Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0

This commit is contained in:
yiminghe 2016-01-30 19:01:14 +08:00
commit ee15ea073e
2 changed files with 7 additions and 1 deletions

View File

@ -16,4 +16,3 @@
// Layout
@import "grid.less";

View File

@ -9,10 +9,14 @@ entry['demo'] = './scripts/demo.js';
module.exports = {
entry: entry,
cache: true,
resolve: {
extensions: ['', '.js', '.jsx']
},
noParse: /_site|node_modules/,
output: {
path: path.join(process.cwd(), 'dist'),
filename: '[name].js'
@ -33,14 +37,17 @@ module.exports = {
}
}, {
test: /\.json$/,
exclude: /node_modules/,
loader: 'json-loader'
}, {
test: /\.less$/,
exclude: /node_modules/,
loader: ExtractTextPlugin.extract(
'css?sourceMap&-minimize!' + 'postcss-loader!' + 'less?sourceMap'
)
}, {
test: /\.css$/,
exclude: /node_modules/,
loader: ExtractTextPlugin.extract(
'css?sourceMap&-minimize!' + 'postcss-loader'
)