Merge branch 'devel' into release-1.6.1

History.md

@@ -145,6 +145,14 @@
   [Issue #9236](https://github.com/meteor/meteor/issues/9236)
   [PR #9237](https://github.com/meteor/meteor/pull/9237)
 
+## v1.6.0.1, 2017-12-08
+
+* Node has been upgraded to version
+  [8.9.3](https://nodejs.org/en/blog/release/v8.9.3/), an important
+  [security release](https://nodejs.org/en/blog/vulnerability/december-2017-security-releases/).
+
+* The `npm` package has been upgraded to version 5.5.1.
+
 ## v1.6, 2017-10-30
 
 * **Important note for package maintainers:**
@@ -277,6 +285,12 @@
   [Issue #9196](https://github.com/meteor/meteor/issues/9196)
   [PR #9198](https://github.com/meteor/meteor/pull/9198)
 
+## v1.5.4.1, 2017-12-08
+
+* Node has been upgraded to version
+  [4.8.7](https://nodejs.org/en/blog/release/v4.8.7/), an important
+  [security release](https://nodejs.org/en/blog/vulnerability/december-2017-security-releases/).
+
 ## v1.5.4, 2017-11-08
 
 * Node has been updated to version 4.8.6. This release officially
@@ -782,6 +796,12 @@
   considered non-portable only if it contained any `.node` binary modules.
   [Issue #8225](https://github.com/meteor/meteor/issues/8225)
 
+## v1.4.4.5, 2017-12-08
+
+* Node has been upgraded to version
+  [4.8.7](https://nodejs.org/en/blog/release/v4.8.7/), an important
+  [security release](https://nodejs.org/en/blog/vulnerability/december-2017-security-releases/).
+
 ## v1.4.4.4, 2017-09-26
 
 * Updating to Meteor 1.4.4.4 will automatically patch a security

meteor

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=8.9.5
+BUNDLE_VERSION=8.9.8
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

packages/mongo/collection.js

@@ -449,7 +449,6 @@ Mongo.Collection = class Collection {
     // Make sure we were passed a document to insert
     if (!doc) {
       throw new Error("insert requires an argument");
-    }
 
     // Make a shallow clone of the document, preserving its prototype.
     doc = Object.create(

scripts/admin/meteor-release-experimental.json

@@ -1,7 +1,7 @@
 {
- "track": "METEOR",
- "version": "1.6.1-beta.14",
- "recommended": false,
- "official": false,
- "description": "Meteor"
+  "track": "METEOR",
+  "version": "1.6.1-beta.14",
+  "recommended": false,
+  "official": false,
+  "description": "Meteor"
 }

scripts/admin/meteor-release-official.json

@@ -1,7 +1,10 @@
 {
   "track": "METEOR",
-  "version": "1.6",
+  "version": "1.6.0.1",
   "recommended": false,
   "official": true,
+  "patchFrom": [
+    "1.6"
+  ],
   "description": "The Official Meteor Distribution"
 }

scripts/build-dev-bundle-common.sh

@@ -5,13 +5,13 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=8.9.1
+NODE_VERSION=8.9.3
 MONGO_VERSION_64BIT=3.4.10
 MONGO_VERSION_32BIT=3.2.15
 NPM_VERSION=5.5.1
 
 # If we built Node from source on Jenkins, this is the build number.
-NODE_BUILD_NUMBER=111
+NODE_BUILD_NUMBER=
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then

scripts/generate-dev-bundle.sh

@@ -28,6 +28,7 @@ extractNodeFromTarGz() {
 }
 
 downloadNodeFromS3() {
+    test -n "${NODE_BUILD_NUMBER}" || return 1
     S3_HOST="s3.amazonaws.com/com.meteor.jenkins"
     S3_TGZ="node_${UNAME}_${ARCH}_v${NODE_VERSION}.tar.gz"
     NODE_URL="https://${S3_HOST}/dev-bundle-node-${NODE_BUILD_NUMBER}/${S3_TGZ}"