From 3c8eeec5157243812affda9eaeb714ef01e8498f Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Fri, 7 Apr 2017 16:25:34 -0500 Subject: [PATCH] Ensure const-check plugin order (#257) --- .../babel-preset-env/data/plugin-features.js | 10 +++++----- .../babel-preset-env/data/plugins.json | 20 +++++++++---------- .../debug-fixtures/builtins-uglify/stdout.txt | 4 ++-- .../test/debug-fixtures/builtins/stdout.txt | 4 ++-- .../test/debug-fixtures/electron/stdout.txt | 4 ++-- .../specific-targets/stdout.txt | 2 +- .../sanity/check-es2015-constants/exec.js | 2 ++ .../check-es2015-constants/options.json | 6 ++++++ .../transform-duplicate-keys/actual.js | 0 .../transform-duplicate-keys/expected.js | 0 .../transform-duplicate-keys/options.json | 0 11 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/exec.js create mode 100644 experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/options.json rename experimental/babel-preset-env/test/fixtures/{preset-options => sanity}/transform-duplicate-keys/actual.js (100%) rename experimental/babel-preset-env/test/fixtures/{preset-options => sanity}/transform-duplicate-keys/expected.js (100%) rename experimental/babel-preset-env/test/fixtures/{preset-options => sanity}/transform-duplicate-keys/options.json (100%) diff --git a/experimental/babel-preset-env/data/plugin-features.js b/experimental/babel-preset-env/data/plugin-features.js index 82d0e9df87..fef5180525 100644 --- a/experimental/babel-preset-env/data/plugin-features.js +++ b/experimental/babel-preset-env/data/plugin-features.js @@ -1,5 +1,10 @@ module.exports = { // es2015 + "check-es2015-constants": { + features: [ + "const", + ], + }, "transform-es2015-arrow-functions": { features: [ "arrow functions", @@ -27,11 +32,6 @@ module.exports = { "object literal extensions / computed properties", ], }, - "check-es2015-constants": { - features: [ - "const", - ], - }, "transform-es2015-destructuring": { features: [ "destructuring, assignment", diff --git a/experimental/babel-preset-env/data/plugins.json b/experimental/babel-preset-env/data/plugins.json index 3f1af588ce..f5b6c10888 100644 --- a/experimental/babel-preset-env/data/plugins.json +++ b/experimental/babel-preset-env/data/plugins.json @@ -1,4 +1,14 @@ { + "check-es2015-constants": { + "chrome": 49, + "edge": 14, + "firefox": 51, + "safari": 10, + "node": 6, + "ios": 10, + "opera": 36, + "electron": 1 + }, "transform-es2015-arrow-functions": { "chrome": 47, "edge": 13, @@ -50,16 +60,6 @@ "opera": 31, "electron": 0.31 }, - "check-es2015-constants": { - "chrome": 49, - "edge": 14, - "firefox": 51, - "safari": 10, - "node": 6, - "ios": 10, - "opera": 36, - "electron": 1 - }, "transform-es2015-destructuring": { "chrome": 51, "edge": 15, diff --git a/experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt index 017d4c6418..44f3707bd2 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt @@ -9,12 +9,12 @@ Using targets: Modules transform: false Using plugins: + check-es2015-constants {"uglify":true} transform-es2015-arrow-functions {"uglify":true} transform-es2015-block-scoped-functions {"uglify":true} transform-es2015-block-scoping {"uglify":true} transform-es2015-classes {"uglify":true} transform-es2015-computed-properties {"uglify":true} - check-es2015-constants {"uglify":true} transform-es2015-destructuring {"uglify":true} transform-es2015-duplicate-keys {"uglify":true} transform-es2015-for-of {"uglify":true} @@ -39,4 +39,4 @@ Using polyfills: web.timers {"chrome":55} web.immediate {"chrome":55} web.dom.iterable {"chrome":55} -src/in.js -> lib/in.js +src/in.js -> lib/in.js \ No newline at end of file diff --git a/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt index 40aaad888a..1779d879f0 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt @@ -10,12 +10,12 @@ Using targets: Modules transform: commonjs Using plugins: + check-es2015-constants {"ie":10} transform-es2015-arrow-functions {"ie":10} transform-es2015-block-scoped-functions {"ie":10} transform-es2015-block-scoping {"ie":10} transform-es2015-classes {"ie":10} transform-es2015-computed-properties {"ie":10} - check-es2015-constants {"ie":10} transform-es2015-destructuring {"ie":10,"node":6} transform-es2015-duplicate-keys {"ie":10} transform-es2015-for-of {"ie":10,"node":6} @@ -120,4 +120,4 @@ Using polyfills: web.timers {"chrome":54,"ie":10,"node":6} web.immediate {"chrome":54,"ie":10,"node":6} web.dom.iterable {"chrome":54,"ie":10,"node":6} -src/in.js -> lib/in.js +src/in.js -> lib/in.js \ No newline at end of file diff --git a/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt index 7c2efa828a..c1128e454d 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt @@ -8,8 +8,8 @@ Using targets: Modules transform: commonjs Using plugins: - transform-es2015-block-scoping {"electron":0.36} check-es2015-constants {"electron":0.36} + transform-es2015-block-scoping {"electron":0.36} transform-es2015-destructuring {"electron":0.36} transform-es2015-for-of {"electron":0.36} transform-es2015-function-name {"electron":0.36} @@ -66,4 +66,4 @@ Using polyfills: web.timers {"electron":0.36} web.immediate {"electron":0.36} web.dom.iterable {"electron":0.36} -src/in.js -> lib/in.js +src/in.js -> lib/in.js \ No newline at end of file diff --git a/experimental/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt index f2b273e78b..fe07366e9d 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt @@ -13,12 +13,12 @@ Using targets: Modules transform: commonjs Using plugins: + check-es2015-constants {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7} transform-es2015-arrow-functions {"ie":10,"ios":9,"safari":7} transform-es2015-block-scoped-functions {"ie":10,"ios":9,"safari":7} transform-es2015-block-scoping {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7} transform-es2015-classes {"ie":10,"ios":9,"safari":7} transform-es2015-computed-properties {"ie":10,"safari":7} - check-es2015-constants {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7} transform-es2015-destructuring {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7} transform-es2015-duplicate-keys {"ie":10,"safari":7} transform-es2015-for-of {"edge":13,"firefox":49,"ie":10,"ios":9,"safari":7} diff --git a/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/exec.js b/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/exec.js new file mode 100644 index 0000000000..26dd9d7713 --- /dev/null +++ b/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/exec.js @@ -0,0 +1,2 @@ +const one = 123; +one = 432; diff --git a/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/options.json b/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/options.json new file mode 100644 index 0000000000..25bb3f6508 --- /dev/null +++ b/experimental/babel-preset-env/test/fixtures/sanity/check-es2015-constants/options.json @@ -0,0 +1,6 @@ +{ + "presets": [ + ["../../../../lib"] + ], + "throws": "\"one\" is read-only" +} diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/actual.js b/experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/actual.js similarity index 100% rename from experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/actual.js rename to experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/actual.js diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/expected.js b/experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/expected.js similarity index 100% rename from experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/expected.js rename to experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/expected.js diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/options.json b/experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/options.json similarity index 100% rename from experimental/babel-preset-env/test/fixtures/preset-options/transform-duplicate-keys/options.json rename to experimental/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/options.json