Merge branch 'devel' of github.com:meteor/meteor into devel

scripts/admin/jsdoc/.gitignore

@@ -0,0 +1 @@
+node_modules

scripts/admin/jsdoc/jsdoc.sh

@@ -2,18 +2,21 @@
 
 ORIGDIR=$(pwd)
 cd $(dirname $0)
+SCRIPTDIR=$(pwd)
 cd ../../..
 TOPDIR=$(pwd)
 
 INFINITY=10000
 
-cd $ORIGDIR
+cd "$SCRIPTDIR"
+${TOPDIR}/dev_bundle/bin/npm install
 
+cd "$ORIGDIR"
 # Call git grep to find all js files with the appropriate comment tags,
 # and only then pass it to JSDoc which will parse the JS files.
 # This is a whole lot faster than calling JSDoc recursively.
 git grep -al "@summary" | xargs -L ${INFINITY} -t \
-    ${TOPDIR}/dev_bundle/bin/node \
-    ${TOPDIR}/dev_bundle/lib/node_modules/.bin/jsdoc \
+    "${TOPDIR}/dev_bundle/bin/node" \
+    "${SCRIPTDIR}/node_modules/.bin/jsdoc" \
     -t "${TOPDIR}/scripts/admin/jsdoc/docdata-jsdoc-template" \
     -c "${TOPDIR}/scripts/admin/jsdoc/jsdoc-conf.json"

scripts/admin/jsdoc/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "meteor-jsdoc",
+  "version": "0.0.0",
+  "description": "no warn",
+  "readme": "no warn",
+  "repository": "no warn",
+  "dependencies": {
+    "jsdoc": "3.3.0-alpha9"
+  }
+}

scripts/generate-dev-bundle.sh

@@ -194,13 +194,6 @@ rm -rf node_modules/esprima/test
 # https://github.com/williamwicks/node-eachline/pull/4
 npm install https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da
 
-# Install jsdoc
-# XXX Do we actually need this in the dev bundle? Can't we just make jsdoc.sh
-#     run 'npm install'?
-npm install jsdoc@3.3.0-alpha9
-rm -rf node_modules/jsdoc/node_modules/catharsis/node_modules/underscore-contrib
-rm -rf node_modules/jsdoc/node_modules/esprima/test
-
 # Cordova npm tool for mobile integration
 # XXX We install our own fork of cordova because we need a particular patch that
 # didn't land to cordova-android yet. As soon as it lands, we can switch back to