diff --git a/package.json b/package.json index 75c16de..8b3d461 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,11 @@ "url": "http://opensource.org/licenses/MIT" } ], + "browserslist": [ + "last 2 versions", + "android 4", + "opera 12" + ], "scripts": { "build": "webpack --progress --config resources/assets/build/webpack.config.js", "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js", @@ -30,7 +35,7 @@ "node": ">= 6.9.4" }, "devDependencies": { - "autoprefixer": "^6.7.7", + "autoprefixer": "^7.1.1", "browser-sync": "^2.18.8", "browsersync-webpack-plugin": "^0.5.3", "bs-html-injector": "^3.0.3", diff --git a/resources/assets/build/config.js b/resources/assets/build/config.js index 9ef5827..c9a04a1 100644 --- a/resources/assets/build/config.js +++ b/resources/assets/build/config.js @@ -25,7 +25,6 @@ const config = merge({ watcher: !!argv.watch, }, watch: [], - browsers: [], }, userConfig); module.exports = merge(config, { diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js index cdd44b2..995d9f6 100644 --- a/resources/assets/build/webpack.config.js +++ b/resources/assets/build/webpack.config.js @@ -141,7 +141,7 @@ let webpackConfig = { output: { path: config.paths.dist }, context: config.paths.assets, postcss: [ - autoprefixer({ browsers: config.browsers }), + autoprefixer(), ], }, }), diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js index 3b306ab..666c945 100644 --- a/resources/assets/build/webpack.config.optimize.js +++ b/resources/assets/build/webpack.config.optimize.js @@ -13,7 +13,7 @@ module.exports = { cssProcessor: cssnano, cssProcessorOptions: { discardComments: { removeAll: true }, - autoprefixer: { browsers: config.browsers }, + autoprefixer: {}, }, canPrint: true, }), diff --git a/resources/assets/config.json b/resources/assets/config.json index 6beda62..4dfdb17 100644 --- a/resources/assets/config.json +++ b/resources/assets/config.json @@ -14,10 +14,5 @@ "cacheBusting": "[name]_[hash:8]", "watch": [ "{app,resources/views}/**/*.php" - ], - "browsers": [ - "last 2 versions", - "android 4", - "opera 12" ] } diff --git a/yarn.lock b/yarn.lock index b19051b..e35627b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -246,7 +246,7 @@ atob@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" -autoprefixer@^6.3.1, autoprefixer@^6.7.7: +autoprefixer@^6.3.1: version "6.7.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" dependencies: @@ -257,6 +257,17 @@ autoprefixer@^6.3.1, autoprefixer@^6.7.7: postcss "^5.2.16" postcss-value-parser "^3.2.3" +autoprefixer@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d" + dependencies: + browserslist "^2.1.3" + caniuse-lite "^1.0.30000670" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^6.0.1" + postcss-value-parser "^3.2.3" + aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" @@ -535,6 +546,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" +browserslist@^2.1.3: + version "2.1.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053" + dependencies: + caniuse-lite "^1.0.30000670" + electron-to-chromium "^1.3.11" + browsersync-webpack-plugin@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/browsersync-webpack-plugin/-/browsersync-webpack-plugin-0.5.3.tgz#35bc3b1c5aba8c7d2d7b700e23d511454b8d516e" @@ -684,6 +702,10 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000655" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874" +caniuse-lite@^1.0.30000670: + version "1.0.30000676" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000676.tgz#1e962123f48073f0c51c4ea0651dd64d25786498" + capture-stack-trace@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" @@ -1456,6 +1478,10 @@ electron-to-chromium@^1.2.7: version "1.3.3" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.3.tgz#651eb63fe89f39db70ffc8dbd5d9b66958bc6a0e" +electron-to-chromium@^1.3.11: + version "1.3.13" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc" + elliptic@^6.0.0: version "6.4.0" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" @@ -4195,6 +4221,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" +postcss@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" + dependencies: + chalk "^1.1.3" + source-map "^0.5.6" + supports-color "^3.2.3" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"