throw on allowDeclareFields

babel · Feb 3, 2021 · ff5d3a6 · ff5d3a6
1 parent 7f056b5
commit ff5d3a6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/packages/babel-preset-flow/src/normalize-options.js b/packages/babel-preset-flow/src/normalize-options.js
@@ -2,19 +2,20 @@ import { OptionValidator } from "@babel/helper-validator-option";
 const v = new OptionValidator("@babel/preset-flow");
 
 export default function normalizeOptions(options = {}) {
-  let { all, allowDeclareFields } = options;
+  let { all } = options;
+  const { allowDeclareFields } = options;
 
   if (process.env.BABEL_8_BREAKING) {
+    v.invariant(
+      !("allowDeclareFields" in options),
+      `Since Babel 8, \`declare property: A\` is always supported, and the "allowDeclareFields" option is no longer available. Please remove it from your config.`,
+    );
     const TopLevelOptions = {
       all: "all",
-      allowDeclareFields: "allowDeclareFields",
     };
     v.validateTopLevelOptions(options, TopLevelOptions);
     all = v.validateBooleanOption(TopLevelOptions.all, options.all);
-    allowDeclareFields = v.validateBooleanOption(
-      TopLevelOptions.allowDeclareFields,
-      options.allowDeclareFields,
-    );
+    return { all };
   }
 
   return {

diff --git a/packages/babel-preset-flow/test/normalize-options.spec.js b/packages/babel-preset-flow/test/normalize-options.spec.js
@@ -2,28 +2,31 @@ import normalizeOptions from "../src/normalize-options";
 describe("normalize options", () => {
   (process.env.BABEL_8_BREAKING ? describe : describe.skip)("Babel 8", () => {
     it("should throw on unknown options", () => {
-      expect(() => normalizeOptions({ allowDeclareField: true }))
+      expect(() => normalizeOptions({ al: true }))
         .toThrowErrorMatchingInlineSnapshot(`
-        "@babel/preset-flow: 'allowDeclareField' is not a valid top-level option.
-        - Did you mean 'allowDeclareFields'?"
+        "@babel/preset-flow: 'al' is not a valid top-level option.
+        - Did you mean 'all'?"
       `);
     });
-    it.each(["all", "allowDeclareFields"])(
-      "should throw when `%p` is not a boolean",
-      optionName => {
-        expect(() => normalizeOptions({ [optionName]: 0 })).toThrow(
-          `@babel/preset-flow: '${optionName}' option must be a boolean.`,
-        );
-      },
-    );
+    it("should throw on Babel 7 `allowDeclareFields` option", () => {
+      expect(() =>
+        normalizeOptions({ allowDeclareFields: true }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"@babel/preset-flow: Since Babel 8, \`declare property: A\` is always supported, and the \\"allowDeclareFields\\" option is no longer available. Please remove it from your config."`,
+      );
+    });
+    it.each(["all"])("should throw when `%p` is not a boolean", optionName => {
+      expect(() => normalizeOptions({ [optionName]: 0 })).toThrow(
+        `@babel/preset-flow: '${optionName}' option must be a boolean.`,
+      );
+    });
     it("should not throw when options is not defined", () => {
       expect(() => normalizeOptions()).not.toThrowError();
     });
     it("default values", () => {
       expect(normalizeOptions({})).toMatchInlineSnapshot(`
         Object {
           "all": undefined,
-          "allowDeclareFields": undefined,
         }
       `);
     });