Hide titlebar controls and fix menubar toggle (#550 )

Merge branch 'master' of github.com:codercom/code-server
Closes #466
2019-04-19 19:54:50 -05:00 · 2019-04-19 20:03:54 -04:00 · 2019-04-19 20:03:52 -04:00 · 2019-04-19 13:32:10 -05:00 · 2019-04-18 13:02:29 -05:00 · 2019-04-18 12:08:44 -05:00
61 changed files with 2814 additions and 899 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ doc/
 .travis.yml
 LICENSE
 README.md
+node_modules
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ dist
 out
 .DS_Store
 release
-.cache
+.vscode
+.cache
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-8.15.0
+10.15.1
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 node_js:
- 8.15.0
+- 10.15.1
 env:
-  - VSCODE_VERSION="1.33.0" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
+  - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
 matrix:
  include:
  - os: linux
--- a/15
+++ b/15
@@ -1,4 +1,4 @@
-FROM node:8.15.0
+FROM node:10.15.1

 # Install VS Code's deps. These are the only two it seems we need.
 RUN apt-get update && apt-get install -y \
@@ -24,7 +24,10 @@ RUN apt-get update && apt-get install -y \
 	git \
 	locales \
 	sudo \
-	dumb-init
+	dumb-init \
+	vim \
+	curl \
+	wget

 RUN locale-gen en_US.UTF-8
 # We unfortunately cannot use update-locale because docker will not use the env variables
@@ -36,9 +39,15 @@ RUN adduser --gecos '' --disabled-password coder && \

 USER coder
 # We create first instead of just using WORKDIR as when WORKDIR creates, the user is root.
-RUN mkdir -p /home/coder/project
+RUN mkdir -p /home/coder/project && \
+    chmod g+rw /home/coder/project;
+
 WORKDIR /home/coder/project

+# This assures we have a volume mounted even if the user forgot to do bind mount.
+# XXX: Workaround for GH-459 and for OpenShift compatibility.
+VOLUME [ "/home/coder/project" ]
+
 COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server
 EXPOSE 8443

--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 Try it out:
 ```bash
-docker run -it -p 127.0.0.1:8443:8443 -v "${PWD}:/home/coder/project" codercom/code-server:1.621 --allow-http --no-auth
+docker run -it -p 127.0.0.1:8443:8443 -v "${PWD}:/home/coder/project" codercom/code-server --allow-http --no-auth
 ```

 - Code on your Chromebook, tablet, and laptop with a consistent dev environment.
@@ -23,10 +23,6 @@ docker run -it -p 127.0.0.1:8443:8443 -v "${PWD}:/home/coder/project" codercom/c

 ## Getting Started

-### Hosted
-
-[Try `code-server` now](https://coder.com/signup) for free at coder.com.
-
 ### Docker

 See docker oneliner mentioned above. Dockerfile is at [/Dockerfile](/Dockerfile).
@@ -67,6 +63,12 @@ How to [secure your setup](/doc/security/ssl.md).

 At the moment we can't use the official VSCode Marketplace. We've created a custom extension marketplace focused around open-sourced extensions. However, if you have access to the `.vsix` file, you can manually install the extension.

+## Telemetry
+
+Use the `--disable-telemetry` flag or set `DISABLE_TELEMETRY=true` to disable tracking ENTIRELY.
+
+We use data collected to improve code-server.
+
 ## Contributing

 Development guides are coming soon.
--- a/build/tasks.ts
+++ b/build/tasks.ts
@@ -12,7 +12,7 @@ const libPath = path.join(__dirname, "../lib");
 const vscodePath = path.join(libPath, "vscode");
 const defaultExtensionsPath = path.join(libPath, "extensions");
 const pkgsPath = path.join(__dirname, "../packages");
-const vscodeVersion = process.env.VSCODE_VERSION || "1.33.0";
+const vscodeVersion = process.env.VSCODE_VERSION || "1.33.1";
 const vsSourceUrl = `https://codesrv-ci.cdr.sh/vstar-${vscodeVersion}.tar.gz`;

 const buildServerBinary = register("build:server:binary", async (runner) => {
@@ -48,19 +48,11 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
 	const bootstrapForkPath = path.join(pkgsPath, "vscode", "out", "bootstrap-fork.js");
 	const webOutputPath = path.join(pkgsPath, "web", "out");
 	const browserAppOutputPath = path.join(pkgsPath, "app", "browser", "out");
-	const nodePtyModule = path.join(pkgsPath, "protocol", "node_modules", "node-pty-prebuilt", "build", "Release", "pty.node");
-	const spdlogModule = path.join(pkgsPath, "protocol", "node_modules", "spdlog", "build", "Release", "spdlog.node");
 	let ripgrepPath = path.join(pkgsPath, "..", "lib", "vscode", "node_modules", "vscode-ripgrep", "bin", "rg");
 	if (isWin) {
 		ripgrepPath += ".exe";
 	}

-	if (!fs.existsSync(nodePtyModule)) {
-		throw new Error("Could not find pty.node. Ensure all packages have been installed");
-	}
-	if (!fs.existsSync(spdlogModule)) {
-		throw new Error("Could not find spdlog.node. Ensure all packages have been installed");
-	}
 	if (!fs.existsSync(webOutputPath)) {
 		throw new Error("Web bundle must be built");
 	}
@@ -75,24 +67,22 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
 	}
 	fse.copySync(defaultExtensionsPath, path.join(cliBuildPath, "extensions"));
 	fs.writeFileSync(path.join(cliBuildPath, "bootstrap-fork.js.gz"), zlib.gzipSync(fs.readFileSync(bootstrapForkPath)));
-	const cpDir = (dir: string, subdir: "auth" | "unauth", rootPath: string): void => {
+	const cpDir = (dir: string, rootPath: string, subdir?: "login"): void => {
 		const stat = fs.statSync(dir);
 		if (stat.isDirectory()) {
 			const paths = fs.readdirSync(dir);
-			paths.forEach((p) => cpDir(path.join(dir, p), subdir, rootPath));
+			paths.forEach((p) => cpDir(path.join(dir, p), rootPath, subdir));
 		} else if (stat.isFile()) {
-			const newPath = path.join(cliBuildPath, "web", subdir, path.relative(rootPath, dir));
+			const newPath = path.join(cliBuildPath, "web", subdir || "", path.relative(rootPath, dir));
 			fse.mkdirpSync(path.dirname(newPath));
 			fs.writeFileSync(newPath + ".gz", zlib.gzipSync(fs.readFileSync(dir)));
 		} else {
 			// Nothing
 		}
 	};
-	cpDir(webOutputPath, "auth", webOutputPath);
-	cpDir(browserAppOutputPath, "unauth", browserAppOutputPath);
+	cpDir(webOutputPath, webOutputPath);
+	cpDir(browserAppOutputPath, browserAppOutputPath, "login");
 	fse.mkdirpSync(path.join(cliBuildPath, "dependencies"));
-	fse.copySync(nodePtyModule, path.join(cliBuildPath, "dependencies", "pty.node"));
-	fse.copySync(spdlogModule, path.join(cliBuildPath, "dependencies", "spdlog.node"));
 	fse.copySync(ripgrepPath, path.join(cliBuildPath, "dependencies", "rg"));
 });

@@ -204,9 +194,9 @@ register("package", async (runner, releaseTag) => {
 	});

 	runner.cwd = releasePath;
-	await os.platform() === "linux"
+	await (os.platform() === "linux"
 		? runner.execute("tar", ["-cvzf", `${archiveName}.tar.gz`, `${archiveName}`])
-		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]);
+		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]));
 });

 run();
--- a/doc/admin/install/digitalocean.md
+++ b/doc/admin/install/digitalocean.md
@@ -39,7 +39,7 @@ If you're just starting out, we recommend [installing code-server locally](../..
  > To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../../security/ssl.md)
 - Finally start the code-server
  ```
-  sudo ./code-server-linux -p 80
+  sudo ./code-server -p 80
  ```
    > For instructions on how to keep the server running after you end your SSH session please checkout [how to use systemd](https://www.linode.com/docs/quick-answers/linux/start-service-at-boot/) to start linux based services if they are killed
 - When you visit the public IP for your Digital Ocean instance, you will be greeted with this page. Code-server is using a self-signed SSL certificate for easy setup. To proceed to the IDE, click **"Advanced"**<img src ="../../assets/chrome_warning.png">
--- a/doc/self-hosted/index.md
+++ b/doc/self-hosted/index.md
@@ -34,40 +34,44 @@ It takes just a few minutes to get your own self-hosted server running. If you'v
 code-server can be ran with a number of arguments to customize your working directory, host, port, and SSL certificate.

 ```
-USAGE
-  $ code-server [WORKDIR]
+Usage: code-server [options]

-ARGUMENTS
-  WORKDIR  [default: (directory to binary)] Specify working dir
+Run VS Code on a remote server.

-OPTIONS
-  -d, --data-dir=data-dir
-  -h, --host=host          [default: 0.0.0.0]
-  -o, --open               Open in browser on startup
-  -p, --port=port          [default: 8443] Port to bind on
-  -v, --version            show CLI version
-  --allow-http
-  --cert=cert
-  --cert-key=cert-key
-  --help                   show CLI help
-  --no-auth
-  --password=password
+Options:
+  -V, --version               output the version number
+  --cert <value>
+  --cert-key <value>
+  -e, --extensions-dir <dir>  Set the root path for extensions.
+  -d --user-data-dir <dir>    Specifies the directory that user data is kept in, useful when running as root.
+  --data-dir <value>          DEPRECATED: Use '--user-data-dir' instead. Customize where user-data is stored.
+  -h, --host <value>          Customize the hostname. (default: "0.0.0.0")
+  -o, --open                  Open in the browser on startup.
+  -p, --port <number>         Port to bind on. (default: 8443)
+  -N, --no-auth               Start without requiring authentication.
+  -H, --allow-http            Allow http connections.
+  -P, --password <value>      Specify a password for authentication.
+  --disable-telemetry         Disables ALL telemetry.
+  --help                      output usage information
  ```

  ### Data Directory
-  Use `code-server -d (path/to/directory)` or `code-server --data-dir=(path/to/directory)`, excluding the parentheses to specify the root folder that VS Code will start in
+  Use `code-server -d (path/to/directory)` or `code-server --data-dir=(path/to/directory)`, excluding the parentheses to specify the root folder that VS Code will start in.

  ### Host
  By default, code-server will use `0.0.0.0` as its address. This can be changed by using `code-server -h` or `code-server --host=` followed by the address you want to use.
  > Example: `code-server -h 127.0.0.1`

  ### Open
-  You can have the server automatically open the VS Code in your browser on startup by using the `code server -o` or `code-server --open` flags
+  You can have the server automatically open the VS Code in your browser on startup by using the `code-server -o` or `code-server --open` flags

  ### Port
  By default, code-server will use `8443` as its port. This can be changed by using `code-server -p` or `code-server --port=` followed by the port you want to use.
  > Example: `code-server -p 9000`

+  ### Telemetry
+  Disable all telemetry with `code-server --disable-telemetry`.
+
  ### Cert and Cert Key
  To encrypt the traffic between the browser and server use `code-server --cert=` followed by the path to your `.cer` file. Additionally, you can use certificate keys with `code-server --cert-key` followed by the path to your `.key` file.
 > Example (certificate and key): `code-server --cert /etc/letsencrypt/live/example.com/fullchain.cer --cert-key /etc/letsencrypt/live/example.com/fullchain.key`
@@ -116,4 +120,4 @@ OPTIONS
  *Important:* For more details about Apache reverse proxy configuration checkout the [documentation](https://httpd.apache.org/docs/current/mod/mod_proxy.html) - especially the [Securing your Server](https://httpd.apache.org/docs/current/mod/mod_proxy.html#access) section
  
  ### Help
-  Use `code-server -h` or `code-server --help` to view the usage for the cli. This is also shown at the beginning of this section. 
+  Use `code-server --help` to view the usage for the CLI. This is also shown at the beginning of this section.
--- a/package.json
+++ b/package.json
@@ -54,10 +54,17 @@
    "webpack-dev-middleware": "^3.5.0",
    "webpack-dev-server": "^3.1.14",
    "webpack-hot-middleware": "^2.24.3",
+    "webpack-pwa-manifest": "^4.0.0",
+    "workbox-webpack-plugin": "^4.1.0",
    "write-file-webpack-plugin": "^4.5.0"
  },
+  "resolutions": {
+    "bindings": "1.3.0"
+  },
  "dependencies": {
    "node-loader": "^0.6.0",
+    "node-pty": "0.8.1",
+    "spdlog": "0.8.1",
    "webpack-merge": "^4.2.1"
  }
 }
--- a/packages/app/browser/src/app.html
+++ b/packages/app/browser/src/app.html
@@ -7,22 +7,24 @@
 </head>

 <body>
-	<div class="login">
-		<div class="back"> <- Back </div>
-		<h4 class="title">code-server</h4>
-		<h2 class="subtitle">
-			Enter server password
-		</h2>
-		<div class="mdc-text-field">
-			<input type="password" id="password" class="mdc-text-field__input" required>
-			<label class="mdc-floating-label" for="password">Password</label>
-			<div class="mdc-line-ripple"></div>
-		</div>
-		<button id="submit" class="mdc-button mdc-button--unelevated">
-			<span class="mdc-button__label">Enter IDE</span>
-		</button>
-		<div id="error-display"></div>
-	</div>
+	<form id="login-form">
+		<div class="login">
+			<div class="back">
+				<- Back </div> <h4 class="title">code-server</h4>
+					<h2 class="subtitle">
+						Enter server password
+					</h2>
+						<div class="mdc-text-field">
+							<input type="password" id="password" class="mdc-text-field__input" required>
+							<label class="mdc-floating-label" for="password">Password</label>
+							<div class="mdc-line-ripple"></div>
+						</div>
+						<button id="submit" class="mdc-button mdc-button--unelevated">
+							<span class="mdc-button__label">Enter IDE</span>
+						</button>
+					<div id="error-display"></div>
+			</div>
+	</form>
 </body>

 </html>
--- a/packages/app/browser/src/app.ts
+++ b/packages/app/browser/src/app.ts
@@ -20,12 +20,17 @@ window.addEventListener("message", (event) => {
 });

 const password = document.getElementById("password") as HTMLInputElement;
-const submit = document.getElementById("submit") as HTMLButtonElement;
-if (!submit) {
-	throw new Error("No submit button found");
+const form = document.getElementById("login-form") as HTMLFormElement;
+
+if (!form) {
+	throw new Error("No password form found");
 }
-submit.addEventListener("click", () => {
-	document.cookie = `password=${password.value}`;
+
+form.addEventListener("submit", (e) => {
+	e.preventDefault();
+	document.cookie = `password=${password.value}; `
+		+ `path=${location.pathname.replace(/\/login\/?$/, "/")}; `
+		+ `domain=${location.hostname}`;
 	location.reload();
 });

@@ -38,4 +43,4 @@ const errorDisplay = document.getElementById("error-display") as HTMLDivElement;

 if (document.referrer === document.location.href && matches) {
 	errorDisplay.innerText = "Password is incorrect!";
-}
+}
--- a/packages/app/browser/webpack.config.js
+++ b/packages/app/browser/webpack.config.js
@@ -7,11 +7,10 @@ const root = path.resolve(__dirname, "../../..");

 module.exports = merge(
 	require(path.join(root, "scripts/webpack.client.config.js"))({
-		entry: path.join(root, "packages/app/browser/src/app.ts"),
-		template: path.join(root, "packages/app/browser/src/app.html"),
+		dirname: __dirname,
+		entry: path.join(__dirname, "src/app.ts"),
+		name: "login",
+		template: path.join(__dirname, "src/app.html"),
 	}), {
-		output: {
-			path: path.join(__dirname, "out"),
-		},
 	},
 );
--- a/packages/dns/webpack.config.js
+++ b/packages/dns/webpack.config.js
@@ -5,15 +5,12 @@ const root = path.resolve(__dirname, "../..");

 module.exports = merge(
 	require(path.join(root, "scripts/webpack.node.config.js"))({
-		// Options.
+		dirname: __dirname,
+		name: "dns",
 	}), {
 		externals: {
 			"node-named": "commonjs node-named",
 		},
-		output: {
-			path: path.join(__dirname, "out"),
-			filename: "main.js",
-		},
 		entry: [
 			"./packages/dns/src/dns.ts"
 		],
--- a/packages/ide-api/api.d.ts
+++ b/packages/ide-api/api.d.ts
@@ -136,12 +136,17 @@ interface ICommandRegistry {
 	registerCommand(command: ICommand): IDisposable;
 }

+interface IStorageService {
+	save(): Promise<void>;
+}
+
 declare namespace ide {
 	export const client: {};

 	export const workbench: {
 		readonly statusbarService: IStatusbarService;
 		readonly notificationService: INotificationService;
+		readonly storageService: IStorageService;
 		readonly menuRegistry: IMenuRegistry;
 		readonly commandRegistry: ICommandRegistry;

--- a/packages/ide-api/package.json
+++ b/packages/ide-api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@coder/ide-api",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"typings": "api.d.ts",
 	"author": "Coder",
 	"license": "MIT",
--- a/packages/ide/src/client.ts
+++ b/packages/ide/src/client.ts
@@ -34,6 +34,12 @@ export abstract class IdeClient {
 		this.loadTime = time(2500);

 		let appWindow: Window | undefined;
+
+		window.addEventListener("beforeunload", (e) => {
+			e.preventDefault(); // FireFox
+			e.returnValue = ""; // Chrome
+		});
+
 		window.addEventListener("message", (event) => {
 			if (event.data === "app") {
 				appWindow = event.source as Window;
--- a/packages/ide/src/fill/electron.ts
+++ b/packages/ide/src/fill/electron.ts
@@ -45,7 +45,8 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
 			},
 			set: (value: string): void => {
 				if (value) {
-					value = value.replace(/file:\/\//g, "/resource");
+					const resourceBaseUrl = location.pathname.replace(/\/$/, "") + "/resource";
+					value = value.replace(/file:\/\//g, resourceBaseUrl);
 				}
 				oldSrc!.set!.call(img, value);
 			},
@@ -66,7 +67,8 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
 			},
 			set: (value: string): void => {
 				if (value) {
-					value = value.replace(/file:\/\//g, "/resource");
+					const resourceBaseUrl = location.pathname.replace(/\/$/, "") + "/resource";
+					value = value.replace(/file:\/\//g, resourceBaseUrl);
 				}
 				oldInnerHtml!.set!.call(style, value);
 			},
@@ -80,7 +82,8 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
 				if (sheet && !overridden) {
 					const oldInsertRule = sheet.insertRule;
 					sheet.insertRule = (rule: string, index?: number): void => {
-						rule = rule.replace(/file:\/\//g, "/resource");
+						const resourceBaseUrl = location.pathname.replace(/\/$/, "") + "/resource";
+						rule = rule.replace(/file:\/\//g, resourceBaseUrl);
 						oldInsertRule.call(sheet, rule, index);
 					};
 					overridden = true;
@@ -145,8 +148,9 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
 		(view as any).send = (channel: string, ...args: any[]): void => { // tslint:disable-line no-any
 			if (args[0] && typeof args[0] === "object" && args[0].contents) {
 				// TODO
-				args[0].contents = (args[0].contents as string).replace(/"(file:\/\/[^"]*)"/g, (m1) => `"/resource${m1}"`);
-				args[0].contents = (args[0].contents as string).replace(/"vscode-resource:([^"]*)"/g, (m, m1) => `"/resource${m1}"`);
+				const resourceBaseUrl = location.pathname.replace(/\/$/, "") + "/resource";
+				args[0].contents = (args[0].contents as string).replace(/"(file:\/\/[^"]*)"/g, (m1) => `"${resourceBaseUrl}${m1}"`);
+				args[0].contents = (args[0].contents as string).replace(/"vscode-resource:([^"]*)"/g, (m, m1) => `"${resourceBaseUrl}${m1}"`);
 				args[0].contents = (args[0].contents as string).replace(/style-src vscode-core-resource:/g, "style-src 'self'");
 			}
 			if (view.contentWindow) {
@@ -182,6 +186,10 @@ class Clipboard {
 	public writeText(value: string): Promise<void> {
 		return clipboard.writeText(value);
 	}
+
+	public readText(): Promise<string> {
+		return clipboard.readText();
+	}
 }

 class Shell {
--- a/packages/ide/src/retry.ts
+++ b/packages/ide/src/retry.ts
@@ -75,7 +75,7 @@ export class Retry {

 	// Times are in seconds.
 	private readonly retryMinDelay = 1;
-	private readonly retryMaxDelay = 10;
+	private readonly retryMaxDelay = 3;
 	private readonly maxImmediateRetries = 5;
 	private readonly retryExponent = 1.5;
 	private blocked: string | boolean | undefined;
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -5,9 +5,12 @@
 		"build": "tsc -p tsconfig.build.json && cp ./out/packages/logger/src/* ./out && rm -rf out/packages && ../../node_modules/.bin/webpack --config ./webpack.config.js",
 		"postinstall": "if [ ! -d out ];then npm run build; fi"
 	},
-	"version": "1.0.3",
+	"version": "1.1.3",
 	"main": "out/main.js",
 	"types": "out/index.d.ts",
 	"author": "Coder",
-	"license": "MIT"
+	"license": "MIT",
+	"dependencies": {
+		"@google-cloud/logging": "^4.5.2"
+	}
 }
--- a/packages/logger/src/extender.test.ts
+++ b/packages/logger/src/extender.test.ts
@@ -0,0 +1,12 @@
+import { field, logger } from "./logger";
+import { createStackdriverExtender } from "./extender";
+
+describe("Extender", () => {
+	it("should add stackdriver extender", () => {
+		logger.extend(createStackdriverExtender("coder-dev-1", "logging-package-tests"));
+	});
+
+	it("should log", async () => {
+		logger.debug("Bananas!", field("frog", { hi: "wow" }));
+	});
+});
--- a/packages/logger/src/extender.ts
+++ b/packages/logger/src/extender.ts
@@ -0,0 +1,63 @@
+import * as gcl from "@google-cloud/logging";
+import { Extender, logger, field } from "./logger";
+
+export const createStackdriverExtender = (projectId: string, logId: string): Extender => {
+	enum GcpLogSeverity {
+		DEFAULT = 0,
+		DEBUG = 100,
+		INFO = 200,
+		NOTICE = 300,
+		WARNING = 400,
+		ERROR = 500,
+		CRITICAL = 600,
+		ALERT = 700,
+		EMERGENCY = 800,
+	}
+
+	const logging = new gcl.Logging({
+		autoRetry: true,
+		projectId,
+	});
+
+	const log = logging.log(logId);
+	const convertSeverity = (severity: "trace" | "info" | "warn" | "debug" | "error"): GcpLogSeverity => {
+		switch (severity) {
+			case "trace":
+			case "debug":
+				return GcpLogSeverity.DEBUG;
+			case "info":
+				return GcpLogSeverity.INFO;
+			case "error":
+				return GcpLogSeverity.ERROR;
+			case "warn":
+				return GcpLogSeverity.WARNING;
+		}
+	};
+
+	return (options): void => {
+		const severity = convertSeverity(options.type);
+		// tslint:disable-next-line:no-any
+		const metadata = {} as any;
+		if (options.fields) {
+			options.fields.forEach((f) => {
+				if (!f) {
+					return;
+				}
+				metadata[f.identifier] = f.value;
+			});
+		}
+
+		const entry = log.entry({
+			// tslint:disable-next-line:no-any
+			severity: severity as any,
+		}, {
+			...metadata,
+			message: options.message,
+		});
+
+		log.write(entry).catch((ex) => {
+			logger.named("GCP").error("Failed to log", field("error", ex));
+		});
+	};
+
+};
--- a/packages/logger/src/logger.ts
+++ b/packages/logger/src/logger.ts
@@ -59,6 +59,14 @@ export const field = <T>(name: string, value: T): Field<T> => {
 	return new Field(name, value);
 };

+export type Extender = (msg: {
+	message: string,
+	level: Level,
+	type: "trace" | "info" | "warn" | "debug" | "error",
+	fields?: FieldArray,
+	section?: string,
+}) => void;
+
 /**
 * This formats & builds text for logging.
 * It should only be used to build one log item at a time since it stores the
@@ -221,6 +229,7 @@ export class Logger {
 		private _formatter: Formatter,
 		private readonly name?: string,
 		private readonly defaultFields?: FieldArray,
+		private readonly extenders: Extender[] = [],
 	) {
 		if (name) {
 			this.nameColor = this.hashStringToColor(name);
@@ -248,6 +257,10 @@ export class Logger {
 		this.muted = true;
 	}

+	public extend(extender: Extender): void {
+		this.extenders.push(extender);
+	}
+
 	/**
 	 * Outputs information.
 	 */
@@ -328,7 +341,7 @@ export class Logger {
 	 * Each name is deterministically generated a color.
 	 */
 	public named(name: string, ...fields: FieldArray): Logger {
-		const l = new Logger(this._formatter, name, fields);
+		const l = new Logger(this._formatter, name, fields, this.extenders);
 		if (this.muted) {
 			l.mute();
 		}
@@ -393,6 +406,16 @@ export class Logger {
 			console.log(...this._formatter.flush());
 		}
 		// tslint:enable no-console
+
+		this.extenders.forEach((extender) => {
+			extender({
+				section: this.name,
+				fields: options.fields,
+				level: options.level,
+				message: options.message as string,
+				type: options.type,
+			});
+		});
 	}

 	/**
--- a/packages/logger/webpack.config.js
+++ b/packages/logger/webpack.config.js
@@ -1,16 +1,34 @@
 const path = require("path");
 const merge = require("webpack-merge");

-module.exports = merge(require(path.join(__dirname, "../../scripts", "webpack.general.config.js"))(), {
-	devtool: "none",
-	mode: "production",
-	target: "node",
-	output: {
-		path: path.join(__dirname, "out"),
-		filename: "main.js",
-		libraryTarget: "commonjs",
-	},
-	entry: [
-		"./packages/logger/src/index.ts"
-	],
-});
+module.exports = [
+	merge(require(path.join(__dirname, "../../scripts", "webpack.general.config.js"))(), {
+		devtool: "none",
+		mode: "production",
+		target: "node",
+		output: {
+			path: path.join(__dirname, "out"),
+			filename: "main.js",
+			libraryTarget: "commonjs",
+		},
+		entry: [
+			"./packages/logger/src/index.ts"
+		],
+	}),
+	merge(require(path.join(__dirname, "../../scripts", "webpack.general.config.js"))(), {
+		devtool: "none",
+		mode: "production",
+		target: "node",
+		output: {
+			path: path.join(__dirname, "out"),
+			filename: "extender.js",
+			libraryTarget: "commonjs",
+		},
+		externals: {
+			"@google-cloud/logging": "commonjs @google-cloud/logging",
+		},
+		entry: [
+			"./packages/logger/src/extender.ts"
+		],
+	}),
+];
--- a/packages/logger/yarn.lock
+++ b/packages/logger/yarn.lock
--- a/packages/package.json
+++ b/packages/package.json
@@ -33,8 +33,7 @@
      "@coder/(.*)/test": "<rootDir>/$1/test",
      "@coder/(.*)": "<rootDir>/$1/src",
      "vs/(.*)": "<rootDir>/../lib/vscode/src/vs/$1",
-      "vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts",
-      "^node-pty": "node-pty-prebuilt"
+      "vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts"
    },
    "transform": {
      "^.+\\.tsx?$": "ts-jest"
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -4,8 +4,6 @@
    "dependencies": {
        "express": "^4.16.4",
        "google-protobuf": "^3.6.1",
-        "node-pty-prebuilt": "^0.7.6",
-        "spdlog": "^0.7.2",
        "trash": "^4.3.0",
        "ws": "^6.1.2"
    },
--- a/packages/protocol/src/browser/client.ts
+++ b/packages/protocol/src/browser/client.ts
@@ -174,9 +174,10 @@ export class Client {
 	 * Make a remote call for a proxy's method using proto.
 	 */
 	private remoteCall(proxyId: number | Module, method: string, args: any[]): Promise<any> {
-		if (this.disconnected && typeof proxyId === "number") {
-			// Can assume killing or closing works because a disconnected proxy
-			// is disposed on the server's side.
+		if (typeof proxyId === "number" && (this.disconnected || !this.proxies.has(proxyId))) {
+			// Can assume killing or closing works because a disconnected proxy is
+			// disposed on the server's side, and a non-existent proxy has already
+			// been disposed.
 			switch (method) {
 				case "close":
 				case "kill":
--- a/packages/protocol/yarn.lock
+++ b/packages/protocol/yarn.lock
@@ -64,29 +64,6 @@ accepts@~1.3.5:
    mime-types "~2.1.18"
    negotiator "0.6.1"

-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 array-flatten@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -114,21 +91,6 @@ balanced-match@^1.0.0:
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

-bindings@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bl@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.1.1"
-
 body-parser@1.18.3:
  version "1.18.3"
  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
@@ -153,49 +115,16 @@ brace-expansion@^1.1.7:
    balanced-match "^1.0.0"
    concat-map "0.0.1"

-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
 bytes@3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=

-chownr@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 content-disposition@0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@@ -216,11 +145,6 @@ cookie@0.3.1:
  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=

-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
 cross-spawn-async@^2.1.1:
  version "2.2.5"
  resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -247,23 +171,6 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -274,11 +181,6 @@ destroy@~1.0.4:
  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=

-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 dir-glob@^2.0.0:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -296,13 +198,6 @@ encodeurl@~1.0.2:
  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=

-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
-
 escape-html@~1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -342,11 +237,6 @@ execa@^0.2.2:
    path-key "^1.0.0"
    strip-eof "^1.0.0"

-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 express@^4.16.4:
  version "4.16.4"
  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
@@ -383,11 +273,6 @@ express@^4.16.4:
    utils-merge "1.0.1"
    vary "~1.1.2"

-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 finalhandler@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -411,11 +296,6 @@ fresh@0.5.2:
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=

-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
 fs-extra@^0.30.0:
  version "0.30.0"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -432,30 +312,11 @@ fs.realpath@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 get-stream@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=

-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
 glob@^7.1.2, glob@^7.1.3:
  version "7.1.3"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -490,11 +351,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==

-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
  version "1.6.3"
  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -525,43 +381,21 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.3, inherits@~2.0.3:
+inherits@2, inherits@2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
 ipaddr.js@1.8.0:
  version "1.8.0"
  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=

-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=

-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -621,11 +455,6 @@ mime@1.4.1:
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==

-mimic-response@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
 minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -633,23 +462,6 @@ minimatch@^3.0.4:
  dependencies:
    brace-expansion "^1.1.7"

-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
 mount-point@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/mount-point/-/mount-point-3.0.0.tgz#665cb9edebe80d110e658db56c31d0aef51a8f97"
@@ -664,21 +476,6 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

-nan@2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
-  integrity sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==
-
-nan@^2.8.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
-  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
-
-napi-build-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
-  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
-
 negotiator@0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -689,26 +486,6 @@ nice-try@^1.0.4:
  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

-node-abi@^2.7.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.7.1.tgz#a8997ae91176a5fbaa455b194976e32683cda643"
-  integrity sha512-OV8Bq1OrPh6z+Y4dqwo05HqrRL9YNF7QVMRfq1/pguwKLG+q9UB/Lk0x5qXjO23JjJg+/jqCHSTaG1P3tfKfuw==
-  dependencies:
-    semver "^5.4.1"
-
-node-pty-prebuilt@^0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/node-pty-prebuilt/-/node-pty-prebuilt-0.7.6.tgz#c04c41e40a527ed894bf0ee801f40e5fd6f5faf6"
-  integrity sha512-aD/77N6WmohtWMhdHaBMunOihpZzDcp5Ig1cHsmtYNxl5NU8+3r9aGkfbKWUDYrPQaFgbJEAWfGeb3NFYd1+0g==
-  dependencies:
-    nan "2.10.0"
-    prebuild-install "^5.0.0"
-
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
-
 npm-run-path@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f"
@@ -723,22 +500,7 @@ npm-run-path@^2.0.0:
  dependencies:
    path-key "^2.0.0"

-npmlog@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -750,14 +512,14 @@ on-finished@~2.3.0:
  dependencies:
    ee-first "1.1.1"

-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
@@ -831,33 +593,6 @@ pinkie@^2.0.0:
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=

-prebuild-install@^5.0.0:
-  version "5.2.5"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.2.5.tgz#c7485911fe98950b7f7cd15bb9daee11b875cc44"
-  integrity sha512-6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w==
-  dependencies:
-    detect-libc "^1.0.3"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
-    noop-logger "^0.1.1"
-    npmlog "^4.0.1"
-    os-homedir "^1.0.1"
-    pump "^2.0.1"
-    rc "^1.2.7"
-    simple-get "^2.7.0"
-    tar-fs "^1.13.0"
-    tunnel-agent "^0.6.0"
-    which-pm-runs "^1.0.0"
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
 proxy-addr@~2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
@@ -871,22 +606,6 @@ pseudomap@^1.0.2:
  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=

-pump@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
-  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 qs@6.5.2:
  version "6.5.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -907,29 +626,6 @@ raw-body@2.3.3:
    iconv-lite "0.4.23"
    unpipe "1.0.0"

-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 rimraf@^2.2.8, rimraf@^2.6.3:
  version "2.6.3"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -944,7 +640,7 @@ run-applescript@^3.0.0:
  dependencies:
    execa "^0.10.0"

-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -954,7 +650,7 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, s
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-semver@^5.4.1, semver@^5.5.0:
+semver@^5.5.0:
  version "5.6.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -988,11 +684,6 @@ serve-static@1.13.2:
    parseurl "~1.3.2"
    send "0.16.2"

-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 setprototypeof@1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -1015,34 +706,11 @@ signal-exit@^3.0.0:
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=

-simple-concat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
-  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
-
-simple-get@^2.7.0:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
-  integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
-  dependencies:
-    decompress-response "^3.3.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
 slash@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=

-spdlog@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.7.2.tgz#9298753d7694b9ee9bbfd7e01ea1e4c6ace1e64d"
-  integrity sha512-rHfWCaWMD4NindDnql6rc6kn7Bs8JR92jhiUpCl3D6v+jYcQ6GozMLig0RliOOR8st5mU+IHLZnr15fBys5x/Q==
-  dependencies:
-    bindings "^1.3.0"
-    mkdirp "^0.5.1"
-    nan "^2.8.0"
-
 "statuses@>= 1.4.0 < 2":
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -1053,87 +721,16 @@ statuses@~1.4.0:
  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==

-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-eof@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=

-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-tar-fs@^1.13.0:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
-  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
-  dependencies:
-    chownr "^1.0.1"
-    mkdirp "^0.5.1"
-    pump "^1.0.0"
-    tar-stream "^1.1.2"
-
-tar-stream@^1.1.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
-  dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
-    xtend "^4.0.0"
-
 text-encoding@^0.7.0:
  version "0.7.0"
  resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
  integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==

-to-buffer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
-
 trash@^4.3.0:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/trash/-/trash-4.3.0.tgz#6ebeecdea4d666b06e389b47d135ea88e1de5075"
@@ -1156,13 +753,6 @@ ts-protoc-gen@^0.8.0:
  dependencies:
    google-protobuf "^3.6.1"

-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
 type-is@~1.6.16:
  version "1.6.16"
  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -1183,11 +773,6 @@ user-home@^2.0.0:
  dependencies:
    os-homedir "^1.0.0"

-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
 utils-merge@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -1203,11 +788,6 @@ vary@~1.1.2:
  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=

-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
 which@^1.2.8, which@^1.2.9:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -1215,13 +795,6 @@ which@^1.2.8, which@^1.2.9:
  dependencies:
    isexe "^2.0.0"

-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -1252,11 +825,6 @@ xdg-trashdir@^2.1.1:
    user-home "^2.0.0"
    xdg-basedir "^2.0.0"

-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
 yallist@^2.1.2:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -9,7 +9,7 @@
 		"build:binary": "ts-node scripts/nbin.ts"
 	},
 	"dependencies": {
-		"@coder/nbin": "^1.0.7",
+		"@coder/nbin": "^1.1.2",
 		"commander": "^2.19.0",
 		"express": "^4.16.4",
 		"express-static-gzip": "^1.1.3",
--- a/packages/server/scripts/nbin.ts
+++ b/packages/server/scripts/nbin.ts
@@ -10,6 +10,16 @@ const bin = new Binary({
 });
 bin.writeFiles(path.join(rootDir, "build", "**"));
 bin.writeFiles(path.join(rootDir, "out", "**"));
+[
+	// Native modules. These are marked as externals in the webpack config.
+	"spdlog",
+	"node-pty",
+
+	// These are spdlog's dependencies.
+	"mkdirp", "bindings",
+].forEach((name) => {
+	bin.writeModule(path.join(__dirname, "../../../node_modules", name));
+});
 bin.build().then((binaryData) => {
 	const outputPath = path.join(__dirname, "..", `cli-${target}`);
 	fs.writeFileSync(outputPath, binaryData);
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -1,6 +1,6 @@
 import { field, logger } from "@coder/logger";
 import { ServerMessage, SharedProcessActive } from "@coder/protocol/src/proto";
-import { ChildProcess, fork, ForkOptions, spawn } from "child_process";
+import { ChildProcess, fork, ForkOptions } from "child_process";
 import { randomFillSync } from "crypto";
 import * as fs from "fs";
 import * as fse from "fs-extra";
@@ -8,9 +8,8 @@ import * as os from "os";
 import * as path from "path";
 import * as WebSocket from "ws";
 import { buildDir, cacheHome, dataHome, isCli, serveStatic } from "./constants";
-import { setup as setupNativeModules } from "./modules";
 import { createApp } from "./server";
-import { forkModule, requireFork, requireModule } from "./vscode/bootstrapFork";
+import { forkModule, requireModule } from "./vscode/bootstrapFork";
 import { SharedProcess, SharedProcessState } from "./vscode/sharedProcess";
 import opn = require("opn");

@@ -26,12 +25,13 @@ commander.version(process.env.VERSION || "development")
 	.option("--data-dir <value>", "DEPRECATED: Use '--user-data-dir' instead. Customize where user-data is stored.")
 	.option("-h, --host <value>", "Customize the hostname.", "0.0.0.0")
 	.option("-o, --open", "Open in the browser on startup.", false)
-	.option("-p, --port <number>", "Port to bind on.", 8443)
+	.option("-p, --port <number>", "Port to bind on.", parseInt(process.env.PORT!, 10) || 8443)
 	.option("-N, --no-auth", "Start without requiring authentication.", undefined)
 	.option("-H, --allow-http", "Allow http connections.", false)
-	.option("-P, --password <value>", "Specify a password for authentication.")
+	.option("-P, --password <value>", "DEPRECATED: Use the PASSWORD environment variable instead. Specify a password for authentication.")
+	.option("--disable-telemetry", "Disables ALL telemetry.", false)
+	.option("--install-extension <value>", "Install an extension by its ID.")
 	.option("--bootstrap-fork <name>", "Used for development. Never set.")
-	.option("--fork <name>", "Used for development. Never set.")
 	.option("--extra-args <args>", "Used for development. Never set.")
 	.arguments("Specify working directory.")
 	.parse(process.argv);
@@ -39,6 +39,7 @@ commander.version(process.env.VERSION || "development")
 Error.stackTraceLimit = Infinity;
 if (isCli) {
 	require("nbin").shimNativeFs(buildDir);
+	require("nbin").shimNativeFs("/node_modules");
 }
 // Makes strings or numbers bold in stdout
 const bold = (text: string | number): string | number => {
@@ -52,6 +53,7 @@ const bold = (text: string | number): string | number => {
 		readonly allowHttp: boolean;
 		readonly host: string;
 		readonly port: number;
+		readonly disableTelemetry: boolean;

 		readonly userDataDir?: string;
 		readonly extensionsDir?: string;
@@ -62,11 +64,16 @@ const bold = (text: string | number): string | number => {
 		readonly cert?: string;
 		readonly certKey?: string;

+		readonly installExtension?: string;
+
 		readonly bootstrapFork?: string;
-		readonly fork?: string;
 		readonly extraArgs?: string;
 	};

+	if (options.disableTelemetry) {
+		process.env.DISABLE_TELEMETRY = "true";
+	}
+
 	// Commander has an exception for `--no` prefixes. Here we'll adjust that.
 	// tslint:disable-next-line:no-any
 	const noAuthValue = (commander as any).auth;
@@ -75,6 +82,7 @@ const bold = (text: string | number): string | number => {
 	const dataDir = path.resolve(options.userDataDir || options.dataDir || path.join(dataHome, "code-server"));
 	const extensionsDir = options.extensionsDir ? path.resolve(options.extensionsDir) : path.resolve(dataDir, "extensions");
 	const workingDir = path.resolve(args[0] || process.cwd());
+	const dependenciesDir = path.join(os.tmpdir(), "code-server/dependencies");

 	if (!fs.existsSync(dataDir)) {
 		const oldDataDir = path.resolve(path.join(os.homedir(), ".code-server"));
@@ -89,9 +97,22 @@ const bold = (text: string | number): string | number => {
 		fse.mkdirp(dataDir),
 		fse.mkdirp(extensionsDir),
 		fse.mkdirp(workingDir),
+		fse.mkdirp(dependenciesDir),
 	]);

-	setupNativeModules(dataDir);
+	const unpackExecutable = (binaryName: string): void => {
+		const memFile = path.join(isCli ? buildDir! : path.join(__dirname, ".."), "build/dependencies", binaryName);
+		const diskFile = path.join(dependenciesDir, binaryName);
+		if (!fse.existsSync(diskFile)) {
+			fse.writeFileSync(diskFile, fse.readFileSync(memFile));
+		}
+		fse.chmodSync(diskFile, "755");
+	};
+
+	unpackExecutable("rg");
+	// tslint:disable-next-line no-any
+	(<any>global).RIPGREP_LOCATION = path.join(dependenciesDir, "rg");
+
 	const builtInExtensionsDir = path.resolve(buildDir || path.join(__dirname, ".."), "build/extensions");
 	if (options.bootstrapFork) {
 		const modulePath = options.bootstrapFork;
@@ -100,19 +121,13 @@ const bold = (text: string | number): string | number => {
 			process.exit(1);
 		}

-		((options.extraArgs ? JSON.parse(options.extraArgs) : []) as string[]).forEach((arg, i) => {
-			// [0] contains the binary running the script (`node` for example) and
-			// [1] contains the script name, so the arguments come after that.
-			process.argv[i + 2] = arg;
-		});
+		process.argv = [
+			process.argv[0],
+			process.argv[1],
+			...(options.extraArgs ? JSON.parse(options.extraArgs) : []),
+		];

-		return requireModule(modulePath, dataDir, builtInExtensionsDir);
-	}
-
-	if (options.fork) {
-		const modulePath = options.fork;
-
-		return requireFork(modulePath, JSON.parse(options.extraArgs!), builtInExtensionsDir);
+		return requireModule(modulePath, builtInExtensionsDir);
 	}

 	const logDir = path.join(cacheHome, "code-server/logs", new Date().toISOString().replace(/[-:.TZ]/g, ""));
@@ -156,6 +171,26 @@ const bold = (text: string | number): string | number => {
 		logger.warn('"--data-dir" is deprecated. Use "--user-data-dir" instead.');
 	}

+	if (options.installExtension) {
+		const fork = forkModule("vs/code/node/cli", [
+			"--user-data-dir", dataDir,
+			"--builtin-extensions-dir", builtInExtensionsDir,
+			"--extensions-dir", extensionsDir,
+			"--install-extension", options.installExtension,
+		], {
+			env: {
+				VSCODE_ALLOW_IO: "true",
+				VSCODE_LOGS: process.env.VSCODE_LOGS,
+			},
+		}, dataDir);
+
+		fork.stdout.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.info(l)));
+		fork.stderr.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.error(l)));
+		fork.on("exit", () => process.exit());
+
+		return;
+	}
+
 	// TODO: fill in appropriate doc url
 	logger.info("Additional documentation: http://github.com/codercom/code-server");
 	logger.info("Initializing", field("data-dir", dataDir), field("extensions-dir", extensionsDir), field("working-dir", workingDir), field("log-dir", logDir));
@@ -174,7 +209,11 @@ const bold = (text: string | number): string | number => {
 		}
 	});

-	let password = options.password;
+	if (options.password) {
+		logger.warn('"--password" is deprecated. Use the PASSWORD environment variable instead.');
+	}
+
+	let password = options.password || process.env.PASSWORD;
 	if (!password) {
 		// Generate a random password with a length of 24.
 		const buffer = Buffer.alloc(12);
@@ -187,20 +226,19 @@ const bold = (text: string | number): string | number => {
 		allowHttp: options.allowHttp,
 		bypassAuth: options.noAuth,
 		registerMiddleware: (app): void => {
-			app.use((req, res, next) => {
-				res.on("finish", () => {
-					logger.trace(`\u001B[1m${req.method} ${res.statusCode} \u001B[0m${req.url}`, field("host", req.hostname), field("ip", req.ip));
-				});
-
-				next();
-			});
 			// If we're not running from the binary and we aren't serving the static
 			// pre-built version, use webpack to serve the web files.
 			if (!isCli && !serveStatic) {
 				const webpackConfig = require(path.resolve(__dirname, "..", "..", "web", "webpack.config.js"));
 				const compiler = require("webpack")(webpackConfig);
 				app.use(require("webpack-dev-middleware")(compiler, {
-					logger,
+					logger: {
+						trace: (m: string): void => logger.trace("webpack", field("message", m)),
+						debug: (m: string): void => logger.debug("webpack", field("message", m)),
+						info: (m: string): void => logger.info("webpack", field("message", m)),
+						warn: (m: string): void => logger.warn("webpack", field("message", m)),
+						error: (m: string): void => logger.error("webpack", field("message", m)),
+					},
 					publicPath: webpackConfig.output.publicPath,
 					stats: webpackConfig.stats,
 				}));
@@ -218,14 +256,7 @@ const bold = (text: string | number): string | number => {
 					return forkModule(options.env.AMD_ENTRYPOINT, args, options, dataDir);
 				}

-				if (isCli) {
-					return spawn(process.execPath, [path.join(buildDir, "out", "cli.js"), "--fork", modulePath, "--extra-args", JSON.stringify(args), "--data-dir", dataDir], {
-						...options,
-						stdio: [null, null, null, "ipc"],
-					});
-				} else {
-					return fork(modulePath, args, options);
-				}
+				return fork(modulePath, args, options);
 			},
 		},
 		password,
--- a/packages/server/src/modules.ts
+++ b/packages/server/src/modules.ts
@@ -1,53 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import * as os from "os";
-import { isCli, buildDir } from "./constants";
-
-/**
- * Handling of native modules within the CLI
- */
-export const setup = (dataDirectory: string): void => {
-	path.resolve(dataDirectory, "dependencies").split(path.sep).reduce((parentDir, childDir) => {
-		const currentDir = path.join(parentDir, childDir);
-		try {
-			fs.mkdirSync(currentDir);
-		} catch (ex) {
-			if (ex.code !== "EEXIST" && ex.code !== "EISDIR" && ex.code !== "ENOENT") {
-				throw ex;
-			}
-		}
-
-		return currentDir;
-	}, os.platform() === "win32" ? undefined! : path.sep); // Might need path.sep here for linux. Having it for windows causes an error because \C:\Users ...
-
-	const unpackModule = (moduleName: string, markExecutable: boolean = false): void => {
-		const memFile = path.join(isCli ? buildDir! : path.join(__dirname, ".."), "build/dependencies", moduleName);
-		const diskFile = path.join(dataDirectory, "dependencies", moduleName);
-		if (!fs.existsSync(diskFile)) {
-			fs.writeFileSync(diskFile, fs.readFileSync(memFile));
-		}
-		if (markExecutable) {
-			fs.chmodSync(diskFile, "755");
-		}
-	};
-
-	/**
-	 * We need to unpack node-pty and patch its `loadNative` function to require our unpacked pty.node
-	 * If pty.node isn't unpacked a SIGSEGV is thrown and the application exits. The exact reasoning
-	 * for this is unknown ATM, but this patch works around it.
-	 */
-	unpackModule("pty.node");
-	unpackModule("spdlog.node");
-	unpackModule("rg", true);
-	// const nodePtyUtils = require("../../protocol/node_modules/node-pty-prebuilt/lib/utils") as typeof import("../../protocol/node_modules/node-pty-prebuilt/src/utils");
-	// tslint:disable-next-line:no-any
-	// nodePtyUtils.loadNative = (modName: string): any => {
-	// 	return (typeof __non_webpack_require__ !== "undefined" ? __non_webpack_require__ : require)(path.join(dataDirectory, "dependencies", modName + ".node"));
-	// };
-	(<any>global).RIPGREP_LOCATION = path.join(dataDirectory, "dependencies", "rg");
-	(<any>global).NODEPTY_LOCATION = path.join(dataDirectory, "dependencies", "pty.node");
-	// tslint:disable-next-line:no-any
-	(<any>global).SPDLOG_LOCATION = path.join(dataDirectory, "dependencies", "spdlog.node");
-	// tslint:disable-next-line:no-unused-expression
-	require("../../protocol/node_modules/node-pty-prebuilt/lib/index") as typeof import("../../protocol/node_modules/node-pty-prebuilt/src/index");
-};
--- a/packages/server/src/portScanner.ts
+++ b/packages/server/src/portScanner.ts
@@ -79,7 +79,11 @@ export const createPortScanner = (scanInterval: number = 5000): PortScanner => {
 		logger.trace("scanning ports");
 		scan((error) => {
 			if (error) {
-				logger.error(`Port scanning will not be available: ${error.message}.`);
+				if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+					logger.warn("Port scanning will not be available because netstat is not installed");
+				} else {
+					logger.warn(`Port scanning will not be available: ${error.message}`);
+				}
 				disposed = true;
 			} else if (!disposed) {
 				lastTimeout = setTimeout(doInterval, scanInterval);
--- a/packages/server/src/server.ts
+++ b/packages/server/src/server.ts
@@ -18,6 +18,7 @@ import * as os from "os";
 import * as path from "path";
 import * as pem from "pem";
 import * as util from "util";
+import * as url from "url";
 import * as ws from "ws";
 import { buildDir } from "./constants";
 import { createPortScanner } from "./portScanner";
@@ -140,13 +141,13 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 	};

 	const portScanner = createPortScanner();
-	wss.on("connection", (ws, req) => {
+	wss.on("connection", async (ws, req) => {
 		if (req.url && req.url.startsWith("/tunnel")) {
 			try {
 				const rawPort = req.url.split("/").pop();
 				const port = Number.parseInt(rawPort!, 10);

-				handleTunnel(ws, port);
+				await handleTunnel(ws, port);
 			} catch (ex) {
 				ws.close(TunnelCloseCode.Error, ex.toString());
 			}
@@ -189,31 +190,70 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 		new Server(connection, options.serverOptions);
 	});

+	const redirect = (
+		req: express.Request, res: express.Response,
+		to: string = "", from: string = "",
+		code: number = 302, protocol: string = req.protocol,
+	): void => {
+		const currentUrl = `${protocol}://${req.headers.host}${req.originalUrl}`;
+		const newUrl = url.parse(currentUrl);
+		if (from && newUrl.pathname) {
+			newUrl.pathname = newUrl.pathname.replace(new RegExp(`\/${from}\/?$`), "/");
+		}
+		if (to) {
+			newUrl.pathname = (newUrl.pathname || "").replace(/\/$/, "") + `/${to}`;
+		}
+		newUrl.path = undefined; // Path is not necessary for format().
+		const newUrlString = url.format(newUrl);
+		logger.trace(`Redirecting from ${currentUrl} to ${newUrlString}`);
+
+		return res.redirect(code, newUrlString);
+	};
+
 	const baseDir = buildDir || path.join(__dirname, "..");
-	const authStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/auth"));
-	const unauthStaticFunc = expressStaticGzip(path.join(baseDir, "build/web/unauth"));
+	const staticGzip = expressStaticGzip(path.join(baseDir, "build/web"));
+
 	app.use((req, res, next) => {
+		logger.trace(`\u001B[1m${req.method} ${res.statusCode} \u001B[0m${req.originalUrl}`, field("host", req.hostname), field("ip", req.ip));
+
+		// Force HTTPS unless allowing HTTP.
 		if (!isEncrypted(req.socket) && !options.allowHttp) {
-			return res.redirect(301, `https://${req.headers.host!}${req.path}`);
+			return redirect(req, res, "", "", 301, "https");
 		}

-		if (isAuthed(req)) {
-			// We can serve the actual VSCode bin
-			authStaticFunc(req, res, next);
-		} else {
-			// Serve only the unauthed version
-			unauthStaticFunc(req, res, next);
-		}
-	});
-	// @ts-ignore
-	app.use((err, req, res, next) => {
 		next();
 	});
-	app.get("/ping", (req, res) => {
+
+	// @ts-ignore
+	app.use((err, _req, _res, next) => {
+		logger.error(err.message);
+		next();
+	});
+
+	// If not authenticated, redirect to the login page.
+	app.get("/", (req, res, next) => {
+		if (!isAuthed(req)) {
+			return redirect(req, res, "login");
+		}
+		next();
+	});
+
+	// If already authenticated, redirect back to the root.
+	app.get("/login", (req, res, next) => {
+		if (isAuthed(req)) {
+			return redirect(req, res, "", "login");
+		}
+		next();
+	});
+
+	// For getting general server data.
+	app.get("/ping", (_req, res) => {
 		res.json({
 			hostname: os.hostname(),
 		});
 	});
+
+	// For getting a resource on disk.
 	app.get("/resource/:url(*)", async (req, res) => {
 		if (!ensureAuthed(req, res)) {
 			return;
@@ -254,6 +294,8 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 			res.end();
 		}
 	});
+
+	// For writing a resource to disk.
 	app.post("/resource/:url(*)", async (req, res) => {
 		if (!ensureAuthed(req, res)) {
 			return;
@@ -271,7 +313,7 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 				const body = data.join("");
 				await mkdirp(path.dirname(fullPath));
 				fs.writeFileSync(fullPath, body);
-				logger.debug("Wrote resource", field("path", fullPath), field("content-length", body.length));
+				logger.info("Wrote resource", field("path", fullPath), field("content-length", body.length));
 				res.status(200);
 				res.end();
 			});
@@ -282,6 +324,9 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 		}
 	});

+	// Everything else just pulls from the static build directory.
+	app.use(staticGzip);
+
 	return {
 		express: app,
 		server,
--- a/packages/server/src/vscode/bootstrapFork.ts
+++ b/packages/server/src/vscode/bootstrapFork.ts
@@ -42,54 +42,13 @@ const requireFilesystemModule = (id: string, builtInExtensionsDir: string): any
 	return customMod.require(id);
 };

-/**
- * Called from forking a module
- */
-export const requireFork = (modulePath: string, args: string[], builtInExtensionsDir: string): void => {
-	const Module = require("module") as typeof import("module");
-	const oldRequire = Module.prototype.require;
-	// tslint:disable-next-line:no-any
-	const oldLoad = (Module as any)._findPath;
-	// @ts-ignore
-	(Module as any)._findPath = function (request, parent, isMain): any {
-		const lookupPaths = oldLoad.call(this, request, parent, isMain);
-
-		return lookupPaths;
-	};
-	// tslint:disable-next-line:no-any
-	Module.prototype.require = function (id: string): any {
-		if (id === "typescript") {
-			return require("typescript");
-		}
-
-		// tslint:disable-next-line:no-any
-		return oldRequire.call(this, id as any);
-	};
-
-	if (!process.send) {
-		throw new Error("No IPC messaging initialized");
-	}
-
-	process.argv = ["", "", ...args];
-	requireFilesystemModule(modulePath, builtInExtensionsDir);
-
-	if (ipcMsgBuffer && ipcMsgListener) {
-		process.removeListener("message", ipcMsgListener);
-		// tslint:disable-next-line:no-any
-		ipcMsgBuffer.forEach((i) => process.emit("message" as any, i as any));
-		ipcMsgBuffer = undefined;
-		ipcMsgListener = undefined;
-	}
-};
-
-export const requireModule = (modulePath: string, dataDir: string, builtInExtensionsDir: string): void => {
+export const requireModule = (modulePath: string, builtInExtensionsDir: string): void => {
 	process.env.AMD_ENTRYPOINT = modulePath;
 	const xml = require("xhr2");
 	xml.XMLHttpRequest.prototype._restrictedHeaders["user-agent"] = false;
 	// tslint:disable-next-line no-any this makes installing extensions work.
 	(global as any).XMLHttpRequest = xml.XMLHttpRequest;

-	const mod = require("module") as typeof import("module");
 	const promiseFinally = require("promise.prototype.finally") as { shim: () => void };
 	promiseFinally.shim();
 	/**
@@ -102,16 +61,7 @@ export const requireModule = (modulePath: string, dataDir: string, builtInExtens
 	};

 	if (isCli) {
-		/**
-		 * Needed for properly forking external modules within the CLI
-		 */
-		// tslint:disable-next-line:no-any
-		(<any>cp).fork = (modulePath: string, args: ReadonlyArray<string> = [], options?: cp.ForkOptions): cp.ChildProcess => {
-			return cp.spawn(process.execPath, [path.join(buildDir, "out", "cli.js"), "--fork", modulePath, "--extra-args", JSON.stringify(args), "--data-dir", dataDir], {
-				...options,
-				stdio: [null, null, null, "ipc"],
-			});
-		};
+		process.env.NBIN_BYPASS = "true";
 	}

 	const baseDir = path.join(buildDir, "build");
@@ -132,7 +82,6 @@ export const requireModule = (modulePath: string, dataDir: string, builtInExtens
 * @param modulePath Path of the VS Code module to load.
 */
 export const forkModule = (modulePath: string, args?: string[], options?: cp.ForkOptions, dataDir?: string): cp.ChildProcess => {
-	let proc: cp.ChildProcess;
 	const forkOptions: cp.ForkOptions = {
 		stdio: [null, null, null, "ipc"],
 	};
@@ -141,18 +90,27 @@ export const forkModule = (modulePath: string, args?: string[], options?: cp.For
 		delete options.env.ELECTRON_RUN_AS_NODE;
 		forkOptions.env = options.env;
 	}
+
 	const forkArgs = ["--bootstrap-fork", modulePath];
 	if (args) {
 		forkArgs.push("--extra-args", JSON.stringify(args));
 	}
 	if (dataDir) {
-		forkArgs.push("--data-dir", dataDir);
+		forkArgs.push("--user-data-dir", dataDir);
 	}
+
+	const nodeArgs = [];
 	if (isCli) {
-		proc = cp.spawn(process.execPath, [path.join(buildDir, "out", "cli.js"), ...forkArgs], forkOptions);
+		nodeArgs.push(path.join(buildDir, "out", "cli.js"));
 	} else {
-		proc = cp.spawn(process.execPath, ["--require", "ts-node/register", "--require", "tsconfig-paths/register", process.argv[1], ...forkArgs], forkOptions);
+		nodeArgs.push(
+			"--require", "ts-node/register",
+			"--require", "tsconfig-paths/register",
+			process.argv[1],
+		);
 	}
+
+	const proc = cp.spawn(process.execPath, [...nodeArgs, ...forkArgs], forkOptions);
 	if (args && args[0] === "--type=watcherService" && os.platform() === "linux") {
 		cp.exec(`renice -n 19 -p ${proc.pid}`, (error) => {
 			if (error) {
--- a/packages/server/src/vscode/sharedProcess.ts
+++ b/packages/server/src/vscode/sharedProcess.ts
@@ -1,6 +1,4 @@
 import { ChildProcess } from "child_process";
-import * as fs from "fs";
-import * as fse from "fs-extra";
 import * as os from "os";
 import * as path from "path";
 import { forkModule } from "./bootstrapFork";
@@ -8,7 +6,7 @@ import { StdioIpcHandler } from "../ipc";
 import { ParsedArgs } from "vs/platform/environment/common/environment";
 import { Emitter } from "@coder/events/src";
 import { retry } from "@coder/ide/src/retry";
-import { logger, Level } from "@coder/logger";
+import { logger, field, Level } from "@coder/logger";

 export enum SharedProcessState {
 	Stopped,
@@ -90,20 +88,11 @@ export class SharedProcess {
 			this.activeProcess.kill();
 		}

-		const backupsDir = path.join(this.userDataDir, "Backups");
-		await Promise.all([
-			fse.mkdirp(backupsDir),
-		]);
-
-		const workspacesFile = path.join(backupsDir, "workspaces.json");
-		if (!fs.existsSync(workspacesFile)) {
-			fs.appendFileSync(workspacesFile, "");
-		}
-
 		const activeProcess = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", [], {
 			env: {
 				VSCODE_ALLOW_IO: "true",
 				VSCODE_LOGS: process.env.VSCODE_LOGS,
+				DISABLE_TELEMETRY: process.env.DISABLE_TELEMETRY,
 			},
 		}, this.userDataDir);
 		this.activeProcess = activeProcess;
@@ -127,13 +116,13 @@ export class SharedProcess {
 			activeProcess.on("exit", doReject);

 			activeProcess.stdout.on("data", (data) => {
-				logger.trace(data.toString());
+				logger.trace("stdout", field("data", data.toString()));
 			});

 			activeProcess.stderr.on("data", (data) => {
 				// Warn instead of error to prevent panic. It's unlikely stderr here is
 				// about anything critical to the functioning of the editor.
-				logger.warn(data.toString());
+				logger.warn("stderr", field("data", data.toString()));
 			});

 			this.ipcHandler = new StdioIpcHandler(activeProcess);
--- a/packages/server/webpack.config.js
+++ b/packages/server/webpack.config.js
@@ -6,14 +6,12 @@ const root = path.resolve(__dirname, "../..");

 module.exports = merge(
 	require(path.join(root, "scripts/webpack.node.config.js"))({
-		// Config options.
+		dirname: __dirname,
 	}), {
 		output: {
 			filename: "cli.js",
-			path: path.join(__dirname, "out"),
 			libraryTarget: "commonjs",
 		},
-		mode: "production",
 		node: {
 			console: false,
 			global: false,
@@ -23,14 +21,8 @@ module.exports = merge(
 			__dirname: false,
 			setImmediate: false
 		},
-		resolve: {
-			alias: {
-				"node-pty": "node-pty-prebuilt",
-			},
-		},
 		externals: {
 			"nbin": "commonjs nbin",
-			"fsevents": "fsevents",
 		},
 		entry: "./packages/server/src/cli.ts",
 		plugins: [
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -7,10 +7,10 @@
  resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-1.0.3.tgz#e0e1ae5496fde5a3c6ef3d748fdfb26a55add8b8"
  integrity sha512-1o5qDZX2VZUNnzgz5KfAdMnaqaX6FNeTs0dUdg73MRHfQW94tFTIryFC1xTTCuzxGDjVHOHkaUAI4uHA2bheOA==

-"@coder/nbin@^1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@coder/nbin/-/nbin-1.0.7.tgz#fc6adeb8366bf9d7dc7c301ce0be9e741eccf14b"
-  integrity sha512-HkCFJnYyFuPaAjk6O8IcafEEBYlHG63SqxgwB0QSyUGwjq/hUekgB23BnKmywbcxNIuX26b9j2AGWt/DBdJlXA==
+"@coder/nbin@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@coder/nbin/-/nbin-1.1.2.tgz#3af9e4368f37532da446c7c291d476bb52de995d"
+  integrity sha512-MkwKpmu1SU9wkBwQ+bZVU2nPzENWUa3Isut9osVq3LG+udovsk+k5c5rjfJ1q8cf4km5snjOSYiulug3n9sdgw==
  dependencies:
    "@coder/logger" "^1.0.3"
    fs-extra "^7.0.1"
--- a/packages/vscode/src/client.ts
+++ b/packages/vscode/src/client.ts
@@ -12,6 +12,7 @@ import { IFileService, FileOperation } from "vs/platform/files/common/files";
 import { ITextFileService } from "vs/workbench/services/textfile/common/textfiles";
 import { IModelService } from "vs/editor/common/services/modelService";
 import { ITerminalService } from "vs/workbench/contrib/terminal/common/terminal";
+import { IStorageService } from "vs/platform/storage/common/storage";
 // NOTE: shouldn't import anything from VS Code here or anything that will
 // depend on a synchronous fill like `os`.

@@ -38,6 +39,14 @@ class VSClient extends IdeClient {
 					// tslint:disable-next-line:no-any
 					statusbarService: getService<IStatusbarService>(IStatusbarService) as any,
 					notificationService: getService<INotificationService>(INotificationService),
+					storageService: {
+						save: (): Promise<void> => {
+							// tslint:disable-next-line:no-any
+							const storageService = getService<IStorageService>(IStorageService) as any;
+
+							return storageService.close();
+						},
+					},

 					onFileCreate: (cb): void => {
 						getService<IFileService>(IFileService).onAfterOperation((e) => {
--- a/packages/vscode/src/dialog.scss
+++ b/packages/vscode/src/dialog.scss
@@ -2,6 +2,7 @@
 	--primary: #2A2E37;
 	--border: black;
 	--faded: #a0a1a5;
+	--disabled: #888;
 	--header-background: #161616;
 	--header-foreground: white;
 	--list-active-selection-background: rgb(0, 120, 160);
@@ -101,6 +102,12 @@
 				background-color: var(--list-active-selection-background);
 				color: var(--list-active-selection-foreground);
 			}
+
+			&.disabled, &.disabled:hover {
+				background-color: var(--primary);
+				color: var(--disabled);
+				cursor: initial;
+			}
 		}
 	}

@@ -134,6 +141,11 @@
 				color: white;
 			}
 		}
+
+		button[disabled], button[disabled]:hover {
+			color: var(--disabled);
+			cursor: initial;
+		}
 	}
 }

--- a/packages/vscode/src/dialog.ts
+++ b/packages/vscode/src/dialog.ts
@@ -16,6 +16,9 @@ import { IThemeService } from "vs/platform/theme/common/themeService";
 import { workbench } from "./workbench";
 import "./dialog.scss";

+/**
+ * Describes the type of dialog to show.
+ */
 export enum DialogType {
 	NewFolder,
 	Save,
@@ -68,8 +71,12 @@ interface DialogEntry {
 	readonly isDirectory: boolean;
 	readonly size: number;
 	readonly lastModified: string;
+	readonly isDisabled?: boolean;
 }

+/**
+ * Open and save dialogs.
+ */
 class Dialog {
 	private _path: string | undefined;

@@ -263,10 +270,12 @@ class Dialog {

 				return;
 			}
+
+			// If it's a directory, we want to navigate to it. If it's a file, then we
+			// only want to open it if opening files is supported.
 			if (element.isDirectory) {
 				this.path = element.fullPath;
-			} else {
-				// Open
+			} else if ((this.options as OpenDialogOptions).properties.openFile) {
 				this.selectEmitter.emit(element.fullPath);
 			}
 		});
@@ -282,12 +291,20 @@ class Dialog {
 		});
 		buttonsNode.appendChild(cancelBtn);
 		const confirmBtn = document.createElement("button");
-		confirmBtn.innerText = "Confirm";
+		const openDirectory = (this.options as OpenDialogOptions).properties.openDirectory;
+		confirmBtn.innerText = this.options.buttonLabel || "Confirm";
 		confirmBtn.addEventListener("click", () => {
-			if (this._path) {
+			if (this._path && openDirectory) {
 				this.selectEmitter.emit(this._path);
 			}
 		});
+		// Disable if we can't open directories, otherwise you can open a directory
+		// as a file which won't work. This is because our button currently just
+		// always opens whatever directory is opened and will not open selected
+		// files. (A single click on a file is used to open it instead.)
+		if (!openDirectory) {
+			confirmBtn.disabled = true;
+		}
 		buttonsNode.appendChild(confirmBtn);
 		this.root.appendChild(buttonsNode);
 		this.entryList.layout();
@@ -303,6 +320,9 @@ class Dialog {
 		return this.errorEmitter.event;
 	}

+	/**
+	 * Remove the dialog.
+	 */
 	public dispose(): void {
 		this.selectEmitter.dispose();
 		this.errorEmitter.dispose();
@@ -310,6 +330,9 @@ class Dialog {
 		this.background.remove();
 	}

+	/**
+	 * Build and insert the path shown at the top of the dialog.
+	 */
 	private buildPath(): void {
 		while (this.pathNode.lastChild) {
 			this.pathNode.removeChild(this.pathNode.lastChild);
@@ -376,6 +399,9 @@ class Dialog {
 		return (<any>this.entryList).typeFilterController.filter._pattern;
 	}

+	/**
+	 * List the files and return dialog entries.
+	 */
 	private async list(directory: string): Promise<ReadonlyArray<DialogEntry>> {
 		const paths = (await util.promisify(fs.readdir)(directory)).sort();
 		const stats = await Promise.all(paths.map(p => util.promisify(fs.stat)(path.join(directory, p))));
@@ -386,6 +412,9 @@ class Dialog {
 			isDirectory: stat.isDirectory(),
 			lastModified: stat.mtime.toDateString(),
 			size: stat.size,
+			// If we can't open files, show them as disabled.
+			isDisabled: !stat.isDirectory()
+				&& !(this.options as OpenDialogOptions).properties.openFile,
 		}));
 	}
 }
@@ -397,11 +426,17 @@ interface DialogEntryData {
 	label: HighlightedLabel;
 }

+/**
+ * Rendering for the different parts of a dialog entry.
+ */
 class DialogEntryRenderer implements ITreeRenderer<DialogEntry, string, DialogEntryData> {
 	public get templateId(): string {
 		return "dialog-entry";
 	}

+	/**
+	 * Append and return containers for each part of the dialog entry.
+	 */
 	public renderTemplate(container: HTMLElement): DialogEntryData {
 		addClass(container, "dialog-entry");
 		addClass(container, "dialog-grid");
@@ -422,6 +457,9 @@ class DialogEntryRenderer implements ITreeRenderer<DialogEntry, string, DialogEn
 		};
 	}

+	/**
+	 * Render a dialog entry.
+	 */
 	public renderElement(node: ITreeNode<DialogEntry, string>, _index: number, templateData: DialogEntryData): void {
 		templateData.icon.className = "dialog-entry-icon monaco-icon-label";
 		const classes = getIconClasses(
@@ -444,8 +482,19 @@ class DialogEntryRenderer implements ITreeRenderer<DialogEntry, string, DialogEn
 		}] : []);
 		templateData.size.innerText = node.element.size.toString();
 		templateData.lastModified.innerText = node.element.lastModified;
+
+		// We know this exists because we created the template.
+		const entryContainer = templateData.label.element.parentElement!.parentElement!.parentElement!;
+		if (node.element.isDisabled) {
+			entryContainer.classList.add("disabled");
+		} else {
+			entryContainer.classList.remove("disabled");
+		}
 	}

+	/**
+	 * Does nothing (not implemented).
+	 */
 	public disposeTemplate(_templateData: DialogEntryData): void {
 		// throw new Error("Method not implemented.");
 	}
--- a/packages/vscode/src/fill/applicationInsights.ts
+++ b/packages/vscode/src/fill/applicationInsights.ts
@@ -0,0 +1,170 @@
+/**
+ * Used by node
+ */
+import * as https from "https";
+import * as os from "os";
+
+export const defaultClient = "filler";
+
+export class TelemetryClient {
+	public channel = {
+		setUseDiskRetryCaching: (): void => undefined,
+	};
+
+	public constructor() {
+		//
+	}
+
+	public trackEvent(options: {
+		name: string;
+		properties: object;
+		measurements: object;
+	}): void {
+		if (!options.properties) {
+			options.properties = {};
+		}
+		if (!options.measurements) {
+			options.measurements = {};
+		}
+
+		try {
+			const cpus = os.cpus();
+			// tslint:disable-next-line:no-any
+			(options.measurements as any).cpu = {
+				model: cpus[0].model,
+				cores: cpus.length,
+			};
+		} catch (ex) {
+			// Nothin
+		}
+
+		try {
+			// tslint:disable-next-line:no-any
+			(options.measurements as any).memory = {
+				virtual_free: os.freemem(),
+				virtual_used: os.totalmem(),
+			};
+		} catch (ex) {
+			//
+		}
+
+		try {
+			// tslint:disable:no-any
+			(options.properties as any)["common.shell"] = os.userInfo().shell;
+			(options.properties as any)["common.release"] = os.release();
+			(options.properties as any)["common.arch"] = os.arch();
+			// tslint:enable:no-any
+		} catch (ex) {
+			//
+		}
+
+		try {
+			// tslint:disable-next-line:no-any
+			(options.properties as any)["common.machineId"] = machineIdSync();
+		} catch (ex) {
+			//
+		}
+
+		try {
+			const request = https.request({
+				host: "v1.telemetry.coder.com",
+				port: 443,
+				path: "/track",
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+			});
+			request.on("error", () => {
+				// Do nothing, we don"t really care
+			});
+			request.write(JSON.stringify(options));
+			request.end();
+		} catch (ex) {
+			// Suppress all errs
+		}
+	}
+
+	public flush(options: {
+		readonly callback: () => void;
+	}): void {
+		options.callback();
+	}
+}
+
+// Taken from https://github.com/automation-stack/node-machine-id
+import { exec, execSync } from "child_process";
+import { createHash } from "crypto";
+
+const isWindowsProcessMixedOrNativeArchitecture = (): "" | "mixed" | "native" => {
+	// detect if the node binary is the same arch as the Windows OS.
+	// or if this is 32 bit node on 64 bit windows.
+	if (process.platform !== "win32") {
+		return "";
+	}
+	if (process.arch === "ia32" && process.env.hasOwnProperty("PROCESSOR_ARCHITEW6432")) {
+		return "mixed";
+	}
+
+	return "native";
+};
+
+let { platform } = process,
+	win32RegBinPath = {
+		native: "%windir%\\System32",
+		mixed: "%windir%\\sysnative\\cmd.exe /c %windir%\\System32",
+		"": "",
+	},
+	guid = {
+		darwin: "ioreg -rd1 -c IOPlatformExpertDevice",
+		win32: `${win32RegBinPath[isWindowsProcessMixedOrNativeArchitecture()]}\\REG ` +
+			"QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography " +
+			"/v MachineGuid",
+		linux: "( cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || hostname ) | head -n 1 || :",
+		freebsd: "kenv -q smbios.system.uuid || sysctl -n kern.hostuuid",
+		// tslint:disable-next-line:no-any
+	} as any;
+
+const hash = (guid: string): string => {
+	return createHash("sha256").update(guid).digest("hex");
+};
+
+const expose = (result: string): string => {
+	switch (platform) {
+		case "darwin":
+			return result
+				.split("IOPlatformUUID")[1]
+				.split("\n")[0].replace(/\=|\s+|\"/ig, "")
+				.toLowerCase();
+		case "win32":
+			return result
+				.toString()
+				.split("REG_SZ")[1]
+				.replace(/\r+|\n+|\s+/ig, "")
+				.toLowerCase();
+		case "linux":
+			return result
+				.toString()
+				.replace(/\r+|\n+|\s+/ig, "")
+				.toLowerCase();
+		case "freebsd":
+			return result
+				.toString()
+				.replace(/\r+|\n+|\s+/ig, "")
+				.toLowerCase();
+		default:
+			throw new Error(`Unsupported platform: ${process.platform}`);
+	}
+};
+
+let cachedMachineId: string | undefined;
+
+const machineIdSync = (): string => {
+	if (cachedMachineId) {
+		return cachedMachineId;
+	}
+	let id: string = expose(execSync(guid[platform]).toString());
+	cachedMachineId = hash(id);
+
+	return cachedMachineId;
+};
--- a/packages/vscode/src/fill/environmentService.ts
+++ b/packages/vscode/src/fill/environmentService.ts
@@ -1,7 +1,9 @@
-import * as path from "path";
 import * as paths from "./paths";
 import * as environment from "vs/platform/environment/node/environmentService";

+/**
+ * Customize paths using data received from the initialization message.
+ */
 export class EnvironmentService extends environment.EnvironmentService {
 	public get sharedIPCHandle(): string {
 		return paths.getSocketPath() || super.sharedIPCHandle;
--- a/packages/vscode/src/fill/product.ts
+++ b/packages/vscode/src/fill/product.ts
@@ -12,6 +12,12 @@ class Product implements IProductConfiguration {
 	public tipsAndTricksUrl = "https://code.visualstudio.com/docs/getstarted/tips-and-tricks";
 	public twitterUrl = "https://twitter.com/code";
 	public licenseUrl = "https://github.com/codercom/code-server/blob/master/LICENSE";
+	public aiConfig = process.env.DISABLE_TELEMETRY ? undefined! : {
+		// Only needed so vscode can see that content exists for this value.
+		// We override the application insights module.
+		asimovKey: "content",
+	};
+	public enableTelemetry = process.env.DISABLE_TELEMETRY ? false : true;

 	private _dataFolderName: string | undefined;
 	public get dataFolderName(): string {
@@ -26,7 +32,8 @@ class Product implements IProductConfiguration {
 		serviceUrl: global && global.process && global.process.env.SERVICE_URL
 			|| process.env.SERVICE_URL
 			|| "https://v1.extapi.coder.com",
-	};
+		// tslint:disable-next-line:no-any
+	} as any;

 	public extensionExecutionEnvironments = {
 		"wayou.vscode-todo-highlight": "worker",
--- a/packages/vscode/src/fill/storageDatabase.ts
+++ b/packages/vscode/src/fill/storageDatabase.ts
@@ -11,6 +11,8 @@ import { IStorageService, WillSaveStateReason } from "vs/platform/storage/common
 import * as paths from "./paths";
 import { workbench } from "../workbench";

+// tslint:disable completed-docs
+
 class StorageDatabase implements workspaceStorage.IStorageDatabase {
 	public readonly onDidChangeItemsExternal = Event.None;
 	private readonly items = new Map<string, string>();
@@ -26,7 +28,8 @@ class StorageDatabase implements workspaceStorage.IStorageDatabase {
 			}

 			this.triggerFlush(WillSaveStateReason.SHUTDOWN);
-			navigator.sendBeacon(`/resource${this.path}`, this.content);
+			const resourceBaseUrl = location.pathname.replace(/\/$/, "") + "/resource";
+			navigator.sendBeacon(`${resourceBaseUrl}/${this.path}`, this.content);
 		});
 	}

--- a/packages/vscode/src/fill/windowsService.ts
+++ b/packages/vscode/src/fill/windowsService.ts
@@ -1,15 +1,27 @@
 import * as electron from "electron";
 import { Emitter } from "@coder/events";
-import { IWindowsService, INativeOpenDialogOptions, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IMessageBoxResult, IDevToolsOptions, IEnterWorkspaceResult, CrashReporterStartOptions, INewWindowOptions, IOpenFileRequest, IAddFoldersRequest } from "vs/platform/windows/common/windows";
+import { logger } from "@coder/logger";
+import { IWindowsService, INativeOpenDialogOptions, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IMessageBoxResult, IDevToolsOptions, IEnterWorkspaceResult, CrashReporterStartOptions, INewWindowOptions, IOpenFileRequest, IAddFoldersRequest, IURIToOpen, IOpenSettings } from "vs/platform/windows/common/windows";
 import { ParsedArgs } from "vs/platform/environment/common/environment";
 import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorkspaceIdentifier } from "vs/platform/workspaces/common/workspaces";
 import { URI } from "vs/base/common/uri";
-import { IRecentlyOpened } from "vs/platform/history/common/history";
+import { IRecentlyOpened, IRecent } from "vs/platform/history/common/history";
 import { ISerializableCommandAction } from "vs/platform/actions/common/actions";
 import { client } from "../client";
 import { showOpenDialog } from "../dialog";
 import { workbench } from "../workbench";

+// tslint:disable completed-docs
+
+// VS Code overrides window.open to call openExternal, but we then call
+// window.open which results in an infinite loop. Store the function but also
+// make it unable to be set (doesn't work otherwise).
+const windowOpen = window.open;
+Object.defineProperty(window, "open", {
+	set: (): void => { /* Not allowed. */ },
+	get: (): Function => windowOpen,
+});
+
 /**
 * Instead of going to the shared process, we'll directly run these methods on
 * the client. This setup means we can only control the current window.
@@ -35,9 +47,9 @@ export class WindowsService implements IWindowsService {
 	private readonly window = new electron.BrowserWindow();

 	// Dialogs
-	public async pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
+	public async pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		showOpenDialog({
-			...(_options.dialogOptions || {}),
+			...(options.dialogOptions || {}),
 			properties: {
 				openFile: true,
 				openDirectory: true,
@@ -50,13 +62,13 @@ export class WindowsService implements IWindowsService {
 				}],
 			} as IOpenFileRequest);
 		}).catch((ex) => {
-			//
+			logger.error(ex.message);
 		});
 	}

-	public async pickFileAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
+	public async pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		showOpenDialog({
-			...(_options.dialogOptions || {}),
+			...(options.dialogOptions || {}),
 			properties: {
 				openFile: true,
 			},
@@ -68,26 +80,32 @@ export class WindowsService implements IWindowsService {
 				}],
 			} as IOpenFileRequest);
 		}).catch((ex) => {
-			//
+			logger.error(ex.message);
 		});
 	}

-	public async pickFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
+	public async pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
+		if (!options.dialogOptions) {
+			options.dialogOptions = {};
+		}
+		if (!options.dialogOptions.title) {
+			options.dialogOptions.title = "Open Folder";
+		}
 		showOpenDialog({
-			...(_options.dialogOptions || {}),
+			...(options.dialogOptions || {}),
 			properties: {
 				openDirectory: true,
 			},
 		}).then((path) => {
 			workbench.workspace = URI.file(path);
 		}).catch((ex) => {
-			//
+			logger.error(ex.message);
 		});
 	}

-	public async pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
+	public async pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		showOpenDialog({
-			...(_options.dialogOptions || {}),
+			...(options.dialogOptions || {}),
 			properties: {
 				openDirectory: true,
 			},
@@ -97,7 +115,7 @@ export class WindowsService implements IWindowsService {
 				foldersToAdd: [URI.file(path)],
 			} as IAddFoldersRequest);
 		}).catch((ex) => {
-			//
+			logger.error(ex.message);
 		});
 	}

@@ -120,16 +138,14 @@ export class WindowsService implements IWindowsService {
 		});
 	}

-	public showOpenDialog(windowId: number, options: OpenDialogOptions): Promise<string[]> {
-		return showOpenDialog({
+	public async showOpenDialog(_windowId: number, options: OpenDialogOptions): Promise<string[]> {
+		return [await showOpenDialog({
 			...(options || {}),
 			properties: {
-				openDirectory: true,
-				openFile: true,
+				openDirectory: options && options.properties && options.properties.includes("openDirectory") || false,
+				openFile: options && options.properties && options.properties.includes("openFile") || false,
 			},
-		}).then((path) => {
-			return [path];
-		});
+		})];
 	}

 	public reloadWindow(windowId: number, _args?: ParsedArgs): Promise<void> {
@@ -148,14 +164,14 @@ export class WindowsService implements IWindowsService {
 		throw new Error("not implemented");
 	}

-	public enterWorkspace(_windowId: number, _path: URI): Promise<IEnterWorkspaceResult> {
-		if (_path.path.endsWith(".json")) {
+	public enterWorkspace(_windowId: number, uri: URI): Promise<IEnterWorkspaceResult> {
+		if (uri.path.endsWith(".json")) {
 			workbench.workspace = {
 				id: "Untitled",
-				configPath: _path.path,
+				configPath: uri,
 			};
 		} else {
-			workbench.workspace = _path;
+			workbench.workspace = uri;
 		}

 		return undefined!;
@@ -179,7 +195,7 @@ export class WindowsService implements IWindowsService {
 		return Promise.resolve(this.getWindowById(windowId).setRepresentedFilename(fileName));
 	}

-	public addRecentlyOpened(_files: URI[]): Promise<void> {
+	public addRecentlyOpened(_files: IRecent[]): Promise<void> {
 		throw new Error("not implemented");
 	}

@@ -283,7 +299,7 @@ export class WindowsService implements IWindowsService {
 	}

 	// Global methods
-	public openWindow(_windowId: number, _paths: URI[], _options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): Promise<void> {
+	public openWindow(_windowId: number, _uris: IURIToOpen[], _options?: IOpenSettings): Promise<void> {
 		throw new Error("not implemented");
 	}

@@ -307,8 +323,8 @@ export class WindowsService implements IWindowsService {
 		throw new Error("not implemented");
 	}

-	public async showItemInFolder(_path: string): Promise<void> {
-		workbench.workspace = URI.file(_path);
+	public async showItemInFolder(uri: URI): Promise<void> {
+		workbench.workspace = uri;
 	}

 	public getActiveWindowId(): Promise<number | undefined> {
--- a/packages/vscode/src/vscode.scss
+++ b/packages/vscode/src/vscode.scss
@@ -53,3 +53,7 @@
 	width: 56px !important;
 	margin-right: 4px;
 }
+
+.window-controls-container {
+	display: none !important;
+}
--- a/packages/vscode/src/workbench.ts
+++ b/packages/vscode/src/workbench.ts
@@ -29,8 +29,6 @@ import { LogLevel } from "vs/platform/log/common/log";
 import { RawContextKey, IContextKeyService } from "vs/platform/contextkey/common/contextkey";
 import { ServiceCollection } from "vs/platform/instantiation/common/serviceCollection";
 import { URI } from "vs/base/common/uri";
-import { BackupMainService } from "vs/platform/backup/electron-main/backupMainService";
-import { IInstantiationService } from "vs/platform/instantiation/common/instantiation";

 /**
 * Initializes VS Code and provides a way to call into general client
@@ -131,14 +129,6 @@ export class Workbench {
 	public set serviceCollection(collection: ServiceCollection) {
 		this._serviceCollection = collection;

-		// TODO: If possible it might be better to start the app from vs/code/electron-main/app.
-		// For now, manually initialize services from there as needed.
-		const inst = this._serviceCollection.get(IInstantiationService) as IInstantiationService;
-		const backupMainService = inst.createInstance(BackupMainService) as BackupMainService;
-		backupMainService.initialize().catch((error) => {
-			logger.error(error.message);
-		});
-
 		const contextKeys = this.serviceCollection.get(IContextKeyService) as IContextKeyService;
 		const bounded = this.clipboardContextKey.bindTo(contextKeys);
 		client.clipboard.onPermissionChange((enabled) => {
--- a/packages/vscode/webpack.bootstrap.config.js
+++ b/packages/vscode/webpack.bootstrap.config.js
@@ -7,6 +7,7 @@ const vsFills = path.join(root, "packages/vscode/src/fill");

 module.exports = merge(
 	require(path.join(root, "scripts/webpack.node.config.js"))({
+		dirname: __dirname,
 		typescriptCompilerOptions: {
 			target: "es6",
 		},
@@ -15,7 +16,6 @@ module.exports = merge(
 		mode: "development",
 		output: {
 			chunkFilename: "[name].bundle.js",
-			path: path.resolve(__dirname, "out"),
 			publicPath: "/",
 			filename: "bootstrap-fork.js",
 			libraryTarget: "commonjs",
@@ -55,12 +55,13 @@ module.exports = merge(
 				"vscode-sqlite3": path.resolve(fills, "empty.ts"),
 				"vs/base/browser/browser": path.resolve(fills, "empty.ts"),

+				"applicationinsights": path.join(vsFills, "applicationInsights.ts"),
 				"electron": path.join(vsFills, "stdioElectron.ts"),
 				"vscode-ripgrep": path.join(vsFills, "ripgrep.ts"),
 				"native-keymap": path.join(vsFills, "native-keymap.ts"),
 				"native-watchdog": path.join(vsFills, "native-watchdog.ts"),
 				"vs/base/common/amd": path.resolve(vsFills, "amd.ts"),
-				"vs/base/node/paths": path.resolve(vsFills, "paths.ts"),
+				"vs/base/node/paths": path.join(vsFills, "paths.ts"),
 				"vs/platform/product/node/package": path.resolve(vsFills, "package.ts"),
 				"vs/platform/product/node/product": path.resolve(vsFills, "product.ts"),
 				"vs/base/node/zip": path.resolve(vsFills, "zip.ts"),
--- a/packages/web/assets/logo.png
+++ b/packages/web/assets/logo.png
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
-	"name": "@coder/web",
-	"scripts": {
-		"build": "../../node_modules/.bin/cross-env UV_THREADPOOL_SIZE=100 node --max-old-space-size=32384 ../../node_modules/webpack/bin/webpack.js --config ./webpack.config.js"
-	}
+  "name": "@coder/web",
+  "scripts": {
+    "build": "../../node_modules/.bin/cross-env UV_THREADPOOL_SIZE=100 node --max-old-space-size=32384 ../../node_modules/webpack/bin/webpack.js --config ./webpack.config.js"
+  }
 }
--- a/packages/web/src/index.html
+++ b/packages/web/src/index.html
@@ -24,7 +24,14 @@
 			}
 			document.body.style.background = bg;
 		})();
+
+		// Check that service workers are registered
+		if ("serviceWorker" in navigator) {
+			// Use the window load event to keep the page load performant
+			window.addEventListener("load", () => {
+				navigator.serviceWorker.register("/service-worker.js");
+			});
+		}
 	</script>
 </body>
-
-</html>
+</html>
--- a/packages/web/webpack.config.js
+++ b/packages/web/webpack.config.js
@@ -7,7 +7,9 @@ const vsFills = path.join(root, "packages/vscode/src/fill");

 module.exports = merge(
 	require(path.join(root, "scripts/webpack.client.config.js"))({
+		dirname: __dirname,
 		entry: path.join(root, "packages/web/src/index.ts"),
+		name: "ide",
 		template: path.join(root, "packages/web/src/index.html"),
 		typescriptCompilerOptions: {
 			"target": "es5",
@@ -15,11 +17,6 @@ module.exports = merge(
 		},
 	},
 ), {
-	output: {
-		chunkFilename: "[name]-[hash:6].bundle.js",
-		path: path.join(__dirname, "out"),
-		filename: "[hash:6].bundle.js",
-	},
 	node: {
 		module: "empty",
 		crypto: "empty",
--- a/scripts/vscode.patch
+++ b/scripts/vscode.patch
@@ -98,6 +98,14 @@ index f68ae90..d6b9ea7 100644
@@ -24 +24 @@ import { disposableTimeout } from 'vs/base/common/async';
 -import { isMacintosh } from 'vs/base/common/platform';
 +import { isMacintosh } from 'vs/base/browser/browser';
+diff --git a/src/vs/base/node/config.ts b/src/vs/base/node/config.ts
+index 5ef2193..a232b6c 100644
+--- a/src/vs/base/node/config.ts
+++ b/src/vs/base/node/config.ts
+@@ -79,0 +80,3 @@ export class ConfigWatcher<T> implements IConfigWatcher<T>, IDisposable {
+			} else {
+				this.cache = config; // update config
+				this._onDidUpdateConfiguration.fire({ config });
 diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
 index 74148e4..041205b 100644
 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -138,12 +146,34 @@ index e0ff793..885de12 100644
 -		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
 +		const cmdOrCtrlKey = browser.isMacintosh ? e.metaKey : e.ctrlKey;
 diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-index 6fd8249..796aed7 100644
+index 6fd8249..04c0933 100644
 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
 +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
-@@ -223,0 +224,2 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo
-+
+@@ -50,0 +51,2 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
+import { BackupMainService } from 'vs/platform/backup/electron-main/backupMainService';
+import { mkdirp } from 'vs/base/node/pfs';
+@@ -93,0 +96,8 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
+	Promise.all<boolean | undefined>([ // Copied from src/vs/code/electron-main/main.ts
+		environmentService.extensionsPath,
+		environmentService.nodeCachedDataDir,
+		environmentService.logsPath,
+		environmentService.globalStorageHome,
+		environmentService.workspaceStorageHome,
+		environmentService.backupHome
+	].map((path): undefined | Promise<boolean> => path ? mkdirp(path) : undefined));
+@@ -119,0 +130,2 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
+	const backupMainService = instantiationService.createInstance(BackupMainService) as BackupMainService;
+	backupMainService.initialize().catch(console.error);
+@@ -223,0 +236 @@ async function handshake(configuration: ISharedProcessConfiguration): Promise<vo
 +startup({ machineId: "1" });
+diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
+index 1f8b17a..2a875f9 100644
+--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
+@@ -43,0 +44,3 @@ export async function main(argv: string[]): Promise<any> {
+	const cli = await new Promise<IMainCli>((c, e) => require(['vs/code/node/cliProcessMain'], c, e));
+	await cli.main(args);
+	return; // Always just do this for now.
 diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
 index f97a692..0206957 100644
 --- a/src/vs/editor/browser/config/configuration.ts
@@ -368,19 +398,35 @@ index 7b6ad89..3190356 100644
 -			return;
 +			return (require('vs/../../../../packages/vscode/src/workbench') as typeof import ('vs/../../../../packages/vscode/src/workbench')).workbench.handleDrop(event, resolveTargetGroup, afterDrop, targetIndex);
 diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
-index c25c940..9f11d98 100644
+index c25c940..f2004f8 100644
 --- a/src/vs/workbench/browser/layout.ts
 +++ b/src/vs/workbench/browser/layout.ts
@@ -12 +12 @@ import { Registry } from 'vs/platform/registry/common/platform';
 -import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-+import { isWindows, isLinux, isMacintosh, isNative, isWeb } from 'vs/base/common/platform';
+import { isWindows, isLinux, isMacintosh, isNative } from 'vs/base/common/platform';
@@ -210 +210 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 -		if ((isWindows || isLinux) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') {
-+		if ((isWeb || isWindows || isLinux) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') {
-@@ -535 +535 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+		// if ((isWeb || isWindows || isLinux) && getTitleBarStyle(this.configurationService, this.environmentService) === 'custom') {
+@@ -212 +212 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+-		}
+		// }
+@@ -219 +219 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+-			if (this.state.fullscreen && (this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default')) {
+			if ((this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default')) {
+@@ -531 +531,5 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+-				if (getTitleBarStyle(this.configurationService, this.environmentService) === 'native') {
+				if (this.state.menuBar.visibility === 'hidden') {
+					return false;
+				} else if (this.state.menuBar.visibility === 'toggle') {
+					return this.state.menuBar.toggled;
+				} else if (getTitleBarStyle(this.configurationService, this.environmentService) === 'native') {
+@@ -535 +539 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 -				} else if (isMacintosh) {
 +				} else if (isNative && isMacintosh) {
-@@ -567 +567 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+@@ -539,2 +542,0 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
+-				} else if (this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default') {
+-					return this.state.menuBar.toggled;
+@@ -567 +569 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 -				if (isMacintosh || this.state.menuBar.visibility === 'hidden') {
 +				if ((isNative && isMacintosh) || this.state.menuBar.visibility === 'hidden') {
 diff --git a/src/vs/workbench/browser/legacyLayout.ts b/src/vs/workbench/browser/legacyLayout.ts
@@ -492,7 +538,7 @@ index a822341..43b882a 100644
 -			if (!isMacintosh && this.currentTitlebarStyleSetting === 'custom') {
 +			if (!(isNative && isMacintosh) && this.currentTitlebarStyleSetting === 'custom') {
 diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
-index 028f375..4bfe956 100644
+index 028f375..f740471 100644
 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
 +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -11 +11 @@ import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/com
@@ -506,7 +552,10 @@ index 028f375..4bfe956 100644
 +		if (!(isNative && isMacintosh)) {
@@ -343 +343 @@ export class TitlebarPart extends Part implements ITitleService {
 -		if (!isMacintosh) {
-+		if (!(isNative && isMacintosh)) {
+		// if (!(isNative && isMacintosh)) {
+@@ -346 +346 @@ export class TitlebarPart extends Part implements ITitleService {
+-		}
+		// }
@@ -549 +549 @@ export class TitlebarPart extends Part implements ITitleService {
 -		if (!isMacintosh &&
 +		if (!(isNative && isMacintosh) &&
@@ -722,11 +771,14 @@ index 1f8088e..f5b0551 100644
 -			included: platform.isMacintosh
 +			included: platform.isNative && platform.isMacintosh
 diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
-index 24ba122..fca7faf 100644
+index 24ba122..3ab8804 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -12,0 +13 @@ import * as nls from 'vs/nls';
 +import * as browser from 'vs/base/browser/browser';
+@@ -185 +186 @@ configurationRegistry.registerConfiguration({
+-			default: 'auto',
+			default: browser.isSafari ? 'dom' : 'auto',
@@ -196 +197 @@ configurationRegistry.registerConfiguration({
 -			default: platform.isMacintosh ? 'selectWord' : platform.isWindows ? 'copyPaste' : 'default',
 +			default: browser.isMacintosh ? 'selectWord' : browser.isWindows ? 'copyPaste' : 'default',
@@ -855,13 +907,19 @@ index 48ef482..dc47f81 100644
 -			placeHolder: isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"),
 +			placeHolder: browser.isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"),
 diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
-index 71bc992..97cbb71 100644
+index 71bc992..a76dad4 100644
 --- a/src/vs/workbench/electron-browser/main.contribution.ts
 +++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -13 +13,2 @@ import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 -import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 +import { isNative, isWeb } from 'vs/base/common/platform';
 +import { isMacintosh, isWindows, isLinux } from 'vs/base/browser/browser';
+@@ -37 +38 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
+-		if (isMacintosh) {
+		if (isNative && isMacintosh) {
+@@ -225 +226 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
+-	if (isMacintosh) {
+	if (isNative && isMacintosh) {
@@ -306 +307 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
 -		when: IsMacContext.toNegated()
 +		// when: IsMacContext.toNegated()
@@ -877,8 +935,10 @@ index 71bc992..97cbb71 100644
@@ -633 +634 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
 -				'included': isWindows || isLinux
 +				'included': isWeb || isWindows || isLinux
-@@ -650 +651 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
+@@ -649,2 +650,2 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
+-				'enum': ['native', 'custom'],
 -				'default': isLinux ? 'native' : 'custom',
+				'enum': ['custom'],
 +				'default': isNative && isLinux ? 'native' : 'custom',
@@ -659 +660 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
 -				'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
--- a/scripts/vstar.sh
+++ b/scripts/vstar.sh
@@ -4,7 +4,7 @@ set -euxo pipefail
 # Builds a tarfile containing vscode sourcefiles neccessary for CI.
 # Done outside the CI and uploaded to object storage to reduce CI time.

-branch=1.33.0
+branch=1.33.1
 dir=/tmp/vstar
 outfile=/tmp/vstar-$branch.tar.gz
 rm -rf $dir
--- a/scripts/webpack.client.config.js
+++ b/scripts/webpack.client.config.js
@@ -4,10 +4,12 @@ const merge = require("webpack-merge");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const PreloadWebpackPlugin = require("preload-webpack-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-// const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
+const WebpackPwaManifest = require("webpack-pwa-manifest");
+const { GenerateSW } = require("workbox-webpack-plugin");

 const root = path.join(__dirname, "..");
 const prod = process.env.NODE_ENV === "production" || process.env.CI === "true";
+const cachePattern = /\.(?:png|jpg|jpeg|svg|css|js|ttf|woff|eot|woff2|wasm)$/;

 module.exports = (options = {}) => merge(
 	require("./webpack.general.config")(options), {
@@ -44,18 +46,43 @@ module.exports = (options = {}) => merge(
 	},
 	plugins: [
 		new MiniCssExtractPlugin({
-			filename: "[name].css",
-			chunkFilename: "[id].css",
+			chunkFilename: `${options.name || "client"}.[name].[hash:6].css`,
+			filename: `${options.name || "client"}.[name].[hash:6].css`
 		}),
 		new HtmlWebpackPlugin({
-			template: options.template,
+			template: options.template
 		}),
 		new PreloadWebpackPlugin({
 			rel: "preload",
-			as: "script",
+			as: "script"
 		}),
-	].concat(prod ? [] : [
-		new webpack.HotModuleReplacementPlugin(),
-	]),
-	target: "web",
+		new WebpackPwaManifest({
+			name: "Coder",
+			short_name: "Coder",
+			description: "Run VS Code on a remote server",
+			background_color: "#e5e5e5",
+			icons: [{
+				src: path.join(root, "packages/web/assets/logo.png"),
+				sizes: [96, 128, 192, 256, 384],
+			}],
+		})
+	].concat(prod ? [
+		new GenerateSW({
+			include: [cachePattern],
+			runtimeCaching: [{
+				urlPattern: cachePattern,
+				handler: "StaleWhileRevalidate",
+				options: {
+					cacheName: "code-server",
+					expiration: {
+						maxAgeSeconds: 86400,
+					},
+					cacheableResponse: {
+						statuses: [0, 200],
+					},
+				},
+			},
+		]}),
+	] : [new webpack.HotModuleReplacementPlugin()]),
+	target: "web"
 });
--- a/scripts/webpack.general.config.js
+++ b/scripts/webpack.general.config.js
@@ -10,18 +10,28 @@ const root = path.join(__dirname, "..");
 module.exports = (options = {}) => ({
 	context: root,
 	devtool: "none",
-	externals: ["fsevents"],
+	externals: {
+		fsevents: "fsevents",
+	},
+	output: {
+		path: path.join(options.dirname || __dirname, "out"),
+		chunkFilename: `${options.name || "general"}.[name].[hash:6].js`,
+		filename: `${options.name || "general"}.[name].[hash:6].js`
+	},
 	module: {
 		rules: [{
 			loader: "string-replace-loader",
 			test: /\.(j|t)s/,
 			options: {
 				multiple: [{
-					// These will be handled by file-loader. We need the location because
-					// they are parsed as URIs and will throw errors if not fully formed.
-					// The !! prefix causes it to ignore other loaders (doesn't work).
+					// These will be handled by file-loader. Must be a fully formed URI.
+					// The !! prefix causes it to ignore other loaders.
 					search: "require\\.toUrl\\(",
-					replace: "location.protocol + '//' + location.host + '/' + require('!!file-loader?name=[path][name].[ext]!' + ",
+					replace: `${
+						options.node
+							? "'file://'"
+							: "location.protocol + '//' + location.host + location.pathname.replace(/\\/$/,'')"
+					} + '/' + require('!!file-loader?name=[path][name].[ext]!' + `,
 					flags: "g",
 				}, {
 					search: "require\\.__\\$__nodeRequire",
@@ -44,48 +54,6 @@ module.exports = (options = {}) => ({
 		}, {
 			test: /\.wasm$/,
 			type: "javascript/auto",
-		}, {
-			// Fixes spdlog.
-			test: /spdlog(\\|\/)index\.js/,
-			loader: "string-replace-loader",
-			options: {
-				multiple: [{
-					search: "const spdlog.*;",
-					replace: "const spdlog = __non_webpack_require__(global.SPDLOG_LOCATION);",
-					flags: "g",
-				}],
-			},
-		}, {
-			// This is required otherwise it attempts to require("package.json")
-			test: /@oclif(\\|\/)command(\\|\/)lib(\\|\/)index\.js/,
-			loader: "string-replace-loader",
-			options: {
-				multiple: [{
-					search: "checkNodeVersion\\(\\);",
-					replace: "",
-					flags: "g",
-				}],
-			},
-		}, {
-			test: /node\-pty\-prebuilt(\\|\/)lib(\\|\/)index\.js/,
-			loader: "string-replace-loader",
-			options: {
-				multiple: [{
-					search: "exports\\.native.*;",
-					replace: "exports.native = null;",
-					flags: "g",
-				}],
-			},
-		}, {
-			test: /node\-pty\-prebuilt(\\|\/)lib(\\|\/).*\.js/,
-			loader: "string-replace-loader",
-			options: {
-				multiple: [{
-					search: "var pty = .*pty\.node.*;",
-					replace: "var pty = __non_webpack_require__(global.NODEPTY_LOCATION);",
-					flags: "g",
-				}],
-			},
 		}],
 	},
 	resolve: {
--- a/scripts/webpack.node.config.js
+++ b/scripts/webpack.node.config.js
@@ -1,8 +1,15 @@
 const merge = require("webpack-merge");

 module.exports = (options = {}) => merge(
-	require("./webpack.general.config")(options), {
+	require("./webpack.general.config")({
+		...options,
+		node: true,
+	}), {
 	devtool: "none",
 	mode: "production",
 	target: "node",
+	externals: {
+		spdlog: "commonjs spdlog",
+		"node-pty": "commonjs node-pty",
+	}
 });
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,9 +23,6 @@
 			],
 			"vs/*": [
 				"./lib/vscode/src/vs/*"
-			],
-			"node-pty": [
-				"./packages/protocol/node_modules/node-pty-prebuilt"
 			]
 		}
 	}
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,20 @@
 # yarn lockfile v1


+"@babel/runtime@^7.0.0":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
+  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
+  dependencies:
+    regenerator-runtime "^0.12.0"
+
+"@babel/runtime@^7.3.4":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
+  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@types/fs-extra@^5.0.4":
  version "5.0.5"
  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b"
@@ -458,6 +472,39 @@ babel-code-frame@^6.22.0:
    esutils "^2.0.2"
    js-tokens "^3.0.2"

+babel-extract-comments@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21"
+  integrity sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==
+  dependencies:
+    babylon "^6.18.0"
+
+babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
+
+babel-plugin-transform-object-rest-spread@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
 balanced-match@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -513,11 +560,21 @@ big.js@^5.2.2:
  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==

+bignumber.js@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
+  integrity sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=
+
 binary-extensions@^1.0.0:
  version "1.12.0"
  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
  integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==

+bindings@1.3.0, bindings@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
+  integrity sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==
+
 block-stream@*:
  version "0.0.9"
  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -530,6 +587,11 @@ bluebird@^3.5.1, bluebird@^3.5.3:
  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==

+bmp-js@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz#64113e9c7cf1202b376ed607bf30626ebe57b18a"
+  integrity sha1-ZBE+nHzxICs3btYHvzBibr5XsYo=
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
  version "4.11.8"
  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -656,6 +718,11 @@ browserify-zlib@^0.2.0:
  dependencies:
    pako "~1.0.5"

+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
 buffer-from@^1.0.0, buffer-from@^1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -929,16 +996,16 @@ commander@2.17.x, commander@~2.17.1:
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==

-commander@^2.12.1, commander@^2.18.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@^2.19.0:
+commander@^2.12.1, commander@^2.18.0, commander@^2.19.0:
  version "2.20.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==

+common-tags@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
 commondir@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1043,6 +1110,11 @@ copy-descriptor@^0.1.0:
  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=

+core-js@^2.4.0:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
+  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+
 core-js@^2.5.7:
  version "2.6.2"
  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.2.tgz#267988d7268323b349e20b4588211655f0e83944"
@@ -1128,6 +1200,11 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
    randombytes "^2.0.0"
    randomfill "^1.0.3"

+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
+
 css-loader@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.0.tgz#42952ac22bca5d076978638e9813abce49b8f0cc"
@@ -1398,6 +1475,11 @@ dom-serializer@0:
    domelementtype "~1.1.1"
    entities "~1.1.1"

+dom-walk@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+  integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
+
 domain-browser@^1.1.1:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -1526,7 +1608,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
  dependencies:
    is-arrayish "^0.2.1"

-es-abstract@^1.4.3, es-abstract@^1.5.1:
+es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1:
  version "1.13.0"
  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -1547,6 +1629,11 @@ es-to-primitive@^1.2.0:
    is-date-object "^1.0.1"
    is-symbol "^1.0.2"

+es6-promise@^3.0.2:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
+  integrity sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=
+
 escape-html@~1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -1643,6 +1730,11 @@ execa@^1.0.0:
    signal-exit "^3.0.0"
    strip-eof "^1.0.0"

+exif-parser@^0.1.9:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
+  integrity sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=
+
 expand-brackets@^2.1.4:
  version "2.1.4"
  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -1785,6 +1877,11 @@ file-loader@^3.0.1:
    loader-utils "^1.0.2"
    schema-utils "^1.0.0"

+file-type@^3.1.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+
 filesize@^3.6.1:
  version "3.6.1"
  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -1862,6 +1959,13 @@ follow-redirects@^1.0.0:
  dependencies:
    debug "=3.1.0"

+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
 for-in@^0.1.3:
  version "0.1.8"
  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -1930,6 +2034,15 @@ from2@^2.1.0:
    inherits "^2.0.1"
    readable-stream "^2.0.0"

+fs-extra@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -2010,6 +2123,11 @@ get-caller-file@^1.0.1, get-caller-file@^1.0.2:
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==

+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
+  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+
 get-stdin@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -2084,6 +2202,14 @@ global-prefix@^1.0.1:
    is-windows "^1.0.1"
    which "^1.2.14"

+global@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
 globby@^6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -2235,6 +2361,11 @@ hmac-drbg@^1.0.0:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.1"

+hoek@6.x.x:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
+  integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
+
 homedir-polyfill@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@@ -2488,6 +2619,11 @@ invert-kv@^2.0.0:
  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==

+ip-regex@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
+  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=
+
 ip-regex@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -2546,7 +2682,7 @@ is-builtin-module@^1.0.0:
  dependencies:
    builtin-modules "^1.0.0"

-is-callable@^1.1.4:
+is-callable@^1.1.3, is-callable@^1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
@@ -2624,6 +2760,11 @@ is-fullwidth-code-point@^2.0.0:
  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=

+is-function@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
+  integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
+
 is-glob@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@@ -2645,6 +2786,11 @@ is-number@^3.0.0:
  dependencies:
    kind-of "^3.0.2"

+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
 is-path-cwd@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -2678,6 +2824,11 @@ is-regex@^1.0.4:
  dependencies:
    has "^1.0.1"

+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -2720,6 +2871,13 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

+isemail@3.x.x:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
+  integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
+  dependencies:
+    punycode "2.x.x"
+
 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -2742,6 +2900,42 @@ isstream@~0.1.2:
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

+jimp@^0.2.28:
+  version "0.2.28"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz#dd529a937190f42957a7937d1acc3a7762996ea2"
+  integrity sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI=
+  dependencies:
+    bignumber.js "^2.1.0"
+    bmp-js "0.0.3"
+    es6-promise "^3.0.2"
+    exif-parser "^0.1.9"
+    file-type "^3.1.0"
+    jpeg-js "^0.2.0"
+    load-bmfont "^1.2.3"
+    mime "^1.3.4"
+    mkdirp "0.5.1"
+    pixelmatch "^4.0.0"
+    pngjs "^3.0.0"
+    read-chunk "^1.0.1"
+    request "^2.65.0"
+    stream-to-buffer "^0.1.0"
+    tinycolor2 "^1.1.2"
+    url-regex "^3.0.0"
+
+joi@^14.3.1:
+  version "14.3.1"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-14.3.1.tgz#164a262ec0b855466e0c35eea2a885ae8b6c703c"
+  integrity sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ==
+  dependencies:
+    hoek "6.x.x"
+    isemail "3.x.x"
+    topo "3.x.x"
+
+jpeg-js@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz#53e448ec9d263e683266467e9442d2c5a2ef5482"
+  integrity sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=
+
 js-base64@^2.1.8:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
@@ -2785,6 +2979,13 @@ json-schema@0.2.3:
  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=

+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+  dependencies:
+    jsonify "~0.0.0"
+
 json-stringify-safe@5.0.1, json-stringify-safe@~5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -2877,6 +3078,20 @@ lightercollective@^0.1.0:
  resolved "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.1.0.tgz#70df102c530dcb8d0ccabfe6175a8d00d5f61300"
  integrity sha512-J9tg5uraYoQKaWbmrzDDexbG6hHnMcWS1qLYgJSWE+mpA3U5OCSeMUhb+K55otgZJ34oFdR0ECvdIb3xuO5JOQ==

+load-bmfont@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz#75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"
+  integrity sha512-kT63aTAlNhZARowaNYcY29Fn/QYkc52M3l6V1ifRcPewg2lvUZDAj7R6dXjOL9D0sict76op3T5+odumDSF81g==
+  dependencies:
+    buffer-equal "0.0.1"
+    mime "^1.3.4"
+    parse-bmfont-ascii "^1.0.3"
+    parse-bmfont-binary "^1.0.5"
+    parse-bmfont-xml "^1.1.4"
+    phin "^2.9.1"
+    xhr "^2.0.1"
+    xtend "^4.0.0"
+
 load-json-file@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -2939,6 +3154,11 @@ locate-path@^3.0.0:
    p-locate "^3.0.0"
    path-exists "^3.0.0"

+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
 lodash.assign@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
@@ -2964,6 +3184,21 @@ lodash.tail@^4.1.1:
  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=

+lodash.template@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
 lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.5, lodash@~4.17.10:
  version "4.17.11"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -3144,6 +3379,11 @@ mime@1.4.1:
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==

+mime@^1.3.4, mime@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 mime@^2.0.3, mime@^2.3.1:
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
@@ -3154,6 +3394,13 @@ mimic-fn@^1.0.0:
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==

+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
 mini-css-extract-plugin@^0.5.0:
  version "0.5.0"
  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
@@ -3237,7 +3484,7 @@ mixin-object@^2.0.1:
    for-in "^0.1.3"
    is-extendable "^0.1.1"

-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -3292,11 +3539,16 @@ multicast-dns@^6.0.1:
    dns-packet "^1.3.1"
    thunky "^1.0.2"

-nan@^2.10.0, nan@^2.9.2:
+nan@2.12.1, nan@^2.10.0, nan@^2.9.2:
  version "2.12.1"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==

+nan@^2.8.0:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
+
 nanomatch@^1.2.9:
  version "1.2.13"
  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -3418,6 +3670,13 @@ node-pre-gyp@^0.10.0:
    semver "^5.3.0"
    tar "^4"

+node-pty@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.8.1.tgz#94b457bec013e7a09b8d9141f63b0787fa25c23f"
+  integrity sha512-j+/g0Q5dR+vkELclpJpz32HcS3O/3EdPSGPvDXJZVJQLCvgG0toEbfmymxAEyQyZEpaoKHAcoL+PvKM+4N9nlw==
+  dependencies:
+    nan "2.12.1"
+
 node-sass@^4.11.0:
  version "4.11.0"
  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
@@ -3736,6 +3995,32 @@ parse-asn1@^5.0.0:
    evp_bytestokey "^1.0.0"
    pbkdf2 "^3.0.3"

+parse-bmfont-ascii@^1.0.3:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285"
+  integrity sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU=
+
+parse-bmfont-binary@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz#d038b476d3e9dd9db1e11a0b0e53a22792b69006"
+  integrity sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=
+
+parse-bmfont-xml@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz#015319797e3e12f9e739c4d513872cd2fa35f389"
+  integrity sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==
+  dependencies:
+    xml-parse-from-string "^1.0.0"
+    xml2js "^0.4.5"
+
+parse-headers@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz#9545e8a4c1ae5eaea7d24992bca890281ed26e34"
+  integrity sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==
+  dependencies:
+    for-each "^0.3.3"
+    string.prototype.trim "^1.1.2"
+
 parse-json@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -3850,6 +4135,11 @@ performance-now@^2.1.0:
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

+phin@^2.9.1:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
+  integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
+
 pidtree@^0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
@@ -3877,6 +4167,13 @@ pinkie@^2.0.0:
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=

+pixelmatch@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
+  integrity sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=
+  dependencies:
+    pngjs "^3.0.0"
+
 pkg-dir@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -3884,6 +4181,11 @@ pkg-dir@^3.0.0:
  dependencies:
    find-up "^3.0.0"

+pngjs@^3.0.0:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
+  integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==
+
 portfinder@^1.0.9:
  version "1.0.20"
  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
@@ -3952,6 +4254,11 @@ preload-webpack-plugin@^3.0.0-beta.2:
    core-js "^2.5.7"
    url-parse "^1.4.3"

+pretty-bytes@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.1.0.tgz#6237ecfbdc6525beaef4de722cc60a58ae0e6c6d"
+  integrity sha512-wa5+qGVg9Yt7PB6rYm3kXlKzgzgivYTLRandezh43jjRqgyDyP+9YxfJpJiLs9yKD1WeU8/OvtToWpW7255FtA==
+
 pretty-error@^2.0.2:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -3970,6 +4277,11 @@ process@^0.11.10:
  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=

+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
+
 promise-inflight@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -4040,16 +4352,16 @@ punycode@1.3.2:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=

+punycode@2.x.x, punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
 punycode@^1.2.4, punycode@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=

-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
 qs@6.5.2, qs@~6.5.2:
  version "6.5.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -4110,6 +4422,11 @@ rc@^1.2.7:
    minimist "^1.2.0"
    strip-json-comments "~2.0.1"

+read-chunk@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz#5f68cab307e663f19993527d9b589cace4661194"
+  integrity sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=
+
 read-pkg-up@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -4190,6 +4507,21 @@ regenerate@^1.2.1:
  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==

+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+
 regex-not@^1.0.0, regex-not@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -4257,7 +4589,7 @@ repeating@^2.0.0:
  dependencies:
    is-finite "^1.0.0"

-request@^2.87.0, request@^2.88.0:
+request@^2.65.0, request@^2.87.0, request@^2.88.0:
  version "2.88.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -4396,7 +4728,7 @@ sass-loader@^7.1.0:
    pify "^3.0.0"
    semver "^5.5.0"

-sax@^1.2.4:
+sax@>=0.6.0, sax@^1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -4683,6 +5015,15 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

+spdlog@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/spdlog/-/spdlog-0.8.1.tgz#dfb3f3422ab3efe32be79e4769b95440ed72699f"
+  integrity sha512-W0s8IOXpn86md+8PJ4mJeB/22thykzH5YaNc3Rgnql4x4/zFIhvNiEx6/a1arnqvmJF0HtRO0Ehlswg0WcwTLQ==
+  dependencies:
+    bindings "^1.3.0"
+    mkdirp "^0.5.1"
+    nan "^2.8.0"
+
 spdx-correct@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -4823,6 +5164,18 @@ stream-shift@^1.0.0:
  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=

+stream-to-buffer@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz#26799d903ab2025c9bd550ac47171b00f8dd80a9"
+  integrity sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk=
+  dependencies:
+    stream-to "~0.2.0"
+
+stream-to@~0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz#84306098d85fdb990b9fa300b1b3ccf55e8ef01d"
+  integrity sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0=
+
 string-replace-loader@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-2.1.1.tgz#b72e7b57b6ef04efe615aff0ad989b5c14ca63d1"
@@ -4857,6 +5210,15 @@ string.prototype.padend@^3.0.0:
    es-abstract "^1.4.3"
    function-bind "^1.0.2"

+string.prototype.trim@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.0"
+    function-bind "^1.0.2"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
@@ -4876,6 +5238,15 @@ string_decoder@~1.1.1:
  dependencies:
    safe-buffer "~5.1.0"

+stringify-object@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -4902,6 +5273,14 @@ strip-bom@^3.0.0:
  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=

+strip-comments@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-1.0.2.tgz#82b9c45e7f05873bee53f37168af930aa368679d"
+  integrity sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==
+  dependencies:
+    babel-extract-comments "^1.0.0"
+    babel-plugin-transform-object-rest-spread "^6.26.0"
+
 strip-eof@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -5039,6 +5418,11 @@ timers-browserify@^2.0.4:
  dependencies:
    setimmediate "^1.0.4"

+tinycolor2@^1.1.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
+  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
+
 to-arraybuffer@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -5069,6 +5453,13 @@ to-regex@^3.0.1, to-regex@^3.0.2:
    regex-not "^1.0.2"
    safe-regex "^1.1.0"

+topo@3.x.x:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
+  integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==
+  dependencies:
+    hoek "6.x.x"
+
 toposort@^1.0.0:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
@@ -5312,6 +5703,13 @@ url-parse@^1.4.3:
    querystringify "^2.0.0"
    requires-port "^1.0.0"

+url-regex@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
+  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=
+  dependencies:
+    ip-regex "^1.0.1"
+
 url@^0.11.0:
  version "0.11.0"
  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -5573,6 +5971,15 @@ webpack-merge@^4.2.1:
  dependencies:
    lodash "^4.17.5"

+webpack-pwa-manifest@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-pwa-manifest/-/webpack-pwa-manifest-4.0.0.tgz#a7c12debe497f61f5948ddb079bb8a955152abd9"
+  integrity sha512-655TpvoOLGHI2hgx7AmmdgHLc+xDtAi6J5fz7bTnuhxWtEVH/NI2qGlDY40HErlblOV74VtVz5S/C0u7ZpPlvQ==
+  dependencies:
+    css-color-names "0.0.4"
+    jimp "^0.2.28"
+    mime "^1.6.0"
+
 webpack-sources@^1.1.0, webpack-sources@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
@@ -5648,6 +6055,141 @@ wide-align@^1.1.0:
  dependencies:
    string-width "^1.0.2 || 2"

+workbox-background-sync@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-4.1.1.tgz#0d4439d9e364854f4030ad8f44c8b34b0bbce2e7"
+  integrity sha512-z8iKAx7f3cfQpGaRrrl2CpP4dGe+vHk05vJbzscwA7e1K8vyNl6zALBtIyyAvEZzMsofsiGEZqt2g/8CfyfQ5g==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-broadcast-update@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-4.1.1.tgz#93a2b455673f6b73027890cb362f66156a3701f1"
+  integrity sha512-gq83a8F6ESQobfltaxzoUTz0mEpTOsXHmy9Po9kKMT1UjXTWh/4NDF3HwQYaxJckOER9NITB3BuoXlXr3tI8aA==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-build@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-4.1.1.tgz#d75d9f4ff70ba5c960be4043bfc4c25c62f22a45"
+  integrity sha512-+QRtNFKDq7RlIpigsh26joUNoEN+c3pQ+yT8Rs29RtpM50S1nKggFUQY0HoRvN7tzvuzIgxCrx3osxOQ8hmj7Q==
+  dependencies:
+    "@babel/runtime" "^7.3.4"
+    common-tags "^1.8.0"
+    fs-extra "^4.0.2"
+    glob "^7.1.3"
+    joi "^14.3.1"
+    lodash.template "^4.4.0"
+    pretty-bytes "^5.1.0"
+    stringify-object "^3.3.0"
+    strip-comments "^1.0.2"
+    workbox-background-sync "^4.1.1"
+    workbox-broadcast-update "^4.1.1"
+    workbox-cacheable-response "^4.1.1"
+    workbox-core "^4.1.1"
+    workbox-expiration "^4.1.1"
+    workbox-google-analytics "^4.1.1"
+    workbox-navigation-preload "^4.1.1"
+    workbox-precaching "^4.1.1"
+    workbox-range-requests "^4.1.1"
+    workbox-routing "^4.1.1"
+    workbox-strategies "^4.1.1"
+    workbox-streams "^4.1.1"
+    workbox-sw "^4.1.1"
+    workbox-window "^4.1.1"
+
+workbox-cacheable-response@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-4.1.1.tgz#f01032f0a08f2eedb9c420f1267b4738c6dfd58e"
+  integrity sha512-uc1zkeidJgAMXHvUbspKJt3NzXHAcb5D+7sX6HrCZIMneS4ZxMvdB86giIR3bveV4PaOssqIYVrWUJvIehK/NA==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-core@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.1.1.tgz#eaad7132762727373377ca1c8a2130cfa641cc90"
+  integrity sha512-RbzMWnDW7UvfstwOs8ERDFTH6zr7akm4wIbIednFs1TnAvZbN3gpIBoEv53kaMr0uMYDSXI2KxaLmmz9WX1PXA==
+
+workbox-expiration@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-4.1.1.tgz#d676fc24dd99576d4f62372d342ed7cea6bd968a"
+  integrity sha512-N/fbypqCbFrrKDhVnTyGXhkFTgjA8aRUydkxCpgJM1ajf7udQYD4XWTQxXosPJC2UVsa2/kPCBYFQOQ1Fu/2TA==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-google-analytics@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-4.1.1.tgz#e3901d9edc00ce269db1a86aef8d2e12b3fca222"
+  integrity sha512-ByZYHv61u4dFQXQAXZZ1bNgcJ45yA85C8OAlSDGwqOuv72dZoybG3EMtJo/0ChO6irxWI1pictF2pTW7JxcCkQ==
+  dependencies:
+    workbox-background-sync "^4.1.1"
+    workbox-core "^4.1.1"
+    workbox-routing "^4.1.1"
+    workbox-strategies "^4.1.1"
+
+workbox-navigation-preload@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-4.1.1.tgz#0990ffe94b2110141d48f2b516084c363f538d4e"
+  integrity sha512-U+QEpcOgakBFZ6Aiv438DTvkZQX518qxfu280kEPZnFU88wIFBAK9V4MmJcoX60fk1INTD//YnfSxI0cLy1N+g==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-precaching@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-4.1.1.tgz#05ddbe82d06f5c07b3cf077389d451ec4df5d157"
+  integrity sha512-GuoBH85MzVpzmF8c5Sql1i9HYdOqcpRDdNPLrIkWEfuvURO5M/jT+cGcyfFq35Xo7xRb4kE79H4hnF3EnCkFRw==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-range-requests@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-4.1.1.tgz#01f81716f86b04e398bfd11df2a34cd73d52e4bc"
+  integrity sha512-i9i7tRTcXveCJdi4lK7XstgHweTwkqEGR7GPauYIDGAZplWrxDOAOUDSvkH8ibOxEgO6f0VFhyYY6fPB6u+oSA==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-routing@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-4.1.1.tgz#c31d663c6c4c0e9a6f03b5a6fdfe79fb6ee7f29d"
+  integrity sha512-slOb+2Nfn8V3fG/TtN0c0k4OOyuwLSnZUv+zyZeJafSU3MrQPC58bPeG7HOZZDwoQAsBG9VSukjRDFR0F1lXKg==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-strategies@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-4.1.1.tgz#5289b977dbc56ef97f17a3a99722f174b8cf6933"
+  integrity sha512-ejmRqmjwn9DYsl1QVZkRb1V/iaBzhsh3YwJelfXQk68JpB36WjwY9csFQ2gSvlLCCg3d4MVFFxKfmHVyVnhwAA==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-streams@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-4.1.1.tgz#f49418d7a2388c89838c4022229ba6ee23af60fd"
+  integrity sha512-6TKC4rrvnjbLpWtgHIYWjWS28h0SqSWogkJIKC1f/6MjJCmi2qM7PYJwXR0/t8lJVZj61ujVSulZ92XQmy3GhQ==
+  dependencies:
+    workbox-core "^4.1.1"
+
+workbox-sw@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-4.1.1.tgz#037031ec107c9befe568064679d16fc03748ff02"
+  integrity sha512-3nQFWFyG1W21x7TUVBsobrLoFDEy7ck/3nx2W1I3c+DhLCIu7B+IAnQVdefK+oRju5fIDWwOQ63fok8Uz7E/Gw==
+
+workbox-webpack-plugin@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-4.1.1.tgz#4e3f40fb5d0bb6aed21e617e47032bafe8cbedb2"
+  integrity sha512-Fygc8qrh/IOeJeZ4NETs9arYtJEwcO0Yy7JRkX5DSOHCSkWHxOX1ryazAcK0ACyMJOQuU9zJVmx+mnn0zqYKtA==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    json-stable-stringify "^1.0.1"
+    workbox-build "^4.1.1"
+
+workbox-window@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-4.1.1.tgz#0c449b87406baa4dc9f7c82d015ac63a031b3ed7"
+  integrity sha512-KadE/DdNY1f6Va3MMOSigheLSgNxWHV/K/iDHnLMpo2EBGVpfwRCOuEwJNHlWA3G5WdpZlyTmtShf/5Mbb6dNg==
+  dependencies:
+    workbox-core "^4.1.1"
+
 worker-farm@^1.5.2:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
@@ -5669,9 +6211,9 @@ wrappy@1:
  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

 write-file-atomic@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
  dependencies:
    graceful-fs "^4.1.11"
    imurmurhash "^0.1.4"
@@ -5691,12 +6233,40 @@ write-file-webpack-plugin@^4.5.0:
    write-file-atomic "^2.3.0"

 ws@^6.0.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
-  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
  dependencies:
    async-limiter "~1.0.0"

+xhr@^2.0.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd"
+  integrity sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==
+  dependencies:
+    global "~4.3.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
+
+xml-parse-from-string@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
+  integrity sha1-qQKekp09vN7RafPG4oI42VpdWig=
+
+xml2js@^0.4.5:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
 xregexp@4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
Author	SHA1	Message	Date
Kyle Carberry	166efcb17e	Hide titlebar controls and fix menubar toggle (#550 )	2019-04-19 19:54:50 -05:00
Kyle Carberry	206e107a9a	Merge branch 'master' of github.com:codercom/code-server	2019-04-19 20:03:54 -04:00
Kyle Carberry	12c8b5d337	Closes #466	2019-04-19 20:03:52 -04:00
Asher	4aa20fd864	Fix require.toUrl on the Node side - Fixes #542	2019-04-19 13:32:10 -05:00
Illia Poplawski	0cd4e46055	Fix self hosted flags (#523 ) * Remove -h flag for help information * Add tab after removing -h option * Remove spaces after --user-data-dir option to line up with other menu items	2019-04-18 13:02:29 -05:00
Asher	f51823b51f	Fix open dialog - Fixes #508	2019-04-18 12:08:44 -05:00
Asher	55bfeab208	Deprecate password flag in favor of an environment variable	2019-04-18 11:10:55 -05:00
Asher	309d15cefd	Use file/folder open commands for all operating systems Mac was using its own thing. - Fixes #535 - Fixes #501	2019-04-18 10:50:23 -05:00
Kyle Carberry	95006a435a	Merge branch 'master' of github.com:codercom/code-server	2019-04-17 21:01:25 -04:00
Kyle Carberry	4d576ab4d4	Trigger configuration update when loaded	2019-04-17 21:01:23 -04:00
Asher	d5b03ef60e	Remove version from Docker command	2019-04-17 17:38:22 -05:00
Kyle Carberry	c3a38e3fea	Add telemetry and option to disable (#519 ) * Add telemetry and option to disable * Update readme and getting-started guide * Update lockfile * Update getting started guide	2019-04-17 17:18:35 -05:00
Asher	cc8c7e2cee	Make assets unique (#518 ) * Make all assets unique All CSS and JavaScript files have unique names now. I also moved the login to the /login path in order to ensure the HTML for each page is also unique. * Explicitly include assets to cache	2019-04-17 17:18:20 -05:00
Kyle Carberry	e0f1787ce6	Update logger	2019-04-17 17:47:02 -04:00
John McCambridge	50e6108012	Add confirmation for closing window (#463 ) * Add confirmation for closing window * Make function an event listener for consistency * Change let to const * Refactor for compatability	2019-04-17 16:42:36 -05:00
Asher	630ccfcacc	Add flag to install an extension from the command line (#504 )	2019-04-17 16:30:50 -05:00
Patrick Smith	c4c26058ef	Use port from PORT env variable if available (#502 )	2019-04-17 16:30:39 -05:00
Kyle Carberry	8a4da542ae	Add GCP logging extender (#503 ) * Add GCP logging extender * Minor version bump for new API * Update packages/logger/src/logger.ts Co-Authored-By: kylecarbs <kyle@kwc.io>	2019-04-17 13:41:10 -05:00
Luca Casonato	e907dbe7e6	fixe password signin with service-worker (#511 )	2019-04-17 10:27:24 -05:00
Luca Casonato	22b485acd9	Added serviceworker and web-manifest (#154 ) * Added serviceworker and manifest.json * added deps in package.json * fixed image link * actually fixed images i think * added assets to individual module folders * added caching * Serviceworker now properly loads * Changed single to double quotes * Update lock * moved the service worker back into prod only * removed sw from general * changed background color of splash screen * added logo to server * centralized logo into single assets folder	2019-04-16 15:44:57 -05:00
Asher	b8f222acf2	Ensure all environment paths are created This normally happens in electron-main/main.ts but we don't run anything from there. Fixes #499.	2019-04-16 10:58:13 -05:00
Asher	aabb2ecda7	Update node to 10.15.1 (#472 ) * Update Node to 10.15.1 * Remove string replace that was used for oclif * Update nbin * Package node-pty and spdlog with nbin * Label stderr/stdout from shared process * Remove fork override * Prevent "already disposed" errors when trying to kill disposed proxies * Include spdlog dependencies * Shim /node_modules * Add node_modules to Docker ignore It keeps using my already-built .node files which results in a mismatching GLIBC version error. * Update nbin	2019-04-15 19:48:12 -05:00
Kibo Hikari	dfabc070b9	fix(dockerfile): explicitly create a volume and set permission for project dir (#471 ) Signed-off-by: Kibo Hikari <enra@sayonika.moe>	2019-04-13 23:34:25 -05:00
Kyle Carberry	da420cdda9	Merge branch 'master' of github.com:codercom/code-server	2019-04-14 00:32:06 -04:00
Kyle Carberry	c6a46e4753	Fix reading text from clipboard via electron fill	2019-04-14 00:32:03 -04:00
Asher	742dd6f597	Upgrade VS Code to 1.33.1	2019-04-12 16:10:45 -05:00
Yen-Chi Chen	6c3ff1d6f0	Fix typo: doc/self-hosted/index.md (#477 )	2019-04-12 10:35:54 -05:00
John McCambridge	db57aa229f	Allow use of the enter key for password input for code-server (#479 ) * Allow use of the enter key for password input for code-server * Remove function, make html form * Remove function and create html form * Handle form submit action * Remove button listener * Check if form exists	2019-04-12 10:35:30 -05:00
David Pinezich	f7342ede69	Update digitalocean.md (#486 ) Seems that sudo ./code-server-linux -p 80 is outdated. The "linux" is not anymore given.	2019-04-11 16:18:13 -05:00
Anmol Sethi	b781ccde9c	Add common utilities to Dockerfile (#488 )	2019-04-11 15:30:21 -05:00
Asher	8f62b2bff2	Decrease max retry time to three seconds	2019-04-11 14:58:29 -05:00
Asher	7047be859c	Fix some open file/folder issues - "Open folder" now says "open folder" instead of "open file" - "Open folder" won't allow you to open files - "Open file" won't allow you to open directories Fixes #249.	2019-04-11 14:55:06 -05:00
Kyle Carberry	2785e2219a	Remove hosted from the readme	2019-04-11 02:11:51 +00:00
majik	4b217fba00	Feature/relative url (#307 ) * resrouce relative url * add url pathname for require.toUrl (fix webview url) * rest resrouce relative url * fix resource url * ignore .vscode	2019-04-10 20:07:53 -05:00
Kyle Carberry	3fae68bbab	Add storage save to ide-api	2019-04-09 12:24:53 -04:00
Asher	a2f20aa25c	Update window service fill	2019-04-08 18:04:41 -05:00
Asher	94b8b9a5cf	Fix window.open infinite loop	2019-04-08 17:44:10 -05:00
Asher	bbd8b27fc7	Explicitly mention if netstat isn't installed; downgrade to warning	2019-04-08 11:15:25 -05:00
Asher	6361635b55	Move backup service init to the shared process Since this is where it attempts to read it, this should solve the JSON errors for good.	2019-04-08 11:03:33 -05:00
@@ -1 +1 @@
 .15.0
 .15.1