Respect workerd: and additionals when auto-collecting modules

Previously, attempting to use Workers Sites with `modules: true`
would fail as the automatic module locator didn't know about
`__STATIC_CONTENT_MANIFEST`. This change passes through additional
modules to the locator. This change also adds support for internal
`"workerd:"` modules to the locator (e.g. `workerd:rtti`).

Author: mrbbot

packages/miniflare/src/plugins/core/index.ts

@@ -374,10 +374,15 @@ export const CORE_PLUGIN: Plugin<
     sourceMapRegistry,
   }) {
     // Define regular user worker
+    const additionalModuleNames = additionalModules.map(({ name }) => {
+      assert(name !== undefined);
+      return name;
+    });
     const workerScript = getWorkerScript(
       sourceMapRegistry,
       options,
-      workerIndex
+      workerIndex,
+      additionalModuleNames
     );
     // Add additional modules (e.g. "__STATIC_CONTENT_MANIFEST") if any
     if ("modules" in workerScript) {
@@ -561,7 +566,8 @@ export function getGlobalServices({
 function getWorkerScript(
   sourceMapRegistry: SourceMapRegistry,
   options: SourceOptions,
-  workerIndex: number
+  workerIndex: number,
+  additionalModuleNames: string[]
 ): { serviceWorkerScript: string } | { modules: Worker_Module[] } {
   const modulesRoot =
     ("modulesRoot" in options ? options.modulesRoot : undefined) ?? "";
@@ -592,6 +598,7 @@ function getWorkerScript(
     const locator = new ModuleLocator(
       sourceMapRegistry,
       modulesRoot,
+      additionalModuleNames,
       options.modulesRules
     );
     // If `script` and `scriptPath` are set, resolve modules in `script`

packages/miniflare/src/plugins/core/modules.ts

@@ -136,6 +136,7 @@ export class ModuleLocator {
   constructor(
     private readonly sourceMapRegistry: SourceMapRegistry,
     private readonly modulesRoot: string,
+    private readonly additionalModuleNames: string[],
     rules?: ModuleRule[]
   ) {
     this.#compiledRules = compileModuleRules(rules);
@@ -256,8 +257,14 @@ ${dim(modulesConfig)}`;
     }
     const spec = specExpression.value;
 
-    // `node:` and `cloudflare:` imports don't need to be included explicitly
-    if (spec.startsWith("node:") || spec.startsWith("cloudflare:")) {
+    // `node:`, `cloudflare:` and `workerd:` imports don't need to be included
+    // explicitly
+    if (
+      spec.startsWith("node:") ||
+      spec.startsWith("cloudflare:") ||
+      spec.startsWith("workerd:") ||
+      this.additionalModuleNames.includes(spec)
+    ) {
       return;
     }
 

packages/miniflare/test/index.spec.ts

@@ -445,17 +445,19 @@ test("Miniflare: custom upstream as origin", async (t) => {
   t.is(await res.text(), "upstream: http://upstream/extra/path?a=1");
 });
 
-test("Miniflare: `node:` and `cloudflare:` modules", async (t) => {
+test("Miniflare: `node:`, `cloudflare:` and `workerd:` modules", async (t) => {
   const mf = new Miniflare({
     modules: true,
-    compatibilityFlags: ["nodejs_compat"],
+    compatibilityFlags: ["nodejs_compat", "rtti_api"],
     script: `
     import assert from "node:assert";
     import { Buffer } from "node:buffer";
     import { connect } from "cloudflare:sockets"; 
+    import rtti from "workerd:rtti";
     export default {
       fetch() {
         assert.strictEqual(typeof connect, "function");
+        assert.strictEqual(typeof rtti, "object");
         return new Response(Buffer.from("test").toString("base64"))
       }
     }