Skip to content

Commit ef0ea26

Browse files
liadyliady
committed
change vars to consts
1 parent c012372 commit ef0ea26

File tree

6 files changed

+69
-74
lines changed

6 files changed

+69
-74
lines changed

‎index.js

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
var utils = require('./utils');
1+
const utils = require('./utils');
22

3-
var scopedModuleRegex = new RegExp(
3+
const scopedModuleRegex = new RegExp(
44
'@[a-zA-Z0-9][\\w-.]+/[a-zA-Z0-9][\\w-.]+([a-zA-Z0-9./]+)?',
55
'g'
66
);
77

88
function getModuleName(request, includeAbsolutePaths) {
9-
var req = request;
10-
var delimiter = '/';
9+
let req = request;
10+
const delimiter = '/';
1111

1212
if (includeAbsolutePaths) {
1313
req = req.replace(/^.*?\/node_modules\//, '');
@@ -23,32 +23,28 @@ function getModuleName(request, includeAbsolutePaths) {
2323

2424
module.exports = function nodeExternals(options) {
2525
options = options || {};
26-
var mistakes = utils.validateOptions(options) || [];
26+
const mistakes = utils.validateOptions(options) || [];
2727
if (mistakes.length) {
28-
mistakes.forEach(function (mistake) {
29-
utils.error(
30-
mistakes.map(function (mistake) {
31-
return mistake.message;
32-
})
33-
);
28+
mistakes.forEach((mistake) => {
29+
utils.error(mistakes.map((mistake) => mistake.message));
3430
utils.log(mistake.message);
3531
});
3632
}
37-
var allowlist = [].concat(options.allowlist || []);
38-
var binaryDirs = [].concat(options.binaryDirs || ['.bin']);
39-
var importType = options.importType || 'commonjs';
40-
var modulesDir = options.modulesDir || 'node_modules';
41-
var modulesFromFile = !!options.modulesFromFile;
42-
var includeAbsolutePaths = !!options.includeAbsolutePaths;
43-
var additionalModuleDirs = options.additionalModuleDirs || [];
33+
const allowlist = [].concat(options.allowlist || []);
34+
const binaryDirs = [].concat(options.binaryDirs || ['.bin']);
35+
const importType = options.importType || 'commonjs';
36+
const modulesDir = options.modulesDir || 'node_modules';
37+
const modulesFromFile = !!options.modulesFromFile;
38+
const includeAbsolutePaths = !!options.includeAbsolutePaths;
39+
const additionalModuleDirs = options.additionalModuleDirs || [];
4440

4541
// helper function
4642
function isNotBinary(x) {
4743
return !utils.contains(binaryDirs, x);
4844
}
4945

5046
// create the node modules list
51-
var nodeModules = modulesFromFile
47+
let nodeModules = modulesFromFile
5248
? utils.readFromPackageJson(options.modulesFromFile)
5349
: utils.readDir(modulesDir).filter(isNotBinary);
5450
additionalModuleDirs.forEach(function (additionalDirectory) {
@@ -69,7 +65,7 @@ module.exports = function nodeExternals(options) {
6965
request = arg1.request;
7066
callback = arg2;
7167
}
72-
var moduleName = getModuleName(request, includeAbsolutePaths);
68+
const moduleName = getModuleName(request, includeAbsolutePaths);
7369
if (
7470
utils.contains(nodeModules, moduleName) &&
7571
!utils.containsPattern(allowlist, request)

‎test/library.spec.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
var nodeExternals = require('../index.js');
2-
var utils = require('../utils.js');
3-
var testUtils = require('./test-utils.js');
4-
var mockNodeModules = testUtils.mockNodeModules;
5-
var restoreMock = testUtils.restoreMock;
6-
var context={};
7-
var assertResult = testUtils.buildAssertion.bind(null, context);
8-
var assertResultWebpack5 = testUtils.buildAssertionWebpack5.bind(null, context);
9-
var chai = require('chai');
10-
var expect = chai.expect;
1+
const nodeExternals = require('../index.js');
2+
const utils = require('../utils.js');
3+
const testUtils = require('./test-utils.js');
4+
const mockNodeModules = testUtils.mockNodeModules;
5+
const restoreMock = testUtils.restoreMock;
6+
const context={};
7+
const assertResult = testUtils.buildAssertion.bind(null, context);
8+
const assertResultWebpack5 = testUtils.buildAssertionWebpack5.bind(null, context);
9+
const chai = require('chai');
10+
const expect = chai.expect;
1111

1212
// Test basic functionality
1313
describe('invocation with no settings', function() {
@@ -232,8 +232,8 @@ describe('when modules dir does not exist', function() {
232232
mockNodeModules();
233233
})
234234
it('should not log ENOENT error', function() {
235-
var log = global.console.log;
236-
var errorLogged = false;
235+
const log = global.console.log;
236+
let errorLogged = false;
237237

238238
// wrap console.log to catch error message
239239
global.console.log = function(error) {
@@ -299,24 +299,24 @@ describe('invocation with no settings - webpack 5', function() {
299299

300300
describe('validate options', function () {
301301
it('should identify misspelled terms', function () {
302-
var results = utils.validateOptions({ whitelist: [], moduledirs: [] });
302+
const results = utils.validateOptions({ whitelist: [], moduledirs: [] });
303303
expect(results.length).to.be.equal(2);
304304
expect(results[0].correctTerm).to.be.equal('allowlist');
305305
expect(results[1].correctTerm).to.be.equal('modulesDir');
306306
});
307307
it('should ignore duplications', function () {
308-
var results = utils.validateOptions({ whitelist: [], moduledirs: [], allowlist: [] });
308+
const results = utils.validateOptions({ whitelist: [], moduledirs: [], allowlist: [] });
309309
expect(results.length).to.be.equal(1);
310310
expect(results[0].correctTerm).to.be.equal('modulesDir');
311311
});
312312
it('should identify wrong casing', function () {
313-
var results = utils.validateOptions({ allowList: [], modulesdir: [] });
313+
const results = utils.validateOptions({ allowList: [], modulesdir: [] });
314314
expect(results.length).to.be.equal(2);
315315
expect(results[0].correctTerm).to.be.equal('allowlist');
316316
expect(results[1].correctTerm).to.be.equal('modulesDir');
317317
});
318318
it('should no identify undefineds', function () {
319-
var results = utils.validateOptions({ allowlist: undefined, modulesdir: [] });
319+
const results = utils.validateOptions({ allowlist: undefined, modulesdir: [] });
320320
expect(results.length).to.be.equal(1);
321321
expect(results[0].correctTerm).to.be.equal('modulesDir');
322322
});

‎test/test-utils.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
var mockDir = require('mock-fs');
2-
var nodeExternals = require('../index.js');
3-
var webpack = require('webpack');
4-
var fs = require('fs');
5-
var ncp = require('ncp').ncp;
6-
var path = require('path');
7-
var relative = path.join.bind(path, __dirname);
8-
var chai = require('chai');
9-
var expect = chai.expect;
1+
const mockDir = require('mock-fs');
2+
const nodeExternals = require('../index.js');
3+
const webpack = require('webpack');
4+
const fs = require('fs');
5+
const ncp = require('ncp').ncp;
6+
const path = require('path');
7+
const relative = path.join.bind(path, __dirname);
8+
const chai = require('chai');
9+
const expect = chai.expect;
1010

1111
/**
1212
* Creates an assertion function that makes sure to output expectedResult when given moduleName
@@ -124,9 +124,9 @@ exports.webpackAssertion = function webpackAssertion(nodeExternalsConfig, extern
124124
* @return {Promise}
125125
*/
126126
function generateWithWebpack(nodeExternalsConfig) {
127-
var testDir = relative('test-webpack');
128-
var outputFileName = 'bundle.js';
129-
var outputFile = path.join(testDir, outputFileName);
127+
const testDir = relative('test-webpack');
128+
const outputFileName = 'bundle.js';
129+
const outputFile = path.join(testDir, outputFileName);
130130
return new Promise(function(resolve, reject) {
131131
webpack({
132132
entry: path.join(testDir, 'index.js'),
@@ -140,11 +140,11 @@ function generateWithWebpack(nodeExternalsConfig) {
140140
'module-c' : path.join(testDir, './modules/module-c')
141141
}
142142
}
143-
}, function(err, stats){
143+
}, function(err){
144144
if(err) {
145145
reject(err);
146146
} else {
147-
var contents = fs.readFileSync(outputFile, 'utf-8');
147+
const contents = fs.readFileSync(outputFile, 'utf-8');
148148
fs.unlinkSync(outputFile);
149149
resolve(contents);
150150
}
@@ -173,7 +173,7 @@ function external(moduleName) {
173173

174174
function removeDir(dirName) {
175175
if(fs.existsSync(dirName) ) {
176-
fs.readdirSync(dirName).forEach(function(file, index){
176+
fs.readdirSync(dirName).forEach(function(file){
177177
fs.unlinkSync(path.join(dirName, file));
178178
});
179179
fs.rmdirSync(dirName);

‎test/test-webpack/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
var x = require('module-a');
2-
var y = require('module-b');
3-
var z = require('module-c');
1+
const x = require('module-a');
2+
const y = require('module-b');
3+
const z = require('module-c');
44

55
module.exports = {
66
x: x,
77
y: y,
8-
z: z
9-
}
8+
z: z,
9+
};

‎test/webpack.spec.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
var nodeExternals = require('../index.js');
2-
var testUtils = require('./test-utils.js');
3-
var webpackAssertion = testUtils.webpackAssertion
1+
const testUtils = require('./test-utils.js');
2+
const webpackAssertion = testUtils.webpackAssertion
43

54
// Test actual webpack output
65
describe('actual webpack bundling', function() {

‎utils.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var fs = require('fs');
2-
var path = require('path');
1+
const fs = require('fs');
2+
const path = require('path');
33

44
exports.contains = function contains(arr, val) {
55
return arr && arr.indexOf(val) !== -1;
66
};
77

8-
var atPrefix = new RegExp('^@', 'g');
8+
const atPrefix = new RegExp('^@', 'g');
99
exports.readDir = function readDir(dirName) {
1010
if (!fs.existsSync(dirName)) {
1111
return [];
@@ -42,14 +42,14 @@ exports.readFromPackageJson = function readFromPackageJson(options) {
4242
if (typeof options !== 'object') {
4343
options = {};
4444
}
45-
var includeInBundle = options.exclude || options.includeInBundle;
46-
var excludeFromBundle = options.include || options.excludeFromBundle;
45+
const includeInBundle = options.exclude || options.includeInBundle;
46+
const excludeFromBundle = options.include || options.excludeFromBundle;
4747

4848
// read the file
49-
var packageJson;
49+
let packageJson;
5050
try {
51-
var fileName = options.fileName || 'package.json';
52-
var packageJsonString = fs.readFileSync(
51+
const fileName = options.fileName || 'package.json';
52+
const packageJsonString = fs.readFileSync(
5353
path.resolve(process.cwd(), fileName),
5454
'utf8'
5555
);
@@ -58,7 +58,7 @@ exports.readFromPackageJson = function readFromPackageJson(options) {
5858
return [];
5959
}
6060
// sections to search in package.json
61-
var sections = [
61+
let sections = [
6262
'dependencies',
6363
'devDependencies',
6464
'peerDependencies',
@@ -73,7 +73,7 @@ exports.readFromPackageJson = function readFromPackageJson(options) {
7373
});
7474
}
7575
// collect dependencies
76-
var deps = {};
76+
const deps = {};
7777
sections.forEach(function (section) {
7878
Object.keys(packageJson[section] || {}).forEach(function (dep) {
7979
deps[dep] = true;
@@ -99,25 +99,25 @@ exports.containsPattern = function containsPattern(arr, val) {
9999

100100
exports.validateOptions = function (options) {
101101
options = options || {};
102-
var results = [];
103-
var mistakes = {
102+
const results = [];
103+
const mistakes = {
104104
allowlist: ['allowslist', 'whitelist', 'allow'],
105105
importType: ['import', 'importype', 'importtype'],
106106
modulesDir: ['moduledir', 'moduledirs'],
107107
modulesFromFile: ['modulesfile'],
108108
includeAbsolutePaths: ['includeAbsolutesPaths'],
109109
additionalModuleDirs: ['additionalModulesDirs', 'additionalModulesDir'],
110110
};
111-
var optionsKeys = Object.keys(options);
112-
var optionsKeysLower = optionsKeys.map(function (optionName) {
111+
const optionsKeys = Object.keys(options);
112+
const optionsKeysLower = optionsKeys.map(function (optionName) {
113113
return optionName && optionName.toLowerCase();
114114
});
115115
Object.keys(mistakes).forEach(function (correctTerm) {
116116
if (!options.hasOwnProperty(correctTerm)) {
117117
mistakes[correctTerm]
118118
.concat(correctTerm.toLowerCase())
119119
.forEach(function (mistake) {
120-
var ind = optionsKeysLower.indexOf(mistake.toLowerCase());
120+
const ind = optionsKeysLower.indexOf(mistake.toLowerCase());
121121
if (ind > -1) {
122122
results.push({
123123
message: `Option '${optionsKeys[ind]}' is not supported. Did you mean '${correctTerm}'?`,

0 commit comments

Comments
 (0)