Revert "Upgrade Node to 0.10.30. Fix npm bug again."

glasser · glasser · commit 98b2885e8531 · 2014-08-15T07:21:24.000-07:00
This reverts commit 56ff54b.
diff --git a/History.md b/History.md
@@ -10,7 +10,6 @@
   failure on the server. (This matches the behavior described in our docs)
 
 * Upgraded dependencies:
-  - Node: 0.10.30 (from 0.10.29)
   - less: 1.7.4 (from 1.7.1)
 
 ## v0.8.3
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
@@ -739,7 +739,7 @@ <h3 class="nosection">Running on your own infrastructure</h3>
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.30; older versions contain a serious bug that can cause production servers
+0.10.29; older versions contain a serious bug that can cause production servers
 to stall.) You can then run the application by invoking node, specifying the
 HTTP port for the application to listen on, and the MongoDB endpoint.  If
 you don't already have a MongoDB server, we can recommend our friends at
diff --git a/meteor b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.47 # warning! 0.3.46 used on cordova-hcp branch
+BUNDLE_VERSION=0.3.44 # warning! 0.3.46 used on cordova-hcp branch
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
@@ -71,13 +71,12 @@ umask 022
 mkdir build
 cd build
 
-# For now, use our fork with https://github.com/npm/npm/pull/5821/files
-git clone https://github.com/meteor/node.git
+git clone https://github.com/joyent/node.git
 cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/main.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.30-with-npm-5821
+git checkout v0.10.29
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
@@ -1546,7 +1546,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
 
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one external dependency:\n" +
-"Node.js 0.10.30 or newer. To run the application:\n" +
+"Node.js 0.10.29 or newer. To run the application:\n" +
 "\n" +
 "  $ (cd programs/server && npm install)\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/main.js b/tools/main.js
@@ -411,7 +411,7 @@ Fiber(function () {
 
   // Check required Node version.
   // This code is duplicated in tools/server/boot.js.
-  var MIN_NODE_VERSION = 'v0.10.30';
+  var MIN_NODE_VERSION = 'v0.10.29';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/main.js.
-var MIN_NODE_VERSION = 'v0.10.30';
+var MIN_NODE_VERSION = 'v0.10.29';
 
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
