@cloudflare/autoconfig 0.2.6 → 0.2.7

package/dist/index.js

@@ -4,7 +4,7 @@ import { existsSync, writeFileSync, mkdirSync, readFileSync, promises as promise
 import { readFile, writeFile, readdir, stat } from 'node:fs/promises';
 import path8, { join, resolve, relative as relative$1 } from 'node:path';
 import { blue, brandColor, dim } from '@cloudflare/cli-shared-helpers/colors';
-import { UserError, FatalError, getInstalledPackageVersion, getTodaysCompatDate, parseJSONC, isPackageInstalled, NubPackageManager, NpmPackageManager, BunPackageManager, YarnPackageManager, PnpmPackageManager, getWorkerName, parsePackageJSON, readFileSync as readFileSync$1, checkWorkerNameValidity } from '@cloudflare/workers-utils';
+import { UserError, FatalError, getInstalledPackageVersion, getTodaysCompatDate, parseJSONC, isPackageInstalled, NubPackageManager, NpmPackageManager, BunPackageManager, YarnPackageManager, PnpmPackageManager, getWorkerName, parsePackageJSON, readFileSync as readFileSync$1, checkWorkerNameValidity, isNodejsCompatDefaultOn } from '@cloudflare/workers-utils';
 export { getInstalledPackageVersion } from '@cloudflare/workers-utils';
 import { updateStatus, endSection } from '@cloudflare/cli-shared-helpers';
 import { spinner } from '@cloudflare/cli-shared-helpers/interactive';
@@ -52475,7 +52475,7 @@ async function runAutoConfig(autoConfigDetails, autoConfigOptions) {
   const { npx } = packageManager;
   const autoConfigSummary = await buildOperationsSummary(
     { ...autoConfigDetails, outputDir: autoConfigDetails.outputDir },
-    dryRunConfigurationResults.wranglerConfig === null ? null : ensureNodejsCompatIsInConfig({
+    dryRunConfigurationResults.wranglerConfig === null ? null : ensureNodejsCompatIsEnabled({
       ...wranglerConfig,
       ...dryRunConfigurationResults.wranglerConfig
     }),
@@ -52539,13 +52539,10 @@ ${JSON.stringify(autoConfigDetails, null, 2)}...`
     );
   }
   if (configurationResults.wranglerConfig !== null) {
-    await saveWranglerJsonc(
-      autoConfigDetails.projectPath,
-      ensureNodejsCompatIsInConfig({
-        ...wranglerConfig,
-        ...configurationResults.wranglerConfig
-      })
-    );
+    await saveWranglerJsonc(autoConfigDetails.projectPath, {
+      ...wranglerConfig,
+      ...configurationResults.wranglerConfig
+    });
   }
   maybeAppendWranglerToGitIgnore(autoConfigDetails.projectPath);
   if (autoConfigDetails.outputDir === autoConfigDetails.projectPath) {
@@ -52564,21 +52561,20 @@ ${JSON.stringify(autoConfigDetails, null, 2)}...`
   return autoConfigSummary;
 }
 __name(runAutoConfig, "runAutoConfig");
-function ensureNodejsCompatIsInConfig(wranglerConfig) {
-  if (wranglerConfig.compatibility_flags?.includes("nodejs_compat")) {
-    return wranglerConfig;
+function ensureNodejsCompatIsEnabled(wranglerConfig) {
+  const flags = (wranglerConfig.compatibility_flags ?? []).filter(
+    (flag) => !flag.startsWith("nodejs_")
+  );
+  if (!isNodejsCompatDefaultOn(wranglerConfig.compatibility_date)) {
+    flags.push("nodejs_compat");
   }
-  return {
-    ...wranglerConfig,
-    compatibility_flags: [
-      ...wranglerConfig.compatibility_flags?.filter(
-        (flag) => !flag.startsWith("nodejs_")
-      ) ?? [],
-      "nodejs_compat"
-    ]
-  };
+  if (flags.length === 0) {
+    const { compatibility_flags: _removed, ...rest } = wranglerConfig;
+    return rest;
+  }
+  return { ...wranglerConfig, compatibility_flags: flags };
 }
-__name(ensureNodejsCompatIsInConfig, "ensureNodejsCompatIsInConfig");
+__name(ensureNodejsCompatIsEnabled, "ensureNodejsCompatIsEnabled");
 async function saveWranglerJsonc(projectPath, wranglerConfig) {
   let existingWranglerConfig = {};
   const wranglerConfigPath = getDirWranglerJsonConfigPath(projectPath);
@@ -52589,16 +52585,13 @@ async function saveWranglerJsonc(projectPath, wranglerConfig) {
       wranglerConfigPath
     );
   }
+  const mergedWranglerConfig = ensureNodejsCompatIsEnabled({
+    ...existingWranglerConfig,
+    ...wranglerConfig
+  });
   await writeFile(
     resolve(projectPath, "wrangler.jsonc"),
-    JSON.stringify(
-      {
-        ...existingWranglerConfig,
-        ...wranglerConfig
-      },
-      null,
-      2
-    ) + "\n"
+    JSON.stringify(mergedWranglerConfig, null, 2) + "\n"
   );
 }
 __name(saveWranglerJsonc, "saveWranglerJsonc");