Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix version checks in .availableHelper and transform-runtime definitions. #8659

Merged
merged 1 commit into from Sep 11, 2018
Merged

Fix version checks in .availableHelper and transform-runtime definitions. #8659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/babel-core/src/transformation/file/file.js
View file
Open in desktop
Expand Up @@ -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) &&
Expand Down
7 changes: 6 additions & 1 deletion ...-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...n-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-classes",
"transform-block-scoping",
Expand Down
7 changes: 6 additions & 1 deletion ...bel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...l-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...ugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...lugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...lugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...es/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
["proposal-class-properties", { "loose": true }],
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-classes",
"transform-block-scoping",
Expand Down
7 changes: 6 additions & 1 deletion .../babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-classes",
"transform-block-scoping",
Expand Down
7 changes: 6 additions & 1 deletion ...ges/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...abel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties",
Expand Down
7 changes: 6 additions & 1 deletion ...s/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...bel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...abel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion ...abel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json
View file
Open in desktop
@@ -1,6 +1,11 @@
{
"plugins": [
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"proposal-class-properties",
"transform-block-scoping",
"syntax-class-properties"
Expand Down
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json
View file
Open in desktop
Expand Up @@ -2,6 +2,11 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers"
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
]
]
}
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json
View file
Open in desktop
Expand Up @@ -2,6 +2,11 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers"
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
]
]
}
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json
View file
Open in desktop
Expand Up @@ -2,6 +2,11 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers"
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
]
]
}
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json
View file
Open in desktop
Expand Up @@ -2,6 +2,11 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers"
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
]
]
}
7 changes: 6 additions & 1 deletion ...roposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json
View file
Open in desktop
Expand Up @@ -2,7 +2,12 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers",
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
],
"syntax-async-generators"
]
}
7 changes: 6 additions & 1 deletion packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json
View file
Open in desktop
Expand Up @@ -2,6 +2,11 @@
"plugins": [
["proposal-decorators", { "decoratorsBeforeExport": false }],
"proposal-class-properties",
"external-helpers"
[
"external-helpers",
{
"helperVersion": "7.0.1"
}
]
]
}