framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1798 from oxyc/patch-1

Browse Source 
Allow browser versions to be configured in config.json
This commit is contained in:
Ben Word
2017-01-11 16:02:42 -07:00
committed by GitHub
parent 21c6d66942 f4cf20b94f
commit d9542131f5
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/build/config.js
View File

@@ -26,6 +26,7 @@ const config = mergeWithConcat({
watcher: !!argv.watch, watcher: !!argv.watch,
}, },
watch: [], watch: [],
browsers: [],
}, userConfig); }, userConfig);
config.watch.push(`${path.basename(config.paths.assets)}/${config.copy}`); config.watch.push(`${path.basename(config.paths.assets)}/${config.copy}`);

2
assets/build/webpack.config.js
View File

@@ -155,7 +155,7 @@ let webpackConfig = {
output: { path: config.paths.dist }, output: { path: config.paths.dist },
context: config.paths.assets, context: config.paths.assets,
postcss: [ postcss: [
autoprefixer({ browsers: ['last 2 versions', 'android 4', 'opera 12'] }), autoprefixer({ browsers: config.browsers }),
], ],
}, },
}), }),

5
assets/build/webpack.config.optimize.js
View File

@@ -11,7 +11,10 @@ module.exports = {
plugins: [ plugins: [
new OptimizeCssAssetsPlugin({ new OptimizeCssAssetsPlugin({
cssProcessor: cssnano, cssProcessor: cssnano,
cssProcessorOptions: { discardComments: { removeAll: true } }, cssProcessorOptions: {
discardComments: { removeAll: true },
autoprefixer: { browsers: config.browsers },
},
canPrint: true, canPrint: true,
}), }),
new ImageminPlugin({ new ImageminPlugin({

7
assets/config.json
View File

@@ -15,5 +15,10 @@
"publicPath": "/app/themes/sage", "publicPath": "/app/themes/sage",
"devUrl": "http://example.dev", "devUrl": "http://example.dev",
"proxyUrl": "http://localhost:3000", "proxyUrl": "http://localhost:3000",
"cacheBusting": "[name]_[hash:8]" "cacheBusting": "[name]_[hash:8]",
"browsers": [
"last 2 versions",
"android 4",
"opera 12"
]
} }