Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
chore(npm): use require.resolve when possible to avoid hard coded mod…
Browse files Browse the repository at this point in the history
…ule paths
  • Loading branch information
jdalton authored and Narretz committed Sep 5, 2016
1 parent 87a2ff7 commit 6100f10
Show file tree
Hide file tree
Showing 8 changed files with 808 additions and 1,690 deletions.
2 changes: 1 addition & 1 deletion docs/app/e2e/app.scenario.js
@@ -1,6 +1,6 @@
'use strict';

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

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

Expand Down
4 changes: 2 additions & 2 deletions karma-shared.conf.js
Expand Up @@ -170,8 +170,8 @@ module.exports = function(config, specificOptions) {
'/someSanitizedUrl',
'/{{testUrl}}'
];
var log4js = require('./node_modules/karma/node_modules/log4js');
var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
var log4js = require('log4js');
var layouts = require('log4js/lib/layouts');
var originalConfigure = log4js.configure;
log4js.configure = function(log4jsConfig) {
var consoleAppender = log4jsConfig.appenders.shift();
Expand Down
2 changes: 1 addition & 1 deletion lib/grunt/plugins.js
Expand Up @@ -39,7 +39,7 @@ module.exports = function(grunt) {


grunt.registerTask('docs', 'create angular docs', function() {
var gruntProc = shelljs.exec('"node_modules/.bin/gulp" --gulpfile docs/gulpfile.js');
var gruntProc = shelljs.exec('node "' + require.resolve('gulp/bin/gulp') + '" --gulpfile docs/gulpfile.js');
if (gruntProc.code !== 0) {
throw new Error('doc generation failed');
}
Expand Down
6 changes: 3 additions & 3 deletions lib/grunt/utils.js
Expand Up @@ -15,7 +15,7 @@ module.exports = {
var reporters = grunt.option('reporters');
var noColor = grunt.option('no-colors');
var port = grunt.option('port');
var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
var p = spawn('node', [require.resolve('karma/bin/karma'), 'start', config,
singleRun ? '--single-run=true' : '',
reporters ? '--reporters=' + reporters : '',
browsers ? '--browsers=' + browsers : '',
Expand All @@ -38,7 +38,7 @@ module.exports = {
done();
return;
}
var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
var p = spawn('node', [require.resolve('protractor/bin/webdriver-manager'), 'update']);
p.stdout.pipe(process.stdout);
p.stderr.pipe(process.stderr);
p.on('exit', function(code) {
Expand All @@ -54,7 +54,7 @@ module.exports = {
var sauceBuild = grunt.option('capabilities.build');
var browser = grunt.option('browser');
var specs = grunt.option('specs');
var args = ['node_modules/protractor/bin/protractor', config];
var args = [require.resolve('protractor/bin/protractor'), config];
if (sauceUser) args.push('--sauceUser=' + sauceUser);
if (sauceKey) args.push('--sauceKey=' + sauceKey);
if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
Expand Down

0 comments on commit 6100f10

Please sign in to comment.