Revert "Back to installing npm modules individually."
It causes the npm-shrinkwrap.json to be ignored. This reverts commit 4dbff13ebf253eda36b2de6f8f17b49c868a471c.
This commit is contained in:
parent
4dbff13ebf
commit
90a89c4220
9
Makefile
9
Makefile
@ -81,7 +81,8 @@ imports := \
|
||||
.tests_enabled
|
||||
|
||||
imports_font_awesome := \
|
||||
node_modules/font-awesome/package.json
|
||||
node_modules/font-awesome/css/font-awesome.css \
|
||||
node_modules/font-awesome/fonts/fontawesome-webfont.woff
|
||||
imports_style := \
|
||||
$(wildcard src/Linkification/icons/*.png)
|
||||
|
||||
@ -104,11 +105,11 @@ all : jshint bds install
|
||||
.events tmp testbuilds builds :
|
||||
$(MKDIR)
|
||||
|
||||
.events/npm.% : npm-shrinkwrap.json | .events
|
||||
npm install $*
|
||||
.events/npm : npm-shrinkwrap.json | .events
|
||||
npm install
|
||||
echo -> $@
|
||||
|
||||
node_modules/%/package.json : .events/npm.%
|
||||
node_modules/% : .events/npm
|
||||
|
||||
|
||||
.tests_enabled :
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user