WIP fix: Restore kernel-browser-runtime sourcemaps in extension

Author: rekmarks

packages/extension/scripts/build-constants.mjs

@@ -12,4 +12,5 @@ export const trustedPreludes = {
   background: {
     path: path.resolve(sourceDir, 'env/background-trusted-prelude.js'),
   },
+  'kernel-worker': { content: "import './endoify.js';" },
 };

packages/extension/src/manifest.json

@@ -12,7 +12,7 @@
   },
   "permissions": ["offscreen", "unlimitedStorage"],
   "sandbox": {
-    "pages": ["browser-runtime/vat/iframe.html"]
+    "pages": ["iframe.html"]
   },
   "content_security_policy": {
     "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'none'; frame-ancestors 'none';",

packages/extension/src/offscreen.ts

@@ -51,7 +51,7 @@ async function makeKernelWorker(): Promise<{
   kernelStream: DuplexStream<JsonRpcResponse, JsonRpcCall>;
   vatWorkerService: VatWorkerServer;
 }> {
-  const worker = new Worker('browser-runtime/kernel-worker/index.js', {
+  const worker = new Worker('kernel-worker.js', {
     type: 'module',
   });
 
@@ -69,7 +69,7 @@ async function makeKernelWorker(): Promise<{
     (vatId) =>
       makeIframeVatWorker({
         id: vatId,
-        iframeUri: 'browser-runtime/vat/iframe.html',
+        iframeUri: 'iframe.html',
         getPort: initializeMessageChannel,
         logger: logger.subLogger({
           tags: ['iframe-vat-worker', vatId],

packages/extension/vite.config.ts

@@ -2,6 +2,7 @@
 /// <reference types="vitest" />
 
 import {
+  deduplicateAssets,
   extensionDev,
   htmlTrustedPrelude,
   jsTrustedPrelude,
@@ -13,27 +14,39 @@ import { checker as viteChecker } from 'vite-plugin-checker';
 import { viteStaticCopy } from 'vite-plugin-static-copy';
 import type { Target } from 'vite-plugin-static-copy';
 
-import {
-  sourceDir,
-  buildDir,
-  trustedPreludes,
-} from './scripts/build-constants.mjs';
+import {} from // sourceDir,
+// buildDir,
+// trustedPreludes,
+'./scripts/build-constants.mjs';
+
+const dirname = path.dirname(new URL(import.meta.url).pathname);
+const packagesDir = path.resolve(dirname, '..');
+const extensionDir = path.resolve(packagesDir, 'extension');
+const sourceDir = path.resolve(extensionDir, 'src');
+const outDir = path.resolve(extensionDir, 'dist');
+const kernelBrowserRuntimeSrcDir = path.resolve(
+  packagesDir,
+  'kernel-browser-runtime/src',
+);
+
+export const trustedPreludes = {
+  background: {
+    path: path.resolve(sourceDir, 'env/background-trusted-prelude.js'),
+  },
+  'kernel-worker': { content: "import './endoify.js';" },
+};
 
 /**
  * Files that need to be statically copied to the destination directory.
  * Paths are relative from the project root directory.
  */
 const staticCopyTargets: readonly (string | Target)[] = [
   // The extension manifest
-  'manifest.json',
-  // External modules
-  'env/dev-console.js',
-  'env/background-trusted-prelude.js',
-  '../../kernel-shims/dist/endoify.js',
-  {
-    src: '../../kernel-browser-runtime/dist/static/*',
-    dest: './browser-runtime',
-  },
+  path.resolve(sourceDir, 'manifest.json'),
+  // Trusted prelude-related
+  path.resolve(sourceDir, 'env/dev-console.js'),
+  path.resolve(sourceDir, 'env/background-trusted-prelude.js'),
+  path.resolve(packagesDir, 'kernel-shims/dist/endoify.js'),
 ];
 
 // https://vitejs.dev/config/
@@ -45,16 +58,26 @@ export default defineConfig(({ mode }) => {
   }
 
   return {
-    root: sourceDir,
+    root: packagesDir,
 
     build: {
+      assetsDir: '',
       emptyOutDir: true,
-      outDir: buildDir,
+      // Disable Vite's module preload, which may cause SES-dependent code to run before lockdown.
+      modulePreload: false,
+      outDir,
       rollupOptions: {
         input: {
           background: path.resolve(sourceDir, 'background.ts'),
           offscreen: path.resolve(sourceDir, 'offscreen.html'),
           popup: path.resolve(sourceDir, 'popup.html'),
+          // kernel-browser-runtime
+          'kernel-worker': path.resolve(
+            kernelBrowserRuntimeSrcDir,
+            'kernel-worker',
+            'kernel-worker.ts',
+          ),
+          vat: path.resolve(kernelBrowserRuntimeSrcDir, 'vat', 'iframe.html'),
         },
         output: {
           entryFileNames: '[name].js',
@@ -82,10 +105,30 @@ export default defineConfig(({ mode }) => {
         silent: isDev,
       }),
       viteChecker({ typescript: { tsconfigPath: 'tsconfig.build.json' } }),
-      // Import sourcemaps from our own libraries
-      // For whatever reason, the types don't match, but it works
+      // Deduplicate sqlite-wasm assets
+      deduplicateAssets({
+        assetFilter: (fileName) =>
+          fileName.includes('sqlite3-') &&
+          !fileName.includes('sqlite3-opfs-async-proxy'),
+        expectedCount: 2,
+      }),
+      // Would you believe that there's no other way to do this?
+      {
+        name: 'move-html-files-to-root',
+        generateBundle: {
+          order: 'post',
+          handler(_, bundle) {
+            for (const chunk of Object.values(bundle)) {
+              if (!chunk.fileName.endsWith('.html')) {
+                continue;
+              }
+              chunk.fileName = path.basename(chunk.fileName);
+            }
+          },
+        },
+      },
       // Open the extension in the browser when watching
-      isWatching && extensionDev({ extensionPath: buildDir }),
+      isWatching && extensionDev({ extensionPath: outDir }),
     ],
   };
 });

packages/kernel-browser-runtime/vite.config.ts

@@ -62,12 +62,11 @@ export default defineConfig(({ mode }) => {
           vat: path.resolve(sourceDir, 'vat', 'iframe.html'),
         },
         output: {
-          format: 'esm',
           // Basically, create directories for each entry point and put all related
           // files in them.
           entryFileNames: (chunkInfo) => {
-            // This property isn't really documented, but it appears to be equivalent
-            // to the keys of `rollupOptions.input`.
+            // This property isn't really documented, but it appears to be the absolute path
+            // to the entry point.
             if (!chunkInfo.facadeModuleId) {
               return '[name].js';
             }
@@ -85,7 +84,6 @@ export default defineConfig(({ mode }) => {
           },
           chunkFileNames: '[name].js',
           assetFileNames: '[name].[ext]',
-          preserveModulesRoot: sourceDir,
         },
       },
       ...(isDev