@vscode/test-web 0.0.13 → 0.0.17

package/out/server/app.js

@@ -1,38 +1,49 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const Koa = require("koa");
-const morgan = require("koa-morgan");
-const kstatic = require("koa-static");
-const kmount = require("koa-mount");
-const workbench_1 = require("./workbench");
-const path = require("path");
-const mounts_1 = require("./mounts");
-async function createApp(config) {
-    const app = new Koa();
-    app.use(morgan('dev'));
-    // this is here such that the iframe worker can fetch the extension files
-    app.use((ctx, next) => {
-        ctx.set('Access-Control-Allow-Origin', '*');
-        return next();
-    });
-    app.use(kmount('/static', kstatic(path.join(__dirname, '../static'))));
-    if (config.extensionPath) {
-        console.log('Serving extensions from ' + config.extensionPath);
-        app.use(kmount('/static/extensions', kstatic(config.extensionPath, { hidden: true })));
-    }
-    if (config.extensionDevelopmentPath) {
-        console.log('Serving dev extensions from ' + config.extensionDevelopmentPath);
-        app.use(kmount('/static/devextensions', kstatic(config.extensionDevelopmentPath, { hidden: true })));
-    }
-    if (config.build.type === 'static') {
-        app.use(kmount('/static/build', kstatic(config.build.location, { hidden: true })));
-    }
-    (0, mounts_1.configureMounts)(config, app);
-    app.use((0, workbench_1.default)(config));
-    return app;
-}
-exports.default = createApp;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+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 mounts_1 = require("./mounts");
+const extensions_1 = require("./extensions");
+async function createApp(config) {
+    const app = new Koa();
+    if (!config.hideServerLog) {
+        app.use(morgan('dev'));
+    }
+    // this is here such that the iframe worker can fetch the extension files
+    app.use((ctx, next) => {
+        ctx.set('Access-Control-Allow-Origin', '*');
+        return next();
+    });
+    const serveOptions = { hidden: true };
+    if (config.extensionDevelopmentPath) {
+        console.log('Serving dev extensions from ' + config.extensionDevelopmentPath);
+        app.use(kmount('/static/devextensions', kstatic(config.extensionDevelopmentPath, serveOptions)));
+    }
+    if (config.build.type === 'static') {
+        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, serveOptions)));
+        });
+    }
+    app.use((0, workbench_1.default)(config));
+    return app;
+}
+exports.default = createApp;

package/out/server/download.js

@@ -1,171 +1,171 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileExists = exports.directoryExists = exports.fetchJSON = exports.fetch = exports.downloadAndUnzipVSCode = void 0;
-const fs_1 = require("fs");
-const path = require("path");
-const https = require("https");
-const http = require("http");
-const createHttpsProxyAgent = require("https-proxy-agent");
-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;
-}
-const reset = '\x1b[G\x1b[0K';
-async function download(downloadUrl, destination, message) {
-    process.stdout.write(message);
-    return new Promise((resolve, reject) => {
-        const httpLibrary = downloadUrl.startsWith('https') ? https : http;
-        httpLibrary.get(downloadUrl, getAgent(downloadUrl), res => {
-            const total = Number(res.headers['content-length']);
-            let received = 0;
-            let timeout;
-            const outStream = (0, fs_1.createWriteStream)(destination);
-            outStream.on('close', () => resolve(destination));
-            outStream.on('error', reject);
-            res.on('data', chunk => {
-                if (!timeout) {
-                    timeout = setTimeout(() => {
-                        process.stdout.write(`${reset}${message}: ${received}/${total} (${(received / total * 100).toFixed()}%)`);
-                        timeout = undefined;
-                    }, 100);
-                }
-                received += chunk.length;
-            });
-            res.on('end', () => {
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
-                process.stdout.write(`${reset}${message}: complete\n`);
-            });
-            res.on('error', reject);
-            res.pipe(outStream);
-        });
-    });
-}
-async function unzip(source, destination, message) {
-    process.stdout.write(message);
-    if (!(0, fs_1.existsSync)(destination)) {
-        await fs_1.promises.mkdir(destination, { recursive: true });
-    }
-    await decompress(source, destination, {
-        plugins: [
-            decompressTargz()
-        ],
-        strip: 1
-    });
-    process.stdout.write(`${reset}${message}: complete\n`);
-}
-async function downloadAndUnzipVSCode(quality) {
-    const info = await getLatestVersion(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 };
-    }
-    if ((0, fs_1.existsSync)(vscodeTestDir)) {
-        await fs_1.promises.rmdir(vscodeTestDir, { recursive: true, maxRetries: 5 });
-    }
-    await fs_1.promises.mkdir(vscodeTestDir, { recursive: true });
-    const productName = `VS Code ${quality === 'stable' ? 'Stable' : 'Insiders'}`;
-    const tmpArchiveName = `vscode-web-${quality}-${info.version}-tmp`;
-    try {
-        await download(info.url, tmpArchiveName, `Downloading ${productName}`);
-        await unzip(tmpArchiveName, downloadedPath, `Unpacking ${productName}`);
-        await fs_1.promises.writeFile(path.join(downloadedPath, 'version'), folderName);
-    }
-    catch (err) {
-        console.error(err);
-        throw Error(`Failed to download and unpack ${productName}`);
-    }
-    finally {
-        try {
-            fs_1.promises.unlink(tmpArchiveName);
-        }
-        catch (e) {
-            // ignore
-        }
-    }
-    return { type: 'static', location: downloadedPath };
-}
-exports.downloadAndUnzipVSCode = downloadAndUnzipVSCode;
-async function fetch(api) {
-    return new Promise((resolve, reject) => {
-        const httpLibrary = api.startsWith('https') ? https : http;
-        httpLibrary.get(api, getAgent(api), res => {
-            if (res.statusCode !== 200) {
-                reject('Failed to get content from ');
-            }
-            let data = '';
-            res.on('data', chunk => {
-                data += chunk;
-            });
-            res.on('end', () => {
-                resolve(data);
-            });
-            res.on('error', err => {
-                reject(err);
-            });
-        });
-    });
-}
-exports.fetch = fetch;
-async function fetchJSON(api) {
-    const data = await fetch(api);
-    try {
-        return JSON.parse(data);
-    }
-    catch (err) {
-        throw new Error(`Failed to parse response from ${api}`);
-    }
-}
-exports.fetchJSON = fetchJSON;
-let PROXY_AGENT = undefined;
-let HTTPS_PROXY_AGENT = undefined;
-if (process.env.npm_config_proxy) {
-    PROXY_AGENT = createHttpProxyAgent(process.env.npm_config_proxy);
-    HTTPS_PROXY_AGENT = createHttpsProxyAgent(process.env.npm_config_proxy);
-}
-if (process.env.npm_config_https_proxy) {
-    HTTPS_PROXY_AGENT = createHttpsProxyAgent(process.env.npm_config_https_proxy);
-}
-function getAgent(url) {
-    const parsed = new url_1.URL(url);
-    const options = {};
-    if (PROXY_AGENT && parsed.protocol.startsWith('http:')) {
-        options.agent = PROXY_AGENT;
-    }
-    if (HTTPS_PROXY_AGENT && parsed.protocol.startsWith('https:')) {
-        options.agent = HTTPS_PROXY_AGENT;
-    }
-    return options;
-}
-async function directoryExists(path) {
-    try {
-        const stats = await fs_1.promises.stat(path);
-        return stats.isDirectory();
-    }
-    catch {
-        return false;
-    }
-}
-exports.directoryExists = directoryExists;
-async function fileExists(path) {
-    try {
-        const stats = await fs_1.promises.stat(path);
-        return stats.isFile();
-    }
-    catch {
-        return false;
-    }
-}
-exports.fileExists = fileExists;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fileExists = exports.directoryExists = exports.fetchJSON = exports.fetch = exports.downloadAndUnzipVSCode = void 0;
+const fs_1 = require("fs");
+const path = require("path");
+const https = require("https");
+const http = require("http");
+const createHttpsProxyAgent = require("https-proxy-agent");
+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;
+}
+const reset = '\x1b[G\x1b[0K';
+async function download(downloadUrl, destination, message) {
+    process.stdout.write(message);
+    return new Promise((resolve, reject) => {
+        const httpLibrary = downloadUrl.startsWith('https') ? https : http;
+        httpLibrary.get(downloadUrl, getAgent(downloadUrl), res => {
+            const total = Number(res.headers['content-length']);
+            let received = 0;
+            let timeout;
+            const outStream = (0, fs_1.createWriteStream)(destination);
+            outStream.on('close', () => resolve(destination));
+            outStream.on('error', reject);
+            res.on('data', chunk => {
+                if (!timeout) {
+                    timeout = setTimeout(() => {
+                        process.stdout.write(`${reset}${message}: ${received}/${total} (${(received / total * 100).toFixed()}%)`);
+                        timeout = undefined;
+                    }, 100);
+                }
+                received += chunk.length;
+            });
+            res.on('end', () => {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
+                process.stdout.write(`${reset}${message}: complete\n`);
+            });
+            res.on('error', reject);
+            res.pipe(outStream);
+        });
+    });
+}
+async function unzip(source, destination, message) {
+    process.stdout.write(message);
+    if (!(0, fs_1.existsSync)(destination)) {
+        await fs_1.promises.mkdir(destination, { recursive: true });
+    }
+    await decompress(source, destination, {
+        plugins: [
+            decompressTargz()
+        ],
+        strip: 1
+    });
+    process.stdout.write(`${reset}${message}: complete\n`);
+}
+async function downloadAndUnzipVSCode(quality) {
+    const info = await getLatestVersion(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, quality, version: info.version };
+    }
+    if ((0, fs_1.existsSync)(vscodeTestDir)) {
+        await fs_1.promises.rmdir(vscodeTestDir, { recursive: true, maxRetries: 5 });
+    }
+    await fs_1.promises.mkdir(vscodeTestDir, { recursive: true });
+    const productName = `VS Code ${quality === 'stable' ? 'Stable' : 'Insiders'}`;
+    const tmpArchiveName = `vscode-web-${quality}-${info.version}-tmp`;
+    try {
+        await download(info.url, tmpArchiveName, `Downloading ${productName}`);
+        await unzip(tmpArchiveName, downloadedPath, `Unpacking ${productName}`);
+        await fs_1.promises.writeFile(path.join(downloadedPath, 'version'), folderName);
+    }
+    catch (err) {
+        console.error(err);
+        throw Error(`Failed to download and unpack ${productName}`);
+    }
+    finally {
+        try {
+            fs_1.promises.unlink(tmpArchiveName);
+        }
+        catch (e) {
+            // ignore
+        }
+    }
+    return { type: 'static', location: downloadedPath, quality, version: info.version };
+}
+exports.downloadAndUnzipVSCode = downloadAndUnzipVSCode;
+async function fetch(api) {
+    return new Promise((resolve, reject) => {
+        const httpLibrary = api.startsWith('https') ? https : http;
+        httpLibrary.get(api, getAgent(api), res => {
+            if (res.statusCode !== 200) {
+                reject('Failed to get content from ');
+            }
+            let data = '';
+            res.on('data', chunk => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                resolve(data);
+            });
+            res.on('error', err => {
+                reject(err);
+            });
+        });
+    });
+}
+exports.fetch = fetch;
+async function fetchJSON(api) {
+    const data = await fetch(api);
+    try {
+        return JSON.parse(data);
+    }
+    catch (err) {
+        throw new Error(`Failed to parse response from ${api}`);
+    }
+}
+exports.fetchJSON = fetchJSON;
+let PROXY_AGENT = undefined;
+let HTTPS_PROXY_AGENT = undefined;
+if (process.env.npm_config_proxy) {
+    PROXY_AGENT = createHttpProxyAgent(process.env.npm_config_proxy);
+    HTTPS_PROXY_AGENT = createHttpsProxyAgent(process.env.npm_config_proxy);
+}
+if (process.env.npm_config_https_proxy) {
+    HTTPS_PROXY_AGENT = createHttpsProxyAgent(process.env.npm_config_https_proxy);
+}
+function getAgent(url) {
+    const parsed = new url_1.URL(url);
+    const options = {};
+    if (PROXY_AGENT && parsed.protocol.startsWith('http:')) {
+        options.agent = PROXY_AGENT;
+    }
+    if (HTTPS_PROXY_AGENT && parsed.protocol.startsWith('https:')) {
+        options.agent = HTTPS_PROXY_AGENT;
+    }
+    return options;
+}
+async function directoryExists(path) {
+    try {
+        const stats = await fs_1.promises.stat(path);
+        return stats.isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+exports.directoryExists = directoryExists;
+async function fileExists(path) {
+    try {
+        const stats = await fs_1.promises.stat(path);
+        return stats.isFile();
+    }
+    catch {
+        return false;
+    }
+}
+exports.fileExists = fileExists;

package/out/server/extensions.js

@@ -1,45 +1,53 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  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;
-const fs_1 = require("fs");
-const path = require("path");
-async function scanForExtensions(rootPath, serverURI) {
-    const result = [];
-    async function getExtension(relativePosixFolderPath) {
-        try {
-            const packageJSONPath = path.join(rootPath, relativePosixFolderPath, 'package.json');
-            if ((await fs_1.promises.stat(packageJSONPath)).isFile()) {
-                return {
-                    scheme: serverURI.scheme,
-                    authority: serverURI.authority,
-                    path: path.posix.join(serverURI.path, relativePosixFolderPath),
-                };
-            }
-        }
-        catch {
-            return undefined;
-        }
-    }
-    async function processFolder(relativePosixFolderPath) {
-        const extension = await getExtension(relativePosixFolderPath);
-        if (extension) {
-            result.push(extension);
-        }
-        else {
-            const folderPath = path.join(rootPath, relativePosixFolderPath);
-            const entries = await fs_1.promises.readdir(folderPath, { withFileTypes: true });
-            for (const entry of entries) {
-                if (entry.isDirectory() && entry.name.charAt(0) !== '.') {
-                    await processFolder(path.posix.join(relativePosixFolderPath, entry.name));
-                }
-            }
-        }
-    }
-    await processFolder('');
-    return result;
-}
-exports.scanForExtensions = scanForExtensions;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getScannedBuiltinExtensions = exports.prebuiltExtensionsLocation = exports.scanForExtensions = void 0;
+const fs_1 = require("fs");
+const path = require("path");
+async function scanForExtensions(rootPath, serverURI) {
+    const result = [];
+    async function getExtension(relativePosixFolderPath) {
+        try {
+            const packageJSONPath = path.join(rootPath, relativePosixFolderPath, 'package.json');
+            if ((await fs_1.promises.stat(packageJSONPath)).isFile()) {
+                return {
+                    scheme: serverURI.scheme,
+                    authority: serverURI.authority,
+                    path: path.posix.join(serverURI.path, relativePosixFolderPath),
+                };
+            }
+        }
+        catch {
+            return undefined;
+        }
+    }
+    async function processFolder(relativePosixFolderPath) {
+        const extension = await getExtension(relativePosixFolderPath);
+        if (extension) {
+            result.push(extension);
+        }
+        else {
+            const folderPath = path.join(rootPath, relativePosixFolderPath);
+            const entries = await fs_1.promises.readdir(folderPath, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.isDirectory() && entry.name.charAt(0) !== '.') {
+                    await processFolder(path.posix.join(relativePosixFolderPath, entry.name));
+                }
+            }
+        }
+    }
+    await processFolder('');
+    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

@@ -1,15 +1,15 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runServer = void 0;
-const app_1 = require("./app");
-async function runServer(port, config) {
-    const app = await (0, app_1.default)(config);
-    const server = app.listen(port);
-    console.log(`Listening on http://localhost:${port}`);
-    return server;
-}
-exports.runServer = runServer;
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runServer = void 0;
+const app_1 = require("./app");
+async function runServer(host, port, config) {
+    const app = await (0, app_1.default)(config);
+    const server = app.listen(port, host);
+    console.log(`Listening on http://${host}:${port}`);
+    return server;
+}
+exports.runServer = runServer;