WIP

Author: GordonSmith

packages/observablehq-compiler/package.json

@@ -51,6 +51,7 @@
         "@observablehq/inspector": "5.0.1",
         "@observablehq/stdlib": "5.8.8",
         "@observablehq/notebook-kit": "1.0.1"
+        
     },
     "repository": {
         "type": "git",

packages/observablehq-compiler/src/index.ts

@@ -6,4 +6,6 @@ export * from "./writer.ts";
 
 import "../src/index.css";
 
-// export { ohqnk } from "./ohqnk/index.ts";
+// Note: ohqnk exports are not re-exported at the root to avoid pulling
+// @observablehq/notebook-kit (which uses npm: specifiers and top-level await)
+// into Node/test environments by default.

packages/observablehq-compiler/src/ohqnk/compiler.ts

@@ -1,5 +1,5 @@
-import { Notebook, Cell } from '@observablehq/notebook-kit';
-import { define, runtime, main, type DefineState, type Definition } from '@observablehq/notebook-kit/runtime';
+import type { Notebook } from "@observablehq/notebook-kit";
+import { define, type DefineState, type Definition } from "@observablehq/notebook-kit/runtime";
 import type { Inspector } from "@observablehq/inspector";
 import type { Runtime, Module } from "@observablehq/runtime";
 

packages/observablehq-compiler/src/ohqnk/index.ts

@@ -1,4 +1,4 @@
-import { Notebook as ohqnkNotebook, Cell as ohqnkCell } from '@observablehq/notebook-kit';
+import { Notebook as ohqnkNotebook, Cell as ohqnkCell } from "@observablehq/notebook-kit";
 import { compile as ohqnkCompile } from "./compiler.ts";
 
 export namespace ohqnk {

packages/observablehq-compiler/vite.config.ts

@@ -2,7 +2,8 @@ import { createHpccViteConfig, browserConfig, nodeConfig } from "@hpcc-js/esbuil
 import pkg from "./package.json" with { type: "json" };
 
 const aliasPlugin = {
-    name: 'alias-plugin',
+    name: "alias-plugin",
+    // esbuild plugin interface
     setup(build) {
         const aliases = [
             {
@@ -19,17 +20,46 @@ const aliasPlugin = {
             for (const alias of aliases) {
                 const match = args.path.match(alias.find);
                 if (match) {
-                    const resolved = alias.replacement.replace('$1', match[1]);
+                    const resolved = alias.replacement.replace("$1", match[1]);
                     return { path: resolved, external: true };
                 }
             }
         });
+    },
+    // Rollup plugin interface
+    resolveId(id, importer) {
+        const aliases = [
+            {
+                find: /^npm:(.*)$/,
+                replacement: "https://cdn.jsdelivr.net/npm/$1/+esm"
+            },
+            {
+                find: /^jsr:(.*)$/,
+                replacement: "https://esm.sh/jsr/$1"
+            }
+        ];
+
+        for (const alias of aliases) {
+            const match = id.match(alias.find);
+            if (match) {
+                const resolved = alias.replacement.replace("$1", match[1]);
+                return { id: resolved, external: true };
+            }
+        }
+        return null;
     }
 };
 
 const myBrowserConfig = { ...browserConfig };
 myBrowserConfig.optimizeDeps = {
-    include: ["acorn", "acorn-walk", "@observablehq/parser"]
+    include: [
+        "acorn",
+        "acorn-walk",
+        "@observablehq/parser",
+        "@observablehq/stdlib",
+        "@observablehq/runtime",
+        "@observablehq/inspector"
+    ]
 };
 
 const myNodeConfig = { ...nodeConfig };
@@ -40,8 +70,67 @@ myNodeConfig.optimizeDeps = {
 const config = createHpccViteConfig(pkg, {
     plugins: [aliasPlugin],
     configOverrides: {
+        // Ensure modern syntax like top-level await is supported during transforms
+        esbuild: {
+            target: "esnext",
+            supported: { "top-level-await": true }
+        },
+        // Make sure dependency optimization (esbuild) also understands our custom schemes
+        optimizeDeps: {
+            esbuildOptions: {
+                target: "esnext",
+                supported: { "top-level-await": true },
+                plugins: [aliasPlugin as any]
+            }
+        },
+        build: {
+            target: "esnext",
+            rollupOptions: {
+                external: [
+                    "@observablehq/notebook-kit",
+                    "@observablehq/notebook-kit/runtime"
+                ],
+                output: {
+                    globals: {
+                        "@observablehq/notebook-kit": "ObservableNotebookKit",
+                        "@observablehq/notebook-kit/runtime": "ObservableNotebookKitRuntime"
+                    }
+                }
+            }
+        },
         test: {
-            projects: [myBrowserConfig, myNodeConfig]
+            projects: [myBrowserConfig, myNodeConfig],
+            deps: {
+                optimizer: {
+                    web: {
+                        exclude: [
+                            "@observablehq/notebook-kit",
+                            "@observablehq/notebook-kit/runtime"
+                        ],
+                        esbuildOptions: {
+                            target: "esnext",
+                            supported: { "top-level-await": true },
+                            plugins: [aliasPlugin as any]
+                        }
+                    },
+                    ssr: {
+                        exclude: [
+                            "@observablehq/notebook-kit",
+                            "@observablehq/notebook-kit/runtime"
+                        ],
+                        esbuildOptions: {
+                            target: "esnext",
+                            supported: { "top-level-await": true },
+                            plugins: [aliasPlugin as any]
+                        }
+                    }
+                }
+            },
+            alias: {
+                // Use local stubs to avoid loading notebook-kit in tests
+                "@observablehq/notebook-kit": "/tests/mocks/notebook-kit.stub.ts",
+                "@observablehq/notebook-kit/runtime": "/tests/mocks/notebook-kit.stub.ts"
+            }
         }
     }
 });