Fix prerelease checks in .availableHelper and transform-runtime defin…

…itions.
babel · Sep 10, 2018 · 61ec957 · 61ec957
1 parent e372129
commit 61ec957
Show file tree

Hide file tree

Showing 31 changed files with 238 additions and 87 deletions.
diff --git a/packages/babel-core/src/transformation/file/file.js b/packages/babel-core/src/transformation/file/file.js
@@ -166,6 +166,25 @@ export default class File {
       return false;
     }
 
+    // semver.intersects() has some surprising behavior with comparing ranges
+    // with preprelease versions. We add '^' to ensure that we are always
+    // comparing ranges with ranges, which sidesteps this logic.
+    // For example:
+    //
+    //   semver.intersects(`<7.0.1`, "7.0.0-beta.0") // false - surprising
+    //   semver.intersects(`<7.0.1`, "^7.0.0-beta.0") // true - expected
+    //
+    // This is because the first falls back to
+    //
+    //   semver.satisfies("7.0.0-beta.0", `<7.0.1`) // false - surprising
+    //
+    // and this fails because a prerelease version can only satisfy a range
+    // if it is a prerelease within the same major/minor/patch range.
+    //
+    // Note: If this is found to have issues, please also revist the logic in
+    // transform-runtime's definitions.js file.
+    if (semver.valid(versionRange)) versionRange = `^${versionRange}`;
+
     return (
       typeof versionRange !== "string" ||
       (!semver.intersects(`<${minVersion}`, versionRange) &&

diff --git a/...-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json b/...-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...n-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json b/...n-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-classes",
     "transform-block-scoping",

diff --git a/...bel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json b/...bel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...l-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json b/...l-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...ugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json b/...ugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...lugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json b/...lugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...lugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json b/...lugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...es/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json b/...es/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     ["proposal-class-properties", { "loose": true }],
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-classes",
     "transform-block-scoping",

diff --git a/.../babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json b/.../babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json b/...-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-classes",
     "transform-block-scoping",

diff --git a/...ges/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json b/...ges/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json b/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json b/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json b/...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties",

diff --git a/...s/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json b/...s/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...bel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json b/...bel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...abel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json b/...abel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/...abel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json b/...abel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json
@@ -1,6 +1,11 @@
 {
   "plugins": [
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "proposal-class-properties",
     "transform-block-scoping",
     "syntax-class-properties"

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json
@@ -2,6 +2,11 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers"
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ]
   ]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json
@@ -2,6 +2,11 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers"
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ]
   ]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json
@@ -2,6 +2,11 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers"
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ]
   ]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json
@@ -2,6 +2,11 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers"
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ]
   ]
 }
diff --git a/...roposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json b/...roposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json
@@ -2,7 +2,12 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ],
     "syntax-async-generators"
   ]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json
@@ -2,6 +2,11 @@
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": false }],
     "proposal-class-properties",
-    "external-helpers"
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.0.1"
+      }
+    ]
   ]
 }