@vscode/test-web 0.0.39 → 0.0.41

package/out/index.js

@@ -35,20 +35,14 @@ async function runTests(options) {
     const server = await (0, main_1.runServer)(host, port, config);
     return new Promise(async (s, e) => {
         const endpoint = `http://${host}:${port}`;
-        const configContext = async (context) => {
-            context.once('close', () => server.close());
+        const configPage = async (page, browser) => {
             const unreportedOutput = [];
-            await context.exposeFunction('codeAutomationLog', (type, args) => {
-                try {
-                    console[type](...args);
-                }
-                catch (_e) {
-                    unreportedOutput.push({ type, args });
-                }
+            await page.exposeFunction('codeAutomationLog', (type, args) => {
+                console[type](...args);
             });
-            await context.exposeFunction('codeAutomationExit', async (code) => {
+            await page.exposeFunction('codeAutomationExit', async (code) => {
                 try {
-                    await context.browser()?.close();
+                    await browser.close();
                 }
                 catch (error) {
                     console.error(`Error when closing browser: ${error}`);
@@ -67,8 +61,11 @@ async function runTests(options) {
             });
         };
         console.log(`Opening browser on ${endpoint}...`);
-        const context = await openBrowser(endpoint, options, configContext);
-        if (!context) {
+        const context = await openBrowser(endpoint, options, configPage);
+        if (context) {
+            context.once('close', () => server.close());
+        }
+        else {
             server.close();
             e(new Error('Can not run test as opening of browser failed.'));
         }
@@ -103,10 +100,8 @@ async function open(options) {
     const port = options.port ?? 3000;
     const server = await (0, main_1.runServer)(host, port, config);
     const endpoint = `http://${host}:${port}`;
-    const configContext = async (context) => {
-        context.once('close', () => server.close());
-    };
-    const context = await openBrowser(endpoint, options, configContext);
+    const context = await openBrowser(endpoint, options);
+    context?.once('close', () => server.close());
     return {
         dispose: () => {
             server.close();
@@ -115,7 +110,7 @@ async function open(options) {
     };
 }
 exports.open = open;
-async function openBrowser(endpoint, options, configureContext) {
+async function openBrowser(endpoint, options, configPage) {
     if (options.browserType === 'none') {
         return undefined;
     }
@@ -137,7 +132,6 @@ async function openBrowser(endpoint, options, configureContext) {
     if (options.permissions) {
         context.grantPermissions(options.permissions);
     }
-    await configureContext(context);
     // forcefully close browser if last page is closed. workaround for https://github.com/microsoft/playwright/issues/2946
     let openPages = 0;
     context.on('page', page => {
@@ -150,6 +144,9 @@ async function openBrowser(endpoint, options, configureContext) {
         });
     });
     const page = context.pages()[0] ?? await context.newPage();
+    if (configPage) {
+        await configPage(page, browser);
+    }
     if (options.waitForDebugger) {
         await page.waitForFunction(() => '__jsDebugIsReady' in globalThis);
     }

package/out/server/workbench.js

@@ -15,7 +15,7 @@ function asJSON(value) {
     return JSON.stringify(value).replace(/"/g, '"');
 }
 class Workbench {
-    constructor(baseUrl, dev, esm, builtInExtensions = [], productOverrides = '') {
+    constructor(baseUrl, dev, esm, builtInExtensions = [], productOverrides) {
         this.baseUrl = baseUrl;
         this.dev = dev;
         this.esm = esm;
@@ -23,12 +23,14 @@ class Workbench {
         this.productOverrides = productOverrides;
     }
     async render(workbenchWebConfiguration) {
+        if (this.productOverrides) {
+            workbenchWebConfiguration.productConfiguration = { ...workbenchWebConfiguration.productConfiguration, ...this.productOverrides };
+        }
         const values = {
             WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
             WORKBENCH_AUTH_SESSION: '',
             WORKBENCH_WEB_BASE_URL: this.baseUrl,
             WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions),
-            WORKBENCH_PRODUCT_OVERRIDES: this.productOverrides,
             WORKBENCH_MAIN: this.getMain()
         };
         try {
@@ -108,7 +110,7 @@ function default_1(config) {
     router.use(async (ctx, next) => {
         if (config.build.type === 'sources') {
             const builtInExtensions = await (0, extensions_1.getScannedBuiltinExtensions)(config.build.location);
-            const productOverrides = await getProductOverridesContent(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);
         }
         else if (config.build.type === 'static') {
@@ -133,11 +135,11 @@ function default_1(config) {
     return router.routes();
 }
 exports.default = default_1;
-async function getProductOverridesContent(vsCodeDevLocation) {
+async function getProductOverrides(vsCodeDevLocation) {
     try {
-        return (await fs_1.promises.readFile(path.join(vsCodeDevLocation, 'product.overrides.json'))).toString();
+        return JSON.parse((await fs_1.promises.readFile(path.join(vsCodeDevLocation, 'product.overrides.json'))).toString());
     }
     catch (e) {
-        return '';
+        return undefined;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "scripts": {
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",

package/views/workbench-esm.html

@@ -25,9 +25,6 @@
 		<!-- Builtin Extensions (running out of sources) -->
 		<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
 
-		<!-- Product Overrides (running out of sources) -->
-		<meta id="vscode-workbench-product-overrides" data-settings="{{WORKBENCH_PRODUCT_OVERRIDES}}">
-
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/manifest.json">

package/views/workbench.html

@@ -25,9 +25,6 @@
 		<!-- Builtin Extensions (running out of sources) -->
 		<meta id="vscode-workbench-builtin-extensions" data-settings="{{WORKBENCH_BUILTIN_EXTENSIONS}}">
 
-		<!-- Product Overrides (running out of sources) -->
-		<meta id="vscode-workbench-product-overrides" data-settings="{{WORKBENCH_PRODUCT_OVERRIDES}}">
-
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="{{WORKBENCH_WEB_BASE_URL}}/favicon.ico" type="image/x-icon" />
 		<link rel="manifest" href="{{WORKBENCH_WEB_BASE_URL}}/manifest.json">