wrangler 2.0.1 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

package/src/__tests__/pages.test.ts

@@ -258,7 +258,7 @@ describe("pages", () => {
         🆙 Publish a directory of static assets as a Pages deployment
 
         Positionals:
-          directory  The directory of Pages Functions  [string] [default: \\"functions\\"]
+          directory  The directory of static files to upload  [string]
 
         Flags:
           -c, --config      Path to .toml configuration file  [string]
@@ -267,11 +267,11 @@ describe("pages", () => {
               --legacy-env  Use legacy environments  [boolean]
 
         Options:
-              --project-name    The name of the project you want to list deployments for  [string]
-              --branch          The branch of the project you want to list deployments for  [string]
-              --commit-hash     The branch of the project you want to list deployments for  [string]
-              --commit-message  The branch of the project you want to list deployments for  [string]
-              --commit-dirty    The branch of the project you want to list deployments for  [boolean]
+              --project-name    The name of the project you want to deploy to  [string]
+              --branch          The name of the branch you want to deploy to  [string]
+              --commit-hash     The SHA to attach to this deployment  [string]
+              --commit-message  The commit message to attach to this deployment  [string]
+              --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
 
         🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);

package/src/__tests__/publish.test.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as TOML from "@iarna/toml";
+import * as esbuild from "esbuild";
 import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
@@ -878,6 +879,77 @@ export default{
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should preserve exports on a module format worker", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+export const abc = 123;
+export const def = "show me the money";
+export default {};`
+      );
+
+      await runWrangler("publish index.js --dry-run --outdir out");
+
+      expect(
+        (
+          await esbuild.build({
+            entryPoints: [path.resolve("./out/index.js")],
+            metafile: true,
+            write: false,
+          })
+        ).metafile?.outputs["index.js"].exports
+      ).toMatchInlineSnapshot(`
+        Array [
+          "abc",
+          "def",
+          "default",
+        ]
+      `);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not preserve exports on a service-worker format worker", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+export const abc = 123;
+export const def = "show me the money";
+addEventListener('fetch', event => {});`
+      );
+
+      await runWrangler("publish index.js --dry-run --outdir out --minify");
+
+      expect(
+        (
+          await esbuild.build({
+            entryPoints: [path.resolve("./out/index.js")],
+            metafile: true,
+            write: false,
+          })
+        ).metafile?.outputs["index.js"].exports
+      ).toMatchInlineSnapshot(`Array []`);
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "▲ [WARNING] The entrypoint index.js has exports like an ES Module, but hasn't defined a default export like a module worker normally would. Building the worker using \\"service-worker\\" format...
+
+        ",
+        }
+      `);
+    });
+
     it("should be able to transpile entry-points in sub-directories (sw)", async () => {
       writeWranglerToml();
       writeWorkerSource({ basePath: "./src", type: "sw" });

package/src/bundle.ts

@@ -66,7 +66,7 @@ export async function bundleWorker(
     absWorkingDir: entry.directory,
     outdir: destination,
     external: ["__STATIC_CONTENT_MANIFEST"],
-    format: "esm",
+    format: entry.format === "modules" ? "esm" : "iife",
     target: "es2020",
     sourcemap: true,
     minify,

package/src/pages.tsx

@@ -804,34 +804,30 @@ const createDeployment: CommandModule<
     return yargs
       .positional("directory", {
         type: "string",
-        default: "functions",
-        description: "The directory of Pages Functions",
+        demandOption: true,
+        description: "The directory of static files to upload",
       })
       .options({
         "project-name": {
           type: "string",
-          description:
-            "The name of the project you want to list deployments for",
+          description: "The name of the project you want to deploy to",
         },
         branch: {
           type: "string",
-          description:
-            "The branch of the project you want to list deployments for",
+          description: "The name of the branch you want to deploy to",
         },
         "commit-hash": {
           type: "string",
-          description:
-            "The branch of the project you want to list deployments for",
+          description: "The SHA to attach to this deployment",
         },
         "commit-message": {
           type: "string",
-          description:
-            "The branch of the project you want to list deployments for",
+          description: "The commit message to attach to this deployment",
         },
         "commit-dirty": {
           type: "boolean",
           description:
-            "The branch of the project you want to list deployments for",
+            "Whether or not the workspace should be considered dirty for this deployment",
         },
       })
       .epilogue(pagesBetaWarning);
@@ -844,6 +840,10 @@ const createDeployment: CommandModule<
     commitMessage,
     commitDirty,
   }) => {
+    if (!directory) {
+      throw new FatalError("Must specify a directory.", 1);
+    }
+
     const config = getConfigCache<PagesConfigCache>(
       PAGES_CONFIG_CACHE_FILENAME
     );

package/wrangler-dist/cli.js

@@ -104810,7 +104810,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "2.0.1";
+var version = "2.0.2";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -108792,7 +108792,7 @@ async function bundleWorker(entry, destination, options) {
     absWorkingDir: entry.directory,
     outdir: destination,
     external: ["__STATIC_CONTENT_MANIFEST"],
-    format: "esm",
+    format: entry.format === "modules" ? "esm" : "iife",
     target: "es2020",
     sourcemap: true,
     minify,
@@ -110423,28 +110423,28 @@ var createDeployment = {
   builder: (yargs) => {
     return yargs.positional("directory", {
       type: "string",
-      default: "functions",
-      description: "The directory of Pages Functions"
+      demandOption: true,
+      description: "The directory of static files to upload"
     }).options({
       "project-name": {
         type: "string",
-        description: "The name of the project you want to list deployments for"
+        description: "The name of the project you want to deploy to"
       },
       branch: {
         type: "string",
-        description: "The branch of the project you want to list deployments for"
+        description: "The name of the branch you want to deploy to"
       },
       "commit-hash": {
         type: "string",
-        description: "The branch of the project you want to list deployments for"
+        description: "The SHA to attach to this deployment"
       },
       "commit-message": {
         type: "string",
-        description: "The branch of the project you want to list deployments for"
+        description: "The commit message to attach to this deployment"
       },
       "commit-dirty": {
         type: "boolean",
-        description: "The branch of the project you want to list deployments for"
+        description: "Whether or not the workspace should be considered dirty for this deployment"
       }
     }).epilogue(pagesBetaWarning);
   },
@@ -110456,6 +110456,9 @@ var createDeployment = {
     commitMessage,
     commitDirty
   }) => {
+    if (!directory) {
+      throw new FatalError("Must specify a directory.", 1);
+    }
     const config = getConfigCache(PAGES_CONFIG_CACHE_FILENAME);
     const accountId = await requireAuth(config);
     projectName ??= config.project_name;