Skip to content

Commit e8d8b8c

Browse files
zhaohaodangzhaohaodang
committed
simplify
1 parent 39c00b3 commit e8d8b8c

25 files changed

+206
-366
lines changed

‎.babelrc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
22
"presets": [
3-
["es2015", { "modules": false }],
3+
["env", {
4+
"modules": false,
5+
"targets": {
6+
"browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
7+
}
8+
}],
49
"stage-2"
510
],
611
"plugins": ["transform-runtime"],
7-
"comments": false,
812
"env": {
913
"test": {
10-
"plugins": [ "istanbul" ]
14+
"presets": ["env", "stage-2"],
15+
"plugins": ["istanbul"]
1116
}
1217
}
1318
}

‎.gitignore

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
.DS_Store
22
node_modules/
33
dist/
4-
npm-debug.log
5-
test/unit/coverage
6-
test/e2e/reports
7-
selenium-debug.log
8-
/.vscode
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
# Editor directories and files
9+
.idea
10+
*.suo
11+
*.ntvs*
12+
*.njsproj
13+
*.sln

‎.postcssrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// https://github.com/michael-ciniawsky/postcss-load-config
2+
3+
module.exports = {
4+
"plugins": {
5+
// to edit target browsers: use "browserslist" field in package.json
6+
"autoprefixer": {}
7+
}
8+
}

‎build/build.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
2626
chunkModules: false
2727
}) + '\n\n')
2828

29+
if (stats.hasErrors()) {
30+
console.log(chalk.red(' Build failed with errors.\n'))
31+
process.exit(1)
32+
}
33+
2934
console.log(chalk.cyan(' Build complete.\n'))
3035
console.log(chalk.yellow(
3136
' Tip: built files are meant to be served over an HTTP server.\n' +

‎build/check-versions.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var chalk = require('chalk')
22
var semver = require('semver')
33
var packageConfig = require('../package.json')
4-
4+
var shell = require('shelljs')
55
function exec (cmd) {
66
return require('child_process').execSync(cmd).toString().trim()
77
}
@@ -11,13 +11,16 @@ var versionRequirements = [
1111
name: 'node',
1212
currentVersion: semver.clean(process.version),
1313
versionRequirement: packageConfig.engines.node
14-
},
15-
{
14+
}
15+
]
16+
17+
if (shell.which('npm')) {
18+
versionRequirements.push({
1619
name: 'npm',
1720
currentVersion: exec('npm --version'),
1821
versionRequirement: packageConfig.engines.npm
19-
}
20-
]
22+
})
23+
}
2124

2225
module.exports = function () {
2326
var warnings = []

‎build/dev-server.js

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ var path = require('path')
1010
var express = require('express')
1111
var webpack = require('webpack')
1212
var proxyMiddleware = require('http-proxy-middleware')
13-
var webpackConfig = process.env.NODE_ENV === 'testing'
14-
? require('./webpack.prod.conf')
15-
: require('./webpack.dev.conf')
13+
var webpackConfig = require('./webpack.dev.conf')
1614

1715
// default port where dev server listens for incoming traffic
1816
var port = process.env.PORT || config.dev.port
@@ -31,7 +29,8 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
3129
})
3230

3331
var hotMiddleware = require('webpack-hot-middleware')(compiler, {
34-
log: () => {}
32+
log: false,
33+
heartbeat: 2000
3534
})
3635
// force page reload when html-webpack-plugin template changes
3736
compiler.plugin('compilation', function (compilation) {
@@ -66,18 +65,26 @@ app.use(staticPath, express.static('./static'))
6665

6766
var uri = 'http://localhost:' + port
6867

69-
devMiddleware.waitUntilValid(function () {
70-
console.log('> Listening at ' + uri + '\n')
68+
var _resolve
69+
var readyPromise = new Promise(resolve => {
70+
_resolve = resolve
7171
})
7272

73-
module.exports = app.listen(port, function (err) {
74-
if (err) {
75-
console.log(err)
76-
return
77-
}
78-
73+
console.log('> Starting dev server...')
74+
devMiddleware.waitUntilValid(() => {
75+
console.log('> Listening at ' + uri + '\n')
7976
// when env is testing, don't need open it
8077
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
8178
opn(uri)
8279
}
80+
_resolve()
8381
})
82+
83+
var server = app.listen(port)
84+
85+
module.exports = {
86+
ready: readyPromise,
87+
close: () => {
88+
server.close()
89+
}
90+
}

‎build/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ exports.cssLoaders = function (options) {
4444
}
4545
}
4646

47-
// http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
47+
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
4848
return {
4949
css: generateLoaders(),
5050
postcss: generateLoaders(),

‎build/vue-loader.conf.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ module.exports = {
99
: config.dev.cssSourceMap,
1010
extract: isProduction
1111
}),
12-
postcss: [
13-
require('autoprefixer')({
14-
browsers: ['last 2 versions']
15-
})
16-
]
12+
transformToRequire: {
13+
video: 'src',
14+
source: 'src',
15+
img: 'src',
16+
image: 'xlink:href'
17+
}
1718
}

‎build/webpack.base.conf.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@ module.exports = {
2020
},
2121
resolve: {
2222
extensions: ['.js', '.vue', '.json'],
23-
modules: [
24-
resolve('src'),
25-
resolve('node_modules')
26-
],
2723
alias: {
28-
'vue$': 'vue/dist/vue.common.js',
29-
'src': resolve('src'),
30-
'assets': resolve('src/assets'),
31-
'components': resolve('src/components')
24+
'vue$': 'vue/dist/vue.esm.js',
25+
'@': resolve('src'),
3226
}
3327
},
3428
module: {
@@ -46,15 +40,23 @@ module.exports = {
4640
{
4741
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
4842
loader: 'url-loader',
49-
query: {
43+
options: {
5044
limit: 10000,
5145
name: utils.assetsPath('img/[name].[hash:7].[ext]')
5246
}
5347
},
48+
{
49+
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
50+
loader: 'url-loader',
51+
options: {
52+
limit: 10000,
53+
name: utils.assetsPath('media/[name].[hash:7].[ext]')
54+
}
55+
},
5456
{
5557
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
5658
loader: 'url-loader',
57-
query: {
59+
options: {
5860
limit: 10000,
5961
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
6062
}

‎build/webpack.dev.conf.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ module.exports = merge(baseWebpackConfig, {
2828
new HtmlWebpackPlugin({
2929
filename: 'index.html',
3030
template: 'index.html',
31-
favicon: 'favicon.ico',
3231
inject: true
3332
}),
3433
new FriendlyErrorsPlugin()

0 commit comments

Comments
 (0)