Skip to content

Commit 63f5b0c

Browse files
author
Duoc
committed
update build, packages
1 parent d6b07f7 commit 63f5b0c

File tree

11 files changed

+73
-59
lines changed

11 files changed

+73
-59
lines changed

‎.babelrc

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

‎.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
build/*.js
2-
config/*.js

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
env: {
1010
browser: true,
1111
},
12-
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
12+
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
1313
extends: 'standard',
1414
// required to lint *.vue files
1515
plugins: [

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ npm-debug.log
77
/dist/static
88
/dist/index.html
99
/config
10+
11+
\.idea/

‎.postcssrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module.exports = {
44
"plugins": {
5-
// to edit target browsers: use "browserlist" field in package.json
5+
// to edit target browsers: use "browserslist" field in package.json
66
"autoprefixer": {}
77
}
88
}

‎build/build.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
// https://github.com/shelljs/shelljs
21
require('./check-versions')()
3-
require('shelljs/global')
4-
env.NODE_ENV = 'production'
52

6-
var path = require('path')
3+
process.env.NODE_ENV = 'production'
4+
75
var ora = require('ora')
6+
var rm = require('rimraf')
7+
var path = require('path')
8+
var chalk = require('chalk')
89
var webpack = require('webpack')
910
var webpackConfig = require('./webpack.prod.conf')
1011

11-
console.log(
12-
' Tip:\n' +
13-
' Built files are meant to be served over an HTTP server.\n' +
14-
' Opening index.html over file:// won\'t work.\n'
15-
)
16-
1712
var spinner = ora('building for production...')
1813
spinner.start()
1914

@@ -26,5 +21,11 @@ webpack(webpackConfig, function (err, stats) {
2621
children: false,
2722
chunks: false,
2823
chunkModules: false
29-
}) + '\n')
24+
}) + '\n\n')
25+
26+
console.log(chalk.cyan(' Build complete.\n'))
27+
console.log(chalk.yellow(
28+
' Tip: built files are meant to be served over an HTTP server.\n' +
29+
' Opening index.html over file:// won\'t work.\n'
30+
))
3031
})

‎build/check-versions.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
var semver = require('semver')
21
var chalk = require('chalk')
2+
var semver = require('semver')
33
var packageConfig = require('../package.json')
4-
var exec = function (cmd) {
5-
return require('child_process')
6-
.execSync(cmd).toString().trim()
4+
var shell = require('shelljs')
5+
function exec (cmd) {
6+
return require('child_process').execSync(cmd).toString().trim()
77
}
88

99
var versionRequirements = [
@@ -12,21 +12,24 @@ var versionRequirements = [
1212
currentVersion: semver.clean(process.version),
1313
versionRequirement: packageConfig.engines.node
1414
},
15-
{
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 = []
2427
for (var i = 0; i < versionRequirements.length; i++) {
2528
var mod = versionRequirements[i]
2629
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
2730
warnings.push(mod.name + ': ' +
28-
chalk.red(mod.currentVersion) + ' should be ' +
29-
chalk.green(mod.versionRequirement)
31+
chalk.red(mod.currentVersion) + ' should be ' +
32+
chalk.green(mod.versionRequirement)
3033
)
3134
}
3235
}

‎build/utils.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin')
33

44
exports.cssLoaders = function (options) {
55
options = options || {}
6+
67
var cssLoader = {
78
loader: 'css-loader',
89
options: {
910
minimize: process.env.NODE_ENV === 'production',
1011
sourceMap: options.sourceMap
1112
}
1213
}
14+
1315
// generate loader string to be used with extract text plugin
1416
function generateLoaders (loader, loaderOptions) {
1517
var loaders = [cssLoader]

‎build/vue-loader.conf.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@ module.exports = {
55
loaders: utils.cssLoaders({
66
sourceMap: true,
77
extract: isProduction
8-
})
8+
}),
9+
transformToRequire: {
10+
video: 'src',
11+
source: 'src',
12+
img: 'src',
13+
image: 'xlink:href'
14+
}
915
}

‎build/webpack.prod.conf.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
var path = require('path')
2-
var utils = require('./utils')
32
var webpack = require('webpack')
43
var ExtractTextPlugin = require('extract-text-webpack-plugin')
5-
var projectRoot = path.resolve(__dirname, '../')
64
var vueLoaderConfig = require('./vue-loader.conf')
75

86
var webpackConfig ={
@@ -52,7 +50,8 @@ var webpackConfig ={
5250
new webpack.optimize.UglifyJsPlugin({
5351
compress: {
5452
warnings: false
55-
}
53+
},
54+
sourceMap: true
5655
}),
5756
new webpack.optimize.OccurrenceOrderPlugin(),
5857
// extract css into its own file

0 commit comments

Comments
 (0)