Skip to content

Commit 2f9a44b

Browse files
author
zhouxianghui
committed
update to v1.2 : update packages
1 parent 9ca4764 commit 2f9a44b

File tree

8 files changed

+13549
-3856
lines changed

8 files changed

+13549
-3856
lines changed

build/utils.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var path = require('path')
2-
var config = require('../config')
3-
var ExtractTextPlugin = require('extract-text-webpack-plugin')
1+
const path = require('path')
2+
const config = require('../config')
3+
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
44

55
exports.assetsPath = function (_path) {
66
var assetsSubDirectory = process.env.NODE_ENV === 'production'
@@ -12,17 +12,24 @@ exports.assetsPath = function (_path) {
1212
exports.cssLoaders = function (options) {
1313
options = options || {}
1414

15-
var cssLoader = {
15+
const cssLoader = {
1616
loader: 'css-loader',
1717
options: {
1818
minimize: process.env.NODE_ENV === 'production',
1919
sourceMap: options.sourceMap
2020
}
2121
}
2222

23+
const postcssLoader = {
24+
loader: 'postcss-loader',
25+
options: {
26+
sourceMap: options.sourceMap
27+
}
28+
}
29+
2330
// generate loader string to be used with extract text plugin
2431
function generateLoaders (loader, loaderOptions) {
25-
var loaders = [cssLoader]
32+
const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
2633
if (loader) {
2734
loaders.push({
2835
loader: loader + '-loader',
@@ -35,10 +42,7 @@ exports.cssLoaders = function (options) {
3542
// Extract CSS when that option is specified
3643
// (which is the case during production build)
3744
if (options.extract) {
38-
return ExtractTextPlugin.extract({
39-
use: loaders,
40-
fallback: 'vue-style-loader'
41-
})
45+
return [MiniCssExtractPlugin.loader].concat(loaders)
4246
} else {
4347
return ['vue-style-loader'].concat(loaders)
4448
}

build/vue-loader.conf.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
var utils = require('./utils')
2-
var config = require('../config')
3-
var isProduction = process.env.NODE_ENV === 'production'
1+
const utils = require('./utils')
2+
const config = require('../config')
3+
const isProduction = process.env.NODE_ENV === 'production'
4+
const sourceMapEnabled = isProduction
5+
? config.build.productionSourceMap
6+
: config.dev.cssSourceMap
47

58
module.exports = {
69
loaders: utils.cssLoaders({
7-
sourceMap: isProduction
8-
? config.build.productionSourceMap
9-
: config.dev.cssSourceMap,
10+
sourceMap: sourceMapEnabled,
1011
extract: isProduction
1112
}),
13+
cssSourceMap: sourceMapEnabled,
14+
cacheBusting: config.dev.cacheBusting,
1215
transformToRequire: {
13-
video: 'src',
16+
video: ['src', 'poster'],
1417
source: 'src',
1518
img: 'src',
1619
image: 'xlink:href'

build/webpack.base.conf.js

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
var path = require('path')
2-
var glob = require('glob')
3-
var webpack = require('webpack')
4-
var utils = require('./utils')
5-
var config = require('../config')
6-
var vueLoaderConfig = require('./vue-loader.conf')
7-
var markdown = require('./webpack.markdown.js');
1+
'use strict'
2+
const path = require('path')
3+
const glob = require('glob')
4+
const webpack = require('webpack')
5+
const utils = require('./utils')
6+
const config = require('../config')
7+
const vueLoaderConfig = require('./vue-loader.conf')
8+
// const VueLoaderPlugin = require('vue-loader/lib/plugin')
9+
const markdown = require('./webpack.markdown.js')
10+
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
811

912
function resolve(dir) {
1013
return path.join(__dirname, '..', dir)
@@ -101,12 +104,25 @@ module.exports = {
101104
]
102105
},
103106
plugins: [
107+
// new VueLoaderPlugin(),
104108
new webpack.ProvidePlugin({
105109
$: "jquery",
106110
jQuery: "jquery",
107111
'window.$': 'jquery',
108112
"window.jQuery": "jquery",
109113
"hljs": 'hljs'
110114
})
111-
]
115+
],
116+
optimization: {
117+
splitChunks: {
118+
cacheGroups: {
119+
commons: {
120+
chunks: 'initial',
121+
minChunks: 3,
122+
name: 'vendors',
123+
enforce: true
124+
}
125+
}
126+
}
127+
}
112128
}

build/webpack.dev.conf.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
var utils = require('./utils')
2-
var webpack = require('webpack')
3-
var glob = require('glob')
4-
var path = require('path')
5-
var config = require('../config')
6-
var merge = require('webpack-merge')
7-
var baseWebpackConfig = require('./webpack.base.conf')
8-
var HtmlWebpackPlugin = require('html-webpack-plugin')
9-
var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
1+
'use strict'
2+
const utils = require('./utils')
3+
const webpack = require('webpack')
4+
const glob = require('glob')
5+
const path = require('path')
6+
const config = require('../config')
7+
const merge = require('webpack-merge')
8+
const baseWebpackConfig = require('./webpack.base.conf')
9+
const HtmlWebpackPlugin = require('html-webpack-plugin')
10+
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
1011

1112
// add hot-reload related code to entry chunks
1213
Object.keys(baseWebpackConfig.entry).forEach(function(name) {
1314
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
1415
})
1516

1617
module.exports = merge(baseWebpackConfig, {
18+
mode: 'development',
1719
module: {
1820
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap })
1921
},
@@ -23,10 +25,6 @@ module.exports = merge(baseWebpackConfig, {
2325
new webpack.DefinePlugin({
2426
'process.env': config.dev.env
2527
}),
26-
new webpack.optimize.CommonsChunkPlugin({
27-
name: 'vendors',
28-
filename: 'vendors.js'
29-
}),
3028
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
3129
new webpack.HotModuleReplacementPlugin(),
3230
new webpack.NoEmitOnErrorsPlugin(),

0 commit comments

Comments
 (0)