wrangler 0.0.34 → 2.0.2

package/README.md

@@ -1,5 +1,7 @@
 ## ⛅️ wrangler
 
+> This package is for wrangler v2.x, released first in May 2022. If you're looking for v1.x of the `@cloudflare/wrangler` package, visit https://www.npmjs.com/package/@cloudflare/wrangler / https://github.com/cloudflare/wrangler.
+
 `wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
 
 ## Quick Start
@@ -22,7 +24,7 @@ npx wrangler init my-worker
 # try it out
 cd my-worker && npm run start
 # and then publish it
-npx wrangler publish
+npm run publish
 ```
 
 ## Installation:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.34",
+  "version": "2.0.2",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -9,9 +9,9 @@
   },
   "license": "MIT OR Apache-2.0",
   "bugs": {
-    "url": "https://github.com/cloudflare/wrangler/issues"
+    "url": "https://github.com/cloudflare/wrangler2/issues"
   },
-  "homepage": "https://github.com/cloudflare/wrangler#readme",
+  "homepage": "https://github.com/cloudflare/wrangler2#readme",
   "keywords": [
     "wrangler",
     "cloudflare",

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__/parse.test.ts

@@ -165,6 +165,10 @@ describe("parseTOML", () => {
       });
     }
   });
+
+  it("should cope with Windows line-endings", () => {
+    expect(parseTOML("# A comment with a Windows line-ending\r\n")).toEqual({});
+  });
 });
 
 describe("parseJSON", () => {

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

@@ -82,6 +82,8 @@ const PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 export const pagesBetaWarning =
   "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
 
+const isInPagesCI = !!process.env.CF_PAGES;
+
 const CLEANUP_CALLBACKS: (() => void)[] = [];
 const CLEANUP = () => {
   CLEANUP_CALLBACKS.forEach((callback) => callback());
@@ -802,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);
@@ -842,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
     );
@@ -851,40 +853,45 @@ const createDeployment: CommandModule<
 
     const isInteractive = process.stdin.isTTY;
     if (!projectName && isInteractive) {
-      const existingOrNew = await new Promise<"new" | "existing">((resolve) => {
-        const { unmount } = render(
-          <>
-            <Text>
-              No project selected. Would you like to create one or use an
-              existing project?
-            </Text>
-            <SelectInput
-              items={[
-                {
-                  key: "new",
-                  label: "Create a new project",
-                  value: "new",
-                },
-                {
-                  key: "existing",
-                  label: "Use an existing project",
-                  value: "existing",
-                },
-              ]}
-              onSelect={async (selected) => {
-                resolve(selected.value as "new" | "existing");
-                unmount();
-              }}
-            />
-          </>
-        );
-      });
+      const projects = (await listProjects({ accountId })).filter(
+        (project) => !project.source
+      );
+
+      let existingOrNew: "existing" | "new" = "new";
+
+      if (projects.length > 0) {
+        existingOrNew = await new Promise<"new" | "existing">((resolve) => {
+          const { unmount } = render(
+            <>
+              <Text>
+                No project selected. Would you like to create one or use an
+                existing project?
+              </Text>
+              <SelectInput
+                items={[
+                  {
+                    key: "new",
+                    label: "Create a new project",
+                    value: "new",
+                  },
+                  {
+                    key: "existing",
+                    label: "Use an existing project",
+                    value: "existing",
+                  },
+                ]}
+                onSelect={async (selected) => {
+                  resolve(selected.value as "new" | "existing");
+                  unmount();
+                }}
+              />
+            </>
+          );
+        });
+      }
 
       switch (existingOrNew) {
         case "existing": {
-          const projects = (await listProjects({ accountId })).filter(
-            (project) => !project.source
-          );
           projectName = await new Promise((resolve) => {
             const { unmount } = render(
               <>
@@ -1581,8 +1588,10 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
           watch,
           plugin,
         }) => {
-          // Beta message for `wrangler pages <commands>` usage
-          logger.log(pagesBetaWarning);
+          if (!isInPagesCI) {
+            // Beta message for `wrangler pages <commands>` usage
+            logger.log(pagesBetaWarning);
+          }
 
           await buildFunctions({
             outfile,

package/src/parse.ts

@@ -77,7 +77,9 @@ type TomlError = Error & {
  */
 export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
   try {
-    return TOML.parse(input);
+    // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
+    const normalizedInput = input.replace(/\r\n$/g, "\n");
+    return TOML.parse(normalizedInput);
   } catch (err) {
     const { name, message, line, col } = err as TomlError;
     if (name !== TOML_ERROR_NAME) {

package/src/proxy.ts

@@ -210,6 +210,10 @@ export function usePreviewServer({
       const request = message.pipe(remote.request(headers));
       request.on("response", (responseHeaders) => {
         const status = responseHeaders[":status"] ?? 500;
+
+        // log all requests to terminal
+        logger.log(new Date().toLocaleTimeString(), method, url, status);
+
         rewriteRemoteHostToLocalHostInHeaders(
           responseHeaders,
           previewToken.host,
@@ -349,15 +353,6 @@ async function createProxyServer(
       : createHttpServer();
 
   return server
-    .on("request", function (req, res) {
-      // log all requests
-      logger.log(
-        new Date().toLocaleTimeString(),
-        req.method,
-        req.url,
-        res.statusCode
-      );
-    })
     .on("upgrade", (req) => {
       // log all websocket connections
       logger.log(

package/wrangler-dist/cli.js

@@ -104810,7 +104810,7 @@ var yargs_default = Yargs;
 
 // package.json
 var name = "wrangler";
-var version = "0.0.34";
+var version = "2.0.2";
 var author = "wrangler@cloudflare.com";
 var description = "Command-line interface for all things Cloudflare Workers";
 var bin = {
@@ -104819,9 +104819,9 @@ var bin = {
 };
 var license = "MIT OR Apache-2.0";
 var bugs = {
-  url: "https://github.com/cloudflare/wrangler/issues"
+  url: "https://github.com/cloudflare/wrangler2/issues"
 };
-var homepage = "https://github.com/cloudflare/wrangler#readme";
+var homepage = "https://github.com/cloudflare/wrangler2#readme";
 var keywords = [
   "wrangler",
   "cloudflare",
@@ -105017,7 +105017,8 @@ var TOML_ERROR_NAME = "TomlError";
 var TOML_ERROR_SUFFIX = " at row ";
 function parseTOML(input, file) {
   try {
-    return import_toml.default.parse(input);
+    const normalizedInput = input.replace(/\r\n$/g, "\n");
+    return import_toml.default.parse(normalizedInput);
   } catch (err2) {
     const { name: name2, message, line, col } = err2;
     if (name2 !== TOML_ERROR_NAME) {
@@ -107438,6 +107439,7 @@ function usePreviewServer({
       const request = message.pipe(remote.request(headers));
       request.on("response", (responseHeaders) => {
         const status = responseHeaders[":status"] ?? 500;
+        logger.log(new Date().toLocaleTimeString(), method, url3, status);
         rewriteRemoteHostToLocalHostInHeaders(responseHeaders, previewToken.host, port, localProtocol);
         for (const name2 of Object.keys(responseHeaders)) {
           if (name2.startsWith(":")) {
@@ -107522,9 +107524,7 @@ var HTTP1_HEADERS = /* @__PURE__ */ new Set([
 ]);
 async function createProxyServer(localProtocol) {
   const server = localProtocol === "https" ? (0, import_node_https.createServer)(await getHttpsOptions()) : (0, import_node_http2.createServer)();
-  return server.on("request", function(req, res) {
-    logger.log(new Date().toLocaleTimeString(), req.method, req.url, res.statusCode);
-  }).on("upgrade", (req) => {
+  return server.on("upgrade", (req) => {
     logger.log(new Date().toLocaleTimeString(), req.method, req.url, 101, "(WebSocket)");
   }).on("error", (err2) => {
     logger.error(new Date().toLocaleTimeString(), err2);
@@ -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,
@@ -109952,6 +109952,7 @@ var getRequestContextCheckOptions = async () => {
 // src/pages.tsx
 var PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 var pagesBetaWarning = "\u{1F6A7} 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
+var isInPagesCI = !!process.env.CF_PAGES;
 var CLEANUP_CALLBACKS = [];
 var CLEANUP = () => {
   CLEANUP_CALLBACKS.forEach((callback) => callback());
@@ -110422,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);
   },
@@ -110455,34 +110456,40 @@ 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;
     const isInteractive = process.stdin.isTTY;
     if (!projectName && isInteractive) {
-      const existingOrNew = await new Promise((resolve11) => {
-        const { unmount: unmount2 } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input2.default, {
-          items: [
-            {
-              key: "new",
-              label: "Create a new project",
-              value: "new"
-            },
-            {
-              key: "existing",
-              label: "Use an existing project",
-              value: "existing"
+      const projects = (await listProjects({ accountId })).filter((project) => !project.source);
+      let existingOrNew = "new";
+      if (projects.length > 0) {
+        existingOrNew = await new Promise((resolve11) => {
+          const { unmount: unmount2 } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "No project selected. Would you like to create one or use an existing project?"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input2.default, {
+            items: [
+              {
+                key: "new",
+                label: "Create a new project",
+                value: "new"
+              },
+              {
+                key: "existing",
+                label: "Use an existing project",
+                value: "existing"
+              }
+            ],
+            onSelect: async (selected) => {
+              resolve11(selected.value);
+              unmount2();
             }
-          ],
-          onSelect: async (selected) => {
-            resolve11(selected.value);
-            unmount2();
-          }
-        })));
-      });
+          })));
+        });
+      }
       switch (existingOrNew) {
         case "existing": {
-          const projects = (await listProjects({ accountId })).filter((project) => !project.source);
           projectName = await new Promise((resolve11) => {
             const { unmount: unmount2 } = (0, import_ink5.render)(/* @__PURE__ */ import_react9.default.createElement(import_react9.default.Fragment, null, /* @__PURE__ */ import_react9.default.createElement(import_ink5.Text, null, "Select a project:"), /* @__PURE__ */ import_react9.default.createElement(import_ink_select_input2.default, {
               items: projects.map((project) => ({
@@ -110960,7 +110967,9 @@ var pages = (yargs) => {
     watch: watch3,
     plugin
   }) => {
-    logger.log(pagesBetaWarning);
+    if (!isInPagesCI) {
+      logger.log(pagesBetaWarning);
+    }
     await buildFunctions({
       outfile,
       outputConfigPath,