nitropack-nightly 2.11.0-20250303-201505.ba9bebc7 → 2.11.0-20250303-213503.3cd9b5f5

package/dist/meta/index.d.mts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-201505.ba9bebc7";
+const version = "2.11.0-20250303-213503.3cd9b5f5";
 
 export { version };

package/dist/meta/index.d.ts

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-201505.ba9bebc7";
+const version = "2.11.0-20250303-213503.3cd9b5f5";
 
 export { version };

package/dist/meta/index.mjs

@@ -1,3 +1,3 @@
-const version = "2.11.0-20250303-201505.ba9bebc7";
+const version = "2.11.0-20250303-213503.3cd9b5f5";
 
 export { version };

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

@@ -15,27 +15,27 @@ export interface CloudflarePagesRoutes {
 }
 export interface CloudflareOptions {
     /**
-     * Configuration for the Cloudflare Deployments
+     * Configuration for the Cloudflare Deployments.
+     *
+     * **NOTE:** This option is only effective if `deployConfig` is enabled.
      */
     wrangler?: WranglerConfig;
     /**
-     * Enable native Node.js compatibility support.
+     * Enable automatic generation of `.wrangler/deploy/config.json`.
      *
-     * Requires `nodejs_compat` compatibility flag (Nitro enables it by default).
+     * **IMPORTANT:** Enabling this option will cause settings from cloudflare dashboard (including environment variables) to be disabled and discarded.
      *
-     * If disabled, pure unenv polyfills will be used instead.
-     *
-     * Enabled by default with `compatibilityDate` >= `2025-03-01`.
+     * More info: https://developers.cloudflare.com/workers/wrangler/configuration#generated-wrangler-configuration
      */
-    nodeCompat?: boolean;
+    deployConfig?: boolean;
     /**
-     * Disable the automatic generation of `.wrangler/deploy/config.json`.
+     * Enable native Node.js compatibility support.
      *
-     * Enabled by default with `compatibilityDate` >= `2025-03-01` unless explicitly set to `false`.
+     * If this option disabled, pure unenv polyfills will be used instead.
      *
-     * More info: https://developers.cloudflare.com/workers/wrangler/configuration#generated-wrangler-configuration
+     * If not set, will be auto enabled if `nodejs_compat` or `nodejs_compat_v2` is detected in `wrangler.toml` or `wrangler.json`.
      */
-    noWranglerDeployConfig?: boolean;
+    nodeCompat?: boolean;
     pages?: {
         /**
          * Nitro will automatically generate a `_routes.json` that controls which files get served statically and

package/dist/presets/cloudflare/utils.mjs

@@ -3,7 +3,7 @@ import { readFile } from "node:fs/promises";
 import { relative, dirname } from "node:path";
 import { writeFile } from "nitropack/kit";
 import { parseTOML } from "confbox";
-import { readGitConfig, readPackageJSON } from "pkg-types";
+import { readGitConfig, readPackageJSON, findNearestFile } from "pkg-types";
 import { defu } from "defu";
 import { globby } from "globby";
 import { join, resolve } from "pathe";
@@ -138,31 +138,44 @@ export async function writeCFPagesRedirects(nitro) {
   }
   await writeFile(redirectsPath, contents.join("\n"), true);
 }
-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 (nitro.options.cloudflare?.nodeCompat === void 0) {
+    const { config } = await readWranglerConfig(nitro);
+    const userCompatibilityFlags = new Set(config?.compatibility_flags || []);
+    if (userCompatibilityFlags.has("nodejs_compat") || userCompatibilityFlags.has("nodejs_compat_v2")) {
+      nitro.options.cloudflare ??= {};
+      nitro.options.cloudflare.nodeCompat = true;
+    }
   }
-  if (nodeCompatEnabled) {
-    nitro.options.unenv.push(unenvWorkerdWithNodeCompat);
-    nitro.options.rollupConfig.plugins ??= [];
-    nitro.options.rollupConfig.plugins.push(
-      workerdHybridNodeCompatPlugin
-    );
+  if (!nitro.options.cloudflare?.nodeCompat) {
+    if (nitro.options.cloudflare?.nodeCompat === void 0) {
+      nitro.logger.warn("[cloudflare] Node.js compatibility is not enabled.");
+    }
+    return;
   }
-  nitro.options.cloudflare ??= {};
-  nitro.options.cloudflare.nodeCompat = nodeCompatEnabled;
+  nitro.options.unenv.push(unenvWorkerdWithNodeCompat);
+  nitro.options.rollupConfig.plugins ??= [];
+  nitro.options.rollupConfig.plugins.push(
+    workerdHybridNodeCompatPlugin
+  );
+}
+async function readWranglerConfig(nitro) {
+  const configPath = await findNearestFile(["wrangler.json", "wrangler.toml"], {
+    startingFrom: nitro.options.rootDir
+  }).catch(() => void 0);
+  if (!configPath) {
+    return {};
+  }
+  const userConfigText = await readFile(configPath, "utf8");
+  const config = configPath.endsWith(".toml") ? parseTOML(userConfigText) : JSON.parse(userConfigText);
+  return { configPath, config };
 }
 export async function writeWranglerConfig(nitro, cfTarget) {
   const wranglerConfigDir = nitro.options.output.serverDir;
   const wranglerConfigPath = join(wranglerConfigDir, "wrangler.json");
   const defaults = {};
   const overrides = {};
-  const compatDate = defaults.compatibility_date = nitro.options.compatibilityDate.cloudflare || nitro.options.compatibilityDate.default;
+  defaults.compatibility_date = nitro.options.compatibilityDate.cloudflare || nitro.options.compatibilityDate.default;
   if (cfTarget === "pages") {
     overrides.pages_build_output_dir = relative(
       wranglerConfigDir,
@@ -178,7 +191,7 @@ export async function writeWranglerConfig(nitro, cfTarget) {
       directory: relative(wranglerConfigDir, nitro.options.output.publicDir)
     };
   }
-  const userConfig = await resolveWranglerConfig(nitro.options.rootDir);
+  const { config: userConfig = {} } = await readWranglerConfig(nitro);
   const ctxConfig = nitro.options.cloudflare?.wrangler || {};
   for (const key in overrides) {
     if (key in userConfig || key in ctxConfig) {
@@ -222,40 +235,17 @@ export async function writeWranglerConfig(nitro, cfTarget) {
     JSON.stringify(wranglerConfig, null, 2),
     true
   );
-  let shouldWriteWranglerDeployConfig = compatDate >= wranglerConfigAndUnenv2CompatDate;
-  if (nitro.options.cloudflare?.noWranglerDeployConfig) {
-    shouldWriteWranglerDeployConfig = false;
-  }
-  if (shouldWriteWranglerDeployConfig) {
-    const configPath = join(
-      nitro.options.rootDir,
-      ".wrangler/deploy/config.json"
-    );
-    await writeFile(
-      configPath,
-      JSON.stringify({
-        configPath: relative(dirname(configPath), wranglerConfigPath)
-      }),
-      true
-    );
-  }
-}
-async function resolveWranglerConfig(dir) {
-  const jsonConfig = join(dir, "wrangler.json");
-  if (existsSync(jsonConfig)) {
-    const config = JSON.parse(
-      await readFile(join(dir, "wrangler.json"), "utf8")
-    );
-    return config;
-  }
-  const tomlConfig = join(dir, "wrangler.toml");
-  if (existsSync(tomlConfig)) {
-    const config = parseTOML(
-      await readFile(join(dir, "wrangler.toml"), "utf8")
-    );
-    return config;
-  }
-  return {};
+  const configPath = join(
+    nitro.options.rootDir,
+    ".wrangler/deploy/config.json"
+  );
+  await writeFile(
+    configPath,
+    JSON.stringify({
+      configPath: relative(dirname(configPath), wranglerConfigPath)
+    }),
+    true
+  );
 }
 async function generateWorkerName(nitro) {
   const gitConfig = await readGitConfig(nitro.options.rootDir).catch(
@@ -267,5 +257,5 @@ async function generateWorkerName(nitro) {
   );
   const pkgName = pkgJSON?.name;
   const subpath = relative(nitro.options.workspaceDir, nitro.options.rootDir);
-  return `${gitRepo || pkgName}/${subpath}`.replace(/[^a-zA-Z0-9-]/g, "-");
+  return `${gitRepo || pkgName}/${subpath}`.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-$/, "");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitropack-nightly",
-  "version": "2.11.0-20250303-201505.ba9bebc7",
+  "version": "2.11.0-20250303-213503.3cd9b5f5",
   "description": "Build and Deploy Universal JavaScript Servers",
   "repository": "nitrojs/nitro",
   "license": "MIT",