Skip to content

Commit f1de717

Browse files
author
jedmao
committed
var -> let, const
1 parent b787a4a commit f1de717

File tree

12 files changed

+82
-82
lines changed

12 files changed

+82
-82
lines changed

‎bin.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
'use strict';
1313

14-
var program = require('commander');
15-
var parse = require('cli-argparse');
16-
var pollinate = require('./lib/index.js');
14+
const program = require('commander');
15+
const parse = require('cli-argparse');
16+
const pollinate = require('./lib/index.js');
1717

18-
var parsed = parse(process.argv, { camelcase: false });
18+
const parsed = parse(process.argv, { camelcase: false });
1919

2020
program
2121
.version(require('./package.json').version)

‎lib/complete.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
'use strict';
1111

12-
var exec = require('child_process').exec;
13-
var async = require('async');
14-
var mv = require('mv');
12+
const exec = require('child_process').exec;
13+
const async = require('async');
14+
const mv = require('mv');
1515

1616
module.exports = function (state, callback) {
17-
var complete = state.data.complete;
17+
const complete = state.data.complete;
1818

1919
async.series([
2020
// Move all the files to the relative path "{{ name }}"
@@ -30,7 +30,7 @@ module.exports = function (state, callback) {
3030
// Call the shell command specified as `complete`
3131
function (next) {
3232
if (complete !== undefined) {
33-
var commands = (typeof complete === 'string')
33+
const commands = (typeof complete === 'string')
3434
? [complete]
3535
: complete;
3636
async.series(commands.map(onCommand)).then(next, next);

‎lib/discard.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
'use strict';
1111

12-
var rimraf = require('rimraf');
13-
var async = require('async');
14-
var isDirectory = require('is-directory');
12+
const rimraf = require('rimraf');
13+
const async = require('async');
14+
const isDirectory = require('is-directory');
1515

1616
module.exports = function (state, callback) {
17-
var discard = state.data.discard,
17+
const discard = state.data.discard,
1818
tmpPath = state.template.tmp;
1919

2020
// Remove the .git directory unless told otherwise

‎lib/extend.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
'use strict';
1212

13-
var fs = require('fs');
14-
var extend = require('extend');
15-
var ospath = require('ospath');
16-
var async = require('async');
17-
var Hjson = require('hjson');
13+
const fs = require('fs');
14+
const extend = require('extend');
15+
const ospath = require('ospath');
16+
const async = require('async');
17+
const Hjson = require('hjson');
1818

1919
module.exports = function (state, callback) {
20-
var userData = {},
20+
let userData = {},
2121
projectData = {},
2222
optionData = {};
2323

‎lib/fetch.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010

1111
'use strict';
1212

13-
var fs = require('fs');
14-
var mkdirp = require('mkdirp');
15-
var cpr = require('cpr');
16-
var rimraf = require('rimraf');
17-
var ospath = require('ospath');
18-
var request = require('request');
19-
var uuid = require('uuid');
20-
var isDirectory = require('is-directory').sync;
21-
var async = require('async');
22-
var exec = require('child_process').exec;
23-
var Hjson = require('hjson');
24-
25-
var gitClone = function (url, ref, tmpPath, callback) {
13+
const fs = require('fs');
14+
const mkdirp = require('mkdirp');
15+
const cpr = require('cpr');
16+
const rimraf = require('rimraf');
17+
const ospath = require('ospath');
18+
const request = require('request');
19+
const uuid = require('uuid');
20+
const isDirectory = require('is-directory').sync;
21+
const async = require('async');
22+
const exec = require('child_process').exec;
23+
const Hjson = require('hjson');
24+
25+
const gitClone = function (url, ref, tmpPath, callback) {
2626
async.series([
2727
function (next) {
2828
exec('git clone ' + url + ' ' + tmpPath, function (err) {
@@ -57,8 +57,8 @@ var gitClone = function (url, ref, tmpPath, callback) {
5757
});
5858
};
5959

60-
var fetchGitHub = function (state, callback) {
61-
var tmpPath = ospath.tmp() + '/' + uuid.v1(),
60+
const fetchGitHub = function (state, callback) {
61+
const tmpPath = ospath.tmp() + '/' + uuid.v1(),
6262
inputUrl = state.template.input.split('#')[0],
6363
inputRef = state.template.input.split('#')[1],
6464
url = 'https://github.com/' + inputUrl + '.git';
@@ -74,8 +74,8 @@ var fetchGitHub = function (state, callback) {
7474
});
7575
};
7676

77-
var fetchDirectory = function (state, callback) {
78-
var input = state.template.input,
77+
const fetchDirectory = function (state, callback) {
78+
const input = state.template.input,
7979
tmpPath = ospath.tmp() + '/' + uuid.v1();
8080

8181
state.template.tmp = tmpPath;
@@ -106,8 +106,8 @@ var fetchDirectory = function (state, callback) {
106106
});
107107
};
108108

109-
var fetchGit = function (state, callback) {
110-
var tmpPath = ospath.tmp() + '/' + uuid.v1(),
109+
const fetchGit = function (state, callback) {
110+
const tmpPath = ospath.tmp() + '/' + uuid.v1(),
111111
inputUrl = state.template.input.split('#')[0],
112112
inputRef = state.template.input.split('#')[1];
113113

@@ -122,8 +122,8 @@ var fetchGit = function (state, callback) {
122122
});
123123
};
124124

125-
var fetchURL = function (state, callback) {
126-
var tmpPath = ospath.tmp() + '/' + uuid.v1(),
125+
const fetchURL = function (state, callback) {
126+
const tmpPath = ospath.tmp() + '/' + uuid.v1(),
127127
input = state.project.input,
128128
response = request(input);
129129

@@ -146,12 +146,12 @@ var fetchURL = function (state, callback) {
146146
});
147147
};
148148

149-
var fetchJSON = function (state, callback) {
149+
const fetchJSON = function (state, callback) {
150150
callback(null, state);
151151
};
152152

153-
var fetchFile = function (state, callback) {
154-
var tmpPath = ospath.tmp() + '/' + uuid.v1(),
153+
const fetchFile = function (state, callback) {
154+
const tmpPath = ospath.tmp() + '/' + uuid.v1(),
155155
input = state.project.input;
156156

157157
// setup the tmp path
@@ -171,7 +171,7 @@ var fetchFile = function (state, callback) {
171171
});
172172
};
173173

174-
var fetchTemplate = function (state, callback) {
174+
const fetchTemplate = function (state, callback) {
175175
switch (state.template.source) {
176176
case 'github':
177177
fetchGitHub(state, callback);
@@ -185,7 +185,7 @@ var fetchTemplate = function (state, callback) {
185185
}
186186
};
187187

188-
var fetchProject = function (state, callback) {
188+
const fetchProject = function (state, callback) {
189189
switch (state.project.source) {
190190
case 'url':
191191
fetchURL(state, callback);

‎lib/index.js

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

1010
'use strict';
1111

12-
var async = require('async');
12+
const async = require('async');
1313

1414
function runPollinate(input, callback) {
1515
async.waterfall([

‎lib/init.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
'use strict';
1212

13-
var isDirectory = require('is-directory').sync;
14-
var isGitHub = function (input) { return input.match(/^(?!\.)[A-Za-z0-9\-_]+\/[A-Za-z0-9\-_]+$/g); };
15-
var isFile = require('fs').existsSync;
16-
var isURL = require('valid-url').isUri;
17-
var isJSON = function (input) { try { JSON.parse(input); return true; } catch (e) { return false; } };
13+
const isDirectory = require('is-directory').sync;
14+
const isGitHub = function (input) { return input.match(/^(?!\.)[A-Za-z0-9\-_]+\/[A-Za-z0-9\-_]+$/g); };
15+
const isFile = require('fs').existsSync;
16+
const isURL = require('valid-url').isUri;
17+
const isJSON = function (input) { try { JSON.parse(input); return true; } catch (e) { return false; } };
1818

19-
var getTemplateSource = function (input) {
20-
var inputNoRef = input.split('#')[0];
19+
const getTemplateSource = function (input) {
20+
const inputNoRef = input.split('#')[0];
2121
if (isDirectory(input)) {
2222
return 'directory';
2323
}
@@ -27,7 +27,7 @@ var getTemplateSource = function (input) {
2727
return 'git';
2828
};
2929

30-
var getProjectSource = function (input) {
30+
const getProjectSource = function (input) {
3131
if (isFile(input)) {
3232
return 'file';
3333
}

‎lib/merge.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
'use strict';
1111

12-
var async = require('async');
13-
var extend = require('extend');
14-
var fs = require('fs');
12+
const async = require('async');
13+
const extend = require('extend');
14+
const fs = require('fs');
1515

1616
module.exports = function merge(state, callback) {
17-
var mergeFiles = state.data.merge;
17+
const mergeFiles = state.data.merge;
1818

1919
if (mergeFiles === undefined || mergeFiles.length === 0) {
2020
callback(null, state);
@@ -29,7 +29,7 @@ module.exports = function merge(state, callback) {
2929
}, next);
3030
},
3131
function (data, next) {
32-
var merged;
32+
let merged;
3333
try {
3434
merged = extend.apply(null, [true].concat(data.map(JSON.parse)));
3535
} catch (error) {

‎lib/move.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010

1111
'use strict';
1212

13-
var mv = require('mv');
14-
var async = require('async');
15-
var fs = require('fs');
16-
var mkdirp = require('mkdirp');
13+
const mv = require('mv');
14+
const async = require('async');
15+
const fs = require('fs');
16+
const mkdirp = require('mkdirp');
1717

1818
module.exports = function (state, callback) {
19-
var move = state.data.move;
19+
const move = state.data.move;
2020

2121
if (move === undefined || move.length === 0) {
2222
callback(null, state);
2323
return;
2424
}
2525

2626
async.parallel(move.map(function (item) {
27-
var orig = state.template.tmp + '/' + Object.keys(item)[0],
28-
dest = state.template.tmp + '/' + item[Object.keys(item)[0]],
29-
destPathOnly;
27+
const orig = state.template.tmp + '/' + Object.keys(item)[0];
28+
const dest = state.template.tmp + '/' + item[Object.keys(item)[0]];
29+
let destPathOnly;
3030

3131
if (fs.existsSync(orig)) {
3232
destPathOnly = dest.substring(0, dest.lastIndexOf('/'));

‎lib/parse.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
'use strict';
1111

12-
var fs = require('fs');
13-
var path = require('path');
14-
var nunjucks = require('nunjucks');
15-
var globby = require('globby');
16-
var async = require('async');
12+
const fs = require('fs');
13+
const path = require('path');
14+
const nunjucks = require('nunjucks');
15+
const globby = require('globby');
16+
const async = require('async');
1717

1818
module.exports = function (state, callback) {
1919

20-
var parse = state.data.parse,
20+
const parse = state.data.parse,
2121
filters = state.data.filters,
2222
env = nunjucks.configure(state.template.tmp, { autoescape: false });
2323

@@ -34,7 +34,7 @@ module.exports = function (state, callback) {
3434
globby(parse, { cwd: state.template.tmp, nodir: true }).then(function (paths) {
3535
async.parallel(paths.map(function (path) {
3636
return function (next) {
37-
var fullPath = state.template.tmp + '/' + path;
37+
const fullPath = state.template.tmp + '/' + path;
3838
fs.writeFile(fullPath, nunjucks.render(fullPath, state.data), next);
3939
};
4040
}), function (err) {

‎lib/prompt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
'use strict';
1111

12-
var prompt = require('prompt');
12+
const prompt = require('prompt');
1313

1414
module.exports = function (state, callback) {
1515
if (!state.template.data || state.project || Object.keys(state.options).length) {
1616
callback(null, state);
1717
return;
1818
}
1919

20-
var items = Object.keys(state.template.data).filter(function (item) {
20+
const items = Object.keys(state.template.data).filter(function (item) {
2121
return ['parse', 'discard', 'move', 'complete', 'filters', 'merge', 'prompt'].indexOf(item) === -1;
2222
});
2323

‎tests/test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
'use strict';
44

5-
var pollinate = require('../lib/index.js');
6-
var assert = require('chai').assert;
7-
var rimraf = require('rimraf');
8-
var fs = require('fs');
9-
var path = require('path');
5+
const pollinate = require('../lib/index.js');
6+
const assert = require('chai').assert;
7+
const rimraf = require('rimraf');
8+
const fs = require('fs');
9+
const path = require('path');
1010

1111
describe('Test basic example', function () {
1212
afterEach(function (done) {
@@ -185,7 +185,7 @@ describe('Test basic example', function () {
185185
assert.isObject(result);
186186
fs.readFile(path.join('newproject', 'package.json'), 'utf8', function (err, data) {
187187
assert.isNull(err);
188-
var parsed = JSON.parse(data);
188+
let parsed = JSON.parse(data);
189189
assert.equal(parsed.name, 'newproject');
190190
assert.equal(parsed.version, '1.0.0');
191191
assert.isOk(parsed.dependencies);

0 commit comments

Comments
 (0)