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

refactor npm install (again) #11353

Closed
wants to merge 2 commits into from
Closed

refactor npm install (again) #11353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
974bc7a
chore(grunt): refactor npm install
Narretz Mar 13, 2015
ba315bc
chore(npm-shrinkwrap): update dependencies
petebacondarwin Mar 15, 2015
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
6 changes: 1 addition & 5 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,6 @@ module.exports = function(grunt) {
},

shell: {
"npm-install": {
command: path.normalize('scripts/npm/install-dependencies.sh')
},

"promises-aplus-tests": {
options: {
stdout: false,
Expand Down Expand Up @@ -324,7 +320,7 @@ module.exports = function(grunt) {

// global beforeEach task
if (!process.env.TRAVIS) {
grunt.task.run('shell:npm-install');
grunt.task.run('npm-install');
}

//alias tasks
Expand Down
4 changes: 4 additions & 0 deletions lib/grunt/plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,8 @@ module.exports = function(grunt) {
.on('error', grunt.fail.warn.bind(grunt.fail))
.on('end', done);
});

grunt.registerTask('npm-install', 'Install dependencies if needed', function () {
util.npmInstall();
});
};
39 changes: 39 additions & 0 deletions lib/grunt/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,39 @@ var shell = require('shelljs');
var grunt = require('grunt');
var spawn = require('child_process').spawn;
var semver = require('semver');
var rimraf = require('rimraf');

var _ = require('lodash');

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

var SHRINKWRAP_FILE = 'npm-shrinkwrap.json';
var SHRINKWRAP_CACHED_FILE = 'node_modules/npm-shrinkwrap.cached.json';

function shrinkwrapChanged() {
return shell.exec('diff ' + SHRINKWRAP_FILE + ' ' + SHRINKWRAP_CACHED_FILE, {silent: true}).output;
}

function cleanNodeModules() {
if (process.platform == "win32") {
rimraf.sync('node_modules');
console.log('cleaned node_modules using rimraf');
} else {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this else? rimraf is cross-platform.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think rm -rf might still be more robust, so we should use it if possible. @IgorMinar should probably have a word here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IgorMinar wanted to use rm -rf where possible for performance reasons

var clean = shell.exec('rm -rf node_modules');
if (clean.code !== 0) {
throw new Error('could not clean node_modules');
}
console.log('cleaned node_modules using rm -rf');
}
}

function npmInstall() {
var install = shell.exec('npm install');
if (install.code !== 0) {
throw new Error('npm install failed');
}
shell.cp(SHRINKWRAP_FILE, SHRINKWRAP_CACHED_FILE);
}

module.exports = {

Expand Down Expand Up @@ -290,5 +318,16 @@ module.exports = {
}
next();
};
},


npmInstall: function() {
if (!shrinkwrapChanged()) {
console.log('No shrinkwrap changes detected. npm install will be skipped...');
} else {
console.log('Blowing away node_modules and reinstalling npm dependencies...');
cleanNodeModules();
npmInstall();
}
}
};
Loading