Skip to content

Commit

Permalink
Update Node to 0.10.33 from 0.10.29
Browse files Browse the repository at this point in the history
Our npm patch is not yet in a Node 0.10 release (it's in npm 2.1.0).
  • Loading branch information
glasser committed Oct 30, 2014
1 parent 25951b3 commit c2a4134
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
3 changes: 3 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions docs/client/full-api/concepts.html
Original file line number Diff line number Diff line change
Expand Up @@ -878,8 +878,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.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
Expand Down
2 changes: 1 addition & 1 deletion meteor
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate-dev-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/bundler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down
2 changes: 1 addition & 1 deletion tools/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
Expand Down
2 changes: 1 addition & 1 deletion tools/server/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit c2a4134

Please sign in to comment.