@vscode/test-web 0.0.13 → 0.0.17

package/out/server/mounts.js

@@ -1,78 +1,78 @@
-"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.configureMounts = exports.fsProviderFolderUri = exports.fsProviderExtensionPrefix = void 0;
-const kstatic = require("koa-static");
-const kmount = require("koa-mount");
-const Router = require("@koa/router");
-const fs_1 = require("fs");
-const path = require("path");
-const mountPrefix = '/static/mount';
-exports.fsProviderExtensionPrefix = '/static/fsproviderextension';
-exports.fsProviderFolderUri = 'vscode-test-web://mount/';
-function configureMounts(config, app) {
-    const folderMountPath = config.folderMountPath;
-    if (folderMountPath) {
-        console.log(`Serving local content ${folderMountPath} at ${mountPrefix}`);
-        app.use(fileOps(mountPrefix, folderMountPath));
-        app.use(kmount(mountPrefix, kstatic(folderMountPath, { hidden: true })));
-        app.use(kmount(exports.fsProviderExtensionPrefix, kstatic(path.join(__dirname, '../../fs-provider'), { hidden: true })));
-    }
-}
-exports.configureMounts = configureMounts;
-function fileOps(mountPrefix, folderMountPath) {
-    const router = new Router();
-    router.get(`${mountPrefix}(/.*)?`, async (ctx, next) => {
-        if (ctx.query.stat !== undefined) {
-            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
-            try {
-                const stats = await fs_1.promises.stat(p);
-                ctx.body = {
-                    type: getFileType(stats),
-                    ctime: stats.ctime.getTime(),
-                    mtime: stats.mtime.getTime(),
-                    size: stats.size
-                };
-            }
-            catch (e) {
-                ctx.body = { error: e.code };
-            }
-        }
-        else if (ctx.query.readdir !== undefined) {
-            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
-            try {
-                const entries = await fs_1.promises.readdir(p, { withFileTypes: true });
-                ctx.body = entries.map(d => ({ name: d.name, type: getFileType(d) }));
-            }
-            catch (e) {
-                ctx.body = { error: e.code };
-            }
-        }
-        else {
-            return next();
-        }
-    });
-    return router.routes();
-}
-var FileType;
-(function (FileType) {
-    FileType[FileType["Unknown"] = 0] = "Unknown";
-    FileType[FileType["File"] = 1] = "File";
-    FileType[FileType["Directory"] = 2] = "Directory";
-    FileType[FileType["SymbolicLink"] = 64] = "SymbolicLink";
-})(FileType || (FileType = {}));
-function getFileType(stats) {
-    if (stats.isFile()) {
-        return FileType.File;
-    }
-    else if (stats.isDirectory()) {
-        return FileType.Directory;
-    }
-    else if (stats.isSymbolicLink()) {
-        return FileType.SymbolicLink;
-    }
-    return FileType.Unknown;
-}
+"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.configureMounts = exports.fsProviderFolderUri = exports.fsProviderExtensionPrefix = void 0;
+const kstatic = require("koa-static");
+const kmount = require("koa-mount");
+const Router = require("@koa/router");
+const fs_1 = require("fs");
+const path = require("path");
+const mountPrefix = '/static/mount';
+exports.fsProviderExtensionPrefix = '/static/extensions/fs';
+exports.fsProviderFolderUri = 'vscode-test-web://mount/';
+function configureMounts(config, app) {
+    const folderMountPath = config.folderMountPath;
+    if (folderMountPath) {
+        console.log(`Serving local content ${folderMountPath} at ${mountPrefix}`);
+        app.use(fileOps(mountPrefix, folderMountPath));
+        app.use(kmount(mountPrefix, kstatic(folderMountPath, { hidden: true })));
+        app.use(kmount(exports.fsProviderExtensionPrefix, kstatic(path.join(__dirname, '../../fs-provider'), { hidden: true })));
+    }
+}
+exports.configureMounts = configureMounts;
+function fileOps(mountPrefix, folderMountPath) {
+    const router = new Router();
+    router.get(`${mountPrefix}(/.*)?`, async (ctx, next) => {
+        if (ctx.query.stat !== undefined) {
+            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
+            try {
+                const stats = await fs_1.promises.stat(p);
+                ctx.body = {
+                    type: getFileType(stats),
+                    ctime: stats.ctime.getTime(),
+                    mtime: stats.mtime.getTime(),
+                    size: stats.size
+                };
+            }
+            catch (e) {
+                ctx.body = { error: e.code };
+            }
+        }
+        else if (ctx.query.readdir !== undefined) {
+            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
+            try {
+                const entries = await fs_1.promises.readdir(p, { withFileTypes: true });
+                ctx.body = entries.map(d => ({ name: d.name, type: getFileType(d) }));
+            }
+            catch (e) {
+                ctx.body = { error: e.code };
+            }
+        }
+        else {
+            return next();
+        }
+    });
+    return router.routes();
+}
+var FileType;
+(function (FileType) {
+    FileType[FileType["Unknown"] = 0] = "Unknown";
+    FileType[FileType["File"] = 1] = "File";
+    FileType[FileType["Directory"] = 2] = "Directory";
+    FileType[FileType["SymbolicLink"] = 64] = "SymbolicLink";
+})(FileType || (FileType = {}));
+function getFileType(stats) {
+    if (stats.isFile()) {
+        return FileType.File;
+    }
+    else if (stats.isDirectory()) {
+        return FileType.Directory;
+    }
+    else if (stats.isSymbolicLink()) {
+        return FileType.SymbolicLink;
+    }
+    return FileType.Unknown;
+}

package/out/server/workbench.js

@@ -1,147 +1,112 @@
-"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 path = require("path");
-const fs_1 = require("fs");
-const vscode_uri_1 = require("vscode-uri");
-const Router = require("@koa/router");
-const extensions_1 = require("./extensions");
-const download_1 = require("./download");
-const mounts_1 = require("./mounts");
-function asJSON(value) {
-    return JSON.stringify(value).replace(/"/g, '"');
-}
-class Workbench {
-    constructor(baseUrl, dev, builtInExtensions = []) {
-        this.baseUrl = baseUrl;
-        this.dev = dev;
-        this.builtInExtensions = builtInExtensions;
-    }
-    async render(workbenchWebConfiguration) {
-        const values = {
-            WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
-            WORKBENCH_AUTH_SESSION: '',
-            WORKBENCH_WEB_BASE_URL: this.baseUrl,
-            WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions),
-            WORKBENCH_MAIN: this.getMain()
-        };
-        try {
-            const workbenchTemplate = (await fs_1.promises.readFile(path.resolve(__dirname, '../../views/workbench.html'))).toString();
-            return workbenchTemplate.replace(/\{\{([^}]+)\}\}/g, (_, key) => { var _a; return (_a = values[key]) !== null && _a !== void 0 ? _a : 'undefined'; });
-        }
-        catch (e) {
-            return String(e);
-        }
-    }
-    getMain() {
-        return this.dev
-            ? `<script> require(['vs/code/browser/workbench/workbench'], function() {}); </script>`
-            : `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.api.nls.js"></script>`
-                + `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.api.js"></script>`
-                + `<script src="${this.baseUrl}/out/vs/code/browser/workbench/workbench.js"></script>`;
-    }
-    async renderCallback() {
-        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.extensionPath) {
-        options.additionalBuiltinExtensions = await (0, extensions_1.scanForExtensions)(config.extensionPath, {
-            scheme: ctx.protocol,
-            authority: ctx.host,
-            path: '/static/extensions',
-        });
-    }
-    if (config.extensionDevelopmentPath) {
-        const developmentOptions = options.developmentOptions = {};
-        developmentOptions.extensions = await (0, extensions_1.scanForExtensions)(config.extensionDevelopmentPath, { scheme: ctx.protocol, authority: ctx.host, path: '/static/devextensions' });
-        if (config.extensionTestsPath) {
-            let relativePath = path.relative(config.extensionDevelopmentPath, config.extensionTestsPath);
-            if (process.platform === 'win32') {
-                relativePath = relativePath.replace(/\\/g, '/');
-            }
-            developmentOptions.extensionTestsPath = {
-                scheme: ctx.protocol,
-                authority: ctx.host,
-                path: path.posix.join('/static/devextensions', relativePath),
-            };
-        }
-    }
-    if (config.folderMountPath) {
-        if (!options.additionalBuiltinExtensions) {
-            options.additionalBuiltinExtensions = [];
-        }
-        options.additionalBuiltinExtensions.push({ scheme: ctx.protocol, authority: ctx.host, path: mounts_1.fsProviderExtensionPrefix });
-        options.folderUri = vscode_uri_1.URI.parse(mounts_1.fsProviderFolderUri);
-    }
-    else if (config.folderUri) {
-        options.folderUri = vscode_uri_1.URI.parse(config.folderUri);
-    }
-    return options;
-}
-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);
-            }
-        }
-        else if (config.build.type === 'static') {
-            ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/build`, false);
-        }
-        else if (config.build.type === 'cdn') {
-            ctx.state.workbench = new Workbench(config.build.uri, false);
-        }
-        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;
+"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 path = require("path");
+const fs_1 = require("fs");
+const vscode_uri_1 = require("vscode-uri");
+const Router = require("@koa/router");
+const extensions_1 = require("./extensions");
+const download_1 = require("./download");
+const mounts_1 = require("./mounts");
+function asJSON(value) {
+    return JSON.stringify(value).replace(/"/g, '&quot;');
+}
+class Workbench {
+    constructor(baseUrl, dev, builtInExtensions = []) {
+        this.baseUrl = baseUrl;
+        this.dev = dev;
+        this.builtInExtensions = builtInExtensions;
+    }
+    async render(workbenchWebConfiguration) {
+        const values = {
+            WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
+            WORKBENCH_AUTH_SESSION: '',
+            WORKBENCH_WEB_BASE_URL: this.baseUrl,
+            WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions),
+            WORKBENCH_MAIN: this.getMain()
+        };
+        try {
+            const workbenchTemplate = (await fs_1.promises.readFile(path.resolve(__dirname, '../../views/workbench.html'))).toString();
+            return workbenchTemplate.replace(/\{\{([^}]+)\}\}/g, (_, key) => { var _a; return (_a = values[key]) !== null && _a !== void 0 ? _a : 'undefined'; });
+        }
+        catch (e) {
+            return String(e);
+        }
+    }
+    getMain() {
+        return this.dev
+            ? `<script> require(['vs/code/browser/workbench/workbench'], function() {}); </script>`
+            : `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.api.nls.js"></script>`
+                + `<script src="${this.baseUrl}/out/vs/workbench/workbench.web.api.js"></script>`
+                + `<script src="${this.baseUrl}/out/vs/code/browser/workbench/workbench.js"></script>`;
+    }
+    async renderCallback() {
+        return await (0, download_1.fetch)(`${this.baseUrl}/out/vs/code/browser/workbench/callback.html`);
+    }
+}
+async function getWorkbenchOptions(ctx, config) {
+    const options = {};
+    if (config.extensionPaths) {
+        await Promise.all(config.extensionPaths.map(async (extensionPath, index) => {
+            options.additionalBuiltinExtensions = await (0, extensions_1.scanForExtensions)(extensionPath, {
+                scheme: ctx.protocol,
+                authority: ctx.host,
+                path: `/static/extensions/${index}`,
+            });
+        }));
+    }
+    if (config.extensionDevelopmentPath) {
+        const developmentOptions = options.developmentOptions = {};
+        developmentOptions.extensions = await (0, extensions_1.scanForExtensions)(config.extensionDevelopmentPath, { scheme: ctx.protocol, authority: ctx.host, path: '/static/devextensions' });
+        if (config.extensionTestsPath) {
+            let relativePath = path.relative(config.extensionDevelopmentPath, config.extensionTestsPath);
+            if (process.platform === 'win32') {
+                relativePath = relativePath.replace(/\\/g, '/');
+            }
+            developmentOptions.extensionTestsPath = {
+                scheme: ctx.protocol,
+                authority: ctx.host,
+                path: path.posix.join('/static/devextensions', relativePath),
+            };
+        }
+    }
+    if (config.folderMountPath) {
+        if (!options.additionalBuiltinExtensions) {
+            options.additionalBuiltinExtensions = [];
+        }
+        options.additionalBuiltinExtensions.push({ scheme: ctx.protocol, authority: ctx.host, path: mounts_1.fsProviderExtensionPrefix });
+        options.folderUri = vscode_uri_1.URI.parse(mounts_1.fsProviderFolderUri);
+    }
+    else if (config.folderUri) {
+        options.folderUri = vscode_uri_1.URI.parse(config.folderUri);
+    }
+    return options;
+}
+function default_1(config) {
+    const router = new Router();
+    router.use(async (ctx, next) => {
+        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);
+        }
+        else if (config.build.type === 'cdn') {
+            ctx.state.workbench = new Workbench(config.build.uri, false);
+        }
+        await next();
+    });
+    router.get('/callback', async (ctx) => {
+        ctx.body = await ctx.state.workbench.renderCallback();
+    });
+    router.get('/', async (ctx) => {
+        const options = await getWorkbenchOptions(ctx, config);
+        ctx.body = await ctx.state.workbench.render(options);
+    });
+    return router.routes();
+}
+exports.default = default_1;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.13",
+  "version": "0.0.17",
   "scripts": {
-    "init": "yarn --cwd=fs-provider && yarn --cwd=sample",
+    "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
     "watch": "tsc -w -p ./",
     "prepublishOnly": "yarn compile",
@@ -11,7 +11,7 @@
     "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": "npm run compile && npm run compile-sample && node . --extensionDevelopmentPath=sample --browserType=chromium --verbose 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"
   },
   "main": "./out/index.js",

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">