more wip

jsjoeio · jsjoeio · commit fe364ba31ff6 · 2021-06-11T16:48:29.000-07:00
diff --git a/ci/dev/watch.ts b/ci/dev/watch.ts
@@ -1,5 +1,6 @@
 import * as cp from "child_process"
 import * as path from "path"
+import * as fs from "fs"
 import browserify from "browserify"
 
 async function main(): Promise<void> {
@@ -164,6 +165,7 @@ class Watcher {
           console.log("[plugin]", original)
         }
         if (line.includes("Watching for file changes")) {
+          bundleBrowserCode(browserFiles)
           restartServer()
         }
       })
@@ -174,12 +176,14 @@ class Watcher {
 function bundleBrowserCode(inputFiles: string[]) {
   console.log(`[browser] bundling...`)
   inputFiles.forEach(async (path: string) => {
-    browserify(path)
+    const outputPath = path.replace(".js", ".browserified.js")
+    browserify()
       .add(path)
       .bundle()
       .on("error", function (error: Error) {
         console.error(error.toString())
       })
+      .pipe(fs.createWriteStream(outputPath))
   })
   console.log(`[browser] done bundling`)
 }
diff --git a/src/browser/pages/error.html b/src/browser/pages/error.html
@@ -30,6 +30,6 @@ <h2 class="header">{{ERROR_HEADER}}</h2>
         </div>
       </div>
     </div>
-    <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.js"></script>
+    <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.browserified.js"></script>
   </body>
 </html>
diff --git a/src/browser/pages/login.html b/src/browser/pages/login.html
@@ -49,6 +49,6 @@ <h1 class="main">Welcome to code-server</h1>
       </div>
     </div>
   </body>
-  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.js"></script>
-  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/login.js"></script>
+  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.browserified.js"></script>
+  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/login.browserified.js"></script>
 </html>
diff --git a/src/browser/pages/login.ts b/src/browser/pages/login.ts
@@ -1,4 +1,4 @@
-import { getOptions } from "../../common/util.js"
+import { getOptions } from "../../common/util"
 
 const options = getOptions()
 const el = document.getElementById("base") as HTMLInputElement
diff --git a/src/browser/pages/vscode.html b/src/browser/pages/vscode.html
@@ -39,8 +39,8 @@
   <body aria-label=""></body>
 
   <!-- Startup (do not modify order of script tags!) -->
-  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/out/browser/pages/vscode.js"></script>
-  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.js"></script>
+  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/out/browser/pages/vscode.browserified.js"></script>
+  <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/out/browser/register.browserified.js"></script>
   <script data-cfasync="false" type="module" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
   <script>
     performance.mark("code/willLoadWorkbenchMain")
diff --git a/src/browser/pages/vscode.ts b/src/browser/pages/vscode.ts
@@ -1,4 +1,4 @@
-import { getOptions } from "../../common/util.js"
+import { getOptions } from "../../common/util"
 
 const options = getOptions()
 
diff --git a/src/browser/register.ts b/src/browser/register.ts
@@ -1,5 +1,5 @@
 import { logger } from "@coder/logger"
-import { getOptions, normalize, logError } from "../common/util.js"
+import { getOptions, normalize, logError } from "../common/util"
 
 export async function registerServiceWorker(): Promise<void> {
   const options = getOptions()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { getOptions } from "../../common/util.js"`
	`1`	`+import { getOptions } from "../../common/util"`
`2`	`2`
`3`	`3`	`const options = getOptions()`
`4`	`4`	`const el = document.getElementById("base") as HTMLInputElement`