nitropack-nightly 2.11.0-20250303-165232.8dd35e61 → 2.11.0-20250303-174007.c9fdeb77

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-165232.8dd35e61";
+const version = "2.11.0-20250303-174007.c9fdeb77";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-165232.8dd35e61";
+const version = "2.11.0-20250303-174007.c9fdeb77";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-165232.8dd35e61";
+const version = "2.11.0-20250303-174007.c9fdeb77";
 
 export { version };

package/dist/presets/_unenv/preset-workerd.d.ts

@@ -1,4 +1,5 @@
 import type { Preset } from "unenv";
 import type { Plugin } from "rollup";
-export declare const unenvWorkerdPreset: Preset;
-export declare const hybridNodePlugin: Plugin;
+export declare const unenvCfExternals: Preset;
+export declare const unenvWorkerdWithNodeCompat: Preset;
+export declare const workerdHybridNodeCompatPlugin: Plugin;

package/dist/presets/_unenv/preset-workerd.mjs

@@ -3,7 +3,21 @@ import { join } from "pathe";
 import { builtnNodeModules, hybridNodeModules } from "./node-compat/cloudflare.mjs";
 const workerdDir = fileURLToPath(new URL("workerd/", import.meta.url));
 const resolvePresetRuntime = (m) => join(workerdDir, `${m}.mjs`);
-export const unenvWorkerdPreset = {
+export const unenvCfExternals = {
+  meta: {
+    name: "nitro-cloudflare:externals"
+  },
+  external: [
+    "cloudflare:email",
+    "cloudflare:sockets",
+    "cloudflare:workers",
+    "cloudflare:workflows"
+  ]
+};
+export const unenvWorkerdWithNodeCompat = {
+  meta: {
+    name: "nitro-cloudflare:node-compat"
+  },
   external: builtnNodeModules.map((m) => `node:${m}`),
   alias: {
     // (native)
@@ -25,7 +39,7 @@ export const unenvWorkerdPreset = {
     )
   }
 };
-export const hybridNodePlugin = {
+export const workerdHybridNodeCompatPlugin = {
   name: "nitro:cloudflare:hybrid-node-compat",
   resolveId(id) {
     if (id.startsWith("cloudflare:")) {

package/dist/presets/cloudflare/preset.mjs

@@ -1,13 +1,14 @@
 import { defineNitroPreset } from "nitropack/kit";
 import { writeFile } from "nitropack/kit";
 import { resolve } from "pathe";
+import { unenvCfExternals } from "../_unenv/preset-workerd.mjs";
 import {
+  enableNodeCompat,
   writeWranglerConfig,
   writeCFRoutes,
   writeCFPagesHeaders,
   writeCFPagesRedirects
 } from "./utils.mjs";
-import { hybridNodePlugin, unenvWorkerdPreset } from "../_unenv/preset-workerd.mjs";
 import cfLegacyPresets from "./preset-legacy.mjs";
 const isWindows = process.platform === "win32";
 const commandWithDir = (command) => isWindows ? `cmd /c "cd ./ && ${command}"` : `(cd ./ && ${command})`;
@@ -25,7 +26,7 @@ const cloudflarePages = defineNitroPreset(
       publicDir: "{{ output.dir }}/{{ baseURL }}",
       serverDir: "{{ output.dir }}/_worker.js"
     },
-    unenv: unenvWorkerdPreset,
+    unenv: [unenvCfExternals],
     alias: {
       // Hotfix: Cloudflare appends /index.html if mime is not found and things like ico are not in standard lite.js!
       // https://github.com/nitrojs/nitro/pull/933
@@ -36,7 +37,6 @@ const cloudflarePages = defineNitroPreset(
       esmImport: true
     },
     rollupConfig: {
-      plugins: [hybridNodePlugin],
       output: {
         entryFileNames: "index.js",
         format: "esm",
@@ -44,12 +44,11 @@ const cloudflarePages = defineNitroPreset(
       }
     },
     hooks: {
+      "build:before": async (nitro) => {
+        await enableNodeCompat(nitro);
+      },
       async compiled(nitro) {
-        await writeWranglerConfig(
-          nitro,
-          true
-          /* pages */
-        );
+        await writeWranglerConfig(nitro, "pages");
         await writeCFRoutes(nitro);
         await writeCFPagesHeaders(nitro);
         await writeCFPagesRedirects(nitro);
@@ -75,11 +74,6 @@ const cloudflarePagesStatic = defineNitroPreset(
     },
     hooks: {
       async compiled(nitro) {
-        await writeWranglerConfig(
-          nitro,
-          true
-          /* pages */
-        );
         await writeCFPagesHeaders(nitro);
         await writeCFPagesRedirects(nitro);
       }
@@ -101,9 +95,8 @@ const cloudflareModule = defineNitroPreset(
       preview: commandWithDir("npx wrangler dev"),
       deploy: commandWithDir("npx wrangler deploy")
     },
-    unenv: unenvWorkerdPreset,
+    unenv: [unenvCfExternals],
     rollupConfig: {
-      plugins: [hybridNodePlugin],
       output: {
         format: "esm",
         exports: "named",
@@ -115,12 +108,11 @@ const cloudflareModule = defineNitroPreset(
       esmImport: true
     },
     hooks: {
+      "build:before": async (nitro) => {
+        await enableNodeCompat(nitro);
+      },
       async compiled(nitro) {
-        await writeWranglerConfig(
-          nitro,
-          false
-          /* module */
-        );
+        await writeWranglerConfig(nitro, "module");
         await writeFile(
           resolve(nitro.options.output.dir, "package.json"),
           JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)

package/dist/presets/cloudflare/types.d.ts

@@ -19,12 +19,24 @@ export interface CloudflareOptions {
      */
     wrangler?: WranglerConfig;
     /**
-     * Disable the automatic generation of .wrangler/deploy/config.json
+     * Enable native Node.js compatibility support.
+     *
+     * Requires `nodejs_compat` compatibility flag (Nitro enables it by default).
+     *
+     * If disabled, pure unenv polyfills will be used instead.
+     *
+     * Enabled by default with `compatibilityDate` >= `2025-03-01`.
+     */
+    nodeCompat?: boolean;
+    /**
+     * Disable the automatic generation of `.wrangler/deploy/config.json`.
+     *
+     * Enabled by default with `compatibilityDate` >= `2025-03-01` unless explicitly set to `false`.
      *
      * More info: https://developers.cloudflare.com/workers/wrangler/configuration#generated-wrangler-configuration
      */
     noWranglerDeployConfig?: boolean;
-    pages: {
+    pages?: {
         /**
          * Nitro will automatically generate a `_routes.json` that controls which files get served statically and
          * which get served by the Worker. Using this config will override the automatic `_routes.json`. Or, if the

package/dist/presets/cloudflare/utils.d.ts

@@ -2,4 +2,5 @@ import type { Nitro } from "nitropack/types";
 export declare function writeCFRoutes(nitro: Nitro): Promise<void>;
 export declare function writeCFPagesHeaders(nitro: Nitro): Promise<void>;
 export declare function writeCFPagesRedirects(nitro: Nitro): Promise<void>;
-export declare function writeWranglerConfig(nitro: Nitro, isPages: boolean): Promise<void>;
+export declare function enableNodeCompat(nitro: Nitro): Promise<void>;
+export declare function writeWranglerConfig(nitro: Nitro, cfTarget: "pages" | "module"): Promise<void>;

package/dist/presets/cloudflare/utils.mjs

@@ -13,6 +13,10 @@ import {
   withTrailingSlash,
   withoutLeadingSlash
 } from "ufo";
+import {
+  workerdHybridNodeCompatPlugin,
+  unenvWorkerdWithNodeCompat
+} from "../_unenv/preset-workerd.mjs";
 export async function writeCFRoutes(nitro) {
   const _cfPagesConfig = nitro.options.cloudflare?.pages || {};
   const routes = {
@@ -133,13 +137,32 @@ export async function writeCFPagesRedirects(nitro) {
   }
   await writeFile(redirectsPath, contents.join("\n"), true);
 }
-export async function writeWranglerConfig(nitro, isPages) {
+const wranglerConfigAndUnenv2CompatDate = "2025-03-01";
+export async function enableNodeCompat(nitro) {
+  const compatDate = nitro.options.compatibilityDate.cloudflare || nitro.options.compatibilityDate.default;
+  const nodeCompatEnabled = nitro.options.cloudflare?.nodeCompat ?? compatDate >= wranglerConfigAndUnenv2CompatDate;
+  if (compatDate < wranglerConfigAndUnenv2CompatDate && nitro.options.cloudflare?.nodeCompat === void 0) {
+    nitro.logger.warn(
+      `Current compatibility date "${compatDate}" does not supports native Node.js support in cloudflare workers. Please consider upgrading compatibilityDate to "${wranglerConfigAndUnenv2CompatDate}" or newer.`
+    );
+  }
+  if (nodeCompatEnabled) {
+    nitro.options.unenv.push(unenvWorkerdWithNodeCompat);
+    nitro.options.rollupConfig.plugins ??= [];
+    nitro.options.rollupConfig.plugins.push(
+      workerdHybridNodeCompatPlugin
+    );
+  }
+  nitro.options.cloudflare ??= {};
+  nitro.options.cloudflare.nodeCompat = nodeCompatEnabled;
+}
+export async function writeWranglerConfig(nitro, cfTarget) {
   const wranglerConfigDir = nitro.options.output.serverDir;
   const wranglerConfigPath = join(wranglerConfigDir, "wrangler.json");
   const defaults = {};
   const overrides = {};
-  defaults.compatibility_date = nitro.options.compatibilityDate.cloudflare || nitro.options.compatibilityDate.default;
-  if (isPages) {
+  const compatDate = defaults.compatibility_date = nitro.options.compatibilityDate.cloudflare || nitro.options.compatibilityDate.default;
+  if (cfTarget === "pages") {
     overrides.pages_build_output_dir = relative(
       wranglerConfigDir,
       nitro.options.output.publicDir
@@ -170,19 +193,21 @@ export async function writeWranglerConfig(nitro, isPages) {
     defaults
   );
   const compatFlags = new Set(wranglerConfig.compatibility_flags || []);
-  if (compatFlags.has("nodejs_compat_v2") && compatFlags.has("no_nodejs_compat_v2")) {
-    nitro.logger.warn(
-      "[nitro] [cloudflare] Wrangler config `compatibility_flags` contains both `nodejs_compat_v2` and `no_nodejs_compat_v2`. Ignoring `nodejs_compat_v2`."
-    );
-    compatFlags.delete("nodejs_compat_v2");
-  }
-  if (compatFlags.has("nodejs_compat_v2")) {
-    nitro.logger.warn(
-      "[nitro] [cloudflare] Wrangler config `compatibility_flags` contains `nodejs_compat_v2`, which is currently incompatible with nitro, please remove it or USE AT YOUR OWN RISK!"
-    );
-  } else {
-    compatFlags.add("nodejs_compat");
-    compatFlags.add("no_nodejs_compat_v2");
+  if (nitro.options.cloudflare?.nodeCompat) {
+    if (compatFlags.has("nodejs_compat_v2") && compatFlags.has("no_nodejs_compat_v2")) {
+      nitro.logger.warn(
+        "[nitro] [cloudflare] Wrangler config `compatibility_flags` contains both `nodejs_compat_v2` and `no_nodejs_compat_v2`. Ignoring `nodejs_compat_v2`."
+      );
+      compatFlags.delete("nodejs_compat_v2");
+    }
+    if (compatFlags.has("nodejs_compat_v2")) {
+      nitro.logger.warn(
+        "[nitro] [cloudflare] Please consider replacing `nodejs_compat_v2` with `nodejs_compat` in your `compatibility_flags` or USE IT AT YOUR OWN RISK as it can cause issues with nitro."
+      );
+    } else {
+      compatFlags.add("nodejs_compat");
+      compatFlags.add("no_nodejs_compat_v2");
+    }
   }
   wranglerConfig.compatibility_flags = [...compatFlags];
   await writeFile(
@@ -190,7 +215,11 @@ export async function writeWranglerConfig(nitro, isPages) {
     JSON.stringify(wranglerConfig, null, 2),
     true
   );
-  if (!nitro.options.cloudflare?.noWranglerDeployConfig) {
+  let shouldWriteWranglerDeployConfig = compatDate >= wranglerConfigAndUnenv2CompatDate;
+  if (nitro.options.cloudflare?.noWranglerDeployConfig) {
+    shouldWriteWranglerDeployConfig = false;
+  }
+  if (shouldWriteWranglerDeployConfig) {
     const configPath = join(
       nitro.options.rootDir,
       ".wrangler/deploy/config.json"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.0-20250303-165232.8dd35e61",
+  "version": "2.11.0-20250303-174007.c9fdeb77",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",