Skip to content

Commit 0e63f13

Browse files
mjbvzmjbvz
authored
Merge branch 'main' into hidden-spider
2 parents e330e67 + e6ab449 commit 0e63f13

File tree

741 files changed

+28229
-13987
lines changed

Some content is hidden

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

741 files changed

+28229
-13987
lines changed

‎.eslintignore

+8
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@
3030
**/src/vs/*/**/*.d.ts
3131
**/src/vs/base/test/common/filters.perf.data.js
3232
**/src/vs/loader.js
33+
**/src2/**/dompurify.js
34+
**/src2/**/marked.js
35+
**/src2/**/semver.js
36+
**/src2/typings/**/*.d.ts
37+
**/src2/vs/*/**/*.d.ts
38+
**/src2/vs/base/test/common/filters.perf.data.js
39+
**/src2/vs/loader.js
3340
**/test/unit/assert.js
41+
**/test/unit/assert-esm.js
3442
**/test/automation/out/**
3543
**/typings/**
3644
!.vscode

‎.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1025,15 +1025,15 @@
10251025
]
10261026
},
10271027
{
1028-
"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts}",
1028+
"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.messages.ts,nls.ts}",
10291029
"restrictions": []
10301030
},
10311031
{
10321032
"target": "src/vscode-dts/**",
10331033
"restrictions": []
10341034
},
10351035
{
1036-
"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,cli.js,main.js,server-cli.js,server-main.js}",
1036+
"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,cli.js,main.js,server-cli.js,server-main.js,bootstrap-cli.js,bootstrap-server.js}",
10371037
"restrictions": []
10381038
}
10391039
]

‎.vscode-test.js

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ const extensions = [
4545
label: 'github-authentication',
4646
workspaceFolder: path.join(os.tmpdir(), `msft-auth-${Math.floor(Math.random() * 100000)}`),
4747
mocha: { timeout: 60_000 }
48+
},
49+
{
50+
label: 'microsoft-authentication',
51+
mocha: { timeout: 60_000 }
4852
}
4953
];
5054

‎.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export async function scanTestOutput(
290290
enqueueExitBlocker(
291291
(async () => {
292292
const stackInfo = await deriveStackLocations(store, rawErr, tcase!);
293-
let message: vscode.TestMessage2;
293+
let message: vscode.TestMessage;
294294

295295
if (hasDiff) {
296296
message = new vscode.TestMessage(tryMakeMarkdown(err));

‎.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"src/**/*",
1212
"../../../src/vscode-dts/vscode.d.ts",
1313
"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
14-
"../../../src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts",
1514
"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
1615
"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
1716
]

‎.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"src/vs/base/test/common/filters.perf.data.js": true,
3333
"src/vs/base/test/node/uri.perf.data.txt": true,
3434
"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
35+
"src/vs/base/test/node/uri.test.data.txt": true,
3536
"src/vs/editor/test/node/diffing/fixtures/**": true,
3637
},
3738
"files.readonlyInclude": {
@@ -50,6 +51,7 @@
5051
"test/smoke/out/**": true,
5152
"test/automation/out/**": true,
5253
"test/integration/browser/out/**": true,
54+
"src2/**": true,
5355
},
5456
"files.readonlyExclude": {
5557
"build/builtin/*.js": true,
@@ -166,6 +168,6 @@
166168
"editor.wordWrap": "on"
167169
},
168170
"css.format.spaceAroundSelectorSeparator": true,
169-
"inlineChat.mode": "live",
170-
"typescript.enablePromptUseWorkspaceTsdk": true
171+
"typescript.enablePromptUseWorkspaceTsdk": true,
172+
"inlineChat.experimental.onlyZoneWidget": true
171173
}

‎.vscode/shared.code-snippets

+18
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,23 @@
3636
"private readonly _onDid$1 = new Emitter<$2>();",
3737
"readonly onDid$1: Event<$2> = this._onDid$1.event;"
3838
],
39+
},
40+
"esm-comment": {
41+
"scope": "typescript,javascript",
42+
"prefix": "esm-comment",
43+
"body": [
44+
"// ESM-comment-begin",
45+
"$SELECTION$0",
46+
"// ESM-comment-end",
47+
]
48+
},
49+
"esm-uncomment": {
50+
"scope": "typescript,javascript",
51+
"prefix": "esm-uncomment",
52+
"body": [
53+
"// ESM-uncomment-begin",
54+
"// $SELECTION$0",
55+
"// ESM-uncomment-end",
56+
]
3957
}
4058
}

‎.yarnrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
disturl "https://electronjs.org/headers"
2-
target "30.1.2"
3-
ms_build_id "9870757"
2+
target "30.4.0"
3+
ms_build_id "10073054"
44
runtime "electron"
55
build_from_source "true"

‎build/.cachesalt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-08-06T11:06:57.600Z
1+
2024-08-14T18:12:43.548Z

‎build/.webignore

+2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ vscode-textmate/webpack.config.js
4646
@microsoft/applicationinsights-core-js/**
4747
@microsoft/applicationinsights-shims/**
4848
!@microsoft/1ds-core-js/dist/ms.core.min.js
49+
!@microsoft/1ds-core-js/bundle/ms.core.min.js
4950
!@microsoft/1ds-post-js/dist/ms.post.min.js
51+
!@microsoft/1ds-post-js/bundle/ms.post.min.js
5052
!@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
5153
!@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
5254

‎build/azure-pipelines/darwin/product-build-darwin-test.yml

+87-42
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ parameters:
77
type: boolean
88
- name: VSCODE_RUN_SMOKE_TESTS
99
type: boolean
10+
- name: VSCODE_BUILD_ESM
11+
type: boolean
12+
default: false
1013

1114
steps:
1215
- script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
@@ -17,34 +20,56 @@ steps:
1720

1821
- ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
1922
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
20-
- script: ./scripts/test.sh --tfs "Unit Tests"
21-
displayName: Run unit tests (Electron)
22-
timeoutInMinutes: 15
23-
24-
- script: yarn test-node
25-
displayName: Run unit tests (node.js)
26-
timeoutInMinutes: 15
27-
28-
- script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
29-
env:
30-
DEBUG: "*browser*"
31-
displayName: Run unit tests (Browser, Chromium & Webkit)
32-
timeoutInMinutes: 30
23+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
24+
- script: ./scripts/test-esm.sh --tfs "Unit Tests"
25+
displayName: Run unit tests (Electron) [ESM]
26+
timeoutInMinutes: 15
27+
- script: yarn test-node-esm
28+
displayName: Run unit tests (node.js) [ESM]
29+
timeoutInMinutes: 15
30+
- script: yarn test-browser-esm-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
31+
env:
32+
DEBUG: "*browser*"
33+
displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
34+
timeoutInMinutes: 30
35+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
36+
- script: ./scripts/test.sh --tfs "Unit Tests"
37+
displayName: Run unit tests (Electron)
38+
timeoutInMinutes: 15
39+
- script: yarn test-node
40+
displayName: Run unit tests (node.js)
41+
timeoutInMinutes: 15
42+
- script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
43+
env:
44+
DEBUG: "*browser*"
45+
displayName: Run unit tests (Browser, Chromium & Webkit)
46+
timeoutInMinutes: 30
3347

3448
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
35-
- script: ./scripts/test.sh --build --tfs "Unit Tests"
36-
displayName: Run unit tests (Electron)
37-
timeoutInMinutes: 15
38-
39-
- script: yarn test-node --build
40-
displayName: Run unit tests (node.js)
41-
timeoutInMinutes: 15
42-
43-
- script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
44-
env:
45-
DEBUG: "*browser*"
46-
displayName: Run unit tests (Browser, Chromium & Webkit)
47-
timeoutInMinutes: 30
49+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
50+
- script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
51+
displayName: Run unit tests (Electron) [ESM]
52+
timeoutInMinutes: 15
53+
- script: yarn test-node-esm --build
54+
displayName: Run unit tests (node.js) [ESM]
55+
timeoutInMinutes: 15
56+
- script: yarn test-browser-esm-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
57+
env:
58+
DEBUG: "*browser*"
59+
displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
60+
timeoutInMinutes: 30
61+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
62+
- script: ./scripts/test.sh --build --tfs "Unit Tests"
63+
displayName: Run unit tests (Electron)
64+
timeoutInMinutes: 15
65+
- script: yarn test-node --build
66+
displayName: Run unit tests (node.js)
67+
timeoutInMinutes: 15
68+
- script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
69+
env:
70+
DEBUG: "*browser*"
71+
displayName: Run unit tests (Browser, Chromium & Webkit)
72+
timeoutInMinutes: 30
4873

4974
- ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
5075
- script: |
@@ -69,24 +94,44 @@ steps:
6994
displayName: Build integration tests
7095
7196
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
72-
- script: ./scripts/test-integration.sh --tfs "Integration Tests"
73-
displayName: Run integration tests (Electron)
74-
timeoutInMinutes: 20
97+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
98+
- script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
99+
displayName: Run integration tests (Electron) [ESM]
100+
timeoutInMinutes: 20
101+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
102+
- script: ./scripts/test-integration --tfs "Integration Tests"
103+
displayName: Run integration tests (Electron)
104+
timeoutInMinutes: 20
75105

76106
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
77-
- script: |
78-
# Figure out the full absolute path of the product we just built
79-
# including the remote server and configure the integration tests
80-
# to run with these builds instead of running out of sources.
81-
set -e
82-
APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
83-
APP_NAME="`ls $APP_ROOT | head -n 1`"
84-
INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
85-
./scripts/test-integration.sh --build --tfs "Integration Tests"
86-
env:
87-
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
88-
displayName: Run integration tests (Electron)
89-
timeoutInMinutes: 20
107+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
108+
- script: |
109+
# Figure out the full absolute path of the product we just built
110+
# including the remote server and configure the integration tests
111+
# to run with these builds instead of running out of sources.
112+
set -e
113+
APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
114+
APP_NAME="`ls $APP_ROOT | head -n 1`"
115+
INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
116+
./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
117+
env:
118+
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
119+
displayName: Run integration tests (Electron) [ESM]
120+
timeoutInMinutes: 20
121+
- ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
122+
- script: |
123+
# Figure out the full absolute path of the product we just built
124+
# including the remote server and configure the integration tests
125+
# to run with these builds instead of running out of sources.
126+
set -e
127+
APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
128+
APP_NAME="`ls $APP_ROOT | head -n 1`"
129+
INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
130+
./scripts/test-integration.sh --build --tfs "Integration Tests"
131+
env:
132+
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
133+
displayName: Run integration tests (Electron)
134+
timeoutInMinutes: 20
90135
91136
- script: ./scripts/test-web-integration.sh --browser webkit
92137
env:

‎build/azure-pipelines/darwin/product-build-darwin.yml

+9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ parameters:
99
type: boolean
1010
- name: VSCODE_RUN_SMOKE_TESTS
1111
type: boolean
12+
- name: VSCODE_BUILD_ESM
13+
type: boolean
14+
default: false
1215

1316
steps:
1417
- ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
@@ -101,6 +104,11 @@ steps:
101104
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
102105
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
103106
GITHUB_TOKEN: "$(github-distro-mixin-password)"
107+
# Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
108+
# https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
109+
# flipped the default to support legacy linux distros which shouldn't happen
110+
# on macOS.
111+
GYP_DEFINES: "kerberos_use_rtld=false"
104112
displayName: Install dependencies
105113
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
106114
@@ -169,6 +177,7 @@ steps:
169177
VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
170178
VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
171179
VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}
180+
VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
172181

173182
- ${{ elseif and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
174183
- task: DownloadPipelineArtifact@2

‎build/azure-pipelines/linux/product-build-linux-legacy-server.yml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ parameters:
55
type: boolean
66
- name: VSCODE_ARCH
77
type: string
8+
- name: VSCODE_BUILD_ESM
9+
type: boolean
10+
default: false
811

912
steps:
1013
- task: NodeTool@0
@@ -201,6 +204,7 @@ steps:
201204
VSCODE_RUN_UNIT_TESTS: false
202205
VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
203206
VSCODE_RUN_SMOKE_TESTS: false
207+
VSCODE_BUILD_ESM: ${{ parameters.VSCODE_BUILD_ESM }}
204208
${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
205209
PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
206210

0 commit comments

Comments
 (0)