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

chore(npm): use require.resolve when possible to avoid hard coded mod… #15071

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/app/e2e/app.scenario.js
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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('npm run gulp -- --gulpfile docs/gulpfile.js');
if (gruntProc.code !== 0) {
throw new Error('doc generation failed');
}
Expand Down
10 changes: 5 additions & 5 deletions lib/grunt/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var fs = require('fs');
var shell = require('shelljs');
var grunt = require('grunt');
var spawn = require('child_process').spawn;
var spawn = require('cross-spawn');

var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP mode. */\n\n';

Expand All @@ -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_modules/.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_modules/.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 = [config];
if (sauceUser) args.push('--sauceUser=' + sauceUser);
if (sauceKey) args.push('--sauceKey=' + sauceKey);
if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
Expand All @@ -65,7 +65,7 @@ module.exports = {
}


var p = spawn('node', args);
var p = spawn('./node_modules/.bin/protractor', args);
p.stdout.pipe(process.stdout);
p.stderr.pipe(process.stderr);
p.on('exit', function(code) {
Expand Down
Loading