nitropack-nightly 2.11.0-20250204-104845.ccf57266 → 2.11.0-20250205-112249.ccfda71c

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250204-104845.ccf57266";
+const version = "2.11.0-20250205-112249.ccfda71c";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250204-104845.ccf57266";
+const version = "2.11.0-20250205-112249.ccfda71c";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250204-104845.ccf57266";
+const version = "2.11.0-20250205-112249.ccfda71c";
 
 export { version };

package/dist/presets/cloudflare/preset-legacy.d.ts

@@ -0,0 +1,3 @@
+export type { CloudflareOptions as PresetOptions } from "./types";
+declare const _default: any[];
+export default _default;

package/dist/presets/cloudflare/preset-legacy.mjs

@@ -0,0 +1,75 @@
+import { defineNitroPreset } from "nitropack/kit";
+import { writeFile } from "nitropack/kit";
+import { resolve } from "pathe";
+const cloudflare = defineNitroPreset(
+  {
+    extends: "base-worker",
+    entry: "./runtime/cloudflare-worker",
+    exportConditions: ["workerd"],
+    commands: {
+      preview: "npx wrangler dev ./server/index.mjs --site ./public",
+      deploy: "npx wrangler deploy"
+    },
+    wasm: {
+      lazy: true
+    },
+    hooks: {
+      async compiled(nitro) {
+        await writeFile(
+          resolve(nitro.options.output.dir, "package.json"),
+          JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)
+        );
+        await writeFile(
+          resolve(nitro.options.output.dir, "package-lock.json"),
+          JSON.stringify({ lockfileVersion: 1 }, null, 2)
+        );
+      }
+    }
+  },
+  {
+    name: "cloudflare-worker",
+    aliases: ["cloudflare"],
+    url: import.meta.url
+  }
+);
+const cloudflareModuleLegacy = defineNitroPreset(
+  {
+    extends: "base-worker",
+    entry: "./runtime/cloudflare-module-legacy",
+    exportConditions: ["workerd"],
+    commands: {
+      preview: "npx wrangler dev ./server/index.mjs --site ./public",
+      deploy: "npx wrangler deploy"
+    },
+    rollupConfig: {
+      external: "__STATIC_CONTENT_MANIFEST",
+      output: {
+        format: "esm",
+        exports: "named",
+        inlineDynamicImports: false
+      }
+    },
+    wasm: {
+      lazy: false,
+      esmImport: true
+    },
+    hooks: {
+      async compiled(nitro) {
+        await writeFile(
+          resolve(nitro.options.output.dir, "package.json"),
+          JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)
+        );
+        await writeFile(
+          resolve(nitro.options.output.dir, "package-lock.json"),
+          JSON.stringify({ lockfileVersion: 1 }, null, 2)
+        );
+      }
+    }
+  },
+  {
+    name: "cloudflare-module-legacy",
+    aliases: ["cloudflare-module"],
+    url: import.meta.url
+  }
+);
+export default [cloudflare, cloudflareModuleLegacy];

package/dist/presets/cloudflare/preset.mjs

@@ -8,6 +8,7 @@ import {
   writeCFPagesRedirects
 } from "./utils.mjs";
 import { hybridNodePlugin, unenvCfPreset } from "./unenv/preset.mjs";
+import cfLegacyPresets from "./preset-legacy.mjs";
 const isWindows = process.platform === "win32";
 const commandWithDir = (command) => isWindows ? `cmd /c "cd ./ && ${command}"` : `(cd ./ && ${command})`;
 const cloudflarePages = defineNitroPreset(
@@ -91,77 +92,6 @@ const cloudflarePagesStatic = defineNitroPreset(
     static: true
   }
 );
-const cloudflare = defineNitroPreset(
-  {
-    extends: "base-worker",
-    entry: "./runtime/cloudflare-worker",
-    exportConditions: ["workerd"],
-    commands: {
-      preview: "npx wrangler dev ./server/index.mjs --site ./public",
-      deploy: "npx wrangler deploy"
-    },
-    wasm: {
-      lazy: true
-    },
-    hooks: {
-      async compiled(nitro) {
-        await writeFile(
-          resolve(nitro.options.output.dir, "package.json"),
-          JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)
-        );
-        await writeFile(
-          resolve(nitro.options.output.dir, "package-lock.json"),
-          JSON.stringify({ lockfileVersion: 1 }, null, 2)
-        );
-      }
-    }
-  },
-  {
-    name: "cloudflare-worker",
-    aliases: ["cloudflare"],
-    url: import.meta.url
-  }
-);
-const cloudflareModuleLegacy = defineNitroPreset(
-  {
-    extends: "base-worker",
-    entry: "./runtime/cloudflare-module-legacy",
-    exportConditions: ["workerd"],
-    commands: {
-      preview: "npx wrangler dev ./server/index.mjs --site ./public",
-      deploy: "npx wrangler deploy"
-    },
-    rollupConfig: {
-      external: "__STATIC_CONTENT_MANIFEST",
-      output: {
-        format: "esm",
-        exports: "named",
-        inlineDynamicImports: false
-      }
-    },
-    wasm: {
-      lazy: false,
-      esmImport: true
-    },
-    hooks: {
-      async compiled(nitro) {
-        await writeFile(
-          resolve(nitro.options.output.dir, "package.json"),
-          JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)
-        );
-        await writeFile(
-          resolve(nitro.options.output.dir, "package-lock.json"),
-          JSON.stringify({ lockfileVersion: 1 }, null, 2)
-        );
-      }
-    }
-  },
-  {
-    name: "cloudflare-module-legacy",
-    aliases: ["cloudflare-module"],
-    url: import.meta.url
-  }
-);
 const cloudflareModule = defineNitroPreset(
   {
     extends: "base-worker",
@@ -220,10 +150,9 @@ const cloudflareDurable = defineNitroPreset(
   }
 );
 export default [
-  cloudflare,
-  cloudflareModuleLegacy,
-  cloudflareModule,
-  cloudflareDurable,
+  ...cfLegacyPresets,
   cloudflarePages,
-  cloudflarePagesStatic
+  cloudflarePagesStatic,
+  cloudflareModule,
+  cloudflareDurable
 ];

package/dist/presets/cloudflare/utils.mjs

@@ -137,32 +137,54 @@ export async function writeWranglerConfig(nitro, isPages) {
   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;
-  defaults.compatibility_flags = ["nodejs_compat", "no_nodejs_compat_v2"];
   if (isPages) {
-    defaults.pages_build_output_dir = relative(
-      dirname(wranglerConfigPath),
+    overrides.pages_build_output_dir = relative(
+      wranglerConfigDir,
       nitro.options.output.publicDir
     );
   } else {
-    defaults.main = relative(
+    overrides.main = relative(
       wranglerConfigDir,
       join(nitro.options.output.serverDir, "index.mjs")
     );
-    defaults.assets = {
+    overrides.assets = {
       binding: "ASSETS",
-      directory: relative(
-        dirname(wranglerConfigPath),
-        nitro.options.output.publicDir
-      )
+      directory: relative(wranglerConfigDir, nitro.options.output.publicDir)
     };
   }
   const userConfig = await resolveWranglerConfig(nitro.options.rootDir);
-  const wranglerConfig = mergeWranglerConfigs(
+  const ctxConfig = nitro.options.cloudflare?.wrangler || {};
+  for (const key in overrides) {
+    if (key in userConfig || key in ctxConfig) {
+      nitro.logger.warn(
+        `[nitro] [cloudflare] Wrangler config \`${key}\`${key in ctxConfig ? "set by config or modules" : ""} is overridden and will be ignored.`
+      );
+    }
+  }
+  const wranglerConfig = defu(
+    overrides,
+    ctxConfig,
     userConfig,
-    nitro.options.cloudflare?.wrangler,
     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");
+  }
+  wranglerConfig.compatibility_flags = [...compatFlags];
   await writeFile(
     wranglerConfigPath,
     JSON.stringify(wranglerConfig, null, 2),
@@ -199,14 +221,3 @@ async function resolveWranglerConfig(dir) {
   }
   return {};
 }
-function mergeWranglerConfigs(...configs) {
-  const merged = defu({}, ...configs);
-  if (merged.compatibility_flags) {
-    let flags = [...new Set(merged.compatibility_flags || [])];
-    if (flags.includes("no_nodejs_compat_v2")) {
-      flags = flags.filter((flag) => flag !== "nodejs_compat_v2");
-    }
-    merged.compatibility_flags = flags;
-  }
-  return merged;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.0-20250204-104845.ccf57266",
+  "version": "2.11.0-20250205-112249.ccfda71c",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",