wrangler 0.0.0-e3cab74 → 0.0.0-e452a04

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e3cab74",
+  "version": "0.0.0-e452a04",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -39,6 +39,7 @@
     "esbuild": "0.14.23",
     "miniflare": "2.3.0",
     "path-to-regexp": "^6.2.0",
+    "selfsigned": "^2.0.0",
     "semiver": "^1.1.0",
     "xxhash-wasm": "^1.0.1"
   },
@@ -46,17 +47,16 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.16.0",
     "@iarna/toml": "^2.2.5",
     "@sentry/cli": "^1.71.0",
     "@sentry/integrations": "^6.17.6",
     "@sentry/node": "^6.17.6",
     "@types/command-exists": "^1.2.0",
-    "@types/estree": "^0.0.50",
     "@types/glob-to-regexp": "0.4.1",
     "@types/mime": "^2.0.3",
     "@types/prompts": "^2.0.14",
     "@types/react": "^17.0.37",
+    "@types/react-test-renderer": "^17.0.1",
     "@types/serve-static": "^1.13.10",
     "@types/signal-exit": "^3.0.1",
     "@types/ws": "^8.2.1",
@@ -84,6 +84,7 @@
     "open": "^8.4.0",
     "prompts": "^2.4.2",
     "react": "^17.0.2",
+    "react-test-renderer": "^17.0.2",
     "react-error-boundary": "^3.1.4",
     "serve-static": "^1.14.1",
     "signal-exit": "^3.0.6",
@@ -123,7 +124,8 @@
       "node_modules/(?!find-up|locate-path|p-locate|p-limit|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port)"
     ],
     "moduleNameMapper": {
-      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js"
+      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
+      "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
     },
     "transform": {
       "^.+\\.c?(t|j)sx?$": [

package/src/__tests__/configuration.test.ts

@@ -21,6 +21,7 @@ describe("normalizeAndValidateConfig()", () => {
         local_protocol: "http",
         port: 8787,
         upstream_protocol: "https",
+        host: undefined,
       },
       durable_objects: {
         bindings: [],
@@ -64,8 +65,8 @@ describe("normalizeAndValidateConfig()", () => {
         dev: {
           ip: "255.255.255.255",
           port: 9999,
-          local_protocol: "HTTPS",
-          upstream_protocol: "HTTP",
+          local_protocol: "https",
+          upstream_protocol: "http",
         },
         build: {
           command: "COMMAND",
@@ -94,8 +95,8 @@ describe("normalizeAndValidateConfig()", () => {
         dev: {
           ip: 222,
           port: "FOO",
-          local_protocol: 333,
-          upstream_protocol: 444,
+          local_protocol: "wss",
+          upstream_protocol: "ws",
         },
         build: {
           command: 555,
@@ -114,17 +115,17 @@ describe("normalizeAndValidateConfig()", () => {
       );
       expect(diagnostics.hasWarnings()).toBe(false);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-          "Processing wrangler configuration:
-            - ERROR: \\"build.command\\" should be of type string but got 555.
-            - ERROR: \\"build.cwd\\" should be of type string but got 666.
-            - ERROR: \\"build.watch_dir\\" should be of type string but got 777.
-            - ERROR: \\"legacy_env\\" should be of type boolean but got \\"FOO\\".
-            - ERROR: \\"main\\" should be a string but got 111
-            - ERROR: \\"dev.ip\\" should be of type string but got 222.
-            - ERROR: \\"dev.port\\" should be of type number but got \\"FOO\\".
-            - ERROR: \\"dev.local_protocol\\" should be of type string but got 333.
-            - ERROR: \\"dev.upstream_protocol\\" should be of type string but got 444."
-        `);
+        "Processing wrangler configuration:
+          - Expected \\"build.command\\" to be of type string but got 555.
+          - Expected \\"build.cwd\\" to be of type string but got 666.
+          - Expected \\"build.watch_dir\\" to be of type string but got 777.
+          - Expected \\"legacy_env\\" to be of type boolean but got \\"FOO\\".
+          - Expected \\"main\\" to be a string but got 111
+          - Expected \\"dev.ip\\" to be of type string but got 222.
+          - Expected \\"dev.port\\" to be of type number but got \\"FOO\\".
+          - Expected \\"dev.local_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"wss\\".
+          - Expected \\"dev.upstream_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"ws\\"."
+      `);
     });
 
     it("should warn on and remove unexpected top level fields", () => {
@@ -243,84 +244,115 @@ describe("normalizeAndValidateConfig()", () => {
       expect(config).toEqual(expect.objectContaining(expectedConfig));
       expect(diagnostics.hasWarnings()).toBe(false);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-          "Processing wrangler configuration:
-            - ERROR: \\"migrations[0].tag\\" should be of type string but got 111.
-            - ERROR: \\"migrations[0].new_classes.[0]\\" should be of type string but got 222.
-            - ERROR: \\"migrations[0].new_classes.[1]\\" should be of type string but got 333.
-            - \\"migrations[0].renamed_classes\\" should be an array of \\"{from: string, to: string}\\" objects but got [{\\"from\\":444,\\"to\\":555}].
-            - ERROR: \\"migrations[0].deleted_classes.[0]\\" should be of type string but got 666.
-            - ERROR: \\"migrations[0].deleted_classes.[1]\\" should be of type string but got 777."
-        `);
+        "Processing wrangler configuration:
+          - Expected \\"migrations[0].tag\\" to be of type string but got 111.
+          - Expected \\"migrations[0].new_classes.[0]\\" to be of type string but got 222.
+          - Expected \\"migrations[0].new_classes.[1]\\" to be of type string but got 333.
+          - Expected \\"migrations[0].renamed_classes\\" to be an array of \\"{from: string, to: string}\\" objects but got [{\\"from\\":444,\\"to\\":555}].
+          - Expected \\"migrations[0].deleted_classes.[0]\\" to be of type string but got 666.
+          - Expected \\"migrations[0].deleted_classes.[1]\\" to be of type string but got 777."
+      `);
     });
 
-    it("should override `site` config defaults with provided values", () => {
-      const expectedConfig: RawConfig = {
-        site: {
-          bucket: "BUCKET",
-          "entry-point": "ENTRY_POINT",
-          include: ["INCLUDE_1", "INCLUDE_2"],
-          exclude: ["EXCLUDE_1", "EXCLUDE_2"],
-        },
-      };
+    describe("site", () => {
+      it("should override `site` config defaults with provided values", () => {
+        const expectedConfig: RawConfig = {
+          site: {
+            bucket: "BUCKET",
+            include: ["INCLUDE_1", "INCLUDE_2"],
+            exclude: ["EXCLUDE_1", "EXCLUDE_2"],
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(false);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
 
-    it("should error if `site` config is missing `bucket`", () => {
-      const expectedConfig: RawConfig = {
-        site: {
-          "entry-point": "ENTRY_POINT",
-          include: ["INCLUDE_1", "INCLUDE_2"],
-          exclude: ["EXCLUDE_1", "EXCLUDE_2"],
-        },
-      } as RawConfig;
+      it("should error if `site` config is missing `bucket`", () => {
+        const expectedConfig: RawConfig = {
+          // @ts-expect-error we're intentionally passing an invalid configuration here
+          site: {
+            include: ["INCLUDE_1", "INCLUDE_2"],
+            exclude: ["EXCLUDE_1", "EXCLUDE_2"],
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasErrors()).toBe(true);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-                "Processing wrangler configuration:
-                  - ERROR: \\"site.bucket\\" is a required field."
-            `);
-      expect(diagnostics.hasWarnings()).toBe(false);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"site.bucket\\" is a required field."
+        `);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
 
-    it("should error on invalid `site` values", () => {
-      const expectedConfig = {
-        site: {
-          bucket: "BUCKET",
-          "entry-point": 111,
-          include: [222, 333],
-          exclude: [444, 555],
-        },
-      };
+      it("should error on invalid `site` values", () => {
+        const expectedConfig = {
+          site: {
+            bucket: "BUCKET",
+            include: [222, 333],
+            exclude: [444, 555],
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig as unknown as RawConfig,
-        undefined
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig as unknown as RawConfig,
+          undefined
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"sites.include.[0]\\" to be of type string but got 222.
+            - Expected \\"sites.include.[1]\\" to be of type string but got 333.
+            - Expected \\"sites.exclude.[0]\\" to be of type string but got 444.
+            - Expected \\"sites.exclude.[1]\\" to be of type string but got 555."
+        `);
+      });
+
+      it("should error with a deprecation warning if entry-point is defined", async () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          {
+            site: {
+              bucket: "some/path",
+              "entry-point": "some/other/script.js",
+            },
+          } as unknown as RawConfig,
+          undefined
+        );
+
+        expect(config.site).toMatchInlineSnapshot(`
+          Object {
+            "bucket": "some/path",
+            "exclude": Array [],
+            "include": Array [],
+          }
+        `);
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - ERROR: \\"site.entry_point\\" should be of type string but got 111.
-            - ERROR: \\"sites.include.[0]\\" should be of type string but got 222.
-            - ERROR: \\"sites.include.[1]\\" should be of type string but got 333.
-            - ERROR: \\"sites.exclude.[0]\\" should be of type string but got 444.
-            - ERROR: \\"sites.exclude.[1]\\" should be of type string but got 555."
+            - Unexpected fields found in site field: \\"entry-point\\""
         `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - DEPRECATION: \\"site.entry-point\\":
+              The \`site.entry-point\` config field is no longer used.
+              The entry-point should be specified via the command line or the \`main\` config field."
+        `);
+      });
     });
 
     it("should map `wasm_module` paths from relative to the config path to relative to the cwd", () => {
@@ -559,7 +591,7 @@ describe("normalizeAndValidateConfig()", () => {
           - Expected \\"jsx_factory\\" field to be a string but got 999.
           - Expected \\"jsx_fragment\\" field to be a string but got 1000.
           - Expected \\"name\\" field to be a string but got 111.
-          - Expected \\"usage_model\\" field to be on of bundled,unbound but got \\"INVALID\\"."
+          - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
       `);
     });
 
@@ -745,20 +777,20 @@ describe("normalizeAndValidateConfig()", () => {
           "Processing wrangler configuration:
 
             - \\"durable_objects.bindings[0]\\": {}
-              - ERROR: bindings should have a string \\"name\\" field.
-              - ERROR: should have a string \\"class_name\\" field.
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"class_name\\" field.
 
             - \\"durable_objects.bindings[1]\\": {\\"name\\":\\"VALID\\"}
-              - ERROR: should have a string \\"class_name\\" field.
+              - binding should have a string \\"class_name\\" field.
 
             - \\"durable_objects.bindings[2]\\": {\\"name\\":1555,\\"class_name\\":1666}
-              - ERROR: bindings should have a string \\"name\\" field.
-              - ERROR: should have a string \\"class_name\\" field.
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"class_name\\" field.
 
             - \\"durable_objects.bindings[3]\\": {\\"name\\":1777,\\"class_name\\":1888,\\"script_name\\":1999}
-              - ERROR: bindings should have a string \\"name\\" field.
-              - ERROR: should have a string \\"class_name\\" field.
-              - ERROR: should, optionally, have a string \\"script_name\\" field."
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"class_name\\" field.
+              - binding should, optionally, have a string \\"script_name\\" field."
         `);
       });
     });
@@ -1175,15 +1207,15 @@ describe("normalizeAndValidateConfig()", () => {
           "Processing wrangler configuration:
 
             - \\"unsafe.bindings[0]\\": {}
-              - ERROR: should have a string \\"name\\" field.
-              - ERROR: should have a string \\"type\\" field.
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"type\\" field.
 
             - \\"unsafe.bindings[1]\\": {\\"name\\":\\"UNSAFE_BINDING_1\\"}
-              - ERROR: should have a string \\"type\\" field.
+              - binding should have a string \\"type\\" field.
 
             - \\"unsafe.bindings[2]\\": {\\"name\\":2666,\\"type\\":2777}
-              - ERROR: should have a string \\"name\\" field.
-              - ERROR: should have a string \\"type\\" field."
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"type\\" field."
         `);
       });
     });
@@ -1389,7 +1421,7 @@ describe("normalizeAndValidateConfig()", () => {
             - Expected \\"jsx_factory\\" field to be a string but got 999.
             - Expected \\"jsx_fragment\\" field to be a string but got 1000.
             - Expected \\"name\\" field to be a string but got 111.
-            - Expected \\"usage_model\\" field to be on of bundled,unbound but got \\"INVALID\\"."
+            - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
       `);
     });
 
@@ -1607,20 +1639,20 @@ describe("normalizeAndValidateConfig()", () => {
             - \\"env.ENV1\\" environment configuration
 
               - \\"env.ENV1.durable_objects.bindings[0]\\": {}
-                - ERROR: bindings should have a string \\"name\\" field.
-                - ERROR: should have a string \\"class_name\\" field.
+                - binding should have a string \\"name\\" field.
+                - binding should have a string \\"class_name\\" field.
 
               - \\"env.ENV1.durable_objects.bindings[1]\\": {\\"name\\":\\"VALID\\"}
-                - ERROR: should have a string \\"class_name\\" field.
+                - binding should have a string \\"class_name\\" field.
 
               - \\"env.ENV1.durable_objects.bindings[2]\\": {\\"name\\":1555,\\"class_name\\":1666}
-                - ERROR: bindings should have a string \\"name\\" field.
-                - ERROR: should have a string \\"class_name\\" field.
+                - binding should have a string \\"name\\" field.
+                - binding should have a string \\"class_name\\" field.
 
               - \\"env.ENV1.durable_objects.bindings[3]\\": {\\"name\\":1777,\\"class_name\\":1888,\\"script_name\\":1999}
-                - ERROR: bindings should have a string \\"name\\" field.
-                - ERROR: should have a string \\"class_name\\" field.
-                - ERROR: should, optionally, have a string \\"script_name\\" field."
+                - binding should have a string \\"name\\" field.
+                - binding should have a string \\"class_name\\" field.
+                - binding should, optionally, have a string \\"script_name\\" field."
         `);
       });
     });
@@ -2117,15 +2149,15 @@ describe("normalizeAndValidateConfig()", () => {
             - \\"env.ENV1\\" environment configuration
 
               - \\"env.ENV1.unsafe.bindings[0]\\": {}
-                - ERROR: should have a string \\"name\\" field.
-                - ERROR: should have a string \\"type\\" field.
+                - binding should have a string \\"name\\" field.
+                - binding should have a string \\"type\\" field.
 
               - \\"env.ENV1.unsafe.bindings[1]\\": {\\"name\\":\\"UNSAFE_BINDING_1\\"}
-                - ERROR: should have a string \\"type\\" field.
+                - binding should have a string \\"type\\" field.
 
               - \\"env.ENV1.unsafe.bindings[2]\\": {\\"name\\":2666,\\"type\\":2777}
-                - ERROR: should have a string \\"name\\" field.
-                - ERROR: should have a string \\"type\\" field."
+                - binding should have a string \\"name\\" field.
+                - binding should have a string \\"type\\" field."
         `);
       });
     });