Skip to content

Commit e460fb7

Browse files
ITJesseITJesse
committed
eslint
1 parent efc1f45 commit e460fb7

File tree

8 files changed

+227
-232
lines changed

8 files changed

+227
-232
lines changed

‎web/build/build.js‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1-
'use strict'
2-
require('./check-versions')()
1+
require('./check-versions')();
32

4-
process.env.NODE_ENV = 'production'
3+
process.env.NODE_ENV = 'production';
54

6-
const ora = require('ora')
7-
const rm = require('rimraf')
8-
const path = require('path')
9-
const chalk = require('chalk')
10-
const webpack = require('webpack')
11-
const config = require('../config')
12-
const webpackConfig = require('./webpack.prod.conf')
5+
const ora = require('ora');
6+
const rm = require('rimraf');
7+
const path = require('path');
8+
const chalk = require('chalk');
9+
const webpack = require('webpack');
10+
const config = require('../config');
11+
const webpackConfig = require('./webpack.prod.conf');
1312

14-
const spinner = ora('building for production...')
15-
spinner.start()
13+
const spinner = ora('building for production...');
14+
spinner.start();
1615

17-
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
18-
if (err) throw err
19-
webpack(webpackConfig, function (err, stats) {
20-
spinner.stop()
21-
if (err) throw err
22-
process.stdout.write(stats.toString({
16+
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), (err) => {
17+
if (err) throw err;
18+
webpack(webpackConfig, (err2, stats) => {
19+
spinner.stop();
20+
if (err2) throw err;
21+
process.stdout.write(`${stats.toString({
2322
colors: true,
2423
modules: false,
2524
children: false,
2625
chunks: false,
27-
chunkModules: false
28-
}) + '\n\n')
26+
chunkModules: false,
27+
})}\n\n`);
2928

3029
if (stats.hasErrors()) {
31-
console.log(chalk.red(' Build failed with errors.\n'))
32-
process.exit(1)
30+
console.log(chalk.red(' Build failed with errors.\n'));
31+
process.exit(1);
3332
}
3433

35-
console.log(chalk.cyan(' Build complete.\n'))
34+
console.log(chalk.cyan(' Build complete.\n'));
3635
console.log(chalk.yellow(
3736
' Tip: built files are meant to be served over an HTTP server.\n' +
38-
' Opening index.html over file:// won\'t work.\n'
39-
))
40-
})
41-
})
37+
' Opening index.html over file:// won\'t work.\n',
38+
));
39+
});
40+
});

‎web/build/check-versions.js‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
1-
'use strict'
2-
const chalk = require('chalk')
3-
const semver = require('semver')
4-
const packageConfig = require('../package.json')
5-
const shell = require('shelljs')
6-
function exec (cmd) {
7-
return require('child_process').execSync(cmd).toString().trim()
1+
2+
const chalk = require('chalk');
3+
const semver = require('semver');
4+
const packageConfig = require('../package.json');
5+
const shell = require('shelljs');
6+
7+
function exec(cmd) {
8+
return require('child_process').execSync(cmd).toString().trim();
89
}
910

1011
const versionRequirements = [
1112
{
1213
name: 'node',
1314
currentVersion: semver.clean(process.version),
14-
versionRequirement: packageConfig.engines.node
15-
}
16-
]
15+
versionRequirement: packageConfig.engines.node,
16+
},
17+
];
1718

1819
if (shell.which('npm')) {
1920
versionRequirements.push({
2021
name: 'npm',
2122
currentVersion: exec('npm --version'),
22-
versionRequirement: packageConfig.engines.npm
23-
})
23+
versionRequirement: packageConfig.engines.npm,
24+
});
2425
}
2526

2627
module.exports = function () {
27-
const warnings = []
28+
const warnings = [];
2829
for (let i = 0; i < versionRequirements.length; i++) {
29-
const mod = versionRequirements[i]
30+
const mod = versionRequirements[i];
3031
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
31-
warnings.push(mod.name + ': ' +
32-
chalk.red(mod.currentVersion) + ' should be ' +
33-
chalk.green(mod.versionRequirement)
34-
)
32+
warnings.push(`${mod.name}: ${
33+
chalk.red(mod.currentVersion)} should be ${
34+
chalk.green(mod.versionRequirement)}`,
35+
);
3536
}
3637
}
3738

3839
if (warnings.length) {
39-
console.log('')
40-
console.log(chalk.yellow('To use this template, you must update following to modules:'))
41-
console.log()
40+
console.log('');
41+
console.log(chalk.yellow('To use this template, you must update following to modules:'));
42+
console.log();
4243
for (let i = 0; i < warnings.length; i++) {
43-
const warning = warnings[i]
44-
console.log(' ' + warning)
44+
const warning = warnings[i];
45+
console.log(` ${warning}`);
4546
}
46-
console.log()
47-
process.exit(1)
47+
console.log();
48+
process.exit(1);
4849
}
49-
}
50+
};

‎web/build/dev-server.js‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
'use strict'
2-
require('./check-versions')()
31

4-
const config = require('../config')
2+
require('./check-versions')();
3+
4+
const config = require('../config');
5+
56
if (!process.env.NODE_ENV) {
6-
process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
7+
process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV);
78
}
89

9-
const opn = require('opn')
10-
const path = require('path')
11-
const express = require('express')
12-
const webpack = require('webpack')
13-
const proxyMiddleware = require('http-proxy-middleware')
14-
const webpackConfig = require('./webpack.dev.conf')
10+
const opn = require('opn');
11+
const path = require('path');
12+
const express = require('express');
13+
const webpack = require('webpack');
14+
const proxyMiddleware = require('http-proxy-middleware');
15+
const webpackConfig = require('./webpack.dev.conf');
1516

1617
// default port where dev server listens for incoming traffic
17-
const port = process.env.PORT || config.dev.port
18+
const port = process.env.PORT || config.dev.port;
1819
// automatically open browser, if not set will be false
19-
const autoOpenBrowser = !!config.dev.autoOpenBrowser
20+
const autoOpenBrowser = !!config.dev.autoOpenBrowser;
2021
// Define HTTP proxies to your custom API backend
2122
// https://github.com/chimurai/http-proxy-middleware
22-
const proxyTable = config.dev.proxyTable
23+
const proxyTable = config.dev.proxyTable;
2324

24-
const app = express()
25-
const compiler = webpack(webpackConfig)
25+
const app = express();
26+
const compiler = webpack(webpackConfig);
2627

2728
const devMiddleware = require('webpack-dev-middleware')(compiler, {
2829
publicPath: webpackConfig.output.publicPath,
29-
quiet: true
30-
})
30+
quiet: true,
31+
});
3132

3233
const hotMiddleware = require('webpack-hot-middleware')(compiler, {
3334
log: false,
34-
heartbeat: 2000
35-
})
35+
heartbeat: 2000,
36+
});
3637
// force page reload when html-webpack-plugin template changes
3738
// currently disabled until this is resolved:
3839
// https://github.com/jantimon/html-webpack-plugin/issues/680
@@ -45,61 +46,60 @@ const hotMiddleware = require('webpack-hot-middleware')(compiler, {
4546

4647
// enable hot-reload and state-preserving
4748
// compilation error display
48-
app.use(hotMiddleware)
49+
app.use(hotMiddleware);
4950

5051
// proxy api requests
51-
Object.keys(proxyTable).forEach(function (context) {
52-
let options = proxyTable[context]
52+
Object.keys(proxyTable).forEach((context) => {
53+
let options = proxyTable[context];
5354
if (typeof options === 'string') {
54-
options = { target: options }
55+
options = { target: options };
5556
}
56-
app.use(proxyMiddleware(options.filter || context, options))
57-
})
57+
app.use(proxyMiddleware(options.filter || context, options));
58+
});
5859

5960
// handle fallback for HTML5 history API
60-
app.use(require('connect-history-api-fallback')())
61+
app.use(require('connect-history-api-fallback')());
6162

6263
// serve webpack bundle output
63-
app.use(devMiddleware)
64+
app.use(devMiddleware);
6465

6566
// serve pure static assets
66-
const staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
67-
app.use(staticPath, express.static('./static'))
67+
const staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory);
68+
app.use(staticPath, express.static('./static'));
6869

69-
const uri = 'http://localhost:' + port
70+
let _resolve;
71+
let _reject;
72+
const readyPromise = new Promise((resolve, reject) => {
73+
_resolve = resolve;
74+
_reject = reject;
75+
});
7076

71-
var _resolve
72-
var _reject
73-
var readyPromise = new Promise((resolve, reject) => {
74-
_resolve = resolve
75-
_reject = reject
76-
})
77+
let server;
78+
const portfinder = require('portfinder');
7779

78-
var server
79-
var portfinder = require('portfinder')
80-
portfinder.basePort = port
80+
portfinder.basePort = port;
8181

82-
console.log('> Starting dev server...')
82+
console.log('> Starting dev server...');
8383
devMiddleware.waitUntilValid(() => {
8484
portfinder.getPort((err, port) => {
8585
if (err) {
86-
_reject(err)
86+
_reject(err);
8787
}
88-
process.env.PORT = port
89-
var uri = 'http://localhost:' + port
90-
console.log('> Listening at ' + uri + '\n')
88+
process.env.PORT = port;
89+
const uri = `http://localhost:${port}`;
90+
console.log(`> Listening at ${uri}\n`);
9191
// when env is testing, don't need open it
9292
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
93-
opn(uri)
93+
opn(uri);
9494
}
95-
server = app.listen(port)
96-
_resolve()
97-
})
98-
})
95+
server = app.listen(port);
96+
_resolve();
97+
});
98+
});
9999

100100
module.exports = {
101101
ready: readyPromise,
102102
close: () => {
103-
server.close()
104-
}
105-
}
103+
server.close();
104+
},
105+
};

‎web/build/utils.js‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,45 @@
1-
'use strict'
2-
const path = require('path')
3-
const config = require('../config')
4-
const ExtractTextPlugin = require('extract-text-webpack-plugin')
1+
2+
const path = require('path');
3+
const config = require('../config');
4+
const ExtractTextPlugin = require('extract-text-webpack-plugin');
55

66
exports.assetsPath = function (_path) {
77
const assetsSubDirectory = process.env.NODE_ENV === 'production'
88
? config.build.assetsSubDirectory
9-
: config.dev.assetsSubDirectory
10-
return path.posix.join(assetsSubDirectory, _path)
11-
}
12-
13-
exports.cssLoaders = function (options) {
14-
options = options || {}
9+
: config.dev.assetsSubDirectory;
10+
return path.posix.join(assetsSubDirectory, _path);
11+
};
1512

13+
exports.cssLoaders = function (options = {}) {
1614
const cssLoader = {
1715
loader: 'css-loader',
1816
options: {
1917
minimize: process.env.NODE_ENV === 'production',
20-
sourceMap: options.sourceMap
21-
}
22-
}
18+
sourceMap: options.sourceMap,
19+
},
20+
};
2321

2422
// generate loader string to be used with extract text plugin
25-
function generateLoaders (loader, loaderOptions) {
26-
const loaders = [cssLoader]
23+
function generateLoaders(loader, loaderOptions) {
24+
const loaders = [cssLoader];
2725
if (loader) {
2826
loaders.push({
29-
loader: loader + '-loader',
27+
loader: `${loader}-loader`,
3028
options: Object.assign({}, loaderOptions, {
31-
sourceMap: options.sourceMap
32-
})
33-
})
29+
sourceMap: options.sourceMap,
30+
}),
31+
});
3432
}
3533

3634
// Extract CSS when that option is specified
3735
// (which is the case during production build)
3836
if (options.extract) {
3937
return ExtractTextPlugin.extract({
4038
use: loaders,
41-
fallback: 'vue-style-loader'
42-
})
43-
} else {
44-
return ['vue-style-loader'].concat(loaders)
39+
fallback: 'vue-style-loader',
40+
});
4541
}
42+
return ['vue-style-loader'].concat(loaders);
4643
}
4744

4845
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
@@ -53,20 +50,20 @@ exports.cssLoaders = function (options) {
5350
sass: generateLoaders('sass', { indentedSyntax: true }),
5451
scss: generateLoaders('sass'),
5552
stylus: generateLoaders('stylus'),
56-
styl: generateLoaders('stylus')
57-
}
58-
}
53+
styl: generateLoaders('stylus'),
54+
};
55+
};
5956

6057
// Generate loaders for standalone style files (outside of .vue)
6158
exports.styleLoaders = function (options) {
62-
const output = []
63-
const loaders = exports.cssLoaders(options)
59+
const output = [];
60+
const loaders = exports.cssLoaders(options);
6461
for (const extension in loaders) {
65-
const loader = loaders[extension]
62+
const loader = loaders[extension];
6663
output.push({
67-
test: new RegExp('\\.' + extension + '$'),
68-
use: loader
69-
})
64+
test: new RegExp(`\\.${extension}$`),
65+
use: loader,
66+
});
7067
}
71-
return output
72-
}
68+
return output;
69+
};

0 commit comments

Comments
 (0)