tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
"npm run lock", exclude node_modules from manifest
This commit is contained in:
Daniel Hensby 2016-03-02 11:14:12 +00:00
commit 827d989836
4 changed files with 10047 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/manifest/ManifestFileFinder.php
View File

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

10
docs/en/05_Contributing/01_Code.md
View File

@ -301,6 +301,16 @@ $ npm run sprites
This script generates sprites from the individual image files in `admin/images/sprites/src`. 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. 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 ### Gulp

10179
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

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