Merge branch 'main' into joh/super-monkey

Author: jrieken

.github/workflows/ci.yml

@@ -82,7 +82,7 @@ jobs:
         run: npm run test-node
 
       - name: Run Unit Tests (Browser, Chromium)
-        run: npm run test-browser-no-install --browser chromium
+        run: npm run test-browser-no-install -- --browser chromium
 
       - name: Run Integration Tests (Electron)
         run: .\scripts\test-integration.bat
@@ -162,7 +162,7 @@ jobs:
 
       - name: Run Unit Tests (Browser, Chromium)
         id: browser-unit-tests
-        run: DISPLAY=:10 npm run test-browser-no-install --browser chromium
+        run: DISPLAY=:10 npm run test-browser-no-install -- --browser chromium
 
       - name: Run Integration Tests (Electron)
         id: electron-integration-tests
@@ -238,7 +238,7 @@ jobs:
         run: npm run test-node
 
       - name: Run Unit Tests (Browser, Chromium)
-        run: DISPLAY=:10 npm run test-browser-no-install --browser chromium
+        run: DISPLAY=:10 npm run test-browser-no-install -- --browser chromium
 
       - name: Run Integration Tests (Electron)
         run: DISPLAY=:10 ./scripts/test-integration.sh

build/lib/tsb/transpiler.js

@@ -403,7 +403,7 @@ export class SwcTranspiler implements ITranspiler {
 			if (isAmd) {
 				options = SwcTranspiler._swcrcAmd;
 			}
-		} else if (this._cmdLine.options.module === ts.ModuleKind.CommonJS) {
+		} else if (this._cmdLine.options.module === ts.ModuleKind.CommonJS || this._cmdLine.options.module === ts.ModuleKind.Node16) {
 			options = SwcTranspiler._swcrcCommonJS;
 		}
 

build/lib/tsb/transpiler.ts

@@ -4,7 +4,8 @@
 		"outDir": "./out",
 		"lib": [
 			"webworker"
-		]
+		],
+		"module": "Node16",
 	},
 	"include": [
 		"src/**/*",

extensions/css-language-features/client/tsconfig.json

@@ -997,7 +997,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "10.0.0-next.8",
+    "vscode-languageclient": "^10.0.0-next.13",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {

extensions/css-language-features/package-lock.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.1",
-    "vscode-languageserver": "10.0.0-next.6",
+    "vscode-languageserver": "^10.0.0-next.11",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {

extensions/css-language-features/package.json

@@ -22,7 +22,7 @@ const messageHandler = async (e: any) => {
 		} else {
 			l10nLog.push(`l10n: No bundle configured.`);
 		}
-		await import('./cssServerMain');
+		await import('./cssServerMain.js');
 		if (self.onmessage !== messageHandler) {
 			pendingMessages.forEach(msg => self.onmessage?.(msg));
 			pendingMessages.length = 0;

extensions/css-language-features/server/package-lock.json

@@ -15,7 +15,7 @@ async function setupMain() {
 			l10nLog.push(`l10n: Problems loading ${i10lLocation.toString()} : ${e}`);
 		}
 	}
-	await import('./cssServerMain');
+	await import('./cssServerMain.js');
 	l10nLog.forEach(console.log);
 }
 setupMain();