Merge pull request #5106 from chillu/pulls/4.0/npm-shrinkwrap

"npm run lock", exclude node_modules from manifest

core/manifest/ManifestFileFinder.php

@@ -22,7 +22,8 @@ class ManifestFileFinder extends SS_FileFinder {
 	protected static $default_options = array(
 		'include_themes' => false,
 		'ignore_tests'   => true,
-		'min_depth'      => 1
+		'min_depth'      => 1,
+		'ignore_dirs'    => array('node_modules')
 	);
 
 	public function acceptDir($basename, $pathname, $depth) {

docs/en/05_Contributing/01_Code.md

@@ -301,6 +301,16 @@ $ npm run sprites
 
 This script generates sprites from the individual image files in `admin/images/sprites/src`.
 
+```
+$ npm run lock
+```
+
+Generates a "shrinkwrap" file containing all npm package versions and writes it to `npm-shrinkwrap.json`.
+Run this command whenever a new package is added to `package.json`, or when updating packages.
+Commit the resulting `npm-shrinkwrap.json`. This uses
+a third party [npm-shrinkwrap](https://github.com/uber/npm-shrinkwrap) library
+since the built-in `npm shrinkwrap` (without a dash) has proven unreliable.
+
 Of course to run these scripts, you'll need to get the dependencies, so run a `npm install` from the root directory to get started.
 
 ### Gulp

package.json

@@ -14,7 +14,8 @@
     "sanity": "gulp sanity",
     "thirdparty": "gulp thirdparty",
     "css": "gulp css",
-    "sprites": "gulp sprites"
+    "sprites": "gulp sprites",
+    "lock": "npm-shrinkwrap --dev"
   },
   "repository": {
     "type": "git",
@@ -44,9 +45,9 @@
     "gulp-diff": "^1.0.0",
     "gulp-if": "^2.0.0",
     "gulp-notify": "^2.2.0",
+    "gulp-postcss": "^6.0.1",
     "gulp-sass": "^2.1.1",
     "gulp-sourcemaps": "^1.6.0",
-    "gulp-postcss": "^6.0.1",
     "gulp-uglify": "^1.5.1",
     "gulp-util": "^3.0.7",
     "semver": "^5.1.0",
@@ -63,6 +64,7 @@
     "bootstrap": "^4.0.0-alpha.2",
     "isomorphic-fetch": "^2.2.1",
     "jquery-sizes": "^0.33.0",
+    "npm-shrinkwrap": "^5.4.1",
     "react": "^0.14.6",
     "react-addons-test-utils": "^0.14.6",
     "react-dom": "^0.14.6",