Merge branch 'main' into joh/super-monkey

Author: jrieken

.eslintignore

@@ -31,7 +31,6 @@
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
 **/test/unit/assert.js
-**/test/unit/assert-esm.js
 **/test/automation/out/**
 **/typings/**
 !.vscode

.eslintplugin/code-import-patterns.ts

@@ -249,7 +249,7 @@ export = new class implements eslint.Rule.RuleModule {
 			const relativeFilename = getRelativeFilename(context);
 			importPath = path.posix.join(path.posix.dirname(relativeFilename), importPath);
 			if (/^src\/vs\//.test(importPath)) {
-				// resolve using AMD base url
+				// resolve using base url
 				importPath = importPath.substring('src/'.length);
 			}
 		}

.eslintrc.json

@@ -2,7 +2,7 @@
 	"root": true,
 	"parser": "@typescript-eslint/parser",
 	"parserOptions": {
-		"ecmaVersion": 6,
+		"ecmaVersion": 2022,
 		"sourceType": "module"
 	},
 	"plugins": [
@@ -1132,7 +1132,13 @@
 						]
 					},
 					{
-						"target": "src/vs/{loader.d.ts,monaco.d.ts,nls.ts,nls.messages.ts}",
+						"target": "src/vs/nls.ts",
+						"restrictions": [
+							"vs/*"
+						]
+					},
+					{
+						"target": "src/vs/{monaco.d.ts,nls.ts,nls.messages.ts}",
 						"restrictions": []
 					},
 					{

build/filters.js

@@ -79,7 +79,6 @@ module.exports.indentationFilter = [
 	'!src/vs/base/node/cpuUsage.sh',
 	'!src/vs/editor/common/languages/highlights/*.scm',
 	'!test/unit/assert.js',
-	'!test/unit/assert-esm.js',
 	'!resources/linux/snap/electron-launch',
 	'!build/ext.js',
 	'!build/npm/gyp/patches/gyp_spectre_mitigation_support.patch',

build/lib/layersChecker.js

@@ -24,7 +24,6 @@ import { match } from 'minimatch';
 // Types we assume are present in all implementations of JS VMs (node.js, browsers)
 // Feel free to add more core types as you see needed if present in node.js and browsers
 const CORE_TYPES = [
-	'require', // from our AMD loader
 	'setTimeout',
 	'clearTimeout',
 	'setInterval',

build/lib/layersChecker.ts

@@ -115,8 +115,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 	writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
 
 	[
-		'vs/loader.js',
-		'vs/loader.d.ts'
+		'vs/loader.js'
 	].forEach(copyFile);
 }
 

build/lib/standalone.js

@@ -5,7 +5,7 @@ echo Runs tests against the current documentation in https://github.com/microsof
 
 pushd %~dp0\..
 
-:: Endgame tests in AMD
+:: Endgame tests
 call .\scripts\test.bat --runGlob **\*.releaseTest.js %*
 if %errorlevel% neq 0 exit /b %errorlevel%
 

build/lib/standalone.ts

@@ -14,7 +14,7 @@ cd $ROOT
 
 echo "Runs tests against the current documentation in https://github.com/microsoft/vscode-docs/tree/vnext"
 
-# Tests in AMD
+# Tests
 ./scripts/test.sh --runGlob **/*.releaseTest.js "$@"
 
 

scripts/test-documentation.bat

@@ -25,7 +25,7 @@ echo Storing crash reports into '%VSCODECRASHDIR%'.
 echo Storing log files into '%VSCODELOGSDIR%'.
 
 
-:: Tests standalone (AMD)
+:: Unit tests
 
 echo.
 echo ### node.js integration tests

scripts/test-documentation.sh

@@ -34,7 +34,7 @@ echo "Storing crash reports into '$VSCODECRASHDIR'."
 echo "Storing log files into '$VSCODELOGSDIR'."
 
 
-# Tests standalone (AMD)
+# Unit tests
 
 echo
 echo "### node.js integration tests"

scripts/test-integration.bat

@@ -643,7 +643,7 @@ async function resolveNlsConfiguration(): Promise<INLSConfiguration> {
 }
 
 /**
- * Language tags are case insensitive however an amd loader is case sensitive
+ * Language tags are case insensitive however an ESM loader is case sensitive
  * To make this work on case preserving & insensitive FS we do the following:
  * the language bundles have lower case language tags and we always lower case
  * the locale we receive from the user or OS.

scripts/test-integration.sh

@@ -21,7 +21,6 @@
 		"typings/vscode-globals-product.d.ts",
 		"typings/vscode-globals-nls.d.ts",
 		"typings/editContext.d.ts",
-		"vs/loader.d.ts",
 		"vs/monaco.d.ts",
 		"vs/editor/*",
 		"vs/base/common/*",