From 72b1f38f91b90711cb22eaa4ab805a221cc23f5d Mon Sep 17 00:00:00 2001 From: Brian Ng Date: Sun, 12 Mar 2017 11:49:05 -0500 Subject: [PATCH] Change trailing commas option on scripts --- experimental/babel-preset-env/package.json | 8 ++++++-- .../babel-preset-env/scripts/build-data.js | 15 +++++++-------- experimental/babel-preset-env/yarn.lock | 6 +----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/experimental/babel-preset-env/package.json b/experimental/babel-preset-env/package.json index 843d082f09..f75b3c115e 100644 --- a/experimental/babel-preset-env/package.json +++ b/experimental/babel-preset-env/package.json @@ -15,9 +15,9 @@ "coverage-ci": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", "dev": "babel -w src -d lib", "fix": "eslint . --fix", + "format": "prettier --trailing-comma all --write \"src/*.js\" \"test/*.js\" && prettier --trailing-comma es5 --write \"scripts/*.js\"", "lint": "eslint .", "precommit": "lint-staged", - "prettify": "prettier --trailing-comma all --write \"src/*.js\" \"scripts/*.js\" \"test/*.js\"", "test": "npm run build && npm run test-only", "test-ci": "nyc npm run test", "test-only": "mocha ./test --compilers js:babel-register -t 10000" @@ -106,10 +106,14 @@ "sourceMap": false }, "lint-staged": { - "{src,scripts}/**/*.js": [ + "src/**/*.js": [ "prettier --trailing-comma all --write", "git add" ], + "scripts/*.js": [ + "prettier --trailing-comma es5 --write", + "git add" + ], "test/*.js": [ "prettier --trailing-comma all --write", "git add" diff --git a/experimental/babel-preset-env/scripts/build-data.js b/experimental/babel-preset-env/scripts/build-data.js index 6694aaba67..03c0cb9352 100644 --- a/experimental/babel-preset-env/scripts/build-data.js +++ b/experimental/babel-preset-env/scripts/build-data.js @@ -54,7 +54,7 @@ const envMap = { const invertedEqualsEnv = Object.keys(envs).filter(b => envs[b].equals).reduce(( a, - b, + b ) => { const checkEnv = envMap[envs[b].equals] || envs[b].equals; environments.some(env => { @@ -88,7 +88,7 @@ const compatibilityTests = flattenDeep( return test.subtests ? [test, renameTests(test.subtests, name => test.name + " / " + name)] : test; - })), + })) ); const getLowestImplementedVersion = ({ features }, env) => { @@ -115,7 +115,7 @@ const getLowestImplementedVersion = ({ features }, env) => { res: test.res, isBuiltIn, }; - }), + }) ); const envTests = tests.map(({ res: test, name, isBuiltIn }, i) => { @@ -141,8 +141,7 @@ const getLowestImplementedVersion = ({ features }, env) => { .filter(t => t.startsWith(env)) // Babel assumes strict mode .filter( - test => - tests[i].res[test] === true || tests[i].res[test] === "strict", + test => tests[i].res[test] === true || tests[i].res[test] === "strict" ) // normalize some keys .map(test => envMap[test] || test) @@ -214,7 +213,7 @@ if (process.argv[2] === "--check") { ) { console.error( "The newly generated plugin/built-in data does not match the current " + - "files. Re-run `npm run build-data`.", + "files. Re-run `npm run build-data`." ); process.exit(1); } @@ -224,10 +223,10 @@ if (process.argv[2] === "--check") { fs.writeFileSync( pluginsDataPath, - JSON.stringify(newPluginData, null, 2) + "\n", + JSON.stringify(newPluginData, null, 2) + "\n" ); fs.writeFileSync( builtInsDataPath, - JSON.stringify(newBuiltInsData, null, 2) + "\n", + JSON.stringify(newBuiltInsData, null, 2) + "\n" ); diff --git a/experimental/babel-preset-env/yarn.lock b/experimental/babel-preset-env/yarn.lock index fb4ed35e8d..9c9e1579dc 100644 --- a/experimental/babel-preset-env/yarn.lock +++ b/experimental/babel-preset-env/yarn.lock @@ -1843,11 +1843,7 @@ dom-serializer@0, dom-serializer@~0.1.0: domelementtype "~1.1.1" entities "~1.1.1" -domelementtype@1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" - -domelementtype@~1.1.1: +domelementtype@1, domelementtype@~1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"