Merge branch 'master' into log-failed-logins

doc/admin/install/aws.md

@@ -39,15 +39,15 @@ If you're just starting out, we recommend [installing code-server locally](../..
   ```
 - Replace {version} in the following command with the version found on the releases page and run it (or just copy the download URL from the releases page):
   ```
-  wget https://github.com/cdr/code-server/releases/download/{version}/code-server-{version}-linux-x64.tar.gz
+  wget https://github.com/cdr/code-server/releases/download/{version}/code-server{version}-linux-x64.tar.gz
   ```
 - Extract the downloaded tar.gz file with this command, for example:
   ```
-  tar -xvzf code-server-{version}-linux-x64.tar.gz
+  tar -xvzf code-server{version}-linux-x64.tar.gz
   ```
 - Navigate to extracted directory with this command:
   ```
-  cd code-server-{version}-linux-x64
+  cd code-server{version}-linux-x64
   ```
 - If you run into any permission errors, make the binary executable by running:
   ```

doc/admin/install/digitalocean.md

@@ -22,15 +22,15 @@ If you're just starting out, we recommend [installing code-server locally](../..
   ```
 - Replace {version} in the following command with the version found on the releases page and run it (or just copy the download URL from the releases page):
   ```
-  wget https://github.com/cdr/code-server/releases/download/{version}/code-server-{version}-linux-x64.tar.gz
+  wget https://github.com/cdr/code-server/releases/download/{version}/code-server{version}-linux-x64.tar.gz
   ```
 - Extract the downloaded tar.gz file with this command, for example:
   ```
-  tar -xvzf code-server-{version}-linux-x64.tar.gz
+  tar -xvzf code-server{version}-linux-x64.tar.gz
   ```
 - Navigate to extracted directory with this command:
   ```
-  cd code-server-{version}-linux-x64
+  cd code-server{version}-linux-x64
   ```
 - If you run into any permission errors when attempting to run the binary:
   ```

doc/admin/install/google_cloud.md

@@ -33,17 +33,17 @@ https://github.com/cdr/code-server/releases/latest
 
 - Replace {version} in the following command with the version found on the releases page and run it (or just copy the download URL from the releases page):
 ```
-wget https://github.com/cdr/code-server/releases/download/{version}/code-server-{version}-linux-x64.tar.gz
+wget https://github.com/cdr/code-server/releases/download/{version}/code-server{version}-linux-x64.tar.gz
 ```
 
 - Extract the downloaded tar.gz file with this command, for example:
 ```
-tar -xvzf code-server-{version}-linux-x64.tar.gz
+tar -xvzf code-server{version}-linux-x64.tar.gz
 ```
 
 - Navigate to extracted directory with this command:
 ```
-cd code-server-{version}-linux-x64
+cd code-server{version}-linux-x64
 ```
 
 - Make the binary executable if you run into any errors regarding permission:

doc/self-hosted/index.md

@@ -25,7 +25,7 @@ It takes just a few minutes to get your own self-hosted server running. If you'v
 > NOTE: Be careful with your password as sharing it will grant those users access to your server's file system
 
 ### Things To Know
-- When you visit the IP for your code-server instance, you will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../../assets/chrome_warning.png">
+- When you visit the IP for your code-server instance, you will be greeted with a page similar to the following screenshot. Code-server is using a self-signed SSL certificate for easy setup. In Chrome/Chromium, click **"Advanced"** then click **"proceed anyway"**. In Firefox, click **Advanced**, then **Add Exception**, then finally **Confirm Security Exception**.<img src ="../assets/chrome_warning.png">
 
 ## Usage
 <pre class="pre-wrap"><code>code-server<span class="virtual-br"></span> --help</code></pre>
@@ -44,7 +44,7 @@ Options:
   -e, --extensions-dir <dir>            Override the main default path for user extensions.
   --extra-extensions-dir [dir]          Path to an extra user extension directory (repeatable). (default: [])
   --extra-builtin-extensions-dir [dir]  Path to an extra built-in extension directory (repeatable). (default: [])
-  -d --user-data-dir <dir>              Specifies the directory that user data is kept in, useful when running as root.
+  -d, --user-data-dir <dir>             Specifies the directory that user data is kept in, useful when running as root.
   -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)

packages/server/src/cli.ts

@@ -28,7 +28,7 @@ commander.version(process.env.VERSION || "development")
 	.option("-e, --extensions-dir <dir>", "Override the main default path for user extensions.")
 	.option("--extra-extensions-dir [dir]", "Path to an extra user extension directory (repeatable).", collect, [])
 	.option("--extra-builtin-extensions-dir [dir]", "Path to an extra built-in extension directory (repeatable).", collect, [])
-	.option("-d --user-data-dir <dir>", "Specifies the directory that user data is kept in, useful when running as root.")
+	.option("-d, --user-data-dir <dir>", "Specifies the directory that user data is kept in, useful when running as root.")
 	.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)

packages/web/src/index.html

@@ -29,7 +29,7 @@
 		if ("serviceWorker" in navigator) {
 			// Use the window load event to keep the page load performant
 			window.addEventListener("load", () => {
-				navigator.serviceWorker.register("/service-worker.js");
+				navigator.serviceWorker.register('service-worker.js', {scope: './'});
 			});
 		}
 	</script>

scripts/webpack.client.config.js

@@ -68,6 +68,7 @@ module.exports = (options = {}) => merge(
 		})
 	].concat(prod ? [
 		new GenerateSW({
+			importWorkboxFrom: "local",
 			include: [cachePattern],
 			runtimeCaching: [{
 				urlPattern: cachePattern,