From 923fd4705edb60b9eede13779e1742c094e2a799 Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Thu, 19 Oct 2017 14:50:48 -0500 Subject: [PATCH] Remove syntax-trailing-function-commas from Babel presets (#6513) --- experimental/babel-preset-env/data/plugin-features.js | 5 ----- experimental/babel-preset-env/data/plugins.json | 10 ---------- experimental/babel-preset-env/package.json | 1 - experimental/babel-preset-env/src/available-plugins.js | 1 - .../test/debug-fixtures/android/stdout.txt | 1 - .../test/debug-fixtures/builtins-no-import/stdout.txt | 1 - .../test/debug-fixtures/builtins-uglify/stdout.txt | 1 - .../test/debug-fixtures/builtins/stdout.txt | 1 - .../test/debug-fixtures/electron/stdout.txt | 1 - .../debug-fixtures/force-all-transforms/stdout.txt | 1 - .../test/debug-fixtures/plugins-only/stdout.txt | 1 - .../test/debug-fixtures/shippedProposals/stdout.txt | 1 - .../test/debug-fixtures/specific-targets/stdout.txt | 1 - .../test/debug-fixtures/usage-none/stdout.txt | 1 - .../test/debug-fixtures/usage-with-import/stdout.txt | 3 +-- .../test/debug-fixtures/usage/stdout.txt | 1 - .../test/debug-fixtures/versions-decimals/stdout.txt | 1 - .../test/debug-fixtures/versions-strings/stdout.txt | 1 - packages/babel-preset-es2017/package.json | 1 - packages/babel-preset-es2017/src/index.js | 3 +-- 20 files changed, 2 insertions(+), 35 deletions(-) diff --git a/experimental/babel-preset-env/data/plugin-features.js b/experimental/babel-preset-env/data/plugin-features.js index d55a080713..1edb195872 100644 --- a/experimental/babel-preset-env/data/plugin-features.js +++ b/experimental/babel-preset-env/data/plugin-features.js @@ -128,11 +128,6 @@ const es2017 = { "async functions", ], }, - "syntax-trailing-function-commas": { - features: [ - "trailing commas in function syntax", - ], - } }; const proposals = require("./shipped-proposals").features; diff --git a/experimental/babel-preset-env/data/plugins.json b/experimental/babel-preset-env/data/plugins.json index 7e4f7b2cb6..1a10f060eb 100644 --- a/experimental/babel-preset-env/data/plugins.json +++ b/experimental/babel-preset-env/data/plugins.json @@ -228,16 +228,6 @@ "opera": "42", "electron": "1.6" }, - "syntax-trailing-function-commas": { - "chrome": "58", - "edge": "14", - "firefox": "52", - "safari": "10", - "node": "8", - "ios": "10", - "opera": "45", - "electron": "1.7" - }, "transform-async-generator-functions": { "chrome": "63", "firefox": "57", diff --git a/experimental/babel-preset-env/package.json b/experimental/babel-preset-env/package.json index adb2285788..8cce94e0b5 100644 --- a/experimental/babel-preset-env/package.json +++ b/experimental/babel-preset-env/package.json @@ -15,7 +15,6 @@ "@babel/plugin-syntax-async-generators": "7.0.0-beta.3", "@babel/plugin-syntax-object-rest-spread": "7.0.0-beta.3", "@babel/plugin-syntax-optional-catch-binding": "7.0.0-beta.3", - "babel-plugin-syntax-trailing-function-commas": "7.0.0-beta.0", "@babel/plugin-transform-async-generator-functions": "7.0.0-beta.3", "@babel/plugin-transform-async-to-generator": "7.0.0-beta.3", "@babel/plugin-transform-es2015-arrow-functions": "7.0.0-beta.3", diff --git a/experimental/babel-preset-env/src/available-plugins.js b/experimental/babel-preset-env/src/available-plugins.js index 4ccc471787..cc8c1bab4c 100644 --- a/experimental/babel-preset-env/src/available-plugins.js +++ b/experimental/babel-preset-env/src/available-plugins.js @@ -3,7 +3,6 @@ export default { "syntax-async-generators": require("@babel/plugin-syntax-async-generators"), "syntax-object-rest-spread": require("@babel/plugin-syntax-object-rest-spread"), "syntax-optional-catch-binding": require("@babel/plugin-syntax-optional-catch-binding"), - "syntax-trailing-function-commas": require("babel-plugin-syntax-trailing-function-commas"), "transform-async-to-generator": require("@babel/plugin-transform-async-to-generator"), "transform-async-generator-functions": require("@babel/plugin-transform-async-generator-functions"), "transform-es2015-arrow-functions": require("@babel/plugin-transform-es2015-arrow-functions"), diff --git a/experimental/babel-preset-env/test/debug-fixtures/android/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/android/stdout.txt index 5cc8480ce7..1d1e9b20df 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/android/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/android/stdout.txt @@ -31,7 +31,6 @@ Using plugins: transform-regenerator { "android":"4" } transform-exponentiation-operator { "android":"4" } transform-async-to-generator { "android":"4" } - syntax-trailing-function-commas { "android":"4" } Using polyfills with `entry` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt index b44b4084ac..5fe5e5d739 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt @@ -13,7 +13,6 @@ Using plugins: transform-es2015-function-name { "node":"6" } transform-exponentiation-operator { "node":"6" } transform-async-to-generator { "node":"6" } - syntax-trailing-function-commas { "node":"6" } Using polyfills with `entry` option: 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 d921d685f3..f9a79ac776 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 @@ -34,7 +34,6 @@ Using plugins: transform-regenerator {} transform-exponentiation-operator {} transform-async-to-generator {} - syntax-trailing-function-commas { "chrome":"55" } Using polyfills with `entry` option: 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 f0b7f9e0eb..5d0f11ce37 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/builtins/stdout.txt @@ -33,7 +33,6 @@ Using plugins: transform-regenerator { "ie":"10" } transform-exponentiation-operator { "ie":"10", "node":"6" } transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" } - syntax-trailing-function-commas { "chrome":"54", "ie":"10", "node":"6" } Using polyfills with `entry` option: 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 190375d76e..7483f9aa57 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/electron/stdout.txt @@ -26,7 +26,6 @@ Using plugins: transform-regenerator { "electron":"0.36" } transform-exponentiation-operator { "electron":"0.36" } transform-async-to-generator { "electron":"0.36" } - syntax-trailing-function-commas { "electron":"0.36" } Using polyfills with `entry` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt index 88398caba5..75966fd508 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt @@ -31,7 +31,6 @@ Using plugins: transform-regenerator {} transform-exponentiation-operator {} transform-async-to-generator {} - syntax-trailing-function-commas { "chrome":"55" } Using polyfills with `entry` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt index 5b67b36704..264f9304da 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt @@ -20,7 +20,6 @@ Using plugins: transform-es2015-for-of { "firefox":"52" } transform-es2015-function-name { "firefox":"52" } transform-es2015-literals { "firefox":"52" } - syntax-trailing-function-commas { "node":"7.4" } Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set. src/in.js -> lib/in.js diff --git a/experimental/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt index 74d2807650..c8b7e5d174 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt @@ -29,7 +29,6 @@ Using plugins: transform-regenerator {} transform-exponentiation-operator {} transform-async-to-generator {} - syntax-trailing-function-commas {} transform-async-generator-functions {} transform-object-rest-spread {} transform-optional-catch-binding {} 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 882b729143..aa7c9bc8b4 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 @@ -36,7 +36,6 @@ Using plugins: transform-regenerator { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" } transform-exponentiation-operator { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" } transform-async-to-generator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" } - syntax-trailing-function-commas { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" } Using polyfills with `entry` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt index 15acd7e0c5..be839da18f 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt @@ -32,7 +32,6 @@ Using plugins: transform-regenerator { "firefox":"50", "ie":"11" } transform-exponentiation-operator { "firefox":"50", "ie":"11" } transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" } - syntax-trailing-function-commas { "chrome":"52", "firefox":"50", "ie":"11" } Using polyfills with `usage` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt index 80bff07fb8..660ffb5247 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt @@ -8,9 +8,8 @@ Using targets: Using modules transform: commonjs Using plugins: - syntax-trailing-function-commas { "chrome":"55" } Using polyfills with `usage` option: [src/in.js] Based on your code and targets, none were added. -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/usage/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/usage/stdout.txt index c99f682d3f..c2109f5608 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/usage/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/usage/stdout.txt @@ -32,7 +32,6 @@ Using plugins: transform-regenerator { "firefox":"50", "ie":"11" } transform-exponentiation-operator { "firefox":"50", "ie":"11" } transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" } - syntax-trailing-function-commas { "chrome":"52", "firefox":"50", "ie":"11" } Using polyfills with `usage` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt index 7e6c84e0cd..1477678224 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt @@ -42,7 +42,6 @@ Using plugins: transform-regenerator { "electron":"0.36", "ie":"10" } transform-exponentiation-operator { "electron":"0.36", "ie":"10", "node":"6.1" } transform-async-to-generator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" } - syntax-trailing-function-commas { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" } Using polyfills with `entry` option: diff --git a/experimental/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt b/experimental/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt index 3fbf242887..7bf8440025 100644 --- a/experimental/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt +++ b/experimental/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt @@ -33,7 +33,6 @@ Using plugins: transform-regenerator { "ie":"10" } transform-exponentiation-operator { "ie":"10", "node":"6.10" } transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" } - syntax-trailing-function-commas { "chrome":"54", "ie":"10", "node":"6.10" } Using polyfills with `entry` option: diff --git a/packages/babel-preset-es2017/package.json b/packages/babel-preset-es2017/package.json index 3bc9b0676f..c44542015a 100644 --- a/packages/babel-preset-es2017/package.json +++ b/packages/babel-preset-es2017/package.json @@ -8,7 +8,6 @@ "repository": "https://github.com/babel/babel/tree/master/packages/babel-preset-es2017", "main": "lib/index.js", "dependencies": { - "babel-plugin-syntax-trailing-function-commas": "7.0.0-beta.0", "@babel/plugin-transform-async-to-generator": "7.0.0-beta.3" } } diff --git a/packages/babel-preset-es2017/src/index.js b/packages/babel-preset-es2017/src/index.js index fea8b272df..1acaae9254 100644 --- a/packages/babel-preset-es2017/src/index.js +++ b/packages/babel-preset-es2017/src/index.js @@ -1,8 +1,7 @@ -import syntaxTrailingFunctionCommas from "babel-plugin-syntax-trailing-function-commas"; import transformAsyncToGenerator from "@babel/plugin-transform-async-to-generator"; export default function() { return { - plugins: [syntaxTrailingFunctionCommas, transformAsyncToGenerator], + plugins: [transformAsyncToGenerator], }; }