mozilla-b2g · lightsofapollo · Oct 30, 2014 · Nov 5, 2014 · Nov 8, 2014 · Nov 8, 2014
diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,6 @@ manifest.appcache
 /outoftree_apps/
 
 /distribution/
-/node_modules/
 /.modules.tar
 ENV/
 modules.tar

diff --git a/Makefile b/Makefile
@@ -707,23 +707,7 @@ git-gaia-node-modules: gaia_node_modules.revision
 	(cd "$(NODE_MODULES_SRC)" && git fetch && git reset --hard "$(NODE_MODULES_REV)" )
 
 node_modules: gaia_node_modules.revision
-	# Running make without using a dependency ensures that we can run
-	# "make node_modules" with a custom NODE_MODULES_GIT_URL variable, and then
-	# run another target without specifying the variable
-	$(MAKE) $(NODE_MODULES_SRC)
-ifeq "$(NODE_MODULES_SRC)" "modules.tar"
-	$(TAR_WILDCARDS) --strip-components 1 -x -m -f $(NODE_MODULES_SRC) "mozilla-b2g-gaia-node-modules-*/node_modules"
-else
-	rm -fr node_modules
-	cp -R $(NODE_MODULES_SRC)/node_modules node_modules
-endif
-	npm install && npm rebuild
-	@echo "node_modules installed."
-	touch -c $@
-ifeq ($(BUILDAPP),device)
-	export LANG=en_US.UTF-8; \
-	npm install marionette-socket-host
-endif
+	npm rebuild
 
 ###############################################################################
 # Tests                                                                       #

diff --git a/README.md b/README.md
@@ -231,3 +231,5 @@ You could generate single app doc with this:
 ```sh
 $ grunt jsdoc:system
 ```
+
+
diff --git a/node_modules/.bin/_mocha b/node_modules/.bin/_mocha
diff --git a/node_modules/.bin/ecstatic b/node_modules/.bin/ecstatic
diff --git a/node_modules/.bin/grunt-jsdoc b/node_modules/.bin/grunt-jsdoc
diff --git a/node_modules/.bin/istanbul b/node_modules/.bin/istanbul
diff --git a/node_modules/.bin/js-test-agent b/node_modules/.bin/js-test-agent
diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml
diff --git a/node_modules/.bin/jshint b/node_modules/.bin/jshint
diff --git a/node_modules/.bin/marionette-mocha b/node_modules/.bin/marionette-mocha
diff --git a/node_modules/.bin/mocha b/node_modules/.bin/mocha
diff --git a/node_modules/.bin/mocha-parallel b/node_modules/.bin/mocha-parallel
diff --git a/node_modules/.bin/mozilla-download b/node_modules/.bin/mozilla-download
diff --git a/node_modules/.bin/report-latency b/node_modules/.bin/report-latency
diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf
diff --git a/node_modules/.bin/static b/node_modules/.bin/static
diff --git a/node_modules/.bin/travisaction b/node_modules/.bin/travisaction
diff --git a/node_modules/adm-zip/MIT-LICENSE.txt b/node_modules/adm-zip/MIT-LICENSE.txt
diff --git a/node_modules/adm-zip/README.md b/node_modules/adm-zip/README.md