diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2019-04-16 10:17:19 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2019-04-16 10:17:19 +0200 |
| commit | 6ca07130bd1ee1f272ab5ab62dea26ed221f43f1 (patch) | |
| tree | 003b63bfb7f9b4e599bfd5fb0484f2a098fb5501 | |
| parent | e32528687539e30edec3bcee5993f84866d9398f (diff) | |
Edge compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | .babelrc.js | 13 | ||||
| -rw-r--r-- | css/ContactsList.scss | 2 | ||||
| -rw-r--r-- | package-lock.json | 20 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | webpack.common.js | 13 |
5 files changed, 24 insertions, 25 deletions
diff --git a/.babelrc.js b/.babelrc.js deleted file mode 100644 index a1690d0d..00000000 --- a/.babelrc.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - plugins: ['@babel/plugin-syntax-dynamic-import'], - presets: [ - [ - '@babel/preset-env', - { - targets: { - browsers: ['last 2 versions', 'ie >= 11'] - } - } - ] - ] -} diff --git a/css/ContactsList.scss b/css/ContactsList.scss index 30e603de..5a2e39bc 100644 --- a/css/ContactsList.scss +++ b/css/ContactsList.scss @@ -27,7 +27,7 @@ width: 44px; height: 44px; z-index: 149; - background-color: var(--color-main-background-darker); + background-color: var(--color-background-darker); cursor: pointer; opacity: 0.6; transform: rotate(180deg); diff --git a/package-lock.json b/package-lock.json index a58de04d..e5abb1a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1881,6 +1881,14 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" + }, + "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==", + "dev": true + } } }, "bail": { @@ -2672,12 +2680,6 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, - "core-js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz", - "integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==", - "dev": true - }, "core-js-compat": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz", @@ -6076,9 +6078,9 @@ "dev": true }, "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", diff --git a/package.json b/package.json index f08b8c7b..023160b2 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ }, "devDependencies": { "@babel/core": "^7.4.3", + "@babel/plugin-proposal-object-rest-spread": "^7.4.3", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/preset-env": "^7.4.3", "@vue/test-utils": "^1.0.0-beta.29", diff --git a/webpack.common.js b/webpack.common.js index 7c4d6a5b..da9cc0e9 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -32,8 +32,17 @@ module.exports = { }, { test: /\.js$/, - loader: 'babel-loader', - exclude: /node_modules/ + use: { + loader: 'babel-loader', + options: { + plugins: [ + '@babel/plugin-syntax-dynamic-import', + '@babel/plugin-proposal-object-rest-spread' + ], + presets: ['@babel/preset-env'] + } + }, + exclude: /node_modules\/(?!(p-limit|p-defer|p-queue|p-try|cdav-library))/ }, { test: /\.(png|jpg|gif|svg)$/, |