wrangler 0.0.21 → 0.0.24

package/src/index.tsx

@@ -32,7 +32,7 @@ import {
   unexpectedKeyValueProps,
 } from "./kv";
 import { getPackageManager } from "./package-manager";
-import { pages } from "./pages";
+import { pages, pagesBetaWarning } from "./pages";
 import { formatMessage, ParseError, parseJSON, readFileSync } from "./parse";
 import publish from "./publish";
 import { createR2Bucket, deleteR2Bucket, listR2Buckets } from "./r2";
@@ -100,24 +100,36 @@ function printWranglerBanner() {
 }
 
 function isLegacyEnv(args: unknown, config: Config): boolean {
-  return (
-    (args as { "legacy-env": boolean | undefined })["legacy-env"] ??
-    config.legacy_env
-  );
+  return config.legacy_env;
 }
 
 function getScriptName(
   args: { name: string | undefined; env: string | undefined },
   config: Config
 ): string | undefined {
-  const shortScriptName = args.name ?? config.name;
-  if (!shortScriptName) {
-    return;
+  if (args.name && isLegacyEnv(args, config) && args.env) {
+    throw new CommandLineArgsError(
+      "In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your wrangler.toml config:" +
+        `
+    [env.${args.env}]
+    name = "${args.name}"
+    `
+    );
   }
 
-  return isLegacyEnv(args, config)
-    ? `${shortScriptName}${args.env ? `-${args.env}` : ""}`
-    : shortScriptName;
+  return args.name ?? config.name;
+}
+
+/**
+ * Alternative to the getScriptName() because special Legacy cases allowed "name", and "env" together in Wrangler1
+ */
+function getLegacyScriptName(
+  args: { name: string | undefined; env: string | undefined },
+  config: Config
+) {
+  return args.name && args.env && isLegacyEnv(args, config)
+    ? `${args.name}-${args.env}`
+    : args.name ?? config.name;
 }
 
 /**
@@ -207,6 +219,7 @@ class DeprecationError extends Error {
 
 export async function main(argv: string[]): Promise<void> {
   const wrangler = makeCLI(argv)
+    .strict()
     // We handle errors ourselves in a try-catch around `yargs.parse`.
     // If you want the "help info" to be displayed then throw an instance of `CommandLineArgsError`.
     // Otherwise we just log the error that was thrown without any "help info".
@@ -285,6 +298,12 @@ export async function main(argv: string[]): Promise<void> {
           describe: "The name of your worker",
           type: "string",
         })
+        .option("type", {
+          describe: "The type of worker to create",
+          type: "string",
+          choices: ["rust", "javascript", "webpack"],
+          deprecated: true,
+        })
         .option("yes", {
           describe: 'Answer "yes" to any prompts for new projects',
           type: "boolean",
@@ -293,7 +312,7 @@ export async function main(argv: string[]): Promise<void> {
     },
     async (args) => {
       printWranglerBanner();
-      if ("type" in args) {
+      if (args.type) {
         let message = "The --type option is no longer supported.";
         if (args.type === "webpack") {
           message +=
@@ -711,6 +730,7 @@ export async function main(argv: string[]): Promise<void> {
         .option("env", {
           describe: "Perform on a specific environment",
           type: "string",
+          alias: "e",
         })
         .option("compatibility-date", {
           describe: "Date to use for compatibility checks",
@@ -785,6 +805,10 @@ export async function main(argv: string[]): Promise<void> {
           describe: "The function that is called for each JSX fragment",
           type: "string",
         })
+        .option("tsconfig", {
+          describe: "Path to a custom tsconfig.json file",
+          type: "string",
+        })
         .option("local", {
           alias: "l",
           describe: "Run on my machine",
@@ -798,10 +822,10 @@ export async function main(argv: string[]): Promise<void> {
     },
     async (args) => {
       printWranglerBanner();
-      const config = readConfig(
+      const configPath =
         (args.config as ConfigPath) ||
-          (args.script && findWranglerToml(path.dirname(args.script)))
-      );
+        (args.script && findWranglerToml(path.dirname(args.script)));
+      const config = readConfig(configPath, args);
       const entry = await getEntry(args, config, "dev");
 
       if (args["experimental-public"]) {
@@ -857,16 +881,6 @@ export async function main(argv: string[]): Promise<void> {
         return zones[0]?.id;
       }
 
-      const environments = config.env ?? {};
-      const envRootObj = args.env ? environments[args.env] || {} : config;
-
-      const hostLike =
-        args.host ||
-        config.dev.host ||
-        (args.routes && args.routes[0]) ||
-        envRootObj.route ||
-        (envRootObj.routes && envRootObj.routes[0]);
-
       // When we're given a host (in one of the above ways), we do 2 things:
       // - We try to extract a host from it
       // - We try to get a zone id from the host
@@ -877,28 +891,37 @@ export async function main(argv: string[]): Promise<void> {
       // get a zone id for it, by lopping off subdomains until we get a hit
       // from the API. That's it!
 
-      const host = typeof hostLike === "string" ? getHost(hostLike) : undefined;
-
-      let zoneId: string | undefined;
-      const hostPieces = typeof host === "string" ? host.split(".") : undefined;
-
-      while (hostPieces && hostPieces.length > 1) {
-        zoneId = await getZoneId(hostPieces.join("."));
-        if (zoneId) break;
-        hostPieces.shift();
-      }
-      if (host && !zoneId) {
-        throw new Error(`Could not find zone for ${hostLike}`);
+      let zone: { host: string; id: string } | undefined;
+
+      if (!args.local) {
+        const hostLike =
+          args.host ||
+          config.dev.host ||
+          (args.routes && args.routes[0]) ||
+          config.route ||
+          (config.routes && config.routes[0]);
+        const host =
+          typeof hostLike === "string" ? getHost(hostLike) : undefined;
+        let zoneId: string | undefined;
+        const hostPieces =
+          typeof host === "string" ? host.split(".") : undefined;
+        while (hostPieces && hostPieces.length > 1) {
+          zoneId = await getZoneId(hostPieces.join("."));
+          if (zoneId) break;
+          hostPieces.shift();
+        }
+        if (host && !zoneId) {
+          throw new Error(`Could not find zone for ${hostLike}`);
+        }
+        zone =
+          typeof zoneId === "string" && typeof host === "string"
+            ? {
+                host,
+                id: zoneId,
+              }
+            : undefined;
       }
 
-      const zone =
-        typeof zoneId === "string" && typeof host === "string"
-          ? {
-              host,
-              id: zoneId,
-            }
-          : undefined;
-
       const { waitUntilExit } = render(
         <Dev
           name={getScriptName(args, config)}
@@ -907,10 +930,11 @@ export async function main(argv: string[]): Promise<void> {
           zone={zone}
           rules={getRules(config)}
           legacyEnv={isLegacyEnv(args, config)}
-          buildCommand={config.build || {}}
+          build={config.build || {}}
           initialMode={args.local ? "local" : "remote"}
-          jsxFactory={args["jsx-factory"] || envRootObj?.jsx_factory}
-          jsxFragment={args["jsx-fragment"] || envRootObj?.jsx_fragment}
+          jsxFactory={args["jsx-factory"] || config.jsx_factory}
+          jsxFragment={args["jsx-fragment"] || config.jsx_fragment}
+          tsconfig={args.tsconfig ?? config.tsconfig}
           upstreamProtocol={upstreamProtocol}
           localProtocol={
             // The typings are not quite clever enough to handle element accesses, only property accesses,
@@ -945,9 +969,9 @@ export async function main(argv: string[]): Promise<void> {
             (args["compatibility-flags"] as string[]) ||
             config.compatibility_flags
           }
-          usageModel={envRootObj.usage_model}
+          usageModel={config.usage_model}
           bindings={{
-            kv_namespaces: envRootObj.kv_namespaces?.map(
+            kv_namespaces: config.kv_namespaces?.map(
               ({ binding, preview_id, id: _id }) => {
                 // In `dev`, we make folks use a separate kv namespace called
                 // `preview_id` instead of `id` so that they don't
@@ -968,12 +992,12 @@ export async function main(argv: string[]): Promise<void> {
                 };
               }
             ),
-            vars: envRootObj.vars,
+            vars: config.vars,
             wasm_modules: config.wasm_modules,
             text_blobs: config.text_blobs,
-            durable_objects: envRootObj.durable_objects,
-            r2_buckets: envRootObj.r2_buckets,
-            unsafe: envRootObj.unsafe?.bindings,
+            durable_objects: config.durable_objects,
+            r2_buckets: config.r2_buckets,
+            unsafe: config.unsafe?.bindings,
           }}
         />
       );
@@ -990,6 +1014,7 @@ export async function main(argv: string[]): Promise<void> {
         .option("env", {
           type: "string",
           describe: "Perform on a specific environment",
+          alias: "e",
         })
         .positional("script", {
           describe: "The path to an entry point for your worker",
@@ -1054,6 +1079,10 @@ export async function main(argv: string[]): Promise<void> {
         .option("jsx-fragment", {
           describe: "The function that is called for each JSX fragment",
           type: "string",
+        })
+        .option("tsconfig", {
+          describe: "Path to a custom tsconfig.json file",
+          type: "string",
         });
     },
     async (args) => {
@@ -1069,10 +1098,10 @@ export async function main(argv: string[]): Promise<void> {
         );
       }
 
-      const config = readConfig(
+      const configPath =
         (args.config as ConfigPath) ||
-          (args.script && findWranglerToml(path.dirname(args.script)))
-      );
+        (args.script && findWranglerToml(path.dirname(args.script)));
+      const config = readConfig(configPath, args);
       const entry = await getEntry(args, config, "publish");
 
       if (args.latest) {
@@ -1103,6 +1132,7 @@ export async function main(argv: string[]): Promise<void> {
         triggers: args.triggers,
         jsxFactory: args["jsx-factory"],
         jsxFragment: args["jsx-fragment"],
+        tsconfig: args.tsconfig,
         routes: args.routes,
         assetPaths,
         legacyEnv: isLegacyEnv(args, config),
@@ -1124,7 +1154,7 @@ export async function main(argv: string[]): Promise<void> {
           })
           // TODO: auto-detect if this should be json or pretty based on atty
           .option("format", {
-            default: "json",
+            default: "pretty",
             choices: ["json", "pretty"],
             describe: "The format of log entries",
           })
@@ -1159,6 +1189,7 @@ export async function main(argv: string[]): Promise<void> {
           .option("env", {
             type: "string",
             describe: "Perform on a specific environment",
+            alias: "e",
           })
           .option("debug", {
             type: "boolean",
@@ -1173,9 +1204,9 @@ export async function main(argv: string[]): Promise<void> {
       if (args.format === "pretty") {
         printWranglerBanner();
       }
-      const config = readConfig(args.config as ConfigPath);
+      const config = readConfig(args.config as ConfigPath, args);
 
-      const scriptName = getScriptName(args, config);
+      const scriptName = getLegacyScriptName(args, config);
 
       if (!scriptName) {
         throw new Error("Missing script name");
@@ -1286,14 +1317,11 @@ export async function main(argv: string[]): Promise<void> {
           "***************************************************\n"
       );
 
-      const config = readConfig(args.config as ConfigPath);
+      const config = readConfig(args.config as ConfigPath, args);
       const entry = await getEntry({}, config, "dev");
 
       const accountId = await requireAuth(config);
 
-      const environments = config.env ?? {};
-      const envRootObj = args.env ? environments[args.env] || {} : config;
-
       const { waitUntilExit } = render(
         <Dev
           name={config.name}
@@ -1302,10 +1330,11 @@ export async function main(argv: string[]): Promise<void> {
           env={args.env}
           zone={undefined}
           legacyEnv={isLegacyEnv(args, config)}
-          buildCommand={config.build || {}}
+          build={config.build || {}}
           initialMode={args.local ? "local" : "remote"}
-          jsxFactory={envRootObj?.jsx_factory}
-          jsxFragment={envRootObj?.jsx_fragment}
+          jsxFactory={config.jsx_factory}
+          jsxFragment={config.jsx_fragment}
+          tsconfig={config.tsconfig}
           upstreamProtocol={config.dev.upstream_protocol}
           localProtocol={config.dev.local_protocol}
           enableLocalPersistence={false}
@@ -1324,7 +1353,7 @@ export async function main(argv: string[]): Promise<void> {
           }
           usageModel={config.usage_model}
           bindings={{
-            kv_namespaces: envRootObj.kv_namespaces?.map(
+            kv_namespaces: config.kv_namespaces?.map(
               ({ binding, preview_id, id: _id }) => {
                 // In `dev`, we make folks use a separate kv namespace called
                 // `preview_id` instead of `id` so that they don't
@@ -1345,12 +1374,12 @@ export async function main(argv: string[]): Promise<void> {
                 };
               }
             ),
-            vars: envRootObj.vars,
+            vars: config.vars,
             wasm_modules: config.wasm_modules,
             text_blobs: config.text_blobs,
-            durable_objects: envRootObj.durable_objects,
-            r2_buckets: envRootObj.r2_buckets,
-            unsafe: envRootObj.unsafe?.bindings,
+            durable_objects: config.durable_objects,
+            r2_buckets: config.r2_buckets,
+            unsafe: config.unsafe?.bindings,
           }}
           inspectorPort={await getPort({ port: 9229 })}
         />
@@ -1398,7 +1427,7 @@ export async function main(argv: string[]): Promise<void> {
           }
         )
         .command(
-          "delete",
+          "delete [id]",
           "Delete a route associated with a zone",
           (yargs) => {
             return yargs
@@ -1473,13 +1502,14 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment",
+                alias: "e",
               });
           },
           async (args) => {
             printWranglerBanner();
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
@@ -1590,12 +1620,13 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment",
+                alias: "e",
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
@@ -1640,12 +1671,13 @@ export async function main(argv: string[]): Promise<void> {
                 type: "string",
                 describe:
                   "Binds the secret to the Worker of the specific environment.",
+                alias: "e",
               });
           },
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
-            const scriptName = getScriptName(args, config);
+            const scriptName = getLegacyScriptName(args, config);
             if (!scriptName) {
               throw new Error("Missing script name");
             }
@@ -1684,6 +1716,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1692,12 +1725,6 @@ export async function main(argv: string[]): Promise<void> {
           },
           async (args) => {
             printWranglerBanner();
-            if (args._.length > 2) {
-              const extraArgs = args._.slice(2).join(" ");
-              throw new CommandLineArgsError(
-                `Unexpected additional positional arguments "${extraArgs}".`
-              );
-            }
 
             if (!isValidNamespaceBinding(args.namespace)) {
               throw new CommandLineArgsError(
@@ -1705,7 +1732,7 @@ export async function main(argv: string[]): Promise<void> {
               );
             }
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             if (!config.name) {
               console.warn(
                 "No configured name present, using `worker` as a prefix for the title"
@@ -1742,7 +1769,7 @@ export async function main(argv: string[]): Promise<void> {
           "Outputs a list of all KV namespaces associated with your account id.",
           {},
           async (args) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
             const accountId = await requireAuth(config);
 
@@ -1770,6 +1797,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1778,7 +1806,7 @@ export async function main(argv: string[]): Promise<void> {
           },
           async (args) => {
             printWranglerBanner();
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
             let id;
             try {
@@ -1851,6 +1879,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1873,7 +1902,7 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ key, ttl, expiration, ...args }) => {
             printWranglerBanner();
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
             // One of `args.path` and `args.value` must be defined
             const value = args.path
@@ -1918,6 +1947,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1932,7 +1962,7 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ prefix, ...args }) => {
             // TODO: support for limit+cursor (pagination)
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
             const accountId = await requireAuth(config);
@@ -1967,6 +1997,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -1980,7 +2011,7 @@ export async function main(argv: string[]): Promise<void> {
               });
           },
           async ({ key, ...args }) => {
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
             const accountId = await requireAuth(config);
@@ -2010,6 +2041,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -2018,7 +2050,7 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ key, ...args }) => {
             printWranglerBanner();
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
             console.log(
@@ -2065,6 +2097,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -2077,7 +2110,7 @@ export async function main(argv: string[]): Promise<void> {
             // This could be made more efficient with a streaming parser/uploader
             // but we'll do that in the future if needed.
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
             const content = parseJSON(readFileSync(filename), filename);
 
@@ -2170,6 +2203,7 @@ export async function main(argv: string[]): Promise<void> {
               .option("env", {
                 type: "string",
                 describe: "Perform on a specific environment",
+                alias: "e",
               })
               .option("preview", {
                 type: "boolean",
@@ -2183,7 +2217,7 @@ export async function main(argv: string[]): Promise<void> {
           },
           async ({ filename, ...args }) => {
             printWranglerBanner();
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
             const namespaceId = getNamespaceId(args, config);
 
             if (!args.force) {
@@ -2244,8 +2278,12 @@ export async function main(argv: string[]): Promise<void> {
     }
   );
 
-  wrangler.command("pages", "⚡️ Configure Cloudflare Pages", (pagesYargs) =>
-    pages(pagesYargs.command(subHelp))
+  wrangler.command(
+    "pages",
+    "⚡️ Configure Cloudflare Pages",
+    async (pagesYargs) => {
+      await pages(pagesYargs.command(subHelp).epilogue(pagesBetaWarning));
+    }
   );
 
   wrangler.command("r2", "📦 Interact with an R2 store", (r2Yargs) => {
@@ -2264,15 +2302,8 @@ export async function main(argv: string[]): Promise<void> {
           },
           async (args) => {
             printWranglerBanner();
-            // We expect three values in `_`: `r2`, `bucket`, `create`.
-            if (args._.length > 3) {
-              const extraArgs = args._.slice(3).join(" ");
-              throw new CommandLineArgsError(
-                `Unexpected additional positional arguments "${extraArgs}".`
-              );
-            }
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
             const accountId = await requireAuth(config);
 
@@ -2283,7 +2314,7 @@ export async function main(argv: string[]): Promise<void> {
         );
 
         r2BucketYargs.command("list", "List R2 buckets", {}, async (args) => {
-          const config = readConfig(args.config as ConfigPath);
+          const config = readConfig(args.config as ConfigPath, args);
 
           const accountId = await requireAuth(config);
 
@@ -2302,15 +2333,8 @@ export async function main(argv: string[]): Promise<void> {
           },
           async (args) => {
             printWranglerBanner();
-            // We expect three values in `_`: `r2`, `bucket`, `delete`.
-            if (args._.length > 3) {
-              const extraArgs = args._.slice(3).join(" ");
-              throw new CommandLineArgsError(
-                `Unexpected additional positional arguments "${extraArgs}".`
-              );
-            }
 
-            const config = readConfig(args.config as ConfigPath);
+            const config = readConfig(args.config as ConfigPath, args);
 
             const accountId = await requireAuth(config);