Skip to content

Commit 6100f10

Browse files
jdaltonNarretz
jdalton
authored and
Narretz
committed
chore(npm): use require.resolve when possible to avoid hard coded module paths
1 parent 87a2ff7 commit 6100f10

8 files changed

Lines changed: 808 additions & 1690 deletions

File tree

‎docs/app/e2e/app.scenario.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var webdriver = require('protractor/node_modules/selenium-webdriver');
3+
var webdriver = require('selenium-webdriver');
44

55
describe('docs.angularjs.org', function() {
66

‎karma-shared.conf.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ module.exports = function(config, specificOptions) {
170170
'/someSanitizedUrl',
171171
'/{{testUrl}}'
172172
];
173-
var log4js = require('./node_modules/karma/node_modules/log4js');
174-
var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
173+
var log4js = require('log4js');
174+
var layouts = require('log4js/lib/layouts');
175175
var originalConfigure = log4js.configure;
176176
log4js.configure = function(log4jsConfig) {
177177
var consoleAppender = log4jsConfig.appenders.shift();

‎lib/grunt/plugins.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = function(grunt) {
3939

4040

4141
grunt.registerTask('docs', 'create angular docs', function() {
42-
var gruntProc = shelljs.exec('"node_modules/.bin/gulp" --gulpfile docs/gulpfile.js');
42+
var gruntProc = shelljs.exec('node "' + require.resolve('gulp/bin/gulp') + '" --gulpfile docs/gulpfile.js');
4343
if (gruntProc.code !== 0) {
4444
throw new Error('doc generation failed');
4545
}

‎lib/grunt/utils.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
var reporters = grunt.option('reporters');
1616
var noColor = grunt.option('no-colors');
1717
var port = grunt.option('port');
18-
var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
18+
var p = spawn('node', [require.resolve('karma/bin/karma'), 'start', config,
1919
singleRun ? '--single-run=true' : '',
2020
reporters ? '--reporters=' + reporters : '',
2121
browsers ? '--browsers=' + browsers : '',
@@ -38,7 +38,7 @@ module.exports = {
3838
done();
3939
return;
4040
}
41-
var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
41+
var p = spawn('node', [require.resolve('protractor/bin/webdriver-manager'), 'update']);
4242
p.stdout.pipe(process.stdout);
4343
p.stderr.pipe(process.stderr);
4444
p.on('exit', function(code) {
@@ -54,7 +54,7 @@ module.exports = {
5454
var sauceBuild = grunt.option('capabilities.build');
5555
var browser = grunt.option('browser');
5656
var specs = grunt.option('specs');
57-
var args = ['node_modules/protractor/bin/protractor', config];
57+
var args = [require.resolve('protractor/bin/protractor'), config];
5858
if (sauceUser) args.push('--sauceUser=' + sauceUser);
5959
if (sauceKey) args.push('--sauceKey=' + sauceKey);
6060
if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);

0 commit comments

Comments
 (0)