@vscode/test-web 0.0.14 → 0.0.18

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.0.18
+ * new option `--browserType none` to start the server without opening a browser.
+
+## 0.0.17
+ * new options `--host` and `--port`: If provided runs the server from the given host and port.
+ * new option `--verbose` to print out the browser console log.
+
+## 0.0.16
+ * new option `--sourcesPath`: If provided, runs the server from VS Code sources at the given location.
+ * option `--version` is deprecated and replaced with `quality`. Supported values: `stable`, `insiders`. Instead of `sources` use `--insiders`
+
 ## 0.0.14
  * new option `--extensionPath` : A path pointing to a folder containing additional extensions to include. Argument can be provided multiple times.
  * new option `--permission`: Permission granted to the opened browser: e.g. clipboard-read, clipboard-write. See full list of options [here](https://playwright.dev/docs/1.14/emulation#permissions). Argument can be provided multiple times.

package/README.md

@@ -1,15 +1,17 @@
 # @vscode/test-web
 
-This module helps testing [VS Code web extensions](https://code.visualstudio.com/api/extension-guides/web-extensions) locally.
+This module helps testing VS Code web extensions locally.
 
 [![Test Status Badge](https://github.com/microsoft/vscode-test-web/workflows/Tests/badge.svg)](https://github.com/microsoft/vscode-test-web/actions/workflows/tests.yml)
 [![npm Package](https://img.shields.io/npm/v/@vscode/test-web.svg?style=flat-square)](https://www.npmjs.org/package/@vscode/test-web)
 [![NPM Downloads](https://img.shields.io/npm/dm/@vscode/test-web.svg)](https://npmjs.org/package/@vscode/test-web)
 
 
-The node module runs a local web server that serves VS Code for the browser including the extensions located at the given local path. Additionally the extension tests are automatically run.
+See the [web extensions guide](https://code.visualstudio.com/api/extension-guides/web-extensions) to learn about web extensions.
 
-The node module providers a command line as well as an API.
+The node module runs a local web server that serves VS Code in the browser including the extension under development. Additionally the extension tests are automatically run.
+
+The node module provides a command line as well as an API.
 
 ## Usage
 
@@ -39,19 +41,23 @@ Via API:
 
 ```ts
 async function go() {
-	try {
-		// The folder containing the Extension Manifest package.json
-		const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
-
-		// The path to module with the test runner and tests
-		const extensionTestsPath = path.resolve(__dirname, './suite/index');
-
-		// Start a web server that serves VSCode in a browser, run the tests
-		await runTests({ browserType: 'chromium', extensionDevelopmentPath, extensionTestsPath });
-	} catch (err) {
-		console.error('Failed to run tests');
-		process.exit(1);
-	}
+  try {
+    // The folder containing the Extension Manifest package.json
+    const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
+
+    // The path to module with the test runner and tests
+    const extensionTestsPath = path.resolve(__dirname, './suite/index');
+
+    // Start a web server that serves VSCode in a browser, run the tests
+    await runTests({
+		browserType: 'chromium',
+		extensionDevelopmentPath
+		extensionTestsPath
+	});
+  } catch (err) {
+    console.error('Failed to run tests');
+    process.exit(1);
+  }
 }
 
 go()
@@ -59,18 +65,22 @@ go()
 
 CLI options:
 
- |Option|Argument Description||
- |-----|-----|----|
- | --browserType | The browser to launch: `chromium` (default), `firefox` or `webkit` |
+|Option|Argument Description|
+|-----|-----|
+| --browserType | The browser to launch: `chromium` (default), `firefox`, `webkit` or `none` |
 | --extensionDevelopmentPath | A path pointing to an extension under development to include. |
-| --extensionTestsPath |  A path to a test module to run. |
-| --version | `insiders` (default),  `stable` or  `sources`.<br>For sources, also run `yarn web` in a vscode repo   |
-| --open-devtools|  If set, opens the dev tools  |
-| --headless|  If set, hides the browser. Defaults to true when an extensionTestsPath is provided, otherwise false. |
-| --hideServerLog| If set, hides the server log. Defaults to true when an extensionTestsPath is provided, otherwise false. |
-| --permission|  Permission granted to the opened browser: e.g. `clipboard-read`, `clipboard-write`.  See [full list of options](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions). Argument can be provided multiple times.  |
+| --extensionTestsPath | A path to a test module to run. |
+| --quality | `insiders` (default),  or `stable`. Ignored when sourcesPath is provided. |
+| --sourcesPath | If set, runs the server from VS Code sources located at the given path. Make sure the sources and extensions are compiled (`yarn compile` and `yarn compile-web`) |
+| --headless | If set, hides the browser. Defaults to true when an extensionTestsPath is provided, otherwise false. |
+| --permission | Permission granted to the opened browser: e.g. `clipboard-read`, `clipboard-write`.  See [full list of options](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions). Argument can be provided multiple times.  |
 | --folder-uri | URI of the workspace to open VS Code on. Ignored when `folderPath` is provided |
 | --extensionPath | A path pointing to a folder containing additional extensions to include. Argument can be provided multiple times. |
+| --host | The host name the server is opened on. Defaults to `localhost` |
+| --port | The port the server is opened on. Defaults to `3000` |
+| --open-devtools | If set, opens the dev tools in the browser |
+| --verbose | If set, prints out more information when running the server |
+| --hideServerLog | If set, hides the server log. Defaults to true when an extensionTestsPath is provided, otherwise false. |
 | 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/fs-provider/dist/fsExtensionMain.js

@@ -2,13 +2,19 @@
 /******/ 	var __webpack_modules__ = ([
 /* 0 */,
 /* 1 */
+/***/ ((__unused_webpack_module, exports) => {
+
+(()=>{"use strict";var e={};(()=>{var r=e;Object.defineProperty(r,"__esModule",{value:!0}),r.getErrorStatusDescription=r.xhr=r.configure=void 0,r.configure=(e,r)=>{},r.xhr=async e=>{const r=new Headers;if(e.headers)for(const t in e.headers){const s=e.headers[t];Array.isArray(s)?s.forEach((e=>r.set(t,e))):r.set(t,s)}e.user&&e.password&&r.set("Authorization","Basic "+btoa(e.user+":"+e.password));const t={method:e.type,redirect:e.followRedirects>0?"follow":"manual",mode:"cors",headers:r};e.data&&(t.body=e.data);const s=new Request(e.url,t),o=await fetch(s),a={};o.headers.forEach(((e,r)=>{a[r]=e}));const n=await o.arrayBuffer();return new class{constructor(){this.status=o.status,this.headers=a}get responseText(){return(new TextDecoder).decode(n)}get body(){return new Uint8Array(n)}}},r.getErrorStatusDescription=function(e){return String(e)}})();var r=exports;for(var t in e)r[t]=e[t];e.__esModule&&Object.defineProperty(r,"__esModule",{value:!0})})();
+
+/***/ }),
+/* 2 */
 /***/ ((module) => {
 
 "use strict";
 module.exports = require("vscode");
 
 /***/ }),
-/* 2 */
+/* 3 */
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -18,92 +24,32 @@ module.exports = require("vscode");
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.MountsFileSystemProvider = exports.SCHEME = void 0;
-const vscode_1 = __webpack_require__(1);
-const vscode_uri_1 = __webpack_require__(3);
-const request_light_1 = __webpack_require__(5);
-exports.SCHEME = 'vscode-test-web';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isEntry(e) {
-    return e && (e.type === vscode_1.FileType.Directory || e.type === vscode_1.FileType.File) && typeof e.name === 'string' && e.name.length > 0;
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isStat(e) {
-    return e && (e.type === vscode_1.FileType.Directory || e.type === vscode_1.FileType.File) && typeof e.ctime === 'number' && typeof e.mtime === 'number' && typeof e.size === 'number';
-}
+exports.MemFileSystemProvider = void 0;
+const vscode_1 = __webpack_require__(2);
+const vscode_uri_1 = __webpack_require__(4);
 function newFileStat(type, size) {
-    return { type, ctime: Date.now(), mtime: Date.now(), size };
+    return Promise.resolve({ type, ctime: Date.now(), mtime: Date.now(), size });
 }
 function modifiedFileStat(stats, size) {
-    return { type: stats.type, ctime: stats.ctime, mtime: Date.now(), size: size !== null && size !== void 0 ? size : stats.size };
+    return Promise.resolve({ type: stats.type, ctime: stats.ctime, mtime: Date.now(), size: size !== null && size !== void 0 ? size : stats.size });
 }
-async function getStats(entry) {
-    let stats = entry.stats;
-    if (stats === undefined) {
-        if (entry.serverUri) {
-            const url = entry.serverUri.with({ query: 'stat' }).toString();
-            const response = await (0, request_light_1.xhr)({ url });
-            if (response.status === 200) {
-                try {
-                    const res = JSON.parse(response.responseText);
-                    if (isStat(res)) {
-                        stats = res;
-                    }
-                }
-                catch {
-                    // ignore
-                }
-            }
-        }
-        if (!stats) {
-            stats = newFileStat(entry.type, 0);
-        }
-        entry.stats = stats;
-    }
-    return stats;
-}
-async function getEntries(entry) {
-    if (entry.entries === undefined) {
-        entry.entries = new Map();
-        if (entry.serverUri) {
-            const url = entry.serverUri.with({ query: 'readdir' }).toString();
-            const response = await (0, request_light_1.xhr)({ url });
-            if (response.status === 200) {
-                try {
-                    const res = JSON.parse(response.responseText);
-                    if (Array.isArray(res)) {
-                        for (const r of res) {
-                            if (isEntry(r)) {
-                                const newEntry = { type: r.type, name: r.name, serverUri: vscode_uri_1.Utils.joinPath(entry.serverUri, r.name) };
-                                entry.entries.set(newEntry.name, newEntry);
-                            }
-                        }
-                    }
-                }
-                catch {
-                    // ignore
-                }
-            }
-        }
-    }
-    return entry.entries;
-}
-class MountsFileSystemProvider {
-    constructor(serverUri) {
+class MemFileSystemProvider {
+    constructor(scheme, root) {
+        this.scheme = scheme;
+        this.root = root;
         // --- manage file events
         this._onDidChangeFile = new vscode_1.EventEmitter();
         this.onDidChangeFile = this._onDidChangeFile.event;
         this._bufferedChanges = [];
-        this.root = { type: vscode_1.FileType.Directory, name: '', serverUri };
     }
     // --- manage file metadata
     async stat(resource) {
         const entry = await this._lookup(resource, false);
-        return getStats(entry);
+        return entry.stats;
     }
     async readDirectory(resource) {
         const entry = await this._lookupAsDirectory(resource, false);
-        const entries = await getEntries(entry);
+        const entries = await entry.entries;
         const result = [];
         entries.forEach((child, name) => result.push([name, child.type]));
         return result;
@@ -111,26 +57,12 @@ class MountsFileSystemProvider {
     // --- manage file contents
     async readFile(resource) {
         const entry = await this._lookupAsFile(resource, false);
-        let content = entry.content;
-        if (content) {
-            return content;
-        }
-        const serverUri = entry.serverUri;
-        if (serverUri) {
-            const response = await (0, request_light_1.xhr)({ url: serverUri.toString() });
-            if (response.status >= 200 && response.status <= 204) {
-                content = entry.content = response.body;
-            }
-        }
-        if (!content) {
-            throw vscode_1.FileSystemError.FileNotFound(resource);
-        }
-        return content;
+        return entry.content;
     }
     async writeFile(uri, content, opts) {
         const basename = vscode_uri_1.Utils.basename(uri);
         const parent = await this._lookupParentDirectory(uri);
-        const entries = await getEntries(parent);
+        const entries = await parent.entries;
         let entry = entries.get(basename);
         if (entry && entry.type === vscode_1.FileType.Directory) {
             throw vscode_1.FileSystemError.FileIsADirectory(uri);
@@ -143,13 +75,13 @@ class MountsFileSystemProvider {
         }
         const stats = newFileStat(vscode_1.FileType.File, content.byteLength);
         if (!entry) {
-            entry = { type: vscode_1.FileType.File, name: basename, stats, content };
+            entry = { type: vscode_1.FileType.File, name: basename, stats, content: Promise.resolve(content) };
             entries.set(basename, entry);
             this._fireSoon({ type: vscode_1.FileChangeType.Created, uri });
         }
         else {
             entry.stats = stats;
-            entry.content = content;
+            entry.content = Promise.resolve(content);
         }
         this._fireSoon({ type: vscode_1.FileChangeType.Changed, uri });
     }
@@ -162,24 +94,18 @@ class MountsFileSystemProvider {
         const oldParent = await this._lookupParentDirectory(from);
         const newParent = await this._lookupParentDirectory(to);
         const newName = vscode_uri_1.Utils.basename(to);
-        const oldParentEntries = await getEntries(oldParent);
+        const oldParentEntries = await oldParent.entries;
         oldParentEntries.delete(entry.name);
-        let newEntry;
-        if (entry.type === vscode_1.FileType.File) {
-            newEntry = { type: vscode_1.FileType.File, name: newName, stats: entry.stats, serverUri: entry.serverUri, content: entry.content };
-        }
-        else {
-            newEntry = { type: vscode_1.FileType.Directory, name: newName, stats: entry.stats, serverUri: entry.serverUri, entries: entry.entries };
-        }
-        const newParentEntries = await getEntries(newParent);
-        newParentEntries.set(newName, newEntry);
+        entry.name = newName;
+        const newParentEntries = await newParent.entries;
+        newParentEntries.set(newName, entry);
         this._fireSoon({ type: vscode_1.FileChangeType.Deleted, uri: from }, { type: vscode_1.FileChangeType.Created, uri: to });
     }
     async delete(uri, opts) {
         const dirname = vscode_uri_1.Utils.dirname(uri);
         const basename = vscode_uri_1.Utils.basename(uri);
         const parent = await this._lookupAsDirectory(dirname, false);
-        const parentEntries = await getEntries(parent);
+        const parentEntries = await parent.entries;
         if (parentEntries.has(basename)) {
             parentEntries.delete(basename);
             parent.stats = newFileStat(parent.type, -1);
@@ -190,15 +116,15 @@ class MountsFileSystemProvider {
         const basename = vscode_uri_1.Utils.basename(uri);
         const dirname = vscode_uri_1.Utils.dirname(uri);
         const parent = await this._lookupAsDirectory(dirname, false);
-        const parentEntries = await getEntries(parent);
-        const entry = { type: vscode_1.FileType.Directory, name: basename, stats: newFileStat(vscode_1.FileType.Directory, 0) };
+        const parentEntries = await parent.entries;
+        const entry = { type: vscode_1.FileType.Directory, name: basename, stats: newFileStat(vscode_1.FileType.Directory, 0), entries: Promise.resolve(new Map()) };
         parentEntries.set(entry.name, entry);
-        const stats = await getStats(parent);
+        const stats = await parent.stats;
         parent.stats = modifiedFileStat(stats, stats.size + 1);
         this._fireSoon({ type: vscode_1.FileChangeType.Changed, uri: dirname }, { type: vscode_1.FileChangeType.Created, uri });
     }
     async _lookup(uri, silent) {
-        if (uri.scheme !== exports.SCHEME) {
+        if (uri.scheme !== this.scheme) {
             if (!silent) {
                 throw vscode_1.FileSystemError.FileNotFound(uri);
             }
@@ -214,7 +140,7 @@ class MountsFileSystemProvider {
             }
             let child;
             if (entry.type === vscode_1.FileType.Directory) {
-                child = (await getEntries(entry)).get(part);
+                child = (await entry.entries).get(part);
             }
             if (!child) {
                 if (!silent) {
@@ -267,11 +193,11 @@ class MountsFileSystemProvider {
         this._onDidChangeFile.dispose();
     }
 }
-exports.MountsFileSystemProvider = MountsFileSystemProvider;
+exports.MemFileSystemProvider = MemFileSystemProvider;
 
 
 /***/ }),
-/* 3 */
+/* 4 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -280,12 +206,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "URI": () => (/* binding */ URI),
 /* harmony export */   "Utils": () => (/* binding */ Utils)
 /* harmony export */ });
-/* provided dependency */ var process = __webpack_require__(4);
+/* provided dependency */ var process = __webpack_require__(5);
 var LIB;LIB=(()=>{"use strict";var t={470:t=>{function e(t){if("string"!=typeof t)throw new TypeError("Path must be a string. Received "+JSON.stringify(t))}function r(t,e){for(var r,n="",o=0,i=-1,a=0,h=0;h<=t.length;++h){if(h<t.length)r=t.charCodeAt(h);else{if(47===r)break;r=47}if(47===r){if(i===h-1||1===a);else if(i!==h-1&&2===a){if(n.length<2||2!==o||46!==n.charCodeAt(n.length-1)||46!==n.charCodeAt(n.length-2))if(n.length>2){var s=n.lastIndexOf("/");if(s!==n.length-1){-1===s?(n="",o=0):o=(n=n.slice(0,s)).length-1-n.lastIndexOf("/"),i=h,a=0;continue}}else if(2===n.length||1===n.length){n="",o=0,i=h,a=0;continue}e&&(n.length>0?n+="/..":n="..",o=2)}else n.length>0?n+="/"+t.slice(i+1,h):n=t.slice(i+1,h),o=h-i-1;i=h,a=0}else 46===r&&-1!==a?++a:a=-1}return n}var n={resolve:function(){for(var t,n="",o=!1,i=arguments.length-1;i>=-1&&!o;i--){var a;i>=0?a=arguments[i]:(void 0===t&&(t=process.cwd()),a=t),e(a),0!==a.length&&(n=a+"/"+n,o=47===a.charCodeAt(0))}return n=r(n,!o),o?n.length>0?"/"+n:"/":n.length>0?n:"."},normalize:function(t){if(e(t),0===t.length)return".";var n=47===t.charCodeAt(0),o=47===t.charCodeAt(t.length-1);return 0!==(t=r(t,!n)).length||n||(t="."),t.length>0&&o&&(t+="/"),n?"/"+t:t},isAbsolute:function(t){return e(t),t.length>0&&47===t.charCodeAt(0)},join:function(){if(0===arguments.length)return".";for(var t,r=0;r<arguments.length;++r){var o=arguments[r];e(o),o.length>0&&(void 0===t?t=o:t+="/"+o)}return void 0===t?".":n.normalize(t)},relative:function(t,r){if(e(t),e(r),t===r)return"";if((t=n.resolve(t))===(r=n.resolve(r)))return"";for(var o=1;o<t.length&&47===t.charCodeAt(o);++o);for(var i=t.length,a=i-o,h=1;h<r.length&&47===r.charCodeAt(h);++h);for(var s=r.length-h,f=a<s?a:s,u=-1,c=0;c<=f;++c){if(c===f){if(s>f){if(47===r.charCodeAt(h+c))return r.slice(h+c+1);if(0===c)return r.slice(h+c)}else a>f&&(47===t.charCodeAt(o+c)?u=c:0===c&&(u=0));break}var l=t.charCodeAt(o+c);if(l!==r.charCodeAt(h+c))break;47===l&&(u=c)}var p="";for(c=o+u+1;c<=i;++c)c!==i&&47!==t.charCodeAt(c)||(0===p.length?p+="..":p+="/..");return p.length>0?p+r.slice(h+u):(h+=u,47===r.charCodeAt(h)&&++h,r.slice(h))},_makeLong:function(t){return t},dirname:function(t){if(e(t),0===t.length)return".";for(var r=t.charCodeAt(0),n=47===r,o=-1,i=!0,a=t.length-1;a>=1;--a)if(47===(r=t.charCodeAt(a))){if(!i){o=a;break}}else i=!1;return-1===o?n?"/":".":n&&1===o?"//":t.slice(0,o)},basename:function(t,r){if(void 0!==r&&"string"!=typeof r)throw new TypeError('"ext" argument must be a string');e(t);var n,o=0,i=-1,a=!0;if(void 0!==r&&r.length>0&&r.length<=t.length){if(r.length===t.length&&r===t)return"";var h=r.length-1,s=-1;for(n=t.length-1;n>=0;--n){var f=t.charCodeAt(n);if(47===f){if(!a){o=n+1;break}}else-1===s&&(a=!1,s=n+1),h>=0&&(f===r.charCodeAt(h)?-1==--h&&(i=n):(h=-1,i=s))}return o===i?i=s:-1===i&&(i=t.length),t.slice(o,i)}for(n=t.length-1;n>=0;--n)if(47===t.charCodeAt(n)){if(!a){o=n+1;break}}else-1===i&&(a=!1,i=n+1);return-1===i?"":t.slice(o,i)},extname:function(t){e(t);for(var r=-1,n=0,o=-1,i=!0,a=0,h=t.length-1;h>=0;--h){var s=t.charCodeAt(h);if(47!==s)-1===o&&(i=!1,o=h+1),46===s?-1===r?r=h:1!==a&&(a=1):-1!==r&&(a=-1);else if(!i){n=h+1;break}}return-1===r||-1===o||0===a||1===a&&r===o-1&&r===n+1?"":t.slice(r,o)},format:function(t){if(null===t||"object"!=typeof t)throw new TypeError('The "pathObject" argument must be of type Object. Received type '+typeof t);return function(t,e){var r=e.dir||e.root,n=e.base||(e.name||"")+(e.ext||"");return r?r===e.root?r+n:r+"/"+n:n}(0,t)},parse:function(t){e(t);var r={root:"",dir:"",base:"",ext:"",name:""};if(0===t.length)return r;var n,o=t.charCodeAt(0),i=47===o;i?(r.root="/",n=1):n=0;for(var a=-1,h=0,s=-1,f=!0,u=t.length-1,c=0;u>=n;--u)if(47!==(o=t.charCodeAt(u)))-1===s&&(f=!1,s=u+1),46===o?-1===a?a=u:1!==c&&(c=1):-1!==a&&(c=-1);else if(!f){h=u+1;break}return-1===a||-1===s||0===c||1===c&&a===s-1&&a===h+1?-1!==s&&(r.base=r.name=0===h&&i?t.slice(1,s):t.slice(h,s)):(0===h&&i?(r.name=t.slice(1,a),r.base=t.slice(1,s)):(r.name=t.slice(h,a),r.base=t.slice(h,s)),r.ext=t.slice(a,s)),h>0?r.dir=t.slice(0,h-1):i&&(r.dir="/"),r},sep:"/",delimiter:":",win32:null,posix:null};n.posix=n,t.exports=n},447:(t,e,r)=>{var n;if(r.r(e),r.d(e,{URI:()=>g,Utils:()=>O}),"object"==typeof process)n="win32"===process.platform;else if("object"==typeof navigator){var o=navigator.userAgent;n=o.indexOf("Windows")>=0}var i,a,h=(i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r])})(t,e)},function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}),s=/^\w[\w\d+.-]*$/,f=/^\//,u=/^\/\//,c="",l="/",p=/^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/,g=function(){function t(t,e,r,n,o,i){void 0===i&&(i=!1),"object"==typeof t?(this.scheme=t.scheme||c,this.authority=t.authority||c,this.path=t.path||c,this.query=t.query||c,this.fragment=t.fragment||c):(this.scheme=function(t,e){return t||e?t:"file"}(t,i),this.authority=e||c,this.path=function(t,e){switch(t){case"https":case"http":case"file":e?e[0]!==l&&(e=l+e):e=l}return e}(this.scheme,r||c),this.query=n||c,this.fragment=o||c,function(t,e){if(!t.scheme&&e)throw new Error('[UriError]: Scheme is missing: {scheme: "", authority: "'+t.authority+'", path: "'+t.path+'", query: "'+t.query+'", fragment: "'+t.fragment+'"}');if(t.scheme&&!s.test(t.scheme))throw new Error("[UriError]: Scheme contains illegal characters.");if(t.path)if(t.authority){if(!f.test(t.path))throw new Error('[UriError]: If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character')}else if(u.test(t.path))throw new Error('[UriError]: If a URI does not contain an authority component, then the path cannot begin with two slash characters ("//")')}(this,i))}return t.isUri=function(e){return e instanceof t||!!e&&"string"==typeof e.authority&&"string"==typeof e.fragment&&"string"==typeof e.path&&"string"==typeof e.query&&"string"==typeof e.scheme&&"function"==typeof e.fsPath&&"function"==typeof e.with&&"function"==typeof e.toString},Object.defineProperty(t.prototype,"fsPath",{get:function(){return C(this,!1)},enumerable:!1,configurable:!0}),t.prototype.with=function(t){if(!t)return this;var e=t.scheme,r=t.authority,n=t.path,o=t.query,i=t.fragment;return void 0===e?e=this.scheme:null===e&&(e=c),void 0===r?r=this.authority:null===r&&(r=c),void 0===n?n=this.path:null===n&&(n=c),void 0===o?o=this.query:null===o&&(o=c),void 0===i?i=this.fragment:null===i&&(i=c),e===this.scheme&&r===this.authority&&n===this.path&&o===this.query&&i===this.fragment?this:new v(e,r,n,o,i)},t.parse=function(t,e){void 0===e&&(e=!1);var r=p.exec(t);return r?new v(r[2]||c,x(r[4]||c),x(r[5]||c),x(r[7]||c),x(r[9]||c),e):new v(c,c,c,c,c)},t.file=function(t){var e=c;if(n&&(t=t.replace(/\\/g,l)),t[0]===l&&t[1]===l){var r=t.indexOf(l,2);-1===r?(e=t.substring(2),t=l):(e=t.substring(2,r),t=t.substring(r)||l)}return new v("file",e,t,c,c)},t.from=function(t){return new v(t.scheme,t.authority,t.path,t.query,t.fragment)},t.prototype.toString=function(t){return void 0===t&&(t=!1),A(this,t)},t.prototype.toJSON=function(){return this},t.revive=function(e){if(e){if(e instanceof t)return e;var r=new v(e);return r._formatted=e.external,r._fsPath=e._sep===d?e.fsPath:null,r}return e},t}(),d=n?1:void 0,v=function(t){function e(){var e=null!==t&&t.apply(this,arguments)||this;return e._formatted=null,e._fsPath=null,e}return h(e,t),Object.defineProperty(e.prototype,"fsPath",{get:function(){return this._fsPath||(this._fsPath=C(this,!1)),this._fsPath},enumerable:!1,configurable:!0}),e.prototype.toString=function(t){return void 0===t&&(t=!1),t?A(this,!0):(this._formatted||(this._formatted=A(this,!1)),this._formatted)},e.prototype.toJSON=function(){var t={$mid:1};return this._fsPath&&(t.fsPath=this._fsPath,t._sep=d),this._formatted&&(t.external=this._formatted),this.path&&(t.path=this.path),this.scheme&&(t.scheme=this.scheme),this.authority&&(t.authority=this.authority),this.query&&(t.query=this.query),this.fragment&&(t.fragment=this.fragment),t},e}(g),m=((a={})[58]="%3A",a[47]="%2F",a[63]="%3F",a[35]="%23",a[91]="%5B",a[93]="%5D",a[64]="%40",a[33]="%21",a[36]="%24",a[38]="%26",a[39]="%27",a[40]="%28",a[41]="%29",a[42]="%2A",a[43]="%2B",a[44]="%2C",a[59]="%3B",a[61]="%3D",a[32]="%20",a);function y(t,e){for(var r=void 0,n=-1,o=0;o<t.length;o++){var i=t.charCodeAt(o);if(i>=97&&i<=122||i>=65&&i<=90||i>=48&&i<=57||45===i||46===i||95===i||126===i||e&&47===i)-1!==n&&(r+=encodeURIComponent(t.substring(n,o)),n=-1),void 0!==r&&(r+=t.charAt(o));else{void 0===r&&(r=t.substr(0,o));var a=m[i];void 0!==a?(-1!==n&&(r+=encodeURIComponent(t.substring(n,o)),n=-1),r+=a):-1===n&&(n=o)}}return-1!==n&&(r+=encodeURIComponent(t.substring(n))),void 0!==r?r:t}function b(t){for(var e=void 0,r=0;r<t.length;r++){var n=t.charCodeAt(r);35===n||63===n?(void 0===e&&(e=t.substr(0,r)),e+=m[n]):void 0!==e&&(e+=t[r])}return void 0!==e?e:t}function C(t,e){var r;return r=t.authority&&t.path.length>1&&"file"===t.scheme?"//"+t.authority+t.path:47===t.path.charCodeAt(0)&&(t.path.charCodeAt(1)>=65&&t.path.charCodeAt(1)<=90||t.path.charCodeAt(1)>=97&&t.path.charCodeAt(1)<=122)&&58===t.path.charCodeAt(2)?e?t.path.substr(1):t.path[1].toLowerCase()+t.path.substr(2):t.path,n&&(r=r.replace(/\//g,"\\")),r}function A(t,e){var r=e?b:y,n="",o=t.scheme,i=t.authority,a=t.path,h=t.query,s=t.fragment;if(o&&(n+=o,n+=":"),(i||"file"===o)&&(n+=l,n+=l),i){var f=i.indexOf("@");if(-1!==f){var u=i.substr(0,f);i=i.substr(f+1),-1===(f=u.indexOf(":"))?n+=r(u,!1):(n+=r(u.substr(0,f),!1),n+=":",n+=r(u.substr(f+1),!1)),n+="@"}-1===(f=(i=i.toLowerCase()).indexOf(":"))?n+=r(i,!1):(n+=r(i.substr(0,f),!1),n+=i.substr(f))}if(a){if(a.length>=3&&47===a.charCodeAt(0)&&58===a.charCodeAt(2))(c=a.charCodeAt(1))>=65&&c<=90&&(a="/"+String.fromCharCode(c+32)+":"+a.substr(3));else if(a.length>=2&&58===a.charCodeAt(1)){var c;(c=a.charCodeAt(0))>=65&&c<=90&&(a=String.fromCharCode(c+32)+":"+a.substr(2))}n+=r(a,!0)}return h&&(n+="?",n+=r(h,!1)),s&&(n+="#",n+=e?s:y(s,!1)),n}function w(t){try{return decodeURIComponent(t)}catch(e){return t.length>3?t.substr(0,3)+w(t.substr(3)):t}}var _=/(%[0-9A-Za-z][0-9A-Za-z])+/g;function x(t){return t.match(_)?t.replace(_,(function(t){return w(t)})):t}var O,P=r(470),j=function(){for(var t=0,e=0,r=arguments.length;e<r;e++)t+=arguments[e].length;var n=Array(t),o=0;for(e=0;e<r;e++)for(var i=arguments[e],a=0,h=i.length;a<h;a++,o++)n[o]=i[a];return n},U=P.posix||P;!function(t){t.joinPath=function(t){for(var e=[],r=1;r<arguments.length;r++)e[r-1]=arguments[r];return t.with({path:U.join.apply(U,j([t.path],e))})},t.resolvePath=function(t){for(var e=[],r=1;r<arguments.length;r++)e[r-1]=arguments[r];var n=t.path||"/";return t.with({path:U.resolve.apply(U,j([n],e))})},t.dirname=function(t){var e=U.dirname(t.path);return 1===e.length&&46===e.charCodeAt(0)?t:t.with({path:e})},t.basename=function(t){return U.basename(t.path)},t.extname=function(t){return U.extname(t.path)}}(O||(O={}))}},e={};function r(n){if(e[n])return e[n].exports;var o=e[n]={exports:{}};return t[n](o,o.exports,r),o.exports}return r.d=(t,e)=>{for(var n in e)r.o(e,n)&&!r.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},r.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r(447)})();const{URI,Utils}=LIB;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
-/* 4 */
+/* 5 */
 /***/ ((module) => {
 
 // shim for using process in browser
@@ -474,12 +400,6 @@ process.chdir = function (dir) {
 process.umask = function() { return 0; };
 
 
-/***/ }),
-/* 5 */
-/***/ ((__unused_webpack_module, exports) => {
-
-(()=>{"use strict";var e={};(()=>{var r=e;Object.defineProperty(r,"__esModule",{value:!0}),r.getErrorStatusDescription=r.xhr=r.configure=void 0,r.configure=(e,r)=>{},r.xhr=async e=>{const r=new Headers;if(e.headers)for(const t in e.headers){const s=e.headers[t];Array.isArray(s)?s.forEach((e=>r.set(t,e))):r.set(t,s)}e.user&&e.password&&r.set("Authorization","Basic "+btoa(e.user+":"+e.password));const t={method:e.type,redirect:e.followRedirects>0?"follow":"manual",mode:"cors",headers:r};e.data&&(t.body=e.data);const s=new Request(e.url,t),o=await fetch(s),a={};o.headers.forEach(((e,r)=>{a[r]=e}));const n=await o.arrayBuffer();return new class{constructor(){this.status=o.status,this.headers=a}get responseText(){return(new TextDecoder).decode(n)}get body(){return new Uint8Array(n)}}},r.getErrorStatusDescription=function(e){return String(e)}})();var r=exports;for(var t in e)r[t]=e[t];e.__esModule&&Object.defineProperty(r,"__esModule",{value:!0})})();
-
 /***/ })
 /******/ 	]);
 /************************************************************************/
@@ -549,15 +469,123 @@ var exports = __webpack_exports__;
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.activate = void 0;
-const vscode = __webpack_require__(1);
-const fsProvider_1 = __webpack_require__(2);
+const request_light_1 = __webpack_require__(1);
+const vscode_1 = __webpack_require__(2);
+const fsProvider_1 = __webpack_require__(3);
+const SCHEME = 'vscode-test-web';
 function activate(context) {
     const serverUri = context.extensionUri.with({ path: '/static/mount', query: undefined });
-    const disposable = vscode.workspace.registerFileSystemProvider(fsProvider_1.SCHEME, new fsProvider_1.MountsFileSystemProvider(serverUri));
+    const serverBackedRootDirectory = new ServerBackedDirectory(serverUri, '');
+    const disposable = vscode_1.workspace.registerFileSystemProvider(SCHEME, new fsProvider_1.MemFileSystemProvider(SCHEME, serverBackedRootDirectory));
     context.subscriptions.push(disposable);
-    console.log(`vscode-test-web-support fs provider registers for ${fsProvider_1.SCHEME}, initial content from ${serverUri.toString()}`);
+    console.log(`vscode-test-web-support fs provider registers for ${SCHEME}, initial content from ${serverUri.toString()}`);
 }
 exports.activate = activate;
+class ServerBackedFile {
+    constructor(_serverUri, name) {
+        this._serverUri = _serverUri;
+        this.name = name;
+        this.type = vscode_1.FileType.File;
+    }
+    get stats() {
+        if (this._stats === undefined) {
+            this._stats = getStats(this._serverUri);
+        }
+        return this._stats;
+    }
+    set stats(stats) {
+        this._stats = stats;
+    }
+    get content() {
+        if (this._content === undefined) {
+            this._content = getContent(this._serverUri);
+        }
+        return this._content;
+    }
+    set content(content) {
+        this._content = content;
+    }
+}
+class ServerBackedDirectory {
+    constructor(_serverUri, name) {
+        this._serverUri = _serverUri;
+        this.name = name;
+        this.type = vscode_1.FileType.Directory;
+    }
+    get stats() {
+        if (this._stats === undefined) {
+            this._stats = getStats(this._serverUri);
+        }
+        return this._stats;
+    }
+    set stats(stats) {
+        this._stats = stats;
+    }
+    get entries() {
+        if (this._entries === undefined) {
+            this._entries = getEntries(this._serverUri);
+        }
+        return this._entries;
+    }
+    set entries(entries) {
+        this._entries = entries;
+    }
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isEntry(e) {
+    return e && (e.type === vscode_1.FileType.Directory || e.type === vscode_1.FileType.File) && typeof e.name === 'string' && e.name.length > 0;
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isStat(e) {
+    return e && (e.type === vscode_1.FileType.Directory || e.type === vscode_1.FileType.File) && typeof e.ctime === 'number' && typeof e.mtime === 'number' && typeof e.size === 'number';
+}
+async function getEntries(serverUri) {
+    const url = serverUri.with({ query: 'readdir' }).toString();
+    const response = await (0, request_light_1.xhr)({ url });
+    if (response.status === 200 && response.status <= 204) {
+        try {
+            const res = JSON.parse(response.responseText);
+            if (Array.isArray(res)) {
+                const entries = new Map();
+                for (const r of res) {
+                    if (isEntry(r)) {
+                        const childPath = vscode_1.Uri.joinPath(serverUri, r.name);
+                        const newEntry = r.type === vscode_1.FileType.Directory ? new ServerBackedDirectory(childPath, r.name) : new ServerBackedFile(childPath, r.name);
+                        entries.set(newEntry.name, newEntry);
+                    }
+                }
+                return entries;
+            }
+        }
+        catch {
+            // ignore
+        }
+        console.log(`Invalid server response format for ${url.toString()}.`);
+    }
+    else {
+        console.log(`Invalid server response for ${url.toString()}. Status ${response.status}`);
+    }
+    return new Map();
+}
+async function getStats(serverUri) {
+    const url = serverUri.with({ query: 'stat' }).toString();
+    const response = await (0, request_light_1.xhr)({ url });
+    if (response.status === 200 && response.status <= 204) {
+        const res = JSON.parse(response.responseText);
+        if (isStat(res)) {
+            return res;
+        }
+        throw vscode_1.FileSystemError.FileNotFound(`Invalid server response for ${serverUri.toString()}.`);
+    }
+    throw vscode_1.FileSystemError.FileNotFound(`Invalid server response for ${serverUri.toString()}. Status ${response.status}.`);
+}
+async function getContent(serverUri) {
+    const response = await (0, request_light_1.xhr)({ url: serverUri.toString() });
+    if (response.status >= 200 && response.status <= 204) {
+        return response.body;
+    }
+    throw vscode_1.FileSystemError.FileNotFound(`Invalid server response for ${serverUri.toString()}. Status ${response.status}.`);
+}
 
 })();
 

package/fs-provider/package.json

@@ -24,10 +24,10 @@
 	},
 	"devDependencies": {
 		"@types/vscode": "^1.55.0",
-		"@types/webpack-env": "^1.16.0",
-		"ts-loader": "^9.2.3",
-		"webpack": "^5.40.0",
-		"webpack-cli": "^4.7.2",
+		"@types/webpack-env": "^1.16.2",
+		"ts-loader": "^9.2.6",
+		"webpack": "^5.55.0",
+		"webpack-cli": "^4.8.0",
 		"process": "^0.11.10",
 		"path-browserify": "^1.0.1",
 		"request-light": "^0.5.3",

package/out/index.d.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-export declare type BrowserType = 'chromium' | 'firefox' | 'webkit';
-export declare type VSCodeVersion = 'insiders' | 'stable' | 'sources';
+export declare type BrowserType = 'chromium' | 'firefox' | 'webkit' | 'none';
+export declare type VSCodeQuality = 'insiders' | 'stable';
 export interface Options {
     /**
-     * Browser to run the test against: 'chromium' | 'firefox' | 'webkit'
+     * Browser to open: 'chromium' | 'firefox' | 'webkit' | 'none'.
      */
     browserType: BrowserType;
     /**
@@ -25,20 +25,25 @@ export interface Options {
      */
     extensionTestsPath?: string;
     /**
-     * The VS Code version to use. Valid versions are:
-     * - `'stable'` : The latest stable build
-     * - `'insiders'` : The latest insiders build
-     * - `'sources'`: From sources, served at localhost:8080 by running `yarn web` in the vscode repo
+     * The quality of the VS Code to use. Supported qualities are:
+     * - `'stable'` : The latest stable build will be used
+     * - `'insiders'` : The latest insiders build will be used
      *
      * Currently defaults to `insiders`, which is latest stable insiders.
+     *
+     * The setting is ignored when a vsCodeDevPath is provided.
+     */
+    quality?: VSCodeQuality;
+    /**
+     * @deprecated. Use `quality` or `vsCodeDevPath` instead.
      */
-    version?: VSCodeVersion;
+    version?: string;
     /**
      * Open the dev tools.
      */
     devTools?: boolean;
     /**
-     * Do not show the browser. Defaults to `true` if a extensionTestsPath is provided, `false` otherwise.
+     * Do not show the browser. Defaults to `true` if a `extensionTestsPath` is provided, `false` otherwise.
      */
     headless?: boolean;
     /**
@@ -70,6 +75,22 @@ export interface Options {
      * Absolute paths pointing to built-in extensions to include.
      */
     extensionPaths?: string[];
+    /**
+     * Absolute path pointing to VS Code sources to use.
+     */
+    vsCodeDevPath?: string;
+    /**
+     * Print out more information while the server is running, e.g. the console output in the browser
+     */
+    verbose?: boolean;
+    /**
+     * The port to start the server on. Defaults to `3000`.
+     */
+    port?: number;
+    /**
+     * The host name to start the server on. Defaults to `localhost`
+     */
+    host?: string;
 }
 export interface Disposable {
     dispose(): void;

package/out/index.js

@@ -18,68 +18,83 @@ const path = require("path");
  * @param options The options defining browser type, extension and test location.
  */
 async function runTests(options) {
+    var _a, _b, _c;
     const config = {
         extensionDevelopmentPath: options.extensionDevelopmentPath,
         extensionTestsPath: options.extensionTestsPath,
-        build: await getBuild(options.version),
+        build: await getBuild(options),
         folderUri: options.folderUri,
         folderMountPath: options.folderPath,
-        hideServerLog: true,
+        hideServerLog: (_a = options.hideServerLog) !== null && _a !== void 0 ? _a : true,
         extensionPaths: options.extensionPaths
     };
-    const port = 3000;
-    const server = await (0, main_1.runServer)(port, config);
+    const host = (_b = options.host) !== null && _b !== void 0 ? _b : 'localhost';
+    const port = (_c = options.port) !== null && _c !== void 0 ? _c : 3000;
+    const server = await (0, main_1.runServer)(host, port, config);
     return new Promise(async (s, e) => {
-        const endpoint = `http://localhost:${port}`;
+        const endpoint = `http://${host}:${port}`;
         const context = await openBrowser(endpoint, options);
-        context.once('close', () => server.close());
-        await context.exposeFunction('codeAutomationLog', (type, args) => {
-            console[type](...args);
-        });
-        await context.exposeFunction('codeAutomationExit', async (code) => {
-            var _a;
-            try {
-                await ((_a = context.browser()) === null || _a === void 0 ? void 0 : _a.close());
-            }
-            catch (error) {
-                console.error(`Error when closing browser: ${error}`);
-            }
+        if (context) {
+            context.once('close', () => server.close());
+            await context.exposeFunction('codeAutomationLog', (type, args) => {
+                console[type](...args);
+            });
+            await context.exposeFunction('codeAutomationExit', async (code) => {
+                var _a;
+                try {
+                    await ((_a = context.browser()) === null || _a === void 0 ? void 0 : _a.close());
+                }
+                catch (error) {
+                    console.error(`Error when closing browser: ${error}`);
+                }
+                server.close();
+                if (code === 0) {
+                    s();
+                }
+                else {
+                    e(new Error('Test failed'));
+                }
+            });
+        }
+        else {
             server.close();
-            if (code === 0) {
-                s();
-            }
-            else {
-                e(new Error('Test failed'));
-            }
-        });
+            e(new Error('Can not run test as opening of browser failed.'));
+        }
     });
 }
 exports.runTests = runTests;
-async function getBuild(version) {
-    if (version === 'sources') {
-        return { type: 'sources' };
+async function getBuild(options) {
+    if (options.vsCodeDevPath) {
+        return {
+            type: 'sources',
+            location: options.vsCodeDevPath
+        };
     }
-    return await (0, download_1.downloadAndUnzipVSCode)(version === 'stable' ? 'stable' : 'insider');
+    const quality = options.quality || options.version;
+    return await (0, download_1.downloadAndUnzipVSCode)(quality === 'stable' ? 'stable' : 'insider');
 }
 async function open(options) {
+    var _a, _b, _c;
     const config = {
         extensionDevelopmentPath: options.extensionDevelopmentPath,
         extensionTestsPath: options.extensionTestsPath,
-        build: await getBuild(options.version),
+        build: await getBuild(options),
         folderUri: options.folderUri,
         folderMountPath: options.folderPath,
+        hideServerLog: (_a = options.hideServerLog) !== null && _a !== void 0 ? _a : true,
         extensionPaths: options.extensionPaths
     };
-    const port = 3000;
-    const server = await (0, main_1.runServer)(port, config);
-    const endpoint = `http://localhost:${port}`;
+    const host = (_b = options.host) !== null && _b !== void 0 ? _b : 'localhost';
+    const port = (_c = options.port) !== null && _c !== void 0 ? _c : 3000;
+    const server = await (0, main_1.runServer)(host, port, config);
+    const endpoint = `http://${host}:${port}`;
     const context = await openBrowser(endpoint, options);
-    context.once('close', () => server.close());
+    context === null || context === void 0 ? void 0 : context.once('close', () => server.close());
     return {
         dispose: () => {
             var _a;
             server.close();
-            (_a = context.browser()) === null || _a === void 0 ? void 0 : _a.close();
+            (_a = context === null || context === void 0 ? void 0 : context.browser()) === null || _a === void 0 ? void 0 : _a.close();
         }
     };
 }
@@ -88,6 +103,14 @@ const width = 1200;
 const height = 800;
 async function openBrowser(endpoint, options) {
     var _a, _b;
+    if (options.browserType === 'none') {
+        return undefined;
+    }
+    const browserType = await playwright[options.browserType];
+    if (!browserType) {
+        console.error(`Can not open browser type: ${options.browserType}`);
+        return undefined;
+    }
     const args = [];
     if (process.platform === 'linux' && options.browserType === 'chromium') {
         args.push('--no-sandbox');
@@ -95,8 +118,8 @@ async function openBrowser(endpoint, options) {
     if (options.waitForDebugger) {
         args.push(`--remote-debugging-port=${options.waitForDebugger}`);
     }
-    const headless = (_a = options.headless) !== null && _a !== void 0 ? _a : options.extensionDevelopmentPath !== undefined;
-    const browser = await playwright[options.browserType].launch({ headless, args, devtools: options.devTools });
+    const headless = (_a = options.headless) !== null && _a !== void 0 ? _a : options.extensionTestsPath !== undefined;
+    const browser = await browserType.launch({ headless, args, devtools: options.devTools });
     const context = await browser.newContext();
     if (options.permissions) {
         context.grantPermissions(options.permissions);
@@ -116,6 +139,11 @@ async function openBrowser(endpoint, options) {
     if (options.waitForDebugger) {
         await page.waitForFunction(() => '__jsDebugIsReady' in globalThis);
     }
+    if (options.verbose) {
+        page.on('console', (message) => {
+            console.log(message.text());
+        });
+    }
     await page.setViewportSize({ width, height });
     await page.goto(endpoint);
     return context;
@@ -146,7 +174,7 @@ function valdiateBrowserType(browserType) {
     if (browserType === undefined) {
         return 'chromium';
     }
-    if ((typeof browserType === 'string') && ['chromium', 'firefox', 'webkit'].includes(browserType)) {
+    if ((typeof browserType === 'string') && ['chromium', 'firefox', 'webkit', 'none'].includes(browserType)) {
         return browserType;
     }
     console.log(`Invalid browser type.`);
@@ -209,11 +237,24 @@ async function validatePath(loc, isFile) {
     }
     return loc;
 }
-function validateVersion(version) {
-    if (version === undefined || ((typeof version === 'string') && ['insiders', 'stable', 'sources'].includes(version))) {
-        return version;
+function validateQuality(quality, version, vsCodeDevPath) {
+    if (version) {
+        console.log(`--version has been replaced by --quality`);
+        quality = quality || version;
+    }
+    if (vsCodeDevPath && quality) {
+        console.log(`Sources folder is provided as input, quality is ignored.`);
+        return undefined;
+    }
+    if (quality === undefined || ((typeof quality === 'string') && ['insiders', 'stable'].includes(quality))) {
+        return quality;
+    }
+    if (version === 'sources') {
+        console.log(`Instead of version=sources use 'sourcesPath' with the location of the VS Code repository.`);
+    }
+    else {
+        console.log(`Invalid quality.`);
     }
-    console.log(`Invalid version.`);
     showHelp();
     process.exit(-1);
 }
@@ -228,40 +269,57 @@ function validatePortNumber(port) {
 }
 function showHelp() {
     console.log('Usage:');
-    console.log(`  --browserType 'chromium' | 'firefox' | 'webkit': The browser to launch. [Optional, default 'chromium']`);
+    console.log(`  --browserType 'chromium' | 'firefox' | 'webkit' | 'none': The browser to launch. [Optional, defaults to 'chromium']`);
     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(`  --version 'insiders' | 'stable' | 'sources' [Optional, default 'insiders']`);
+    console.log(`  --quality 'insiders' | 'stable' [Optional, default 'insiders', ignored when running from sources]`);
+    console.log(`  --sourcesPath path: If provided, running from VS Code sources at the given location [Optional]`);
     console.log(`  --open-devtools: If set, opens the dev tools  [Optional]`);
     console.log(`  --headless: Whether to hide the browser. Defaults to true when an extensionTestsPath is provided, otherwise false. [Optional]`);
-    console.log(`  --hideServerLog: Whether to hide the server log. 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(`  --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(`  --host: The host name the server is opened on  [Optional, defaults to localhost]`);
+    console.log(`  --port: The port the server is opened on  [Optional, defaults to 3000]`);
+    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(`  --hideServerLog: Whether to hide the server log. Defaults to true when an extensionTestsPath is provided, otherwise false. [Optional]`);
     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() {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const manifest = require('../package.json');
+    console.log(`${manifest.name}: ${manifest.version}`);
     const options = {
-        string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browserType', 'version', 'waitForDebugger', 'folder-uri', 'permission', 'extensionPath'],
-        boolean: ['open-devtools', 'headless', 'hideServerLog'],
+        string: ['extensionDevelopmentPath', 'extensionTestsPath', 'browserType', 'quality', 'version', 'waitForDebugger', 'folder-uri', 'permission', 'extensionPath', 'sourcesPath', 'host', 'port'],
+        boolean: ['open-devtools', 'headless', 'hideServerLog', 'help', 'verbose'],
         unknown: arg => {
             if (arg.startsWith('-')) {
                 console.log(`Unknown argument ${arg}`);
-                return false;
+                showHelp();
+                process.exit();
             }
             return true;
         }
     };
     const args = minimist(process.argv.slice(2), options);
+    if (args.help) {
+        showHelp();
+        process.exit();
+    }
     const browserType = valdiateBrowserType(args.browserType);
     const extensionTestsPath = await validatePathOrUndefined(args, 'extensionTestsPath', true);
     const extensionDevelopmentPath = await validatePathOrUndefined(args, 'extensionDevelopmentPath');
     const extensionPaths = await valdiateExtensionPaths(args.extensionPath);
-    const version = validateVersion(args.version);
+    const vsCodeDevPath = await validatePathOrUndefined(args, 'sourcesPath');
+    const quality = validateQuality(args.quality, args.version, vsCodeDevPath);
     const devTools = validateBooleanOrUndefined(args, 'open-devtools');
     const headless = validateBooleanOrUndefined(args, 'headless');
     const permissions = valdiatePermissions(args.permission);
     const hideServerLog = validateBooleanOrUndefined(args, 'hideServerLog');
+    const verbose = validateBooleanOrUndefined(args, 'verbose');
+    const port = validatePortNumber(args.port);
+    const host = validateStringOrUndefined(args, 'host');
     const waitForDebugger = validatePortNumber(args.waitForDebugger);
     let folderUri = validateStringOrUndefined(args, 'folder-uri');
     let folderPath;
@@ -281,7 +339,7 @@ async function cliMain() {
             extensionTestsPath,
             extensionDevelopmentPath,
             browserType,
-            version,
+            quality,
             devTools,
             waitForDebugger,
             folderUri,
@@ -289,14 +347,21 @@ async function cliMain() {
             headless,
             hideServerLog,
             permissions,
-            extensionPaths
+            extensionPaths,
+            vsCodeDevPath,
+            verbose,
+            host,
+            port
+        }).catch(e => {
+            console.log(e.message);
+            process.exit(1);
         });
     }
     else {
         open({
             extensionDevelopmentPath,
             browserType,
-            version,
+            quality,
             devTools,
             waitForDebugger,
             folderUri,
@@ -304,7 +369,11 @@ async function cliMain() {
             headless,
             hideServerLog,
             permissions,
-            extensionPaths
+            extensionPaths,
+            vsCodeDevPath,
+            verbose,
+            host,
+            port
         });
     }
 }

package/out/server/app.js

@@ -8,9 +8,10 @@ const Koa = require("koa");
 const morgan = require("koa-morgan");
 const kstatic = require("koa-static");
 const kmount = require("koa-mount");
+const path_1 = require("path");
 const workbench_1 = require("./workbench");
-const path = require("path");
 const mounts_1 = require("./mounts");
+const extensions_1 = require("./extensions");
 async function createApp(config) {
     const app = new Koa();
     if (!config.hideServerLog) {
@@ -21,19 +22,25 @@ async function createApp(config) {
         ctx.set('Access-Control-Allow-Origin', '*');
         return next();
     });
-    app.use(kmount('/static', kstatic(path.join(__dirname, '../static'))));
+    const serveOptions = { hidden: true };
     if (config.extensionDevelopmentPath) {
         console.log('Serving dev extensions from ' + config.extensionDevelopmentPath);
-        app.use(kmount('/static/devextensions', kstatic(config.extensionDevelopmentPath, { hidden: true })));
+        app.use(kmount('/static/devextensions', kstatic(config.extensionDevelopmentPath, serveOptions)));
     }
     if (config.build.type === 'static') {
-        app.use(kmount('/static/build', kstatic(config.build.location, { hidden: true })));
+        app.use(kmount('/static/build', kstatic(config.build.location, serveOptions)));
+    }
+    else if (config.build.type === 'sources') {
+        app.use(kmount('/static/sources', kstatic(config.build.location, serveOptions)));
+        app.use(kmount('/static/sources', kstatic((0, path_1.join)(config.build.location, 'resources', 'server'), serveOptions))); // for manifest.json, favicon and code icons.
+        // built-in extension are at 'extensions` as well as prebuilt extensions dowloaded from the marketplace
+        app.use(kmount(`/static/sources/extensions`, kstatic((0, path_1.join)(config.build.location, extensions_1.prebuiltExtensionsLocation), serveOptions)));
     }
     (0, mounts_1.configureMounts)(config, app);
     if (config.extensionPaths) {
         config.extensionPaths.forEach((extensionPath, index) => {
             console.log('Serving additional built-in extensions from ' + extensionPath);
-            app.use(kmount(`/static/extensions/${index}`, kstatic(extensionPath, { hidden: true })));
+            app.use(kmount(`/static/extensions/${index}`, kstatic(extensionPath, serveOptions)));
         });
     }
     app.use((0, workbench_1.default)(config));

package/out/server/download.js

@@ -70,7 +70,7 @@ async function downloadAndUnzipVSCode(quality) {
     const folderName = `vscode-web-${quality}-${info.version}`;
     const downloadedPath = path.resolve(vscodeTestDir, folderName);
     if ((0, fs_1.existsSync)(downloadedPath) && (0, fs_1.existsSync)(path.join(downloadedPath, 'version'))) {
-        return { type: 'static', location: downloadedPath };
+        return { type: 'static', location: downloadedPath, quality, version: info.version };
     }
     if ((0, fs_1.existsSync)(vscodeTestDir)) {
         await fs_1.promises.rmdir(vscodeTestDir, { recursive: true, maxRetries: 5 });
@@ -95,7 +95,7 @@ async function downloadAndUnzipVSCode(quality) {
             // ignore
         }
     }
-    return { type: 'static', location: downloadedPath };
+    return { type: 'static', location: downloadedPath, quality, version: info.version };
 }
 exports.downloadAndUnzipVSCode = downloadAndUnzipVSCode;
 async function fetch(api) {

package/out/server/extensions.js

@@ -4,7 +4,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scanForExtensions = void 0;
+exports.getScannedBuiltinExtensions = exports.prebuiltExtensionsLocation = exports.scanForExtensions = void 0;
 const fs_1 = require("fs");
 const path = require("path");
 async function scanForExtensions(rootPath, serverURI) {
@@ -43,3 +43,11 @@ async function scanForExtensions(rootPath, serverURI) {
     return result;
 }
 exports.scanForExtensions = scanForExtensions;
+exports.prebuiltExtensionsLocation = '.build/builtInExtensions';
+async function getScannedBuiltinExtensions(vsCodeDevLocation) {
+    // use the build utility as to not duplicate the code
+    const extensionsUtil = await Promise.resolve().then(() => require(path.join(vsCodeDevLocation, 'build', 'lib', 'extensions.js')));
+    return extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, 'extensions'))
+        .concat(extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, exports.prebuiltExtensionsLocation)));
+}
+exports.getScannedBuiltinExtensions = getScannedBuiltinExtensions;

package/out/server/main.js

@@ -6,10 +6,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runServer = void 0;
 const app_1 = require("./app");
-async function runServer(port, config) {
+async function runServer(host, port, config) {
     const app = await (0, app_1.default)(config);
-    const server = app.listen(port);
-    console.log(`Listening on http://localhost:${port}`);
+    const server = app.listen(port, host);
+    console.log(`Listening on http://${host}:${port}`);
     return server;
 }
 exports.runServer = runServer;

package/out/server/workbench.js

@@ -47,9 +47,6 @@ class Workbench {
         return await (0, download_1.fetch)(`${this.baseUrl}/out/vs/code/browser/workbench/callback.html`);
     }
 }
-function valueOrFirst(value) {
-    return Array.isArray(value) ? value[0] : value;
-}
 async function getWorkbenchOptions(ctx, config) {
     const options = {};
     if (config.extensionPaths) {
@@ -91,15 +88,9 @@ async function getWorkbenchOptions(ctx, config) {
 function default_1(config) {
     const router = new Router();
     router.use(async (ctx, next) => {
-        if (ctx.query['dev'] || config.build.type === 'sources') {
-            try {
-                const builtInExtensions = await (0, download_1.fetchJSON)('http://localhost:8080/builtin');
-                ctx.state.workbench = new Workbench('http://localhost:8080/static', true, builtInExtensions);
-            }
-            catch (err) {
-                console.log(err);
-                ctx.throw('Could not connect to localhost:8080, make sure you start `yarn web`', 400);
-            }
+        if (config.build.type === 'sources') {
+            const builtInExtensions = await (0, extensions_1.getScannedBuiltinExtensions)(config.build.location);
+            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, builtInExtensions);
         }
         else if (config.build.type === 'static') {
             ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/build`, false);
@@ -109,41 +100,13 @@ function default_1(config) {
         }
         await next();
     });
-    const callbacks = new Map();
     router.get('/callback', async (ctx) => {
-        const { 'vscode-requestId': vscodeRequestId, 'vscode-scheme': vscodeScheme, 'vscode-authority': vscodeAuthority, 'vscode-path': vscodePath, 'vscode-query': vscodeQuery, 'vscode-fragment': vscodeFragment, } = ctx.query;
-        if (!vscodeRequestId || !vscodeScheme || !vscodeAuthority) {
-            return ctx.throw(400);
-        }
-        const requestId = valueOrFirst(vscodeRequestId);
-        const uri = vscode_uri_1.URI.from({
-            scheme: valueOrFirst(vscodeScheme),
-            authority: valueOrFirst(vscodeAuthority),
-            path: valueOrFirst(vscodePath),
-            query: valueOrFirst(vscodeQuery),
-            fragment: valueOrFirst(vscodeFragment),
-        });
-        callbacks.set(requestId, uri);
         ctx.body = await ctx.state.workbench.renderCallback();
     });
-    router.get('/fetch-callback', async (ctx) => {
-        const { 'vscode-requestId': vscodeRequestId } = ctx.query;
-        if (!vscodeRequestId) {
-            return ctx.throw(400);
-        }
-        const requestId = valueOrFirst(vscodeRequestId);
-        const uri = callbacks.get(requestId);
-        if (!uri) {
-            return ctx.throw(400);
-        }
-        callbacks.delete(requestId);
-        ctx.body = uri.toJSON();
-    });
     router.get('/', async (ctx) => {
         const options = await getWorkbenchOptions(ctx, config);
         ctx.body = await ctx.state.workbench.render(options);
     });
-    //mountAPI(config, router);
     return router.routes();
 }
 exports.default = default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.14",
+  "version": "0.0.18",
   "scripts": {
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
@@ -11,8 +11,8 @@
     "postversion": "git push && git push --tags",
     "compile-fs-provider": "yarn --cwd=fs-provider compile-web",
     "compile-sample": "yarn --cwd=sample compile-web",
-    "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --browserType=chromium sample/test-workspace",
-    "sample-tests": "npm run compile &&  npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --browserType=chromium --headless=false sample/test-workspace"
+    "sample": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --verbose sample/test-workspace",
+    "sample-tests": "npm run compile &&  npm run compile-sample && node . --extensionDevelopmentPath=sample --extensionTestsPath=sample/dist/web/test/suite/index.js --headless=false sample/test-workspace"
   },
   "main": "./out/index.js",
   "bin": {

package/views/workbench.html

@@ -7,6 +7,12 @@
 		</script>
 		<meta charset="utf-8" />
 
+		<!-- Mobile tweaks -->
+		<meta name="mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-capable" content="yes" />
+		<meta name="apple-mobile-web-app-title" content="Code">
+		<link rel="apple-touch-icon" href="{{WORKBENCH_WEB_BASE_URL}}/code-192.png" />
+
 		<!-- Disable pinch zooming -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">