Skip to content

Commit 0540a0a

Browse files
committed
update package and config
1 parent 311c0fb commit 0540a0a

18 files changed

+225
-298
lines changed

.babelrc

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
{
2-
"presets": [["env", { "modules": false }], "stage-2"],
3-
"plugins": ["transform-runtime", ["component", [
4-
{
2+
"presets": [
3+
["env", {
4+
"modules": false,
5+
"targets": {
6+
"browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
7+
}
8+
}],
9+
"stage-2"
10+
],
11+
"plugins": [
12+
"transform-runtime",
13+
["component", [{
514
"libraryName": "element-ui",
615
"styleLibraryName": "theme-default"
7-
}
8-
]]],
9-
"comments": false,
16+
}]]
17+
],
1018
"env": {
1119
"test": {
1220
"presets": ["env", "stage-2"],
13-
"plugins": [ "istanbul" ]
21+
"plugins": ["istanbul"]
1422
}
1523
}
1624
}

.gitignore

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

.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.test.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

build/check-versions.js

Lines changed: 10 additions & 7 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,12 +12,15 @@ 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 = []

build/dev-server.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
3232
})
3333

3434
var hotMiddleware = require('webpack-hot-middleware')(compiler, {
35-
log: () => {}
35+
log: () => {},
36+
heartbeat: 2000
3637
})
3738
// force page reload when html-webpack-plugin template changes
3839
compiler.plugin('compilation', function (compilation) {
@@ -74,18 +75,26 @@ app.use(staticPath, express.static('./static'))
7475

7576
var uri = 'http://localhost:' + port
7677

77-
devMiddleware.waitUntilValid(function () {
78-
console.log('> Listening at ' + uri + '\n')
78+
var _resolve
79+
var readyPromise = new Promise(resolve => {
80+
_resolve = resolve
7981
})
8082

81-
module.exports = app.listen(port, function (err) {
82-
if (err) {
83-
console.log(err)
84-
return
85-
}
86-
83+
console.log('> Starting dev server...')
84+
devMiddleware.waitUntilValid(() => {
85+
console.log('> Listening at ' + uri + '\n')
8786
// when env is testing, don't need open it
8887
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
8988
opn(uri)
9089
}
90+
_resolve()
9191
})
92+
93+
var server = app.listen(port)
94+
95+
module.exports = {
96+
ready: readyPromise,
97+
close: () => {
98+
server.close()
99+
}
100+
}

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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@ module.exports = {
88
? config.build.productionSourceMap
99
: config.dev.cssSourceMap,
1010
extract: isProduction
11-
})
11+
}),
12+
transformToRequire: {
13+
video: 'src',
14+
source: 'src',
15+
img: 'src',
16+
image: 'xlink:href'
17+
}
1218
}

build/webpack.base.conf.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ module.exports = {
2222
extensions: ['.js', '.vue', '.json'],
2323
alias: {
2424
'vue$': 'vue/dist/vue.esm.js',
25-
'@': resolve('src'),
25+
'@': resolve('src')
2626
}
2727
},
2828
module: {
2929
rules: [
3030
{
3131
test: /\.(js|vue)$/,
3232
loader: 'eslint-loader',
33-
enforce: "pre",
33+
enforce: 'pre',
3434
include: [resolve('src'), resolve('test')],
3535
options: {
3636
formatter: require('eslint-friendly-formatter')
@@ -49,15 +49,23 @@ module.exports = {
4949
{
5050
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
5151
loader: 'url-loader',
52-
query: {
52+
options: {
5353
limit: 10000,
5454
name: utils.assetsPath('img/[name].[hash:7].[ext]')
5555
}
5656
},
57+
{
58+
test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
59+
loader: 'url-loader',
60+
options: {
61+
limit: 10000,
62+
name: utils.assetsPath('media/[name].[hash:7].[ext]')
63+
}
64+
},
5765
{
5866
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
5967
loader: 'url-loader',
60-
query: {
68+
options: {
6169
limit: 10000,
6270
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
6371
}

build/webpack.dev.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module.exports = merge(baseWebpackConfig, {
2626
new webpack.NoEmitOnErrorsPlugin(),
2727
// https://github.com/ampedandwired/html-webpack-plugin
2828
new HtmlWebpackPlugin({
29+
favicon: 'favicon.ico',
2930
filename: 'index.html',
3031
template: 'index.html',
3132
inject: true

build/webpack.prod.conf.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ var webpackConfig = merge(baseWebpackConfig, {
4343
}),
4444
// Compress extracted CSS. We are using this plugin so that possible
4545
// duplicated CSS from different components can be deduped.
46-
new OptimizeCSSPlugin(),
46+
new OptimizeCSSPlugin({
47+
cssProcessorOptions: {
48+
safe: true
49+
}
50+
}),
4751
// generate dist index.html with correct asset hash for caching.
4852
// you can customize output by editing /index.html
4953
// see https://github.com/ampedandwired/html-webpack-plugin
@@ -118,4 +122,14 @@ if (config.build.bundleAnalyzerReport) {
118122
webpackConfig.plugins.push(new BundleAnalyzerPlugin())
119123
}
120124

125+
// deploy to server
126+
if (process.env.COMMAND_ENV === 'deploy') {
127+
var DeployPlugin = require('deploy-webpack-plugin')
128+
webpackConfig.plugins.push(new DeployPlugin({
129+
"receiver": "http://ip:8999/receiver", // optional, deploy to local directory when omitted
130+
"staticDir": "/data/webapps", // .js,.css,images will end up here
131+
"tplDir": "/data/webapps" // .html ends up here
132+
}))
133+
}
134+
121135
module.exports = webpackConfig

0 commit comments

Comments
 (0)