Skip to content

Commit 18caae5

Browse files
jzyrobertjzyrobert
committed
Merge remote-tracking branch 'upstream/main' into jzyrobert/explorer_autoreveal
2 parents 768bfd4 + 8721752 commit 18caae5

File tree

98 files changed

+1270
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1270
-334
lines changed

‎.github/workflows/no-yarn-lock-changes.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818
run: |
1919
echo "user: ${{ github.event.pull_request.user.login }}"
2020
echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
21+
echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
2122
echo "should_run: ${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
22-
echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
23+
echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}"
2324
- name: Get file changes
2425
uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
2526
if: ${{ steps.control.outputs.should_run == 'true' }}

‎.vscode/notebooks/endgame.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\r\n\r\n$MILESTONE=milestone:\"May 2022\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"June 2022\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-endgame.github-issues‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"May 2022\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"June 2022\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
],
7474
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
7575
"git.branchRandomName.enable": true,
76+
"git.mergeEditor": true,
7677
"remote.extensionKind": {
7778
"msjsdiag.debugger-for-chrome": "workspace"
7879
},

‎build/lib/tsb/transpiler.js‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,29 @@ class Transpiler {
121121
this._allJobs = [];
122122
logFn('Transpile', `will use ${Transpiler.P} transpile worker`);
123123
this._getOutputFileName = (file) => {
124-
if (!_cmdLine.options.configFilePath) {
125-
// this is needed for the INTERNAL getOutputFileNames-call below...
126-
_cmdLine.options.configFilePath = configFilePath;
127-
}
128-
const isDts = file.endsWith('.d.ts');
129-
if (isDts) {
130-
file = file.slice(0, -5) + '.ts';
131-
_cmdLine.fileNames.push(file);
124+
try {
125+
// windows: path-sep normalizing
126+
file = ts.normalizePath(file);
127+
if (!_cmdLine.options.configFilePath) {
128+
// this is needed for the INTERNAL getOutputFileNames-call below...
129+
_cmdLine.options.configFilePath = configFilePath;
130+
}
131+
const isDts = file.endsWith('.d.ts');
132+
if (isDts) {
133+
file = file.slice(0, -5) + '.ts';
134+
_cmdLine.fileNames.push(file);
135+
}
136+
const outfile = ts.getOutputFileNames(_cmdLine, file, true)[0];
137+
if (isDts) {
138+
_cmdLine.fileNames.pop();
139+
}
140+
return outfile;
132141
}
133-
const outfile = ts.getOutputFileNames(_cmdLine, file, true)[0];
134-
if (isDts) {
135-
_cmdLine.fileNames.pop();
142+
catch (err) {
143+
console.error(file, _cmdLine.fileNames);
144+
console.error(err);
145+
throw new err;
136146
}
137-
return outfile;
138147
};
139148
}
140149
async join() {

‎build/lib/tsb/transpiler.ts‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -166,23 +166,35 @@ export class Transpiler {
166166
// very complicated logic to re-use TS internal functions to know the output path
167167
// given a TS input path and its config
168168
type InternalTsApi = typeof ts & {
169+
normalizePath(path: string): string;
169170
getOutputFileNames(commandLine: ts.ParsedCommandLine, inputFileName: string, ignoreCase: boolean): readonly string[];
170171
};
171172
this._getOutputFileName = (file) => {
172-
if (!_cmdLine.options.configFilePath) {
173-
// this is needed for the INTERNAL getOutputFileNames-call below...
174-
_cmdLine.options.configFilePath = configFilePath;
175-
}
176-
const isDts = file.endsWith('.d.ts');
177-
if (isDts) {
178-
file = file.slice(0, -5) + '.ts';
179-
_cmdLine.fileNames.push(file);
180-
}
181-
const outfile = (<InternalTsApi>ts).getOutputFileNames(_cmdLine, file, true)[0];
182-
if (isDts) {
183-
_cmdLine.fileNames.pop();
173+
try {
174+
175+
// windows: path-sep normalizing
176+
file = (<InternalTsApi>ts).normalizePath(file);
177+
178+
if (!_cmdLine.options.configFilePath) {
179+
// this is needed for the INTERNAL getOutputFileNames-call below...
180+
_cmdLine.options.configFilePath = configFilePath;
181+
}
182+
const isDts = file.endsWith('.d.ts');
183+
if (isDts) {
184+
file = file.slice(0, -5) + '.ts';
185+
_cmdLine.fileNames.push(file);
186+
}
187+
const outfile = (<InternalTsApi>ts).getOutputFileNames(_cmdLine, file, true)[0];
188+
if (isDts) {
189+
_cmdLine.fileNames.pop();
190+
}
191+
return outfile;
192+
193+
} catch (err) {
194+
console.error(file, _cmdLine.fileNames);
195+
console.error(err);
196+
throw new err;
184197
}
185-
return outfile;
186198
};
187199
}
188200

‎build/linux/rpm/dep-lists.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ exports.referenceGeneratedDepsByArch = {
7474
'libgbm.so.1()(64bit)',
7575
'libgcc_s.so.1()(64bit)',
7676
'libgcc_s.so.1(GCC_3.0)(64bit)',
77-
'libgdk_pixbuf-2.0.so.0()(64bit)',
7877
'libgio-2.0.so.0()(64bit)',
7978
'libglib-2.0.so.0()(64bit)',
8079
'libgobject-2.0.so.0()(64bit)',
@@ -157,7 +156,6 @@ exports.referenceGeneratedDepsByArch = {
157156
'libgcc_s.so.1(GCC_3.0)',
158157
'libgcc_s.so.1(GCC_3.4)',
159158
'libgcc_s.so.1(GCC_3.5)',
160-
'libgdk_pixbuf-2.0.so.0',
161159
'libgio-2.0.so.0',
162160
'libglib-2.0.so.0',
163161
'libgobject-2.0.so.0',
@@ -247,7 +245,6 @@ exports.referenceGeneratedDepsByArch = {
247245
'libgcc_s.so.1(GCC_3.0)(64bit)',
248246
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
249247
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
250-
'libgdk_pixbuf-2.0.so.0()(64bit)',
251248
'libgio-2.0.so.0()(64bit)',
252249
'libglib-2.0.so.0()(64bit)',
253250
'libgobject-2.0.so.0()(64bit)',

‎build/linux/rpm/dep-lists.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const referenceGeneratedDepsByArch = {
7474
'libgbm.so.1()(64bit)',
7575
'libgcc_s.so.1()(64bit)',
7676
'libgcc_s.so.1(GCC_3.0)(64bit)',
77-
'libgdk_pixbuf-2.0.so.0()(64bit)',
7877
'libgio-2.0.so.0()(64bit)',
7978
'libglib-2.0.so.0()(64bit)',
8079
'libgobject-2.0.so.0()(64bit)',
@@ -157,7 +156,6 @@ export const referenceGeneratedDepsByArch = {
157156
'libgcc_s.so.1(GCC_3.0)',
158157
'libgcc_s.so.1(GCC_3.4)',
159158
'libgcc_s.so.1(GCC_3.5)',
160-
'libgdk_pixbuf-2.0.so.0',
161159
'libgio-2.0.so.0',
162160
'libglib-2.0.so.0',
163161
'libgobject-2.0.so.0',
@@ -247,7 +245,6 @@ export const referenceGeneratedDepsByArch = {
247245
'libgcc_s.so.1(GCC_3.0)(64bit)',
248246
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
249247
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
250-
'libgdk_pixbuf-2.0.so.0()(64bit)',
251248
'libgio-2.0.so.0()(64bit)',
252249
'libglib-2.0.so.0()(64bit)',
253250
'libgobject-2.0.so.0()(64bit)',

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"esbuild": "^0.14.2",
5353
"extract-zip": "^2.0.1",
5454
"fs-extra": "^9.1.0",
55-
"got": "11.8.1",
55+
"got": "11.8.5",
5656
"gulp-merge-json": "^2.1.1",
5757
"gulp-shell": "^0.8.0",
5858
"jsonc-parser": "^2.3.0",

‎build/yarn.lock‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,17 +1067,17 @@ cacheable-request@^6.0.0:
10671067
normalize-url "^4.1.0"
10681068
responselike "^1.0.2"
10691069

1070-
cacheable-request@^7.0.1:
1071-
version "7.0.1"
1072-
resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58"
1073-
integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==
1070+
cacheable-request@^7.0.2:
1071+
version "7.0.2"
1072+
resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
1073+
integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
10741074
dependencies:
10751075
clone-response "^1.0.2"
10761076
get-stream "^5.1.0"
10771077
http-cache-semantics "^4.0.0"
10781078
keyv "^4.0.0"
10791079
lowercase-keys "^2.0.0"
1080-
normalize-url "^4.1.0"
1080+
normalize-url "^6.0.1"
10811081
responselike "^2.0.0"
10821082

10831083
call-bind@^1.0.0:
@@ -1974,17 +1974,17 @@ globby@^11.0.4:
19741974
merge2 "^1.4.1"
19751975
slash "^3.0.0"
19761976

1977-
got@11.8.1:
1978-
version "11.8.1"
1979-
resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d"
1980-
integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q==
1977+
got@11.8.5:
1978+
version "11.8.5"
1979+
resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
1980+
integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
19811981
dependencies:
19821982
"@sindresorhus/is" "^4.0.0"
19831983
"@szmarczak/http-timer" "^4.0.5"
19841984
"@types/cacheable-request" "^6.0.1"
19851985
"@types/responselike" "^1.0.0"
19861986
cacheable-lookup "^5.0.3"
1987-
cacheable-request "^7.0.1"
1987+
cacheable-request "^7.0.2"
19881988
decompress-response "^6.0.0"
19891989
http2-wrapper "^1.0.0-beta.5.2"
19901990
lowercase-keys "^2.0.0"
@@ -2604,6 +2604,11 @@ normalize-url@^4.1.0:
26042604
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
26052605
integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
26062606

2607+
normalize-url@^6.0.1:
2608+
version "6.1.0"
2609+
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
2610+
integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
2611+
26072612
npm-conf@^1.1.3:
26082613
version "1.1.3"
26092614
resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"

0 commit comments

Comments
 (0)