Merge pull request #555 from erikrose/js-lockdown

Correct some infra around JS plugin

.gitignore

@@ -14,8 +14,15 @@ dxr-temp-*
 /build
 /dist
 /*.egg-info
-/tooling/node/node_modules/.bin/nunjucks-precompile
-/tooling/node/node_modules/nunjucks
+/tooling/node/node_modules/*
+!tooling/node/node_modules/.bin/lockdown
+!tooling/node/node_modules/.bin/lockdown-relock
+!tooling/node/node_modules/lockdown
+/dxr/plugins/js/.npm_installed
+/dxr/plugins/js/analyze_js/node_modules/*
+!/dxr/plugins/js/analyze_js/node_modules/.bin/lockdown
+!/dxr/plugins/js/analyze_js/node_modules/.bin/lockdown-relock
+!/dxr/plugins/js/analyze_js/node_modules/lockdown
 /docs/build
 .dxr_installed
 .npm_installed

dxr/plugins/js/analyze_js/package.json

@@ -3,7 +3,7 @@
   "description": "esprima-based javascript plugin for DXR",
   "author": "Mozilla",
   "version": "1.0.0",
-  "engine": "node >= 6.0.0",
+  "engines": { "node": ">= 6.0.0" },
   "license": "MIT",
   "scripts": { "preinstall": "lockdown" },
   "dependencies": {

dxr/plugins/js/makefile

@@ -1,10 +1,20 @@
-build:
-	cd analyze_js; npm install
+build: .npm_installed
+	cd analyze_js && npm install
 
+# Remove anything within node_modules that's not checked into git. Skip things
+# with spaces in them, lest xargs screw up and delete the wrong thing.
 clean:
-	rm -rf analyze_js/node_modules
+	rm -f .npm_installed
+	cd analyze_js/node_modules && git ls-files -o --directory -x '* *' -x '.DS_Store' | xargs rm -rf
 
 lint: build
-	cd analyze_js; node_modules/.bin/eslint .
+	cd analyze_js && node_modules/.bin/eslint .
+
+# .npm_installed is an empty file we touch whenever we run npm install. This
+# target redoes the install if the packages or lockdown files are newer than
+# that file:
+.npm_installed: analyze_js/package.json analyze_js/lockdown.json
+	cd analyze_js && npm install
+	touch $@
 
 .PHONY: build clean lint

makefile

@@ -10,12 +10,13 @@ test: all
 	$(VIRTUAL_ENV)/bin/nosetests -v --nologcapture
 
 clean: static_clean
-	rm -rf tooling/node/node_modules/.bin/nunjucks-precompile \
-	       tooling/node/node_modules/nunjucks \
-	       .npm_installed \
+	rm -rf .npm_installed \
 	       .peep_installed \
 	       venv \
 	       .dxr_installed
+	@# Remove anything within node_modules that's not checked into git. Skip things
+	@# with spaces in them, lest xargs screw up and delete the wrong thing.
+	cd tooling/node/node_modules && git ls-files -o --directory -x '* *' -x '.DS_Store' | xargs rm -rf
 	find . -name "*.pyc" -exec rm -f {} \;
 	$(MAKE) -C dxr/plugins/clang clean
 	$(MAKE) -C dxr/plugins/js clean

tooling/node/package.json

@@ -6,7 +6,9 @@
   "devDependencies": {
     "nunjucks": "2.0.0"
   },
-  "engine": "node >= 0.8.x",
+  "engines": {
+    "node": ">= 0.8.0"
+  },
   "dependencies": {
     "lockdown": "0.0.6"
   },