From ece840834d24d2df9cc184aeaaeb968590e848ff Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 21 Oct 2019 14:54:32 -0500 Subject: [PATCH] Move login page to browser directory Fixes it not being included in the optimized build as well as making it more consistent. --- scripts/build.ts | 2 +- scripts/optimize.js | 1 + src/{login/index.html => browser/login.html} | 0 src/node/server.ts | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) rename src/{login/index.html => browser/login.html} (100%) diff --git a/scripts/build.ts b/scripts/build.ts index 9bec0f06..5b459ebe 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -261,7 +261,7 @@ class Builder { fs.remove(path.join(finalServerPath, "node_modules")).then(() => { return fs.copy(path.join(serverPath, "node_modules"), path.join(finalServerPath, "node_modules")); }), - fs.copy(path.join(serverPath, "src/browser/workbench-build.html"), path.join(finalServerPath, "src/browser/workbench.html")), + fs.copy(path.join(finalServerPath, "src/browser/workbench-build.html"), path.join(finalServerPath, "src/browser/workbench.html")), ]); }), ]); diff --git a/scripts/optimize.js b/scripts/optimize.js index baf609dc..dfc6e1a9 100644 --- a/scripts/optimize.js +++ b/scripts/optimize.js @@ -24,6 +24,7 @@ const vscodeResources = [ "out-build/vs/server/src/node/uriTransformer.js", "!out-build/vs/server/doc/**", "out-build/vs/code/browser/workbench/**", + "out-build/vs/server/src/browser/*.html", "out-build/vs/server/src/media/*", "out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js", "out-build/bootstrap.js", diff --git a/src/login/index.html b/src/browser/login.html similarity index 100% rename from src/login/index.html rename to src/browser/login.html diff --git a/src/node/server.ts b/src/node/server.ts index b2467133..21384580 100644 --- a/src/node/server.ts +++ b/src/node/server.ts @@ -375,7 +375,7 @@ export abstract class Server { } private async getLogin(error: string = "", payload?: LoginPayload): Promise { - const filePath = path.join(this.serverRoot, "login/index.html"); + const filePath = path.join(this.serverRoot, "browser/login.html"); const content = (await util.promisify(fs.readFile)(filePath, "utf8")) .replace("{{ERROR}}", error) .replace("display:none", error ? "display:block" : "display:none") @@ -536,7 +536,7 @@ export class MainServer extends Server { } private async getRoot(request: http.IncomingMessage, parsedUrl: url.UrlWithParsedQuery): Promise { - const filePath = path.join(this.rootPath, "out/vs/server/src/browser/workbench.html"); + const filePath = path.join(this.serverRoot, "browser/workbench.html"); let [content, startPath] = await Promise.all([ util.promisify(fs.readFile)(filePath, "utf8"), this.getFirstValidPath([