Merge pull request #409 from che-incubator/fix-rebase

chore: Align with upstream

.rebase/replace/code/build/lib/mangle/index.js.json

@@ -1,6 +1,6 @@
 [
     {
-        "from": "const skippedExportMangledFiles = [",
-        "by": "const skippedExportMangledFiles = [\\\n    // che-api contains few interfaces (with Symbol usage) that are not handled correctly by the mangle logic\\\n    'devfile-service',\\\n    'github-service',\\\n    'telemetry-service',\\\n    'workspace-service',"
+        "from": "// Module passed around as type",
+        "by": "// che-api contains few interfaces (with Symbol usage) that are not handled correctly by the mangle logic\\\n\\\t\\\t'devfile-service',\\\n\\\t\\\t'github-service',\\\n\\\t\\\t'telemetry-service',\\\n\\\t\\\t'workspace-service',\\\n\\\n\\\t\\\t// Module passed around as type"
     }
 ]

.rebase/replace/code/build/lib/mangle/index.ts.json

@@ -1,6 +1,6 @@
 [
     {
-        "from": "const skippedExportMangledFiles = [",
-        "by": "const skippedExportMangledFiles = [\\\n\\\t// che-api contains few interfaces (with Symbol usage) that are not handled correctly by the mangle logic\\\n\\\t'devfile-service',\\\n\\\t'github-service',\\\n\\\t'telemetry-service',\\\n\\\t'workspace-service',"
+        "from": "// Module passed around as type",
+        "by": "// che-api contains few interfaces (with Symbol usage) that are not handled correctly by the mangle logic\\\n\\\t\\\t'devfile-service',\\\n\\\t\\\t'github-service',\\\n\\\t\\\t'telemetry-service',\\\n\\\t\\\t'workspace-service',\\\n\\\n\\\t\\\t// Module passed around as type"
     }
 ]

code/.eslintignore

@@ -30,7 +30,15 @@
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
+**/src2/**/dompurify.js
+**/src2/**/marked.js
+**/src2/**/semver.js
+**/src2/typings/**/*.d.ts
+**/src2/vs/*/**/*.d.ts
+**/src2/vs/base/test/common/filters.perf.data.js
+**/src2/vs/loader.js
 **/test/unit/assert.js
+**/test/unit/assert-esm.js
 **/test/automation/out/**
 **/typings/**
 !.vscode

code/.eslintplugin/code-ensure-no-disposables-leak-in-test.ts

@@ -12,7 +12,8 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 		type: 'problem',
 		messages: {
 			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
-		}
+		},
+		fixable: 'code'
 	};
 
 	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
@@ -30,6 +31,10 @@ export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rul
 					context.report({
 						node,
 						messageId: 'ensure',
+						fix: (fixer) => {
+							const updatedSrc = src.replace(/(suite\(.*\n)/, '$1\n\tensureNoDisposablesAreLeakedInTestSuite();\n');
+							return fixer.replaceText(node, updatedSrc);
+						}
 					});
 				}
 			},

code/.eslintrc.json

@@ -1025,15 +1025,15 @@
 						]
 					},
 					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts}",
+						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.messages.ts,nls.ts}",
 						"restrictions": []
 					},
 					{
 						"target": "src/vscode-dts/**",
 						"restrictions": []
 					},
 					{
-						"target": "src/{bootstrap-amd.js,bootstrap-fork.js,bootstrap-node.js,bootstrap-window.js,cli.js,main.js,server-cli.js,server-main.js}",
+						"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}",
 						"restrictions": []
 					}
 				]

code/.vscode-test.js

@@ -45,6 +45,10 @@ const extensions = [
 		label: 'github-authentication',
 		workspaceFolder: path.join(os.tmpdir(), `msft-auth-${Math.floor(Math.random() * 100000)}`),
 		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'microsoft-authentication',
+		mocha: { timeout: 60_000 }
 	}
 ];
 

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

@@ -290,7 +290,7 @@ export async function scanTestOutput(
 							enqueueExitBlocker(
 								(async () => {
 									const stackInfo = await deriveStackLocations(store, rawErr, tcase!);
-									let message: vscode.TestMessage2;
+									let message: vscode.TestMessage;
 
 									if (hasDiff) {
 										message = new vscode.TestMessage(tryMakeMarkdown(err));

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

@@ -11,7 +11,6 @@
 		"src/**/*",
 		"../../../src/vscode-dts/vscode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testObserver.d.ts",
-		"../../../src/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.testRelatedCode.d.ts",
 		"../../../src/vscode-dts/vscode.proposed.attributableCoverage.d.ts"
 	]

code/.vscode/settings.json

@@ -32,6 +32,7 @@
 		"src/vs/base/test/common/filters.perf.data.js": true,
 		"src/vs/base/test/node/uri.perf.data.txt": true,
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
+		"src/vs/base/test/node/uri.test.data.txt": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
 	},
 	"files.readonlyInclude": {
@@ -50,6 +51,7 @@
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true,
+		"src2/**": true,
 	},
 	"files.readonlyExclude": {
 		"build/builtin/*.js": true,
@@ -166,6 +168,6 @@
 		"editor.wordWrap": "on"
 	},
 	"css.format.spaceAroundSelectorSeparator": true,
-	"inlineChat.mode": "live",
-	"typescript.enablePromptUseWorkspaceTsdk": true
+	"typescript.enablePromptUseWorkspaceTsdk": true,
+	"inlineChat.experimental.onlyZoneWidget": true
 }

code/.vscode/shared.code-snippets

@@ -36,5 +36,23 @@
 			"private readonly _onDid$1 = new Emitter<$2>();",
 			"readonly onDid$1: Event<$2> = this._onDid$1.event;"
 		],
+	},
+	"esm-comment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-comment",
+		"body": [
+			"// ESM-comment-begin",
+			"$SELECTION$0",
+			"// ESM-comment-end",
+		]
+	},
+	"esm-uncomment": {
+		"scope": "typescript,javascript",
+		"prefix": "esm-uncomment",
+		"body": [
+			"// ESM-uncomment-begin",
+			"// $SELECTION$0",
+			"// ESM-uncomment-end",
+		]
 	}
 }

code/.yarnrc

@@ -1,5 +1,5 @@
 disturl "https://electronjs.org/headers"
-target "30.1.2"
-ms_build_id "9870757"
+target "30.4.0"
+ms_build_id "10073054"
 runtime "electron"
 build_from_source "true"

code/ThirdPartyNotices.txt

@@ -263,6 +263,34 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
+cacheable-request 7.0.4 - MIT
+
+
+Copyright (c) cacheable-request authors
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 Colorsublime-Themes 0.1.0
 https://github.com/Colorsublime/Colorsublime-Themes
 
@@ -890,7 +918,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---------------------------------------------------------
 
-JuliaEditorSupport/atom-language-julia 0.22.1 - MIT
+JuliaEditorSupport/atom-language-julia 0.23.0 - MIT
 https://github.com/JuliaEditorSupport/atom-language-julia
 
 The atom-language-julia package is licensed under the MIT "Expat" License:
@@ -1241,7 +1269,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------
 
-marked 4.1.0 - MIT
+marked 14.0.0 - MIT
 https://github.com/markedjs/marked
 
 information
@@ -1506,7 +1534,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-RedCMD/YAML-Syntax-Highlighter 1.0.1 - MIT
+RedCMD/YAML-Syntax-Highlighter 1.1.1 - MIT
 https://github.com/RedCMD/YAML-Syntax-Highlighter
 
 MIT License

code/build/.cachesalt

@@ -1 +1 @@
-2024-08-08T03:47:49.879Z
+2024-08-14T18:12:43.548Z

code/build/.webignore

@@ -46,7 +46,9 @@ vscode-textmate/webpack.config.js
 @microsoft/applicationinsights-core-js/**
 @microsoft/applicationinsights-shims/**
 !@microsoft/1ds-core-js/dist/ms.core.min.js
+!@microsoft/1ds-core-js/bundle/ms.core.min.js
 !@microsoft/1ds-post-js/dist/ms.post.min.js
+!@microsoft/1ds-post-js/bundle/ms.post.min.js
 !@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
 !@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
 

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

@@ -7,6 +7,9 @@ parameters:
     type: boolean
   - name: VSCODE_RUN_SMOKE_TESTS
     type: boolean
+  - name: VSCODE_BUILD_ESM
+    type: boolean
+    default: false
 
 steps:
   - script: yarn npm-run-all -lp "electron $(VSCODE_ARCH)" "playwright-install"
@@ -17,34 +20,56 @@ steps:
 
   - ${{ if eq(parameters.VSCODE_RUN_UNIT_TESTS, true) }}:
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: yarn test-node
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --sequential --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit)
+          timeoutInMinutes: 30
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test.sh --build --tfs "Unit Tests"
-        displayName: Run unit tests (Electron)
-        timeoutInMinutes: 15
-
-      - script: yarn test-node --build
-        displayName: Run unit tests (node.js)
-        timeoutInMinutes: 15
-
-      - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
-        env:
-          DEBUG: "*browser*"
-        displayName: Run unit tests (Browser, Chromium & Webkit)
-        timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-esm.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-node-esm --build
+          displayName: Run unit tests (node.js) [ESM]
+          timeoutInMinutes: 15
+        - script: yarn test-browser-esm-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit) [ESM]
+          timeoutInMinutes: 30
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test.sh --build --tfs "Unit Tests"
+          displayName: Run unit tests (Electron)
+          timeoutInMinutes: 15
+        - script: yarn test-node --build
+          displayName: Run unit tests (node.js)
+          timeoutInMinutes: 15
+        - script: yarn test-browser-no-install --sequential --build --browser chromium --browser webkit --tfs "Browser Unit Tests"
+          env:
+            DEBUG: "*browser*"
+          displayName: Run unit tests (Browser, Chromium & Webkit)
+          timeoutInMinutes: 30
 
   - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
     - script: |
@@ -69,24 +94,44 @@ steps:
       displayName: Build integration tests
 
     - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: ./scripts/test-integration.sh --tfs "Integration Tests"
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: ./scripts/test-integration-esm.sh --tfs "Integration Tests"
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: ./scripts/test-integration --tfs "Integration Tests"
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
     - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-      - script: |
-          # Figure out the full absolute path of the product we just built
-          # including the remote server and configure the integration tests
-          # to run with these builds instead of running out of sources.
-          set -e
-          APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
-          APP_NAME="`ls $APP_ROOT | head -n 1`"
-          INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
-          ./scripts/test-integration.sh --build --tfs "Integration Tests"
-        env:
-          VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
-        displayName: Run integration tests (Electron)
-        timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, true) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+            APP_NAME="`ls $APP_ROOT | head -n 1`"
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+            ./scripts/test-integration-esm.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron) [ESM]
+          timeoutInMinutes: 20
+      - ${{ if eq(parameters.VSCODE_BUILD_ESM, false) }}:
+        - script: |
+            # Figure out the full absolute path of the product we just built
+            # including the remote server and configure the integration tests
+            # to run with these builds instead of running out of sources.
+            set -e
+            APP_ROOT="$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)"
+            APP_NAME="`ls $APP_ROOT | head -n 1`"
+            INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+            ./scripts/test-integration.sh --build --tfs "Integration Tests"
+          env:
+            VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)
+          displayName: Run integration tests (Electron)
+          timeoutInMinutes: 20
 
       - script: ./scripts/test-web-integration.sh --browser webkit
         env: