@distilled.cloud/cloudflare-rolldown-plugin 0.3.0 → 0.4.0

package/dist/plugins/virtual-modules.js

@@ -0,0 +1,125 @@
+import { createPlugin } from "../factory.js";
+// oxlint-disable-next-line no-control-regex
+const VIRTUAL_MODULE_REGEXP = /^\0distilled:.*$/;
+export const WORKER_ENTRY_PREFIX = "\0distilled:worker-entry:";
+const USER_ENTRY_PREFIX = "\0distilled:user-entry:";
+const PEAR_ENTRY_PREFIX = "\0distilled:pear-entry:";
+const INJECT_PREFIX = "\0distilled:inject:";
+const EXPORT_TYPES_ID = "\0distilled:export-types";
+export const virtualModulesPlugin = createPlugin("virtual-modules", (options) => {
+    let unenvApi;
+    const inject = () => {
+        if (!unenvApi)
+            return [];
+        return [
+            ...unenvApi.polyfill.map((module) => `import "${module}";`),
+            ...Object.keys(unenvApi.inject).map((injectedName) => `import "${INJECT_PREFIX}${injectedName}";`),
+        ];
+    };
+    return {
+        shared: {
+            buildStart({ plugins }) {
+                unenvApi = plugins.find((plugin) => "name" in plugin && plugin.name === "distilled-cloudflare:nodejs-unenv")?.api;
+            },
+            resolveId: {
+                filter: { id: VIRTUAL_MODULE_REGEXP },
+                handler(id) {
+                    if (id.startsWith(WORKER_ENTRY_PREFIX) ||
+                        id.startsWith(PEAR_ENTRY_PREFIX) ||
+                        id.startsWith(INJECT_PREFIX) ||
+                        id === EXPORT_TYPES_ID) {
+                        return { id };
+                    }
+                    if (id.startsWith(USER_ENTRY_PREFIX)) {
+                        return this.resolve(id.slice(USER_ENTRY_PREFIX.length), undefined, {
+                            isEntry: true,
+                            kind: "import-statement",
+                        });
+                    }
+                },
+            },
+            load: {
+                filter: { id: VIRTUAL_MODULE_REGEXP },
+                handler(id) {
+                    if (id.startsWith(WORKER_ENTRY_PREFIX)) {
+                        const userEntryId = id.replace(WORKER_ENTRY_PREFIX, USER_ENTRY_PREFIX);
+                        return [
+                            ...inject(),
+                            `import { getExportTypes } from "${EXPORT_TYPES_ID}";`,
+                            ...(options.exports
+                                ? [`export { ${options.exports.join(", ")} } from "${userEntryId}";`]
+                                : [
+                                    `import * as userEntry from "${userEntryId}";`,
+                                    `export * from "${userEntryId}";`,
+                                    `export default userEntry.default ?? {};`,
+                                ]),
+                            "if (import.meta.hot) {",
+                            "  import.meta.hot.accept((module) => {",
+                            "    const exportTypes = getExportTypes(module);",
+                            '    import.meta.hot.send("distilled-cloudflare:worker-export-types", exportTypes);',
+                            "  });",
+                            "}",
+                        ].join("\n");
+                    }
+                    if (id === EXPORT_TYPES_ID) {
+                        return `
+import {
+  WorkerEntrypoint,
+  DurableObject,
+  WorkflowEntrypoint,
+} from "cloudflare:workers";
+
+const baseClasses = new Map([
+  ["WorkerEntrypoint", WorkerEntrypoint],
+  ["DurableObject", DurableObject],
+  ["WorkflowEntrypoint", WorkflowEntrypoint],
+]);
+
+export function getExportTypes(module) {
+  const exportTypes = {};
+
+  for (const [key, value] of Object.entries(module)) {
+    if (key === "default") {
+      continue;
+    }
+
+    let exportType;
+
+    if (typeof value === "function") {
+      for (const [type, baseClass] of baseClasses) {
+        if (baseClass.prototype.isPrototypeOf(value.prototype)) {
+          exportType = type;
+          break;
+        }
+      }
+
+      if (!exportType) {
+        exportType = "DurableObject";
+      }
+    } else if (typeof value === "object" && value !== null) {
+      exportType = "WorkerEntrypoint";
+    }
+
+    exportTypes[key] = exportType;
+  }
+
+  return exportTypes;
+}`;
+                    }
+                    if (id.startsWith(INJECT_PREFIX)) {
+                        const injectedName = id.slice(INJECT_PREFIX.length);
+                        const moduleSpecifier = unenvApi?.inject[injectedName];
+                        if (!moduleSpecifier) {
+                            throw new Error(`Expected module specifier for "${injectedName}" to be defined`);
+                        }
+                        return [
+                            `import ${injectedName} from "${moduleSpecifier}";`,
+                            `globalThis.${injectedName} = ${injectedName};`,
+                        ].join("\n");
+                    }
+                },
+            },
+        },
+    };
+});
+//# sourceMappingURL=virtual-modules.js.map

package/dist/plugins/virtual-modules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-modules.js","sourceRoot":"","sources":["../../src/plugins/virtual-modules.ts"],"names":[],"mappings":"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"}

package/dist/plugins/wasm-init.d.ts

@@ -1,3 +1,2 @@
-import type { Plugin } from "rolldown";
-export declare const wasmInitPlugin: Plugin;
+export declare const wasmInitPlugin: import("../factory.js").PluginOutput<any>;
 //# sourceMappingURL=wasm-init.d.ts.map

package/dist/plugins/wasm-init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasm-init.d.ts","sourceRoot":"","sources":["../../src/plugins/wasm-init.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKvC,eAAO,MAAM,cAAc,EAAE,MAc5B,CAAC"}
+{"version":3,"file":"wasm-init.d.ts","sourceRoot":"","sources":["../../src/plugins/wasm-init.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc,2CAexB,CAAC"}

package/dist/plugins/wasm-init.js

@@ -1,18 +1,20 @@
+import { createPlugin } from "../factory.js";
 import { sanitizePath } from "../utils.js";
 const WASM_INIT_QUERY = /\.wasm\?init$/;
-export const wasmInitPlugin = {
-    name: "rolldown-plugin-cloudflare:wasm-init",
-    load: {
-        filter: { id: WASM_INIT_QUERY },
-        handler(id) {
-            return [
-                `import wasmModule from "${sanitizePath(id)}";`,
-                `export default async (imports) => {`,
-                `  const result = await WebAssembly.instantiate(wasmModule, imports);`,
-                `  return "instance" in result ? result.instance : result;`,
-                `};`,
-            ].join("\n");
+export const wasmInitPlugin = createPlugin("wasm-init", () => ({
+    shared: {
+        load: {
+            filter: { id: WASM_INIT_QUERY },
+            handler(id) {
+                return [
+                    `import wasmModule from "${sanitizePath(id)}";`,
+                    `export default async (imports) => {`,
+                    `  const result = await WebAssembly.instantiate(wasmModule, imports);`,
+                    `  return "instance" in result ? result.instance : result;`,
+                    `};`,
+                ].join("\n");
+            },
         },
     },
-};
+}));
 //# sourceMappingURL=wasm-init.js.map

package/dist/plugins/wasm-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"wasm-init.js","sourceRoot":"","sources":["../../src/plugins/wasm-init.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,eAAe,GAAG,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAW;IACpC,IAAI,EAAE,sCAAsC;IAC5C,IAAI,EAAE;QACJ,MAAM,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE;QAC/B,OAAO,CAAC,EAAE;YACR,OAAO;gBACL,2BAA2B,YAAY,CAAC,EAAE,CAAC,IAAI;gBAC/C,qCAAqC;gBACrC,sEAAsE;gBACtE,2DAA2D;gBAC3D,IAAI;aACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;KACF;CACF,CAAC"}
+{"version":3,"file":"wasm-init.js","sourceRoot":"","sources":["../../src/plugins/wasm-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,eAAe,GAAG,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7D,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,MAAM,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE;YAC/B,OAAO,CAAC,EAAE;gBACR,OAAO;oBACL,2BAA2B,YAAY,CAAC,EAAE,CAAC,IAAI;oBAC/C,qCAAqC;oBACrC,sEAAsE;oBACtE,2DAA2D;oBAC3D,IAAI;iBACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,CAAC;SACF;KACF;CACF,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare-rolldown-plugin",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Rolldown plugin for Cloudflare Workers.",
   "keywords": [
     "cloudflare",
@@ -35,6 +35,14 @@
       "bun": "./src/plugin.ts",
       "types": "./dist/plugin.d.ts",
       "import": "./dist/plugin.js"
+    },
+    "./plugins": {
+      "types": "./dist/plugins/index.d.ts",
+      "import": "./dist/plugins/index.js"
+    },
+    "./options": {
+      "types": "./dist/options.d.ts",
+      "import": "./dist/options.js"
     }
   },
   "publishConfig": {
@@ -51,14 +59,21 @@
   },
   "dependencies": {
     "@cloudflare/unenv-preset": "^2.16.0",
+    "magic-string": "^0.30.21",
     "unenv": "^2.0.0-rc.24"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260310.1",
     "@distilled.cloud/test-utils": "0.0.0",
+    "vite": "^8.0.3",
     "vitest": "^4.1.1"
   },
   "peerDependencies": {
     "rolldown": "^1.0.0-rc.9"
+  },
+  "peerDependenciesMeta": {
+    "rolldown": {
+      "optional": true
+    }
   }
 }

package/src/factory.ts

@@ -0,0 +1,60 @@
+import type * as rolldown from "rolldown";
+import type * as vite from "vite";
+import type { CloudflarePluginOptions } from "./options.js";
+
+export interface PluginInput<A = any> {
+  shared?: Omit<rolldown.Plugin<A>, "name">;
+  rolldown?: Omit<rolldown.Plugin<A>, "name">;
+  vite?: Omit<vite.Plugin<A>, "name">;
+}
+
+export interface NullablePluginOutput<A = any> {
+  rolldown: (options: CloudflarePluginOptions) => rolldown.Plugin<A> | null;
+  vite: (options: CloudflarePluginOptions) => vite.Plugin<A> | null;
+}
+
+export interface PluginOutput<A = any> {
+  rolldown: (options: CloudflarePluginOptions) => rolldown.Plugin<A>;
+  vite: (options: CloudflarePluginOptions) => vite.Plugin<A>;
+}
+
+export function createPlugin<TName extends string, A = any>(
+  pluginName: TName,
+  make: (options: CloudflarePluginOptions) => PluginInput<A>,
+): PluginOutput<A>;
+
+export function createPlugin<TName extends string, A = any>(
+  pluginName: TName,
+  make: (options: CloudflarePluginOptions) => PluginInput<A> | undefined,
+): NullablePluginOutput<A>;
+
+export function createPlugin<TName extends string, A = any>(
+  pluginName: TName,
+  make: (options: CloudflarePluginOptions) => PluginInput<A> | undefined,
+): PluginOutput<A> | NullablePluginOutput<A> {
+  const name = `distilled-cloudflare:${pluginName}`;
+  return {
+    rolldown: (options: CloudflarePluginOptions) => {
+      const plugin = make(options);
+      if (!plugin) return null;
+      return {
+        name,
+        ...plugin.shared,
+        ...plugin.rolldown,
+      };
+    },
+    vite: (options: CloudflarePluginOptions) => {
+      const plugin = make(options);
+      if (!plugin) return null;
+      return {
+        name,
+        sharedDuringBuild: true,
+        applyToEnvironment(environment) {
+          return environment.name !== "client";
+        },
+        ...plugin.shared,
+        ...plugin.vite,
+      } as vite.Plugin;
+    },
+  };
+}

package/src/options.ts

@@ -0,0 +1,25 @@
+export interface CloudflarePluginOptions {
+  /**
+   * The compatibility date to use. This is optional, but should be defined to avoid unexpected behavior.
+   * @default undefined
+   */
+  compatibilityDate?: string;
+  /**
+   * The compatibility flags to enable.
+   * @default []
+   * @example
+   * ```ts
+   * cloudflare({ compatibilityDate: "2026-04-01", compatibilityFlags: ["nodejs_compat"] });
+   * ```
+   */
+  compatibilityFlags?: Array<string>;
+  /**
+   * The exports to include in the bundle.
+   * By default, all exports are included. However, if you only want to include certain exports, you can use this option.
+   * @example
+   * ```ts
+   * cloudflare({ exports: ["default"] });
+   * ```
+   */
+  exports?: Array<string>;
+}

package/src/plugin.ts

@@ -1,24 +1,28 @@
-import type { RolldownPluginOption } from "rolldown";
-import { makeAdditionalModulesPlugin } from "./plugins/additional-modules.js";
-import { cloudflareExternalsPlugin } from "./plugins/cloudflare-externals.js";
-import { makeNodejsCompatPlugin } from "./plugins/nodejs-compat.js";
-import { makeOptionsPlugin } from "./plugins/options.js";
-import { wasmInitPlugin } from "./plugins/wasm-init.js";
+import type * as rolldown from "rolldown";
+import type { CloudflarePluginOptions } from "./options.js";
+import {
+  additionalModulesPlugin,
+  cloudflareExternalsPlugin,
+  nodejsAlsPlugin,
+  nodejsImportWarningPlugin,
+  nodejsUnenvPlugin,
+  optionsPlugin,
+  virtualModulesPlugin,
+  wasmInitPlugin,
+} from "./plugins/index.js";
 
-export interface CloudflarePluginOptions {
-  compatibilityDate?: string;
-  compatibilityFlags?: Array<string>;
-}
+export type CloudflarePlugin = (options?: CloudflarePluginOptions) => Array<rolldown.Plugin | null>;
 
-export type CloudflarePlugin = (options?: CloudflarePluginOptions) => RolldownPluginOption;
-
-const cloudflare: CloudflarePlugin = async (options = {}) => {
+const cloudflare: CloudflarePlugin = (options = {}) => {
   return [
-    makeOptionsPlugin(options),
-    cloudflareExternalsPlugin,
-    makeNodejsCompatPlugin(options),
-    wasmInitPlugin,
-    makeAdditionalModulesPlugin(),
+    optionsPlugin.rolldown(options),
+    cloudflareExternalsPlugin.rolldown(options),
+    nodejsAlsPlugin.rolldown(options),
+    nodejsImportWarningPlugin.rolldown(options),
+    nodejsUnenvPlugin.rolldown(options),
+    virtualModulesPlugin.rolldown(options),
+    wasmInitPlugin.rolldown(options),
+    additionalModulesPlugin.rolldown(options),
   ];
 };
 

package/src/plugins/additional-modules.ts

@@ -1,5 +1,13 @@
+import MagicString from "magic-string";
 import path from "node:path";
-import { RolldownMagicString, type Plugin } from "rolldown";
+import type {
+  Plugin,
+  PluginContext,
+  RenderedChunk,
+  RolldownMagicString,
+  SourceMap,
+} from "rolldown";
+import { createPlugin } from "../factory.js";
 import { sanitizePath } from "../utils.js";
 
 const MODULE_RULES = [
@@ -12,71 +20,97 @@ const MODULE_REFERENCE_PATTERN = `__CLOUDFLARE_MODULE__(${MODULE_RULES.map((rule
 const MODULE_REFERENCE_REGEX = new RegExp(MODULE_REFERENCE_PATTERN);
 const MODULE_REFERENCE_GLOBAL_REGEX = new RegExp(MODULE_REFERENCE_PATTERN, "g");
 
-export function makeAdditionalModulesPlugin(): Plugin {
+export const additionalModulesPlugin = createPlugin("additional-modules", () => {
   const additionalModulePaths = new Set<string>();
-
   return {
-    name: "rolldown-plugin-cloudflare:additional-modules",
-    // TODO: these are Vite options, not Rolldown
-    // enforce: "pre",
-    // applyToEnvironment(environment) {
-    //   return environment.name === "development";
-    // },
-    // hotUpdate(options) {
-    //   if (additionalModulePaths.has(options.file)) {
-    //     void options.server.restart();
-    //     return [];
-    //   }
-    // },
-    resolveId: {
-      filter: { id: MODULE_RULES.map((rule) => rule.pattern) },
-      async handler(source, importer, options) {
-        const resolved = await this.resolve(source, importer, options);
-        if (!resolved) {
-          return;
+    vite: {
+      enforce: "pre",
+      hotUpdate(options) {
+        if (additionalModulePaths.has(options.file)) {
+          void options.server.restart();
+          return [];
         }
+      },
+    },
+    shared: {
+      resolveId: {
+        filter: { id: MODULE_RULES.map((rule) => rule.pattern) },
+        async handler(source, importer, options) {
+          const resolved = await this.resolve(source, importer, options);
+          if (!resolved) {
+            return;
+          }
 
-        const rule = MODULE_RULES.find((rule) => rule.pattern.test(resolved.id));
-        if (!rule) {
-          return resolved;
-        }
+          const rule = MODULE_RULES.find((rule) => rule.pattern.test(resolved.id));
+          if (!rule) {
+            return resolved;
+          }
 
-        const filePath = sanitizePath(resolved.id);
-        additionalModulePaths.add(filePath);
+          const filePath = sanitizePath(resolved.id);
+          additionalModulePaths.add(filePath);
 
-        return {
-          external: true,
-          id: moduleReferenceId(rule.type, filePath),
-        };
+          return {
+            id: moduleReferenceId(rule.type, filePath),
+            external: true,
+          };
+        },
       },
-    },
-    renderChunk: {
-      filter: { code: { include: MODULE_REFERENCE_REGEX } },
-      async handler(code, chunk) {
-        const matches = code.matchAll(MODULE_REFERENCE_GLOBAL_REGEX);
-        let magicString: RolldownMagicString | undefined;
-        for (const match of matches) {
-          magicString ??= new RolldownMagicString(code);
-          const [full, , id] = match;
-          const source = await this.fs.readFile(id);
-          const referenceId = this.emitFile({
-            type: "asset",
-            name: path.basename(id),
-            source,
-          });
-          const fileName = this.getFileName(referenceId);
-          const relativePath = path.relative(path.dirname(chunk.fileName), fileName);
-          const importPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
-          magicString.update(match.index, match.index + full.length, importPath);
-        }
-        if (magicString) {
-          return magicString;
-        }
+      renderChunk: {
+        filter: { code: { include: MODULE_REFERENCE_REGEX } },
+        handler: withMagicString(async function (code, chunk, magicString) {
+          const matches = code.matchAll(MODULE_REFERENCE_GLOBAL_REGEX);
+          for (const match of matches) {
+            const [full, , id] = match;
+            const source = await this.fs.readFile(id);
+            const referenceId = this.emitFile({
+              type: "asset",
+              name: path.basename(id),
+              source,
+            });
+            const fileName = this.getFileName(referenceId);
+            const relativePath = path.relative(path.dirname(chunk.fileName), fileName);
+            const importPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
+            magicString.update(match.index, match.index + full.length, importPath);
+          }
+        }),
       },
     },
   };
-}
+});
 
 function moduleReferenceId(type: "CompiledWasm" | "Data" | "Text", id: string) {
   return `__CLOUDFLARE_MODULE__${type}__${id}__CLOUDFLARE_MODULE__` as const;
 }
+
+type PluginHandler<T extends keyof Plugin> = Plugin[T] extends infer T
+  ? T extends (...args: any) => any
+    ? T
+    : never
+  : never;
+
+/**
+ * Returns a `renderChunk` handler that transforms the chunk using a magic string.
+ * Uses Rolldown's native magic string if available, or the `magic-string` library otherwise.
+ */
+function withMagicString(
+  renderChunk: (
+    this: PluginContext,
+    code: string,
+    chunk: RenderedChunk,
+    magicString: MagicString | RolldownMagicString,
+  ) => Promise<void>,
+): PluginHandler<"renderChunk"> {
+  return async function (code, chunk, outputOptions, meta) {
+    const magicString = meta.magicString ?? new MagicString(code);
+    await renderChunk.call(this, code, chunk, magicString);
+    if ("isRolldownMagicString" in magicString && magicString.isRolldownMagicString) {
+      return magicString;
+    }
+    return {
+      code: magicString.toString(),
+      map: outputOptions.sourcemap
+        ? (magicString.generateMap({ hires: "boundary" }) as SourceMap)
+        : null,
+    };
+  };
+}

package/src/plugins/cloudflare-externals.ts

@@ -1,6 +1,6 @@
-import type { Plugin } from "rolldown";
+import { createPlugin } from "../factory.js";
 
-const CLOUDFLARE_BUILTIN_MODULES = [
+const CLOUDFLARE_BUILT_IN_MODULES = [
   "cloudflare:email",
   "cloudflare:node",
   "cloudflare:sockets",
@@ -8,19 +8,39 @@ const CLOUDFLARE_BUILTIN_MODULES = [
   "cloudflare:workflows",
 ];
 
-export const cloudflareExternalsPlugin: Plugin = {
-  name: "rolldown-plugin-cloudflare:cloudflare-externals",
-  resolveId: {
-    filter: { id: /^cloudflare:/ },
-    handler(id) {
-      if (!CLOUDFLARE_BUILTIN_MODULES.includes(id)) {
-        return;
-      }
+export const cloudflareExternalsPlugin = createPlugin("cloudflare-externals", () => {
+  return {
+    rolldown: {
+      resolveId: {
+        filter: { id: /^cloudflare:/ },
+        handler(id) {
+          if (!CLOUDFLARE_BUILT_IN_MODULES.includes(id)) {
+            return;
+          }
 
-      return {
-        id,
-        external: true,
-      };
+          return {
+            id,
+            external: true,
+          };
+        },
+      },
     },
-  },
-};
+    vite: {
+      configEnvironment(name) {
+        if (name === "client") {
+          // Some frameworks allow users to mix client and server code in the same file and then extract the server code.
+          // As the dependency optimization may happen before the server code is extracted, we should exclude Cloudflare built-ins from client optimization.
+          return { optimizeDeps: { exclude: CLOUDFLARE_BUILT_IN_MODULES } };
+        }
+        return {
+          resolve: {
+            builtins: CLOUDFLARE_BUILT_IN_MODULES,
+          },
+          optimizeDeps: {
+            exclude: CLOUDFLARE_BUILT_IN_MODULES,
+          },
+        };
+      },
+    },
+  };
+});

package/src/plugins/index.ts

@@ -0,0 +1,6 @@
+export * from "./additional-modules.js";
+export * from "./cloudflare-externals.js";
+export * from "./nodejs-compat.js";
+export * from "./options.js";
+export * from "./virtual-modules.js";
+export * from "./wasm-init.js";