Skip to content

Commit a031a73

Browse files
committed
fix(cli): avoid nodejs side-effects for multiple var declarations in same statement
1 parent 873a952 commit a031a73

File tree

12 files changed

+46
-54
lines changed

12 files changed

+46
-54
lines changed

cli/lib/ask.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Following is adapted from Vue CLI v2 "init" command
22

3-
const
4-
async = require('async'),
5-
inquirer = require('inquirer'),
6-
evaluate = require('./eval')
3+
const async = require('async')
4+
const inquirer = require('inquirer')
5+
const evaluate = require('./eval')
76

87
// Support types from prompt-for which was used before
98
const promptMapping = {

cli/lib/ensure-outside-project.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
const
2-
{ existsSync } = require('fs'),
3-
{ sep, normalize, join } = require('path')
1+
const { existsSync } = require('fs')
2+
const { sep, normalize, join } = require('path')
43

54
module.exports = function () {
65
let dir = process.cwd()

cli/lib/eval.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ const chalk = require('chalk')
1010
module.exports = function evaluate (exp, data) {
1111
/* eslint-disable no-new-func */
1212
const fn = new Function('data', 'with (data) { return ' + exp + '}')
13+
1314
try {
1415
return fn(data)
15-
} catch (e) {
16+
}
17+
catch (e) {
1618
console.error(chalk.red('Error when evaluating filter condition: ' + exp))
1719
}
1820
}

cli/lib/filter.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Following is adapted from Vue CLI v2 "init" command
22

3-
const
4-
match = require('minimatch'),
5-
evaluate = require('./eval')
3+
const match = require('minimatch')
4+
const evaluate = require('./eval')
65

76
module.exports = (files, filters, data, done) => {
87
if (!filters) {

cli/lib/generate.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
// Adapted from Vue CLI v2 "init" command
22

3-
const
4-
chalk = require('chalk'),
5-
Metalsmith = require('metalsmith'),
6-
Handlebars = require('handlebars'),
7-
async = require('async'),
8-
render = require('consolidate').handlebars.render,
9-
path = require('path'),
10-
multimatch = require('multimatch')
11-
12-
const
13-
getOptions = require('./options'),
14-
ask = require('./ask'),
15-
filter = require('./filter'),
16-
logger = require('./logger')
3+
const chalk = require('chalk')
4+
const Metalsmith = require('metalsmith')
5+
const Handlebars = require('handlebars')
6+
const async = require('async')
7+
const render = require('consolidate').handlebars.render
8+
const path = require('path')
9+
const multimatch = require('multimatch')
10+
11+
const getOptions = require('./options')
12+
const ask = require('./ask')
13+
const filter = require('./filter')
14+
const logger = require('./logger')
1715

1816
// register handlebars helper
1917
Handlebars.registerHelper('if_eq', function (a, b, opts) {

cli/lib/get-project-root.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
const
2-
{ existsSync } = require('fs'),
3-
{ sep, normalize, join } = require('path')
1+
const { existsSync } = require('fs')
2+
const { sep, normalize, join } = require('path')
43

54
module.exports = function () {
65
let dir = process.cwd()

cli/lib/git-user.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ module.exports = () => {
99
try {
1010
name = exec('git config --get user.name')
1111
email = exec('git config --get user.email')
12-
} catch (e) {}
12+
}
13+
catch (e) {}
1314

1415
name = name && JSON.stringify(name.toString().trim()).slice(1, -1)
1516
email = email && (' <' + email.toString().trim() + '>')
17+
1618
return (name || '') + (email || '')
1719
}

cli/lib/logger.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Adapted from Vue CLI v2 "init" command
22

3-
const
4-
chalk = require('chalk'),
5-
format = require('util').format
3+
const chalk = require('chalk')
4+
const format = require('util').format
65

76
/**
87
* Prefix.

cli/lib/net.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
const
2-
os = require('os'),
3-
net = require('net')
1+
const os = require('os')
2+
const net = require('net')
43

54
module.exports.getExternalNetworkInterface = function () {
65
const
7-
networkInterfaces = os.networkInterfaces(),
8-
devices = []
6+
networkInterfaces = os.networkInterfaces();
7+
const devices = []
98

109
for (let deviceName of Object.keys(networkInterfaces)) {
1110
const networkInterface = networkInterfaces[deviceName]

cli/lib/node-packager.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
const
2-
fs = require('fs'),
3-
{ join } = require('path'),
4-
spawn = require('cross-spawn').sync
1+
const fs = require('fs')
2+
const { join } = require('path')
3+
const spawn = require('cross-spawn').sync
54

6-
const
7-
{ fatal } = require('./logger')
5+
const { fatal } = require('./logger')
86

97
function isInstalled (cmd) {
108
try {

0 commit comments

Comments
 (0)