@vscode/test-web 0.0.77 → 0.0.78

package/out/server/index.d.ts

@@ -65,7 +65,7 @@ export interface Options {
      */
     coi?: boolean;
     /**
-     * If set, serves the page with ESM usage.
+     * If set to true, serves the page with ESM usage, if set to false, serves the page with AMD usage. If not set, ESM is used if the build supports it.
      */
     esm?: boolean;
     /**

package/out/server/index.js

@@ -29,7 +29,7 @@ async function runTests(options) {
         extensionPaths: options.extensionPaths,
         extensionIds: options.extensionIds,
         coi: !!options.coi,
-        esm: !!options.esm,
+        esm: options.esm,
     };
     const host = options.host ?? 'localhost';
     const port = options.port ?? 3000;
@@ -95,7 +95,7 @@ async function open(options) {
         extensionPaths: options.extensionPaths,
         extensionIds: options.extensionIds,
         coi: !!options.coi,
-        esm: !!options.esm,
+        esm: options.esm,
     };
     const host = options.host ?? 'localhost';
     const port = options.port ?? 3000;
@@ -179,6 +179,9 @@ function validateBooleanOrUndefined(options, name) {
     if (value === undefined || typeof value === 'boolean') {
         return value;
     }
+    if (value === null) {
+        return undefined;
+    }
     console.log(`'${name}' needs to be a boolean value.`);
     showHelp();
     process.exit(-1);
@@ -372,7 +375,7 @@ function showHelp() {
     console.log(`  --headless: Whether to hide the browser. Defaults to true when an extensionTestsPath is provided, otherwise false. [Optional]`);
     console.log(`  --permission: Permission granted in the opened browser: e.g. 'clipboard-read', 'clipboard-write'. [Optional, Multiple]`);
     console.log(`  --coi: Enables cross origin isolation [Optional]`);
-    console.log(`  --esm: Serve the ESM variant of VS Code [Optional]`);
+    console.log(`  --esm: If set to true, serves the page with ESM loader, if set to false, serves the page with AMD loader. If not set, ESM is used if the build supports it. [Optional]`);
     console.log(`  --folder-uri: workspace to open VS Code on. Ignored when folderPath is provided. [Optional]`);
     console.log(`  --extensionPath: A path pointing to a folder containing additional extensions to include [Optional, Multiple]`);
     console.log(`  --extensionId: The id of an extension include. The format is '\${publisher}.\${name}'. Append '@prerelease' to use a prerelease version [Optional, Multiple]`);
@@ -396,6 +399,9 @@ async function cliMain() {
     const options = {
         string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browser', 'browserOption', 'browserType', 'quality', 'version', 'commit', 'waitForDebugger', 'folder-uri', 'permission', 'extensionPath', 'extensionId', 'sourcesPath', 'host', 'port', 'testRunnerDataDir'],
         boolean: ['open-devtools', 'headless', 'hideServerLog', 'printServerLog', 'help', 'verbose', 'coi', 'esm'],
+        default: {
+            esm: null
+        },
         unknown: arg => {
             if (arg.startsWith('-')) {
                 console.log(`Unknown argument ${arg}`);

package/out/server/workbench.js

@@ -144,7 +144,7 @@ function default_1(config) {
         if (config.build.type === 'sources') {
             const builtInExtensions = await (0, extensions_1.getScannedBuiltinExtensions)(config.build.location);
             const productOverrides = await getProductOverrides(config.build.location);
-            const esm = config.esm || await isESM(config.build.location);
+            const esm = config.esm ?? await isESM(config.build.location);
             console.log('Using ESM loader:', esm);
             const devCSSModules = esm ? await getDevCssModules(config.build.location) : [];
             ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, esm, devCSSModules, builtInExtensions, {
@@ -155,13 +155,17 @@ function default_1(config) {
         }
         else if (config.build.type === 'static') {
             const baseUrl = `${ctx.protocol}://${ctx.host}/static/build`;
-            ctx.state.workbench = new Workbench(baseUrl, false, config.esm, [], [], {
+            const esm = config.esm ?? await isESM(config.build.location);
+            console.log('Using ESM loader:', esm);
+            ctx.state.workbench = new Workbench(baseUrl, false, esm, [], [], {
                 webEndpointUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/build`,
                 webviewContentExternalBaseUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/build/out/vs/workbench/contrib/webview/browser/pre/`
             });
         }
         else if (config.build.type === 'cdn') {
-            ctx.state.workbench = new Workbench(config.build.uri, false, config.esm, []);
+            const esm = config.esm ?? true;
+            console.log('Using ESM loader:', esm);
+            ctx.state.workbench = new Workbench(config.build.uri, false, esm, []);
         }
         await next();
     });
@@ -191,13 +195,6 @@ async function getDevCssModules(vsCodeDevLocation) {
     return glob.glob('**/*.css', { cwd: path.join(vsCodeDevLocation, 'out') });
 }
 async function isESM(vsCodeDevLocation) {
-    try {
-        const packageJSON = await fs_1.promises.readFile(path.join(vsCodeDevLocation, 'out', 'package.json'));
-        return JSON.parse(packageJSON.toString()).type === 'module';
-    }
-    catch (e) {
-        // ignore
-    }
     try {
         const packageJSON = await fs_1.promises.readFile(path.join(vsCodeDevLocation, 'package.json'));
         return JSON.parse(packageJSON.toString()).type === 'module';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.77",
+  "version": "0.0.78",
   "scripts": {
     "install-extensions": "npm i --prefix=fs-provider && npm i --prefix=sample",
     "compile": "tsc -b ./ && npm run compile-fs-provider",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@koa/cors": "^5.0.0",
-    "@koa/router": "^15.0.0",
+    "@koa/router": "^15.2.0",
     "@playwright/browser-chromium": "^1.57.0",
     "tinyglobby": "^0.2.15",
     "gunzip-maybe": "^1.4.2",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.3",
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.39.2",
     "@types/gunzip-maybe": "^1.4.3",
     "@types/koa": "^3.0.1",
     "@types/koa__router": "^12.0.5",
@@ -51,9 +51,9 @@
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.16.13",
     "@types/tar-fs": "^2.0.4",
-    "@typescript-eslint/eslint-plugin": "^8.48.1",
-    "@typescript-eslint/parser": "^8.48.1",
-    "eslint": "^9.39.1",
+    "@typescript-eslint/eslint-plugin": "^8.52.0",
+    "@typescript-eslint/parser": "^8.52.0",
+    "eslint": "^9.39.2",
     "@tony.ganchev/eslint-plugin-header": "^3.1.11",
     "typescript": "^5.9.3"
   },

package/views/workbench-esm.html

@@ -26,7 +26,7 @@
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/manifest.json">
 
-		<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.css" />
+		<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.internal.css" />
 		<style id="vscode-css-modules" type="text/css" media="screen"></style>
 	</head>