fixup! fixup! conditional js engine

Author: avivkeller

apps/site/open-next.config.ts

@@ -3,7 +3,4 @@ import incrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache
 
 const cloudflareConfig = defineCloudflareConfig({ incrementalCache });
 
-export default {
-  ...cloudflareConfig,
-  buildCommand: 'pnpm exec cross-env CF=true pnpm build:default',
-};
+export default { ...cloudflareConfig, buildCommand: 'pnpm build:default' };

packages/rehype-shiki/eslint.config.js

@@ -1,5 +1,3 @@
-import globals from 'globals';
-
 import baseConfig from '../../eslint.config.js';
 
 export default [
@@ -11,7 +9,9 @@ export default [
         // and top-level await
         ecmaVersion: 'latest',
       },
-      globals: globals.nodeBuiltin,
+      globals: {
+        WebAssembly: 'readonly',
+      },
     },
     rules: {
       // Shiki's export isn't named, it's a re-export

packages/rehype-shiki/package.json

@@ -20,8 +20,5 @@
     "hast-util-to-string": "^3.0.1",
     "shiki": "~3.4.2",
     "unist-util-visit": "^5.0.0"
-  },
-  "devDependencies": {
-    "globals": "^16.2.0"
   }
 }

packages/rehype-shiki/src/index.mjs

@@ -1,5 +1,5 @@
-import { createJavaScriptRegexEngine } from '@shikijs/engine-javascript';
 import { createOnigurumaEngine } from '@shikijs/engine-oniguruma';
+import { wasmBinary } from '@shikijs/engine-oniguruma/wasm-inlined';
 import cLanguage from 'shiki/langs/c.mjs';
 import coffeeScriptLanguage from 'shiki/langs/coffeescript.mjs';
 import cPlusPlusLanguage from 'shiki/langs/cpp.mjs';
@@ -21,14 +21,13 @@ const { shiki, getLanguageDisplayName, highlightToHast, highlightToHtml } =
   createHighlighter({
     // On the server, we use the faster (but less web-optimized) WASM engine
     //
-    // TODO(@avivkeller): This engine is not currently supported on OpenNext.
-    // If/when OpenNext supports `WebAssembly.instantiate`, we should switch
-    // this.
-    //
-    // See: https://github.com/opennextjs/opennextjs-cloudflare/blob/main/packages/cloudflare/src/cli/build/patches/plugins/wrangler-external.ts#L30
-    engine: process?.env.CF
-      ? createJavaScriptRegexEngine()
-      : await createOnigurumaEngine(import('shiki/wasm')),
+    // TODO(@avivkeller): `shiki/wasm` is not supported in OpenNext, so we
+    // manually instantiate the binary.
+    engine: await createOnigurumaEngine(imports =>
+      WebAssembly.instantiate(new WebAssembly.Module(wasmBinary), imports).then(
+        wasm => wasm.exports
+      )
+    ),
     langs: [
       ...cLanguage,
       ...coffeeScriptLanguage,