@vscode/test-web 0.0.36 → 0.0.38

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 0.0.37
+ * new option `--testRunnerDataDir` to set the temporary folder for storing the VS Code builds used for running the tests
+
+
 ## 0.0.28
  * new option `--coi` to enable cross origin isolation.
 

package/README.md

@@ -83,6 +83,7 @@ CLI options:
 | --open-devtools | If set, opens the dev tools in the browser. |
 | --verbose | If set, prints out more information when running the server. |
 | --printServerLog | If set, prints the server access log. |
+| --testRunnerDataDir | If set, the temporary folder for storing the VS Code builds used for running the tests |
 | folderPath |  A local folder to open VS Code on. The folder content will be available as a virtual file system and opened as workspace. |
 
 Corresponding options are available in the API.

package/out/index.d.ts

@@ -111,6 +111,10 @@ export interface Options {
      * The host name to start the server on. Defaults to `localhost`
      */
     host?: string;
+    /**
+     * The temporary folder for storing the VS Code builds used for running the tests. Defaults to `$CURRENT_WORKING_DIR/.vscode-test-web`.
+     */
+    testRunnerDataDir?: string;
 }
 export interface Disposable {
     dispose(): void;

package/out/index.js

@@ -39,8 +39,14 @@ async function runTests(options) {
         const context = await openBrowser(endpoint, options);
         if (context) {
             context.once('close', () => server.close());
+            const unreportedOutput = [];
             await context.exposeFunction('codeAutomationLog', (type, args) => {
-                console[type](...args);
+                try {
+                    console[type](...args);
+                }
+                catch (_e) {
+                    unreportedOutput.push({ type, args });
+                }
             });
             await context.exposeFunction('codeAutomationExit', async (code) => {
                 try {
@@ -49,6 +55,10 @@ async function runTests(options) {
                 catch (error) {
                     console.error(`Error when closing browser: ${error}`);
                 }
+                if (unreportedOutput.length) {
+                    console.error(`There were ${unreportedOutput.length} messages that could not be reported to the console:`);
+                    unreportedOutput.forEach(({ type, args }) => console[type](...args));
+                }
                 server.close();
                 if (code === 0) {
                     s();
@@ -73,7 +83,8 @@ async function getBuild(options) {
         };
     }
     const quality = options.quality || options.version;
-    return await (0, download_1.downloadAndUnzipVSCode)(quality === 'stable' ? 'stable' : 'insider');
+    const testRunnerDataDir = options.testRunnerDataDir ?? path.resolve(process.cwd(), '.vscode-test-web');
+    return await (0, download_1.downloadAndUnzipVSCode)(quality === 'stable' ? 'stable' : 'insider', testRunnerDataDir);
 }
 async function open(options) {
     const config = {
@@ -334,6 +345,7 @@ function showHelp() {
     console.log(`  --open-devtools: If set, opens the dev tools. [Optional]`);
     console.log(`  --verbose: If set, prints out more information when running the server. [Optional]`);
     console.log(`  --printServerLog: If set, prints the server access log. [Optional]`);
+    console.log(`  --testRunnerDataDir: If set, the temporary folder for storing the VS Code builds used for running the tests. [Optional, defaults to '$CURRENT_WORKING_DIR/.vscode-test-web']`);
     console.log(`  folderPath. A local folder to open VS Code on. The folder content will be available as a virtual file system. [Optional]`);
 }
 async function cliMain() {
@@ -347,7 +359,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'],
+        string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browser', '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('-')) {
@@ -379,6 +391,7 @@ async function cliMain() {
     const host = validateStringOrUndefined(args, 'host');
     const coi = validateBooleanOrUndefined(args, 'coi');
     const esm = validateBooleanOrUndefined(args, 'esm');
+    const testRunnerDataDir = validateStringOrUndefined(args, 'testRunnerDataDir');
     const waitForDebugger = validatePortNumber(args.waitForDebugger);
     let folderUri = validateStringOrUndefined(args, 'folder-uri');
     let folderPath;
@@ -413,7 +426,8 @@ async function cliMain() {
             esm,
             coi,
             host,
-            port
+            port,
+            testRunnerDataDir
         }).catch(e => {
             console.log('Error running tests:', e);
             process.exit(1);
@@ -438,7 +452,8 @@ async function cliMain() {
             esm,
             coi,
             host,
-            port
+            port,
+            testRunnerDataDir
         });
     }
 }

package/out/server/download.js

@@ -14,8 +14,6 @@ const createHttpProxyAgent = require("http-proxy-agent");
 const url_1 = require("url");
 const decompress = require("decompress");
 const decompressTargz = require("decompress-targz");
-const extensionRoot = process.cwd();
-const vscodeTestDir = path.resolve(extensionRoot, '.vscode-test-web');
 async function getLatestVersion(quality) {
     const update = await fetchJSON(`https://update.code.visualstudio.com/api/update/web-standalone/${quality}/latest`);
     return update;
@@ -65,7 +63,7 @@ async function unzip(source, destination, message) {
     });
     process.stdout.write(`${reset}${message}: complete\n`);
 }
-async function downloadAndUnzipVSCode(quality) {
+async function downloadAndUnzipVSCode(quality, vscodeTestDir) {
     const info = await getLatestVersion(quality);
     const folderName = `vscode-web-${quality}-${info.version}`;
     const downloadedPath = path.resolve(vscodeTestDir, folderName);
@@ -77,7 +75,7 @@ async function downloadAndUnzipVSCode(quality) {
     }
     await fs_1.promises.mkdir(vscodeTestDir, { recursive: true });
     const productName = `VS Code ${quality === 'stable' ? 'Stable' : 'Insiders'}`;
-    const tmpArchiveName = `vscode-web-${quality}-${info.version}-tmp`;
+    const tmpArchiveName = path.join(vscodeTestDir, `vscode-web-${quality}-${info.version}-tmp`);
     try {
         await download(info.url, tmpArchiveName, `Downloading ${productName}`);
         await unzip(tmpArchiveName, downloadedPath, `Unpacking ${productName}`);

package/out/server/extensions.js

@@ -3,7 +3,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getScannedBuiltinExtensions = exports.prebuiltExtensionsLocation = exports.scanForExtensions = void 0;
 const fs_1 = require("fs");
@@ -48,7 +47,7 @@ exports.scanForExtensions = scanForExtensions;
 exports.prebuiltExtensionsLocation = '.build/builtInExtensions';
 async function getScannedBuiltinExtensions(vsCodeDevLocation) {
     // use the build utility as to not duplicate the code
-    const extensionsUtil = await (_a = path.join(vsCodeDevLocation, 'build', 'lib', 'extensions.js'), Promise.resolve().then(() => require(_a)));
+    const extensionsUtil = await Promise.resolve(`${path.join(vsCodeDevLocation, 'build', 'lib', 'extensions.js')}`).then(s => require(s));
     const localExtensions = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, 'extensions'));
     const prebuiltExtensions = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, exports.prebuiltExtensionsLocation));
     for (const ext of localExtensions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "scripts": {
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
@@ -30,7 +30,7 @@
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "minimist": "^1.2.8",
-    "playwright": "^1.32.0",
+    "playwright": "^1.32.2",
     "vscode-uri": "^3.0.7",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.1",
@@ -39,19 +39,19 @@
     "get-stream": "6.0.1"
   },
   "devDependencies": {
-    "@types/koa": "^2.13.5",
+    "@types/koa": "^2.13.6",
     "@types/koa-morgan": "^1.0.5",
     "@types/koa-mount": "^4.0.2",
     "@types/koa-static": "^4.0.2",
     "@types/koa__router": "^12.0.0",
     "@types/minimist": "^1.2.2",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "@types/decompress": "^4.2.4",
-    "eslint": "^8.36.0",
+    "eslint": "^8.37.0",
     "eslint-plugin-header": "^3.1.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.3"
   },
   "license": "MIT",
   "author": "Visual Studio Code Team",