Skip to content

Commit

Permalink
Prepare to build Node 0.10.40
Browse files Browse the repository at this point in the history
  • Loading branch information
glasser committed Jul 17, 2015
1 parent 5e0fefa commit f59cf85
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 9 deletions.
6 changes: 4 additions & 2 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## batch-plugins

Backwards-incompatible change: static assets in package.js files must be
explicitly declared with `{isAsset: true}`.
Backwards-incompatible change: static assets in package.js files must
be explicitly declared with `{isAsset: true}`. See the batch-plugins merge
message for more details.


## v.NEXT
Expand Down Expand Up @@ -213,6 +214,7 @@ explicitly declared with `{isAsset: true}`.

* Upgraded dependencies:

- Node: 0.10.40 (from 0.10.36)
- uglify-js: 2.4.20 (from 2.4.17)
- http-proxy: 1.11.1 (from 1.6.0)

Expand Down
2 changes: 1 addition & 1 deletion docs/client/full-api/concepts.html
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,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.36.) You can then run the application by invoking node, specifying the
0.10.40.) 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 scripts/build-node-for-dev-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -u
# 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/full-api/concepts.html and the README in tools/bundler.js.
NODE_VERSION=0.10.36
NODE_VERSION=0.10.40

source "$(dirname $0)/build-dev-bundle-common.sh"
echo CHECKOUT DIR IS "$CHECKOUT_DIR"
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-dev-bundle.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# use 32bit by default
$PLATFORM = "windows_x86"
$MONGO_VERSION = "2.6.7"
$NODE_VERSION = "0.10.36"
$NODE_VERSION = "0.10.40"

# take it form the environment if exists
if (Test-Path variable:global:PLATFORM) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-dev-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ S3_HOST="s3.amazonaws.com/com.meteor.jenkins"

# Update these values after building the dev-bundle-node Jenkins project.
# Also make sure to update NODE_VERSION in generate-dev-bundle.ps1.
NODE_VERSION=0.10.36
NODE_VERSION=0.10.40
NODE_BUILD_NUMBER=13
NODE_TGZ="node_${PLATFORM}_v${NODE_VERSION}.tar.gz"
if [ -f "${CHECKOUT_DIR}/${NODE_TGZ}" ] ; then
Expand Down
2 changes: 1 addition & 1 deletion tools/isobuild/bundler.js
Original file line number Diff line number Diff line change
Expand Up @@ -1833,7 +1833,7 @@ var writeSiteArchive = Profile(

builder.write('README', { data: new Buffer(
`This is a Meteor application bundle. It has only one external dependency:
Node.js 0.10.36 or newer. To run the application:
Node.js 0.10.40 or newer. To run the application:
$ (cd programs/server && npm install)
$ export MONGO_URL='mongodb://user:password@host:port/databasename'
Expand Down
2 changes: 1 addition & 1 deletion tools/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ Fiber(function () {

// Check required Node version.
// This code is duplicated in tools/server/boot.js.
var MIN_NODE_VERSION = 'v0.10.36';
var MIN_NODE_VERSION = 'v0.10.40';
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 @@ -9,7 +9,7 @@ var bootUtils = require('./boot-utils.js');
var files = require('./mini-files.js');

// This code is duplicated in tools/main.js.
var MIN_NODE_VERSION = 'v0.10.36';
var MIN_NODE_VERSION = 'v0.10.40';

if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
process.stderr.write(
Expand Down

0 comments on commit f59cf85

Please sign in to comment.