@vscode/test-web 0.0.47 → 0.0.49

package/fs-provider/package.json

@@ -36,13 +36,13 @@
 	},
 	"devDependencies": {
 		"@types/vscode": "^1.81.0",
-		"@types/webpack-env": "^1.18.2",
-		"ts-loader": "^9.4.4",
-		"webpack": "^5.88.2",
+		"@types/webpack-env": "^1.18.3",
+		"ts-loader": "^9.5.0",
+		"webpack": "^5.89.0",
 		"webpack-cli": "^5.1.4",
 		"process": "^0.11.10",
 		"path-browserify": "^1.0.1",
 		"request-light": "^0.7.0",
-		"vscode-uri": "^3.0.7"
+		"vscode-uri": "^3.0.8"
 	}
 }

package/out/index.d.ts

@@ -10,6 +10,10 @@ export interface Options {
      * Browser to open: 'chromium' | 'firefox' | 'webkit' | 'none'.
      */
     browserType: BrowserType;
+    /**
+     * Browser command line options.
+     */
+    browserOptions?: string[];
     /**
      * Absolute path to folder that contains one or more extensions (in subfolders).
      * Extension folders include a `package.json` extension manifest.

package/out/index.js

@@ -120,6 +120,9 @@ async function openBrowser(endpoint, options, configPage) {
         return undefined;
     }
     const args = [];
+    if (options.browserOptions) {
+        args.push(...options.browserOptions);
+    }
     if (process.platform === 'linux' && options.browserType === 'chromium') {
         args.push('--no-sandbox');
     }
@@ -219,7 +222,24 @@ function validatePermissions(permissions) {
     if (Array.isArray(permissions) && permissions.every(isValidPermission)) {
         return permissions;
     }
-    console.log(`Invalid permission`);
+    console.log(`Invalid permission: ${permissions}`);
+    showHelp();
+    process.exit(-1);
+}
+function validateBrowserOptions(browserOptions) {
+    if (browserOptions === undefined) {
+        return undefined;
+    }
+    function isValidOption(p) {
+        return typeof p === 'string';
+    }
+    if (isValidOption(browserOptions)) {
+        return [browserOptions];
+    }
+    if (Array.isArray(browserOptions) && browserOptions.every(isValidOption)) {
+        return browserOptions;
+    }
+    console.log(`Invalid browser option: ${browserOptions}`);
     showHelp();
     process.exit(-1);
 }
@@ -328,6 +348,7 @@ function validatePortNumber(port) {
 function showHelp() {
     console.log('Usage:');
     console.log(`  --browser 'chromium' | 'firefox' | 'webkit' | 'none': The browser to launch. [Optional, defaults to 'chromium']`);
+    console.log(`  --browserOption option: Command line argument to use when launching the browser instance. [Optional, Multiple]`);
     console.log(`  --extensionDevelopmentPath path: A path pointing to an extension under development to include. [Optional]`);
     console.log(`  --extensionTestsPath path: A path to a test module to run. [Optional]`);
     console.log(`  --quality 'insiders' | 'stable' [Optional, default 'insiders', ignored when running from sources]`);
@@ -359,7 +380,7 @@ async function cliMain() {
     const manifest = require('../package.json');
     console.log(`${manifest.name}: ${manifest.version}`);
     const options = {
-        string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browser', 'browserType', 'quality', 'version', 'waitForDebugger', 'folder-uri', 'permission', 'extensionPath', 'extensionId', 'sourcesPath', 'host', 'port', 'testRunnerDataDir'],
+        string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browser', 'browserOption', 'browserType', 'quality', 'version', 'waitForDebugger', 'folder-uri', 'permission', 'extensionPath', 'extensionId', 'sourcesPath', 'host', 'port', 'testRunnerDataDir'],
         boolean: ['open-devtools', 'headless', 'hideServerLog', 'printServerLog', 'help', 'verbose', 'coi', 'esm'],
         unknown: arg => {
             if (arg.startsWith('-')) {
@@ -375,6 +396,7 @@ async function cliMain() {
         showHelp();
         process.exit();
     }
+    const browserOptions = validateBrowserOptions(args.browserOption);
     const browserType = validateBrowserType(args);
     const extensionTestsPath = await validatePathOrUndefined(args, 'extensionTestsPath', true);
     const extensionDevelopmentPath = await validatePathOrUndefined(args, 'extensionDevelopmentPath');
@@ -410,6 +432,7 @@ async function cliMain() {
         runTests({
             extensionTestsPath,
             extensionDevelopmentPath,
+            browserOptions,
             browserType,
             quality,
             devTools,
@@ -436,6 +459,7 @@ async function cliMain() {
     else {
         open({
             extensionDevelopmentPath,
+            browserOptions,
             browserType,
             quality,
             devTools,

package/out/server/app.js

@@ -22,14 +22,17 @@ async function createApp(config) {
         allowMethods: ['GET'],
         credentials: true,
         origin: (ctx) => {
-            if (/^https:\/\/[^.]+\.vscode-cdn\.net$/.test(ctx.get('Origin')) || // needed for the webviewContent
-                /^https:\/\/[^.]+\.vscode-webview\.net$/.test(ctx.get('Origin'))) {
-                return ctx.get('Origin');
+            const origin = ctx.get('Origin');
+            if (/^https:\/\/[^.]+\.vscode-cdn\.net$/.test(origin) || // needed for the webviewContent
+                /^https:\/\/[^.]+\.vscode-webview\.net$/.test(origin) ||
+                new RegExp(`^${ctx.protocol}://[^.]+\\.${ctx.host}$`).test(origin) // match subdomains of localhost
+            ) {
+                return origin;
             }
             return undefined;
         },
     }));
-    if (config.build.type !== 'sources') {
+    if (config.build.type !== 'sources' && config.build.type !== 'static') {
         // CSP: frame-ancestors
         app.use((ctx, next) => {
             ctx.set('Content-Security-Policy', `frame-ancestors 'none'`);

package/out/server/workbench.js

@@ -111,10 +111,18 @@ 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);
-            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, builtInExtensions, productOverrides);
+            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, builtInExtensions, {
+                ...productOverrides,
+                webEndpointUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/sources`,
+                webviewContentExternalBaseUrlTemplate: `${ctx.protocol}://{{uuid}}.${ctx.host}/static/sources/out/vs/workbench/contrib/webview/browser/pre/`
+            });
         }
         else if (config.build.type === 'static') {
-            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/build`, false, config.esm);
+            const baseUrl = `${ctx.protocol}://${ctx.host}/static/build`;
+            ctx.state.workbench = new Workbench(baseUrl, false, config.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);

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "scripts": {
-    "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
-    "compile": "tsc -p ./ && yarn compile-fs-provider",
+    "install-extensions": "npm i --prefix=fs-provider && npm i --prefix=sample",
+    "compile": "tsc -p ./ && npm run compile-fs-provider",
     "watch": "tsc -w -p ./",
-    "prepack": "yarn compile",
+    "prepack": "npm run compile",
     "test": "eslint src --ext ts && tsc --noEmit",
     "preversion": "npm test",
     "postversion": "git push && git push --tags",
-    "compile-fs-provider": "yarn --cwd=fs-provider compile-web",
-    "compile-sample": "yarn --cwd=sample compile-web",
+    "compile-fs-provider": "npm run --prefix=fs-provider compile-web",
+    "compile-sample": "npm run --prefix=sample compile-web",
     "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample sample/test-workspace",
     "sample-tests": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=true sample/test-workspace",
     "empty": "npm run compile && node ."
@@ -23,36 +23,36 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@koa/router": "^12.0.0",
+    "@koa/router": "^12.0.1",
     "@koa/cors": "^4.0.0",
     "koa": "^2.14.2",
     "koa-morgan": "^1.0.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "minimist": "^1.2.8",
-    "playwright": "^1.38.1",
-    "@playwright/browser-chromium": "^1.38.1",
-    "vscode-uri": "^3.0.7",
+    "playwright": "^1.40.1",
+    "@playwright/browser-chromium": "^1.40.1",
+    "vscode-uri": "^3.0.8",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "tar-fs": "^3.0.4",
     "gunzip-maybe": "^1.4.2"
   },
   "devDependencies": {
-    "@types/koa": "^2.13.9",
-    "@types/koa-morgan": "^1.0.6",
-    "@types/koa-mount": "^4.0.3",
-    "@types/koa-static": "^4.0.2",
-    "@types/koa__router": "^12.0.1",
-    "@types/minimist": "^1.2.3",
-    "@types/node": "^20.8.4",
-    "@types/gunzip-maybe": "^1.4.0",
-    "@types/tar-fs": "^2.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
-    "eslint": "^8.51.0",
+    "@types/koa": "^2.13.12",
+    "@types/koa-morgan": "^1.0.8",
+    "@types/koa-mount": "^4.0.5",
+    "@types/koa-static": "^4.0.4",
+    "@types/koa__router": "^12.0.4",
+    "@types/minimist": "^1.2.5",
+    "@types/node": "^20.10.1",
+    "@types/gunzip-maybe": "^1.4.2",
+    "@types/tar-fs": "^2.0.4",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
+    "eslint": "^8.54.0",
     "eslint-plugin-header": "^3.1.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "license": "MIT",
   "author": "Visual Studio Code Team",
@@ -63,4 +63,4 @@
   "bugs": {
     "url": "https://github.com/microsoft/vscode-test-web/issues"
   }
-}
+}