@cloudflare/autoconfig 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WorkerConfigInput } from '@cloudflare/config';
+import { WorkerConfig } from '@cloudflare/config';
 import { PackageManager, PackageJSON, RawConfig, Config, FatalError, TelemetryMessage, UserError } from '@cloudflare/workers-utils';
 export { getInstalledPackageVersion } from '@cloudflare/workers-utils';
 
@@ -177,7 +177,7 @@ type ConfigurationResults = {
     /** The tool that cf should delegate build and development commands to. */
     buildTool?: "vite" | "wrangler";
     /** Worker configuration generated by the framework. `null` if an external tool generates it. */
-    workerConfig: Partial<WorkerConfigInput> | null;
+    workerConfig: Partial<WorkerConfig> | null;
     /** Build configuration that complements the Worker configuration. */
     buildConfig?: BuildConfig;
     packageJsonScriptsOverrides?: PackageJsonScriptsOverrides;
@@ -245,7 +245,7 @@ type AutoConfigOptions = {
 };
 type AutoConfigSummary = {
     scripts: Record<string, string>;
-    workerConfig?: WorkerConfigInput;
+    workerConfig?: WorkerConfig;
     buildConfig?: BuildConfig;
     wranglerConfig?: RawConfig;
     frameworkConfiguration?: string;
@@ -322,7 +322,7 @@ declare function runAutoConfig(autoConfigDetails: AutoConfigDetails, autoConfigO
  */
 declare function buildOperationsSummary(autoConfigDetails: AutoConfigDetailsForNonConfiguredProject & {
     outputDir: NonNullable<AutoConfigDetails["outputDir"]>;
-}, workerConfig: WorkerConfigInput | null, configurationResults: ConfigurationResults, projectCommands: {
+}, workerConfig: WorkerConfig | null, configurationResults: ConfigurationResults, projectCommands: {
     build?: string;
     deploy: string;
     version?: string;

package/dist/index.js

@@ -17,7 +17,7 @@ import { fileURLToPath } from 'node:url';
 import os from 'node:os';
 import tty from 'node:tty';
 import { maybeAppendWranglerToGitIgnore, maybeAppendWranglerToGitIgnoreLikeFile } from '@cloudflare/cli-shared-helpers/gitignore';
-import { InputWorkerSchema, convertToWranglerConfig } from '@cloudflare/config';
+import { InputConfigSchema, convertToWranglerConfig } from '@cloudflare/config';
 
 // ../../node_modules/.pnpm/tslib@2.8.1/node_modules/tslib/tslib.es6.mjs
 var tslib_es6_exports = {};
@@ -52203,7 +52203,9 @@ async function detectFramework(projectPath, context, {
     context
   );
   if (maybeDetectedFramework && target === "cf") {
-    const detectedFrameworkSettings = project.frameworks.get(maybeDetectedFramework.baseDirectory ?? "")?.find(({ id }) => id === maybeDetectedFramework.framework.id);
+    const frameworkId = maybeDetectedFramework.framework.id;
+    const frameworkIsSupported = isKnownFramework(frameworkId) && isFrameworkSupported(frameworkId);
+    const detectedFrameworkSettings = frameworkIsSupported ? project.frameworks.get(maybeDetectedFramework.baseDirectory ?? "")?.find(({ id }) => id === frameworkId) : void 0;
     maybeDetectedFramework.devCommand = detectedFrameworkSettings?.dev?.command;
     maybeDetectedFramework.buildCommand = detectedFrameworkSettings?.build?.command;
   }
@@ -52782,11 +52784,8 @@ function getWranglerConfig(workerConfig, configurationResults) {
   if (workerConfig === null) {
     return null;
   }
-  const parsedWorkerConfig = InputWorkerSchema.parse({
-    type: "worker",
-    ...workerConfig
-  });
-  const convertedWranglerConfig = convertToWranglerConfig(parsedWorkerConfig);
+  const parsedConfig = InputConfigSchema.parse({ worker: workerConfig });
+  const convertedWranglerConfig = convertToWranglerConfig(parsedConfig);
   const wranglerConfig = ensureNodejsCompatIsEnabled({
     $schema: "node_modules/wrangler/config-schema.json",
     ...convertedWranglerConfig,
@@ -52849,9 +52848,11 @@ async function saveWranglerConfigTs(projectPath, buildConfig) {
 }
 __name(saveWranglerConfigTs, "saveWranglerConfigTs");
 function renderCloudflareConfig(workerConfig) {
-  return `import { defineWorker } from "cf/config";
+  return `import { defineConfig } from "cf/config";
 
-export default defineWorker(${JSON.stringify(workerConfig, null, 2)});
+export default defineConfig({
+  worker: ${JSON.stringify(workerConfig, null, 2).replaceAll("\n", "\n  ")}
+});
 `;
 }
 __name(renderCloudflareConfig, "renderCloudflareConfig");