Refactor template string with handlebars.

- Refactor static routing, template vars.
- Fixed issue where JSON entities may be unescaped
- Updated web manifest schema, route handler.
- Clean up issues surrounding static paths, types.
- Removed static path helper.
- Fixed issue where locals may change during request handling.
- Added missing types.
- Fixed issue where body theme color is stale.

Author: GirlBossRush

ci/build/build-code-server.sh

@@ -25,13 +25,10 @@ main() {
   fi
 
   parcel build \
-    --public-url "." \
+    --public-url "/static/" \
     --out-dir dist \
-    $([[ $MINIFY ]] || echo --no-minify) \
-    src/browser/register.ts \
-    src/browser/serviceWorker.ts \
-    src/browser/pages/login.ts \
-    src/browser/pages/vscode.ts
+    "$([[ $MINIFY ]] || echo --no-minify)" \
+    src/browser/**/*.ts
 }
 
 main "$@"

ci/build/build-release.sh

@@ -38,10 +38,9 @@ bundle_code_server() {
 
   # For source maps and images.
   mkdir -p "$RELEASE_PATH/src/browser"
-  rsync src/browser/media/ "$RELEASE_PATH/src/browser/media"
-  mkdir -p "$RELEASE_PATH/src/browser/pages"
-  rsync src/browser/pages/*.html "$RELEASE_PATH/src/browser/pages"
-  rsync src/browser/robots.txt "$RELEASE_PATH/src/browser"
+  rsync -r src/browser/public "$RELEASE_PATH/src/browser"
+  mkdir -p "$RELEASE_PATH/src/browser/views"
+  rsync -r src/browser/views "$RELEASE_PATH/src/browser"
 
   # Adds the commit to package.json
   jq --slurp '.[0] * .[1]' package.json <(

ci/dev/watch.ts

@@ -173,21 +173,13 @@ class Watcher {
   }
 
   private createBundler(out = "dist"): Bundler {
-    return new Bundler(
-      [
-        path.join(this.rootPath, "src/browser/register.ts"),
-        path.join(this.rootPath, "src/browser/serviceWorker.ts"),
-        path.join(this.rootPath, "src/browser/pages/login.ts"),
-        path.join(this.rootPath, "src/browser/pages/vscode.ts"),
-      ],
-      {
-        outDir: path.join(this.rootPath, out),
-        cacheDir: path.join(this.rootPath, ".cache"),
-        minify: !!process.env.MINIFY,
-        logLevel: 1,
-        publicUrl: ".",
-      },
-    )
+    return new Bundler([path.join(this.rootPath, "src/browser/**/*.ts")], {
+      outDir: path.join(this.rootPath, out),
+      cacheDir: path.join(this.rootPath, ".cache"),
+      minify: !!process.env.MINIFY,
+      logLevel: 1,
+      publicUrl: "/static/",
+    })
   }
 }
 

package.json

@@ -32,7 +32,9 @@
   "devDependencies": {
     "@types/body-parser": "^1.19.0",
     "@types/cookie-parser": "^1.4.2",
+    "@types/entities": "^1.1.1",
     "@types/express": "^4.17.8",
+    "@types/express-handlebars": "^3.1.0",
     "@types/fs-extra": "^8.0.1",
     "@types/http-proxy": "^1.17.4",
     "@types/js-yaml": "^3.12.3",
@@ -71,8 +73,10 @@
     "@coder/logger": "1.1.16",
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.5",
+    "entities": "^2.1.0",
     "env-paths": "^2.2.0",
     "express": "^5.0.0-alpha.8",
+    "express-handlebars": "^5.2.0",
     "fs-extra": "^9.0.1",
     "http-proxy": "^1.18.0",
     "httpolyglot": "^0.1.2",

src/browser/main.ts

@@ -0,0 +1,16 @@
+import "./views/error/index.css"
+import "./views/global.css"
+import "./views/login/index.css"
+
+import { getOptions, normalize } from "../common/util"
+
+const options = getOptions()
+
+if ("serviceWorker" in navigator) {
+  const path = normalize(`${options.base}/serviceWorker.js`)
+  navigator.serviceWorker
+    .register(path, {
+      scope: (options.base ?? "") + "/",
+    })
+    .then(() => console.debug("[Code Server Service Worker] registered"))
+}