Skip to content

Commit a3a8c80

Browse files
committed
fix and optimize layout media queries after upgrade to webpack 2 vuematerial#456
1 parent bcaf143 commit a3a8c80

File tree

4 files changed

+89
-107
lines changed

4 files changed

+89
-107
lines changed

build/webpack/prod-docs.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin';
66
import CopyWebpackPlugin from 'copy-webpack-plugin';
77
import HtmlWebpackPlugin from 'html-webpack-plugin';
88
import OptimizeJsPlugin from 'optimize-js-plugin';
9+
import OptimizeCssAssetsPlugin from 'optimize-css-assets-webpack-plugin';
10+
import mediaPacker from 'css-mqpacker';
911
import config from '../config';
1012
import baseConfig from './base';
1113

@@ -37,7 +39,8 @@ const conf = merge(baseConfig, {
3739
postcss: [
3840
autoprefixer({
3941
browsers: ['last 3 versions', 'not IE < 10']
40-
})
42+
}),
43+
mediaPacker()
4144
]
4245
}
4346
},
@@ -130,7 +133,8 @@ const conf = merge(baseConfig, {
130133
new webpack.optimize.CommonsChunkPlugin({
131134
name: 'manifest',
132135
chunks: ['vendor']
133-
})
136+
}),
137+
new OptimizeCssAssetsPlugin()
134138
]
135139
});
136140

build/webpack/prod-lib.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import merge from 'webpack-merge';
55
import autoprefixer from 'autoprefixer';
66
import ExtractTextPlugin from 'extract-text-webpack-plugin';
77
import OptimizeJsPlugin from 'optimize-js-plugin';
8+
import OptimizeCssAssetsPlugin from 'optimize-css-assets-webpack-plugin';
9+
import mediaPacker from 'css-mqpacker';
810
import config from '../config';
911
import baseConfig from './base';
1012

@@ -54,7 +56,8 @@ export default merge(baseConfig, {
5456
postcss: [
5557
autoprefixer({
5658
browsers: ['last 3 versions', 'not IE < 10']
57-
})
59+
}),
60+
mediaPacker()
5861
]
5962
}
6063
},
@@ -109,6 +112,7 @@ export default merge(baseConfig, {
109112
raw: true,
110113
entryOnly: true
111114
}),
112-
new ExtractTextPlugin('[name].css')
115+
new ExtractTextPlugin('[name].css'),
116+
new OptimizeCssAssetsPlugin()
113117
]
114118
});

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"connect-history-api-fallback": "^1.3.0",
6262
"copy-webpack-plugin": "^4.0.1",
6363
"css-loader": "^0.26.1",
64+
"css-mqpacker": "^5.0.1",
6465
"element.scrollintoviewifneeded-polyfill": "^1.0.1",
6566
"eslint": "^3.15.0",
6667
"eslint-friendly-formatter": "^2.0.7",
@@ -74,6 +75,7 @@
7475
"highlight.js": "^9.9.0",
7576
"html-webpack-plugin": "^2.28.0",
7677
"node-sass": "^4.5.0",
78+
"optimize-css-assets-webpack-plugin": "^1.3.0",
7779
"optimize-js-plugin": "^0.0.4",
7880
"ora": "^1.1.0",
7981
"raw-loader": "^0.5.1",

0 commit comments

Comments
 (0)