From c2a4134d975f6ffaccb3d7615204faef8e265de5 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 30 Oct 2014 11:32:11 -0700 Subject: [PATCH] Update Node to 0.10.33 from 0.10.29 Our npm patch is not yet in a Node 0.10 release (it's in npm 2.1.0). --- History.md | 3 +++ docs/client/full-api/concepts.html | 3 +-- meteor | 2 +- scripts/generate-dev-bundle.sh | 4 ++-- tools/bundler.js | 2 +- tools/main.js | 2 +- tools/server/boot.js | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/History.md b/History.md index d0ffca04e5..8ca991ed04 100644 --- a/History.md +++ b/History.md @@ -3,6 +3,9 @@ * Spacebars: Allow curly braces to be escaped, with special sequences `{{|` and `{{{|` to insert a literal `{{` or `{{{`. +* Upgraded dependencies: + - node: 0.10.33 (from 0.10.29) + ## v1.0 diff --git a/docs/client/full-api/concepts.html b/docs/client/full-api/concepts.html index 9fdaedfbfe..cb781a4bb6 100644 --- a/docs/client/full-api/concepts.html +++ b/docs/client/full-api/concepts.html @@ -878,8 +878,7 @@ To get started, run 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.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 +0.10.33.) You can then run the application by invoking node, specifying the HTTP port for the application to listen on, and the MongoDB endpoint. ```bash diff --git a/meteor b/meteor index 5e237bf746..0308a63402 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/bin/bash -BUNDLE_VERSION=0.3.61 +BUNDLE_VERSION=0.3.62 # 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 index d2b21d231b..40a4af270a 100755 --- a/scripts/generate-dev-bundle.sh +++ b/scripts/generate-dev-bundle.sh @@ -101,8 +101,8 @@ git clone https://github.com/meteor/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.29-with-npm-5821 +# docs/client/full-api/concepts.html and the README in tools/bundler.js. +git checkout v0.10.33-with-npm-5821 ./configure --prefix="$DIR" make -j4 diff --git a/tools/bundler.js b/tools/bundler.js index 1f72846828..d6e2462782 100644 --- a/tools/bundler.js +++ b/tools/bundler.js @@ -1794,7 +1794,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.29 or newer. To run the application:\n" + +"Node.js 0.10.33 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 index 4c9f3d9a78..4ef32c5ae3 100644 --- a/tools/main.js +++ b/tools/main.js @@ -467,7 +467,7 @@ Fiber(function () { // Check required Node version. // This code is duplicated in tools/server/boot.js. - var MIN_NODE_VERSION = 'v0.10.29'; + var MIN_NODE_VERSION = 'v0.10.33'; if (require('semver').lt(process.version, MIN_NODE_VERSION)) { Console.error( 'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.'); diff --git a/tools/server/boot.js b/tools/server/boot.js index 3ff572f350..23c6f060c3 100644 --- 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.29'; +var MIN_NODE_VERSION = 'v0.10.33'; if (require('semver').lt(process.version, MIN_NODE_VERSION)) { process.stderr.write(