@cloudflare/autoconfig 0.1.5 → 0.2.0

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, 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 } 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';
@@ -43623,11 +43623,31 @@ function mergeObjectProperties(sourceObject, newProperties) {
       );
       return;
     }
+    if (existing.type === "ObjectProperty" && existing.value.type === "ArrayExpression" && newProp.value.type === "ArrayExpression") {
+      mergeArrayElements(existing.value, newProp.value);
+      return;
+    }
     sourceObject.properties[indexOfExisting] = newProp;
   });
 }
 __name(mergeObjectProperties, "mergeObjectProperties");
 __name2(mergeObjectProperties, "mergeObjectProperties");
+function mergeArrayElements(existingArray, newArray) {
+  const existingStringValues = new Set(
+    existingArray.elements.filter((el) => el?.type === "StringLiteral").map((el) => el.value)
+  );
+  newArray.elements.forEach((el) => {
+    if (el?.type === "StringLiteral") {
+      if (existingStringValues.has(el.value)) {
+        return;
+      }
+      existingStringValues.add(el.value);
+    }
+    existingArray.elements.push(el);
+  });
+}
+__name(mergeArrayElements, "mergeArrayElements");
+__name2(mergeArrayElements, "mergeArrayElements");
 function getPropertyName(newProp) {
   return newProp.key.type === "Identifier" ? newProp.key.name : newProp.key.type === "StringLiteral" ? newProp.key.value : null;
 }
@@ -52007,7 +52027,10 @@ async function detectFramework(projectPath, context, wranglerConfig) {
       );
     }
   }
-  const packageManager = convertDetectedPackageManager(project.packageManager);
+  const packageManager = convertDetectedPackageManager(
+    project.packageManager,
+    projectPath
+  );
   const lockFileExists = packageManager.lockFiles.some(
     (lockFile) => existsSync(join(projectPath, lockFile))
   );
@@ -52052,7 +52075,10 @@ async function detectFramework(projectPath, context, wranglerConfig) {
   };
 }
 __name(detectFramework, "detectFramework");
-function convertDetectedPackageManager(pkgManager) {
+function convertDetectedPackageManager(pkgManager, projectPath) {
+  if (existsSync(join(projectPath, "nub.lock"))) {
+    return NubPackageManager;
+  }
   if (!pkgManager) {
     return NpmPackageManager;
   }