From cbf460b981c0bb28a309bfd1e7dbc3dbc9f952f2 Mon Sep 17 00:00:00 2001 From: Scott Rumsby Date: Mon, 22 Apr 2019 12:01:42 -0700 Subject: [PATCH] Added proper, working babel.config.js to project Inadvertently a non-functioning, test version of the babel config file was committed with the last PR. Commiting the real version with this. --- frontend/babel.config.js | 43 ++++++++++++------------ frontend/package-lock.json | 69 ++++++++++++++++++++++---------------- frontend/package.json | 3 +- 3 files changed, 63 insertions(+), 52 deletions(-) diff --git a/frontend/babel.config.js b/frontend/babel.config.js index b67b9524e..58e8c516b 100644 --- a/frontend/babel.config.js +++ b/frontend/babel.config.js @@ -1,35 +1,36 @@ module.exports = function(api) { - api.cache.using( () => process.env.NODE_ENV !== 'test') - const isTest = api.env('test') - if (isTest) { + if (api.env('test')) { return { presets: [ [ '@babel/preset-env', { - useBuiltIns: "usage", - corejs: "3", targets: { - ie: "11" - } - }, + browsers: [ + 'last 10 Chrome versions' + ] + }, + useBuiltIns: 'usage', + corejs: 3, + } ] - ], + ] } } return { presets: [ - '@vue/app', [ - '@babel/preset-env', - { - useBuiltIns: "usage", - corejs: "3", - targets: { - ie: "11" - } - }, - ] - ] + '@babel/preset-env', + { + modules: false, + targets: { + browsers: ['> 1%','last 2 versions', 'not ie <= 10'], + }, + useBuiltIns: 'usage', + corejs: 3, + } + ], + ], + } -} +} \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7faa77c41..894a13792 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -765,22 +765,6 @@ "regexpu-core": "^4.5.4" } }, - "@babel/polyfill": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.3.tgz", - "integrity": "sha512-rkv8WIvJshA5Ev8iNMGgz5WZkRtgtiPexiT7w5qevGTuT7ZBfM3de9ox1y9JR5/OXb/sWGBbWlHNa7vQKqku3Q==", - "requires": { - "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.2" - }, - "dependencies": { - "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==" - } - } - }, "@babel/preset-env": { "version": "7.4.3", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.3.tgz", @@ -883,6 +867,15 @@ } } }, + "@babel/runtime-corejs3": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.4.3.tgz", + "integrity": "sha512-12jcdiSTZu6bLXyjCqD4E8/rFoctaLjR/MvIiI4I4kvqFEnifeDbaChDpYHrt9meOXbkDpykXdqhXfRJCJYHxQ==", + "requires": { + "core-js-pure": "^3.0.0", + "regenerator-runtime": "^0.13.2" + } + }, "@babel/template": { "version": "7.4.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz", @@ -3068,8 +3061,7 @@ "core-js-pure": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.1.tgz", - "integrity": "sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==", - "dev": true + "integrity": "sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==" }, "core-util-is": { "version": "1.0.2", @@ -5066,7 +5058,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5087,12 +5080,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5107,17 +5102,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5234,7 +5232,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5246,6 +5245,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5260,6 +5260,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5267,12 +5268,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5291,6 +5294,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5371,7 +5375,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5383,6 +5388,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5468,7 +5474,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5504,6 +5511,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5523,6 +5531,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5566,12 +5575,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/frontend/package.json b/frontend/package.json index cf5d09679..d769348bd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,8 +14,7 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { - "@babel/polyfill": "^7.0.0", - "@babel/runtime-corejs2": "^7.4.3", + "@babel/runtime-corejs3": "^7.4.3", "@fortawesome/fontawesome-free": "^5.7.0", "@fortawesome/fontawesome-svg-core": "^1.2.8", "@fortawesome/free-regular-svg-icons": "^5.7.1",