wrangler 0.0.0-e2f9bb2 → 0.0.0-e322475

package/src/__tests__/configuration.test.ts

@@ -19,7 +19,7 @@ describe("normalizeAndValidateConfig()", () => {
       build: {
         command: undefined,
         cwd: undefined,
-        watch_dir: undefined,
+        watch_dir: "./src",
       },
       compatibility_date: undefined,
       compatibility_flags: [],
@@ -27,7 +27,7 @@ describe("normalizeAndValidateConfig()", () => {
       dev: {
         ip: "localhost",
         local_protocol: "http",
-        port: 8787,
+        port: undefined, // the default of 8787 is set at runtime
         upstream_protocol: "https",
         host: undefined,
       },
@@ -43,6 +43,7 @@ describe("normalizeAndValidateConfig()", () => {
       migrations: [],
       name: undefined,
       r2_buckets: [],
+      services: [],
       route: undefined,
       routes: undefined,
       rules: [],
@@ -60,6 +61,8 @@ describe("normalizeAndValidateConfig()", () => {
       data_blobs: undefined,
       workers_dev: undefined,
       zone_id: undefined,
+      minify: undefined,
+      node_compat: undefined,
     });
     expect(diagnostics.hasErrors()).toBe(false);
     expect(diagnostics.hasWarnings()).toBe(false);
@@ -162,68 +165,110 @@ describe("normalizeAndValidateConfig()", () => {
       `);
     });
 
-    it("should override `migrations` config defaults with provided values", () => {
-      const expectedConfig: RawConfig = {
-        migrations: [
-          {
-            tag: "TAG",
-            new_classes: ["CLASS_1", "CLASS_2"],
-            renamed_classes: [
-              {
-                from: "FROM_CLASS",
-                to: "TO_CLASS",
-              },
-            ],
-            deleted_classes: ["CLASS_3", "CLASS_4"],
-          },
-        ],
-      };
+    describe("migrations", () => {
+      it("should override `migrations` config defaults with provided values", () => {
+        const expectedConfig: RawConfig = {
+          migrations: [
+            {
+              tag: "TAG",
+              new_classes: ["CLASS_1", "CLASS_2"],
+              renamed_classes: [
+                {
+                  from: "FROM_CLASS",
+                  to: "TO_CLASS",
+                },
+              ],
+              deleted_classes: ["CLASS_3", "CLASS_4"],
+            },
+          ],
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: 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 on invalid `migrations` values", () => {
-      const expectedConfig = {
-        migrations: [
-          {
-            tag: 111,
-            new_classes: [222, 333],
-            renamed_classes: [
-              {
-                from: 444,
-                to: 555,
-              },
-            ],
-            deleted_classes: [666, 777],
-          },
-        ],
-      };
+      it("should error on invalid `migrations` values", () => {
+        const expectedConfig = {
+          migrations: [
+            {
+              tag: 111,
+              new_classes: [222, 333],
+              renamed_classes: [
+                {
+                  from: 444,
+                  to: 555,
+                },
+              ],
+              deleted_classes: [666, 777],
+            },
+          ],
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig as unknown as RawConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "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."
-      `);
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "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 warn/error on unexpected fields on `migrations`", async () => {
+        const expectedConfig = {
+          migrations: [
+            {
+              tag: "TAG",
+              new_classes: ["CLASS_1", "CLASS_2"],
+              renamed_classes: [
+                {
+                  from: "FROM_CLASS",
+                  to: "TO_CLASS",
+                },
+                {
+                  a: "something",
+                  b: "someone",
+                },
+              ],
+              deleted_classes: ["CLASS_3", "CLASS_4"],
+              unrecognized_field: "FOO",
+            },
+          ],
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Unexpected fields found in migrations field: \\"unrecognized_field\\""
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"migrations[0].renamed_classes\\" to be an array of \\"{from: string, to: string}\\" objects but got [{\\"from\\":\\"FROM_CLASS\\",\\"to\\":\\"TO_CLASS\\"},{\\"a\\":\\"something\\",\\"b\\":\\"someone\\"}]."
+        `);
+      });
     });
 
     describe("site", () => {
@@ -367,6 +412,67 @@ describe("normalizeAndValidateConfig()", () => {
       });
     });
 
+    describe("assets", () => {
+      it("should error if `assets` config is missing `bucket`", () => {
+        const expectedConfig: RawConfig = {
+          // @ts-expect-error we're intentionally passing an invalid configuration here
+          assets: {
+            include: ["INCLUDE_1", "INCLUDE_2"],
+            exclude: ["EXCLUDE_1", "EXCLUDE_2"],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"assets\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"assets.bucket\\" is a required field."
+        `);
+      });
+
+      it("should error on invalid `assets` values", () => {
+        const expectedConfig = {
+          assets: {
+            bucket: "BUCKET",
+            include: [222, 333],
+            exclude: [444, 555],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"assets\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"assets.include.[0]\\" to be of type string but got 222.
+            - Expected \\"assets.include.[1]\\" to be of type string but got 333.
+            - Expected \\"assets.exclude.[0]\\" to be of type string but got 444.
+            - Expected \\"assets.exclude.[1]\\" to be of type string but got 555."
+        `);
+      });
+    });
+
     it("should map `wasm_module` paths from relative to the config path to relative to the cwd", () => {
       const expectedConfig: RawConfig = {
         wasm_modules: {
@@ -393,6 +499,40 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasWarnings()).toBe(false);
     });
 
+    it("should warn on unexpected fields on `triggers`", async () => {
+      const expectedConfig: RawConfig = {
+        triggers: {
+          crons: ["1 * * * *"],
+          // @ts-expect-error we're purposely adding a field
+          // that doesn't belong here
+          someOtherfield: 123,
+        },
+      };
+
+      const { config, diagnostics } = normalizeAndValidateConfig(
+        expectedConfig,
+        "project/wrangler.toml",
+        { env: undefined }
+      );
+
+      expect(config).toEqual(
+        expect.objectContaining({
+          triggers: {
+            crons: ["1 * * * *"],
+            someOtherfield: 123,
+          },
+        })
+      );
+      expect(diagnostics.hasErrors()).toBe(false);
+      expect(diagnostics.hasWarnings()).toBe(true);
+
+      expect(normalizePath(diagnostics.renderWarnings()))
+        .toMatchInlineSnapshot(`
+        "Processing project/wrangler.toml configuration:
+          - Unexpected fields found in triggers field: \\"someOtherfield\\""
+      `);
+    });
+
     it("should error on invalid `wasm_modules` paths", () => {
       const expectedConfig = {
         wasm_modules: {
@@ -620,6 +760,12 @@ describe("normalizeAndValidateConfig()", () => {
               class_name: "CLASS2",
               script_name: "SCRIPT2",
             },
+            {
+              name: "DO_BINDING_3",
+              class_name: "CLASS3",
+              script_name: "SCRIPT3",
+              environment: "ENV3",
+            },
           ],
         },
         kv_namespaces: [
@@ -638,6 +784,13 @@ describe("normalizeAndValidateConfig()", () => {
             preview_bucket_name: "R2_PREVIEW_2",
           },
         ],
+        services: [
+          {
+            binding: "SERVICE_BINDING_1",
+            service: "SERVICE_TYPE_1",
+            environment: "SERVICE_BINDING_ENVIRONMENT_1",
+          },
+        ],
         unsafe: {
           bindings: [
             { name: "UNSAFE_BINDING_1", type: "UNSAFE_TYPE_1" },
@@ -648,6 +801,8 @@ describe("normalizeAndValidateConfig()", () => {
             },
           ],
         },
+        minify: true,
+        node_compat: true,
       };
 
       const { config, diagnostics } = normalizeAndValidateConfig(
@@ -661,9 +816,19 @@ describe("normalizeAndValidateConfig()", () => {
       );
       expect(diagnostics.hasErrors()).toBe(false);
       expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-          "Processing wrangler configuration:
-            - \\"unsafe\\" fields are experimental and may change or break at any time."
-        `);
+        "Processing wrangler configuration:
+          - \\"unsafe\\" fields are experimental and may change or break at any time.
+          - \\"services\\" fields are experimental and may change or break at any time.
+          - In wrangler.toml, you have configured [durable_objects] exported by this Worker (CLASS1), but no [migrations] for them. This may not work as expected until you add a [migrations] section to your wrangler.toml. Add this configuration to your wrangler.toml:
+
+              \`\`\`
+              [[migrations]]
+              tag = \\"v1\\" # Should be unique for each entry
+              new_classes = [\\"CLASS1\\"]
+              \`\`\`
+
+            Refer to https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml for more details."
+      `);
     });
 
     it("should error on invalid environment values", () => {
@@ -705,6 +870,8 @@ describe("normalizeAndValidateConfig()", () => {
           cwd: 1555,
           watch_dir: 1666,
         },
+        minify: "INVALID",
+        node_compat: "INVALID",
       } as unknown as RawEnvironment;
 
       const { config, diagnostics } = normalizeAndValidateConfig(
@@ -717,8 +884,8 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasWarnings()).toBe(false);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
-          - Expected \\"route\\" to be either a string, or an object with shape { pattern, zone_id | zone_name }, but got 888.
-          - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, zone_id | zone_name }, but these weren't valid: [
+          - Expected \\"route\\" to be either a string, or an object with shape { pattern, custom_domain, zone_id | zone_name }, but got 888.
+          - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, custom_domain, zone_id | zone_name }, but these weren't valid: [
               666,
               777,
               {
@@ -767,175 +934,256 @@ describe("normalizeAndValidateConfig()", () => {
           - Expected \\"tsconfig\\" to be of type string but got true.
           - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got 111.
           - Expected \\"main\\" to be of type string but got 1333.
-          - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
+          - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\".
+          - Expected \\"minify\\" to be of type boolean but got \\"INVALID\\".
+          - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\"."
       `);
     });
 
-    it("should error on invalid `name` value with spaces", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "NCC 1701 D",
-      } as unknown as RawEnvironment;
+    describe("name", () => {
+      it("should error on invalid `name` value with spaces", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "NCC 1701 D",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"NCC 1701 D\\"."
-      `);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"NCC 1701 D\\"."
+        `);
+      });
 
-    it("should be valid `name` with underscores", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "enterprise_nx_01",
-      } as unknown as RawEnvironment;
+      it("should be valid `name` with underscores", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "enterprise_nx_01",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.hasErrors()).toBe(false);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(false);
+      });
 
-    it("should error on invalid `name` value with special characters", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "Thy'lek-Shran",
-      } as unknown as RawEnvironment;
+      it("should error on invalid `name` value with special characters", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "Thy'lek-Shran",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"Thy'lek-Shran\\"."
-      `);
-    });
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"Thy'lek-Shran\\"."
+        `);
+      });
 
-    it("should error on invalid `name` value with only special characters", () => {
-      const expectedConfig: RawEnvironment = {
-        name: "!@#$%^&*(()",
-      } as unknown as RawEnvironment;
+      it("should error on invalid `name` value with only special characters", () => {
+        const expectedConfig: RawEnvironment = {
+          name: "!@#$%^&*(()",
+        } as unknown as RawEnvironment;
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config).toEqual(expect.objectContaining(expectedConfig));
-      expect(diagnostics.hasWarnings()).toBe(false);
-      expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-        "Processing wrangler configuration:
-          - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"!@#$%^&*(()\\"."
-      `);
+        expect(config).toEqual(expect.objectContaining(expectedConfig));
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got \\"!@#$%^&*(()\\"."
+        `);
+      });
     });
 
-    it("should override build.upload config defaults with provided values and warn about deprecations", () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          upload: {
-            dir: "src",
-            format: "modules",
-            main: "index.ts",
-            rules: [{ type: "Text", globs: ["GLOB"], fallthrough: true }],
+    describe("build", () => {
+      it("should override build.upload config defaults with provided values and warn about deprecations", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            upload: {
+              dir: "src",
+              format: "modules",
+              main: "index.ts",
+              rules: [{ type: "Text", globs: ["GLOB"], fallthrough: true }],
+            },
           },
-        },
-      };
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        path.resolve("project/wrangler.toml"),
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          path.resolve("project/wrangler.toml"),
+          { env: undefined }
+        );
 
-      expect(config.main).toEqual(path.resolve("project/src/index.ts"));
-      expect(config.build.upload).toBeUndefined();
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(true);
-      expect(normalizePath(diagnostics.renderWarnings()))
-        .toMatchInlineSnapshot(`
-        "Processing project/wrangler.toml configuration:
-          - Deprecation: \\"build.upload.format\\":
-            The format is inferred automatically from the code.
-          - Deprecation: \\"build.upload.main\\":
-            Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-            Then add the top level \`main\` field to your configuration file:
-            \`\`\`
-            main = \\"src/index.ts\\"
-            \`\`\`
-          - Deprecation: \\"build.upload.dir\\":
-            Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
-          - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
-            \`\`\`
-            [[rules]]
-            type = \\"Text\\"
-            globs = [ \\"GLOB\\" ]
-            fallthrough = true
-            \`\`\`"
-      `);
-    });
+        expect(config.main).toEqual(path.resolve("project/src/index.ts"));
+        expect(config.build.upload).toBeUndefined();
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(normalizePath(diagnostics.renderWarnings()))
+          .toMatchInlineSnapshot(`
+          "Processing project/wrangler.toml configuration:
+            - Deprecation: \\"build.upload.format\\":
+              The format is inferred automatically from the code.
+            - Deprecation: \\"build.upload.main\\":
+              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+              Then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"src/index.ts\\"
+              \`\`\`
+            - Deprecation: \\"build.upload.dir\\":
+              Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
+            - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
+              \`\`\`
+              [[rules]]
+              type = \\"Text\\"
+              globs = [ \\"GLOB\\" ]
+              fallthrough = true
+              \`\`\`"
+        `);
+      });
 
-    it("should default custom build watch directories to src", () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          command: "execute some --build",
-        },
-      };
+      it("should default custom build watch directories to src", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        undefined,
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          undefined,
+          { env: undefined }
+        );
 
-      expect(config.build).toEqual(
-        expect.objectContaining({
-          command: "execute some --build",
-          watch_dir: "./src",
-        })
-      );
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: "./src",
+          })
+        );
 
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(false);
-    });
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
 
-    it("should resolve custom build watch directories relative to wrangler.toml", async () => {
-      const expectedConfig: RawEnvironment = {
-        build: {
-          command: "execute some --build",
-          watch_dir: "some/path",
-        },
-      };
+      it("should resolve custom build watch directories relative to wrangler.toml", async () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: "some/path",
+          },
+        };
 
-      const { config, diagnostics } = normalizeAndValidateConfig(
-        expectedConfig,
-        "project/wrangler.toml",
-        { env: undefined }
-      );
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
 
-      expect(config.build).toEqual(
-        expect.objectContaining({
-          command: "execute some --build",
-          watch_dir: path.normalize("project/some/path"),
-        })
-      );
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: path.normalize("project/some/path"),
+          })
+        );
 
-      expect(diagnostics.hasErrors()).toBe(false);
-      expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
+
+      it("should allow watch_dir to be an array of paths", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: ["some/path/a", "some/path/b", "some/path/c"],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
+
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: [
+              path.normalize("project/some/path/a"),
+              path.normalize("project/some/path/b"),
+              path.normalize("project/some/path/c"),
+            ],
+          })
+        );
+
+        expect(diagnostics.hasErrors()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(false);
+      });
+
+      it("should error when the watch_dir array isn't an array of strings", () => {
+        const expectedConfig: RawEnvironment = {
+          build: {
+            command: "execute some --build",
+            watch_dir: [
+              "some/path/a",
+              "some/path/b",
+              // @ts-expect-error intentionally bad "paths"
+              123,
+              "some/path/c",
+              // @ts-expect-error intentionally bad "paths"
+              false,
+            ],
+          },
+        };
+
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          expectedConfig,
+          "project/wrangler.toml",
+          { env: undefined }
+        );
+
+        expect(config.build).toEqual(
+          expect.objectContaining({
+            command: "execute some --build",
+            watch_dir: [
+              path.normalize("project/some/path/a"),
+              path.normalize("project/some/path/b"),
+              path.normalize("project/123"),
+              path.normalize("project/some/path/c"),
+              path.normalize("project/false"),
+            ],
+          })
+        );
+
+        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(true);
+
+        expect(normalizePath(diagnostics.renderErrors()))
+          .toMatchInlineSnapshot(`
+          "Processing project/wrangler.toml configuration:
+            - Expected \\"build.watch_dir.[2]\\" to be of type string but got 123.
+            - Expected \\"build.watch_dir.[4]\\" to be of type string but got false."
+        `);
+      });
     });
 
     describe("durable_objects field", () => {
@@ -1106,13 +1354,29 @@ describe("normalizeAndValidateConfig()", () => {
             durable_objects: {
               bindings: [
                 {},
-                { name: "VALID" },
+                { name: "MISSING_CLASS" },
                 { name: 1555, class_name: 1666 },
                 {
                   name: 1777,
                   class_name: 1888,
                   script_name: 1999,
                 },
+                {
+                  name: "SOMENAME",
+                  class_name: "SomeClass",
+                  environment: "staging",
+                },
+                {
+                  name: 1778,
+                  class_name: 1889,
+                  script_name: 1992,
+                  environment: 2111,
+                },
+                {
+                  name: 1772,
+                  class_name: 1883,
+                  environment: 2112,
+                },
               ],
             },
           } as unknown as RawConfig,
@@ -1126,6 +1390,8 @@ describe("normalizeAndValidateConfig()", () => {
           })
         );
         expect(diagnostics.hasWarnings()).toBe(false);
+
+        expect(diagnostics.hasErrors()).toBe(true);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -1133,7 +1399,7 @@ describe("normalizeAndValidateConfig()", () => {
               - binding should have a string \\"name\\" field.
               - binding should have a string \\"class_name\\" field.
 
-            - \\"durable_objects.bindings[1]\\": {\\"name\\":\\"VALID\\"}
+            - \\"durable_objects.bindings[1]\\": {\\"name\\":\\"MISSING_CLASS\\"}
               - binding should have a string \\"class_name\\" field.
 
             - \\"durable_objects.bindings[2]\\": {\\"name\\":1555,\\"class_name\\":1666}
@@ -1143,7 +1409,22 @@ describe("normalizeAndValidateConfig()", () => {
             - \\"durable_objects.bindings[3]\\": {\\"name\\":1777,\\"class_name\\":1888,\\"script_name\\":1999}
               - binding should have a string \\"name\\" field.
               - binding should have a string \\"class_name\\" field.
-              - binding should, optionally, have a string \\"script_name\\" field."
+              - the field \\"script_name\\", when present, should be a string.
+
+            - \\"durable_objects.bindings[4]\\": {\\"name\\":\\"SOMENAME\\",\\"class_name\\":\\"SomeClass\\",\\"environment\\":\\"staging\\"}
+              - binding should have a \\"script_name\\" field if \\"environment\\" is present.
+
+            - \\"durable_objects.bindings[5]\\": {\\"name\\":1778,\\"class_name\\":1889,\\"script_name\\":1992,\\"environment\\":2111}
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"class_name\\" field.
+              - the field \\"script_name\\", when present, should be a string.
+              - the field \\"environment\\", when present, should be a string.
+
+            - \\"durable_objects.bindings[6]\\": {\\"name\\":1772,\\"class_name\\":1883,\\"environment\\":2112}
+              - binding should have a string \\"name\\" field.
+              - binding should have a string \\"class_name\\" field.
+              - the field \\"environment\\", when present, should be a string.
+              - binding should have a \\"script_name\\" field if \\"environment\\" is present."
         `);
       });
     });
@@ -1358,6 +1639,151 @@ describe("normalizeAndValidateConfig()", () => {
       });
     });
 
+    describe("services field", () => {
+      it("should error if services is an object", () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          { services: {} } as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(
+          expect.not.objectContaining({ services: expect.anything })
+        );
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - The field \\"services\\" should be an array but got {}."
+        `);
+      });
+
+      it("should error if services is a string", () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          { services: "BAD" } as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(
+          expect.not.objectContaining({ services: expect.anything })
+        );
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - The field \\"services\\" should be an array but got \\"BAD\\"."
+        `);
+      });
+
+      it("should error if services is a number", () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          { services: 999 } as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(
+          expect.not.objectContaining({ services: expect.anything })
+        );
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - The field \\"services\\" should be an array but got 999."
+        `);
+      });
+
+      it("should error if services is null", () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          { services: null } as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(
+          expect.not.objectContaining({ services: expect.anything })
+        );
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - The field \\"services\\" should be an array but got null."
+        `);
+      });
+
+      it("should error if services bindings are not valid", () => {
+        const { config, diagnostics } = normalizeAndValidateConfig(
+          {
+            services: [
+              {},
+              { binding: "SERVICE_BINDING_1" },
+              { binding: 123, service: 456 },
+              { binding: 123, service: 456, environment: 789 },
+              { binding: "SERVICE_BINDING_1", service: 456, environment: 789 },
+              {
+                binding: 123,
+                service: "SERVICE_BINDING_SERVICE_1",
+                environment: 789,
+              },
+              {
+                binding: 123,
+                service: 456,
+                environment: "SERVICE_BINDING_ENVIRONMENT_1",
+              },
+            ],
+          } as unknown as RawConfig,
+          undefined,
+          { env: undefined }
+        );
+
+        expect(config).toEqual(
+          expect.not.objectContaining({
+            services: { bindings: expect.anything },
+          })
+        );
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services\\" fields are experimental and may change or break at any time."
+        `);
+        expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - \\"services[0]\\" bindings should have a string \\"binding\\" field but got {}.
+            - \\"services[0]\\" bindings should have a string \\"service\\" field but got {}.
+            - \\"services[1]\\" bindings should have a string \\"service\\" field but got {\\"binding\\":\\"SERVICE_BINDING_1\\"}.
+            - \\"services[2]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456}.
+            - \\"services[2]\\" bindings should have a string \\"service\\" field but got {\\"binding\\":123,\\"service\\":456}.
+            - \\"services[3]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456,\\"environment\\":789}.
+            - \\"services[3]\\" bindings should have a string \\"service\\" field but got {\\"binding\\":123,\\"service\\":456,\\"environment\\":789}.
+            - \\"services[3]\\" bindings should have a string \\"environment\\" field but got {\\"binding\\":123,\\"service\\":456,\\"environment\\":789}.
+            - \\"services[4]\\" bindings should have a string \\"service\\" field but got {\\"binding\\":\\"SERVICE_BINDING_1\\",\\"service\\":456,\\"environment\\":789}.
+            - \\"services[4]\\" bindings should have a string \\"environment\\" field but got {\\"binding\\":\\"SERVICE_BINDING_1\\",\\"service\\":456,\\"environment\\":789}.
+            - \\"services[5]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":\\"SERVICE_BINDING_SERVICE_1\\",\\"environment\\":789}.
+            - \\"services[5]\\" bindings should have a string \\"environment\\" field but got {\\"binding\\":123,\\"service\\":\\"SERVICE_BINDING_SERVICE_1\\",\\"environment\\":789}.
+            - \\"services[6]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456,\\"environment\\":\\"SERVICE_BINDING_ENVIRONMENT_1\\"}.
+            - \\"services[6]\\" bindings should have a string \\"service\\" field but got {\\"binding\\":123,\\"service\\":456,\\"environment\\":\\"SERVICE_BINDING_ENVIRONMENT_1\\"}."
+        `);
+      });
+    });
+
     describe("unsafe field", () => {
       it("should error if unsafe is an array", () => {
         const { config, diagnostics } = normalizeAndValidateConfig(
@@ -1622,14 +2048,7 @@ describe("normalizeAndValidateConfig()", () => {
             - Deprecation: \\"zone_id\\":
               This is unnecessary since we can deduce this from routes directly.
             - Deprecation: \\"experimental_services\\":
-              The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
-              \`\`\`
-              [[unsafe.bindings]]
-              name = \\"mock-name\\"
-              type = \\"service\\"
-              service = \\"SERVICE\\"
-              environment = \\"ENV\\"
-              \`\`\`"
+              The \\"experimental_services\\" field is no longer supported. Simply rename the [experimental_services] field to [services]."
         `);
       });
     });
@@ -1722,6 +2141,8 @@ describe("normalizeAndValidateConfig()", () => {
           cwd: "CWD",
           watch_dir: "WATCH_DIR",
         },
+        minify: true,
+        node_compat: true,
       };
 
       const { config, diagnostics } = normalizeAndValidateConfig(
@@ -1762,6 +2183,8 @@ describe("normalizeAndValidateConfig()", () => {
           cwd: "ENV_CWD",
           watch_dir: "ENV_WATCH_DIR",
         },
+        minify: false,
+        node_compat: false,
       };
       const rawConfig: RawConfig = {
         name: "mock-name",
@@ -1781,6 +2204,8 @@ describe("normalizeAndValidateConfig()", () => {
           cwd: "CWD",
           watch_dir: "WATCH_DIR",
         },
+        minify: true,
+        node_compat: true,
         env: {
           ENV1: rawEnv,
         },
@@ -2031,6 +2456,8 @@ describe("normalizeAndValidateConfig()", () => {
           cwd: 1555,
           watch_dir: 1666,
         },
+        minify: "INVALID",
+        node_compat: "INVALID",
       } as unknown as RawEnvironment;
 
       const { config, diagnostics } = normalizeAndValidateConfig(
@@ -2045,8 +2472,8 @@ describe("normalizeAndValidateConfig()", () => {
         "Processing wrangler configuration:
 
           - \\"env.ENV1\\" environment configuration
-            - Expected \\"route\\" to be either a string, or an object with shape { pattern, zone_id | zone_name }, but got 888.
-            - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, zone_id | zone_name }, but these weren't valid: [
+            - Expected \\"route\\" to be either a string, or an object with shape { pattern, custom_domain, zone_id | zone_name }, but got 888.
+            - Expected \\"routes\\" to be an array of either strings or objects with the shape { pattern, custom_domain, zone_id | zone_name }, but these weren't valid: [
                 666,
                 777
               ].
@@ -2063,7 +2490,9 @@ describe("normalizeAndValidateConfig()", () => {
             - Expected \\"tsconfig\\" to be of type string but got 123.
             - Expected \\"name\\" to be of type string, alphanumeric and lowercase with dashes only but got 111.
             - Expected \\"main\\" to be of type string but got 1333.
-            - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\"."
+            - Expected \\"usage_model\\" field to be one of [\\"bundled\\",\\"unbound\\"] but got \\"INVALID\\".
+            - Expected \\"minify\\" to be of type boolean but got \\"INVALID\\".
+            - Expected \\"node_compat\\" to be of type boolean but got \\"INVALID\\"."
       `);
     });
 
@@ -2285,6 +2714,7 @@ describe("normalizeAndValidateConfig()", () => {
           })
         );
         expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasErrors()).toBe(true);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -2304,7 +2734,7 @@ describe("normalizeAndValidateConfig()", () => {
               - \\"env.ENV1.durable_objects.bindings[3]\\": {\\"name\\":1777,\\"class_name\\":1888,\\"script_name\\":1999}
                 - binding should have a string \\"name\\" field.
                 - binding should have a string \\"class_name\\" field.
-                - binding should, optionally, have a string \\"script_name\\" field."
+                - the field \\"script_name\\", when present, should be a string."
         `);
       });
     });
@@ -2869,14 +3299,7 @@ describe("normalizeAndValidateConfig()", () => {
               - Deprecation: \\"zone_id\\":
                 This is unnecessary since we can deduce this from routes directly.
               - Deprecation: \\"experimental_services\\":
-                The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
-                \`\`\`
-                [[unsafe.bindings]]
-                name = \\"mock-name\\"
-                type = \\"service\\"
-                service = \\"SERVICE\\"
-                environment = \\"ENV\\"
-                \`\`\`"
+                The \\"experimental_services\\" field is no longer supported. Simply rename the [experimental_services] field to [services]."
         `);
       });
     });