From a8b8038d95ee33834c06fa8fd7470521bb034eac Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Sat, 9 Jul 2016 16:17:45 +0800
Subject: [PATCH 001/688] Ability to override the default warehouse url base

Hope this one does override!
---
 tools/packaging/tropohouse.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/packaging/tropohouse.js b/tools/packaging/tropohouse.js
index a30719a232..1e416f9c6b 100644
--- a/tools/packaging/tropohouse.js
+++ b/tools/packaging/tropohouse.js
@@ -299,6 +299,12 @@ _.extend(exports.Tropohouse.prototype, {
   // XXX: Error handling.
   _downloadBuildToTempDir: function (versionInfo, buildRecord) {
     var url = buildRecord.build.url;
+    
+    // Override the download domain name and protocol if METEOR_WAREHOUSE_URLBASE
+    // provided.
+    if (process.env.METEOR_WAREHOUSE_URLBASE) {
+      url = url.replace(/^[a-zA-Z]+:\/\/[^\/]+/, process.env.METEOR_WAREHOUSE_URLBASE);
+    }
 
     // XXX: We use one progress for download & untar; this isn't ideal:
     // it relies on extractTarGz being fast and not reporting any progress.

From 5d4de13cfd0deaddd84da43dd05901e3dc94da7e Mon Sep 17 00:00:00 2001
From: Raghavendra Rachamadugu
 <raghavendrarachamadugu@Raghavendras-MacBook-Pro.local>
Date: Mon, 18 Jul 2016 16:20:48 -0700
Subject: [PATCH 002/688] [7397] onLogout should provide connection information

Adding an argument to onLogoutCallback. The callback is an object with two properties - userId and connection. I thought of loading up the user and instead have the user property, but felt like this maybe redundant. Logout hooks can always do this if they need. However one advantage of having user instead of userId is it makes it symmetric/consistent with onLogin callback. Let me know if you strongly feel we should have user instead userId..

Also extended an existing test to validate the onLogout callback gets this argument with expected user id
---
 packages/accounts-base/accounts_server.js | 7 ++++---
 packages/accounts-base/accounts_tests.js  | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index dbffd61e64..88e785758d 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -176,9 +176,10 @@ Ap._failedLogin = function (connection, attempt) {
   });
 };
 
-Ap._successfulLogout = function () {
+Ap._successfulLogout = function (connection, userId) {
+  var logoutContext = { userId: userId, connection: connection };
   this._onLogoutHook.each(function (callback) {
-    callback();
+    callback(logoutContext);
     return true;
   });
 };
@@ -537,8 +538,8 @@ Ap._initServerMethods = function () {
     accounts._setLoginToken(this.userId, this.connection, null);
     if (token && this.userId)
       accounts.destroyToken(this.userId, token);
+    accounts._successfulLogout(this.connection, this.userId);
     this.setUserId(null);
-    accounts._successfulLogout();
   };
 
   // Delete all the current user's tokens and close all open connections logged
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index bb8774b7b1..cc56f03a57 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -388,6 +388,9 @@ Tinytest.add(
     var onLoginStopper = Accounts.onLogin(function(attempt) {
       test.equal(Meteor.userId(), onLoginExpectedUserId, "onLogin");
     });
+    var onLogoutStopper = Accounts.onLogout(function(logoutContext) {
+      test.equal(logoutContext.userId, onLogoutExpectedUserId, "onLogout");
+    });
     var onLoginFailureStopper = Accounts.onLoginFailure(function(attempt) {
       test.equal(Meteor.userId(), onLoginFailureExpectedUserId, "onLoginFailure");
     });
@@ -408,9 +411,14 @@ Tinytest.add(
     var onLoginFailureExpectedUserId = userId;
     test.throws(function() { conn.call('login', { resume: "bogus" }) }, '403');
 
+    // Trigger onLogout callbacks
+    var onLogoutExpectedUserId = userId;
+    conn.call('logout');
+
     conn.disconnect();
     validateStopper.stop();
     onLoginStopper.stop();
+    onLogoutStopper.stop();
     onLoginFailureStopper.stop();
   }
 );

From 0e1d3c7f92a36de5887286613aef97b2ce5b8375 Mon Sep 17 00:00:00 2001
From: Raghavendra Rachamadugu
 <raghavendrarachamadugu@Raghavendras-MacBook-Pro.local>
Date: Tue, 19 Jul 2016 13:18:23 -0700
Subject: [PATCH 003/688] Add check for connection field in test

---
 packages/accounts-base/accounts_tests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index cc56f03a57..258e0011d4 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -390,6 +390,7 @@ Tinytest.add(
     });
     var onLogoutStopper = Accounts.onLogout(function(logoutContext) {
       test.equal(logoutContext.userId, onLogoutExpectedUserId, "onLogout");
+      test.instanceOf(logoutContext.connection, Object);
     });
     var onLoginFailureStopper = Accounts.onLoginFailure(function(attempt) {
       test.equal(Meteor.userId(), onLoginFailureExpectedUserId, "onLoginFailure");

From 4a609c278364d165d0babadf591fed146dbf809a Mon Sep 17 00:00:00 2001
From: Raghavendra Rachamadugu
 <raghavendrarachamadugu@raghavendrasmbp.attlocal.net>
Date: Tue, 19 Jul 2016 21:26:50 -0700
Subject: [PATCH 004/688] [7397] Change argument to onLogout callback to be
 consistent with onLogin argument

onLogin argument is an object that has user and connection fields among other fields. So I'm making onLogout also have user and connection fields to make things consistent.

Other fields that onLogin callbacks receive include type, allowed, methodName, methodArguments - which are not available or applicable for onLogout.
---
 packages/accounts-base/accounts_server.js | 4 ++--
 packages/accounts-base/accounts_tests.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 88e785758d..a165ec509b 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -177,9 +177,9 @@ Ap._failedLogin = function (connection, attempt) {
 };
 
 Ap._successfulLogout = function (connection, userId) {
-  var logoutContext = { userId: userId, connection: connection };
+  const user = userId && this.users.findOne(userId);
   this._onLogoutHook.each(function (callback) {
-    callback(logoutContext);
+    callback({ user, connection });
     return true;
   });
 };
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index 258e0011d4..5857597221 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -389,7 +389,7 @@ Tinytest.add(
       test.equal(Meteor.userId(), onLoginExpectedUserId, "onLogin");
     });
     var onLogoutStopper = Accounts.onLogout(function(logoutContext) {
-      test.equal(logoutContext.userId, onLogoutExpectedUserId, "onLogout");
+      test.equal(logoutContext.user._id, onLogoutExpectedUserId, "onLogout");
       test.instanceOf(logoutContext.connection, Object);
     });
     var onLoginFailureStopper = Accounts.onLoginFailure(function(attempt) {

From 618d3730ddad5952f86aa8bdfc12ab4a7e0f9665 Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Sat, 23 Jul 2016 22:29:02 +0800
Subject: [PATCH 005/688] Improve the meteor build speed on travis ci

run.sh already runs ./meteor --self-test

so the install section defined in travis config can be remove.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5ec40272b9..d172d1e022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ cache:
     - "dev_bundle"
     - ".meteor"
     - ".babel-cache"
-install: ./meteor --get-ready
 script: TEST_PACKAGES_EXCLUDE="less" ./packages/test-in-console/run.sh
 sudo: false
 env:

From 8169b6fd573722e8b02e30202627ede922e3f037 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 27 Jul 2016 14:09:30 +1000
Subject: [PATCH 006/688] Added a note about replicaSet #7450

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index 84f0b7520f..13c1d4f198 100644
--- a/History.md
+++ b/History.md
@@ -29,6 +29,10 @@
   2.6 up. Mongo 2.4 has now reached end-of-life
   (https://www.mongodb.com/support-policy), and is no longer supported.
 
+  If you are setting `MONGO_OPLOG_URL`, especially in production, ensure you are
+  passing in the `replicaSet` argument (see [#7450]
+    (https://github.com/meteor/meteor/issues/7450))
+
 * Custom Mongo options can now be specified using the
   `Mongo.setConnectionOptions(options)` API.
   [#7277](https://github.com/meteor/meteor/pull/7277)

From 696de365493dd923ff6a9e740241372ca1bdd0b3 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 27 Jul 2016 16:15:51 +1000
Subject: [PATCH 007/688] More subtle logic for deciding when test files should
 be lazily loaded

The logic at the top of this function was basically just for the case of
"file is in imports but also a test file". But the logic caught up some
other edge cases, such as "file is in node_modules but also a test file".
---
 tools/isobuild/package-source.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index a32f71ded6..39648e1667 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -1361,21 +1361,16 @@ _.extend(PackageSource.prototype, {
 
   _inferFileOptions(relPath, {arch, isApp}) {
     const fileOptions = {};
-    const isAnyTest = global.testCommandMetadata &&
-      (global.testCommandMetadata.isTest ||
-       global.testCommandMetadata.isAppTest);
+    const isTest = global.testCommandMetadata
+      && global.testCommandMetadata.isTest;
+    const isAppTest = global.testCommandMetadata
+      && global.testCommandMetadata.isAppTest;
+    const isTestFile = (isTest || isAppTest) && isTestFilePath(relPath);
 
-    if (isAnyTest) {
-      if (isTestFilePath(relPath)) {
-        // When running tests, test files should not be loaded lazily.
-        return fileOptions;
-      }
-
-      // If running in test mode (`meteor test`), all files other than
-      // test files should be loaded lazily.
-      if (global.testCommandMetadata.isTest) {
-        fileOptions.lazy = true;
-      }
+    // If running in test mode (`meteor test`), all files other than
+    // test files should be loaded lazily.
+    if (isTest && !isTestFile) {
+      fileOptions.lazy = true;
     }
 
     const dirs = files.pathDirname(relPath).split(files.pathSep);
@@ -1392,7 +1387,8 @@ _.extend(PackageSource.prototype, {
         return fileOptions;
       }
 
-      if (isApp && dir === "imports") {
+      // Files in `imports/` should be lazily loaded *apart* from tests
+      if (isApp && dir === "imports" && !isTestFile) {
         fileOptions.lazy = true;
       }
 

From c239effdad1d43dfdf922319822d2110998ac911 Mon Sep 17 00:00:00 2001
From: Alon Amster <m@ster.am>
Date: Mon, 23 Nov 2015 23:11:18 +0200
Subject: [PATCH 008/688] Removed the google `profile` scope.

The `email` scope is enough for getting the required data, including the
user ID.
---
 packages/google/google_client.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index d8a9ea4e9a..b7b673147c 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -23,9 +23,9 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
 
   var credentialToken = Random.secret();
 
-  // always need this to get user id from google.
-  var requiredScope = ['profile'];
-  var scope = ['email'];
+  // we need the email scope to get user id from google.
+  var requiredScope = ['email'];
+  var scope = [];
   if (options.requestPermissions)
     scope = options.requestPermissions;
   scope = _.union(scope, requiredScope);

From ca09e9d19bbf2b741ed11a5a691f539c7ee4d54d Mon Sep 17 00:00:00 2001
From: Alon Amster <m@ster.am>
Date: Wed, 27 Jul 2016 10:53:56 +0300
Subject: [PATCH 009/688] Improve backward compatibility and add note

The default value for the `requestPermissions` option is now `profile`,
thus preserving the old behavior in case the option was not
explicitly set.

Added a note in the History.md file regarding this change.
---
 History.md                       | 8 ++++++++
 packages/google/google_client.js | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 13c1d4f198..12e8096074 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,13 @@
 ## v.NEXT
 
+* The `google` package now uses the `email` scope as a mandatory field instead
+  of the `profile` scope. The `profile` scope is still added by default if the
+  `requestPermissions` option is not specified to maintain backward
+  compatibility, but it is now possible to pass an empty array to
+  `requestPermissions` in order to only request the `email` scope, which
+  reduces the amount of permissions requested from the user in the Google
+  popup. [PR #6975](https://github.com/meteor/meteor/pull/6975)
+
 ## v1.4
 
 * Node has been upgraded to 4.4.7.
diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index b7b673147c..b8af26fee4 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -25,7 +25,7 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
 
   // we need the email scope to get user id from google.
   var requiredScope = ['email'];
-  var scope = [];
+  var scope = ['profile'];
   if (options.requestPermissions)
     scope = options.requestPermissions;
   scope = _.union(scope, requiredScope);

From 3f1826bf7abb20212c4cefcc1fe483b56ea9eb30 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 21 Jul 2016 16:45:18 -0400
Subject: [PATCH 010/688] Provide bin\7za.exe with Windows dev bundle.

---
 scripts/generate-dev-bundle.ps1 | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 704e35c2f5..72d07cd59e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -35,6 +35,16 @@ cd bin
 $webclient = New-Object System.Net.WebClient
 $shell = New-Object -com shell.application
 
+mkdir "$DIR\7z"
+cd "$DIR\7z"
+$webclient.DownloadFile("http://www.7-zip.org/a/7z1602.msi", "$DIR\7z\7z.msi")
+$webclient.DownloadFile("http://www.7-zip.org/a/7z1602-extra.7z", "$DIR\7z\extra.7z")
+msiexec /i 7z.msi /quiet /qn /norestart
+ping -n 4 127.0.0.1 | out-null
+& "C:\Program Files*\7-Zip\7z.exe" x extra.7z
+mv 7za.exe "$DIR\bin\7z.exe"
+cd "$DIR\bin"
+
 # download node
 # same node on 32bit vs 64bit?
 $node_link = "http://nodejs.org/dist/v${NODE_VERSION}/win-x86/node.exe"
@@ -63,6 +73,7 @@ foreach($item in $zip.items()) {
 }
 
 rm -Recurse -Force $npm_zip
+rm -Recurse -Force "$DIR\7z"
 
 # add bin to the front of the path so we can use our own node for building
 $env:PATH = "${DIR}\bin;${env:PATH}"

From 18d70ee780f2a3d002924f94f1b1a60691c9c10d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 22 Jul 2016 14:11:48 -0400
Subject: [PATCH 011/688] Bump $BUNDLE_VERSION to 4.2.0 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 0ab07e0073..a46bca511c 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.1.4
+BUNDLE_VERSION=4.2.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From ed624147d7da62ea9384e53d221010acca62bbf9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 21 Jul 2016 21:27:09 -0400
Subject: [PATCH 012/688] Use native tar or 7z.exe for extracting tar.gz files
 when possible.

---
 tools/fs/files.js | 123 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 102 insertions(+), 21 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index d2bbfd49d2..92bd21ef42 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -12,6 +12,7 @@ var util = require('util');
 var _ = require('underscore');
 var Fiber = require('fibers');
 var crypto = require('crypto');
+var spawn = require("child_process").spawn;
 
 var rimraf = require('rimraf');
 var sourcemap = require('source-map');
@@ -695,33 +696,26 @@ files.extractTarGz = function (buffer, destPath, options) {
   var tempDir = files.pathJoin(parentDir, '.tmp' + utils.randomToken());
   files.mkdir_p(tempDir);
 
-  var tar = require("tar");
-  var zlib = require("zlib");
+  const startTime = +new Date;
+  let promise = tryExtractWithNativeTar(buffer, tempDir);
 
-  new Promise(function (resolve, reject) {
-    var gunzip = zlib.createGunzip().on('error', reject);
+  if (process.platform === "win32") {
+    promise = promise.catch(
+      error => tryExtractWithNative7z(buffer, tempDir)
+    );
+  }
 
-    var extractor = new tar.Extract({
-      path: files.convertToOSPath(tempDir)
-    }).on('entry', function (e) {
-      if (process.platform === "win32" || options.forceConvert) {
-        // On Windows, try to convert old packages that have colons in paths
-        // by blindly replacing all of the paths. Otherwise, we can't even
-        // extract the tarball
-        e.path = colonConverter.convert(e.path);
-      }
-    }).on('error', reject)
-      .on('end', resolve);
+  promise = promise.catch(
+    error => tryExtractWithNpmTar(buffer, tempDir)
+  );
 
-    // write the buffer to the (gunzip|untar) pipeline; these calls
-    // cause the tar to be extracted to disk.
-    gunzip.pipe(extractor);
-    gunzip.write(buffer);
-    gunzip.end();
-  }).await();
+  promise.await();
+
+  console.log("finished extracting in", new Date - startTime, "ms");
 
   // succeed!
   var topLevelOfArchive = files.readdir(tempDir);
+  console.log(topLevelOfArchive);
   if (topLevelOfArchive.length !== 1) {
     throw new Error(
       "Extracted archive '" + tempDir + "' should only contain one entry");
@@ -733,6 +727,93 @@ files.extractTarGz = function (buffer, destPath, options) {
   files.rmdir(tempDir);
 };
 
+function tryExtractWithNativeTar(buffer, tempDir) {
+  const tarProc = spawn("tar", ["xzf", "-"], {
+    cwd: tempDir,
+    stdio: "pipe"
+  });
+
+  tarProc.stdin.write(buffer);
+  tarProc.stdin.end();
+
+  return new Promise((resolve, reject) => {
+    tarProc.on("error", reject);
+    tarProc.on("exit", resolve);
+  });
+}
+
+function tryExtractWithNative7z(buffer, tempDir) {
+  const exeOSPath = files.convertToOSPath(
+    files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
+  const tarGzBasename = "out.tar.gz";
+  const tarGzOSPath = files.convertToOSPath(
+    files.pathJoin(tempDir, tarGzBasename));
+
+  files.writeFile(tarGzOSPath, buffer);
+
+  const proc1 = spawn(exeOSPath, ["x", tarGzBasename], {
+    cwd: tempDir,
+    stdio: "inherit" // TODO Hide this later.
+  });
+
+  return new Promise((resolve, reject) => {
+    proc1.on("error", reject);
+    proc1.on("exit", resolve);
+  }).then(code => {
+    assert.strictEqual(code, 0);
+
+    let tarBasename;
+    const foundTar = files.readdir(tempDir).some(file => {
+      if (file !== tarGzBasename) {
+        tarBasename = file;
+        return true;
+      }
+    });
+
+    assert.ok(foundTar, "failed to find .tar file");
+
+    const proc2 = spawn(exeOSPath, ["x", tarBasename], {
+      cwd: tempDir,
+      stdio: "inherit" // TODO Hide this later.
+    });
+
+    function cleanUp() {
+      files.unlink(files.pathJoin(tempDir, tarGzBasename));
+      files.unlink(files.pathJoin(tempDir, tarBasename));
+    }
+
+    return new Promise((resolve, reject) => {
+      proc2.on("error", reject);
+      proc2.on("exit", resolve);
+    }).then(code => {
+      cleanUp();
+      return code;
+    }, error => {
+      cleanUp();
+      throw error;
+    });
+  });
+}
+
+function tryExtractWithNpmTar(buffer, tempDir) {
+  var tar = require("tar");
+  var zlib = require("zlib");
+
+  return new Promise((resolve, reject) => {
+    var gunzip = zlib.createGunzip().on('error', reject);
+    var extractor = new tar.Extract({
+      path: files.convertToOSPath(tempDir)
+    }).on('error', reject)
+      .on('end', resolve);
+
+    // write the buffer to the (gunzip|untar) pipeline; these calls
+    // cause the tar to be extracted to disk.
+    gunzip.pipe(extractor);
+    gunzip.write(buffer);
+    gunzip.end();
+  });
+}
+
 // Tar-gzips a directory, returning a stream that can then be piped as
 // needed.  The tar archive will contain a top-level directory named
 // after dirPath.

From 136c2f86960b32f67328ba58f1cab61baeb4ef16 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 22 Jul 2016 11:56:25 -0400
Subject: [PATCH 013/688] Don't let previous extraction attempts interfere with
 later ones.

---
 tools/fs/files.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 92bd21ef42..932c0da78b 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -727,7 +727,15 @@ files.extractTarGz = function (buffer, destPath, options) {
   files.rmdir(tempDir);
 };
 
+function ensureDirectoryEmpty(dir) {
+  files.readdir(dir).forEach(file => {
+    files.rm_recursive(files.pathJoin(dir, file));
+  });
+}
+
 function tryExtractWithNativeTar(buffer, tempDir) {
+  ensureDirectoryEmpty(tempDir);
+
   const tarProc = spawn("tar", ["xzf", "-"], {
     cwd: tempDir,
     stdio: "pipe"
@@ -743,6 +751,8 @@ function tryExtractWithNativeTar(buffer, tempDir) {
 }
 
 function tryExtractWithNative7z(buffer, tempDir) {
+  ensureDirectoryEmpty(tempDir);
+
   const exeOSPath = files.convertToOSPath(
     files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
   const tarGzBasename = "out.tar.gz";
@@ -796,6 +806,8 @@ function tryExtractWithNative7z(buffer, tempDir) {
 }
 
 function tryExtractWithNpmTar(buffer, tempDir) {
+  ensureDirectoryEmpty(tempDir);
+
   var tar = require("tar");
   var zlib = require("zlib");
 

From 4fa4bd73510f703bf65ac24d01a44ceb9ae9d587 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 22 Jul 2016 13:25:38 -0400
Subject: [PATCH 014/688] Fix .tar.gz extraction bugs on Windows.

---
 tools/fs/files.js | 60 +++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 932c0da78b..2e4198adc4 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -714,8 +714,11 @@ files.extractTarGz = function (buffer, destPath, options) {
   console.log("finished extracting in", new Date - startTime, "ms");
 
   // succeed!
-  var topLevelOfArchive = files.readdir(tempDir);
-  console.log(topLevelOfArchive);
+  var topLevelOfArchive = files.readdir(tempDir)
+    // On Windows, the 7z.exe tool sometimes creates an auxiliary
+    // PaxHeader directory.
+    .filter(file => ! file.startsWith("PaxHeader"));
+
   if (topLevelOfArchive.length !== 1) {
     throw new Error(
       "Extracted archive '" + tempDir + "' should only contain one entry");
@@ -724,7 +727,7 @@ files.extractTarGz = function (buffer, destPath, options) {
   var extractDir = files.pathJoin(tempDir, topLevelOfArchive[0]);
   makeTreeReadOnly(extractDir);
   files.rename(extractDir, destPath);
-  files.rmdir(tempDir);
+  files.rm_recursive(tempDir);
 };
 
 function ensureDirectoryEmpty(dir) {
@@ -736,17 +739,17 @@ function ensureDirectoryEmpty(dir) {
 function tryExtractWithNativeTar(buffer, tempDir) {
   ensureDirectoryEmpty(tempDir);
 
-  const tarProc = spawn("tar", ["xzf", "-"], {
-    cwd: tempDir,
-    stdio: "pipe"
-  });
-
-  tarProc.stdin.write(buffer);
-  tarProc.stdin.end();
-
   return new Promise((resolve, reject) => {
+    const tarProc = spawn("tar", ["xzf", "-"], {
+      cwd: files.convertToOSPath(tempDir),
+      stdio: "pipe"
+    });
+
     tarProc.on("error", reject);
     tarProc.on("exit", resolve);
+
+    tarProc.stdin.write(buffer);
+    tarProc.stdin.end();
   });
 }
 
@@ -756,19 +759,21 @@ function tryExtractWithNative7z(buffer, tempDir) {
   const exeOSPath = files.convertToOSPath(
     files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
   const tarGzBasename = "out.tar.gz";
-  const tarGzOSPath = files.convertToOSPath(
-    files.pathJoin(tempDir, tarGzBasename));
+  const Console = require("../console/console.js").Console;
+  const spawnOptions = {
+    cwd: files.convertToOSPath(tempDir),
+    stdio: Console.verbose ? "inherit" : "pipe",
+  };
 
-  files.writeFile(tarGzOSPath, buffer);
-
-  const proc1 = spawn(exeOSPath, ["x", tarGzBasename], {
-    cwd: tempDir,
-    stdio: "inherit" // TODO Hide this later.
-  });
+  files.writeFile(files.pathJoin(tempDir, tarGzBasename), buffer);
 
   return new Promise((resolve, reject) => {
-    proc1.on("error", reject);
-    proc1.on("exit", resolve);
+    spawn(exeOSPath, [
+      "x", "-y", tarGzBasename
+    ], spawnOptions)
+      .on("error", reject)
+      .on("exit", resolve);
+
   }).then(code => {
     assert.strictEqual(code, 0);
 
@@ -782,19 +787,18 @@ function tryExtractWithNative7z(buffer, tempDir) {
 
     assert.ok(foundTar, "failed to find .tar file");
 
-    const proc2 = spawn(exeOSPath, ["x", tarBasename], {
-      cwd: tempDir,
-      stdio: "inherit" // TODO Hide this later.
-    });
-
     function cleanUp() {
       files.unlink(files.pathJoin(tempDir, tarGzBasename));
       files.unlink(files.pathJoin(tempDir, tarBasename));
     }
 
     return new Promise((resolve, reject) => {
-      proc2.on("error", reject);
-      proc2.on("exit", resolve);
+      spawn(exeOSPath, [
+        "x", "-y", tarBasename
+      ], spawnOptions)
+        .on("error", reject)
+        .on("exit", resolve);
+
     }).then(code => {
       cleanUp();
       return code;

From 2f40d3bfbb63763266186ff3e9f9f055c5c166ed Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 22 Jul 2016 14:02:02 -0400
Subject: [PATCH 015/688] Refactor verbosity logic for .tar.gz extraction.

---
 tools/fs/files.js | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 2e4198adc4..1e52b55dfd 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -696,23 +696,25 @@ files.extractTarGz = function (buffer, destPath, options) {
   var tempDir = files.pathJoin(parentDir, '.tmp' + utils.randomToken());
   files.mkdir_p(tempDir);
 
+  if (! _.has(options, "verbose")) {
+    options.verbose = require("../console/console.js").Console.verbose;
+  }
+
   const startTime = +new Date;
-  let promise = tryExtractWithNativeTar(buffer, tempDir);
+  let promise = tryExtractWithNativeTar(buffer, tempDir, options);
 
   if (process.platform === "win32") {
     promise = promise.catch(
-      error => tryExtractWithNative7z(buffer, tempDir)
+      error => tryExtractWithNative7z(buffer, tempDir, options)
     );
   }
 
   promise = promise.catch(
-    error => tryExtractWithNpmTar(buffer, tempDir)
+    error => tryExtractWithNpmTar(buffer, tempDir, options)
   );
 
   promise.await();
 
-  console.log("finished extracting in", new Date - startTime, "ms");
-
   // succeed!
   var topLevelOfArchive = files.readdir(tempDir)
     // On Windows, the 7z.exe tool sometimes creates an auxiliary
@@ -728,6 +730,10 @@ files.extractTarGz = function (buffer, destPath, options) {
   makeTreeReadOnly(extractDir);
   files.rename(extractDir, destPath);
   files.rm_recursive(tempDir);
+
+  if (options.verbose) {
+    console.log("Finished extracting in", new Date - startTime, "ms");
+  }
 };
 
 function ensureDirectoryEmpty(dir) {
@@ -736,13 +742,18 @@ function ensureDirectoryEmpty(dir) {
   });
 }
 
-function tryExtractWithNativeTar(buffer, tempDir) {
+function tryExtractWithNativeTar(buffer, tempDir, options) {
   ensureDirectoryEmpty(tempDir);
 
   return new Promise((resolve, reject) => {
-    const tarProc = spawn("tar", ["xzf", "-"], {
+    const flags = options.verbose ? "-xzvf" : "-xzf";
+    const tarProc = spawn("tar", [flags, "-"], {
       cwd: files.convertToOSPath(tempDir),
-      stdio: "pipe"
+      stdio: options.verbose ? [
+        "pipe", // Always need to write to tarProc.stdin.
+        process.stdout,
+        process.stderr
+      ] : "pipe",
     });
 
     tarProc.on("error", reject);
@@ -753,16 +764,15 @@ function tryExtractWithNativeTar(buffer, tempDir) {
   });
 }
 
-function tryExtractWithNative7z(buffer, tempDir) {
+function tryExtractWithNative7z(buffer, tempDir, options) {
   ensureDirectoryEmpty(tempDir);
 
   const exeOSPath = files.convertToOSPath(
     files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
   const tarGzBasename = "out.tar.gz";
-  const Console = require("../console/console.js").Console;
   const spawnOptions = {
     cwd: files.convertToOSPath(tempDir),
-    stdio: Console.verbose ? "inherit" : "pipe",
+    stdio: options.verbose ? "inherit" : "pipe",
   };
 
   files.writeFile(files.pathJoin(tempDir, tarGzBasename), buffer);
@@ -809,7 +819,7 @@ function tryExtractWithNative7z(buffer, tempDir) {
   });
 }
 
-function tryExtractWithNpmTar(buffer, tempDir) {
+function tryExtractWithNpmTar(buffer, tempDir, options) {
   ensureDirectoryEmpty(tempDir);
 
   var tar = require("tar");

From 277fa504a77fc0f230d834d73c1b0ead15aba8ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 22 Jul 2016 15:28:10 -0400
Subject: [PATCH 016/688] Honor options.forceConvert in tryExtractWithNpmTar.

---
 tools/fs/files.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 1e52b55dfd..02f3d9ab15 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -745,6 +745,11 @@ function ensureDirectoryEmpty(dir) {
 function tryExtractWithNativeTar(buffer, tempDir, options) {
   ensureDirectoryEmpty(tempDir);
 
+  if (options.forceConvert) {
+    return Promise.reject(new Error(
+      "Native tar cannot convert colons in package names"));
+  }
+
   return new Promise((resolve, reject) => {
     const flags = options.verbose ? "-xzvf" : "-xzf";
     const tarProc = spawn("tar", [flags, "-"], {
@@ -767,6 +772,11 @@ function tryExtractWithNativeTar(buffer, tempDir, options) {
 function tryExtractWithNative7z(buffer, tempDir, options) {
   ensureDirectoryEmpty(tempDir);
 
+  if (options.forceConvert) {
+    return Promise.reject(new Error(
+      "Native 7z.exe cannot convert colons in package names"));
+  }
+
   const exeOSPath = files.convertToOSPath(
     files.pathJoin(files.getCurrentNodeBinDir(), "7z.exe"));
   const tarGzBasename = "out.tar.gz";
@@ -829,6 +839,13 @@ function tryExtractWithNpmTar(buffer, tempDir, options) {
     var gunzip = zlib.createGunzip().on('error', reject);
     var extractor = new tar.Extract({
       path: files.convertToOSPath(tempDir)
+    }).on('entry', function (e) {
+      if (process.platform === "win32" || options.forceConvert) {
+        // On Windows, try to convert old packages that have colons in
+        // paths by blindly replacing all of the paths. Otherwise, we
+        // can't even extract the tarball
+        e.path = colonConverter.convert(e.path);
+      }
     }).on('error', reject)
       .on('end', resolve);
 

From 23a3ba0e7201c339b63ee45ec867215403aee9cb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 28 Jul 2016 14:42:45 -0400
Subject: [PATCH 017/688] Use getUrlWithResuming for publish-for-arch, and log
 extraction.

---
 tools/cli/commands-packages.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 701ebbd4d7..901e3f5c5d 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -603,15 +603,21 @@ main.registerCommand({
 
   // Download the source to the package.
   var sourceTarball = buildmessage.enterJob("downloading package source", function () {
-    return httpHelpers.getUrl({
+    return httpHelpers.getUrlWithResuming({
       url: pkgVersion.source.url,
       encoding: null
     });
   });
 
+  if (buildmessage.hasMessages()) {
+    return 1;
+  }
+
   var sourcePath = files.mkdtemp('package-source');
-  // XXX check tarballHash!
-  files.extractTarGz(sourceTarball, sourcePath);
+  buildmessage.enterJob("extracting package source", () => {
+    // XXX check tarballHash!
+    files.extractTarGz(sourceTarball, sourcePath);
+  });
 
   // XXX Factor out with packageClient.bundleSource so that we don't
   // have knowledge of the tarball structure in two places.

From 2c67d64585dfe489c62c2be862b81ecb6f1e428a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 28 Jul 2016 14:43:47 -0400
Subject: [PATCH 018/688] Use getUrlWithResuming in
 downloadPackagesToWarehouse.

---
 tools/packaging/warehouse.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/packaging/warehouse.js b/tools/packaging/warehouse.js
index e17f33d4d7..b37bda6ee9 100644
--- a/tools/packaging/warehouse.js
+++ b/tools/packaging/warehouse.js
@@ -394,8 +394,13 @@ _.extend(warehouse, {
               "/" + version +
               "/" + name + '-' + version + "-" + platform + ".tar.gz";
 
-        var tarball = httpHelpers.getUrl({url: packageUrl, encoding: null});
+        var tarball = httpHelpers.getUrlWithResuming({
+          url: packageUrl,
+          encoding: null
+        });
+
         files.extractTarGz(tarball, packageDir);
+
         if (!dontWriteFreshFile) {
           files.writeFile(warehouse.getPackageFreshFile(name, version), '');
         }

From 536eecea01bff1a285f0a4569ab95548e4877e9e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 28 Jul 2016 14:44:46 -0400
Subject: [PATCH 019/688] Log package extraction and loading separately from
 downloading.

https://github.com/meteor/meteor/pull/7457#issuecomment-235881746

Helps with #7283.
---
 tools/packaging/tropohouse.js | 82 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/tools/packaging/tropohouse.js b/tools/packaging/tropohouse.js
index f5739182ec..0607f46c34 100644
--- a/tools/packaging/tropohouse.js
+++ b/tools/packaging/tropohouse.js
@@ -293,33 +293,6 @@ _.extend(exports.Tropohouse.prototype, {
     });
   },
 
-  // Contacts the package server, downloads and extracts a tarball for a given
-  // buildRecord into a temporary directory, whose path is returned.
-  //
-  // XXX: Error handling.
-  _downloadBuildToTempDir: function (versionInfo, buildRecord) {
-    var url = buildRecord.build.url;
-    
-    // Override the download domain name and protocol if METEOR_WAREHOUSE_URLBASE
-    // provided.
-    if (process.env.METEOR_WAREHOUSE_URLBASE) {
-      url = url.replace(/^[a-zA-Z]+:\/\/[^\/]+/, process.env.METEOR_WAREHOUSE_URLBASE);
-    }
-
-    // XXX: We use one progress for download & untar; this isn't ideal:
-    // it relies on extractTarGz being fast and not reporting any progress.
-    // Really, we should create two subtasks
-    // (and, we should stream the download to the tar extractor)
-    var packageTarball = httpHelpers.getUrlWithResuming({
-      url: url,
-      encoding: null,
-      progress: buildmessage.getCurrentProgressTracker(),
-      wait: false
-    });
-
-    return exports._extractAndConvert(packageTarball);
-  },
-
   // Given a package name and version, returns the architectures for
   // which we have downloaded this package
   //
@@ -493,36 +466,65 @@ _.extend(exports.Tropohouse.prototype, {
         // XXX how does concurrency work here?  we could just get errors if we
         // try to rename over the other thing?  but that's the same as in
         // warehouse?
-        _.each(buildsToDownload, function (build) {
-          buildmessage.enterJob({
+        _.each(buildsToDownload, ({ build: { url }}) => {
+          const packageTarball = buildmessage.enterJob({
             title: "downloading " + packageName + "@" + version + "..."
-          }, function() {
+          }, () => {
             try {
-              var buildTempDir = self._downloadBuildToTempDir(
-                { packageName: packageName, version: version }, build);
+              // Override the download domain name and protocol if METEOR_WAREHOUSE_URLBASE
+              // provided.
+              if (process.env.METEOR_WAREHOUSE_URLBASE) {
+                url = url.replace(
+                  /^[a-zA-Z]+:\/\/[^\/]+/,
+                  process.env.METEOR_WAREHOUSE_URLBASE
+                );
+              }
+
+              return httpHelpers.getUrlWithResuming({
+                url: url,
+                encoding: null,
+                progress: buildmessage.getCurrentProgressTracker(),
+                wait: false
+              });
+
             } catch (e) {
-              if (!(e instanceof files.OfflineError)) {
+              if (! (e instanceof files.OfflineError)) {
                 throw e;
               }
               buildmessage.error(e.error.message);
             }
+          });
+
+          if (buildmessage.jobHasMessages()) {
+            return;
+          }
+
+          buildmessage.enterJob({
+            title: "extracting " + packageName + "@" + version + "..."
+          }, () => {
+            const buildTempDir = exports._extractAndConvert(packageTarball);
             buildInputDirs.push(buildTempDir);
             buildTempDirs.push(buildTempDir);
           });
         });
+
         if (buildmessage.jobHasMessages()) {
           return;
         }
 
-        // We need to turn our builds into a single isopack.
-        var isopack = new Isopack();
-        _.each(buildInputDirs, function (buildTempDir, i) {
-          isopack._loadUnibuildsFromPath(packageName, buildTempDir, {
-            firstIsopack: i === 0,
+        buildmessage.enterJob({
+          title: "loading " + packageName + "@" + version + "..."
+        }, () => {
+          // We need to turn our builds into a single isopack.
+          var isopack = new Isopack();
+          _.each(buildInputDirs, (buildTempDir, i) => {
+            isopack._loadUnibuildsFromPath(packageName, buildTempDir, {
+              firstIsopack: i === 0,
+            });
           });
-        });
 
-        self._saveIsopack(isopack, packageName, version);
+          self._saveIsopack(isopack, packageName, version);
+        });
 
         // Delete temp directories now (asynchronously).
         _.each(buildTempDirs, function (buildTempDir) {

From 98aaaed084fd87ab8003f0c2839705acdf965789 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 12:23:04 +1000
Subject: [PATCH 020/688] Fix #7491 by wrapping child process in `script` on
 OSX

See https://github.com/meteor/meteor/issues/7491#issuecomment-235887764

NOTE: this issue should be fixed in the next release of node v4
(4.4.8 or 4.5). When we include that in the dev bundle we should
revert this change
---
 tools/cli/main.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index b04ad74fe6..e5ab1f1d06 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -493,6 +493,14 @@ var springboard = function (rel, options) {
     }).await());
   }
 
+  // On OSX, there is a bug in node 4 when launching out to a node 0.10 process
+  // This should be fixed in the next release of node (we should then revert
+  // this change) https://github.com/meteor/meteor/issues/7491
+  if (process.platform === 'darwin') {
+    newArgv.unshift('-q', '/dev/null', executable);
+    executable = 'script';
+  }
+
   // Now exec; we're not coming back.
   require('kexec')(executable, newArgv);
   throw Error('exec failed?');

From 7485f021182adb69655bdcfdbf4dddf6f4f5b954 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 12:26:41 +1000
Subject: [PATCH 021/688] Trying 1.4.0.1-rc.2

---
 packages/meteor-tool/package.js                | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index dca5e85d20..5f571e4cad 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.0'
+  version: '1.4.0-1-rc.2'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 56fb5520a2..4476f8bab3 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4-rc.2",
+ "version": "1.4.0.1-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 57dfb0b4e164a0eb70e8f1406c4b352560021ed7 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 13:19:14 +1000
Subject: [PATCH 022/688] Don't try and use wired tiger on 32bit linux

For https://github.com/meteor/meteor/issues/7511
---
 tools/runners/run-mongo.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index d666c17c7a..9f9b692a20 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -55,8 +55,9 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) {
     '--replSet', replSetName
   ];
 
-  // Use mmapv1 on windows, as our binary doesn't support WT
-  if (process.platform === "win32") {
+  // Use mmapv1 on 32bit platforms, as our binary doesn't support WT
+  if (process.platform === "win32"
+      || (process.platform === "linux" && process.arch === "ia32")) {
     args.push('--storageEngine', 'mmapv1', '--smallfiles');
   } else {
     // The WT journal seems to be at least 300MB, which is just too much

From c47aae693dcf8b9fbd43ce208c9ee4eac182d872 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 13:20:19 +1000
Subject: [PATCH 023/688] Release 1.4.0.1-rc.3

---
 packages/meteor-tool/package.js                | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 5f571e4cad..241dfbffdf 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.0-1-rc.2'
+  version: '1.4.0-1-rc.3'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4476f8bab3..acf7469cac 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.0.1-rc.2",
+ "version": "1.4.0.1-rc.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 821fa36fcd6ee9365d6da975a0355b3d13d58fcc Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 16:02:45 +1000
Subject: [PATCH 024/688] Update changelog for 1.4.0.1 release

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index 13c1d4f198..9f642f9e67 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 ## v.NEXT
 
+## v1.4.0.1
+
+* Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))
+
+* Fix issue with running in development on Linux 32bit [Issue #7511](https://github.com/meteor/meteor/issues/7511)
+
 ## v1.4
 
 * Node has been upgraded to 4.4.7.

From 67c3664e167e147c7c10042dd3f540653df6da78 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 29 Jul 2016 16:06:55 +1000
Subject: [PATCH 025/688] Preparing 1.4.0.1 release

---
 packages/meteor-tool/package.js            | 2 +-
 scripts/admin/meteor-release-official.json | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 241dfbffdf..09098a8829 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.0-1-rc.3'
+  version: '1.4.0-1'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 996cb5ecf3..3940331155 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,7 +1,8 @@
 {
   "track": "METEOR",
-  "version": "1.4",
+  "version": "1.4.0.1",
   "recommended": false,
   "official": true,
-  "description": "The Official Meteor Distribution"
+  "description": "The Official Meteor Distribution",
+  "patchFrom": ["1.4"]
 }

From 57a28eafff7c173f4889ff1feec5940f36cc12e1 Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Sat, 30 Jul 2016 04:43:53 +0800
Subject: [PATCH 026/688] Have `meteor update` explain how to update cordova
 packages (#7233)

---
 tools/cli/commands-packages.js | 40 +++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 901e3f5c5d..d93a4b4aab 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1621,6 +1621,34 @@ main.registerCommand({
     upgradePackageNames = options.args;
   }
 
+  const upgradePackagesWithoutCordova =
+    upgradePackageNames.filter(name => name.split(':')[0] !== 'cordova');
+  if (!_.isEqual(upgradePackagesWithoutCordova, upgradePackageNames)) {
+    // There are some cordova packages in the list to update.
+    // We should tell users how to update cordova packages.
+    Console.warn();
+    Console.warn("To add/upgrade a Cordova plugin in your Meteor project, run:");
+    Console.warn();
+    Console.warn(
+      Console.command("meteor add cordova:PLUGIN-NAME@x.y.z"),
+      Console.options({ indent: 2 }));
+    Console.warn();
+    Console.warn("The 'PLUGIN-NAME' should be an official plugin name",
+      "(e.g. cordova-plugin-media) and the 'x.y.z' should be an available version of",
+      "the plugin. The latest version can be found with the following command:");
+    Console.warn();
+    Console.warn(
+      Console.command("meteor npm view PLUGIN-NAME version"),
+      Console.options({ indent: 2 }));
+    if (upgradePackagesWithoutCordova.length !== 0) {
+      Console.warn();
+      Console.warn('The non-Cordova packages will now be updated...');
+    }
+    Console.warn();
+    // Exclude cordova packages
+    upgradePackageNames = upgradePackagesWithoutCordova;
+  }
+
   // Try to resolve constraints, allowing the given packages to be upgraded.
   projectContext.reset({
     upgradePackageNames: upgradePackageNames,
@@ -1635,11 +1663,13 @@ main.registerCommand({
 
       // If the user explicitly mentioned some packages to upgrade, they must
       // actually end up in our solution!
-      _.each(options.args, function (packageName) {
-        if (! projectContext.packageMap.getInfo(packageName)) {
-          buildmessage.error(packageName + ': package is not in the project');
-        }
-      });
+      if (options.args.length !== 0) {
+        _.each(upgradePackageNames, function (packageName) {
+          if (! projectContext.packageMap.getInfo(packageName)) {
+            buildmessage.error(packageName + ': package is not in the project');
+          }
+        });
+      }
       if (buildmessage.jobHasMessages()) {
         return;
       }

From a850b91f2512d70178af6c70f8d29f8818e45774 Mon Sep 17 00:00:00 2001
From: Birk Skyum <birkskyum@gmail.com>
Date: Sat, 30 Jul 2016 19:22:51 +0200
Subject: [PATCH 027/688] Update README.md

Use the install command shown at https://www.meteor.com/install
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 021c811f0d..f27f3c1ff5 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Next, read the [guide](http://guide.meteor.com) or the reference documentation a
 Install Meteor:
 
 ```bash
-curl https://install.meteor.com | /bin/sh
+curl https://install.meteor.com/ | sh
 ```
 
 Create a project:

From 7769951ee888f16512c601676de6c682c8a43467 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Mon, 1 Aug 2016 17:55:37 +1000
Subject: [PATCH 028/688] Switched to concat-stream for performance

---
 scripts/dev-bundle-tool-package.js |  2 +-
 tools/tests/utils-tests.js         |  1 +
 tools/utils/http-helpers.js        | 26 ++++++++++++--------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 0649543971..f85665143a 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -55,7 +55,7 @@ var packageJson = {
     'lru-cache': '2.6.4',
     'cordova-lib': "6.0.0",
     longjohn: '0.2.11',
-    'stream-buffers': '3.0.0'
+    'concat-stream': '1.5.1'
   }
 };
 
diff --git a/tools/tests/utils-tests.js b/tools/tests/utils-tests.js
index 3cf172e30e..659763a138 100644
--- a/tools/tests/utils-tests.js
+++ b/tools/tests/utils-tests.js
@@ -177,6 +177,7 @@ selftest.define("resume downloads", ['net'], function () {
             ++interruptCount;
             request.emit('error', 'pretend-http-error');
             request.emit('end');
+            request.abort();
           }
         });
       }
diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index 017f069e41..59485738bb 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -14,7 +14,7 @@ var release = require('../packaging/release.js');
 var Console = require('../console/console.js').Console;
 var timeoutScaleFactor = require('./utils.js').timeoutScaleFactor;
 
-import { WritableStreamBuffer } from 'stream-buffers';
+import concatStream from 'concat-stream';
 
 // Helper that tracks bytes written to a writable
 var WritableWithProgress = function (writable, listener) {
@@ -393,8 +393,6 @@ _.extend(exports, {
       url: urlOrOptions,
     };
 
-    const outputStream = new WritableStreamBuffer();
-
     const maxAttempts =
       _.has(options, "maxAttempts")
       ? options.maxAttempts : 10;
@@ -404,13 +402,13 @@ _.extend(exports, {
       ? options.retryDelaySecs : 5;
 
     const masterProgress = options.progress;
+    const outputStream = concatStream();
 
-    let lastSize = 0;
-    function attempt(triesRemaining) {
-      if (lastSize > 0) {
+    function attempt(triesRemaining = maxAttempts, startAt = 0) {
+      if (startAt > 0) {
         options.headers = {
           ...options.headers,
-          Range: `bytes=${outputStream.size()}-`
+          Range: `bytes=${startAt}-`
         };
       }
 
@@ -428,10 +426,9 @@ _.extend(exports, {
         }));
 
       } catch (e) {
-        const size = outputStream.size();
-        const useTry = size === lastSize;
-        const change = size - lastSize;
-        lastSize = outputStream.size();
+        const size = _.reduce(outputStream.body, (s, buf) => s + buf.length, 0);
+        const useTry = size === startAt;
+        const change = size - startAt;
 
         if (!useTry || triesRemaining > 0) {
           if (useTry) {
@@ -442,7 +439,7 @@ _.extend(exports, {
 
           return new Promise(
             resolve => setTimeout(resolve, retryDelaySecs * 1000)
-          ).then(() => attempt(triesRemaining - (useTry ? 1 : 0)));
+          ).then(() => attempt(triesRemaining - (useTry ? 1 : 0), size));
         }
 
         Console.debug(`Request failed ${maxAttempts} times: failing`);
@@ -450,13 +447,14 @@ _.extend(exports, {
       }
     }
 
-    const result = attempt(maxAttempts).await();
+
+    const result = attempt().await();
     const response = result.response
     if (response.statusCode >= 400 && response.statusCode < 600) {
       const href = response.request.href;
       throw Error(`Could not get ${href}; server returned [${response.statusCode}]`);
     }
 
-    return outputStream.getContents();
+    return outputStream.getBody();
   }
 });

From 155fa2e2479fda99ab913979a8f6b8e1114568f7 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Mon, 1 Aug 2016 18:03:21 +1000
Subject: [PATCH 029/688] dev bundle 4.2.1

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index a46bca511c..09fda2a280 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.0
+BUNDLE_VERSION=4.2.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From bb8e1a3b9f92172b50d4d8169e928d5c8890ee79 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 14:42:22 -0400
Subject: [PATCH 030/688] Implement ConcatStream class instead of using
 concat-stream npm package.

---
 scripts/dev-bundle-tool-package.js |  3 +--
 tools/utils/http-helpers.js        | 31 ++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index f85665143a..fd75a4d7a5 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -54,8 +54,7 @@ var packageJson = {
     runas: "3.1.1",
     'lru-cache': '2.6.4',
     'cordova-lib': "6.0.0",
-    longjohn: '0.2.11',
-    'concat-stream': '1.5.1'
+    longjohn: '0.2.11'
   }
 };
 
diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index 59485738bb..673da536b7 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -14,7 +14,30 @@ var release = require('../packaging/release.js');
 var Console = require('../console/console.js').Console;
 var timeoutScaleFactor = require('./utils.js').timeoutScaleFactor;
 
-import concatStream from 'concat-stream';
+import { Writable } from "stream";
+
+class ConcatStream extends Writable {
+  constructor() {
+    super();
+    this.chunks = [];
+    this.size = 0;
+  }
+
+  _write(chunk, encoding, next) {
+    this.chunks.push(chunk);
+    this.size += chunk.length;
+    next();
+  }
+
+  getBuffer() {
+    if (this.chunks.length !== 1) {
+      this.chunks[0] = Buffer.concat(this.chunks);
+      this.chunks.length = 1;
+    }
+
+    return this.chunks[0];
+  }
+}
 
 // Helper that tracks bytes written to a writable
 var WritableWithProgress = function (writable, listener) {
@@ -402,7 +425,7 @@ _.extend(exports, {
       ? options.retryDelaySecs : 5;
 
     const masterProgress = options.progress;
-    const outputStream = concatStream();
+    const outputStream = new ConcatStream();
 
     function attempt(triesRemaining = maxAttempts, startAt = 0) {
       if (startAt > 0) {
@@ -426,7 +449,7 @@ _.extend(exports, {
         }));
 
       } catch (e) {
-        const size = _.reduce(outputStream.body, (s, buf) => s + buf.length, 0);
+        const size = outputStream.size;
         const useTry = size === startAt;
         const change = size - startAt;
 
@@ -455,6 +478,6 @@ _.extend(exports, {
       throw Error(`Could not get ${href}; server returned [${response.statusCode}]`);
     }
 
-    return outputStream.getBody();
+    return outputStream.getBuffer();
   }
 });

From 3dac486a94275b181c964053e8638fb8d04456b2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 14:42:45 -0400
Subject: [PATCH 031/688] Bump $BUNDLE_VERSION to 4.2.2 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 09fda2a280..fb80725cda 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.1
+BUNDLE_VERSION=4.2.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From c475ffc1617fc9d8d7f19a988f5bcd057f896152 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 19:01:28 -0400
Subject: [PATCH 032/688] Create .meteor/local directory if necessary for
 `meteor {node,npm}`.

Fixes #7546.
---
 tools/cli/dev-bundle.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/cli/dev-bundle.js b/tools/cli/dev-bundle.js
index 9d291f4e80..6e032527fe 100644
--- a/tools/cli/dev-bundle.js
+++ b/tools/cli/dev-bundle.js
@@ -29,7 +29,11 @@ function getDevBundleDir() {
 
   var localDir = path.join(path.dirname(releaseFile), "local");
   if (! statOrNull(localDir, "isDirectory")) {
-    return defaultDevBundlePromise;
+    try {
+      fs.mkdirSync(localDir);
+    } catch (e) {
+      return defaultDevBundlePromise;
+    }
   }
 
   var devBundleLink = path.join(localDir, "dev_bundle");

From d411ba66d025e0f3d834379554861d50b22b5fa5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 23:58:20 -0400
Subject: [PATCH 033/688] Use native Node aes-gcm support in oauth-encryption
 package.

---
 packages/oauth-encryption/encrypt.js | 41 ++++++++++++++--------------
 packages/oauth-encryption/package.js |  9 +++---
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/oauth-encryption/encrypt.js b/packages/oauth-encryption/encrypt.js
index f0bb10fdac..ab1ad42140 100644
--- a/packages/oauth-encryption/encrypt.js
+++ b/packages/oauth-encryption/encrypt.js
@@ -1,12 +1,6 @@
-var crypto = Npm.require("crypto");
-// XXX We hope to be able to use the `crypto` module exclusively when
-// Node supports GCM in version 0.11.
-var gcm = NpmModuleNodeAesGcm;
-
-OAuthEncryption = {};
-
+var crypto = require("crypto");
 var gcmKey = null;
-
+var OAuthEncryption = exports.OAuthEncryption = {};
 
 // Node leniently ignores non-base64 characters when parsing a base64
 // string, but we want to provide a more informative error message if
@@ -67,13 +61,19 @@ OAuthEncryption.seal = function (data, userId) {
     data: data,
     userId: userId
   }));
+
   var iv = crypto.randomBytes(12);
-  var result = gcm.encrypt(gcmKey, iv, plaintext, new Buffer([]) /* aad */);
+  var cipher = crypto.createCipheriv("aes-128-gcm", gcmKey, iv);
+  cipher.setAAD(new Buffer([]));
+  var chunks = [cipher.update(plaintext)];
+  chunks.push(cipher.final());
+  var encrypted = Buffer.concat(chunks);
+
   return {
     iv: iv.toString("base64"),
-    ciphertext: result.ciphertext.toString("base64"),
+    ciphertext: encrypted.toString("base64"),
     algorithm: "aes-128-gcm",
-    authTag: result.auth_tag.toString("base64")
+    authTag: cipher.getAuthTag().toString("base64")
   };
 };
 
@@ -96,23 +96,24 @@ OAuthEncryption.open = function (ciphertext, userId) {
       throw new Error();
     }
 
-    var result = gcm.decrypt(
+    var decipher = crypto.createDecipheriv(
+      "aes-128-gcm",
       gcmKey,
-      new Buffer(ciphertext.iv, "base64"),
-      new Buffer(ciphertext.ciphertext, "base64"),
-      new Buffer([]), /* aad */
-      new Buffer(ciphertext.authTag, "base64")
+      new Buffer(ciphertext.iv, "base64")
     );
 
-    if (! result.auth_ok) {
-      throw new Error();
-    }
+    decipher.setAAD(new Buffer([]));
+    decipher.setAuthTag(new Buffer(ciphertext.authTag, "base64"));
+    var chunks = [decipher.update(
+      new Buffer(ciphertext.ciphertext, "base64"))];
+    chunks.push(decipher.final());
+    var plaintext = Buffer.concat(chunks).toString("utf8");
 
     var err;
     var data;
 
     try {
-      data = EJSON.parse(result.plaintext.toString());
+      data = EJSON.parse(plaintext);
     } catch (e) {
       err = new Error();
     }
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 14609f0702..be1817470a 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,17 +1,16 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.1.13'
+  version: '1.2.0'
 });
 
 Package.onUse(function (api) {
-  api.use("npm-node-aes-gcm@=0.1.7_4");
-
-  api.export("OAuthEncryption", ["server"]);
   api.use([
+    "modules",
     "underscore",
     "ejson"
   ]);
-  api.addFiles("encrypt.js", ["server"]);
+  api.mainModule("encrypt.js", "server");
+  api.export("OAuthEncryption", "server");
 });
 
 Package.onTest(function (api) {

From accde8048f966fe74737268e7fe17a6df52ed023 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 Aug 2016 00:00:44 -0400
Subject: [PATCH 034/688] Remove now-unused npm-node-aes-gcm package.

---
 packages/non-core/npm-node-aes-gcm/.gitignore |  1 -
 .../npm-node-aes-gcm/.npm/package/.gitignore  |  1 -
 .../npm-node-aes-gcm/.npm/package/README      |  7 ------
 .../.npm/package/npm-shrinkwrap.json          | 23 -------------------
 packages/non-core/npm-node-aes-gcm/.versions  |  3 ---
 packages/non-core/npm-node-aes-gcm/README.md  |  3 ---
 packages/non-core/npm-node-aes-gcm/package.js | 15 ------------
 packages/non-core/npm-node-aes-gcm/wrapper.js | 14 -----------
 8 files changed, 67 deletions(-)
 delete mode 100644 packages/non-core/npm-node-aes-gcm/.gitignore
 delete mode 100644 packages/non-core/npm-node-aes-gcm/.npm/package/.gitignore
 delete mode 100644 packages/non-core/npm-node-aes-gcm/.npm/package/README
 delete mode 100644 packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/npm-node-aes-gcm/.versions
 delete mode 100644 packages/non-core/npm-node-aes-gcm/README.md
 delete mode 100644 packages/non-core/npm-node-aes-gcm/package.js
 delete mode 100644 packages/non-core/npm-node-aes-gcm/wrapper.js

diff --git a/packages/non-core/npm-node-aes-gcm/.gitignore b/packages/non-core/npm-node-aes-gcm/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/non-core/npm-node-aes-gcm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/non-core/npm-node-aes-gcm/.npm/package/.gitignore b/packages/non-core/npm-node-aes-gcm/.npm/package/.gitignore
deleted file mode 100644
index 3c3629e647..0000000000
--- a/packages/non-core/npm-node-aes-gcm/.npm/package/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/non-core/npm-node-aes-gcm/.npm/package/README b/packages/non-core/npm-node-aes-gcm/.npm/package/README
deleted file mode 100644
index 3d492553a4..0000000000
--- a/packages/non-core/npm-node-aes-gcm/.npm/package/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated
-when you change this package's NPM dependencies. Commit the files in this
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
-so that others run the same versions of sub-dependencies.
-
-You should NOT check in the node_modules directory that Meteor automatically
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json b/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index eb10313104..0000000000
--- a/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "dependencies": {
-    "meteor-node-aes-gcm": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/meteor-node-aes-gcm/-/meteor-node-aes-gcm-0.1.7.tgz",
-      "from": "meteor-node-aes-gcm@0.1.7",
-      "dependencies": {
-        "node-aes-gcm": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/node-aes-gcm/-/node-aes-gcm-0.1.7.tgz",
-          "from": "node-aes-gcm@0.1.7",
-          "dependencies": {
-            "nan": {
-              "version": "2.3.3",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.3.tgz",
-              "from": "nan@>=2.3.0 <2.4.0"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/packages/non-core/npm-node-aes-gcm/.versions b/packages/non-core/npm-node-aes-gcm/.versions
deleted file mode 100644
index 3e3de6dc43..0000000000
--- a/packages/non-core/npm-node-aes-gcm/.versions
+++ /dev/null
@@ -1,3 +0,0 @@
-meteor@1.1.16
-npm-node-aes-gcm@0.1.5_2
-underscore@1.0.9
diff --git a/packages/non-core/npm-node-aes-gcm/README.md b/packages/non-core/npm-node-aes-gcm/README.md
deleted file mode 100644
index 65878320f3..0000000000
--- a/packages/non-core/npm-node-aes-gcm/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## Using this package on Windows
-
-This package uses the [node-aes-gcm](https://github.com/xorbit/node-aes-gcm) NPM module, which requires you to have OpenSSL installed on your system to run. To install OpenSSL on Windows, use one of the binaries on [this page](http://slproweb.com/products/Win32OpenSSL.html). Don't forget to install the Visual Studio 2008 redistributables if you don't have them yet.
diff --git a/packages/non-core/npm-node-aes-gcm/package.js b/packages/non-core/npm-node-aes-gcm/package.js
deleted file mode 100644
index 20a82e1adc..0000000000
--- a/packages/non-core/npm-node-aes-gcm/package.js
+++ /dev/null
@@ -1,15 +0,0 @@
-Package.describe({
-  summary: "Wrapper around the node-aes-gcm npm package",
-  version: '0.1.7_4',
-  documentation: null
-});
-
-Npm.depends({
-  'meteor-node-aes-gcm': '0.1.7'
-});
-
-Package.onUse(function (api) {
-  api.use("modules@0.6.1");
-  api.export('NpmModuleNodeAesGcm', 'server');
-  api.addFiles('wrapper.js', 'server');
-});
diff --git a/packages/non-core/npm-node-aes-gcm/wrapper.js b/packages/non-core/npm-node-aes-gcm/wrapper.js
deleted file mode 100644
index 9e944ded31..0000000000
--- a/packages/non-core/npm-node-aes-gcm/wrapper.js
+++ /dev/null
@@ -1,14 +0,0 @@
-try {
-  NpmModuleNodeAesGcm = require('meteor-node-aes-gcm');
-} catch (err) {
-  if (process.platform === "win32" &&
-    err.message.match(/specified module could not be found/)) {
-    // the user probably doesn't have OpenSSL installed.
-    throw new Error(
-"Couldn't load the package 'meteor-node-aes-gcm'. This is probably because you " +
-"don't have OpenSSL installed. See the README for details and directions: " +
-"https://github.com/meteor/meteor/blob/devel/packages/non-core/npm-node-aes-gcm/README.md");
-  } else {
-    throw err;
-  }
-}

From d4ab84df65c196a1a074e449c1a53de1f9bd23f5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 Aug 2016 10:31:32 -0400
Subject: [PATCH 035/688] Update inaccurate comment about AAD data.

https://github.com/meteor/meteor/pull/7548#issuecomment-236916851
---
 packages/oauth-encryption/encrypt.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/oauth-encryption/encrypt.js b/packages/oauth-encryption/encrypt.js
index ab1ad42140..0c6f895fc1 100644
--- a/packages/oauth-encryption/encrypt.js
+++ b/packages/oauth-encryption/encrypt.js
@@ -48,9 +48,10 @@ OAuthEncryption.loadKey = function (key) {
 // credentials such as access tokens from being used by a different
 // user.
 //
-// We would actually like the user id to be AAD (additional
-// authenticated data), but the node crypto API does not currently have
-// support for specifying AAD.
+// We might someday like the user id to be AAD (additional authenticated
+// data), but the Node 0.10.x crypto API did not support specifying AAD,
+// and it's not clear that we want to incur the compatibility issues of
+// relying on that feature, even though it's now supported by Node 4.
 //
 OAuthEncryption.seal = function (data, userId) {
   if (! gcmKey) {

From f834b59b5238da1ec25c1232ba765b39b03bfae0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 Aug 2016 10:34:13 -0400
Subject: [PATCH 036/688] Remove underscore dependency from oauth-encryption.

---
 packages/oauth-encryption/encrypt.js | 9 +++++++--
 packages/oauth-encryption/package.js | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/oauth-encryption/encrypt.js b/packages/oauth-encryption/encrypt.js
index 0c6f895fc1..d174c96ba5 100644
--- a/packages/oauth-encryption/encrypt.js
+++ b/packages/oauth-encryption/encrypt.js
@@ -1,6 +1,11 @@
 var crypto = require("crypto");
 var gcmKey = null;
 var OAuthEncryption = exports.OAuthEncryption = {};
+var objToStr = Object.prototype.toString;
+
+function isString(value) {
+  return objToStr.call(value) === "[object String]";
+}
 
 // Node leniently ignores non-base64 characters when parsing a base64
 // string, but we want to provide a more informative error message if
@@ -11,7 +16,7 @@ var OAuthEncryption = exports.OAuthEncryption = {};
 // Exported for the convenience of tests.
 //
 OAuthEncryption._isBase64 = function (str) {
-  return _.isString(str) && /^[A-Za-z0-9\+\/]*\={0,2}$/.test(str);
+  return isString(str) && /^[A-Za-z0-9\+\/]*\={0,2}$/.test(str);
 };
 
 
@@ -139,7 +144,7 @@ OAuthEncryption.isSealed = function (maybeCipherText) {
     OAuthEncryption._isBase64(maybeCipherText.iv) &&
     OAuthEncryption._isBase64(maybeCipherText.ciphertext) &&
     OAuthEncryption._isBase64(maybeCipherText.authTag) &&
-    _.isString(maybeCipherText.algorithm);
+    isString(maybeCipherText.algorithm);
 };
 
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index be1817470a..7a86ce918a 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -6,7 +6,6 @@ Package.describe({
 Package.onUse(function (api) {
   api.use([
     "modules",
-    "underscore",
     "ejson"
   ]);
   api.mainModule("encrypt.js", "server");

From b8539357101da597778ddc982b580af951b65938 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 Aug 2016 10:37:30 -0400
Subject: [PATCH 037/688] Specify version constraints for modules and ejson in
 oauth-encryption.

---
 packages/oauth-encryption/package.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 7a86ce918a..6712d1363c 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -4,10 +4,8 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
-  api.use([
-    "modules",
-    "ejson"
-  ]);
+  api.use("modules@0.7.5", "server");
+  api.use("ejson@1.0.12", "server");
   api.mainModule("encrypt.js", "server");
   api.export("OAuthEncryption", "server");
 });

From b165d3e935e38a60c306d17864141c36bdaa8ad7 Mon Sep 17 00:00:00 2001
From: Guillaume Sabran <sabranguillaume@gmail.com>
Date: Tue, 2 Aug 2016 09:32:36 -0700
Subject: [PATCH 038/688] Attach to the Facebook scope the function to get fb
 data from an access token

---
 packages/facebook/facebook_server.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/facebook/facebook_server.js b/packages/facebook/facebook_server.js
index 36ddb48b03..c52ab64ce9 100644
--- a/packages/facebook/facebook_server.js
+++ b/packages/facebook/facebook_server.js
@@ -2,12 +2,7 @@ Facebook = {};
 
 var querystring = Npm.require('querystring');
 
-
-OAuth.registerService('facebook', 2, null, function(query) {
-
-  var response = getTokenResponse(query);
-  var accessToken = response.accessToken;
-
+Facebook.handleAuthFromAccessToken = function handleAuthFromAccessToken(accessToken, expiresAt) {
   // include all fields from facebook
   // http://developers.facebook.com/docs/reference/login/public-profile-and-friend-list/
   var whitelisted = ['id', 'email', 'name', 'first_name',
@@ -17,10 +12,9 @@ OAuth.registerService('facebook', 2, null, function(query) {
 
   var serviceData = {
     accessToken: accessToken,
-    expiresAt: (+new Date) + (1000 * response.expiresIn)
+    expiresAt: expiresAt
   };
 
-
   var fields = _.pick(identity, whitelisted);
   _.extend(serviceData, fields);
 
@@ -28,6 +22,14 @@ OAuth.registerService('facebook', 2, null, function(query) {
     serviceData: serviceData,
     options: {profile: {name: identity.name}}
   };
+};
+
+OAuth.registerService('facebook', 2, null, function(query) {
+  var response = getTokenResponse(query);
+  var accessToken = response.accessToken;
+  var expiresIn = response.expiresIn;
+
+  return Facebook.handleAuthFromAccessToken(accessToken, (+new Date) + (1000 * expiresIn));
 });
 
 // checks whether a string parses as JSON

From 46b9f128ce113d16e304415600dbbb22b0989c59 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 3 Aug 2016 09:15:35 +1000
Subject: [PATCH 039/688] Added some history messages for merged PRs

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index 283316a19f..a3013e786e 100644
--- a/History.md
+++ b/History.md
@@ -8,6 +8,12 @@
   reduces the amount of permissions requested from the user in the Google
   popup. [PR #6975](https://github.com/meteor/meteor/pull/6975)
 
+* Added `Facebook.handleAuthFromAccessToken` in the case where you get the FB
+  accessToken in some out-of-band way. [PR #7550](https://github.com/meteor/meteor/pull/7550)
+
+* `Accounts.onLogout` gets `{ user, connection }` context in a similar fashion
+  to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issue/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
+
 ## v1.4.0.1
 
 * Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))

From 8ac556b993627cf06cc98565396cb27692adc33a Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Tue, 26 Jul 2016 22:17:04 +0800
Subject: [PATCH 040/688] Fix source map header

---
 tools/isobuild/linker.js | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index d9d084dfa5..823aa584e1 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -1057,27 +1057,28 @@ export var fullLink = Profile("linker.fullLink", function (inputFiles, {
     name
   });
 
+  if (includeSourceMapInstructions) {
+    header = SOURCE_MAP_INSTRUCTIONS_COMMENT + "\n\n" + header;
+  }
+
+  // Bias the source map by the length of the header without
+  // (fully) parsing and re-serializing it. (We used to do this
+  // with the source-map library, but it was incredibly slow,
+  // accounting for over half of bundling time.) It would be nice
+  // if we could use "index maps" for this (the 'sections' key),
+  // as that would let us avoid even JSON-parsing the source map,
+  // but that doesn't seem to be supported by Firefox yet.
+  if (header.charAt(header.length - 1) !== "\n") {
+    // make sure it's a whole number of lines
+    header += "\n";
+  }
+  var headerLines = header.split('\n').length - 1;
+  var headerContent = (new Array(headerLines + 1).join(';'));
+
   return _.map(prelinkedFiles, function (file) {
     if (file.sourceMap) {
-      if (includeSourceMapInstructions) {
-        header = SOURCE_MAP_INSTRUCTIONS_COMMENT + "\n\n" + header;
-      }
-
-      // Bias the source map by the length of the header without
-      // (fully) parsing and re-serializing it. (We used to do this
-      // with the source-map library, but it was incredibly slow,
-      // accounting for over half of bundling time.) It would be nice
-      // if we could use "index maps" for this (the 'sections' key),
-      // as that would let us avoid even JSON-parsing the source map,
-      // but that doesn't seem to be supported by Firefox yet.
-      if (header.charAt(header.length - 1) !== "\n") {
-        // make sure it's a whole number of lines
-        header += "\n";
-      }
-      var headerLines = header.split('\n').length - 1;
       var sourceMap = file.sourceMap;
-      sourceMap.mappings = (new Array(headerLines + 1).join(';')) +
-        sourceMap.mappings;
+      sourceMap.mappings = headerContent + sourceMap.mappings;
       return {
         source: header + file.source + footer,
         sourcePath: file.sourcePath,

From e4dd8684b1ead95bfa7d5668c01e2a4208909168 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Tue, 2 Aug 2016 22:51:00 -0700
Subject: [PATCH 041/688] CoffeeScript compiling badly interacts with Babel.

---
 packages/coffeescript-test-helper/exporting.coffee | 14 ++++++++++++++
 packages/coffeescript-test-helper/package.js       |  2 ++
 packages/coffeescript/tests/coffeescript_tests.js  |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/packages/coffeescript-test-helper/exporting.coffee b/packages/coffeescript-test-helper/exporting.coffee
index eb75de9f7d..93e4873187 100644
--- a/packages/coffeescript-test-helper/exporting.coffee
+++ b/packages/coffeescript-test-helper/exporting.coffee
@@ -1 +1,15 @@
 COFFEESCRIPT_EXPORTED = 123
+COFFEESCRIPT_EXPORTED_ONE_MORE = 234
+
+# Having backticks in the code is required to trigger Babel processing
+# the file and re-wrapping the list of defined variables.
+`COFFEESCRIPT_EXPORTED_WITH_BACKTICKS = 345`
+
+# Defining a class which extends a new class forces CoffeeScript
+# to define an "extend" function, which then in turn forces Babel
+# to re-wrap the list of defined variables so that each is defined
+# in its own line.
+
+class TestClass
+
+class ClassExtending extends TestClass
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index ec5f594029..4d8549bdb8 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -6,5 +6,7 @@ Package.describe({
 Package.onUse(function (api) {
   api.use('coffeescript', ['client', 'server']);
   api.export('COFFEESCRIPT_EXPORTED');
+  api.export('COFFEESCRIPT_EXPORTED_ONE_MORE');
+  api.export('COFFEESCRIPT_EXPORTED_WITH_BACKTICKS');
   api.addFiles("exporting.coffee", ['client', 'server']);
 });
diff --git a/packages/coffeescript/tests/coffeescript_tests.js b/packages/coffeescript/tests/coffeescript_tests.js
index 033d7f9082..df127d2cc3 100644
--- a/packages/coffeescript/tests/coffeescript_tests.js
+++ b/packages/coffeescript/tests/coffeescript_tests.js
@@ -9,4 +9,8 @@ Tinytest.add("literate coffeescript - presence", function(test) {
 Tinytest.add("coffeescript - exported variable", function(test) {
   test.equal(COFFEESCRIPT_EXPORTED, 123);
   test.equal(Package['coffeescript-test-helper'].COFFEESCRIPT_EXPORTED, 123);
+  test.equal(COFFEESCRIPT_EXPORTED_ONE_MORE, 234);
+  test.equal(Package['coffeescript-test-helper'].COFFEESCRIPT_EXPORTED_ONE_MORE, 234);
+  test.equal(COFFEESCRIPT_EXPORTED_WITH_BACKTICKS, 345);
+  test.equal(Package['coffeescript-test-helper'].COFFEESCRIPT_EXPORTED_WITH_BACKTICKS, 345);
 });

From 4c31d680876001b2dd23d020153b91578b783e79 Mon Sep 17 00:00:00 2001
From: Benedikt Huss <benedikt.huss@gmail.com>
Date: Sun, 31 Jul 2016 13:04:36 +0200
Subject: [PATCH 042/688] Password reset tokens have now a default expiration
 time of 3 days

---
 packages/accounts-base/accounts_common.js     | 13 +++-
 packages/accounts-base/accounts_server.js     | 36 ++++++++++
 packages/accounts-password/password_server.js |  5 ++
 packages/accounts-password/password_tests.js  | 69 +++++++++++++++++++
 4 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 8282789cfa..aea362c462 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -83,6 +83,9 @@ export class AccountsCommon {
   // - loginExpirationInDays {Number}
   //     Number of days since login until a user is logged out (login token
   //     expires).
+  // - passwordResetTokenExpirationInDays {Number}
+  //     Number of days since password reset token creation until the
+  //     token cannt be used any longer (password reset token expires).
 
   /**
    * @summary Set global accounts options.
@@ -93,6 +96,7 @@ export class AccountsCommon {
    * @param {String | Function} options.restrictCreationByEmailDomain If set to a string, only allows new users if the domain part of their email address matches the string. If set to a function, only allows new users if the function returns true.  The function is passed the full email address of the proposed new user.  Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmailDomain: 'school.edu' })`.
    * @param {Number} options.loginExpirationInDays The number of days from when a user logs in until their token expires and they are logged out. Defaults to 90. Set to `null` to disable login expiration.
    * @param {String} options.oauthSecretKey When using the `oauth-encryption` package, the 16 byte key using to encrypt sensitive account credentials in the database, encoded in base64.  This option may only be specifed on the server.  See packages/oauth-encryption/README.md for details.
+   * @param {Number} options.passwordResetTokenExpirationInDays The number of days from when a link to reset password is sent until token expires and user can't reset password with the link anymore. Defaults to 3.
    */
   config(options) {
     var self = this;
@@ -125,7 +129,7 @@ export class AccountsCommon {
 
     // validate option keys
     var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                      "restrictCreationByEmailDomain", "loginExpirationInDays"];
+                      "restrictCreationByEmailDomain", "loginExpirationInDays", "passwordResetTokenExpirationInDays"];
     _.each(_.keys(options), function (key) {
       if (!_.contains(VALID_KEYS, key)) {
         throw new Error("Accounts.config: Invalid key: " + key);
@@ -208,6 +212,11 @@ export class AccountsCommon {
             DEFAULT_LOGIN_EXPIRATION_DAYS) * 24 * 60 * 60 * 1000;
   }
 
+  _getPasswordResetTokenLifetimeMs() {
+   return (this._options.passwordResetTokenExpirationInDays ||
+            DEFAULT_PASSWORD_RESET_TOKEN_EXPIRATION_DAYS) * 24 * 60 * 60 * 1000;
+  }
+
   _tokenExpiration(when) {
     // We pass when through the Date constructor for backwards compatibility;
     // `when` used to be a number.
@@ -248,6 +257,8 @@ Meteor.user = function () {
 
 // how long (in days) until a login token expires
 var DEFAULT_LOGIN_EXPIRATION_DAYS = 90;
+// how long (in days) until reset password token expires
+var DEFAULT_PASSWORD_RESET_TOKEN_EXPIRATION_DAYS = 3;
 // Clients don't try to auto-login with a token that is going to expire within
 // .1 * DEFAULT_LOGIN_EXPIRATION_DAYS, capped at MIN_TOKEN_LIFETIME_CAP_SECS.
 // Tries to avoid abrupt disconnects from expiring tokens.
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index b81dd40482..76f68048b6 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1115,6 +1115,41 @@ Ap._expireTokens = function (oldestValidDate, userId) {
   // expired tokens.
 };
 
+// Deletes expired password reset tokens from the database.
+//
+// Exported for tests. Also, the arguments are only used by
+// tests. oldestValidDate is simulate expiring tokens without waiting
+// for them to actually expire. userId is used by tests to only expire
+// tokens for the test user.
+Ap._expirePasswordResetTokens = function (oldestValidDate, userId) {
+  var tokenLiftetimeMs = this. _getPasswordResetTokenLifetimeMs();
+
+  // when calling from a test with extra arguments, you must specify both!
+  if ((oldestValidDate && !userId) || (!oldestValidDate && userId)) {
+    throw new Error("Bad test. Must specify both oldestValidDate and userId.");
+  }
+
+  oldestValidDate = oldestValidDate ||
+    (new Date(new Date() - tokenLifetimeMs));
+  var userFilter = userId ? {_id: userId} : {};
+
+  this.users.update(_.extend(userFilter, {
+    $or: [
+      { "services.password.reset.when": { $lt: oldestValidDate } },
+      { "services.password.reset.when": { $lt: +oldestValidDate } }
+    ]
+  }), {
+    $pull: {
+      "services.password.reset": {
+        $or: [
+          { when: { $lt: oldestValidDate } },
+          { when: { $lt: +oldestValidDate } }
+        ]
+      }
+    }
+  }, { multi: true });
+}
+
 // @override from accounts_common.js
 Ap.config = function (options) {
   // Call the overridden implementation of the method.
@@ -1135,6 +1170,7 @@ Ap.config = function (options) {
 function setExpireTokensInterval(accounts) {
   accounts.expireTokenInterval = Meteor.setInterval(function () {
     accounts._expireTokens();
+    accounts._expirePasswordResetTokens();
   }, EXPIRE_TOKENS_INTERVAL_MS);
 }
 
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 0262386488..bd36804bb6 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -664,6 +664,11 @@ Meteor.methods({resetPassword: function (token, newPassword) {
         "services.password.reset.token": token});
       if (!user)
         throw new Meteor.Error(403, "Token expired");
+      var when = user.services.password.reset.when;
+      var tokenLifetimeMs = Accounts._getPasswordResetTokenLifetimeMs();
+      var currentTimeMs = Date.now();
+      if ((currentTimeMs - when) > tokenLifetimeMs)
+        throw new Meteor.Error(403, "Token expired");
       var email = user.services.password.reset.email;
       if (!_.include(_.pluck(user.emails || [], 'address'), email))
         return {
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index b6f831d6f6..248ac13fbf 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1392,6 +1392,75 @@ if (Meteor.isServer) (function () {
       }, /Incorrect password/);
     });
 
+  Tinytest.add(
+    'passwords - reset password should work when token is not expired',
+    function (test, onComplete) {
+      var username = Random.id();
+      var email = username + '-intercept@example.com';
+
+      var userId = Accounts.createUser({
+        username: username,
+        email: email,
+        password: "old-password"
+      });
+
+      var user = Meteor.users.findOne(userId);
+
+      Accounts.sendResetPasswordEmail(userId, email);
+
+      var resetPasswordEmailOptions =
+        Meteor.call("getInterceptedEmails", email)[0];
+
+      var re = new RegExp(Meteor.absoluteUrl() + "#/reset-password/(\\S*)");
+      var match = resetPasswordEmailOptions.text.match(re);
+      test.isTrue(match);
+      var resetPasswordToken = match[1];
+
+      makeTestConnection(
+        test,
+        function () {
+          
+          test.isTrue(Meteor.call("resetPassword", resetPasswordToken, "new-password"));
+          test.isTrue(Meteor.call("login", {user: {username: username}, password: "new-password"}));
+
+          onComplete();
+      });
+    });
+
+  Tinytest.add(
+    'passwords - reset password should not work when token is expired',
+    function (test) {
+      var username = Random.id();
+      var email = username + '-intercept@example.com';
+
+      var userId = Accounts.createUser({
+        username: username,
+        email: email,
+        password: "old-password"
+      });
+
+      var user = Meteor.users.findOne(userId);
+
+      Accounts.sendResetPasswordEmail(userId, email);
+
+      var resetPasswordEmailOptions =
+        Meteor.call("getInterceptedEmails", email)[0];
+
+      var re = new RegExp(Meteor.absoluteUrl() + "#/reset-password/(\\S*)");
+      var match = resetPasswordEmailOptions.text.match(re);
+      test.isTrue(match);
+      var resetPasswordToken = match[1];
+
+      Meteor.users.update(userId, {$set: {"services.password.reset.when":  new Date(Date.now() + -5 * 24 * 3600 * 1000) }});
+
+      test.throws(function () {
+        Meteor.call("resetPassword", resetPasswordToken, "new-password");
+      }, /Token expired/);
+      test.throws(function () {
+        Meteor.call("login", {user: {username: username}, password: "new-password"});
+      }, /Incorrect password/);
+    });
+
   // We should be able to change the username
   Tinytest.add("passwords - change username", function (test) {
     var username = Random.id();

From 36afd7f5c3d3ccb36f1002095d1eca8112f69215 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 15:18:34 -0400
Subject: [PATCH 043/688] Defend global.Promise against misbehaving polyfills.

---
 tools/tool-env/install-promise.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tools/tool-env/install-promise.js b/tools/tool-env/install-promise.js
index dc78ea6661..10dee1cf07 100644
--- a/tools/tool-env/install-promise.js
+++ b/tools/tool-env/install-promise.js
@@ -1,10 +1,24 @@
 // Install a global ES2015-compliant Promise constructor that knows how to
 // run all its callbacks in Fibers.
 
-var Promise = global.Promise = global.Promise ||
+var Promise = global.Promise ||
   require("promise/lib/es6-extensions");
 
-require("meteor-promise").makeCompatible(
-  Promise,
-  require("fibers")
-);
+function makeCompatible(newPromise) {
+  require("meteor-promise").makeCompatible(
+    newPromise,
+    require("fibers")
+  );
+}
+
+makeCompatible(Promise);
+
+Object.defineProperty(global, "Promise", {
+  get: function () {
+    return Promise;
+  },
+
+  // Make the new Promise compatible with Fibers, but do not allow further
+  // modifications to global.Promise, e.g. by misbehaving polyfills.
+  set: makeCompatible
+});

From 2de0fb59ef9023923ed4d0637808de66181e9bd5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 15:19:31 -0400
Subject: [PATCH 044/688] Make sure self-tests have a consistent runtime
 environment.

---
 tools/tool-testing/selftest.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 49d5e7445a..15fe71bd31 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -27,6 +27,8 @@ var release = require('../packaging/release.js');
 var projectContextModule = require('../project-context.js');
 var upgraders = require('../upgraders.js');
 
+require("../tool-env/install-runtime.js");
+
 try {
   var phantomjs = require('phantomjs-prebuilt');
 } catch (e) {

From 1d5ca820df83795aa16ebd18e96a2ae76ed404c8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 15:21:16 -0400
Subject: [PATCH 045/688] Don't swallow unexpected errors when checking for
 phantomjs-prebuilt.

---
 tools/tool-testing/selftest.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 15fe71bd31..c2ae7feb44 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -30,7 +30,7 @@ var upgraders = require('../upgraders.js');
 require("../tool-env/install-runtime.js");
 
 try {
-  var phantomjs = require('phantomjs-prebuilt');
+  var phantomPath = require.resolve('phantomjs-prebuilt');
 } catch (e) {
   throw new Error([
     "Please install PhantomJS by running the following command:",
@@ -42,6 +42,8 @@ try {
   ].join("\n"));
 }
 
+var phantomjs = require(phantomPath);
+
 // To allow long stack traces that cross async boundaries
 require('longjohn');
 

From a617ddaec288be4c77a3ff753b1e3f4dc2d58e2d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 15:50:18 -0400
Subject: [PATCH 046/688] Add node-gyp and node-pre-gyp to server node_modules.

This will help with running `npm rebuild` in bundle/programs/server,
fixing problems like #7568.
---
 scripts/dev-bundle-server-package.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 6c03d52c98..c4641e5125 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -9,6 +9,8 @@ var packageJson = {
   // Version is not important but is needed to prevent warnings.
   version: "0.0.0",
   dependencies: {
+    "node-gyp": "3.4.0",
+    "node-pre-gyp": "0.6.29",
     "meteor-promise": "0.7.2",
     fibers: "1.0.13",
     promise: "7.1.1",

From 83b0d901807949e3fb4e733d2ab895f9322e7b40 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 11:26:44 -0400
Subject: [PATCH 047/688] Fix multi-line input to `meteor shell`.

There is unfortunately no way to access the special Recoverable
constructor defined in node/lib/repl.js unless we temporarily use the
defaultEval function, trigger a recoverable error, and capture its
.constructor property. Fortunately we are that clever.

Fixes #7504.
---
 tools/static-assets/server/shell-server.js | 82 ++++++++++++++++++++--
 1 file changed, 75 insertions(+), 7 deletions(-)

diff --git a/tools/static-assets/server/shell-server.js b/tools/static-assets/server/shell-server.js
index 3e93047ab2..3f2c0e63be 100644
--- a/tools/static-assets/server/shell-server.js
+++ b/tools/static-assets/server/shell-server.js
@@ -176,7 +176,8 @@ Sp.onConnection = function onConnection(socket) {
     delete options.key;
 
     if (options.evaluateAndExit) {
-      evalCommand(
+      evalCommand.call(
+        Object.create(null), // Dummy repl object without ._RecoverableError.
         "(" + options.evaluateAndExit.command + ")",
         null, // evalCommand ignores the context parameter, anyway
         options.evaluateAndExit.filename || "<meteor shell>",
@@ -202,8 +203,7 @@ Sp.onConnection = function onConnection(socket) {
     // Immutable options.
     _.extend(options, {
       input: replInputSocket,
-      output: socket,
-      eval: evalCommand
+      output: socket
     });
 
     // Overridable options.
@@ -316,6 +316,26 @@ Sp.startREPL = function startREPL(options) {
       process.exit(0);
     }
   });
+
+  // Trigger one recoverable error using the default eval function, just
+  // to capture the Recoverable error constructor, so that our custom
+  // evalCommand function can wrap recoverable errors properly.
+  repl.eval(
+    "{", null, "<meteor shell>",
+    function (error) {
+      // Capture the Recoverable error constructor.
+      repl._RecoverableError = error && error.constructor;
+
+      // Now set repl.eval to the actual evalCommand function that we want
+      // to use, bound to repl._domain if necessary.
+      repl.eval = repl._domain
+        ? repl._domain.bind(evalCommand)
+        : evalCommand;
+
+      // Terminate the partial evaluation of the { command.
+      repl.commands["break"].action.call(repl);
+    }
+  );
 };
 
 function getInfoFile(shellDir) {
@@ -346,6 +366,21 @@ function getTerminalWidth() {
 var evalCommandPromise = Promise.resolve();
 
 function evalCommand(command, context, filename, callback) {
+  var repl = this;
+
+  function finish(error, result) {
+    if (error) {
+      if (repl._RecoverableError &&
+          isRecoverableError(error, repl)) {
+        callback(new repl._RecoverableError(error));
+      } else {
+        callback(error);
+      }
+    } else {
+      callback(null, result);
+    }
+  }
+
   if (Package.ecmascript) {
     var noParens = stripParens(command);
     if (noParens !== command) {
@@ -367,7 +402,7 @@ function evalCommand(command, context, filename, callback) {
     try {
       command = Package.ecmascript.ECMAScript.compileForShell(command);
     } catch (error) {
-      callback(error);
+      finish(error);
       return;
     }
   }
@@ -378,13 +413,13 @@ function evalCommand(command, context, filename, callback) {
       displayErrors: false
     });
   } catch (parseError) {
-    callback(parseError);
+    finish(parseError);
     return;
   }
 
   evalCommandPromise.then(function () {
-    callback(null, script.runInThisContext());
-  }).catch(callback);
+    finish(null, script.runInThisContext());
+  }).catch(finish);
 }
 
 function stripParens(command) {
@@ -395,6 +430,39 @@ function stripParens(command) {
   return command;
 }
 
+// The bailOnIllegalToken and isRecoverableError functions are taken from
+// https://github.com/nodejs/node/blob/c9e670ea2a/lib/repl.js#L1227-L1253
+function bailOnIllegalToken(parser) {
+  return parser._literal === null &&
+    ! parser.blockComment &&
+    ! parser.regExpLiteral;
+}
+
+// If the error is that we've unexpectedly ended the input,
+// then let the user try to recover by adding more input.
+function isRecoverableError(e, repl) {
+  if (e && e.name === 'SyntaxError') {
+    var message = e.message;
+    if (message === 'Unterminated template literal' ||
+        message === 'Missing } in template expression') {
+      repl._inTemplateLiteral = true;
+      return true;
+    }
+
+    if (message.startsWith('Unexpected end of input') ||
+        message.startsWith('missing ) after argument list') ||
+        message.startsWith('Unexpected token')) {
+      return true;
+    }
+
+    if (message === 'Invalid or unexpected token') {
+      return ! bailOnIllegalToken(repl.lineParser);
+    }
+  }
+
+  return false;
+}
+
 // This function allows a persistent history of shell commands to be saved
 // to and loaded from .meteor/local/shell-history.
 Sp.initializeHistory = function initializeHistory() {

From 08f14ef1a25287aa341d5c5b9d55ec7d7571f320 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 11:58:51 -0400
Subject: [PATCH 048/688] Add a basic app template for testing `meteor shell`.

---
 tools/tests/apps/shell/.gitignore             |  1 +
 .../apps/shell/.meteor/.finished-upgraders    | 14 ++++
 tools/tests/apps/shell/.meteor/.gitignore     |  1 +
 tools/tests/apps/shell/.meteor/.id            |  7 ++
 tools/tests/apps/shell/.meteor/packages       | 21 ++++++
 tools/tests/apps/shell/.meteor/platforms      |  2 +
 tools/tests/apps/shell/.meteor/release        |  1 +
 tools/tests/apps/shell/.meteor/versions       | 69 +++++++++++++++++++
 tools/tests/apps/shell/client/main.css        |  1 +
 tools/tests/apps/shell/client/main.html       | 25 +++++++
 tools/tests/apps/shell/client/main.js         | 22 ++++++
 tools/tests/apps/shell/package.json           | 10 +++
 tools/tests/apps/shell/server/main.js         |  5 ++
 13 files changed, 179 insertions(+)
 create mode 100644 tools/tests/apps/shell/.gitignore
 create mode 100644 tools/tests/apps/shell/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/shell/.meteor/.gitignore
 create mode 100644 tools/tests/apps/shell/.meteor/.id
 create mode 100644 tools/tests/apps/shell/.meteor/packages
 create mode 100644 tools/tests/apps/shell/.meteor/platforms
 create mode 100644 tools/tests/apps/shell/.meteor/release
 create mode 100644 tools/tests/apps/shell/.meteor/versions
 create mode 100644 tools/tests/apps/shell/client/main.css
 create mode 100644 tools/tests/apps/shell/client/main.html
 create mode 100644 tools/tests/apps/shell/client/main.js
 create mode 100644 tools/tests/apps/shell/package.json
 create mode 100644 tools/tests/apps/shell/server/main.js

diff --git a/tools/tests/apps/shell/.gitignore b/tools/tests/apps/shell/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/tests/apps/shell/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/tests/apps/shell/.meteor/.finished-upgraders b/tools/tests/apps/shell/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..11fc14e301
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/.finished-upgraders
@@ -0,0 +1,14 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
diff --git a/tools/tests/apps/shell/.meteor/.gitignore b/tools/tests/apps/shell/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/shell/.meteor/.id b/tools/tests/apps/shell/.meteor/.id
new file mode 100644
index 0000000000..3f3cf63ad1
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+5tjd8d18ck7qdfgmbjb
diff --git a/tools/tests/apps/shell/.meteor/packages b/tools/tests/apps/shell/.meteor/packages
new file mode 100644
index 0000000000..d4c8001f20
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/packages
@@ -0,0 +1,21 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+reactive-var            # Reactive variable for tracker
+jquery                  # Helpful client-side library
+tracker                 # Meteor's client-side reactive programming library
+
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers.
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+
+autopublish             # Publish all data to the clients (for prototyping)
+insecure                # Allow all DB writes from clients (for prototyping)
diff --git a/tools/tests/apps/shell/.meteor/platforms b/tools/tests/apps/shell/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/shell/.meteor/release b/tools/tests/apps/shell/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/shell/.meteor/versions b/tools/tests/apps/shell/.meteor/versions
new file mode 100644
index 0000000000..40d32caaa2
--- /dev/null
+++ b/tools/tests/apps/shell/.meteor/versions
@@ -0,0 +1,69 @@
+allow-deny@1.0.5
+autopublish@1.0.7
+autoupdate@1.3.11
+babel-compiler@6.9.0
+babel-runtime@0.1.10
+base64@1.0.9
+binary-heap@1.0.9
+blaze@2.1.8
+blaze-html-templates@1.0.4
+blaze-tools@1.0.9
+boilerplate-generator@1.0.9
+caching-compiler@1.1.6
+caching-html-compiler@1.0.6
+callback-hook@1.0.9
+check@1.2.3
+ddp@1.2.5
+ddp-client@1.3.0
+ddp-common@1.2.6
+ddp-server@1.3.9
+deps@1.0.12
+diff-sequence@1.0.6
+ecmascript@0.5.7
+ecmascript-runtime@0.3.12
+ejson@1.0.12
+es5-shim@4.6.13
+fastclick@1.0.12
+geojson-utils@1.0.9
+hot-code-push@1.0.4
+html-tools@1.0.10
+htmljs@1.0.10
+http@1.2.8
+id-map@1.0.8
+insecure@1.0.7
+jquery@1.11.9
+launch-screen@1.0.12
+livedata@1.0.18
+logging@1.1.14
+meteor@1.2.16
+meteor-base@1.0.4
+minifier-css@1.2.13
+minifier-js@1.2.13
+minimongo@1.0.17
+mobile-experience@1.0.4
+mobile-status-bar@1.0.12
+modules@0.7.5
+modules-runtime@0.7.5
+mongo@1.1.10
+mongo-id@1.0.5
+npm-mongo@1.5.45
+observe-sequence@1.0.12
+ordered-dict@1.0.8
+promise@0.8.3
+random@1.0.10
+reactive-var@1.0.10
+reload@1.1.10
+retry@1.0.8
+routepolicy@1.0.11
+spacebars@1.0.12
+spacebars-compiler@1.0.12
+standard-minifier-css@1.1.8
+standard-minifier-js@1.1.8
+templating@1.2.13
+templating-tools@1.0.4
+tracker@1.1.0
+ui@1.0.11
+underscore@1.0.9
+url@1.0.10
+webapp@1.3.10
+webapp-hashing@1.0.9
diff --git a/tools/tests/apps/shell/client/main.css b/tools/tests/apps/shell/client/main.css
new file mode 100644
index 0000000000..b6b4052b43
--- /dev/null
+++ b/tools/tests/apps/shell/client/main.css
@@ -0,0 +1 @@
+/* CSS declarations go here */
diff --git a/tools/tests/apps/shell/client/main.html b/tools/tests/apps/shell/client/main.html
new file mode 100644
index 0000000000..c9a56af2fe
--- /dev/null
+++ b/tools/tests/apps/shell/client/main.html
@@ -0,0 +1,25 @@
+<head>
+  <title>shell</title>
+</head>
+
+<body>
+  <h1>Welcome to Meteor!</h1>
+
+  {{> hello}}
+  {{> info}}
+</body>
+
+<template name="hello">
+  <button>Click Me</button>
+  <p>You've pressed the button {{counter}} times.</p>
+</template>
+
+<template name="info">
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li><a href="https://www.meteor.com/try" target="_blank">Do the Tutorial</a></li>
+    <li><a href="http://guide.meteor.com" target="_blank">Follow the Guide</a></li>
+    <li><a href="https://docs.meteor.com" target="_blank">Read the Docs</a></li>
+    <li><a href="https://forums.meteor.com" target="_blank">Discussions</a></li>
+  </ul>
+</template>
diff --git a/tools/tests/apps/shell/client/main.js b/tools/tests/apps/shell/client/main.js
new file mode 100644
index 0000000000..ecb3282a2f
--- /dev/null
+++ b/tools/tests/apps/shell/client/main.js
@@ -0,0 +1,22 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import './main.html';
+
+Template.hello.onCreated(function helloOnCreated() {
+  // counter starts at 0
+  this.counter = new ReactiveVar(0);
+});
+
+Template.hello.helpers({
+  counter() {
+    return Template.instance().counter.get();
+  },
+});
+
+Template.hello.events({
+  'click button'(event, instance) {
+    // increment the counter when button is clicked
+    instance.counter.set(instance.counter.get() + 1);
+  },
+});
diff --git a/tools/tests/apps/shell/package.json b/tools/tests/apps/shell/package.json
new file mode 100644
index 0000000000..eaa0f0bc14
--- /dev/null
+++ b/tools/tests/apps/shell/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "shell",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "meteor-node-stubs": "~0.2.0"
+  }
+}
diff --git a/tools/tests/apps/shell/server/main.js b/tools/tests/apps/shell/server/main.js
new file mode 100644
index 0000000000..31a9e0e2d6
--- /dev/null
+++ b/tools/tests/apps/shell/server/main.js
@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+Meteor.startup(() => {
+  // code to run on server at startup
+});

From 44cf6bbe4d72c3ae72fc11e50c97fef0c9ab73fe Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 14:13:28 -0400
Subject: [PATCH 049/688] Add some basic self-tests of `meteor shell`.

Related to #7504.
---
 tools/tests/apps/shell/server/main.js |  2 +-
 tools/tests/shell-tests.js            | 36 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tools/tests/shell-tests.js

diff --git a/tools/tests/apps/shell/server/main.js b/tools/tests/apps/shell/server/main.js
index 31a9e0e2d6..b0dbc0ed81 100644
--- a/tools/tests/apps/shell/server/main.js
+++ b/tools/tests/apps/shell/server/main.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 
 Meteor.startup(() => {
-  // code to run on server at startup
+  Meteor.checkMeFromShell = "oky dok";
 });
diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js
new file mode 100644
index 0000000000..c7f26e6b4f
--- /dev/null
+++ b/tools/tests/shell-tests.js
@@ -0,0 +1,36 @@
+var selftest = require('../tool-testing/selftest.js');
+var Sandbox = selftest.Sandbox;
+
+selftest.define("meteor shell", function () {
+  var s = new Sandbox();
+  s.createApp("meteor-shell-test", "shell");
+  s.cd("meteor-shell-test");
+
+  var server = s.run("run", "--once");
+  server.waitSecs(45);
+  server.match("App running at");
+
+  var shell = s.run("shell");
+  // First try a simple one-line expression.
+  shell.write("{server:Meteor.isServer}\n");
+  shell.proc.stdin.end();
+  shell.match('{"server":true}');
+
+  shell = s.run("shell");
+  // Now try with a bunch of newlines in the input.
+  shell.write("500+\n4000\n+60\n\n+\n7\n");
+  shell.proc.stdin.end();
+  shell.match("4567");
+
+  shell = s.run("shell");
+  // Now use the shell to make the server output something.
+  shell.write('console.log("oyez")\n');
+  shell.proc.stdin.end();
+  server.match("oyez");
+
+  shell = s.run("shell");
+  // Now check something set by the test app.
+  shell.write('Meteor.checkMeFromShell\n');
+  shell.proc.stdin.end();
+  shell.match("oky dok");
+});

From 7ece1e5a28a743be47659a08374fd49a938f2838 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 15:58:36 -0400
Subject: [PATCH 050/688] Bump $BUNDLE_VERSION to 4.2.3 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index fb80725cda..b76e3b0bad 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.2
+BUNDLE_VERSION=4.2.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 7363d9c0be0c17f5d391733a91d78d46b987afaa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 3 Aug 2016 16:33:22 -0400
Subject: [PATCH 051/688] Upgrade uglify-js to version 2.7.0.

This version still doesn't support many ES2015 features, but we might as
well use the latest stable version.
---
 .../.npm/package/npm-shrinkwrap.json          | 142 +++++++++++-------
 packages/minifier-js/package.js               |   6 +-
 2 files changed, 91 insertions(+), 57 deletions(-)

diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index 5f0105ed20..31a74fb7c5 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -1,60 +1,94 @@
 {
   "dependencies": {
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "from": "align-text@>=0.1.3 <0.2.0"
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "from": "async@>=0.2.6 <0.3.0"
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "from": "camelcase@>=1.0.2 <2.0.0"
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "from": "center-align@>=0.1.1 <0.2.0"
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "from": "cliui@>=2.1.0 <3.0.0"
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "from": "decamelize@>=1.0.0 <2.0.0"
+    },
+    "is-buffer": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz",
+      "from": "is-buffer@>=1.0.2 <2.0.0"
+    },
+    "kind-of": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz",
+      "from": "kind-of@>=3.0.2 <4.0.0"
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "from": "lazy-cache@>=1.0.3 <2.0.0"
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "from": "longest@>=1.0.1 <2.0.0"
+    },
+    "repeat-string": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz",
+      "from": "repeat-string@>=1.5.2 <2.0.0"
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "from": "right-align@>=0.1.1 <0.2.0"
+    },
+    "source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "from": "source-map@>=0.5.1 <0.6.0"
+    },
     "uglify-js": {
-      "version": "2.4.20",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz",
-      "from": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz",
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "from": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-        },
-        "source-map": {
-          "version": "0.1.34",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
-          "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
-          "dependencies": {
-            "amdefine": {
-              "version": "0.1.0",
-              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz",
-              "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
-            }
-          }
-        },
-        "uglify-to-browserify": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-          "from": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
-        },
-        "yargs": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
-          "from": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
-          "dependencies": {
-            "camelcase": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz",
-              "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz"
-            },
-            "decamelize": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz",
-              "from": "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz"
-            },
-            "window-size": {
-              "version": "0.1.0",
-              "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-              "from": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
-            },
-            "wordwrap": {
-              "version": "0.0.2",
-              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-              "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
-            }
-          }
-        }
-      }
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
+      "from": "uglify-js@2.7.0"
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "from": "uglify-to-browserify@>=1.0.0 <1.1.0"
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "from": "window-size@0.1.0"
+    },
+    "wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "from": "wordwrap@0.0.2"
+    },
+    "yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "from": "yargs@>=3.10.0 <3.11.0"
     }
   }
 }
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index afb5f8b6c9..b53c6ceb37 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.13"
+  version: "1.2.14"
 });
 
 Npm.depends({
-  "uglify-js": "2.4.20",
+  "uglify-js": "2.7.0"
 });
 
 Npm.strip({
-  "uglify-js": ["test/"],
+  "uglify-js": ["test/"]
 });
 
 Package.onUse(function (api) {

From 2f6a6921b915154102f31f157cdf6f02612cf1e4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 12:45:09 -0400
Subject: [PATCH 052/688] Don't minify non-web .js files.

Fixes #7479, #7441, and similar issues for server-only files that
contain syntax supported by Node 4 but not supported by UglifyJS.
---
 packages/standard-minifier-js/package.js          | 2 +-
 packages/standard-minifier-js/plugin/minify-js.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index dcab86536c..72c501e663 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.1.8',
+  version: '1.2.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 44ca1cf1c4..b9a5248826 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,5 +1,6 @@
 Plugin.registerMinifier({
-  extensions: ["js"]
+  extensions: ["js"],
+  archMatching: "web"
 }, function () {
   var minifier = new UglifyJSMinifier();
   return minifier;

From a83f6da0590a1c7500458a7ecd9d744d249747ac Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 Aug 2016 12:47:17 -0400
Subject: [PATCH 053/688] Don't minify non-web .css files.

We shouldn't be processing .css files on the server anyway, because of a
similar restriction in packages/meteor/plugin/basic-file-types.js, but
it seemed wise to enforce that restriction redundantly here.
---
 packages/standard-minifier-css/package.js           | 2 +-
 packages/standard-minifier-css/plugin/minify-css.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index fc4129ed43..cf53e0e1c0 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.1.8',
+  version: '1.2.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index 59925e4b82..8858d0b43a 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -1,7 +1,8 @@
 var sourcemap = Npm.require('source-map');
 
 Plugin.registerMinifier({
-  extensions: ["css"]
+  extensions: ["css"],
+  archMatching: "web"
 }, function () {
   var minifier = new CssToolsMinifier();
   return minifier;

From ccaa3fc704c6710082f355d90081fd787d17aa80 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@percolatestudio.com>
Date: Thu, 4 Aug 2016 11:42:12 +1000
Subject: [PATCH 054/688] Update History.md

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index a3013e786e..329c3d0bd2 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v.NEXT
 
+* Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
+
 * The `google` package now uses the `email` scope as a mandatory field instead
   of the `profile` scope. The `profile` scope is still added by default if the
   `requestPermissions` option is not specified to maintain backward

From bbc0ecc6e1203d995a07bb80a17328f3a8025d69 Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime@quandalle.com>
Date: Fri, 5 Aug 2016 13:46:30 +0200
Subject: [PATCH 055/688] Fix broken links in the changelog (#7588)

---
 History.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 329c3d0bd2..17f4a11bb6 100644
--- a/History.md
+++ b/History.md
@@ -14,7 +14,7 @@
   accessToken in some out-of-band way. [PR #7550](https://github.com/meteor/meteor/pull/7550)
 
 * `Accounts.onLogout` gets `{ user, connection }` context in a similar fashion
-  to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issue/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
+  to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issues/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
 
 ## v1.4.0.1
 
@@ -149,7 +149,7 @@
   invoke. Note that you must `meteor update` to 1.3.4.2 before this logic
   will take effect, but it will work in all app directories after
   updating, even those pinned to older versions.
-  [#7338](https://github.com/meteor/meteor/issue/7338)
+  [#7338](https://github.com/meteor/meteor/issues/7338)
 
 * The Meteor installer now has the ability to resume downloads, so
   installing Meteor on a spotty internet connection should be more

From 3a662a5bfbf752e643268fc9a711d732e0663575 Mon Sep 17 00:00:00 2001
From: Lieuwe Rooijakkers <lieuwerooijakkers@gmail.com>
Date: Fri, 5 Aug 2016 20:22:39 +0200
Subject: [PATCH 056/688] make commits links in changelog

---
 History.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 17f4a11bb6..1622ae0a66 100644
--- a/History.md
+++ b/History.md
@@ -72,7 +72,7 @@
 
 * This release fixed a small bug in 1.3.5 that prevented updating apps
   whose `.meteor/release` files refer to releases no longer installed in
-  `~/.meteor/packages/meteor-tool`. 576468eae8d8dd7c1fe2fa381ac51dee5cb792cd
+  `~/.meteor/packages/meteor-tool`. [576468eae8d8dd7c1fe2fa381ac51dee5cb792cd](https://github.com/meteor/meteor/commit/576468eae8d8dd7c1fe2fa381ac51dee5cb792cd)
 
 ## v1.3.5
 
@@ -83,7 +83,7 @@
 * If an app has no `package.json` file, all packages in `node_modules`
   will be built into the production bundle. In other words, make sure you
   have a `package.json` file if you want to benefit from `devDependencies`
-  pruning. 7b2193188fc9e297eefc841ce6035825164f0684
+  pruning. [7b2193188fc9e297eefc841ce6035825164f0684](https://github.com/meteor/meteor/commit/7b2193188fc9e297eefc841ce6035825164f0684)
 
 * Binary npm dependencies of compiler plugins are now automatically
   rebuilt when Node/V8 versions change.
@@ -118,7 +118,7 @@
   `Npm.depends`) has been set to "error" instead of "warn". Note that this
   change does not affect `meteor npm ...` commands, which can be easily
   configured using `.npmrc` files or command-line flags.
-  https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8
+  [0689cae25a3e0da3615a402cdd0bec94ce8455c8](https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8)
 
 ## v1.3.4.3
 

From 70b620511d92ae1f9c31c2bb76b4fdd4b93b4d7c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 Aug 2016 18:10:51 -0400
Subject: [PATCH 057/688] Fix tests for #7534.

---
 packages/accounts-password/password_tests.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 248ac13fbf..fcabdfe8d3 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1392,7 +1392,7 @@ if (Meteor.isServer) (function () {
       }, /Incorrect password/);
     });
 
-  Tinytest.add(
+  Tinytest.addAsync(
     'passwords - reset password should work when token is not expired',
     function (test, onComplete) {
       var username = Random.id();
@@ -1418,10 +1418,17 @@ if (Meteor.isServer) (function () {
 
       makeTestConnection(
         test,
-        function () {
-          
-          test.isTrue(Meteor.call("resetPassword", resetPasswordToken, "new-password"));
-          test.isTrue(Meteor.call("login", {user: {username: username}, password: "new-password"}));
+        function (clientConn) {
+          test.isTrue(clientConn.call(
+            "resetPassword",
+            resetPasswordToken,
+            "new-password"
+          ));
+
+          test.isTrue(clientConn.call("login", {
+            user: { username },
+            password: "new-password"
+          }));
 
           onComplete();
       });

From cfa38d1de676feaa918f0e9a5c66f6097417a68a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 6 Aug 2016 13:44:29 -0400
Subject: [PATCH 058/688] Fix call to nonexistent method
 buildmessage.hasMessages().

---
 tools/cli/commands-packages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index d93a4b4aab..a8574a8905 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -609,7 +609,7 @@ main.registerCommand({
     });
   });
 
-  if (buildmessage.hasMessages()) {
+  if (buildmessage.jobHasMessages()) {
     return 1;
   }
 

From f9809c2f4b0bfbdb4c53928a694430f0d97d88dd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 Aug 2016 11:03:10 -0400
Subject: [PATCH 059/688] Update History.md to reflect various changes for
 v1.4.1.

---
 History.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/History.md b/History.md
index 17f4a11bb6..f15a98f77f 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v.NEXT
 
+## v1.4.1
+
 * Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
 
 * The `google` package now uses the `email` scope as a mandatory field instead
@@ -16,6 +18,27 @@
 * `Accounts.onLogout` gets `{ user, connection }` context in a similar fashion
   to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issues/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
 
+* The `node-gyp` and `node-pre-gyp` tools will now be installed in
+  `bundle/programs/server/node_modules`, to assist with rebuilding binary
+  npm packages when deploying an app to Galaxy or elsewhere.
+  [#7571](https://github.com/meteor/meteor/pull/7571)
+
+* The `standard-minifier-{js,css}` packages no longer minify .js or .css
+  files on the server. [#7572](https://github.com/meteor/meteor/pull/7572)
+
+* Multi-line input to `meteor shell`, which was broken by changes to the
+  `repl` module in Node 4, works again.
+  [#7562](https://github.com/meteor/meteor/pull/7562)
+
+* The implementation of the command-line `meteor` tool now forbids
+  misbehaving polyfill libraries from overwriting `global.Promise`.
+  [#7569](https://github.com/meteor/meteor/pull/7569)
+
+* The `oauth-encryption` package no longer depends on the
+  `npm-node-aes-gcm` package (or any special npm packages), because the
+  Node 4 `crypto` library natively supports the `aes-128-gcm` algorithm.
+  [#7548](https://github.com/meteor/meteor/pull/7548)
+
 ## v1.4.0.1
 
 * Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))

From b96a016202bdc53504d9ab04f9f2237de6fc8109 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 Aug 2016 11:15:32 -0400
Subject: [PATCH 060/688] Mention native package extraction in History.md.

---
 History.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/History.md b/History.md
index f15a98f77f..e176601680 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,15 @@
 
 ## v1.4.1
 
+* After Meteor packages are downloaded from Atmosphere, they will now be
+  extracted using native `tar` or `7z.exe` on Windows, instead of the
+  https://www.npmjs.com/package/tar library, for a significant performance
+  improvement. [#7457](https://github.com/meteor/meteor/pull/7457)
+
+* The progress indicator now distinguishes between downloading,
+  extracting, and loading newly-installed Meteor packages, instead of
+  lumping all of that work into a "downloading" status message.
+
 * Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
 
 * The `google` package now uses the `email` scope as a mandatory field instead

From 760eecb1d2da9fdfc154d272bb4bcf51a67decc5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 Aug 2016 14:28:46 -0400
Subject: [PATCH 061/688] Include Node 4.5.0-rc.2 in the dev bundle.

---
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 4 ++--
 scripts/generate-dev-bundle.sh     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 325f6f4994..22d3382402 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.4.7
+NODE_VERSION=4.5.0-rc.2
 NPM_VERSION=3.10.5
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 72d07cd59e..62a6b514f1 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.4.7"
+$NODE_VERSION = "4.5.0-rc.2"
 $NPM_VERSION = "3.10.5"
 $PYTHON_VERSION = "2.7.10" # For node-gyp
 
@@ -47,7 +47,7 @@ cd "$DIR\bin"
 
 # download node
 # same node on 32bit vs 64bit?
-$node_link = "http://nodejs.org/dist/v${NODE_VERSION}/win-x86/node.exe"
+$node_link = "http://nodejs.org/download/rc/v${NODE_VERSION}/win-x86/node.exe"
 $webclient.DownloadFile($node_link, "$DIR\bin\node.exe")
 
 # On Windows we provide a reliable version of python.exe for use by
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 099a4a971d..b2c2d9f093 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -20,7 +20,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_URL="https://nodejs.org/dist/v${NODE_VERSION}/${NODE_TGZ}"
+NODE_URL="https://nodejs.org/download/rc/v${NODE_VERSION}/${NODE_TGZ}"
 echo "Downloading Node from ${NODE_URL}"
 curl "${NODE_URL}" | tar zx --strip-components 1
 

From 2c790c48a2787dac181dd8ae23ee4d8b155efe1b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 Aug 2016 14:29:01 -0400
Subject: [PATCH 062/688] Bump $BUNDLE_VERSION to 4.2.4 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index b76e3b0bad..2dcd7d8b29 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.3
+BUNDLE_VERSION=4.2.4
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 7faa4ba7d76bf77c2bee0a5b01bd9f13c9d873c2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 Aug 2016 11:24:11 -0400
Subject: [PATCH 063/688] Revert "Include Node 4.5.0-rc.2 in the dev bundle."

This reverts commit 64a9312e29ba7edd5d0ab310f873aa49b52fffc7.

Although Meteor runs fine on Node 4.5.0, node-gyp doesn't know how to
download libraries appropriate for RC releases, so it looks like we need
to hold off on this upgrade until it's officially out.
---
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 4 ++--
 scripts/generate-dev-bundle.sh     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 22d3382402..325f6f4994 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.5.0-rc.2
+NODE_VERSION=4.4.7
 NPM_VERSION=3.10.5
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 62a6b514f1..72d07cd59e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.5.0-rc.2"
+$NODE_VERSION = "4.4.7"
 $NPM_VERSION = "3.10.5"
 $PYTHON_VERSION = "2.7.10" # For node-gyp
 
@@ -47,7 +47,7 @@ cd "$DIR\bin"
 
 # download node
 # same node on 32bit vs 64bit?
-$node_link = "http://nodejs.org/download/rc/v${NODE_VERSION}/win-x86/node.exe"
+$node_link = "http://nodejs.org/dist/v${NODE_VERSION}/win-x86/node.exe"
 $webclient.DownloadFile($node_link, "$DIR\bin\node.exe")
 
 # On Windows we provide a reliable version of python.exe for use by
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index b2c2d9f093..099a4a971d 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -20,7 +20,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_URL="https://nodejs.org/download/rc/v${NODE_VERSION}/${NODE_TGZ}"
+NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/${NODE_TGZ}"
 echo "Downloading Node from ${NODE_URL}"
 curl "${NODE_URL}" | tar zx --strip-components 1
 

From a4a828e4c3fd30959ba1a480d61bb25347cb5283 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 Aug 2016 11:54:56 -0400
Subject: [PATCH 064/688] Install Node headers and libraries in
 dev_bundle/.node-gyp/.

This gives us a reliable place for node-gyp to find the necessary headers
and libraries for compiling binary packages, instead of relying on the
accessibility of $HOME and/or $USERPROFILE.
---
 scripts/generate-dev-bundle.ps1 | 17 +++++++++++++----
 scripts/generate-dev-bundle.sh  | 11 ++++++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 72d07cd59e..6e9ec54562 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -78,10 +78,6 @@ rm -Recurse -Force "$DIR\7z"
 # add bin to the front of the path so we can use our own node for building
 $env:PATH = "${DIR}\bin;${env:PATH}"
 
-# Make sure node-gyp knows how to find its build tools.
-$env:PYTHON = "${DIR}\python\python.exe"
-$env:GYP_MSVS_VERSION = "2015"
-
 # Install the version of npm that we're actually going to expose from the
 # dev bundle. Note that we use npm@1.4.12 to install npm@${NPM_VERSION}.
 cd "${DIR}\lib"
@@ -95,6 +91,19 @@ npm version
 cd node_modules\npm
 npm install node-gyp
 
+# Make sure node-gyp knows how to find its build tools.
+$env:PYTHON = "${DIR}\python\python.exe"
+$env:GYP_MSVS_VERSION = "2015"
+$env:HOME = "$DIR";
+$env:USERPROFILE = "$DIR";
+
+# Make node-gyp install Node headers and libraries in $DIR\.node-gyp\.
+# https://github.com/nodejs/node-gyp/blob/4ee31329e0/lib/node-gyp.js#L52
+& "${DIR}\bin\node.exe" node_modules\node-gyp\bin\node-gyp.js install
+$include_path = "${DIR}\.node-gyp\${NODE_VERSION}\include\node"
+echo "Contents of ${include_path}:"
+dir "$include_path"
+
 # install dev-bundle-package.json
 # use short folder names
 # b for build
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 099a4a971d..e439817b2d 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -60,7 +60,7 @@ npm version
 # will get confused by the pre-existing modules.
 mkdir "${DIR}/build/npm-server-install"
 cd "${DIR}/build/npm-server-install"
-node "${CHECKOUT_DIR}/scripts/dev-bundle-server-package.js" >package.json
+node "${CHECKOUT_DIR}/scripts/dev-bundle-server-package.js" > package.json
 npm install
 npm shrinkwrap
 
@@ -68,6 +68,15 @@ mkdir -p "${DIR}/server-lib/node_modules"
 # This ignores the stuff in node_modules/.bin, but that's OK.
 cp -R node_modules/* "${DIR}/server-lib/node_modules/"
 
+# Make node-gyp install Node headers and libraries in $DIR/.node-gyp/.
+# https://github.com/nodejs/node-gyp/blob/4ee31329e0/lib/node-gyp.js#L52
+export HOME="$DIR"
+export USERPROFILE="$DIR"
+node "${DIR}/server-lib/node_modules/node-gyp/bin/node-gyp.js" install
+INCLUDE_PATH="${DIR}/.node-gyp/${NODE_VERSION}/include/node"
+echo "Contents of ${INCLUDE_PATH}:"
+ls -al "$INCLUDE_PATH"
+
 mkdir -p "${DIR}/etc"
 mv package.json npm-shrinkwrap.json "${DIR}/etc/"
 

From 4bdc65919df9615990b36cebba992f063fbbbdf7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 Aug 2016 12:07:59 -0400
Subject: [PATCH 065/688] Set $USERPROFILE to the dev bundle directory for
 `meteor {node,npm}`.

The node-gyp tool uses `process.env.HOME || process.env.USERPROFILE` to
determine where it should install the .node-gyp directory containing Node
headers and libraries, and we now preinstall that directory at
dev_bundle/.node-gyp/, so (with this change) no download should be
necessary.
---
 tools/cli/dev-bundle-bin-helpers.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 5f68ef6eb1..873fa30e60 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -24,6 +24,10 @@ exports.getEnv = function (options) {
 
     var env = Object.create(process.env);
 
+    // This allows node-gyp to find Node headers and libraries in
+    // dev_bundle/.node-gyp.
+    env.USERPROFILE = devBundleDir;
+
     var PATH = env.PATH || env.Path;
     if (PATH) {
       paths.push(PATH);

From 0ae8494b819d605a02154737b2c19955b5b48129 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 Aug 2016 12:11:01 -0400
Subject: [PATCH 066/688] Bump $BUNDLE_VERSION to 4.2.5 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 2dcd7d8b29..11f0d76f48 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.4
+BUNDLE_VERSION=4.2.5
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 5b35fc5573edd9e00713b857ad22dadc3dc824f5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 8 Aug 2016 12:46:30 -0400
Subject: [PATCH 067/688] Bump npm-bcrypt version to republish for all
 architectures.

---
 packages/non-core/npm-bcrypt/.versions  | 2 +-
 packages/non-core/npm-bcrypt/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/non-core/npm-bcrypt/.versions b/packages/non-core/npm-bcrypt/.versions
index 6697cb762c..d755fbc0d1 100644
--- a/packages/non-core/npm-bcrypt/.versions
+++ b/packages/non-core/npm-bcrypt/.versions
@@ -1,3 +1,3 @@
 meteor@1.1.16
-npm-bcrypt@0.8.7
+npm-bcrypt@0.8.7_1
 underscore@1.0.9
diff --git a/packages/non-core/npm-bcrypt/package.js b/packages/non-core/npm-bcrypt/package.js
index ecaa1f8af1..216ed15756 100644
--- a/packages/non-core/npm-bcrypt/package.js
+++ b/packages/non-core/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: '0.8.7',
+  version: '0.8.7_1',
   documentation: null
 });
 

From 0d4cf0236190bba18edd2217d65e5cdcd92a27bd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 8 Aug 2016 12:46:47 -0400
Subject: [PATCH 068/688] Add version constraints for all dependencies of
 accounts-password.

This is necessary to allow publishing accounts-password independently of a
Meteor release.

Note that the npm-bcrypt version has been bumped to 0.8.7_1.
---
 packages/accounts-password/package.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 01ea4278df..34671df504 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,27 +1,27 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.2.12"
+  version: "1.2.13"
 });
 
 Package.onUse(function(api) {
-  api.use('npm-bcrypt@=0.8.7');
+  api.use('npm-bcrypt@=0.8.7_1');
 
   api.use([
-    'accounts-base',
-    'srp',
-    'sha',
-    'ejson',
-    'ddp'
+    'accounts-base@1.2.9',
+    'srp@1.0.9',
+    'sha@1.0.8',
+    'ejson@1.0.12',
+    'ddp@1.2.5'
   ], ['client', 'server']);
 
   // Export Accounts (etc) to packages using this one.
-  api.imply('accounts-base', ['client', 'server']);
+  api.imply('accounts-base@1.2.9', ['client', 'server']);
 
-  api.use('email', ['server']);
-  api.use('random', ['server']);
-  api.use('check');
-  api.use('underscore');
-  api.use('ecmascript');
+  api.use('email@1.1.16', ['server']);
+  api.use('random@1.0.10', ['server']);
+  api.use('check@1.2.3');
+  api.use('underscore@1.0.9');
+  api.use('ecmascript@0.5.7');
 
   api.addFiles('email_templates.js', 'server');
   api.addFiles('password_server.js', 'server');

From cb587f6145af3f6362bb6a0fd174abe704680ec8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 8 Aug 2016 18:38:15 -0400
Subject: [PATCH 069/688] Upgrade meteor-ecmascript-runtime to 0.2.8.

Most notably, this version reuses global.Symbol when possible.
---
 .../.npm/package/npm-shrinkwrap.json           | 18 ++++++++----------
 packages/ecmascript-runtime/package.js         | 10 +++++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
index b6abbda7be..3a25c59713 100644
--- a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
+++ b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
@@ -1,16 +1,14 @@
 {
   "dependencies": {
+    "core-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.1.tgz",
+      "from": "core-js@1.2.1"
+    },
     "meteor-ecmascript-runtime": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.6.tgz",
-      "from": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.6.tgz",
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.1.tgz",
-          "from": "https://registry.npmjs.org/core-js/-/core-js-1.2.1.tgz"
-        }
-      }
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.8.tgz",
+      "from": "meteor-ecmascript-runtime@0.2.8"
     }
   }
 }
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index b014f46c7d..747da9d95b 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,23 +1,23 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.12",
+  version: "0.3.13",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "meteor-ecmascript-runtime": "0.2.6",
+  "meteor-ecmascript-runtime": "0.2.8",
 });
 
 Package.onUse(function(api) {
   // If the es5-shim package is installed, make sure it loads before
   // ecmascript-runtime, since ecmascript-runtime uses some ES5 APIs like
   // Object.defineProperties that are buggy in older browsers.
-  api.use("es5-shim", { weak: true });
+  api.use("es5-shim@4.6.13", { weak: true });
 
-  api.use("modules");
-  api.use("promise");
+  api.use("modules@0.7.5");
+  api.use("promise@0.8.3");
 
   api.mainModule("runtime.js");
 

From a912eed990002824b3407ffa49cb4b9393539fe0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Mon, 8 Aug 2016 19:35:11 -0400
Subject: [PATCH 070/688] Fix accidental stripping of @scoped npm packages.
 (#7609)

The previous code did not accommodate the possibility that
`meteorNpm.getProdPackageNames` might return a package name that contained
one or more `/` characters.

Fixes #7579.
---
 tools/isobuild/bundler.js | 54 ++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 59cab96a65..8a342eb9da 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1885,7 +1885,23 @@ class JsImage {
         };
 
         if (nmd.local) {
-          let prodPackageNames;
+          const prodPackageTree = Object.create(null);
+          const complete = Symbol();
+          let maxPartCount = 0;
+
+          Object.keys(
+            meteorNpm.getProdPackageNames(nmd.sourcePath)
+          ).forEach(name => {
+            const parts = name.split("/");
+            let tree = prodPackageTree;
+
+            parts.forEach(part => {
+              tree = tree[part] || (tree[part] = Object.create(null));
+            });
+
+            tree[complete] = true;
+            maxPartCount = Math.max(parts.length, maxPartCount);
+          });
 
           // When copying a local node_modules directory, ignore any npm
           // package directories not in the list of production package
@@ -1897,18 +1913,38 @@ class JsImage {
           // package's "dependencies", then every copy of that package
           // will be copied to the destination directory. A little bit of
           // overcopying vastly simplifies the job of directoryFilter.
-          copyOptions.directoryFilter = function (dir) {
-            var base = files.pathBasename(dir);
-            var parentBase = files.pathBasename(files.pathDirname(dir));
-            if (parentBase !== "node_modules") {
+          copyOptions.directoryFilter = function isWithinProdPackage(dir) {
+            const parts = files.pathRelative(nmd.sourcePath, dir)
+              .split(files.pathSep);
+
+            let start = parts.lastIndexOf("node_modules") + 1;
+
+            if (parts.length - start > maxPartCount) {
+              // We're deep enough inside node_modules that it's safe to
+              // say we should have returned false earlier.
               return true;
             }
 
-            // Compute prodPackageNames lazily.
-            prodPackageNames = prodPackageNames ||
-              meteorNpm.getProdPackageNames(nmd.sourcePath);
+            let tree = prodPackageTree;
 
-            return _.has(prodPackageNames, base);
+            for (let pos = start; pos < parts.length; ++pos) {
+              const part = parts[pos];
+              const branch = tree[part];
+
+              if (! branch) {
+                // This dir is not prefixed by a production package name.
+                return false;
+              }
+
+              if (branch[complete]) {
+                // This dir is prefixed by a complete production package name.
+                break;
+              }
+
+              tree = branch;
+            }
+
+            return true;
           };
         }
 

From 15684bc47e26fd3ef874d435f8d7c766cf5ab70c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 8 Aug 2016 20:44:39 -0400
Subject: [PATCH 071/688] Bump package versions for 1.4.1-beta.0 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index a64b9a6611..ebef4319d0 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.9"
+  version: "1.2.10-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 7f339ed356..df8b50745c 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.3"
+  version: "1.2.4-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 252280c8be..2a87099b03 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.7',
+  version: '0.5.8-beta.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 456e9e2525..4c840c5e55 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.8"
+  version: "1.2.9-beta.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 4dd3ec78a9..6262f9481a 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.13"
+  version: "1.1.14-beta.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 589d8bf262..2a80110fd4 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.4',
+  version: '2.7.5-beta.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 09098a8829..015e41be53 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.0-1'
+  version: '1.4.1-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b53c6ceb37..3415ca840b 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14"
+  version: "1.2.14-beta.0"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index cf53e0e1c0..4a91141576 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0',
+  version: '1.2.0-beta.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 72c501e663..6f7ee445df 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0',
+  version: '1.2.0-beta.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index e8df227b46..5199039aee 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.11',
+  version: '1.1.12-beta.0',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 27946df7ac..66e5953f0c 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.4"
+  version: "2.513.5-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 31a8133d11..91744dab5d 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.13'
+  version: '1.2.14-beta.0'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index acf7469cac..4a1a61d1a0 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.0.1-rc.3",
+ "version": "1.4.1-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From d15e87c82300c46c7330a5c5698a913c9275183e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 Aug 2016 13:06:13 -0400
Subject: [PATCH 072/688] Fix typo in Accounts#_expirePasswordResetTokens.

Follow-up to #7534.
---
 packages/accounts-base/accounts_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index d9fd94cc1a..f694b3a2bb 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1123,7 +1123,7 @@ Ap._expireTokens = function (oldestValidDate, userId) {
 // for them to actually expire. userId is used by tests to only expire
 // tokens for the test user.
 Ap._expirePasswordResetTokens = function (oldestValidDate, userId) {
-  var tokenLiftetimeMs = this. _getPasswordResetTokenLifetimeMs();
+  var tokenLifetimeMs = this._getPasswordResetTokenLifetimeMs();
 
   // when calling from a test with extra arguments, you must specify both!
   if ((oldestValidDate && !userId) || (!oldestValidDate && userId)) {

From c8f16330121c31b0f8dfabbcc574cba654461b7c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 Aug 2016 13:06:13 -0400
Subject: [PATCH 073/688] Fix typo in Accounts#_expirePasswordResetTokens.

Needed to add version constraints to all the dependencies in
accounts-base/package.js so that I can publish it independently from a
Meteor release.

Follow-up to #7534.
Fixes #7611.
---
 packages/accounts-base/accounts_server.js |  2 +-
 packages/accounts-base/package.js         | 32 +++++++++++------------
 packages/accounts-password/package.js     |  6 ++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index d9fd94cc1a..f694b3a2bb 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1123,7 +1123,7 @@ Ap._expireTokens = function (oldestValidDate, userId) {
 // for them to actually expire. userId is used by tests to only expire
 // tokens for the test user.
 Ap._expirePasswordResetTokens = function (oldestValidDate, userId) {
-  var tokenLiftetimeMs = this. _getPasswordResetTokenLifetimeMs();
+  var tokenLifetimeMs = this._getPasswordResetTokenLifetimeMs();
 
   // when calling from a test with extra arguments, you must specify both!
   if ((oldestValidDate && !userId) || (!oldestValidDate && userId)) {
diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index a64b9a6611..34d5b67b59 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,39 +1,39 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.9"
+  version: "1.2.10"
 });
 
 Package.onUse(function (api) {
-  api.use('underscore', ['client', 'server']);
-  api.use('ecmascript', ['client', 'server']);
-  api.use('ddp-rate-limiter');
-  api.use('localstorage', 'client');
-  api.use('tracker', 'client');
-  api.use('check', 'server');
-  api.use('random', ['client', 'server']);
-  api.use('ejson', 'server');
-  api.use('callback-hook', ['client', 'server']);
+  api.use('underscore@1.0.9', ['client', 'server']);
+  api.use('ecmascript@0.5.7', ['client', 'server']);
+  api.use('ddp-rate-limiter@1.0.5');
+  api.use('localstorage@1.0.11', 'client');
+  api.use('tracker@1.1.0', 'client');
+  api.use('check@1.2.3', 'server');
+  api.use('random@1.0.10', ['client', 'server']);
+  api.use('ejson@1.0.12', 'server');
+  api.use('callback-hook@1.0.9', ['client', 'server']);
 
   // use unordered to work around a circular dependency
   // (service-configuration needs Accounts.connection)
-  api.use('service-configuration', ['client', 'server'], { unordered: true });
+  api.use('service-configuration@1.0.10', ['client', 'server'], { unordered: true });
 
   // needed for getting the currently logged-in user
-  api.use('ddp', ['client', 'server']);
+  api.use('ddp@1.2.5', ['client', 'server']);
 
   // need this because of the Meteor.users collection but in the future
   // we'd probably want to abstract this away
-  api.use('mongo', ['client', 'server']);
+  api.use('mongo@1.1.10', ['client', 'server']);
 
   // If the 'blaze' package is loaded, we'll define some helpers like
   // {{currentUser}}.  If not, no biggie.
-  api.use('blaze', 'client', {weak: true});
+  api.use('blaze@2.1.8', 'client', {weak: true});
 
   // Allow us to detect 'autopublish', and publish some Meteor.users fields if
   // it's loaded.
-  api.use('autopublish', 'server', {weak: true});
+  api.use('autopublish@1.0.7', 'server', {weak: true});
 
-  api.use('oauth-encryption', 'server', {weak: true});
+  api.use('oauth-encryption@1.2.0', 'server', {weak: true});
 
   // Though this "Accounts" symbol is the only official Package export for
   // the accounts-base package, modules that import accounts-base will
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 34671df504..f4f8b3360e 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.2.13"
+  version: "1.2.14"
 });
 
 Package.onUse(function(api) {
   api.use('npm-bcrypt@=0.8.7_1');
 
   api.use([
-    'accounts-base@1.2.9',
+    'accounts-base@1.2.10',
     'srp@1.0.9',
     'sha@1.0.8',
     'ejson@1.0.12',
@@ -15,7 +15,7 @@ Package.onUse(function(api) {
   ], ['client', 'server']);
 
   // Export Accounts (etc) to packages using this one.
-  api.imply('accounts-base@1.2.9', ['client', 'server']);
+  api.imply('accounts-base@1.2.10', ['client', 'server']);
 
   api.use('email@1.1.16', ['server']);
   api.use('random@1.0.10', ['server']);

From a1c35160530edb625312db718d7c36014dbf4049 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Tue, 9 Aug 2016 16:42:41 -0400
Subject: [PATCH 074/688] Use pure-JavaScript implementation for npm-bcrypt
 package. (#7595)

According to the README, this implementation is approximately 2.7 times
slower than native: https://www.npmjs.com/package/bcryptjs

Apps that wish to continue using the native bcrypt package should run
`meteor npm install --save bcrypt` in the root application directory, and
the npm-bcrypt package will prefer that implementation.
---
 packages/accounts-password/package.js         |  4 +-
 .../.npm/package/npm-shrinkwrap.json          | 19 ----------
 packages/non-core/npm-bcrypt/.versions        |  3 --
 packages/non-core/npm-bcrypt/package.js       | 14 -------
 packages/non-core/npm-bcrypt/wrapper.js       |  1 -
 packages/{non-core => }/npm-bcrypt/.gitignore |  0
 .../npm-bcrypt/.npm/package/.gitignore        |  0
 .../npm-bcrypt/.npm/package/README            |  0
 .../.npm/package/npm-shrinkwrap.json          |  9 +++++
 packages/npm-bcrypt/.versions                 |  5 +++
 packages/npm-bcrypt/package.js                | 15 ++++++++
 packages/npm-bcrypt/wrapper.js                | 38 +++++++++++++++++++
 tools/tests/package-tests.js                  |  8 ----
 13 files changed, 69 insertions(+), 47 deletions(-)
 delete mode 100644 packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json
 delete mode 100644 packages/non-core/npm-bcrypt/.versions
 delete mode 100644 packages/non-core/npm-bcrypt/package.js
 delete mode 100644 packages/non-core/npm-bcrypt/wrapper.js
 rename packages/{non-core => }/npm-bcrypt/.gitignore (100%)
 rename packages/{non-core => }/npm-bcrypt/.npm/package/.gitignore (100%)
 rename packages/{non-core => }/npm-bcrypt/.npm/package/README (100%)
 create mode 100644 packages/npm-bcrypt/.npm/package/npm-shrinkwrap.json
 create mode 100644 packages/npm-bcrypt/.versions
 create mode 100644 packages/npm-bcrypt/package.js
 create mode 100644 packages/npm-bcrypt/wrapper.js

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index f4f8b3360e..6e1e8e9dcb 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.2.14"
+  version: "1.3.0"
 });
 
 Package.onUse(function(api) {
-  api.use('npm-bcrypt@=0.8.7_1');
+  api.use('npm-bcrypt@0.9.0', 'server');
 
   api.use([
     'accounts-base@1.2.10',
diff --git a/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json b/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 9f8bfdb477..0000000000
--- a/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "dependencies": {
-    "bcrypt": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz",
-      "from": "bcrypt@0.8.7"
-    },
-    "bindings": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
-      "from": "bindings@1.2.1"
-    },
-    "nan": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz",
-      "from": "nan@2.3.5"
-    }
-  }
-}
diff --git a/packages/non-core/npm-bcrypt/.versions b/packages/non-core/npm-bcrypt/.versions
deleted file mode 100644
index d755fbc0d1..0000000000
--- a/packages/non-core/npm-bcrypt/.versions
+++ /dev/null
@@ -1,3 +0,0 @@
-meteor@1.1.16
-npm-bcrypt@0.8.7_1
-underscore@1.0.9
diff --git a/packages/non-core/npm-bcrypt/package.js b/packages/non-core/npm-bcrypt/package.js
deleted file mode 100644
index 216ed15756..0000000000
--- a/packages/non-core/npm-bcrypt/package.js
+++ /dev/null
@@ -1,14 +0,0 @@
-Package.describe({
-  summary: "Wrapper around the bcrypt npm package",
-  version: '0.8.7_1',
-  documentation: null
-});
-
-Npm.depends({
-  bcrypt: '0.8.7'
-});
-
-Package.onUse(function (api) {
-  api.export('NpmModuleBcrypt', 'server');
-  api.addFiles('wrapper.js', 'server');
-});
diff --git a/packages/non-core/npm-bcrypt/wrapper.js b/packages/non-core/npm-bcrypt/wrapper.js
deleted file mode 100644
index afff6278ff..0000000000
--- a/packages/non-core/npm-bcrypt/wrapper.js
+++ /dev/null
@@ -1 +0,0 @@
-NpmModuleBcrypt = Npm.require('bcrypt');
diff --git a/packages/non-core/npm-bcrypt/.gitignore b/packages/npm-bcrypt/.gitignore
similarity index 100%
rename from packages/non-core/npm-bcrypt/.gitignore
rename to packages/npm-bcrypt/.gitignore
diff --git a/packages/non-core/npm-bcrypt/.npm/package/.gitignore b/packages/npm-bcrypt/.npm/package/.gitignore
similarity index 100%
rename from packages/non-core/npm-bcrypt/.npm/package/.gitignore
rename to packages/npm-bcrypt/.npm/package/.gitignore
diff --git a/packages/non-core/npm-bcrypt/.npm/package/README b/packages/npm-bcrypt/.npm/package/README
similarity index 100%
rename from packages/non-core/npm-bcrypt/.npm/package/README
rename to packages/npm-bcrypt/.npm/package/README
diff --git a/packages/npm-bcrypt/.npm/package/npm-shrinkwrap.json b/packages/npm-bcrypt/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 0000000000..95b0f873f6
--- /dev/null
+++ b/packages/npm-bcrypt/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "bcryptjs": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz",
+      "from": "bcryptjs@2.3.0"
+    }
+  }
+}
diff --git a/packages/npm-bcrypt/.versions b/packages/npm-bcrypt/.versions
new file mode 100644
index 0000000000..fe86c99b06
--- /dev/null
+++ b/packages/npm-bcrypt/.versions
@@ -0,0 +1,5 @@
+meteor@1.2.16
+modules@0.7.5
+modules-runtime@0.7.5
+npm-bcrypt@0.9.0
+underscore@1.0.9
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
new file mode 100644
index 0000000000..61f5431c66
--- /dev/null
+++ b/packages/npm-bcrypt/package.js
@@ -0,0 +1,15 @@
+Package.describe({
+  summary: "Wrapper around the bcrypt npm package",
+  version: "0.9.0",
+  documentation: null
+});
+
+Npm.depends({
+  bcryptjs: "2.3.0"
+});
+
+Package.onUse(function (api) {
+  api.use("modules@0.7.5", "server");
+  api.mainModule("wrapper.js", "server");
+  api.export("NpmModuleBcrypt", "server");
+});
diff --git a/packages/npm-bcrypt/wrapper.js b/packages/npm-bcrypt/wrapper.js
new file mode 100644
index 0000000000..eac4ad51f0
--- /dev/null
+++ b/packages/npm-bcrypt/wrapper.js
@@ -0,0 +1,38 @@
+var assert = require("assert");
+
+// The bcryptjs package has a slightly larger API than the native bcrypt
+// package, so we stick to the smaller API for consistency.
+var methods = {
+  compare: true,
+  compareSync: true,
+  genSalt: true,
+  genSaltSync: true,
+  getRounds: true,
+  hash: true,
+  hashSync: true
+};
+
+try {
+  // If you really need the native `bcrypt` package, then you should
+  // `meteor npm install --save bcrypt` into the node_modules directory in
+  // the root of your application.
+  var bcrypt = require("bcrypt");
+} catch (e) {
+  bcrypt = require("bcryptjs");
+  console.warn([
+    "Note: you are using a pure-JavaScript implementation of bcrypt.",
+    "While this implementation will work correctly, it is known to be",
+    "approximately three times slower than the native implementation.",
+    "In order to use the native implementation instead, run",
+    "",
+    "  meteor npm install --save bcrypt",
+    "",
+    "in the root directory of your application."
+  ].join("\n"));
+}
+
+exports.NpmModuleBcrypt = {};
+Object.keys(methods).forEach(function (key) {
+  assert.strictEqual(typeof bcrypt[key], "function");
+  exports.NpmModuleBcrypt[key] = bcrypt[key];
+});
diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js
index 7c9151a51a..d2ca44c5ba 100644
--- a/tools/tests/package-tests.js
+++ b/tools/tests/package-tests.js
@@ -424,14 +424,6 @@ selftest.define("show unknown version of package", function () {
   run.waitSecs(5);
   run.matchErr("meteor-base@0.123.456: not found");
   run.expectExit(1);
-
-  // This package exists in the server (we need it to publish the tool), but is
-  // not a local package.
-  run = s.run("show", "npm-bcrypt@local");
-  run.waitSecs(5);
-  run.matchErr("npm-bcrypt@local: not found");
-  run.expectExit(1);
-
 });
 
 selftest.define("circular dependency errors", function () {

From e4e87ecce43d13ae1ccfcbd1bcbda2cf76589a9e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Wed, 10 Aug 2016 16:53:56 -0400
Subject: [PATCH 075/688] Don't touch ~/.meteor/meteor after background
 updates. (#7616)

---
 tools/packaging/updater.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/packaging/updater.js b/tools/packaging/updater.js
index d8e1eb38a5..07bfaecb66 100644
--- a/tools/packaging/updater.js
+++ b/tools/packaging/updater.js
@@ -61,8 +61,6 @@ var checkForUpdate = function (showBanner, printErrors) {
     return;
   }
 
-  updateMeteorToolSymlink(printErrors);
-
   maybeShowBanners();
 };
 

From fe9f46c8a01bb503b6cad3bb54464639fb2d84c8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 Aug 2016 17:38:59 -0400
Subject: [PATCH 076/688] Upgrade ecmascript-runtime to include stage 4
 proposals.

https://github.com/meteor/ecmascript-runtime/pull/4
---
 packages/ecmascript-runtime/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 747da9d95b..0174dcc23a 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.13",
+  version: "0.3.14",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "meteor-ecmascript-runtime": "0.2.8",
+  "meteor-ecmascript-runtime": "0.2.9",
 });
 
 Package.onUse(function(api) {

From 491a413cb5f81583c36d4805e5e65695a54becf6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 Aug 2016 19:05:21 -0400
Subject: [PATCH 077/688] Update shrinkwrap for ecmascript-runtime.

---
 .../.npm/package/npm-shrinkwrap.json                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
index 3a25c59713..2d4e33d663 100644
--- a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
+++ b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "core-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.1.tgz",
-      "from": "core-js@1.2.1"
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+      "from": "core-js@2.4.1"
     },
     "meteor-ecmascript-runtime": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.8.tgz",
-      "from": "meteor-ecmascript-runtime@0.2.8"
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.9.tgz",
+      "from": "meteor-ecmascript-runtime@0.2.9"
     }
   }
 }

From e91b342360426b24da6f5d5dd39054517d1e68ac Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Thu, 11 Aug 2016 07:10:30 +0800
Subject: [PATCH 078/688] Update README.md for Windows users. (#7610)

* Update README.md

* Update README.md
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f27f3c1ff5..a34d26f161 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@ Next, read the [guide](http://guide.meteor.com) or the reference documentation a
 
 ## Quick Start
 
-Install Meteor:
+On Windows, simply go to https://www.meteor.com/install and use the Windows installer.
+
+On Linux/macOS, use this line:
 
 ```bash
 curl https://install.meteor.com/ | sh
@@ -91,6 +93,8 @@ rm -rf ~/.meteor/
 sudo rm /usr/local/bin/meteor
 ```
 
+On Windows, just run the uninstaller from your Control Panel.
+
 ## Developer Resources
 
 Building an application with Meteor?

From 3c7f83778f31ae1d3eed6e71bf1675662b99648c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Thu, 11 Aug 2016 09:11:40 -0400
Subject: [PATCH 079/688] Move server-side component of `meteor shell` into a
 package. (#7624)

This will make it much easier to fix bugs and make improvements going
forward, since they won't have to wait for the next release of Meteor.

One functional change: when the parent process exits, it no longer forces
all connected shell clients to disconnect, which is actually a more
convenient behavior, because it gives the clients a chance to reconnect
when/if the server starts up again, and it's easy enough to kill the
clients if that's what you want.
---
 packages/shell-server/README.md            |   4 +
 packages/shell-server/main.js              |   7 +
 packages/shell-server/package.js           |  11 +
 packages/shell-server/shell-server.js      | 501 +++++++++++++++++++++
 tools/isobuild/bundler.js                  |   1 -
 tools/runners/run-app.js                   |   9 -
 tools/shell-client.js                      |  11 +-
 tools/static-assets/server/boot.js         |   5 -
 tools/static-assets/server/shell-server.js | 499 --------------------
 tools/static-assets/skel/.meteor/packages  |   1 +
 tools/tests/apps/shell/.meteor/packages    |   1 +
 tools/tests/apps/shell/.meteor/versions    |   9 +-
 tools/tool-testing/selftest.js             |   3 +-
 tools/upgraders.js                         |   6 +
 14 files changed, 546 insertions(+), 522 deletions(-)
 create mode 100644 packages/shell-server/README.md
 create mode 100644 packages/shell-server/main.js
 create mode 100644 packages/shell-server/package.js
 create mode 100644 packages/shell-server/shell-server.js
 delete mode 100644 tools/static-assets/server/shell-server.js

diff --git a/packages/shell-server/README.md b/packages/shell-server/README.md
new file mode 100644
index 0000000000..be30895185
--- /dev/null
+++ b/packages/shell-server/README.md
@@ -0,0 +1,4 @@
+# `meteor shell`
+
+This code used to be integrated into the Meteor command-line tool, which
+made it difficult to release frequent updates.
diff --git a/packages/shell-server/main.js b/packages/shell-server/main.js
new file mode 100644
index 0000000000..ab044b88b4
--- /dev/null
+++ b/packages/shell-server/main.js
@@ -0,0 +1,7 @@
+export * from "./shell-server.js";
+import { listen } from "./shell-server.js";
+
+const shellDir = process.env.METEOR_SHELL_DIR;
+if (shellDir) {
+  listen(shellDir);
+}
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
new file mode 100644
index 0000000000..689b52f701
--- /dev/null
+++ b/packages/shell-server/package.js
@@ -0,0 +1,11 @@
+Package.describe({
+  name: "shell-server",
+  version: "0.2.1",
+  summary: "Server-side component of the `meteor shell` command.",
+  documentation: "README.md"
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript@0.5.7", "server");
+  api.mainModule("main.js", "server");
+});
diff --git a/packages/shell-server/shell-server.js b/packages/shell-server/shell-server.js
new file mode 100644
index 0000000000..eff77e0468
--- /dev/null
+++ b/packages/shell-server/shell-server.js
@@ -0,0 +1,501 @@
+var assert = require("assert");
+var path = require("path");
+var stream = require("stream");
+var fs = require("fs");
+var net = require("net");
+var tty = require("tty");
+var vm = require("vm");
+var _ = require("underscore");
+var INFO_FILE_MODE = parseInt("600", 8); // Only the owner can read or write.
+var EXITING_MESSAGE = "Shell exiting...";
+
+// Invoked by the server process to listen for incoming connections from
+// shell clients. Each connection gets its own REPL instance.
+export function listen(shellDir) {
+  function callback() {
+    new Server(shellDir).listen();
+  }
+
+  // If the server is still in the very early stages of starting up,
+  // Meteor.startup may not available yet.
+  if (typeof Meteor === "object") {
+    Meteor.startup(callback);
+  } else if (typeof __meteor_bootstrap__ === "object") {
+    var hooks = __meteor_bootstrap__.startupHooks;
+    if (hooks) {
+      hooks.push(callback);
+    } else {
+      // As a fallback, just call the callback asynchronously.
+      setImmediate(callback);
+    }
+  }
+}
+
+// Disabling the shell causes all attached clients to disconnect and exit.
+export function disable(shellDir) {
+  try {
+    // Replace info.json with a file that says the shell server is
+    // disabled, so that any connected shell clients will fail to
+    // reconnect after the server process closes their sockets.
+    fs.writeFileSync(
+      getInfoFile(shellDir),
+      JSON.stringify({
+        status: "disabled",
+        reason: "Shell server has shut down."
+      }) + "\n",
+      { mode: INFO_FILE_MODE }
+    );
+  } catch (ignored) {}
+}
+
+class Server {
+  constructor(shellDir) {
+    var self = this;
+    assert.ok(self instanceof Server);
+
+    self.shellDir = shellDir;
+    self.key = Math.random().toString(36).slice(2);
+
+    self.server = net.createServer(function(socket) {
+      self.onConnection(socket);
+    }).on("error", function(err) {
+      console.error(err.stack);
+    });
+  }
+
+  listen() {
+    var self = this;
+    var infoFile = getInfoFile(self.shellDir);
+
+    fs.unlink(infoFile, function() {
+      self.server.listen(0, "127.0.0.1", function() {
+        fs.writeFileSync(infoFile, JSON.stringify({
+          status: "enabled",
+          port: self.server.address().port,
+          key: self.key
+        }) + "\n", {
+          mode: INFO_FILE_MODE
+        });
+      });
+    });
+  }
+
+  onConnection(socket) {
+    var self = this;
+
+    // Make sure this function doesn't try to write anything to the socket
+    // after it has been closed.
+    socket.on("close", function() {
+      socket = null;
+    });
+
+    // If communication is not established within 1000ms of the first
+    // connection, forcibly close the socket.
+    var timeout = setTimeout(function() {
+      if (socket) {
+        socket.removeAllListeners("data");
+        socket.end(EXITING_MESSAGE + "\n");
+      }
+    }, 1000);
+
+    // Let connecting clients configure certain REPL options by sending a
+    // JSON object over the socket. For example, only the client knows
+    // whether it's running a TTY or an Emacs subshell or some other kind of
+    // terminal, so the client must decide the value of options.terminal.
+    readJSONFromStream(socket, function (error, options, replInputSocket) {
+      clearTimeout(timeout);
+
+      if (error) {
+        socket = null;
+        console.error(error.stack);
+        return;
+      }
+
+      if (options.key !== self.key) {
+        if (socket) {
+          socket.end(EXITING_MESSAGE + "\n");
+        }
+        return;
+      }
+      delete options.key;
+
+      if (options.evaluateAndExit) {
+        evalCommand.call(
+          Object.create(null), // Dummy repl object without ._RecoverableError.
+          "(" + options.evaluateAndExit.command + ")",
+          null, // evalCommand ignores the context parameter, anyway
+          options.evaluateAndExit.filename || "<meteor shell>",
+          function (error, result) {
+            if (socket) {
+              var message = error ? {
+                error: error + "",
+                code: 1
+              } : {
+                result: result
+              };
+
+              // Sending back a JSON payload allows the client to
+              // distinguish between errors and successful results.
+              socket.end(JSON.stringify(message) + "\n");
+            }
+          }
+        );
+        return;
+      }
+      delete options.evaluateAndExit;
+
+      // Immutable options.
+      _.extend(options, {
+        input: replInputSocket,
+        output: socket
+      });
+
+      // Overridable options.
+      _.defaults(options, {
+        prompt: "> ",
+        terminal: true,
+        useColors: true,
+        useGlobal: true,
+        ignoreUndefined: true,
+      });
+
+      self.startREPL(options);
+    });
+  }
+
+  startREPL(options) {
+    var self = this;
+
+    if (! options.output.columns) {
+      // The REPL's tab completion logic assumes process.stdout is a TTY,
+      // and while that isn't technically true here, we can get tab
+      // completion to behave correctly if we fake the .columns property.
+      options.output.columns = getTerminalWidth();
+    }
+
+    // Make sure this function doesn't try to write anything to the output
+    // stream after it has been closed.
+    options.output.on("close", function() {
+      options.output = null;
+    });
+
+    var repl = self.repl = require("repl").start(options);
+
+    // History persists across shell sessions!
+    self.initializeHistory();
+
+    // Save the global `_` object in the server.  This is probably defined by the
+    // underscore package.  It is unlikely to be the same object as the `var _ =
+    // require('underscore')` in this file!
+    var originalUnderscore = repl.context._;
+
+    Object.defineProperty(repl.context, "_", {
+      // Force the global _ variable to remain bound to underscore.
+      get: function () { return originalUnderscore; },
+
+      // Expose the last REPL result as __ instead of _.
+      set: function(lastResult) {
+        repl.context.__ = lastResult;
+      },
+
+      enumerable: true,
+
+      // Allow this property to be (re)defined more than once (e.g. each
+      // time the server restarts).
+      configurable: true
+    });
+
+    if (Package.modules) {
+      // Use the same `require` function and `module` object visible to the
+      // application.
+      var toBeInstalled = {};
+      var shellModuleName = "meteor-shell-" +
+        Math.random().toString(36).slice(2) + ".js";
+
+      toBeInstalled[shellModuleName] = function (require, exports, module) {
+        repl.context.module = module;
+        repl.context.require = require;
+
+        // Tab completion sometimes uses require.extensions, but only for
+        // the keys.
+        require.extensions = {
+          ".js": true,
+          ".json": true,
+          ".node": true,
+        };
+      };
+
+      // This populates repl.context.{module,require} by evaluating the
+      // module defined above.
+      Package.modules.meteorInstall(toBeInstalled)("./" + shellModuleName);
+    }
+
+    repl.context.repl = repl;
+
+    // Some improvements to the existing help messages.
+    function addHelp(cmd, helpText) {
+      var info = repl.commands[cmd] || repl.commands["." + cmd];
+      if (info) {
+        info.help = helpText;
+      }
+    }
+    addHelp("break", "Terminate current command input and display new prompt");
+    addHelp("exit", "Disconnect from server and leave shell");
+    addHelp("help", "Show this help information");
+
+    // When the REPL exits, signal the attached client to exit by sending it
+    // the special EXITING_MESSAGE.
+    repl.on("exit", function() {
+      if (options.output) {
+        options.output.write(EXITING_MESSAGE + "\n");
+        options.output.end();
+      }
+    });
+
+    // When the server process exits, end the output stream but do not
+    // signal the attached client to exit.
+    process.on("exit", function() {
+      if (options.output) {
+        options.output.end();
+      }
+    });
+
+    // This Meteor-specific shell command rebuilds the application as if a
+    // change was made to server code.
+    repl.defineCommand("reload", {
+      help: "Restart the server and the shell",
+      action: function() {
+        process.exit(0);
+      }
+    });
+
+    // Trigger one recoverable error using the default eval function, just
+    // to capture the Recoverable error constructor, so that our custom
+    // evalCommand function can wrap recoverable errors properly.
+    repl.eval(
+      "{", null, "<meteor shell>",
+      function (error) {
+        // Capture the Recoverable error constructor.
+        repl._RecoverableError = error && error.constructor;
+
+        // Now set repl.eval to the actual evalCommand function that we want
+        // to use, bound to repl._domain if necessary.
+        repl.eval = repl._domain
+          ? repl._domain.bind(evalCommand)
+          : evalCommand;
+
+        // Terminate the partial evaluation of the { command.
+        repl.commands["break"].action.call(repl);
+      }
+    );
+  }
+
+  // This function allows a persistent history of shell commands to be saved
+  // to and loaded from .meteor/local/shell-history.
+  initializeHistory() {
+    var self = this;
+    var rli = self.repl.rli;
+    var historyFile = getHistoryFile(self.shellDir);
+    var historyFd = fs.openSync(historyFile, "a+");
+    var historyLines = fs.readFileSync(historyFile, "utf8").split("\n");
+    var seenLines = Object.create(null);
+
+    if (! rli.history) {
+      rli.history = [];
+      rli.historyIndex = -1;
+    }
+
+    while (rli.history && historyLines.length > 0) {
+      var line = historyLines.pop();
+      if (line && /\S/.test(line) && ! seenLines[line]) {
+        rli.history.push(line);
+        seenLines[line] = true;
+      }
+    }
+
+    rli.addListener("line", function(line) {
+      if (historyFd >= 0 && /\S/.test(line)) {
+        fs.writeSync(historyFd, line + "\n");
+      }
+    });
+
+    self.repl.on("exit", function() {
+      fs.closeSync(historyFd);
+      historyFd = -1;
+    });
+  }
+}
+
+function readJSONFromStream(inputStream, callback) {
+  var outputStream = new stream.PassThrough;
+  var dataSoFar = "";
+
+  function onData(buffer) {
+    var lines = buffer.toString("utf8").split("\n");
+
+    while (lines.length > 0) {
+      dataSoFar += lines.shift();
+
+      try {
+        var json = JSON.parse(dataSoFar);
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          continue;
+        }
+
+        return finish(error);
+      }
+
+      if (lines.length > 0) {
+        outputStream.write(lines.join("\n"));
+      }
+
+      inputStream.pipe(outputStream);
+
+      return finish(null, json);
+    }
+  }
+
+  function onClose() {
+    finish(new Error("stream unexpectedly closed"));
+  }
+
+  var finished = false;
+  function finish(error, json) {
+    if (! finished) {
+      finished = true;
+      inputStream.removeListener("data", onData);
+      inputStream.removeListener("error", finish);
+      inputStream.removeListener("close", onClose);
+      callback(error, json, outputStream);
+    }
+  }
+
+  inputStream.on("data", onData);
+  inputStream.on("error", finish);
+  inputStream.on("close", onClose);
+}
+
+function getInfoFile(shellDir) {
+  return path.join(shellDir, "info.json");
+}
+
+function getHistoryFile(shellDir) {
+  return path.join(shellDir, "history");
+}
+
+function getTerminalWidth() {
+  try {
+    // Inspired by https://github.com/TooTallNate/ttys/blob/master/index.js
+    var fd = fs.openSync("/dev/tty", "r");
+    assert.ok(tty.isatty(fd));
+    var ws = new tty.WriteStream(fd);
+    ws.end();
+    return ws.columns;
+  } catch (fancyApproachWasTooFancy) {
+    return 80;
+  }
+}
+
+// Shell commands need to be executed in a Fiber in case they call into
+// code that yields. Using a Promise is an even better idea, since it runs
+// its callbacks in Fibers drawn from a pool, so the Fibers are recycled.
+var evalCommandPromise = Promise.resolve();
+
+function evalCommand(command, context, filename, callback) {
+  var repl = this;
+
+  function finish(error, result) {
+    if (error) {
+      if (repl._RecoverableError &&
+          isRecoverableError(error, repl)) {
+        callback(new repl._RecoverableError(error));
+      } else {
+        callback(error);
+      }
+    } else {
+      callback(null, result);
+    }
+  }
+
+  if (Package.ecmascript) {
+    var noParens = stripParens(command);
+    if (noParens !== command) {
+      var classMatch = /^\s*class\s+(\w+)/.exec(noParens);
+      if (classMatch && classMatch[1] !== "extends") {
+        // If the command looks like a named ES2015 class, we remove the
+        // extra layer of parentheses added by the REPL so that the
+        // command will be evaluated as a class declaration rather than as
+        // a named class expression. Note that you can still type (class A
+        // {}) explicitly to evaluate a named class expression. The REPL
+        // code that calls evalCommand handles named function expressions
+        // similarly (first with and then without parentheses), but that
+        // code doesn't know about ES2015 classes, which is why we have to
+        // handle them here.
+        command = noParens;
+      }
+    }
+
+    try {
+      command = Package.ecmascript.ECMAScript.compileForShell(command);
+    } catch (error) {
+      finish(error);
+      return;
+    }
+  }
+
+  try {
+    var script = new vm.Script(command, {
+      filename: filename,
+      displayErrors: false
+    });
+  } catch (parseError) {
+    finish(parseError);
+    return;
+  }
+
+  evalCommandPromise.then(function () {
+    finish(null, script.runInThisContext());
+  }).catch(finish);
+}
+
+function stripParens(command) {
+  if (command.charAt(0) === "(" &&
+      command.charAt(command.length - 1) === ")") {
+    return command.slice(1, command.length - 1);
+  }
+  return command;
+}
+
+// The bailOnIllegalToken and isRecoverableError functions are taken from
+// https://github.com/nodejs/node/blob/c9e670ea2a/lib/repl.js#L1227-L1253
+function bailOnIllegalToken(parser) {
+  return parser._literal === null &&
+    ! parser.blockComment &&
+    ! parser.regExpLiteral;
+}
+
+// If the error is that we've unexpectedly ended the input,
+// then let the user try to recover by adding more input.
+function isRecoverableError(e, repl) {
+  if (e && e.name === 'SyntaxError') {
+    var message = e.message;
+    if (message === 'Unterminated template literal' ||
+        message === 'Missing } in template expression') {
+      repl._inTemplateLiteral = true;
+      return true;
+    }
+
+    if (message.startsWith('Unexpected end of input') ||
+        message.startsWith('missing ) after argument list') ||
+        message.startsWith('Unexpected token')) {
+      return true;
+    }
+
+    if (message === 'Invalid or unexpected token') {
+      return ! bailOnIllegalToken(repl.lineParser);
+    }
+  }
+
+  return false;
+}
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 8a342eb9da..eb8b9dabd6 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -2180,7 +2180,6 @@ class ServerTarget extends JsImageTarget {
     _.each([
       "boot.js",
       "boot-utils.js",
-      "shell-server.js",
       "server-json.js",
       "mini-files.js",
       "npm-require.js",
diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index 1b7432d665..8a5fa568eb 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -138,15 +138,6 @@ _.extend(AppProcess.prototype, {
     // exception and the whole app dies.
     // http://stackoverflow.com/questions/2893458/uncatchable-errors-in-node-js
     self.proc.stdin.on('error', function () {});
-
-    // When the parent process exits (i.e. the server is shutting down and
-    // not merely restarting), make sure to disconnect any still-connected
-    // shell clients.
-    require('../tool-env/cleanup.js').onExit(function() {
-      require('../static-assets/server/shell-server.js').disable(
-        self.projectContext.getMeteorShellDirectory()
-      );
-    });
   },
 
   _maybeCallOnExit: function (code, signal) {
diff --git a/tools/shell-client.js b/tools/shell-client.js
index 35071377b5..4f6bc936ee 100644
--- a/tools/shell-client.js
+++ b/tools/shell-client.js
@@ -1,12 +1,17 @@
 var assert = require("assert");
 var fs = require("fs");
+var path = require("path");
 var net = require("net");
 var eachline = require("eachline");
 var chalk = require("chalk");
 var EOL = require("os").EOL;
-var server = require('./static-assets/server/shell-server.js');
-var EXITING_MESSAGE = server.EXITING_MESSAGE;
-var getInfoFile = server.getInfoFile;
+
+// These two values (EXITING_MESSAGE and getInfoFile) must match the
+// values used by the shell-server package.
+var EXITING_MESSAGE = "Shell exiting...";
+function getInfoFile(shellDir) {
+  return path.join(shellDir, "info.json");
+}
 
 // Invoked by the process running `meteor shell` to attempt to connect to
 // the server via the socket file.
diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index e20594fde9..5dd474e375 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -96,11 +96,6 @@ sourcemap_support.install({
   wrapCallSite: wrapCallSite
 });
 
-// Only enabled by default in development.
-if (process.env.METEOR_SHELL_DIR) {
-  require('./shell-server.js').listen(process.env.METEOR_SHELL_DIR);
-}
-
 // As a replacement to the old keepalives mechanism, check for a running
 // parent every few seconds. Exit if the parent is not running.
 //
diff --git a/tools/static-assets/server/shell-server.js b/tools/static-assets/server/shell-server.js
deleted file mode 100644
index 3f2c0e63be..0000000000
--- a/tools/static-assets/server/shell-server.js
+++ /dev/null
@@ -1,499 +0,0 @@
-var assert = require("assert");
-var path = require("path");
-var stream = require("stream");
-var fs = require("fs");
-var net = require("net");
-var tty = require("tty");
-var vm = require("vm");
-var _ = require("underscore");
-var INFO_FILE_MODE = parseInt("600", 8); // Only the owner can read or write.
-var EXITING_MESSAGE =
-  // Exported so that ./client.js can know what to expect.
-  exports.EXITING_MESSAGE = "Shell exiting...";
-
-var Promise = require("promise/lib/es6-extensions");
-require("meteor-promise").makeCompatible(Promise, require("fibers"));
-
-// Invoked by the server process to listen for incoming connections from
-// shell clients. Each connection gets its own REPL instance.
-exports.listen = function listen(shellDir) {
-  function callback() {
-    new Server(shellDir).listen();
-  }
-
-  // If the server is still in the very early stages of starting up,
-  // Meteor.startup may not available yet.
-  if (typeof Meteor === "object") {
-    Meteor.startup(callback);
-  } else if (typeof __meteor_bootstrap__ === "object") {
-    var hooks = __meteor_bootstrap__.startupHooks;
-    if (hooks) {
-      hooks.push(callback);
-    } else {
-      // As a fallback, just call the callback asynchronously.
-      setImmediate(callback);
-    }
-  }
-};
-
-// Disabling the shell causes all attached clients to disconnect and exit.
-exports.disable = function disable(shellDir) {
-  try {
-    // Replace info.json with a file that says the shell server is
-    // disabled, so that any connected shell clients will fail to
-    // reconnect after the server process closes their sockets.
-    fs.writeFileSync(
-      getInfoFile(shellDir),
-      JSON.stringify({
-        status: "disabled",
-        reason: "Shell server has shut down."
-      }) + "\n",
-      { mode: INFO_FILE_MODE }
-    );
-  } catch (ignored) {}
-};
-
-function Server(shellDir) {
-  var self = this;
-  assert.ok(self instanceof Server);
-
-  self.shellDir = shellDir;
-  self.key = Math.random().toString(36).slice(2);
-
-  self.server = net.createServer(function(socket) {
-    self.onConnection(socket);
-  }).on("error", function(err) {
-    console.error(err.stack);
-  });
-}
-
-var Sp = Server.prototype;
-
-Sp.listen = function listen() {
-  var self = this;
-  var infoFile = getInfoFile(self.shellDir);
-
-  fs.unlink(infoFile, function() {
-    self.server.listen(0, "127.0.0.1", function() {
-      fs.writeFileSync(infoFile, JSON.stringify({
-        status: "enabled",
-        port: self.server.address().port,
-        key: self.key
-      }) + "\n", {
-        mode: INFO_FILE_MODE
-      });
-    });
-  });
-};
-
-function readJSONFromStream(inputStream, callback) {
-  var outputStream = new stream.PassThrough;
-  var dataSoFar = "";
-
-  function onData(buffer) {
-    var lines = buffer.toString("utf8").split("\n");
-
-    while (lines.length > 0) {
-      dataSoFar += lines.shift();
-
-      try {
-        var json = JSON.parse(dataSoFar);
-      } catch (error) {
-        if (error instanceof SyntaxError) {
-          continue;
-        }
-
-        return finish(error);
-      }
-
-      if (lines.length > 0) {
-        outputStream.write(lines.join("\n"));
-      }
-
-      inputStream.pipe(outputStream);
-
-      return finish(null, json);
-    }
-  }
-
-  function onClose() {
-    finish(new Error("stream unexpectedly closed"));
-  }
-
-  var finished = false;
-  function finish(error, json) {
-    if (! finished) {
-      finished = true;
-      inputStream.removeListener("data", onData);
-      inputStream.removeListener("error", finish);
-      inputStream.removeListener("close", onClose);
-      callback(error, json, outputStream);
-    }
-  }
-
-  inputStream.on("data", onData);
-  inputStream.on("error", finish);
-  inputStream.on("close", onClose);
-}
-
-Sp.onConnection = function onConnection(socket) {
-  var self = this;
-
-  // Make sure this function doesn't try to write anything to the socket
-  // after it has been closed.
-  socket.on("close", function() {
-    socket = null;
-  });
-
-  // If communication is not established within 1000ms of the first
-  // connection, forcibly close the socket.
-  var timeout = setTimeout(function() {
-    if (socket) {
-      socket.removeAllListeners("data");
-      socket.end(EXITING_MESSAGE + "\n");
-    }
-  }, 1000);
-
-  // Let connecting clients configure certain REPL options by sending a
-  // JSON object over the socket. For example, only the client knows
-  // whether it's running a TTY or an Emacs subshell or some other kind of
-  // terminal, so the client must decide the value of options.terminal.
-  readJSONFromStream(socket, function (error, options, replInputSocket) {
-    clearTimeout(timeout);
-
-    if (error) {
-      socket = null;
-      console.error(error.stack);
-      return;
-    }
-
-    if (options.key !== self.key) {
-      if (socket) {
-        socket.end(EXITING_MESSAGE + "\n");
-      }
-      return;
-    }
-    delete options.key;
-
-    if (options.evaluateAndExit) {
-      evalCommand.call(
-        Object.create(null), // Dummy repl object without ._RecoverableError.
-        "(" + options.evaluateAndExit.command + ")",
-        null, // evalCommand ignores the context parameter, anyway
-        options.evaluateAndExit.filename || "<meteor shell>",
-        function (error, result) {
-          if (socket) {
-            var message = error ? {
-              error: error + "",
-              code: 1
-            } : {
-              result: result
-            };
-
-            // Sending back a JSON payload allows the client to
-            // distinguish between errors and successful results.
-            socket.end(JSON.stringify(message) + "\n");
-          }
-        }
-      );
-      return;
-    }
-    delete options.evaluateAndExit;
-
-    // Immutable options.
-    _.extend(options, {
-      input: replInputSocket,
-      output: socket
-    });
-
-    // Overridable options.
-    _.defaults(options, {
-      prompt: "> ",
-      terminal: true,
-      useColors: true,
-      useGlobal: true,
-      ignoreUndefined: true,
-    });
-
-    self.startREPL(options);
-  });
-};
-
-Sp.startREPL = function startREPL(options) {
-  var self = this;
-
-  if (! options.output.columns) {
-    // The REPL's tab completion logic assumes process.stdout is a TTY,
-    // and while that isn't technically true here, we can get tab
-    // completion to behave correctly if we fake the .columns property.
-    options.output.columns = getTerminalWidth();
-  }
-
-  // Make sure this function doesn't try to write anything to the output
-  // stream after it has been closed.
-  options.output.on("close", function() {
-    options.output = null;
-  });
-
-  var repl = self.repl = require("repl").start(options);
-
-  // History persists across shell sessions!
-  self.initializeHistory();
-
-  // Save the global `_` object in the server.  This is probably defined by the
-  // underscore package.  It is unlikely to be the same object as the `var _ =
-  // require('underscore')` in this file!
-  var originalUnderscore = repl.context._;
-
-  Object.defineProperty(repl.context, "_", {
-    // Force the global _ variable to remain bound to underscore.
-    get: function () { return originalUnderscore; },
-
-    // Expose the last REPL result as __ instead of _.
-    set: function(lastResult) {
-      repl.context.__ = lastResult;
-    },
-
-    enumerable: true,
-
-    // Allow this property to be (re)defined more than once (e.g. each
-    // time the server restarts).
-    configurable: true
-  });
-
-  if (Package.modules) {
-    // Use the same `require` function and `module` object visible to the
-    // application.
-    var toBeInstalled = {};
-    var shellModuleName = "meteor-shell-" +
-      Math.random().toString(36).slice(2) + ".js";
-
-    toBeInstalled[shellModuleName] = function (require, exports, module) {
-      repl.context.module = module;
-      repl.context.require = require;
-    };
-
-    // This populates repl.context.{module,require} by evaluating the
-    // module defined above.
-    Package.modules.meteorInstall(toBeInstalled)("./" + shellModuleName);
-  }
-
-  repl.context.repl = repl;
-
-  // Some improvements to the existing help messages.
-  function addHelp(cmd, helpText) {
-    var info = repl.commands[cmd] || repl.commands["." + cmd];
-    if (info) {
-      info.help = helpText;
-    }
-  }
-  addHelp("break", "Terminate current command input and display new prompt");
-  addHelp("exit", "Disconnect from server and leave shell");
-  addHelp("help", "Show this help information");
-
-  // When the REPL exits, signal the attached client to exit by sending it
-  // the special EXITING_MESSAGE.
-  repl.on("exit", function() {
-    if (options.output) {
-      options.output.write(EXITING_MESSAGE + "\n");
-      options.output.end();
-    }
-  });
-
-  // When the server process exits, end the output stream but do not
-  // signal the attached client to exit.
-  process.on("exit", function() {
-    if (options.output) {
-      options.output.end();
-    }
-  });
-
-  // This Meteor-specific shell command rebuilds the application as if a
-  // change was made to server code.
-  repl.defineCommand("reload", {
-    help: "Restart the server and the shell",
-    action: function() {
-      process.exit(0);
-    }
-  });
-
-  // Trigger one recoverable error using the default eval function, just
-  // to capture the Recoverable error constructor, so that our custom
-  // evalCommand function can wrap recoverable errors properly.
-  repl.eval(
-    "{", null, "<meteor shell>",
-    function (error) {
-      // Capture the Recoverable error constructor.
-      repl._RecoverableError = error && error.constructor;
-
-      // Now set repl.eval to the actual evalCommand function that we want
-      // to use, bound to repl._domain if necessary.
-      repl.eval = repl._domain
-        ? repl._domain.bind(evalCommand)
-        : evalCommand;
-
-      // Terminate the partial evaluation of the { command.
-      repl.commands["break"].action.call(repl);
-    }
-  );
-};
-
-function getInfoFile(shellDir) {
-  return path.join(shellDir, "info.json");
-}
-exports.getInfoFile = getInfoFile;
-
-function getHistoryFile(shellDir) {
-  return path.join(shellDir, "history");
-}
-
-function getTerminalWidth() {
-  try {
-    // Inspired by https://github.com/TooTallNate/ttys/blob/master/index.js
-    var fd = fs.openSync("/dev/tty", "r");
-    assert.ok(tty.isatty(fd));
-    var ws = new tty.WriteStream(fd);
-    ws.end();
-    return ws.columns;
-  } catch (fancyApproachWasTooFancy) {
-    return 80;
-  }
-}
-
-// Shell commands need to be executed in a Fiber in case they call into
-// code that yields. Using a Promise is an even better idea, since it runs
-// its callbacks in Fibers drawn from a pool, so the Fibers are recycled.
-var evalCommandPromise = Promise.resolve();
-
-function evalCommand(command, context, filename, callback) {
-  var repl = this;
-
-  function finish(error, result) {
-    if (error) {
-      if (repl._RecoverableError &&
-          isRecoverableError(error, repl)) {
-        callback(new repl._RecoverableError(error));
-      } else {
-        callback(error);
-      }
-    } else {
-      callback(null, result);
-    }
-  }
-
-  if (Package.ecmascript) {
-    var noParens = stripParens(command);
-    if (noParens !== command) {
-      var classMatch = /^\s*class\s+(\w+)/.exec(noParens);
-      if (classMatch && classMatch[1] !== "extends") {
-        // If the command looks like a named ES2015 class, we remove the
-        // extra layer of parentheses added by the REPL so that the
-        // command will be evaluated as a class declaration rather than as
-        // a named class expression. Note that you can still type (class A
-        // {}) explicitly to evaluate a named class expression. The REPL
-        // code that calls evalCommand handles named function expressions
-        // similarly (first with and then without parentheses), but that
-        // code doesn't know about ES2015 classes, which is why we have to
-        // handle them here.
-        command = noParens;
-      }
-    }
-
-    try {
-      command = Package.ecmascript.ECMAScript.compileForShell(command);
-    } catch (error) {
-      finish(error);
-      return;
-    }
-  }
-
-  try {
-    var script = new vm.Script(command, {
-      filename: filename,
-      displayErrors: false
-    });
-  } catch (parseError) {
-    finish(parseError);
-    return;
-  }
-
-  evalCommandPromise.then(function () {
-    finish(null, script.runInThisContext());
-  }).catch(finish);
-}
-
-function stripParens(command) {
-  if (command.charAt(0) === "(" &&
-      command.charAt(command.length - 1) === ")") {
-    return command.slice(1, command.length - 1);
-  }
-  return command;
-}
-
-// The bailOnIllegalToken and isRecoverableError functions are taken from
-// https://github.com/nodejs/node/blob/c9e670ea2a/lib/repl.js#L1227-L1253
-function bailOnIllegalToken(parser) {
-  return parser._literal === null &&
-    ! parser.blockComment &&
-    ! parser.regExpLiteral;
-}
-
-// If the error is that we've unexpectedly ended the input,
-// then let the user try to recover by adding more input.
-function isRecoverableError(e, repl) {
-  if (e && e.name === 'SyntaxError') {
-    var message = e.message;
-    if (message === 'Unterminated template literal' ||
-        message === 'Missing } in template expression') {
-      repl._inTemplateLiteral = true;
-      return true;
-    }
-
-    if (message.startsWith('Unexpected end of input') ||
-        message.startsWith('missing ) after argument list') ||
-        message.startsWith('Unexpected token')) {
-      return true;
-    }
-
-    if (message === 'Invalid or unexpected token') {
-      return ! bailOnIllegalToken(repl.lineParser);
-    }
-  }
-
-  return false;
-}
-
-// This function allows a persistent history of shell commands to be saved
-// to and loaded from .meteor/local/shell-history.
-Sp.initializeHistory = function initializeHistory() {
-  var self = this;
-  var rli = self.repl.rli;
-  var historyFile = getHistoryFile(self.shellDir);
-  var historyFd = fs.openSync(historyFile, "a+");
-  var historyLines = fs.readFileSync(historyFile, "utf8").split("\n");
-  var seenLines = Object.create(null);
-
-  if (! rli.history) {
-    rli.history = [];
-    rli.historyIndex = -1;
-  }
-
-  while (rli.history && historyLines.length > 0) {
-    var line = historyLines.pop();
-    if (line && /\S/.test(line) && ! seenLines[line]) {
-      rli.history.push(line);
-      seenLines[line] = true;
-    }
-  }
-
-  rli.addListener("line", function(line) {
-    if (historyFd >= 0 && /\S/.test(line)) {
-      fs.writeSync(historyFd, line + "\n");
-    }
-  });
-
-  self.repl.on("exit", function() {
-    fs.closeSync(historyFd);
-    historyFd = -1;
-  });
-};
diff --git a/tools/static-assets/skel/.meteor/packages b/tools/static-assets/skel/.meteor/packages
index d4c8001f20..1615051104 100644
--- a/tools/static-assets/skel/.meteor/packages
+++ b/tools/static-assets/skel/.meteor/packages
@@ -16,6 +16,7 @@ standard-minifier-css   # CSS minifier run for production mode
 standard-minifier-js    # JS minifier run for production mode
 es5-shim                # ECMAScript 5 compatibility for older browsers.
 ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
 
 autopublish             # Publish all data to the clients (for prototyping)
 insecure                # Allow all DB writes from clients (for prototyping)
diff --git a/tools/tests/apps/shell/.meteor/packages b/tools/tests/apps/shell/.meteor/packages
index d4c8001f20..c45a0da55a 100644
--- a/tools/tests/apps/shell/.meteor/packages
+++ b/tools/tests/apps/shell/.meteor/packages
@@ -19,3 +19,4 @@ ecmascript              # Enable ECMAScript2015+ syntax in app code
 
 autopublish             # Publish all data to the clients (for prototyping)
 insecure                # Allow all DB writes from clients (for prototyping)
+shell-server
diff --git a/tools/tests/apps/shell/.meteor/versions b/tools/tests/apps/shell/.meteor/versions
index 40d32caaa2..80b62f9734 100644
--- a/tools/tests/apps/shell/.meteor/versions
+++ b/tools/tests/apps/shell/.meteor/versions
@@ -20,7 +20,7 @@ ddp-server@1.3.9
 deps@1.0.12
 diff-sequence@1.0.6
 ecmascript@0.5.7
-ecmascript-runtime@0.3.12
+ecmascript-runtime@0.3.14
 ejson@1.0.12
 es5-shim@4.6.13
 fastclick@1.0.12
@@ -38,7 +38,7 @@ logging@1.1.14
 meteor@1.2.16
 meteor-base@1.0.4
 minifier-css@1.2.13
-minifier-js@1.2.13
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
@@ -55,10 +55,11 @@ reactive-var@1.0.10
 reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
+shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
 templating@1.2.13
 templating-tools@1.0.4
 tracker@1.1.0
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index c2ae7feb44..1fd550f866 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -144,7 +144,8 @@ var ROOT_PACKAGES_TO_BUILD_IN_SANDBOX = [
   "insecure",
   "standard-minifier-css",
   "standard-minifier-js",
-  "es5-shim"
+  "es5-shim",
+  "shell-server"
 ];
 
 var setUpBuiltPackageTropohouse = function () {
diff --git a/tools/upgraders.js b/tools/upgraders.js
index 8691afc261..94528f9232 100644
--- a/tools/upgraders.js
+++ b/tools/upgraders.js
@@ -233,6 +233,12 @@ the guide about breaking changes here:`,
     files.rm_recursive(oldDevBundleLink);
   },
 
+  "1.4.1-add-shell-server-package": function (projectContext) {
+    const packagesFile = projectContext.projectConstraintsFile;
+    packagesFile.addPackages(["shell-server"]);
+    packagesFile.writeIfModified();
+  },
+
   ////////////
   // PLEASE. When adding new upgraders that print mesasges, follow the
   // examples for 0.9.0 and 0.9.1 above. Specifically, formatting

From a78dde02254f9f2072e1db60e3fbeaa7ea26cc31 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Thu, 11 Aug 2016 11:24:38 -0400
Subject: [PATCH 080/688] Make `meteor publish-for-arch` unnecessary in most
 cases (#7608)

* Include process.{platform,arch} in .meteor-last-rebuild-version.json.

This supports rebuilding binary npm packages published by completely
different architectures, not just different versions of Node.

* Make publish-for-arch unnecessary in most cases.

* Don't rebuild binary packages when Node patch version changes.

* Permit patch-compatible versions in .meteor-last-rebuild-version.json.

This is a more general solution than simply discarding the patch version
for currentVersions.versions.node, as I did in a previous commit.
---
 tools/isobuild/bundler.js    |  4 ++
 tools/isobuild/compiler.js   | 21 +++++++-
 tools/isobuild/meteor-npm.js | 97 ++++++++++++++++++++++++++++--------
 3 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index eb8b9dabd6..b507c349f4 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -260,6 +260,10 @@ export class NodeModulesDirectory {
     return meteorNpm.dependenciesArePortable(this.sourcePath);
   }
 
+  rebuildIfNonPortable() {
+    return meteorNpm.rebuildIfNonPortable(this.sourcePath);
+  }
+
   getPreferredBundlePath(kind) {
     assert.ok(kind === "bundle" ||
               kind === "isopack",
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 9d9e9b632c..1de3c021b0 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -623,8 +623,25 @@ api.addAssets('${relPath}', 'client').`);
     return _.pick(symbol, ['name', 'testOnly']);
   });
 
-  const isPortable = process.env.METEOR_FORCE_PORTABLE ||
-    _.every(nodeModulesDirectories, nmd => nmd.isPortable());
+  // By default, consider this isopack "portable" unless
+  // process.env.METEOR_ALLOW_NON_PORTABLE is truthy or the name of the
+  // package is "meteor-tool", in which case we determine portability by
+  // scanning node_modules directories for binary .node files.
+  // Non-portable packages must publish platform-specific builds using
+  // publish-for-arch, whereas portable packages can avoid running
+  // publish-for-arch and rely instead on the package consumer to rebuild
+  // binary npm dependencies when necessary.
+  let isPortable = true;
+  if (! process.env.METEOR_FORCE_PORTABLE) {
+    // Make sure we've rebuilt these npm packages according to the current
+    // process.{platform,arch,versions}.
+    _.each(nodeModulesDirectories, nmd => nmd.rebuildIfNonPortable());
+
+    if (process.env.METEOR_ALLOW_NON_PORTABLE ||
+        isopk.name === "meteor-tool") {
+      isPortable = _.every(nodeModulesDirectories, nmd => nmd.isPortable());
+    }
+  }
 
   // *** Consider npm dependencies and portability
   var arch = inputSourceArch.arch;
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 16fc723a09..d8c9a21e32 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -156,12 +156,19 @@ meteorNpm.getProdPackageNames = function (nodeModulesDir) {
 };
 
 const lastRebuildJSONFilename = ".meteor-last-rebuild-version.json";
+
+const currentVersions = {
+  platform: process.platform,
+  arch: process.arch,
+  versions: {...process.versions},
+};
+
 const currentVersionsJSON =
-  JSON.stringify(process.versions, null, 2) + "\n";
+  JSON.stringify(currentVersions, null, 2) + "\n";
 
 function recordLastRebuildVersions(pkgDir) {
-  // Record the current process.versions so that we can avoid
-  // copying/rebuilding/renaming next time.
+  // Record the current process.{platform,arch,versions} so that we can
+  // avoid copying/rebuilding/renaming next time.
   files.writeFile(
     files.pathJoin(pkgDir, lastRebuildJSONFilename),
     currentVersionsJSON,
@@ -169,6 +176,54 @@ function recordLastRebuildVersions(pkgDir) {
   );
 }
 
+// Returns true iff isSubtreeOf(currentVersions, versions), allowing
+// valid semantic versions to differ in their patch versions.
+function versionsAreCompatible(versions) {
+  import { parse } from "semver";
+
+  return isSubtreeOf(currentVersions, versions, (a, b) => {
+    // Technically already handled by isSubtreeOf, but doesn't hurt.
+    if (a === b) {
+      return true;
+    }
+
+    if (! a || ! b) {
+      return false;
+    }
+
+    const aType = typeof a;
+    const bType = typeof b;
+
+    if (aType !== bType) {
+      return false;
+    }
+
+    if (aType === "string") {
+      const aVer = parse(a);
+      const bVer = parse(b);
+      return aVer && bVer &&
+        aVer.major === bVer.major &&
+        aVer.minor === bVer.minor;
+    }
+  });
+}
+
+function rebuildVersionsAreCompatible(pkgPath) {
+  const versionFile =
+    files.pathJoin(pkgPath, lastRebuildJSONFilename);
+
+  try {
+    var versions = JSON.parse(files.readFile(versionFile));
+  } catch (e) {
+    if (! (e instanceof SyntaxError ||
+           e.code === "ENOENT")) {
+      throw e;
+    }
+  }
+
+  return versionsAreCompatible(versions);
+}
+
 // Rebuilds any binary dependencies in the given node_modules directory,
 // and returns true iff anything was rebuilt.
 meteorNpm.rebuildIfNonPortable =
@@ -182,19 +237,7 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
       return;
     }
 
-    const versionFile =
-      files.pathJoin(pkgPath, lastRebuildJSONFilename);
-
-    try {
-      var versions = JSON.parse(files.readFile(versionFile));
-    } catch (e) {
-      if (! (e instanceof SyntaxError ||
-             e.code === "ENOENT")) {
-        throw e;
-      }
-    }
-
-    if (_.isEqual(versions, process.versions)) {
+    if (rebuildVersionsAreCompatible(pkgPath)) {
       return;
     }
 
@@ -457,16 +500,26 @@ var updateExistingNpmDirectory = function (packageName, newPackageNpmDir,
                        npmDependencies);
 };
 
-function isSubtreeOf(subsetTree, supersetTree) {
+function isSubtreeOf(subsetTree, supersetTree, predicate) {
   if (subsetTree === supersetTree) {
     return true;
   }
 
-  return _.isObject(subsetTree) &&
-    _.isObject(supersetTree) &&
-    _.every(subsetTree, (value, key) => {
-      return isSubtreeOf(value, supersetTree[key]);
-    });
+  if (_.isObject(subsetTree)) {
+    return _.isObject(supersetTree) &&
+      _.every(subsetTree, (value, key) => {
+        return isSubtreeOf(value, supersetTree[key], predicate);
+      });
+  }
+
+  if (_.isFunction(predicate)) {
+    const result = predicate(subsetTree, supersetTree);
+    if (typeof result === "boolean") {
+      return result;
+    }
+  }
+
+  return false;
 }
 
 var createFreshNpmDirectory = function (packageName, newPackageNpmDir,

From e5313e9144d0204c4e31a7fc12e4e83bb6c887ad Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 11:42:59 -0400
Subject: [PATCH 081/688] Update meteor-ecmascript-runtime to v0.2.9.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index fd75a4d7a5..25e63dd000 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -21,7 +21,7 @@ var packageJson = {
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.
     "babel-runtime": "6.9.2",
     // For various ES2015 polyfills, such as Map and Set.
-    "meteor-ecmascript-runtime": "0.2.6",
+    "meteor-ecmascript-runtime": "0.2.9",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
     // in the package too) because we should consider using lodash instead
     // (and there are backwards-incompatible changes either way).

From d6cc3429fe8bb77e2d95629a4204fba4325370d4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 11:43:08 -0400
Subject: [PATCH 082/688] Update meteor-babel to v0.12.0.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 25e63dd000..53135a9a13 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "3.10.5",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.29",
-    "meteor-babel": "0.11.7",
+    "meteor-babel": "0.12.0",
     "meteor-promise": "0.7.2",
     fibers: "1.0.13",
     promise: "7.1.1",

From 0122127aeebbeea64cec61f8566e01cc61f141ce Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 11:43:41 -0400
Subject: [PATCH 083/688] Bump $BUNDLE_VERSION to 4.2.6 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 11f0d76f48..970f4b7882 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.5
+BUNDLE_VERSION=4.2.6
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From e9f6b2b4040f8f6b9902bfc9c79a9e5ea86b9c0d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 12:15:55 -0400
Subject: [PATCH 084/688] Bump package versions for 1.4.1-beta.1 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 74ae102d28..c099e9b2de 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-beta.0"
+  version: "1.2.11-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 6e1e8e9dcb..23caff3a46 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0"
+  version: "1.3.0-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index df8b50745c..13bfffee0a 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-beta.0"
+  version: "1.2.4-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 0174dcc23a..2fe26ccae6 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14",
+  version: "0.3.14-beta.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 2a87099b03..05659d950b 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-beta.0',
+  version: '0.5.8-beta.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 4c840c5e55..852f48aa20 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-beta.0"
+  version: "1.2.9-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 6262f9481a..9fcf8ca25b 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-beta.0"
+  version: "1.1.14-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 2a80110fd4..9a14a64080 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-beta.0',
+  version: '2.7.5-beta.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 015e41be53..a39c81422a 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-beta.0'
+  version: '1.4.1-beta.1'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 3415ca840b..18ebe08926 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-beta.0"
+  version: "1.2.14-beta.1"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 4a91141576..0eb5729022 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-beta.0',
+  version: '1.2.0-beta.1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 6f7ee445df..e0dbe6d6f0 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-beta.0',
+  version: '1.2.0-beta.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 5199039aee..69668c97eb 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-beta.0',
+  version: '1.1.12-beta.1',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 66e5953f0c..c045fd9f99 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-beta.0"
+  version: "2.513.5-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 91744dab5d..045aa5ed30 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-beta.0'
+  version: '1.2.14-beta.1'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4a1a61d1a0..787460f5b6 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-beta.0",
+ "version": "1.4.1-beta.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 62ff1ec5ed961805c79a8d83492cf9fd82a25a86 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 16:08:57 -0400
Subject: [PATCH 085/688] Upgrade npm tar package to v2.2.1.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 53135a9a13..c47a7c84fc 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -30,7 +30,7 @@ var packageJson = {
     semver: "4.1.0",
     request: "2.47.0",
     fstream: "https://github.com/meteor/fstream/tarball/cf4ea6c175355cec7bee38311e170d08c4078a5d",
-    tar: "1.0.2",
+    tar: "2.2.1",
     kexec: "2.0.2",
     "source-map": "0.5.3",
     "browserstack-webdriver": "2.41.1",

From 1783932a5cc9822e9c2c05eb8baf9270012a3db5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 16:10:29 -0400
Subject: [PATCH 086/688] Bump $BUNDLE_VERSION to 4.2.7 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 970f4b7882..40c9b22e95 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.6
+BUNDLE_VERSION=4.2.7
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From d808bc2a49dfca9975d27a16b37195b013a33be6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 16:29:45 -0400
Subject: [PATCH 087/688] Bump package versions for 1.4.1-beta.2 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index c099e9b2de..2d5a8c4499 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-beta.1"
+  version: "1.2.11-beta.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 23caff3a46..2dfc8227ed 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-beta.1"
+  version: "1.3.0-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 13bfffee0a..0699e6f4c1 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-beta.1"
+  version: "1.2.4-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 2fe26ccae6..d3c953311f 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-beta.1",
+  version: "0.3.14-beta.2",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 05659d950b..d6d7ac14fb 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-beta.1',
+  version: '0.5.8-beta.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 852f48aa20..83291d27dd 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-beta.1"
+  version: "1.2.9-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 9fcf8ca25b..06827b142a 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-beta.1"
+  version: "1.1.14-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 9a14a64080..1e438ab8ac 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-beta.1',
+  version: '2.7.5-beta.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index a39c81422a..e4c5d0fe79 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-beta.1'
+  version: '1.4.1-beta.2'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 18ebe08926..b1e8d37fa2 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-beta.1"
+  version: "1.2.14-beta.2"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 0eb5729022..2ccbf76a63 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-beta.1',
+  version: '1.2.0-beta.2',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index e0dbe6d6f0..86575ed264 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-beta.1',
+  version: '1.2.0-beta.2',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 69668c97eb..1924610c9c 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-beta.1',
+  version: '1.1.12-beta.2',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index c045fd9f99..ad993ef3b4 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-beta.1"
+  version: "2.513.5-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 045aa5ed30..addb980eb8 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-beta.1'
+  version: '1.2.14-beta.2'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 787460f5b6..9a3b7e2b93 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-beta.1",
+ "version": "1.4.1-beta.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 38096aafc82323dcae11dc539fea9ecf4b5f4a88 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 18:30:17 -0400
Subject: [PATCH 088/688] Use --debug instead of --debug-brk for `meteor
 debug`.

Breaking on the first statement in the program used to be the only way to
get the debugger to stop at any breakpoints, but more recent versions of
node-inspector (compatible with Node 4) do a much better job of stopping
at breakpoints after the program starts.
---
 tools/inspector.js       | 15 +++++++++++----
 tools/runners/run-app.js |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/inspector.js b/tools/inspector.js
index b4265c8b72..21cc3ebaf6 100644
--- a/tools/inspector.js
+++ b/tools/inspector.js
@@ -295,13 +295,20 @@ function banner(debugPort) {
   return [
     "",
     chalk.green([
-      "Your application is now paused and ready for debugging!",
+      "Your application is now ready for debugging!",
       "",
       "To debug the server process using a graphical debugging interface, ",
-      "visit this URL in your web browser:"
+      "visit this URL in your web browser:",
+      ""
     ].join(EOL)),
-    chalk.cyan(proc.url),
-    EOL
+    chalk.cyan("  " + proc.url),
+    chalk.green([
+      "",
+      "If your application is paused on a breakpoint but the code is not ",
+      "visible in the debugger, press the pause (||) button.",
+      ""
+    ].join(EOL)),
+    ""
   ].join(EOL);
 }
 
diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index 8a5fa568eb..e0568e6cdc 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -240,9 +240,9 @@ _.extend(AppProcess.prototype, {
     if (self.debugPort) {
       attach = require('../inspector.js').start(self.debugPort, entryPoint);
 
-      // If you do opts.push("--debug-brk", port) it doesn't work on Windows
-      // for some reason
-      opts.push("--debug-brk=" + attach.suggestedDebugBrkPort);
+      // If you do opts.push("--debug", port) it doesn't work on Windows
+      // for some reason.
+      opts.push("--debug=" + attach.suggestedDebugBrkPort);
     }
 
     opts.push(entryPoint);

From 0a58a934901674afc5bc2cb2a4407c1a7c62fd93 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 19:05:44 -0400
Subject: [PATCH 089/688] Allow tests to share .meteor/local/shell with apps.

This change means `meteor shell` will now work when running tests with
`meteor test`.
---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 87473a5777..754e9b4535 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1657,6 +1657,7 @@ function doTestCommand(options) {
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'bundler-cache');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'isopacks');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'plugin-cache');
+    copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'shell');
     
     projectContext = new projectContextModule.ProjectContext(projectContextOptions);
 

From fe761c53673a745a986457e951ccc39a08b89ba8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 Aug 2016 19:14:55 -0400
Subject: [PATCH 090/688] Bump package versions for 1.4.1-rc.0 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 2d5a8c4499..b95483b995 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-beta.2"
+  version: "1.2.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 2dfc8227ed..f4f2cad40f 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-beta.2"
+  version: "1.3.0-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 0699e6f4c1..fdb37e4116 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-beta.2"
+  version: "1.2.4-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index d3c953311f..e10c6681b1 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-beta.2",
+  version: "0.3.14-rc.0",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index d6d7ac14fb..39c0c91abd 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-beta.2',
+  version: '0.5.8-rc.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 83291d27dd..021da91c1e 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-beta.2"
+  version: "1.2.9-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 06827b142a..9c628af5d3 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-beta.2"
+  version: "1.1.14-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 1e438ab8ac..bbbde2db14 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-beta.2',
+  version: '2.7.5-rc.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e4c5d0fe79..69562c4416 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-beta.2'
+  version: '1.4.1-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b1e8d37fa2..281ebe3f75 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-beta.2"
+  version: "1.2.14-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 2ccbf76a63..c8e31fbe67 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-beta.2',
+  version: '1.2.0-rc.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 86575ed264..3a5337a974 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-beta.2',
+  version: '1.2.0-rc.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 1924610c9c..31509cec44 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-beta.2',
+  version: '1.1.12-rc.0',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index ad993ef3b4..3074a2c9b7 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-beta.2"
+  version: "2.513.5-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index addb980eb8..1d899bdadb 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-beta.2'
+  version: '1.2.14-rc.0'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 9a3b7e2b93..14099a1ec2 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-beta.2",
+ "version": "1.4.1-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From f9f94e21d10676aaa4a8a6809cb3bbc2fa60f536 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Mon, 15 Aug 2016 12:01:56 +1000
Subject: [PATCH 091/688] Fix issue with `_expirePasswordResetTokens` for #7534

Also added a test to actually execute this code
---
 packages/accounts-base/accounts_server.js    |  2 +-
 packages/accounts-password/password_tests.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index f694b3a2bb..abeebd651a 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1140,7 +1140,7 @@ Ap._expirePasswordResetTokens = function (oldestValidDate, userId) {
       { "services.password.reset.when": { $lt: +oldestValidDate } }
     ]
   }), {
-    $pull: {
+    $unset: {
       "services.password.reset": {
         $or: [
           { when: { $lt: oldestValidDate } },
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index fcabdfe8d3..61c78060e4 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1468,6 +1468,20 @@ if (Meteor.isServer) (function () {
       }, /Incorrect password/);
     });
 
+  Tinytest.add(
+    'passwords - reset tokens get cleaned up',
+    function (test) {
+      var email = test.id + '-intercept@example.com';
+      var userId = Accounts.createUser({email: email, password: 'password'});
+      Accounts.sendResetPasswordEmail(userId, email);
+      test.isTrue(!!Meteor.users.findOne(userId).services.password.reset);
+
+      Accounts._expirePasswordResetTokens(new Date(), userId);
+
+      test.isUndefined(Meteor.users.findOne(userId).services.password.reset);
+    }
+  )
+
   // We should be able to change the username
   Tinytest.add("passwords - change username", function (test) {
     var username = Random.id();

From bff8d742dd377cd054cac9f7bf17e7365e656cb9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 11:12:34 -0400
Subject: [PATCH 092/688] Update History.md with more changes in 1.4.1.

---
 History.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/History.md b/History.md
index aa4cff3eae..f05d1769cc 100644
--- a/History.md
+++ b/History.md
@@ -2,15 +2,41 @@
 
 ## v1.4.1
 
+* The `meteor publish-for-arch` command is no longer necessary when
+  publishing Meteor packages with binary npm dependencies. Instead, binary
+  dependencies will be rebuilt automatically on the installation side.
+  Meteor package authors are not responsible for failures due to compiler
+  toolchain misconfiguration, and any compilation problems with the
+  underlying npm packages should be taken up with the authors of those
+  packages. That said, if a Meteor package author really needs or wants to
+  continue using `meteor publish-for-arch`, she should publish her package
+  using an older release: e.g. `meteor --release 1.4 publish`.
+  [#7608](https://github.com/meteor/meteor/pull/7608)
+
+* The `npm-bcrypt` package now uses a pure-JavaScript implementation by
+  default, but will prefer the native `bcrypt` implementation if it is
+  installed in the application's `node_modules` directory. In other words,
+  run `meteor install --save bcrypt` in your application if you need or
+  want to use the native implementation of `bcrypt`.
+  [#7595](https://github.com/meteor/meteor/pull/7595)
+
 * After Meteor packages are downloaded from Atmosphere, they will now be
   extracted using native `tar` or `7z.exe` on Windows, instead of the
   https://www.npmjs.com/package/tar library, for a significant performance
   improvement. [#7457](https://github.com/meteor/meteor/pull/7457)
 
+* The npm `tar` package has been upgraded to 2.2.1, though it is now only
+  used as a fallback after native `tar` and/or `7z.exe`.
+
 * The progress indicator now distinguishes between downloading,
   extracting, and loading newly-installed Meteor packages, instead of
   lumping all of that work into a "downloading" status message.
 
+* Background Meteor updates will no longer modify the `~/.meteor/meteor`
+  symbolic link (or `AppData\Local\.meteor\meteor.bat` on Windows).
+  Instead, developers must explicitly type `meteor update` to begin using
+  a new version of the `meteor` script.
+
 * Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
 
 * The `google` package now uses the `email` scope as a mandatory field instead
@@ -48,6 +74,27 @@
   Node 4 `crypto` library natively supports the `aes-128-gcm` algorithm.
   [#7548](https://github.com/meteor/meteor/pull/7548)
 
+* The server-side component of the `meteor shell` command has been moved
+  into a Meteor package, so that it can be developed independently from
+  the Meteor release process, thanks to version unpinning.
+  [#7624](https://github.com/meteor/meteor/pull/7624)
+
+* The `meteor shell` command now works when running `meteor test`.
+
+* The `meteor debug` command no longer pauses at the first statement
+  in the Node process, yet still reliably stops at custom breakpoints
+  it encounters later.
+
+* The `meteor-babel` package has been upgraded to 0.12.0.
+
+* The `meteor-ecmascript-runtime` package has been upgraded to 0.2.9, to
+  support several additional [stage 4
+  proposals](https://github.com/meteor/ecmascript-runtime/pull/4).
+
+* A bug that prevented @-scoped npm packages from getting bundled for
+  deployed apps has been fixed.
+  [#7609](https://github.com/meteor/meteor/pull/7609).
+
 ## v1.4.0.1
 
 * Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))

From 65b3e60d67f25fc80edeaf244e5810ddf585e75f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 11:13:39 -0400
Subject: [PATCH 093/688] Bump package versions for 1.4.1-rc.1 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index b95483b995..26313ac8f9 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.0"
+  version: "1.2.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index f4f2cad40f..5a850f50eb 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.0"
+  version: "1.3.0-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index fdb37e4116..5eb3e15186 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.0"
+  version: "1.2.4-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index e10c6681b1..f7a017db03 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.0",
+  version: "0.3.14-rc.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 39c0c91abd..3e11e7c525 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.0',
+  version: '0.5.8-rc.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 021da91c1e..0d3b829c65 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.0"
+  version: "1.2.9-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 9c628af5d3..2ed6ab2019 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.0"
+  version: "1.1.14-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index bbbde2db14..5e54964c3f 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.0',
+  version: '2.7.5-rc.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 69562c4416..cebecac81d 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.0'
+  version: '1.4.1-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 281ebe3f75..085ff3239c 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.0"
+  version: "1.2.14-rc.1"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index c8e31fbe67..33182a0fec 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.0',
+  version: '1.2.0-rc.1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 3a5337a974..32839fd828 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.0',
+  version: '1.2.0-rc.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 31509cec44..a51dabfe59 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.0',
+  version: '1.1.12-rc.1',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 3074a2c9b7..9f887e11e4 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.0"
+  version: "2.513.5-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 1d899bdadb..bb67773bc8 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.0'
+  version: '1.2.14-rc.1'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 14099a1ec2..97e91270cb 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.0",
+ "version": "1.4.1-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 351e958d6c2d9f747e9fb91d8bb34b7e0d2cb229 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 13:39:26 -0400
Subject: [PATCH 094/688] Mention relaxing .meteor-last-rebuild-version.json
 comparisons.

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index f05d1769cc..9508b5b20f 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,12 @@
   using an older release: e.g. `meteor --release 1.4 publish`.
   [#7608](https://github.com/meteor/meteor/pull/7608)
 
+* The `.meteor-last-rebuild-version.json` files that determine if a binary
+  npm package needs to be rebuilt now include more information from the
+  `process` object, namely `process.{platform,arch,versions}` instead of
+  just `process.versions`. Note also that the comparison of versions now
+  ignores differences in patch versions, to avoid needless rebuilds.
+
 * The `npm-bcrypt` package now uses a pure-JavaScript implementation by
   default, but will prefer the native `bcrypt` implementation if it is
   installed in the application's `node_modules` directory. In other words,

From f6a52788f0aefedb60d597e27577cf0cab614a0d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 13:34:00 -0400
Subject: [PATCH 095/688] Remove BrowserStack from dev bundle.

---
 scripts/ci.sh                      |  2 +-
 scripts/dev-bundle-tool-package.js |  1 -
 scripts/generate-dev-bundle.sh     | 12 -----
 tools/tool-testing/selftest.js     | 73 +++++++++++++++++++++++-------
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index d81fa968c4..3004d2a75d 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -7,7 +7,7 @@ export EMACS=t
 
 # Since PhantomJS has been removed from dev_bundle/lib/node_modules
 # (#6905), but self-test still needs it, install it now.
-./meteor npm install -g phantomjs-prebuilt
+./meteor npm install -g phantomjs-prebuilt browserstack-webdriver
 
 # run different jobs based on CicleCI parallel container index
 case $CIRCLE_NODE_INDEX in
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index c47a7c84fc..9d5aa5b600 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -33,7 +33,6 @@ var packageJson = {
     tar: "2.2.1",
     kexec: "2.0.2",
     "source-map": "0.5.3",
-    "browserstack-webdriver": "2.41.1",
     "node-inspector": "0.12.8",
     chalk: "0.5.1",
     sqlite3: "3.1.3",
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index e439817b2d..2790ad3a43 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -120,9 +120,6 @@ delete () {
     rm -rf "$1"
 }
 
-delete browserstack-webdriver/docs
-delete browserstack-webdriver/lib/test
-
 delete sqlite3/deps
 delete wordwrap/test
 delete moment/min
@@ -133,15 +130,6 @@ find . -path '*/esprima-fb/test' | xargs rm -rf
 cd "$DIR/lib/node_modules/fibers/bin"
 shrink_fibers
 
-# Download BrowserStackLocal binary.
-BROWSER_STACK_LOCAL_URL="https://browserstack-binaries.s3.amazonaws.com/BrowserStackLocal-07-03-14-$OS-$ARCH.gz"
-
-cd "$DIR/build"
-curl -O $BROWSER_STACK_LOCAL_URL
-gunzip BrowserStackLocal*
-mv BrowserStackLocal* BrowserStackLocal
-mv BrowserStackLocal "$DIR/bin/"
-
 # Sanity check to see if we're not breaking anything by replacing npm
 INSTALLED_NPM_VERSION=$(cat "$DIR/lib/node_modules/npm/package.json" |
 xargs -0 node -e "console.log(JSON.parse(process.argv[1]).version)")
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 1fd550f866..f8a0b732d0 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -3,7 +3,6 @@ var util = require('util');
 var Future = require('fibers/future');
 var fiberHelpers = require('../utils/fiber-helpers.js');
 var child_process = require('child_process');
-var webdriver = require('browserstack-webdriver');
 
 var files = require('../fs/files.js');
 var utils = require('../utils/utils.js');
@@ -13,6 +12,7 @@ var archinfo = require('../utils/archinfo.js');
 var config = require('../meteor-services/config.js');
 var buildmessage = require('../utils/buildmessage.js');
 var execFileSync = require('../utils/processes.js').execFileSync;
+var { getUrlWithResuming } = require("../utils/http-helpers.js");
 var Builder = require('../isobuild/builder.js').default;
 
 var catalog = require('../packaging/catalog/catalog.js');
@@ -29,20 +29,25 @@ var upgraders = require('../upgraders.js');
 
 require("../tool-env/install-runtime.js");
 
-try {
-  var phantomPath = require.resolve('phantomjs-prebuilt');
-} catch (e) {
-  throw new Error([
-    "Please install PhantomJS by running the following command:",
-    "",
-    "  /path/to/meteor npm install -g phantomjs-prebuilt",
-    "",
-    "Where `/path/to/meteor` is the executable you used to run this self-test.",
-    ""
-  ].join("\n"));
+function checkTestOnlyDependency(name) {
+  try {
+    var absPath = require.resolve(name);
+  } catch (e) {
+    throw new Error([
+      "Please install " + name + " by running the following command:",
+      "",
+      "  /path/to/meteor npm install -g " + name,
+      "",
+      "Where `/path/to/meteor` is the executable you used to run this self-test.",
+      ""
+    ].join("\n"));
+  }
+
+  return require(absPath);
 }
 
-var phantomjs = require(phantomPath);
+var phantomjs = checkTestOnlyDependency("phantomjs-prebuilt");
+var webdriver = checkTestOnlyDependency('browserstack-webdriver');
 
 // To allow long stack traces that cross async boundaries
 require('longjohn');
@@ -1077,10 +1082,8 @@ _.extend(BrowserStackClient.prototype, {
   },
 
   _launchBrowserStackTunnel: function (callback) {
-    var self = this;
-    var browserStackPath =
-      files.pathJoin(files.getDevBundle(), 'bin', 'BrowserStackLocal');
-    files.chmod(browserStackPath, 0o755);
+    const self = this;
+    const browserStackPath = ensureBrowserStack();
 
     var args = [
       browserStackPath,
@@ -1105,6 +1108,42 @@ _.extend(BrowserStackClient.prototype, {
   }
 });
 
+function ensureBrowserStack() {
+  const browserStackPath = files.pathJoin(
+    files.getDevBundle(),
+    'bin',
+    'BrowserStackLocal'
+  );
+
+  const browserStackStat = files.statOrNull(browserStackPath);
+  if (! browserStackStat) {
+    const host = "browserstack-binaries.s3.amazonaws.com";
+    const OS = process.platform === "darwin" ? "osx" : "linux";
+    const ARCH = process.arch === "x64" ? "x86_64" : "i686";
+    const tarGz = `BrowserStackLocal-07-03-14-${OS}-${ARCH}.gz`;
+    const url = `https:\/\/${host}/${tarGz}`;
+
+    buildmessage.enterJob("downloading BrowserStack binaries", () => {
+      return new Promise((resolve, reject) => {
+        const browserStackStream =
+          files.createWriteStream(browserStackPath);
+
+        browserStackStream.on("error", reject);
+        browserStackStream.on("end", resolve);
+
+        const gunzip = require("zlib").createGunzip();
+        gunzip.pipe(browserStackStream);
+        gunzip.write(getUrlWithResuming(url));
+        gunzip.end();
+      }).await();
+    });
+  }
+
+  files.chmod(browserStackPath, 0o755);
+
+  return browserStackPath;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Run
 ///////////////////////////////////////////////////////////////////////////////

From 8aff09bec5fa8e81081e1f2a3d9c874671c0a773 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 13:35:17 -0400
Subject: [PATCH 096/688] Remove unnecessary sqlite3 dependencies from dev
 bundle.

---
 scripts/generate-dev-bundle.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 2790ad3a43..6bb9ec48d5 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -121,6 +121,8 @@ delete () {
 }
 
 delete sqlite3/deps
+delete sqlite3/node_modules/nan
+delete sqlite3/node_modules/node-pre-gyp
 delete wordwrap/test
 delete moment/min
 

From 99004c08268b266d9a6e1b1204e8c9e95305c21d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 13:35:31 -0400
Subject: [PATCH 097/688] Remove npm/test from dev bundle.

---
 scripts/generate-dev-bundle.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 6bb9ec48d5..9c5e6d2cf2 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -120,6 +120,7 @@ delete () {
     rm -rf "$1"
 }
 
+delete npm/test
 delete sqlite3/deps
 delete sqlite3/node_modules/nan
 delete sqlite3/node_modules/node-pre-gyp

From da0e944c149af18e38ffebfe466172ee7b1aec68 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 14:20:39 -0400
Subject: [PATCH 098/688] Avoid installing an extra copy of node-gyp in the dev
 bundle.

---
 scripts/generate-dev-bundle.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 9c5e6d2cf2..ec3aa0d522 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -121,6 +121,11 @@ delete () {
 }
 
 delete npm/test
+delete npm/node_modules/node-gyp
+pushd npm/node_modules
+ln -s ../../node-gyp ./
+popd
+
 delete sqlite3/deps
 delete sqlite3/node_modules/nan
 delete sqlite3/node_modules/node-pre-gyp

From b2e2d0651be672a4be085cf705d0eb6261650deb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 14:21:13 -0400
Subject: [PATCH 099/688] Don't install node-gyp or node-pre-gyp in server
 bundle.

These packages need to be installed when we run `npm install` in
`bundle/programs/server` (which this commit ensures), but they don't need
to be part of the dev bundle.
---
 scripts/dev-bundle-server-package.js |  2 --
 scripts/generate-dev-bundle.sh       | 18 +++++++++---------
 tools/isobuild/bundler.js            |  3 +++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index c4641e5125..6c03d52c98 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -9,8 +9,6 @@ var packageJson = {
   // Version is not important but is needed to prevent warnings.
   version: "0.0.0",
   dependencies: {
-    "node-gyp": "3.4.0",
-    "node-pre-gyp": "0.6.29",
     "meteor-promise": "0.7.2",
     fibers: "1.0.13",
     promise: "7.1.1",
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index ec3aa0d522..fbc8d0756d 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -68,15 +68,6 @@ mkdir -p "${DIR}/server-lib/node_modules"
 # This ignores the stuff in node_modules/.bin, but that's OK.
 cp -R node_modules/* "${DIR}/server-lib/node_modules/"
 
-# Make node-gyp install Node headers and libraries in $DIR/.node-gyp/.
-# https://github.com/nodejs/node-gyp/blob/4ee31329e0/lib/node-gyp.js#L52
-export HOME="$DIR"
-export USERPROFILE="$DIR"
-node "${DIR}/server-lib/node_modules/node-gyp/bin/node-gyp.js" install
-INCLUDE_PATH="${DIR}/.node-gyp/${NODE_VERSION}/include/node"
-echo "Contents of ${INCLUDE_PATH}:"
-ls -al "$INCLUDE_PATH"
-
 mkdir -p "${DIR}/etc"
 mv package.json npm-shrinkwrap.json "${DIR}/etc/"
 
@@ -104,6 +95,15 @@ cp -R node_modules/* "${DIR}/lib/node_modules/"
 # commands like node-gyp and node-pre-gyp.
 cp -R node_modules/.bin "${DIR}/lib/node_modules/"
 
+# Make node-gyp install Node headers and libraries in $DIR/.node-gyp/.
+# https://github.com/nodejs/node-gyp/blob/4ee31329e0/lib/node-gyp.js#L52
+export HOME="$DIR"
+export USERPROFILE="$DIR"
+node "${DIR}/lib/node_modules/node-gyp/bin/node-gyp.js" install
+INCLUDE_PATH="${DIR}/.node-gyp/${NODE_VERSION}/include/node"
+echo "Contents of ${INCLUDE_PATH}:"
+ls -al "$INCLUDE_PATH"
+
 cd "${DIR}/lib"
 
 # Clean up some bulky stuff.
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index b507c349f4..b3686c7b80 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -2145,6 +2145,9 @@ class ServerTarget extends JsImageTarget {
     serverPkgJson.scripts = serverPkgJson.scripts || {};
     serverPkgJson.scripts.install = "node npm-rebuild.js";
 
+    serverPkgJson.dependencies["node-gyp"] = "3.4.0";
+    serverPkgJson.dependencies["node-pre-gyp"] = "0.6.29";
+
     builder.write('package.json', {
       data: new Buffer(
         JSON.stringify(serverPkgJson, null, 2) + "\n",

From da88a4afe0b68fb780b1b09da56f6f83311296d8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 14:22:31 -0400
Subject: [PATCH 100/688] Remove cordova-app-hello-world from dev bundle.

This package is depended upon by `cordova-lib`, and npm@3 hoists it to the
top-level dev_bundle/lib/node_modules directory.

We don't use this example app in Meteor, so we don't need it in the dev
bundle. If it is ever needed, developers can run

  meteor npm install -g cordova-app-hello-world

To include it in the dev bundle.

It would be really great if we could remove cordova-lib's extra copy of
npm, but that will probably have to wait until they update to npm@3.
---
 scripts/generate-dev-bundle.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index fbc8d0756d..d37a3e1f04 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -131,6 +131,7 @@ delete sqlite3/node_modules/nan
 delete sqlite3/node_modules/node-pre-gyp
 delete wordwrap/test
 delete moment/min
+delete cordova-app-hello-world
 
 # Remove esprima tests to reduce the size of the dev bundle
 find . -path '*/esprima-fb/test' | xargs rm -rf

From ccb56dd45c2dca689ff33d9a9712b882b6864d3e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 14:34:07 -0400
Subject: [PATCH 101/688] Bump $BUNDLE_VERSION to 4.2.8 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 40c9b22e95..e97732eaaf 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.7
+BUNDLE_VERSION=4.2.8
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 9478f35fa4116dc3ef35ef7fcd4ddc19ca97e1ee Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 Aug 2016 14:52:02 -0400
Subject: [PATCH 102/688] Bump package versions for 1.4.1-rc.2 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 26313ac8f9..3ae99964e7 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.1"
+  version: "1.2.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 5a850f50eb..3c58895926 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.1"
+  version: "1.3.0-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 5eb3e15186..749fe6a3a3 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.1"
+  version: "1.2.4-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index f7a017db03..4862050853 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.1",
+  version: "0.3.14-rc.2",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 3e11e7c525..d7efc4f657 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.1',
+  version: '0.5.8-rc.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 0d3b829c65..0774c250f1 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.1"
+  version: "1.2.9-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 2ed6ab2019..0461c9d597 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.1"
+  version: "1.1.14-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 5e54964c3f..f300bb8c0c 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.1',
+  version: '2.7.5-rc.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index cebecac81d..abd793329c 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.1'
+  version: '1.4.1-rc.2'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 085ff3239c..75a9efae0b 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.1"
+  version: "1.2.14-rc.2"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 33182a0fec..07b9beb306 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.1',
+  version: '1.2.0-rc.2',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 32839fd828..de9de6821d 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.1',
+  version: '1.2.0-rc.2',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index a51dabfe59..81c7b190ec 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.1',
+  version: '1.1.12-rc.2',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 9f887e11e4..158739a04d 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.1"
+  version: "2.513.5-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index bb67773bc8..148470e214 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.1'
+  version: '1.2.14-rc.2'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 97e91270cb..365db9f7be 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.1",
+ "version": "1.4.1-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From b45f733209a13e9545f3758ee063757572dddc3f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 12:47:19 -0400
Subject: [PATCH 103/688] Upgrade Node to 4.5.0.

https://nodejs.org/en/blog/release/v4.5.0/
---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 9508b5b20f..b8118e0cb8 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,8 @@
 
 ## v1.4.1
 
+* Node has been upgraded to 4.5.0.
+
 * The `meteor publish-for-arch` command is no longer necessary when
   publishing Meteor packages with binary npm dependencies. Instead, binary
   dependencies will be rebuilt automatically on the installation side.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 325f6f4994..64265d26fa 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.4.7
+NODE_VERSION=4.5.0
 NPM_VERSION=3.10.5
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 6e9ec54562..f1f6f97c84 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.4.7"
+$NODE_VERSION = "4.5.0"
 $NPM_VERSION = "3.10.5"
 $PYTHON_VERSION = "2.7.10" # For node-gyp
 

From ca51c8fd87c32adc2057e6b43d940a3abcf189eb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 12:50:23 -0400
Subject: [PATCH 104/688] Upgrade npm to 3.10.6.

https://github.com/npm/npm/blob/master/CHANGELOG.md#v3106-2016-07-07
---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index b8118e0cb8..5ce9cff087 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,8 @@
 
 * Node has been upgraded to 4.5.0.
 
+* `npm` has been upgraded to 3.10.6.
+
 * The `meteor publish-for-arch` command is no longer necessary when
   publishing Meteor packages with binary npm dependencies. Instead, binary
   dependencies will be rebuilt automatically on the installation side.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 64265d26fa..5e2e858e55 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -7,7 +7,7 @@ UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
 NODE_VERSION=4.5.0
-NPM_VERSION=3.10.5
+NPM_VERSION=3.10.6
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 9d5aa5b600..7daff12cda 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.5",
+    npm: "3.10.6",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.29",
     "meteor-babel": "0.12.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index f1f6f97c84..08f034f87e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -3,7 +3,7 @@
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.5.0"
-$NPM_VERSION = "3.10.5"
+$NPM_VERSION = "3.10.6"
 $PYTHON_VERSION = "2.7.10" # For node-gyp
 
 # take it form the environment if exists

From d28fe76851afb2d196cb44aac1b1e23943cf1a57 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 12:51:22 -0400
Subject: [PATCH 105/688] Upgrade Windows bundled Python version to 2.7.12.

---
 scripts/generate-dev-bundle.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 08f034f87e..61953f70d4 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -4,7 +4,7 @@ $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.5.0"
 $NPM_VERSION = "3.10.6"
-$PYTHON_VERSION = "2.7.10" # For node-gyp
+$PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists
 if (Test-Path env:PLATFORM) {

From b7bab0eefa5be3924d8ac4af3ec46ac2a826ff7c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 12:52:04 -0400
Subject: [PATCH 106/688] Bump $BUNDLE_VERSION to 4.2.9 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index e97732eaaf..03d4169b23 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.8
+BUNDLE_VERSION=4.2.9
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From afbddc428b5d3443dd0e8514f67f6685967d6c2f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 13:05:54 -0400
Subject: [PATCH 107/688] Bump package versions for 1.4.1-rc.3 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 4 ++--
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/jshint/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 36 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 3ae99964e7..260a76316e 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.2"
+  version: "1.2.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 3c58895926..b36d3d6cb1 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.2"
+  version: "1.3.0-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 1a6c4306d2..6075a69f37 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.0'
+  version: '6.9.1-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 8f68486e18..5a4bd373fd 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.10',
+  version: '0.1.11-rc.3',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 06b1d6d4cd..3c30b7709d 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.6',
+  version: '1.1.7-rc.3',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 749fe6a3a3..2a8ff5b6b6 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.2"
+  version: "1.2.4-rc.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index cc0cb2a6d3..cd4fdd4925 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.0',
+  version: '1.3.1-rc.3',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index c2a7731e23..36121a3dbf 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.9',
+  version: '1.3.10-rc.3',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 4862050853..eab3b6dd90 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.2",
+  version: "0.3.14-rc.3",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index d7efc4f657..9d672879b1 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.2',
+  version: '0.5.8-rc.3',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index ad1dc37e5d..8fdce2fa5b 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.16"
+  version: "1.1.17-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 30e5b6451a..aead376fb7 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,12 +1,12 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.13",
+  version: "4.6.14-rc.3",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "es5-shim": "4.5.7"
+  "es5-shim": "4.5.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 0774c250f1..1a05254e7d 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.2"
+  version: "1.2.9-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 0461c9d597..31262757a4 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.2"
+  version: "1.1.14-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 745d6bc218..4f62bfa2fb 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.8'
+  version: '1.2.9-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 50c54dc46f..653b3ec043 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.5',
+  version: '1.1.6-rc.3',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index f300bb8c0c..fd76de85ce 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.2',
+  version: '2.7.5-rc.3',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index c3a9806e24..0491a529b1 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.14'
+  version: '1.1.15-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index abd793329c..62c1db8d86 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.2'
+  version: '1.4.1-rc.3'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index f4067cf16e..70330120f3 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.16'
+  version: '1.2.17-rc.3'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 3de369f110..58e08f06b2 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.13"
+  version: "1.2.14-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 75a9efae0b..c42ee5bbb7 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.2"
+  version: "1.2.14-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 9ef594d341..f393599f80 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.5",
+  version: "0.7.6-rc.3",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 2315ab1943..2353d6d36b 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.5",
+  version: "0.7.6-rc.3",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 34065c55ea..9b6a93772b 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.10'
+  version: '1.1.11-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 61f5431c66..7fdc4da1cb 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.0",
+  version: "0.9.1-rc.3",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 92c312d7fe..98ecf7261c 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.45',
+  version: '1.5.46-rc.3',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index a808ffae15..3befaa2623 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.3",
+  version: "0.8.4-rc.3",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 07b9beb306..3651d99c68 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.2',
+  version: '1.2.0-rc.3',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index de9de6821d..88d2fd0ba1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.2',
+  version: '1.2.0-rc.3',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 81c7b190ec..5aa237b948 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.2',
+  version: '1.1.12-rc.3',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 158739a04d..349cf4ce10 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.2"
+  version: "2.513.5-rc.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 148470e214..12eeb9ff25 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.2'
+  version: '1.2.14-rc.3'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 5675570b12..3e000291b2 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.10'
+  version: '1.3.11-rc.3'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 619eabb6ba..aa198437c8 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.13'
+  version: '2.5.14-rc.3'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 365db9f7be..0a88fb4b37 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.2",
+ "version": "1.4.1-rc.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 7c019139f596bfa44ca734d85cd4cd50f9f52c53 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 16:26:52 -0400
Subject: [PATCH 108/688] Update es5-shim shrinkwrap file.

---
 packages/es5-shim/.npm/package/npm-shrinkwrap.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/es5-shim/.npm/package/npm-shrinkwrap.json b/packages/es5-shim/.npm/package/npm-shrinkwrap.json
index 5e557de55d..cf6fd2e3a9 100644
--- a/packages/es5-shim/.npm/package/npm-shrinkwrap.json
+++ b/packages/es5-shim/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "es5-shim": {
-      "version": "4.5.7",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.7.tgz",
-      "from": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.7.tgz"
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.9.tgz",
+      "from": "es5-shim@4.5.9"
     }
   }
 }

From c5809a4a1c90a4878a6883639e2d1b6da0698aca Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 16:23:48 -0400
Subject: [PATCH 109/688] Allow files.cp_r to copy non-directories.

---
 tools/fs/files.js | 86 +++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 02f3d9ab15..d474c03a61 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -434,9 +434,7 @@ files.mkdir_p = function (dir, mode) {
   return pathIsDirectory(p);
 };
 
-// Roughly like cp -R. 'from' should be a directory. 'to' can either
-// be a directory, or it can not exist (in which case it will be
-// created with mkdir_p).
+// Roughly like cp -R.
 //
 // The output files will be readable and writable by everyone that the umask
 // allows, and executable by everyone (modulo umask) if the original file was
@@ -450,49 +448,55 @@ files.mkdir_p = function (dir, mode) {
 // If options.ignore is present, it should be a list of regexps. Any
 // file whose basename matches one of the regexps, before
 // transformation, will be skipped.
-files.cp_r = function (from, to, options) {
-  options = options || {};
+files.cp_r = function(from, to, options = {}) {
+  from = files.pathResolve(from);
 
-  var absFrom = files.pathResolve(from);
-  files.mkdir_p(to, 0o755);
+  const stat = options.preserveSymlinks
+    ? files.lstat(from)
+    : files.stat(from);
 
-  _.each(files.readdir(from), function (f) {
-    if (_.any(options.ignore || [], function (pattern) {
-      return f.match(pattern);
-    })) {
-      return;
-    }
+  if (stat.isDirectory()) {
+    files.mkdir_p(to, 0o755);
 
-    var fullFrom = files.pathJoin(from, f);
-    if (options.transformFilename) {
-      f = options.transformFilename(f);
-    }
-    var fullTo = files.pathJoin(to, f);
-    var stats = options.preserveSymlinks
-          ? files.lstat(fullFrom) : files.stat(fullFrom);
-    if (stats.isDirectory()) {
-      files.cp_r(fullFrom, fullTo, options);
-    } else if (stats.isSymbolicLink()) {
-      var linkText = files.readlink(fullFrom);
-      files.symlink(linkText, fullTo);
-    } else {
-      var absFullFrom = files.pathResolve(fullFrom);
-
-      // Create the file as readable and writable by everyone, and executable by
-      // everyone if the original file is executably by owner. (This mode will
-      // be modified by umask.) We don't copy the mode *directly* because this
-      // function is used by 'meteor create' which is copying from the read-only
-      // tools tree into a writable app.
-      var mode = (stats.mode & 0o100) ? 0o777 : 0o666;
-      if (!options.transformContents) {
-        copyFileHelper(fullFrom, fullTo, mode);
-      } else {
-        var contents = files.readFile(fullFrom);
-        contents = options.transformContents(contents, f);
-        files.writeFile(fullTo, contents, { mode: mode });
+    files.readdir(from).forEach(f => {
+      if (options.ignore &&
+          _.any(options.ignore,
+                pattern => f.match(pattern))) {
+        return;
       }
+
+      if (options.transformFilename) {
+        f = options.transformFilename(f);
+      }
+
+      files.cp_r(
+        files.pathJoin(from, f),
+        files.pathJoin(to, f),
+        options
+      );
+    })
+
+  } else if (stat.isSymbolicLink()) {
+    files.symlink(files.readlink(from), to);
+
+  } else {
+    // Create the file as readable and writable by everyone, and
+    // executable by everyone if the original file is executable by
+    // owner. (This mode will be modified by umask.) We don't copy the
+    // mode *directly* because this function is used by 'meteor create'
+    // which is copying from the read-only tools tree into a writable app.
+    const mode = (stat.mode & 0o100) ? 0o777 : 0o666;
+
+    if (options.transformContents) {
+      files.writeFile(to, options.transformContents(
+        files.readFile(from),
+        files.basename(from)
+      ), { mode });
+
+    } else {
+      copyFileHelper(from, to, mode);
     }
-  });
+  }
 };
 
 /**

From 21462959f605af998cec441def60b07dcc4f483d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 16:26:34 -0400
Subject: [PATCH 110/688] Try to symlink rather than copying node_modules when
 rebuilding.

---
 tools/isobuild/meteor-npm.js | 89 ++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index d8c9a21e32..8133506e46 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -270,9 +270,11 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
       files.pathBasename(pkgPath)
     );
 
-    // Copy instead of rename so that the original package directories
-    // will be left untouched if the rebuild fails.
-    files.cp_r(pkgPath, tempPkgDir);
+    // Copy the package directory instead of renaming it, so that the
+    // original package will be left untouched if the rebuild fails. We
+    // could just run files.cp_r(pkgPath, tempPkgDir) here, except that we
+    // want to handle nested node_modules directories specially.
+    copyNpmPackageWithSymlinkedNodeModules(pkgPath, tempPkgDir);
 
     // Record the current process.versions so that we can avoid
     // copying/rebuilding/renaming next time.
@@ -291,6 +293,30 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
   // If the `npm rebuild` command succeeded, overwrite the original
   // package directories with the rebuilt package directories.
   dirsToRebuild.forEach(function (pkgPath) {
+    const actualNodeModulesDir =
+      files.pathJoin(pkgPath, "node_modules");
+
+    const actualNodeModulesStat =
+      files.statOrNull(actualNodeModulesDir);
+
+    if (actualNodeModulesStat &&
+        actualNodeModulesStat.isDirectory()) {
+      // If the original package had a node_modules directory, move it
+      // into the temporary package directory, overwriting the one created
+      // by copyNpmPackageWithSymlinkedNodeModules (which contains only
+      // symlinks), so that when we rename the temporary directory back to
+      // the original directory below, we'll end up with a node_modules
+      // directory that contains real packages rather than symlinks.
+
+      const symlinkNodeModulesDir =
+        files.pathJoin(tempPkgDirs[pkgPath], "node_modules");
+
+      files.renameDirAlmostAtomically(
+        actualNodeModulesDir,
+        symlinkNodeModulesDir
+      );
+    }
+
     files.renameDirAlmostAtomically(tempPkgDirs[pkgPath], pkgPath);
   });
 
@@ -299,6 +325,63 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
   return true;
 });
 
+// Copy an npm package directory to another location, but attempt to
+// symlink all of its node_modules rather than recursively copying them,
+// which potentially saves a lot of time.
+function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
+  files.mkdir_p(toPkgDir);
+
+  let needToHandleNodeModules = false;
+
+  files.readdir(fromPkgDir).forEach(item => {
+    if (item === "node_modules") {
+      // We'll link or copy node_modules in a follow-up step.
+      needToHandleNodeModules = true;
+      return;
+    }
+
+    files.cp_r(
+      files.pathJoin(fromPkgDir, item),
+      files.pathJoin(toPkgDir, item)
+    );
+  });
+
+  if (! needToHandleNodeModules) {
+    return;
+  }
+
+  const nodeModulesFromPath = files.pathJoin(fromPkgDir, "node_modules");
+  const nodeModulesToPath = files.pathJoin(toPkgDir, "node_modules");
+
+  files.mkdir(nodeModulesToPath);
+
+  files.readdir(nodeModulesFromPath).forEach(depPath => {
+    if (depPath === ".bin") {
+      // Avoid copying node_modules/.bin because commands like
+      // .bin/node-gyp and .bin/node-pre-gyp tend to cause problems.
+      return;
+    }
+
+    const absDepFromPath = files.pathJoin(nodeModulesFromPath, depPath);
+
+    if (! files.stat(absDepFromPath).isDirectory()) {
+      // Only copy package directories, even though there might be other
+      // kinds of files in node_modules.
+      return;
+    }
+
+    const absDepToPath = files.pathJoin(nodeModulesToPath, depPath);
+
+    // Try to symlink node_modules dependencies if possible (faster),
+    // and fall back to a recursive copy otherwise.
+    try {
+      files.symlink(absDepFromPath, absDepToPath, "junction");
+    } catch (e) {
+      files.cp_r(absDepFromPath, absDepToPath);
+    }
+  });
+}
+
 function isPortable(dir) {
   const lstat = files.lstat(dir);
   if (! lstat.isDirectory()) {

From 31155ad990f3b6b834fef0138189e4af582a00a5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 17:27:48 -0400
Subject: [PATCH 111/688] Do not run `npm rebuild` for local node_modules
 directories.

Since we do not write .meteor-last-rebuild-version.json files when
developers run `meteor npm install ...`, this commit saves us from
unnecessarily rebuilding any freshly-installed binary npm dependencies
when Meteor starts.
---
 tools/isobuild/compiler.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 1de3c021b0..a1d438b2dc 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -635,7 +635,16 @@ api.addAssets('${relPath}', 'client').`);
   if (! process.env.METEOR_FORCE_PORTABLE) {
     // Make sure we've rebuilt these npm packages according to the current
     // process.{platform,arch,versions}.
-    _.each(nodeModulesDirectories, nmd => nmd.rebuildIfNonPortable());
+    _.each(nodeModulesDirectories, nmd => {
+      if (nmd.local) {
+        // Meteor never attempts to modify the contents of local
+        // node_modules directories (such as the one in the root directory
+        // of an application), so we call nmd.rebuildIfNonPortable() only
+        // when nmd.local is false.
+      } else {
+        nmd.rebuildIfNonPortable();
+      }
+    });
 
     if (process.env.METEOR_ALLOW_NON_PORTABLE ||
         isopk.name === "meteor-tool") {

From cc362a3bca9d0cf6a64f5fb4f691dbe1cdd8788a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 18:33:10 -0400
Subject: [PATCH 112/688] Fix typo in new version of files.cp_r.

---
 tools/fs/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index d474c03a61..6e9ea93502 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -490,7 +490,7 @@ files.cp_r = function(from, to, options = {}) {
     if (options.transformContents) {
       files.writeFile(to, options.transformContents(
         files.readFile(from),
-        files.basename(from)
+        files.pathBasename(from)
       ), { mode });
 
     } else {

From 409f78b6689bb302cfeca7dcc3fa3b2b9e24bbc9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 17:53:46 -0400
Subject: [PATCH 113/688] Bump package versions for 1.4.1-rc.5 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/jshint/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 260a76316e..eeed4d714e 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.3"
+  version: "1.2.11-rc.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index b36d3d6cb1..3028405959 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.3"
+  version: "1.3.0-rc.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 6075a69f37..1ede4ccb3a 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1-rc.3'
+  version: '6.9.1-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 5a4bd373fd..90d6a23c43 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11-rc.3',
+  version: '0.1.11-rc.5',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 3c30b7709d..86137bf4db 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7-rc.3',
+  version: '1.1.7-rc.5',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 2a8ff5b6b6..29881a1be5 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.3"
+  version: "1.2.4-rc.5"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index cd4fdd4925..8c8bf8eef2 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1-rc.3',
+  version: '1.3.1-rc.5',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 36121a3dbf..9808e712bd 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10-rc.3',
+  version: '1.3.10-rc.5',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index eab3b6dd90..44b839fec9 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.3",
+  version: "0.3.14-rc.5",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 9d672879b1..8941f5d913 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.3',
+  version: '0.5.8-rc.5',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 8fdce2fa5b..b3bcebfdac 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17-rc.3"
+  version: "1.1.17-rc.5"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index aead376fb7..cff0689b6f 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14-rc.3",
+  version: "4.6.14-rc.5",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 1a05254e7d..f4f93063d9 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.3"
+  version: "1.2.9-rc.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 31262757a4..5f505807f9 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.3"
+  version: "1.1.14-rc.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 4f62bfa2fb..70c84e1cc3 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9-rc.3'
+  version: '1.2.9-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 653b3ec043..6b28df1bb1 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6-rc.3',
+  version: '1.1.6-rc.5',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index fd76de85ce..12d9b0753e 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.3',
+  version: '2.7.5-rc.5',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 0491a529b1..16f81a5cd3 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15-rc.3'
+  version: '1.1.15-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 62c1db8d86..ee231d2fba 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.3'
+  version: '1.4.1-rc.5'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 70330120f3..688f02a073 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17-rc.3'
+  version: '1.2.17-rc.5'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 58e08f06b2..0481abbd5d 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14-rc.3"
+  version: "1.2.14-rc.5"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index c42ee5bbb7..cfcfa75974 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.3"
+  version: "1.2.14-rc.5"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index f393599f80..2b1824993b 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6-rc.3",
+  version: "0.7.6-rc.5",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 2353d6d36b..8f50a1d283 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6-rc.3",
+  version: "0.7.6-rc.5",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 9b6a93772b..91ca9be99c 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.11-rc.3'
+  version: '1.1.11-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 7fdc4da1cb..be3bad1265 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1-rc.3",
+  version: "0.9.1-rc.5",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 98ecf7261c..d8223dfb8d 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.46-rc.3',
+  version: '1.5.46-rc.5',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 3befaa2623..225bda7a51 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4-rc.3",
+  version: "0.8.4-rc.5",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 3651d99c68..79a22b5f9d 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.3',
+  version: '1.2.0-rc.5',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 88d2fd0ba1..2c5b71918b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.3',
+  version: '1.2.0-rc.5',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 5aa237b948..405e3da213 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.3',
+  version: '1.1.12-rc.5',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 349cf4ce10..72a2131b00 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.3"
+  version: "2.513.5-rc.5"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 12eeb9ff25..ffe3663538 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.3'
+  version: '1.2.14-rc.5'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 3e000291b2..5760d429e8 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11-rc.3'
+  version: '1.3.11-rc.5'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index aa198437c8..4f75ec98bc 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14-rc.3'
+  version: '2.5.14-rc.5'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 0a88fb4b37..7fa9527140 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.3",
+ "version": "1.4.1-rc.5",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 88bccdb36a04928cca0ae20e2ea97205229f0eaa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 Aug 2016 22:15:18 -0400
Subject: [PATCH 114/688] Tolerate missing source files in files.cp_r.

---
 tools/fs/files.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 6e9ea93502..ae83d5e3ab 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -261,15 +261,21 @@ files.prettyPath = function (p) {
 
 // Like statSync, but null if file not found
 files.statOrNull = function (path) {
+  return statOrNull(path);
+};
+
+function statOrNull(path, preserveSymlinks) {
   try {
-    return files.stat(path);
+    return preserveSymlinks
+      ? files.lstat(path)
+      : files.stat(path);
   } catch (e) {
-    if (e.code == "ENOENT") {
+    if (e.code === "ENOENT") {
       return null;
     }
     throw e;
   }
-};
+}
 
 // Like rm -r.
 files.rm_recursive = Profile("files.rm_recursive", function (p) {
@@ -451,9 +457,10 @@ files.mkdir_p = function (dir, mode) {
 files.cp_r = function(from, to, options = {}) {
   from = files.pathResolve(from);
 
-  const stat = options.preserveSymlinks
-    ? files.lstat(from)
-    : files.stat(from);
+  const stat = statOrNull(from, options.preserveSymlinks);
+  if (! stat) {
+    return;
+  }
 
   if (stat.isDirectory()) {
     files.mkdir_p(to, 0o755);
@@ -476,7 +483,12 @@ files.cp_r = function(from, to, options = {}) {
       );
     })
 
-  } else if (stat.isSymbolicLink()) {
+    return;
+  }
+
+  files.mkdir_p(files.pathDirname(to));
+
+  if (stat.isSymbolicLink()) {
     files.symlink(files.readlink(from), to);
 
   } else {

From 01e1dbf3521f6aee8e16decfd7b860e75bc01cb0 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 16 Aug 2016 17:20:27 +1000
Subject: [PATCH 115/688] Added `meteor update --all-packages` to update
 indirect dependencies

See #7495. Still some decisions to be made:

 - Should we make --all-packages the default?
 - How should we deal with *new* indirect dependencies?
 - Should we do anything about underpinning indirect dependencies when updating?
---
 tools/cli/commands-packages.js                | 28 ++++++++++---
 .../.meteor/.gitignore                        |  1 +
 .../.meteor/.id                               |  7 ++++
 .../.meteor/packages                          |  6 +++
 .../.meteor/platforms                         |  2 +
 .../.meteor/release                           |  1 +
 .../.meteor/versions                          | 11 +++++
 .../app-with-indirect-dependencies.js         |  1 +
 tools/tests/update-tests.js                   | 40 +++++++++++++++++++
 9 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/release
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index a8574a8905..a1eb7abce8 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1546,7 +1546,8 @@ main.registerCommand({
   options: {
     patch: { type: Boolean },
     "packages-only": { type: Boolean },
-    "allow-incompatible-update": { type: Boolean }
+    "allow-incompatible-update": { type: Boolean },
+    "all-packages": { type: Boolean }
   },
   // We have to be able to work without a release, since 'meteor
   // update' is how you fix apps that don't have a release.
@@ -1611,13 +1612,28 @@ main.registerCommand({
   // args), take patches to indirect dependencies.
   var upgradeIndirectDepPatchVersions = false;
   if (options.args.length === 0) {
-    projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
-      if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
-        upgradePackageNames.push(constraint.package);
-      }
-    });
+    var allDependencies = _.keys(projectContext.packageMapFile._versions);
+
+    // "all-packages" means update every package we depend on. The default
+    // is to tend to leave indirect dependencies (i.e. things not listed in
+    // `.meteor/packages`) alone.
+    if (options["all-packages"] && allDependencies.length > 0) {
+      upgradePackageNames = allDependencies;
+    } else {
+      projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
+        if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
+          upgradePackageNames.push(constraint.package);
+        }
+      });
+    }
     upgradeIndirectDepPatchVersions = true;
   } else {
+    if (options["all-packages"]) {
+      Console.error("You cannot both specify a list of packages to"
+       + " update and pass --all-packages.");
+       exit(1)
+    }
+
     upgradePackageNames = options.args;
   }
 
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
new file mode 100644
index 0000000000..a31494c6f4
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+1wehy3x1n3lcvy1v8vllm
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages b/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
new file mode 100644
index 0000000000..3ccf15ba69
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
@@ -0,0 +1,6 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+tmeasday:direct-dependency@=1.0.0
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms b/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/release b/tools/tests/apps/app-with-indirect-dependencies/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions b/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
new file mode 100644
index 0000000000..0a377b1bd8
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
@@ -0,0 +1,11 @@
+babel-compiler@6.9.0
+babel-runtime@0.1.10
+ecmascript@0.5.7
+ecmascript-runtime@0.3.13
+meteor@1.2.16
+modules@0.7.5
+modules-runtime@0.7.5
+promise@0.8.3
+tmeasday:direct-dependency@1.0.0
+tmeasday:indirect-dependency@1.0.0
+underscore@1.0.9
diff --git a/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js b/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js
new file mode 100644
index 0000000000..0d201f4ca6
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js
@@ -0,0 +1 @@
+// This app doesn't do anything, we just check versions
diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js
index 97956b3df1..61d659e3ec 100644
--- a/tools/tests/update-tests.js
+++ b/tools/tests/update-tests.js
@@ -51,3 +51,43 @@ selftest.define("'meteor update' alters constraints in `.meteor/packages`", () =
     selftest.fail("Failed to update the version specifier for the `meteor-base` package");
   }
 });
+
+selftest.define("'meteor update' updates indirect dependencies with patches", () => {
+  const s = new Sandbox();
+
+  s.createApp("myapp", "app-with-indirect-dependencies", {
+    release: DEFAULT_RELEASE_TRACK + '@v1'
+  });
+  s.cd("myapp");
+
+  var run = s.run("--prepare-app");
+  // our .meteor/versions contains a version of this so we shouldn't change it
+  run.forbid(/indirect-dependency/);
+  run.expectExit(0);
+
+  var update = s.run("update");
+  // we have direct-dependency@=1.0.0, which depends on indirect@1.0.0
+  // we should update to 1.0.1 (only take patches to indirect dependencies)
+  update.match(/indirect-dependency.*1.0.1/);
+  update.expectExit(0);
+});
+
+selftest.define("'meteor update --update-all' updates indirect dependencies to latest, within constraints", () => {
+  const s = new Sandbox();
+
+  s.createApp("myapp", "app-with-indirect-dependencies", {
+    release: DEFAULT_RELEASE_TRACK + '@v1'
+  });
+  s.cd("myapp");
+
+  var run = s.run("--prepare-app");
+  // our .meteor/versions contains a version of this so we shouldn't change it
+  run.forbid(/indirect-dependency/);
+  run.expectExit(0);
+
+  var update = s.run("update", "--all-packages");
+  // we have direct-dependency@=1.0.0, which depends on indirect@1.0.0
+  // we should update to 1.1.0 but not 2.0.0
+  update.match(/indirect-dependency.*1.1.0/);
+  update.expectExit(0);
+});

From 1a8a1177e0040adc37d0a0f6515458550d533792 Mon Sep 17 00:00:00 2001
From: Yo-An Lin <yoanlin93+github@gmail.com>
Date: Wed, 17 Aug 2016 22:00:15 +0800
Subject: [PATCH 116/688] Add option to skip release check (#7445)

* Add --no-release-check option to skip release check

* Add METEOR_NO_RELEASE_CHECK environment variable
---
 tools/cli/commands.js    | 2 ++
 tools/cli/help.txt       | 1 +
 tools/runners/run-all.js | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 87473a5777..34cbe95e17 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -256,6 +256,7 @@ var runCommandOptions = {
     'mobile-port': { type: String },
     'app-port': { type: String },
     'debug-port': { type: String },
+    'no-release-check': { type: Boolean },
     production: { type: Boolean },
     'raw-logs': { type: Boolean },
     settings: { type: String },
@@ -374,6 +375,7 @@ function doRunCommand(options) {
     oplogUrl: process.env.MONGO_OPLOG_URL,
     mobileServerUrl: utils.formatUrl(parsedMobileServerUrl),
     once: options.once,
+    noReleaseCheck: options['no-release-check'] || process.env.METEOR_NO_RELEASE_CHECK,
     cordovaRunner: cordovaRunner
   });
 }
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index e8c942aa79..c402e8db51 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -58,6 +58,7 @@ Options:
   --release        Specify the release of Meteor to use.
   --verbose        Print all output from builds logs.
   --no-lint        Don't run linters used by the app on every rebuild.
+  --no-release-check            Don't run the release updater to check for new releases.
   --allow-incompatible-update   Allow packages in your project to be upgraded or
                    downgraded to versions that are potentially incompatible with
                    the current versions, if required to satisfy all package
diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js
index a49500a7f8..da225fe8c6 100644
--- a/tools/runners/run-all.js
+++ b/tools/runners/run-all.js
@@ -31,6 +31,7 @@ class Runner {
     rootUrl,
     selenium,
     seleniumBrowser,
+    noReleaseCheck,
     ...optionsForAppRunner
   }) {
     const self = this;
@@ -46,6 +47,7 @@ class Runner {
     self.regenerateAppPort();
 
     self.stopped = false;
+    self.noReleaseCheck = noReleaseCheck;
     self.quiet = quiet;
     self.banner = banner || files.convertToOSPath(
       files.prettyPath(self.projectContext.projectDir)
@@ -125,7 +127,7 @@ class Runner {
     var unblockAppRunner = self.appRunner.makeBeforeStartPromise();
     self._startMongoAsync().then(unblockAppRunner);
 
-    if (! self.stopped) {
+    if (!self.noReleaseCheck && ! self.stopped) {
       self.updater.start();
     }
 

From f006d98e8d89e8ecefce70ed25ea5ee37d8fc1c2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 10:55:52 -0400
Subject: [PATCH 117/688] Filter --all-packages package names through
 isIsobuildFeaturePackage.

---
 tools/cli/commands-packages.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index a1eb7abce8..31d0f54c9b 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1612,21 +1612,26 @@ main.registerCommand({
   // args), take patches to indirect dependencies.
   var upgradeIndirectDepPatchVersions = false;
   if (options.args.length === 0) {
-    var allDependencies = _.keys(projectContext.packageMapFile._versions);
-
     // "all-packages" means update every package we depend on. The default
     // is to tend to leave indirect dependencies (i.e. things not listed in
     // `.meteor/packages`) alone.
-    if (options["all-packages"] && allDependencies.length > 0) {
-      upgradePackageNames = allDependencies;
-    } else {
+    if (options["all-packages"]) {
+      upgradePackageNames = _.filter(
+        _.keys(projectContext.packageMapFile.getCachedVersions()),
+        packageName => ! compiler.isIsobuildFeaturePackage(packageName)
+      );
+    }
+
+    if (upgradePackageNames.length === 0) {
       projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
         if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
           upgradePackageNames.push(constraint.package);
         }
       });
     }
+
     upgradeIndirectDepPatchVersions = true;
+
   } else {
     if (options["all-packages"]) {
       Console.error("You cannot both specify a list of packages to"

From 2d40f2c592f6314b8e3e6ac8c9f57e3b1600606a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 10:56:25 -0400
Subject: [PATCH 118/688] Recommend `meteor update --all-packages` after
 partial update.

---
 tools/cli/commands-packages.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 31d0f54c9b..36e0bff234 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1750,9 +1750,10 @@ main.registerCommand({
       Console.info("\nNewer versions of the following indirect dependencies" +
                    " are available:");
       _.each(nonlatestIndirectDeps, printItem);
-      Console.info(
-        "To update one or more of these packages, pass their names to " +
-          "`meteor update`.");
+      Console.info([
+        "To update one or more of these packages, pass their names to ",
+        "`meteor update`, or just run `meteor update --all-packages`."
+      ].join("\n"));
     }
   }
 });

From 2290911723ef19f56567afaafeab6424eef9893a Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 16 Aug 2016 17:20:27 +1000
Subject: [PATCH 119/688] Added `meteor update --all-packages` to update
 indirect dependencies

See #7495. Still some decisions to be made:

 - Should we make --all-packages the default?
 - How should we deal with *new* indirect dependencies?
 - Should we do anything about underpinning indirect dependencies when updating?
---
 tools/cli/commands-packages.js                | 28 ++++++++++---
 .../.meteor/.gitignore                        |  1 +
 .../.meteor/.id                               |  7 ++++
 .../.meteor/packages                          |  6 +++
 .../.meteor/platforms                         |  2 +
 .../.meteor/release                           |  1 +
 .../.meteor/versions                          | 11 +++++
 .../app-with-indirect-dependencies.js         |  1 +
 tools/tests/update-tests.js                   | 40 +++++++++++++++++++
 9 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/release
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
 create mode 100644 tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index a8574a8905..a1eb7abce8 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1546,7 +1546,8 @@ main.registerCommand({
   options: {
     patch: { type: Boolean },
     "packages-only": { type: Boolean },
-    "allow-incompatible-update": { type: Boolean }
+    "allow-incompatible-update": { type: Boolean },
+    "all-packages": { type: Boolean }
   },
   // We have to be able to work without a release, since 'meteor
   // update' is how you fix apps that don't have a release.
@@ -1611,13 +1612,28 @@ main.registerCommand({
   // args), take patches to indirect dependencies.
   var upgradeIndirectDepPatchVersions = false;
   if (options.args.length === 0) {
-    projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
-      if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
-        upgradePackageNames.push(constraint.package);
-      }
-    });
+    var allDependencies = _.keys(projectContext.packageMapFile._versions);
+
+    // "all-packages" means update every package we depend on. The default
+    // is to tend to leave indirect dependencies (i.e. things not listed in
+    // `.meteor/packages`) alone.
+    if (options["all-packages"] && allDependencies.length > 0) {
+      upgradePackageNames = allDependencies;
+    } else {
+      projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
+        if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
+          upgradePackageNames.push(constraint.package);
+        }
+      });
+    }
     upgradeIndirectDepPatchVersions = true;
   } else {
+    if (options["all-packages"]) {
+      Console.error("You cannot both specify a list of packages to"
+       + " update and pass --all-packages.");
+       exit(1)
+    }
+
     upgradePackageNames = options.args;
   }
 
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
new file mode 100644
index 0000000000..a31494c6f4
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+1wehy3x1n3lcvy1v8vllm
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages b/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
new file mode 100644
index 0000000000..3ccf15ba69
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/packages
@@ -0,0 +1,6 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+tmeasday:direct-dependency@=1.0.0
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms b/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
new file mode 100644
index 0000000000..8a3a35f9f6
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/platforms
@@ -0,0 +1,2 @@
+browser
+server
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/release b/tools/tests/apps/app-with-indirect-dependencies/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions b/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
new file mode 100644
index 0000000000..0a377b1bd8
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/.meteor/versions
@@ -0,0 +1,11 @@
+babel-compiler@6.9.0
+babel-runtime@0.1.10
+ecmascript@0.5.7
+ecmascript-runtime@0.3.13
+meteor@1.2.16
+modules@0.7.5
+modules-runtime@0.7.5
+promise@0.8.3
+tmeasday:direct-dependency@1.0.0
+tmeasday:indirect-dependency@1.0.0
+underscore@1.0.9
diff --git a/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js b/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js
new file mode 100644
index 0000000000..0d201f4ca6
--- /dev/null
+++ b/tools/tests/apps/app-with-indirect-dependencies/app-with-indirect-dependencies.js
@@ -0,0 +1 @@
+// This app doesn't do anything, we just check versions
diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js
index 97956b3df1..61d659e3ec 100644
--- a/tools/tests/update-tests.js
+++ b/tools/tests/update-tests.js
@@ -51,3 +51,43 @@ selftest.define("'meteor update' alters constraints in `.meteor/packages`", () =
     selftest.fail("Failed to update the version specifier for the `meteor-base` package");
   }
 });
+
+selftest.define("'meteor update' updates indirect dependencies with patches", () => {
+  const s = new Sandbox();
+
+  s.createApp("myapp", "app-with-indirect-dependencies", {
+    release: DEFAULT_RELEASE_TRACK + '@v1'
+  });
+  s.cd("myapp");
+
+  var run = s.run("--prepare-app");
+  // our .meteor/versions contains a version of this so we shouldn't change it
+  run.forbid(/indirect-dependency/);
+  run.expectExit(0);
+
+  var update = s.run("update");
+  // we have direct-dependency@=1.0.0, which depends on indirect@1.0.0
+  // we should update to 1.0.1 (only take patches to indirect dependencies)
+  update.match(/indirect-dependency.*1.0.1/);
+  update.expectExit(0);
+});
+
+selftest.define("'meteor update --update-all' updates indirect dependencies to latest, within constraints", () => {
+  const s = new Sandbox();
+
+  s.createApp("myapp", "app-with-indirect-dependencies", {
+    release: DEFAULT_RELEASE_TRACK + '@v1'
+  });
+  s.cd("myapp");
+
+  var run = s.run("--prepare-app");
+  // our .meteor/versions contains a version of this so we shouldn't change it
+  run.forbid(/indirect-dependency/);
+  run.expectExit(0);
+
+  var update = s.run("update", "--all-packages");
+  // we have direct-dependency@=1.0.0, which depends on indirect@1.0.0
+  // we should update to 1.1.0 but not 2.0.0
+  update.match(/indirect-dependency.*1.1.0/);
+  update.expectExit(0);
+});

From e326fddafbcdf1073702ae0b112e76e77666c43e Mon Sep 17 00:00:00 2001
From: Yo-An Lin <yoanlin93+github@gmail.com>
Date: Wed, 17 Aug 2016 22:00:15 +0800
Subject: [PATCH 120/688] Add option to skip release check (#7445)

* Add --no-release-check option to skip release check

* Add METEOR_NO_RELEASE_CHECK environment variable
---
 tools/cli/commands.js    | 2 ++
 tools/cli/help.txt       | 1 +
 tools/runners/run-all.js | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 754e9b4535..6f75da283d 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -256,6 +256,7 @@ var runCommandOptions = {
     'mobile-port': { type: String },
     'app-port': { type: String },
     'debug-port': { type: String },
+    'no-release-check': { type: Boolean },
     production: { type: Boolean },
     'raw-logs': { type: Boolean },
     settings: { type: String },
@@ -374,6 +375,7 @@ function doRunCommand(options) {
     oplogUrl: process.env.MONGO_OPLOG_URL,
     mobileServerUrl: utils.formatUrl(parsedMobileServerUrl),
     once: options.once,
+    noReleaseCheck: options['no-release-check'] || process.env.METEOR_NO_RELEASE_CHECK,
     cordovaRunner: cordovaRunner
   });
 }
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index e8c942aa79..c402e8db51 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -58,6 +58,7 @@ Options:
   --release        Specify the release of Meteor to use.
   --verbose        Print all output from builds logs.
   --no-lint        Don't run linters used by the app on every rebuild.
+  --no-release-check            Don't run the release updater to check for new releases.
   --allow-incompatible-update   Allow packages in your project to be upgraded or
                    downgraded to versions that are potentially incompatible with
                    the current versions, if required to satisfy all package
diff --git a/tools/runners/run-all.js b/tools/runners/run-all.js
index a49500a7f8..da225fe8c6 100644
--- a/tools/runners/run-all.js
+++ b/tools/runners/run-all.js
@@ -31,6 +31,7 @@ class Runner {
     rootUrl,
     selenium,
     seleniumBrowser,
+    noReleaseCheck,
     ...optionsForAppRunner
   }) {
     const self = this;
@@ -46,6 +47,7 @@ class Runner {
     self.regenerateAppPort();
 
     self.stopped = false;
+    self.noReleaseCheck = noReleaseCheck;
     self.quiet = quiet;
     self.banner = banner || files.convertToOSPath(
       files.prettyPath(self.projectContext.projectDir)
@@ -125,7 +127,7 @@ class Runner {
     var unblockAppRunner = self.appRunner.makeBeforeStartPromise();
     self._startMongoAsync().then(unblockAppRunner);
 
-    if (! self.stopped) {
+    if (!self.noReleaseCheck && ! self.stopped) {
       self.updater.start();
     }
 

From 9249985875d68e5150e844758e9842f6f8260b11 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 10:55:52 -0400
Subject: [PATCH 121/688] Filter --all-packages package names through
 isIsobuildFeaturePackage.

---
 tools/cli/commands-packages.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index a1eb7abce8..31d0f54c9b 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1612,21 +1612,26 @@ main.registerCommand({
   // args), take patches to indirect dependencies.
   var upgradeIndirectDepPatchVersions = false;
   if (options.args.length === 0) {
-    var allDependencies = _.keys(projectContext.packageMapFile._versions);
-
     // "all-packages" means update every package we depend on. The default
     // is to tend to leave indirect dependencies (i.e. things not listed in
     // `.meteor/packages`) alone.
-    if (options["all-packages"] && allDependencies.length > 0) {
-      upgradePackageNames = allDependencies;
-    } else {
+    if (options["all-packages"]) {
+      upgradePackageNames = _.filter(
+        _.keys(projectContext.packageMapFile.getCachedVersions()),
+        packageName => ! compiler.isIsobuildFeaturePackage(packageName)
+      );
+    }
+
+    if (upgradePackageNames.length === 0) {
       projectContext.projectConstraintsFile.eachConstraint(function (constraint) {
         if (! compiler.isIsobuildFeaturePackage(constraint.package)) {
           upgradePackageNames.push(constraint.package);
         }
       });
     }
+
     upgradeIndirectDepPatchVersions = true;
+
   } else {
     if (options["all-packages"]) {
       Console.error("You cannot both specify a list of packages to"

From d6ffff50b5cff243ce22d30874bd14dc9073df82 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 10:56:25 -0400
Subject: [PATCH 122/688] Recommend `meteor update --all-packages` after
 partial update.

---
 tools/cli/commands-packages.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 31d0f54c9b..36e0bff234 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1750,9 +1750,10 @@ main.registerCommand({
       Console.info("\nNewer versions of the following indirect dependencies" +
                    " are available:");
       _.each(nonlatestIndirectDeps, printItem);
-      Console.info(
-        "To update one or more of these packages, pass their names to " +
-          "`meteor update`.");
+      Console.info([
+        "To update one or more of these packages, pass their names to ",
+        "`meteor update`, or just run `meteor update --all-packages`."
+      ].join("\n"));
     }
   }
 });

From 61012963a5fc1e18ae8da65c8e5e9683ef231b2f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 14:52:50 -0400
Subject: [PATCH 123/688] Fix test description to say --all-packages instead of
 --update-all.

---
 tools/tests/update-tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js
index 61d659e3ec..035246d3d9 100644
--- a/tools/tests/update-tests.js
+++ b/tools/tests/update-tests.js
@@ -72,7 +72,7 @@ selftest.define("'meteor update' updates indirect dependencies with patches", ()
   update.expectExit(0);
 });
 
-selftest.define("'meteor update --update-all' updates indirect dependencies to latest, within constraints", () => {
+selftest.define("'meteor update --all-packages' updates indirect dependencies to latest, within constraints", () => {
   const s = new Sandbox();
 
   s.createApp("myapp", "app-with-indirect-dependencies", {

From c51ca7357534c7c649540d395ab71aea9e2f098b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 09:58:40 -0400
Subject: [PATCH 124/688] Bump package versions for 1.4.1-rc.6 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/jshint/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index eeed4d714e..1b48bc7bbb 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.5"
+  version: "1.2.11-rc.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 3028405959..67b7405955 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.5"
+  version: "1.3.0-rc.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 1ede4ccb3a..568d55803b 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1-rc.5'
+  version: '6.9.1-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 90d6a23c43..11a9e16f72 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11-rc.5',
+  version: '0.1.11-rc.6',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 86137bf4db..7d3ad3f0b8 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7-rc.5',
+  version: '1.1.7-rc.6',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 29881a1be5..a5d7e230c4 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.5"
+  version: "1.2.4-rc.6"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 8c8bf8eef2..00575e5e36 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1-rc.5',
+  version: '1.3.1-rc.6',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 9808e712bd..edfa6eaa4a 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10-rc.5',
+  version: '1.3.10-rc.6',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 44b839fec9..f5ce59c10e 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.5",
+  version: "0.3.14-rc.6",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 8941f5d913..05dc6b1909 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.5',
+  version: '0.5.8-rc.6',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index b3bcebfdac..47164f4ea2 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17-rc.5"
+  version: "1.1.17-rc.6"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index cff0689b6f..151cb4eec2 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14-rc.5",
+  version: "4.6.14-rc.6",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index f4f93063d9..c401f26b51 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.5"
+  version: "1.2.9-rc.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 5f505807f9..59b7372a05 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.5"
+  version: "1.1.14-rc.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 70c84e1cc3..82cd28f99f 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9-rc.5'
+  version: '1.2.9-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 6b28df1bb1..bfd19e8e10 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6-rc.5',
+  version: '1.1.6-rc.6',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 12d9b0753e..dd3b65eb3b 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.5',
+  version: '2.7.5-rc.6',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 16f81a5cd3..721e4a5f9d 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15-rc.5'
+  version: '1.1.15-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index ee231d2fba..fe40e962b6 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.5'
+  version: '1.4.1-rc.6'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 688f02a073..2db233f6da 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17-rc.5'
+  version: '1.2.17-rc.6'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 0481abbd5d..8a1bef2907 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14-rc.5"
+  version: "1.2.14-rc.6"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index cfcfa75974..c43bb4234f 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.5"
+  version: "1.2.14-rc.6"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 2b1824993b..3542682a39 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6-rc.5",
+  version: "0.7.6-rc.6",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 8f50a1d283..750af4415f 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6-rc.5",
+  version: "0.7.6-rc.6",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 91ca9be99c..7f3d262c25 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.11-rc.5'
+  version: '1.1.11-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index be3bad1265..31725db763 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1-rc.5",
+  version: "0.9.1-rc.6",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index d8223dfb8d..5321034eea 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.46-rc.5',
+  version: '1.5.46-rc.6',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 225bda7a51..7f64070b24 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4-rc.5",
+  version: "0.8.4-rc.6",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 79a22b5f9d..98544f24c2 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.5',
+  version: '1.2.0-rc.6',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 2c5b71918b..f71e5bcfee 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.5',
+  version: '1.2.0-rc.6',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 405e3da213..f1eabeebc3 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.5',
+  version: '1.1.12-rc.6',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 72a2131b00..618d4e8f53 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.5"
+  version: "2.513.5-rc.6"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index ffe3663538..0f48bee0c2 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.5'
+  version: '1.2.14-rc.6'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 5760d429e8..58087d117a 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11-rc.5'
+  version: '1.3.11-rc.6'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 4f75ec98bc..3e3936c6b1 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14-rc.5'
+  version: '2.5.14-rc.6'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 7fa9527140..ef69a3f764 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.5",
+ "version": "1.4.1-rc.6",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From ff0f9fe7b64bb0aec39123d64758f2cb704fc4eb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 15:27:15 -0400
Subject: [PATCH 125/688] Update History.md with recent changes in 1.4.1.

---
 History.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/History.md b/History.md
index 5ce9cff087..d2041e0c95 100644
--- a/History.md
+++ b/History.md
@@ -105,6 +105,16 @@
   deployed apps has been fixed.
   [#7609](https://github.com/meteor/meteor/pull/7609).
 
+* The `meteor update` command now supports an `--all-packages` flag to
+  update all packages (including indirect dependencies) to their latest
+  compatible versions, similar to passing the names of all your packages
+  to the `meteor update` command.
+  [#7653](https://github.com/meteor/meteor/pull/7653)
+
+* Background release updates can now be disabled by invoking either
+  `meteor --no-release-check` or `METEOR_NO_RELEASE_CHECK=1 meteor`.
+  [#7445](https://github.com/meteor/meteor/pull/7445)
+
 ## v1.4.0.1
 
 * Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))

From 61c1ab0cac9f437f7472d526cf391ea565c9a0bb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 18:08:24 -0400
Subject: [PATCH 126/688] Avoid colons in .npm/plugin/... paths.

Fixes #7661.
---
 tools/isobuild/compiler.js       | 6 ++++--
 tools/isobuild/meteor-npm.js     | 6 +++++-
 tools/isobuild/package-source.js | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index a1d438b2dc..ba0146d921 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -73,8 +73,10 @@ compiler.compile = Profile(function (packageSource, options) {
         // Plugins have their own npm dependencies separate from the
         // rest of the package, so they need their own separate npm
         // shrinkwrap and cache state.
-        npmDir: files.pathResolve(
-          files.pathJoin(packageSource.sourceRoot, '.npm', 'plugin', info.name))
+        npmDir: files.pathResolve(files.pathJoin(
+          packageSource.sourceRoot,
+          '.npm', 'plugin', colonConverter.convert(info.name)
+        ))
       });
       // Add this plugin's dependencies to our "plugin dependency"
       // WatchSet. buildResult.watchSet will end up being the merged
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 8133506e46..5416617b34 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -18,6 +18,9 @@ import { execFileAsync } from "../utils/processes.js";
 import {
   get as getRebuildArgs
 } from "../static-assets/server/npm-rebuild-args.js";
+import {
+  convert as convertColonsInPath
+} from "../utils/colon-converter.js";
 
 var meteorNpm = exports;
 
@@ -52,7 +55,8 @@ meteorNpm.updateDependencies = function (packageName,
   // we can then atomically rename it. we also make sure to
   // randomize the name, in case we're bundling this package
   // multiple times in parallel.
-  var newPackageNpmDir = packageNpmDir + '-new-' + utils.randomToken();
+  var newPackageNpmDir =
+    convertColonsInPath(packageNpmDir) + '-new-' + utils.randomToken();
 
   if (! npmDependencies || _.isEmpty(npmDependencies)) {
     // No NPM dependencies? Delete the .npm directory if it exists (because,
diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index 39648e1667..e0a5acedc9 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -22,6 +22,10 @@ import {
   APP_TEST_FILENAME_REGEXPS,
   isTestFilePath } from './test-files.js';
 
+import {
+  convert as convertColonsInPath
+} from '../utils/colon-converter.js';
+
 // XXX: This is a medium-term hack, to avoid having the user set a package name
 // & test-name in package.describe. We will change this in the new control file
 // world in some way.
@@ -386,7 +390,7 @@ _.extend(PackageSource.prototype, {
 
     utils.ensureOnlyValidVersions(options.npmDependencies, {forCordova: false});
     self.npmDependencies = options.npmDependencies;
-    self.npmCacheDirectory = options.npmDir;
+    self.npmCacheDirectory = convertColonsInPath(options.npmDir);
 
     utils.ensureOnlyValidVersions(options.cordovaDependencies, {forCordova: true});
     self.cordovaDependencies = options.cordovaDependencies;

From 4c1fe8ff2205922e0659a69b81cb5c5ddd139fe2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 18:14:15 -0400
Subject: [PATCH 127/688] Convert options.npmDir only if it's a string.

---
 tools/isobuild/package-source.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index e0a5acedc9..2b2636967a 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -390,7 +390,11 @@ _.extend(PackageSource.prototype, {
 
     utils.ensureOnlyValidVersions(options.npmDependencies, {forCordova: false});
     self.npmDependencies = options.npmDependencies;
-    self.npmCacheDirectory = convertColonsInPath(options.npmDir);
+
+    // If options.npmDir is a string, make sure it contains no colons.
+    self.npmCacheDirectory = _.isString(options.npmDir)
+      ? convertColonsInPath(options.npmDir)
+      : options.npmDir;
 
     utils.ensureOnlyValidVersions(options.cordovaDependencies, {forCordova: true});
     self.cordovaDependencies = options.cordovaDependencies;

From e90c638c9fbc34f0047c1db972e15ef33be0b979 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 Aug 2016 18:12:07 -0400
Subject: [PATCH 128/688] Bump package versions for 1.4.1-rc.7 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/jshint/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 1b48bc7bbb..3030aaefe1 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.6"
+  version: "1.2.11-rc.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 67b7405955..38a3cb19e9 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.6"
+  version: "1.3.0-rc.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 568d55803b..56a4dd4da6 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1-rc.6'
+  version: '6.9.1-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 11a9e16f72..ad4f40b07d 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11-rc.6',
+  version: '0.1.11-rc.7',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 7d3ad3f0b8..515eaf513a 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7-rc.6',
+  version: '1.1.7-rc.7',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index a5d7e230c4..2b1b2c5531 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.6"
+  version: "1.2.4-rc.7"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 00575e5e36..91855ac460 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1-rc.6',
+  version: '1.3.1-rc.7',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index edfa6eaa4a..e68798c23b 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10-rc.6',
+  version: '1.3.10-rc.7',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index f5ce59c10e..4c79fa357f 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.6",
+  version: "0.3.14-rc.7",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 05dc6b1909..836bef7d8e 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.6',
+  version: '0.5.8-rc.7',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 47164f4ea2..59c72289fa 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17-rc.6"
+  version: "1.1.17-rc.7"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 151cb4eec2..285c1abf75 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14-rc.6",
+  version: "4.6.14-rc.7",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index c401f26b51..35ca86ce7f 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.6"
+  version: "1.2.9-rc.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 59b7372a05..69784f1662 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.6"
+  version: "1.1.14-rc.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 82cd28f99f..70b2b8a03a 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9-rc.6'
+  version: '1.2.9-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index bfd19e8e10..1c7a749a98 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6-rc.6',
+  version: '1.1.6-rc.7',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index dd3b65eb3b..9f2c3db570 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.6',
+  version: '2.7.5-rc.7',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 721e4a5f9d..3a4cd431a3 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15-rc.6'
+  version: '1.1.15-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index fe40e962b6..84dc134625 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.6'
+  version: '1.4.1-rc.7'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 2db233f6da..2ca6ed9ea7 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17-rc.6'
+  version: '1.2.17-rc.7'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 8a1bef2907..d245e4a1f0 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14-rc.6"
+  version: "1.2.14-rc.7"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index c43bb4234f..9931ae310f 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.6"
+  version: "1.2.14-rc.7"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 3542682a39..29e38fbdf9 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6-rc.6",
+  version: "0.7.6-rc.7",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 750af4415f..8502eb2998 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6-rc.6",
+  version: "0.7.6-rc.7",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 7f3d262c25..efe8333db8 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.11-rc.6'
+  version: '1.1.11-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 31725db763..bd4691739b 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1-rc.6",
+  version: "0.9.1-rc.7",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 5321034eea..1736f93022 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.46-rc.6',
+  version: '1.5.46-rc.7',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 7f64070b24..d5682f810e 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4-rc.6",
+  version: "0.8.4-rc.7",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 98544f24c2..d943a4121e 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.6',
+  version: '1.2.0-rc.7',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index f71e5bcfee..08545f5b0b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.6',
+  version: '1.2.0-rc.7',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index f1eabeebc3..793ee538ec 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.6',
+  version: '1.1.12-rc.7',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 618d4e8f53..876fe279a5 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.6"
+  version: "2.513.5-rc.7"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 0f48bee0c2..8688fbc23f 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.6'
+  version: '1.2.14-rc.7'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 58087d117a..eab6166de2 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11-rc.6'
+  version: '1.3.11-rc.7'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 3e3936c6b1..c075642bed 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14-rc.6'
+  version: '2.5.14-rc.7'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index ef69a3f764..2a7ca869b9 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.6",
+ "version": "1.4.1-rc.7",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 365c765971a9f0a0bcf816ec76badcff7ca025a5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 Aug 2016 11:37:18 -0400
Subject: [PATCH 129/688] Bump package versions for the official 1.4.1 release.

---
 packages/accounts-base/package.js          | 2 +-
 packages/accounts-password/package.js      | 2 +-
 packages/babel-compiler/package.js         | 2 +-
 packages/babel-runtime/package.js          | 2 +-
 packages/caching-compiler/package.js       | 2 +-
 packages/coffeescript/package.js           | 2 +-
 packages/ddp-client/package.js             | 2 +-
 packages/ddp-server/package.js             | 2 +-
 packages/ecmascript-runtime/package.js     | 2 +-
 packages/ecmascript/package.js             | 2 +-
 packages/email/package.js                  | 2 +-
 packages/es5-shim/package.js               | 2 +-
 packages/facebook/package.js               | 2 +-
 packages/google/package.js                 | 2 +-
 packages/http/package.js                   | 2 +-
 packages/jshint/package.js                 | 2 +-
 packages/less/package.js                   | 2 +-
 packages/logging/package.js                | 2 +-
 packages/meteor-tool/package.js            | 2 +-
 packages/meteor/package.js                 | 2 +-
 packages/minifier-css/package.js           | 2 +-
 packages/minifier-js/package.js            | 2 +-
 packages/modules-runtime/package.js        | 2 +-
 packages/modules/package.js                | 2 +-
 packages/mongo/package.js                  | 2 +-
 packages/npm-bcrypt/package.js             | 2 +-
 packages/npm-mongo/package.js              | 2 +-
 packages/promise/package.js                | 2 +-
 packages/standard-minifier-css/package.js  | 2 +-
 packages/standard-minifier-js/package.js   | 2 +-
 packages/static-html/package.js            | 2 +-
 packages/stylus/package.js                 | 2 +-
 packages/templating/package.js             | 2 +-
 packages/webapp/package.js                 | 2 +-
 packages/xmlbuilder/package.js             | 2 +-
 scripts/admin/meteor-release-official.json | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 3030aaefe1..e162820f3e 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11-rc.7"
+  version: "1.2.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 38a3cb19e9..6e1e8e9dcb 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0-rc.7"
+  version: "1.3.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 56a4dd4da6..94daa41410 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1-rc.7'
+  version: '6.9.1'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index ad4f40b07d..a3a2050c94 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11-rc.7',
+  version: '0.1.11',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 515eaf513a..f9c2ac587b 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7-rc.7',
+  version: '1.1.7',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 2b1b2c5531..e3cc7cdcaa 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-rc.7"
+  version: "1.2.4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 91855ac460..d49ca97779 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1-rc.7',
+  version: '1.3.1',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index e68798c23b..e3c599d45d 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10-rc.7',
+  version: '1.3.10',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 4c79fa357f..0174dcc23a 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-rc.7",
+  version: "0.3.14",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 836bef7d8e..7643da24c9 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-rc.7',
+  version: '0.5.8',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 59c72289fa..bb30e9853e 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17-rc.7"
+  version: "1.1.17"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 285c1abf75..c7dcc696ab 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14-rc.7",
+  version: "4.6.14",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 35ca86ce7f..f7883bb59e 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9-rc.7"
+  version: "1.2.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 69784f1662..9ecc80a3c4 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14-rc.7"
+  version: "1.1.14"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 70b2b8a03a..dd130ccb72 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9-rc.7'
+  version: '1.2.9'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 1c7a749a98..6527945fd5 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6-rc.7',
+  version: '1.1.6',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 9f2c3db570..ac0a88c577 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-rc.7',
+  version: '2.7.5',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 3a4cd431a3..567aa4d3a6 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15-rc.7'
+  version: '1.1.15'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 84dc134625..901bfc0808 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-rc.7'
+  version: '1.4.1'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 2ca6ed9ea7..2941f35c7c 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17-rc.7'
+  version: '1.2.17'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index d245e4a1f0..93d75bd005 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14-rc.7"
+  version: "1.2.14"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 9931ae310f..b53c6ceb37 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-rc.7"
+  version: "1.2.14"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 29e38fbdf9..c18ad3de4d 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6-rc.7",
+  version: "0.7.6",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 8502eb2998..69ac7073bc 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6-rc.7",
+  version: "0.7.6",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index efe8333db8..11c05148eb 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.11-rc.7'
+  version: '1.1.11'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index bd4691739b..c6025af0c6 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1-rc.7",
+  version: "0.9.1",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 1736f93022..15a031d6fa 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.46-rc.7',
+  version: '1.5.46',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index d5682f810e..9e4589b23f 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4-rc.7",
+  version: "0.8.4",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index d943a4121e..cf53e0e1c0 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-rc.7',
+  version: '1.2.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 08545f5b0b..72c501e663 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-rc.7',
+  version: '1.2.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 793ee538ec..4efeb39971 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-rc.7',
+  version: '1.1.12',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 876fe279a5..8285d3017f 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-rc.7"
+  version: "2.513.5"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 8688fbc23f..2e23bd1c2a 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-rc.7'
+  version: '1.2.14'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index eab6166de2..6fcf9a54b8 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11-rc.7'
+  version: '1.3.11'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index c075642bed..1caee9b139 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14-rc.7'
+  version: '2.5.14'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 3940331155..79e671345a 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "1.4.0.1",
+  "version": "1.4.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution",

From 4618b3d8de240db33bb48c1f42eaabd47535183b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 Aug 2016 16:39:47 -0400
Subject: [PATCH 130/688] Remove --no-bin-links flag from default `npm rebuild`
 arguments.

After recent discussion on https://github.com/meteor/meteor/issues/7401,
@glasser and I think the relatively obscure benefit of --no-bin-links is
outweighed by the problems it causes for packages whose rebuild scripts
need executable scripts installed in the node_modules/.bin/ directory.
---
 tools/static-assets/server/npm-rebuild-args.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/static-assets/server/npm-rebuild-args.js b/tools/static-assets/server/npm-rebuild-args.js
index dab0ad56f8..8fb90463f1 100644
--- a/tools/static-assets/server/npm-rebuild-args.js
+++ b/tools/static-assets/server/npm-rebuild-args.js
@@ -2,11 +2,6 @@
 var args = [
   "rebuild",
 
-  // The --no-bin-links flag tells npm not to create symlinks in the
-  // node_modules/.bin/ directory when rebuilding packages, which helps
-  // avoid problems like https://github.com/meteor/meteor/issues/7401.
-  "--no-bin-links",
-
   // The --update-binary flag tells node-pre-gyp to replace previously
   // installed local binaries with remote binaries:
   // https://github.com/mapbox/node-pre-gyp#options

From b552011180a7d0c26a78531f23536cce8d250730 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 Aug 2016 17:13:48 -0400
Subject: [PATCH 131/688] Revert "Fix #7491 by wrapping child process in
 `script` on OSX"

This reverts commit 98aaaed084fd87ab8003f0c2839705acdf965789.

This change is no longer necessary with Node 4.5.0, which was included
with Meteor 1.4.1.
---
 tools/cli/main.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index e5ab1f1d06..b04ad74fe6 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -493,14 +493,6 @@ var springboard = function (rel, options) {
     }).await());
   }
 
-  // On OSX, there is a bug in node 4 when launching out to a node 0.10 process
-  // This should be fixed in the next release of node (we should then revert
-  // this change) https://github.com/meteor/meteor/issues/7491
-  if (process.platform === 'darwin') {
-    newArgv.unshift('-q', '/dev/null', executable);
-    executable = 'script';
-  }
-
   // Now exec; we're not coming back.
   require('kexec')(executable, newArgv);
   throw Error('exec failed?');

From 88db65c8378336d20104792c7f2ce3604afa7d74 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 Aug 2016 17:31:21 -0400
Subject: [PATCH 132/688] Update modules test app to Meteor 1.4.1.

---
 .../apps/modules/.meteor/.finished-upgraders  |  1 +
 tools/tests/apps/modules/.meteor/packages     | 13 ++---
 tools/tests/apps/modules/.meteor/release      |  2 +-
 tools/tests/apps/modules/.meteor/versions     | 49 ++++++++++---------
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/.finished-upgraders b/tools/tests/apps/modules/.meteor/.finished-upgraders
index 3e712bc5a9..a541808f2b 100644
--- a/tools/tests/apps/modules/.meteor/.finished-upgraders
+++ b/tools/tests/apps/modules/.meteor/.finished-upgraders
@@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
 1.3.0-split-minifiers-package
 1.3.5-remove-old-dev-bundle-link
 1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 431c7291c4..e31a9d935f 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -6,19 +6,20 @@
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
 mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.10                   # The database Meteor supports right now
+mongo@1.1.11                   # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
 session@1.1.6                 # Client-side reactive dictionary for your app
 jquery@1.11.9                  # Helpful client-side library
 tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-es5-shim@4.6.13                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.7              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript@1.2.3
+coffeescript@1.2.4
 modules-test-package
 avital:mocha
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
 client-only-ecmascript
 modules-test-plugin
+shell-server
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index 810628dc6d..30b2c590e3 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4
+METEOR@1.4.1
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 7b73993d9a..3a2911a046 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -1,62 +1,62 @@
 allow-deny@1.0.5
-autoupdate@1.2.11
+autoupdate@1.3.11
 avital:mocha@2.1.0_10
-babel-compiler@6.9.0
-babel-runtime@0.1.10
+babel-compiler@6.9.1
+babel-runtime@0.1.11
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.8
 blaze-html-templates@1.0.4
 blaze-tools@1.0.9
 boilerplate-generator@1.0.9
-caching-compiler@1.1.6
+caching-compiler@1.1.7
 caching-html-compiler@1.0.6
 callback-hook@1.0.9
 check@1.2.3
 client-only-ecmascript@0.0.1
-coffeescript@1.2.3
+coffeescript@1.2.4
 ddp@1.2.5
-ddp-client@1.2.9
+ddp-client@1.3.1
 ddp-common@1.2.6
-ddp-server@1.2.10
+ddp-server@1.3.10
 deps@1.0.12
 diff-sequence@1.0.6
-ecmascript@0.5.7
-ecmascript-runtime@0.3.12
+ecmascript@0.5.8
+ecmascript-runtime@0.3.14
 ejson@1.0.12
-es5-shim@4.6.13
+es5-shim@4.6.14
 fastclick@1.0.12
 geojson-utils@1.0.9
 hot-code-push@1.0.4
 html-tools@1.0.10
 htmljs@1.0.10
-http@1.1.8
+http@1.2.9
 id-map@1.0.8
 jquery@1.11.9
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.1.14
-meteor@1.2.16
+logging@1.1.15
+meteor@1.2.17
 meteor-base@1.0.4
-minifier-css@1.2.13
-minifier-js@1.2.13
+minifier-css@1.2.14
+minifier-js@1.2.14
 minimongo@1.0.17
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.7.5
-modules-runtime@0.7.5
+modules@0.7.6
+modules-runtime@0.7.6
 modules-test-package@0.0.1
 modules-test-plugin@0.0.1
-mongo@1.1.10
+mongo@1.1.11
 mongo-id@1.0.5
-npm-mongo@1.5.45
+npm-mongo@1.5.46
 observe-sequence@1.0.12
 ordered-dict@1.0.8
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
 practicalmeteor:mocha-core@0.1.4
 practicalmeteor:sinon@1.14.1_2
-promise@0.8.3
+promise@0.8.4
 random@1.0.10
 reactive-dict@1.1.8
 reactive-var@1.0.10
@@ -64,16 +64,17 @@ reload@1.1.10
 retry@1.0.8
 routepolicy@1.0.11
 session@1.1.6
+shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
-standard-minifier-css@1.1.8
-standard-minifier-js@1.1.8
-templating@1.1.14
+standard-minifier-css@1.2.0
+standard-minifier-js@1.2.0
+templating@1.2.14
 templating-tools@1.0.4
 tmeasday:test-reporter-helpers@0.2.1
 tracker@1.1.0
 ui@1.0.11
 underscore@1.0.9
 url@1.0.10
-webapp@1.3.10
+webapp@1.3.11
 webapp-hashing@1.0.9

From d5c83aaf8fe59a09688f0d17a61b6e7f10ee7af2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 22 Aug 2016 16:50:06 -0400
Subject: [PATCH 133/688] Don't try to use native tar command on Windows.

Fixes #7689.
---
 tools/fs/files.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index ae83d5e3ab..ff3198512c 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -717,13 +717,10 @@ files.extractTarGz = function (buffer, destPath, options) {
   }
 
   const startTime = +new Date;
-  let promise = tryExtractWithNativeTar(buffer, tempDir, options);
 
-  if (process.platform === "win32") {
-    promise = promise.catch(
-      error => tryExtractWithNative7z(buffer, tempDir, options)
-    );
-  }
+  let promise = process.platform === "win32"
+    ? tryExtractWithNative7z(buffer, tempDir, options)
+    : tryExtractWithNativeTar(buffer, tempDir, options)
 
   promise = promise.catch(
     error => tryExtractWithNpmTar(buffer, tempDir, options)

From 5fa59d2b8b61fe408cf1ec34d639a4df709bddd4 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 23 Aug 2016 11:44:21 +1000
Subject: [PATCH 134/688] Bumping version of the `npm-mongo` package for #7594

This was a fairly serious issue with the mongo driver
---
 packages/npm-mongo/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 15a031d6fa..10da6b35e8 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.46',
+  version: '1.5.47',
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.4"
+  mongodb: "2.2.7"
 });
 
 Package.onUse(function (api) {

From 7f8ecb6b1c80f3872b226cc60a4727b9bc020f6f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 23 Aug 2016 11:36:00 -0400
Subject: [PATCH 135/688] Update npm-mongo shrinkwrap.

---
 .../.npm/package/npm-shrinkwrap.json          | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index e327314325..35c9428649 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,14 @@
 {
   "dependencies": {
     "bson": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.2.tgz",
-      "from": "bson@>=0.5.1 <0.6.0"
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.4.tgz",
+      "from": "bson@>=0.5.3 <0.6.0"
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "from": "buffer-shims@>=1.0.0 <2.0.0"
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -11,9 +16,9 @@
       "from": "core-util-is@>=1.0.0 <1.1.0"
     },
     "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "from": "es6-promise@3.0.2"
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+      "from": "es6-promise@3.2.1"
     },
     "inherits": {
       "version": "2.0.1",
@@ -21,24 +26,29 @@
       "from": "inherits@>=2.0.1 <2.1.0"
     },
     "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "from": "isarray@>=1.0.0 <1.1.0"
     },
     "mongodb": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.4.tgz",
-      "from": "mongodb@2.2.4"
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.7.tgz",
+      "from": "mongodb@2.2.7"
     },
     "mongodb-core": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.6.tgz",
-      "from": "mongodb-core@2.0.6"
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.9.tgz",
+      "from": "mongodb-core@2.0.9"
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0"
     },
     "readable-stream": {
-      "version": "1.0.31",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-      "from": "readable-stream@1.0.31"
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
+      "from": "readable-stream@2.1.5"
     },
     "require_optional": {
       "version": "1.0.0",
@@ -59,6 +69,11 @@
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
       "from": "string_decoder@>=0.10.0 <0.11.0"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "from": "util-deprecate@>=1.0.1 <1.1.0"
     }
   }
 }

From 659706f61d4e979613d86a92320c9a0ea2033a3e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 23 Aug 2016 11:50:38 -0400
Subject: [PATCH 136/688] Bump package versions for 1.4.2-beta.0 release.

---
 packages/meteor-tool/package.js                | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 901bfc0808..4bd08c3606 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1'
+  version: '1.4.2-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 10da6b35e8..1cdc793330 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.47',
+  version: '1.5.48-beta.0',
   documentation: null
 });
 
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 2a7ca869b9..7f2569d003 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.7",
+ "version": "1.4.2-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 532a7feafabac8d0853b51b117ba35318840886e Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Wed, 25 May 2016 14:15:53 +0800
Subject: [PATCH 137/688] Take callbacks for all accounts-client and handle
 them consistently

Where possible, only throw if there is no callback and we know
on the client that the arguments are wrong. Add some tests for
this behavior.
---
 packages/accounts-password/password_client.js | 44 +++++-----
 packages/accounts-password/password_tests.js  | 83 +++++++++++++++++++
 2 files changed, 108 insertions(+), 19 deletions(-)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index 83f1161984..bc1478507f 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -1,3 +1,12 @@
+// Used in the various functions below to handle errors consistently
+function reportError(error, callback) {
+   if (callback) {
+     callback(error);
+   } else {
+     throw error;
+   }
+};
+
 // Attempt to log in with a password.
 //
 // @param selector {String|Object} One of the following:
@@ -55,7 +64,7 @@ Meteor.loginWithPassword = function (selector, password, callback) {
         }, callback);
       }
       else if (error) {
-        callback && callback(error);
+        reportError(error, callback);
       } else {
         callback && callback();
       }
@@ -83,9 +92,9 @@ var srpUpgradePath = function (options, callback) {
     details = EJSON.parse(options.upgradeError.details);
   } catch (e) {}
   if (!(details && details.format === 'srp')) {
-    callback && callback(
+    reportError(
       new Meteor.Error(400, "Password is old. Please reset your " +
-                       "password."));
+                       "password."), callback);
   } else {
     Accounts.callLoginMethod({
       methodArguments: [{
@@ -98,7 +107,6 @@ var srpUpgradePath = function (options, callback) {
   }
 };
 
-
 // Attempt to log in as a new user.
 
 /**
@@ -118,8 +126,7 @@ Accounts.createUser = function (options, callback) {
   if (typeof options.password !== 'string')
     throw new Error("options.password must be a string");
   if (!options.password) {
-    callback(new Meteor.Error(400, "Password may not be empty"));
-    return;
+    return reportError(new Meteor.Error(400, "Password may not be empty"), callback);
   }
 
   // Replace password with the hashed password.
@@ -150,14 +157,12 @@ Accounts.createUser = function (options, callback) {
  */
 Accounts.changePassword = function (oldPassword, newPassword, callback) {
   if (!Meteor.user()) {
-    callback && callback(new Error("Must be logged in to change password."));
-    return;
+    return reportError(new Error("Must be logged in to change password."), callback);
   }
 
   check(newPassword, String);
   if (!newPassword) {
-    callback(new Meteor.Error(400, "Password may not be empty"));
-    return;
+    return reportError(new Meteor.Error(400, "Password may not be empty"), callback);
   }
 
   Accounts.connection.apply(
@@ -177,7 +182,7 @@ Accounts.changePassword = function (oldPassword, newPassword, callback) {
             plaintextPassword: oldPassword
           }, function (err) {
             if (err) {
-              callback && callback(err);
+              reportError(err, callback);
             } else {
               // Now that we've successfully migrated from srp to
               // bcrypt, try changing the password again.
@@ -186,8 +191,8 @@ Accounts.changePassword = function (oldPassword, newPassword, callback) {
           });
         } else {
           // A normal error, not an error telling us to upgrade to bcrypt
-          callback && callback(
-            error || new Error("No result from changePassword."));
+          reportError(
+            error || new Error("No result from changePassword."), callback);
         }
       } else {
         callback && callback();
@@ -212,8 +217,9 @@ Accounts.changePassword = function (oldPassword, newPassword, callback) {
  * @importFromPackage accounts-base
  */
 Accounts.forgotPassword = function(options, callback) {
-  if (!options.email)
-    throw new Error("Must pass options.email");
+  if (!options.email) {
+    return reportError(new Meteor.Error(400, "Must pass options.email"), callback);
+  }
   Accounts.connection.call("forgotPassword", options, callback);
 };
 
@@ -237,8 +243,7 @@ Accounts.resetPassword = function(token, newPassword, callback) {
   check(newPassword, String);
 
   if (!newPassword) {
-    callback(new Meteor.Error(400, "Password may not be empty"));
-    return;
+    return reportError(new Meteor.Error(400, "Password may not be empty"), callback);
   }
 
   Accounts.callLoginMethod({
@@ -261,8 +266,9 @@ Accounts.resetPassword = function(token, newPassword, callback) {
  * @importFromPackage accounts-base
  */
 Accounts.verifyEmail = function(token, callback) {
-  if (!token)
-    throw new Error("Need to pass token");
+  if (!token) {
+    return reportError(new Meteor.Error(400, "Need to pass token"), callback);
+  }
 
   Accounts.callLoginMethod({
     methodName: 'verifyEmail',
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 61c78060e4..0f2fc81086 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -410,6 +410,13 @@ if (Meteor.isClient) (function () {
       "email", [
     createUserStep,
     logoutStep,
+    // Create user error without callback should not throw error
+    function (test, expect) {
+      this.newUsername = 'adalovelace' + this.randomSuffix;
+      Accounts.createUser(
+        { username: this.newUsername, password: '' }
+        );
+    },
     // Attempting to create another user with an email that only differs in
     // case should fail
     function (test, expect) {
@@ -468,6 +475,14 @@ if (Meteor.isClient) (function () {
         test.equal(Meteor.user().username, self.username);
       }));
     },
+    // change password with bad old password, but no callback so no error
+    function (test, expect) {
+      Accounts.changePassword('wrong', 'doesntmatter');
+    },
+    // change password with blank new password, but no callback so no error
+    function (test, expect) {
+      Accounts.changePassword(this.password, '');
+    },
     // change password with good old password.
     function (test, expect) {
       Accounts.changePassword(this.password, this.password2,
@@ -544,6 +559,74 @@ if (Meteor.isClient) (function () {
       }, 10 * 1000, 100);
     }
   ]);
+  
+  
+  testAsyncMulti("passwords - forgotPassword client return error when empty email", [
+    function (test, expect) {
+      // setup
+      this.email = '';
+    },
+    // forgotPassword called on client with blank email
+    function (test, expect) {
+      Accounts.forgotPassword(
+        { email: this.email }, expect(function (error) {
+          test.isTrue(error);
+      }));
+    },
+    // forgotPassword called on client with blank email, no callback so no error
+    function (test, expect) {
+      Accounts.forgotPassword({ email: this.email });
+    },
+  ]);
+ 
+  testAsyncMulti("passwords - verifyEmail client return error when empty token", [
+    function (test, expect) {
+      // setup
+      this.token = '';
+    },
+    // verifyEmail called on client with blank token
+    function (test, expect) {
+      Accounts.verifyEmail(
+        this.token, expect(function (error) {
+          test.isTrue(error);
+      }));
+    },
+    // verifyEmail called on client with blank token, no callback so no error
+    function (test, expect) {
+      Accounts.verifyEmail(this.token);
+    },
+  ]);
+ 
+  testAsyncMulti("passwords - resetPassword errors", [
+    function (test, expect) {
+      // setup
+      this.token = '';
+      this.newPassword = 'nonblankpassword';
+    },
+    // resetPassword called on client with blank token
+    function (test, expect) {
+      Accounts.resetPassword(
+        this.token, this.newPassword, expect(function (error) {
+          test.isTrue(error);
+      }));
+    },
+    function (test, expect) {
+      // setup
+      this.token = 'nonblank-token';
+      this.newPassword = '';
+    },
+    // resetPassword called on client with blank password
+    function (test, expect) {
+      Accounts.resetPassword(
+        this.token, this.newPassword, expect(function (error) {
+          test.isTrue(error);
+      }));
+    },
+    // resetPassword called on client with blank password, no callback so no error
+    function (test, expect) {
+      Accounts.resetPassword(this.token, this.newPassword);
+    },
+  ]);
 
 
   testAsyncMulti("passwords - new user hooks", [

From c8d1f2009f4414184d61efb2ba928c969142cb48 Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Sat, 30 Jul 2016 18:50:49 +0800
Subject: [PATCH 138/688] Further tests to fix accounts callback / throwing
 behavior

---
 packages/accounts-password/password_tests.js | 36 +++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 0f2fc81086..a60cb25fb9 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -410,12 +410,12 @@ if (Meteor.isClient) (function () {
       "email", [
     createUserStep,
     logoutStep,
-    // Create user error without callback should not throw error
+    // Create user error without callback should throw error
     function (test, expect) {
       this.newUsername = 'adalovelace' + this.randomSuffix;
-      Accounts.createUser(
-        { username: this.newUsername, password: '' }
-        );
+      test.throws(function(){
+        Accounts.createUser({ username: this.newUsername, password: '' });
+      }, /Password may not be empty/);
     },
     // Attempting to create another user with an email that only differs in
     // case should fail
@@ -475,13 +475,11 @@ if (Meteor.isClient) (function () {
         test.equal(Meteor.user().username, self.username);
       }));
     },
-    // change password with bad old password, but no callback so no error
+    // change password with blank new password
     function (test, expect) {
-      Accounts.changePassword('wrong', 'doesntmatter');
-    },
-    // change password with blank new password, but no callback so no error
-    function (test, expect) {
-      Accounts.changePassword(this.password, '');
+      test.throws(function(){
+        Accounts.changePassword(this.password, '');
+      }, /Password may not be empty/);
     },
     // change password with good old password.
     function (test, expect) {
@@ -573,9 +571,11 @@ if (Meteor.isClient) (function () {
           test.isTrue(error);
       }));
     },
-    // forgotPassword called on client with blank email, no callback so no error
+    // forgotPassword called on client with blank email and no callback.
     function (test, expect) {
-      Accounts.forgotPassword({ email: this.email });
+      test.throws(function(){
+        Accounts.forgotPassword({ email: this.email });
+      }, /Must pass options\.email/);
     },
   ]);
  
@@ -591,9 +591,11 @@ if (Meteor.isClient) (function () {
           test.isTrue(error);
       }));
     },
-    // verifyEmail called on client with blank token, no callback so no error
+    // verifyEmail called on client with blank token and no callback.
     function (test, expect) {
-      Accounts.verifyEmail(this.token);
+      test.throws(function(){
+        Accounts.verifyEmail(this.token);
+      }, /Need to pass token/);
     },
   ]);
  
@@ -622,9 +624,11 @@ if (Meteor.isClient) (function () {
           test.isTrue(error);
       }));
     },
-    // resetPassword called on client with blank password, no callback so no error
+    // resetPassword called on client with blank password and no callback.
     function (test, expect) {
-      Accounts.resetPassword(this.token, this.newPassword);
+      test.throws(function(){
+        Accounts.resetPassword(this.token, this.newPassword);
+      }, /Match error: Expected string, got undefined/);
     },
   ]);
 

From 0757e2195814a36517004c06b346e61b0a0b6986 Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Thu, 26 May 2016 12:12:53 +0800
Subject: [PATCH 139/688] Update History.md

---
 History.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.md b/History.md
index d2041e0c95..76092a769e 100644
--- a/History.md
+++ b/History.md
@@ -390,6 +390,7 @@
 * Insert a `Date` header into emails by default: https://github.com/meteor/meteor/pull/6916/files
 
 * `meteor test` now supports setting the bind address using `--port IP:PORT` the same as `meteor run` [PR #6964](https://github.com/meteor/meteor/pull/6964) [Issue #6961](https://github.com/meteor/meteor/issues/6961)
+* Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
 
 * `Meteor.apply` now takes a `noRetry` option to opt-out of automatically retrying non-idempotent methods on connection blips: [PR #6180](https://github.com/meteor/meteor/pull/6180)
 

From d1edbebbf526eb472378c6e25b101421384276e7 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 24 Aug 2016 11:48:09 +1000
Subject: [PATCH 140/688] Set a minimum version for `npm-mongo` package in
 `mongo` package

So when we do a release, the constraint will force users to get the
new npm-mongo package. We likely will seek a better solution to
this kind of problem in the future
---
 packages/mongo/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 11c05148eb..9da2fe1f48 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.11'
+  version: '1.1.12'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo', 'server');
+  api.use('npm-mongo@1.5.47', 'server');
   api.use('allow-deny');
 
   api.use([

From 6eec080025814f41352d8dded5e1f712fd1dedc2 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 24 Aug 2016 12:23:42 +1000
Subject: [PATCH 141/688] Preparing the 1.4.1.1 release

---
 History.md                                 | 6 ++++++
 scripts/admin/meteor-release-official.json | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index d2041e0c95..ce5a62aa2a 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 ## v.NEXT
 
+## v1.4.1.1
+
+* Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in
+  reconnection logic, leading to some `update` and `remove` commands being
+  treated as `insert`s. [#7594](https://github.com/meteor/meteor/issue/7594)
+
 ## v1.4.1
 
 * Node has been upgraded to 4.5.0.
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 79e671345a..3f211afbdd 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,8 +1,8 @@
 {
   "track": "METEOR",
-  "version": "1.4.1",
+  "version": "1.4.1.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution",
-  "patchFrom": ["1.4"]
+  "patchFrom": ["1.4.1"]
 }

From e9a57a9bad32cbb971cdda79b5828d8b2f1a0a94 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 24 Aug 2016 14:54:37 +1000
Subject: [PATCH 142/688] Bumped node module version again for 1.4.1.1 release

---
 packages/coffeescript/package.js              |  2 +-
 packages/meteor-tool/package.js               |  2 +-
 packages/mongo/package.js                     |  2 +-
 .../.npm/package/npm-shrinkwrap.json          | 51 ++++++++++++-------
 packages/npm-mongo/package.js                 |  4 +-
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index e3cc7cdcaa..3feb3ff339 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4"
+  version: "1.2.4_1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 901bfc0808..0ac0d2148c 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1'
+  version: '1.4.1_1'
 });
 
 Package.includeTool();
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 9da2fe1f48..3e420265e4 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@1.5.47', 'server');
+  api.use('npm-mongo@1.5.48', 'server');
   api.use('allow-deny');
 
   api.use([
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index e327314325..50563e4ea7 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,14 @@
 {
   "dependencies": {
     "bson": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.2.tgz",
-      "from": "bson@>=0.5.1 <0.6.0"
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.4.tgz",
+      "from": "bson@>=0.5.4 <0.6.0"
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "from": "buffer-shims@>=1.0.0 <2.0.0"
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -11,9 +16,9 @@
       "from": "core-util-is@>=1.0.0 <1.1.0"
     },
     "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "from": "es6-promise@3.0.2"
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+      "from": "es6-promise@3.2.1"
     },
     "inherits": {
       "version": "2.0.1",
@@ -21,24 +26,29 @@
       "from": "inherits@>=2.0.1 <2.1.0"
     },
     "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "from": "isarray@0.0.1"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "from": "isarray@>=1.0.0 <1.1.0"
     },
     "mongodb": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.4.tgz",
-      "from": "mongodb@2.2.4"
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.8.tgz",
+      "from": "mongodb@2.2.8"
     },
     "mongodb-core": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.6.tgz",
-      "from": "mongodb-core@2.0.6"
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.10.tgz",
+      "from": "mongodb-core@2.0.10"
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0"
     },
     "readable-stream": {
-      "version": "1.0.31",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-      "from": "readable-stream@1.0.31"
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
+      "from": "readable-stream@2.1.5"
     },
     "require_optional": {
       "version": "1.0.0",
@@ -59,6 +69,11 @@
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
       "from": "string_decoder@>=0.10.0 <0.11.0"
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "from": "util-deprecate@>=1.0.1 <1.1.0"
     }
   }
 }
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 10da6b35e8..86dab645cb 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.47',
+  version: '1.5.48',
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.7"
+  mongodb: "2.2.8"
 });
 
 Package.onUse(function (api) {

From afc165e00a8096a59dd8a77ab216bf968f04fa54 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 9 Aug 2016 14:03:24 +1000
Subject: [PATCH 143/688] Literally just deleted packages

---
 packages/blaze-html-templates/README.md       |    9 -
 packages/blaze-html-templates/package.js      |   25 -
 packages/blaze-tools/.gitignore               |    1 -
 packages/blaze-tools/README.md                |    4 -
 packages/blaze-tools/package.js               |   24 -
 packages/blaze-tools/preamble.js              |    1 -
 packages/blaze-tools/tojs.js                  |  156 -
 packages/blaze-tools/token_tests.js           |   78 -
 packages/blaze-tools/tokens.js                |  193 -
 packages/blaze/.gitignore                     |    1 -
 packages/blaze/README.md                      |  318 --
 packages/blaze/attrs.js                       |  365 --
 packages/blaze/backcompat.js                  |   18 -
 packages/blaze/builtins.js                    |  354 --
 packages/blaze/dombackend.js                  |  179 -
 packages/blaze/domrange.js                    |  485 ---
 packages/blaze/events.js                      |  204 -
 packages/blaze/exceptions.js                  |   56 -
 packages/blaze/lookup.js                      |  238 --
 packages/blaze/materializer.js                |  191 -
 packages/blaze/microscore.js                  |  116 -
 packages/blaze/package.js                     |   55 -
 packages/blaze/preamble.js                    |   32 -
 packages/blaze/render_tests.js                |  688 ----
 packages/blaze/template.js                    |  565 ---
 packages/blaze/view.js                        |  900 -----
 packages/blaze/view_tests.js                  |   59 -
 packages/caching-html-compiler/README.md      |   37 -
 .../caching-html-compiler.js                  |  141 -
 packages/caching-html-compiler/package.js     |   21 -
 packages/html-tools/.gitignore                |    1 -
 packages/html-tools/README.md                 |  139 -
 packages/html-tools/charref.js                | 2414 -----------
 packages/html-tools/charref_tests.js          |  114 -
 packages/html-tools/package.js                |   29 -
 packages/html-tools/parse.js                  |  358 --
 packages/html-tools/parse_tests.js            |  404 --
 packages/html-tools/scanner.js                |   82 -
 packages/html-tools/templatetag.js            |   29 -
 packages/html-tools/tokenize.js               |  513 ---
 packages/html-tools/tokenize_tests.js         |  344 --
 packages/html-tools/utils.js                  |   50 -
 packages/htmljs/.gitignore                    |    1 -
 packages/htmljs/README.md                     |  427 --
 packages/htmljs/html.js                       |  268 --
 packages/htmljs/htmljs_test.js                |   87 -
 packages/htmljs/package.js                    |   21 -
 packages/htmljs/preamble.js                   |    4 -
 packages/htmljs/visitors.js                   |  331 --
 packages/spacebars-compiler/.gitignore        |    1 -
 packages/spacebars-compiler/README.md         |   15 -
 packages/spacebars-compiler/codegen.js        |  389 --
 packages/spacebars-compiler/compile_tests.js  |  114 -
 packages/spacebars-compiler/compiler.js       |  116 -
 .../compiler_output_tests.coffee              |  296 --
 packages/spacebars-compiler/optimizer.js      |  189 -
 packages/spacebars-compiler/package.js        |   38 -
 packages/spacebars-compiler/react.js          |   44 -
 .../spacebars-compiler/spacebars_tests.js     |  317 --
 packages/spacebars-compiler/templatetag.js    |  506 ---
 packages/spacebars-tests/.gitignore           |    1 -
 packages/spacebars-tests/README.md            |    1 -
 .../assets/markdown_basic.html                |   49 -
 .../assets/markdown_each1.html                |   15 -
 .../assets/markdown_each2.html                |   19 -
 .../spacebars-tests/assets/markdown_if1.html  |   19 -
 .../spacebars-tests/assets/markdown_if2.html  |   19 -
 packages/spacebars-tests/old_templates.js     | 2058 ----------
 .../spacebars-tests/old_templates_tests.js    | 2749 -------------
 packages/spacebars-tests/package.js           |   46 -
 packages/spacebars-tests/template_tests.html  | 1160 ------
 packages/spacebars-tests/template_tests.js    | 3512 -----------------
 .../spacebars-tests/template_tests_server.js  |   28 -
 .../spacebars-tests/templating_tests.html     |  224 --
 packages/spacebars-tests/templating_tests.js  |  619 ---
 packages/spacebars/.gitignore                 |    1 -
 packages/spacebars/README.md                  |    9 -
 packages/spacebars/package.js                 |   23 -
 packages/spacebars/spacebars-runtime.js       |  283 --
 packages/static-html/README.md                |   10 -
 packages/static-html/package.js               |   29 -
 packages/static-html/static-html.js           |   90 -
 packages/templating-tools/README.md           |  102 -
 packages/templating-tools/code-generation.js  |   18 -
 .../compile-tags-with-spacebars.js            |  104 -
 .../templating-tools/html-scanner-tests.js    |  189 -
 packages/templating-tools/html-scanner.js     |  172 -
 packages/templating-tools/package.js          |   47 -
 packages/templating-tools/templating-tools.js |    4 -
 .../templating-tools/throw-compile-error.js   |   11 -
 packages/templating/.gitignore                |    1 -
 packages/templating/README.md                 |   13 -
 packages/templating/dynamic.html              |   23 -
 packages/templating/dynamic.js                |   39 -
 packages/templating/dynamic_tests.html        |   61 -
 packages/templating/dynamic_tests.js          |  239 --
 packages/templating/package.js                |   48 -
 .../templating/plugin/compile-templates.js    |    9 -
 packages/templating/templating.js             |   78 -
 99 files changed, 25277 deletions(-)
 delete mode 100644 packages/blaze-html-templates/README.md
 delete mode 100644 packages/blaze-html-templates/package.js
 delete mode 100644 packages/blaze-tools/.gitignore
 delete mode 100644 packages/blaze-tools/README.md
 delete mode 100644 packages/blaze-tools/package.js
 delete mode 100644 packages/blaze-tools/preamble.js
 delete mode 100644 packages/blaze-tools/tojs.js
 delete mode 100644 packages/blaze-tools/token_tests.js
 delete mode 100644 packages/blaze-tools/tokens.js
 delete mode 100644 packages/blaze/.gitignore
 delete mode 100644 packages/blaze/README.md
 delete mode 100644 packages/blaze/attrs.js
 delete mode 100644 packages/blaze/backcompat.js
 delete mode 100644 packages/blaze/builtins.js
 delete mode 100644 packages/blaze/dombackend.js
 delete mode 100644 packages/blaze/domrange.js
 delete mode 100644 packages/blaze/events.js
 delete mode 100644 packages/blaze/exceptions.js
 delete mode 100644 packages/blaze/lookup.js
 delete mode 100644 packages/blaze/materializer.js
 delete mode 100644 packages/blaze/microscore.js
 delete mode 100644 packages/blaze/package.js
 delete mode 100644 packages/blaze/preamble.js
 delete mode 100644 packages/blaze/render_tests.js
 delete mode 100644 packages/blaze/template.js
 delete mode 100644 packages/blaze/view.js
 delete mode 100644 packages/blaze/view_tests.js
 delete mode 100644 packages/caching-html-compiler/README.md
 delete mode 100644 packages/caching-html-compiler/caching-html-compiler.js
 delete mode 100644 packages/caching-html-compiler/package.js
 delete mode 100644 packages/html-tools/.gitignore
 delete mode 100644 packages/html-tools/README.md
 delete mode 100644 packages/html-tools/charref.js
 delete mode 100644 packages/html-tools/charref_tests.js
 delete mode 100644 packages/html-tools/package.js
 delete mode 100644 packages/html-tools/parse.js
 delete mode 100644 packages/html-tools/parse_tests.js
 delete mode 100644 packages/html-tools/scanner.js
 delete mode 100644 packages/html-tools/templatetag.js
 delete mode 100644 packages/html-tools/tokenize.js
 delete mode 100644 packages/html-tools/tokenize_tests.js
 delete mode 100644 packages/html-tools/utils.js
 delete mode 100644 packages/htmljs/.gitignore
 delete mode 100644 packages/htmljs/README.md
 delete mode 100644 packages/htmljs/html.js
 delete mode 100644 packages/htmljs/htmljs_test.js
 delete mode 100644 packages/htmljs/package.js
 delete mode 100644 packages/htmljs/preamble.js
 delete mode 100644 packages/htmljs/visitors.js
 delete mode 100644 packages/spacebars-compiler/.gitignore
 delete mode 100644 packages/spacebars-compiler/README.md
 delete mode 100644 packages/spacebars-compiler/codegen.js
 delete mode 100644 packages/spacebars-compiler/compile_tests.js
 delete mode 100644 packages/spacebars-compiler/compiler.js
 delete mode 100644 packages/spacebars-compiler/compiler_output_tests.coffee
 delete mode 100644 packages/spacebars-compiler/optimizer.js
 delete mode 100644 packages/spacebars-compiler/package.js
 delete mode 100644 packages/spacebars-compiler/react.js
 delete mode 100644 packages/spacebars-compiler/spacebars_tests.js
 delete mode 100644 packages/spacebars-compiler/templatetag.js
 delete mode 100644 packages/spacebars-tests/.gitignore
 delete mode 100644 packages/spacebars-tests/README.md
 delete mode 100644 packages/spacebars-tests/assets/markdown_basic.html
 delete mode 100644 packages/spacebars-tests/assets/markdown_each1.html
 delete mode 100644 packages/spacebars-tests/assets/markdown_each2.html
 delete mode 100644 packages/spacebars-tests/assets/markdown_if1.html
 delete mode 100644 packages/spacebars-tests/assets/markdown_if2.html
 delete mode 100644 packages/spacebars-tests/old_templates.js
 delete mode 100644 packages/spacebars-tests/old_templates_tests.js
 delete mode 100644 packages/spacebars-tests/package.js
 delete mode 100644 packages/spacebars-tests/template_tests.html
 delete mode 100644 packages/spacebars-tests/template_tests.js
 delete mode 100644 packages/spacebars-tests/template_tests_server.js
 delete mode 100644 packages/spacebars-tests/templating_tests.html
 delete mode 100644 packages/spacebars-tests/templating_tests.js
 delete mode 100644 packages/spacebars/.gitignore
 delete mode 100644 packages/spacebars/README.md
 delete mode 100644 packages/spacebars/package.js
 delete mode 100644 packages/spacebars/spacebars-runtime.js
 delete mode 100644 packages/static-html/README.md
 delete mode 100644 packages/static-html/package.js
 delete mode 100644 packages/static-html/static-html.js
 delete mode 100644 packages/templating-tools/README.md
 delete mode 100644 packages/templating-tools/code-generation.js
 delete mode 100644 packages/templating-tools/compile-tags-with-spacebars.js
 delete mode 100644 packages/templating-tools/html-scanner-tests.js
 delete mode 100644 packages/templating-tools/html-scanner.js
 delete mode 100644 packages/templating-tools/package.js
 delete mode 100644 packages/templating-tools/templating-tools.js
 delete mode 100644 packages/templating-tools/throw-compile-error.js
 delete mode 100644 packages/templating/.gitignore
 delete mode 100644 packages/templating/README.md
 delete mode 100644 packages/templating/dynamic.html
 delete mode 100644 packages/templating/dynamic.js
 delete mode 100644 packages/templating/dynamic_tests.html
 delete mode 100644 packages/templating/dynamic_tests.js
 delete mode 100644 packages/templating/package.js
 delete mode 100644 packages/templating/plugin/compile-templates.js
 delete mode 100644 packages/templating/templating.js

diff --git a/packages/blaze-html-templates/README.md b/packages/blaze-html-templates/README.md
deleted file mode 100644
index 84ad905655..0000000000
--- a/packages/blaze-html-templates/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# blaze-html-templates
-
-A meta-package that includes everything you need to compile and run Meteor templates with Spacebars and Blaze.
-
-For more details, see the documentation of the component packages:
-
-- [templating](https://atmospherejs.com/meteor/templating): compiles `.html` files
-- [blaze](https://atmospherejs.com/meteor/blaze): the runtime library
-- [spacebars](https://atmospherejs.com/meteor/spacebars): the templating language
diff --git a/packages/blaze-html-templates/package.js b/packages/blaze-html-templates/package.js
deleted file mode 100644
index edc01346bc..0000000000
--- a/packages/blaze-html-templates/package.js
+++ /dev/null
@@ -1,25 +0,0 @@
-Package.describe({
-  name: 'blaze-html-templates',
-  version: '1.0.4',
-  // Brief, one-line summary of the package.
-  summary: 'Compile HTML templates into reactive UI with Meteor Blaze',
-  // By default, Meteor will default to using README.md for documentation.
-  // To avoid submitting documentation, set this field to null.
-  documentation: 'README.md'
-});
-
-Package.onUse(function(api) {
-  api.imply([
-    // A library for reactive user interfaces
-    'blaze',
-
-    // The following packages are basically empty shells that just exist to
-    // satisfy code checking for the existence of a package. Rest assured that
-    // they are not adding any bloat to your bundle.
-    'ui', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
-    'spacebars', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0
-
-    // Compile .html files into Blaze reactive views
-    'templating'
-  ]);
-});
diff --git a/packages/blaze-tools/.gitignore b/packages/blaze-tools/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/blaze-tools/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/blaze-tools/README.md b/packages/blaze-tools/README.md
deleted file mode 100644
index 4b92b835aa..0000000000
--- a/packages/blaze-tools/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# blaze-tools
-
-Compile-time utilities that are likely to be useful to any package
-that compiles templates for Blaze.
diff --git a/packages/blaze-tools/package.js b/packages/blaze-tools/package.js
deleted file mode 100644
index c6c90f3071..0000000000
--- a/packages/blaze-tools/package.js
+++ /dev/null
@@ -1,24 +0,0 @@
-Package.describe({
-  summary: "Compile-time tools for Blaze",
-  version: '1.0.9'
-});
-
-Package.onUse(function (api) {
-  api.export('BlazeTools');
-
-  api.use('htmljs');
-  api.use('underscore');
-
-  api.addFiles(['preamble.js',
-                 'tokens.js',
-                 'tojs.js']);
-});
-
-Package.onTest(function (api) {
-  api.use('blaze-tools');
-  api.use('tinytest');
-  api.use('underscore');
-  api.use('html-tools');
-
-  api.addFiles(['token_tests.js']);
-});
diff --git a/packages/blaze-tools/preamble.js b/packages/blaze-tools/preamble.js
deleted file mode 100644
index 2211e646ab..0000000000
--- a/packages/blaze-tools/preamble.js
+++ /dev/null
@@ -1 +0,0 @@
-BlazeTools = {};
diff --git a/packages/blaze-tools/tojs.js b/packages/blaze-tools/tojs.js
deleted file mode 100644
index 730dc24d54..0000000000
--- a/packages/blaze-tools/tojs.js
+++ /dev/null
@@ -1,156 +0,0 @@
-
-BlazeTools.EmitCode = function (value) {
-  if (! (this instanceof BlazeTools.EmitCode))
-    // called without `new`
-    return new BlazeTools.EmitCode(value);
-
-  if (typeof value !== 'string')
-    throw new Error('BlazeTools.EmitCode must be constructed with a string');
-
-  this.value = value;
-};
-BlazeTools.EmitCode.prototype.toJS = function (visitor) {
-  return this.value;
-};
-
-// Turns any JSONable value into a JavaScript literal.
-toJSLiteral = function (obj) {
-  // See <http://timelessrepo.com/json-isnt-a-javascript-subset> for `\u2028\u2029`.
-  // Also escape Unicode surrogates.
-  return (JSON.stringify(obj)
-          .replace(/[\u2028\u2029\ud800-\udfff]/g, function (c) {
-            return '\\u' + ('000' + c.charCodeAt(0).toString(16)).slice(-4);
-          }));
-};
-BlazeTools.toJSLiteral = toJSLiteral;
-
-
-
-var jsReservedWordSet = (function (set) {
-  _.each("abstract else instanceof super boolean enum int switch break export interface synchronized byte extends let this case false long throw catch final native throws char finally new transient class float null true const for package try continue function private typeof debugger goto protected var default if public void delete implements return volatile do import short while double in static with".split(' '), function (w) {
-    set[w] = 1;
-  });
-  return set;
-})({});
-
-toObjectLiteralKey = function (k) {
-  if (/^[a-zA-Z$_][a-zA-Z$0-9_]*$/.test(k) && jsReservedWordSet[k] !== 1)
-    return k;
-  return toJSLiteral(k);
-};
-BlazeTools.toObjectLiteralKey = toObjectLiteralKey;
-
-var hasToJS = function (x) {
-  return x.toJS && (typeof (x.toJS) === 'function');
-};
-
-ToJSVisitor = HTML.Visitor.extend();
-ToJSVisitor.def({
-  visitNull: function (nullOrUndefined) {
-    return 'null';
-  },
-  visitPrimitive: function (stringBooleanOrNumber) {
-    return toJSLiteral(stringBooleanOrNumber);
-  },
-  visitArray: function (array) {
-    var parts = [];
-    for (var i = 0; i < array.length; i++)
-      parts.push(this.visit(array[i]));
-    return '[' + parts.join(', ') + ']';
-  },
-  visitTag: function (tag) {
-    return this.generateCall(tag.tagName, tag.attrs, tag.children);
-  },
-  visitComment: function (comment) {
-    return this.generateCall('HTML.Comment', null, [comment.value]);
-  },
-  visitCharRef: function (charRef) {
-    return this.generateCall('HTML.CharRef',
-                             {html: charRef.html, str: charRef.str});
-  },
-  visitRaw: function (raw) {
-    return this.generateCall('HTML.Raw', null, [raw.value]);
-  },
-  visitObject: function (x) {
-    if (hasToJS(x)) {
-      return x.toJS(this);
-    }
-
-    throw new Error("Unexpected object in HTMLjs in toJS: " + x);
-  },
-  generateCall: function (name, attrs, children) {
-    var tagSymbol;
-    if (name.indexOf('.') >= 0) {
-      tagSymbol = name;
-    } else if (HTML.isTagEnsured(name)) {
-      tagSymbol = 'HTML.' + HTML.getSymbolName(name);
-    } else {
-      tagSymbol = 'HTML.getTag(' + toJSLiteral(name) + ')';
-    }
-
-    var attrsArray = null;
-    if (attrs) {
-      attrsArray = [];
-      var needsHTMLAttrs = false;
-      if (HTML.isArray(attrs)) {
-        var attrsArray = [];
-        for (var i = 0; i < attrs.length; i++) {
-          var a = attrs[i];
-          if (hasToJS(a)) {
-            attrsArray.push(a.toJS(this));
-            needsHTMLAttrs = true;
-          } else {
-            var attrsObjStr = this.generateAttrsDictionary(attrs[i]);
-            if (attrsObjStr !== null)
-              attrsArray.push(attrsObjStr);
-          }
-        }
-      } else if (hasToJS(attrs)) {
-        attrsArray.push(attrs.toJS(this));
-        needsHTMLAttrs = true;
-      } else {
-        attrsArray.push(this.generateAttrsDictionary(attrs));
-      }
-    }
-    var attrsStr = null;
-    if (attrsArray && attrsArray.length) {
-      if (attrsArray.length === 1 && ! needsHTMLAttrs) {
-        attrsStr = attrsArray[0];
-      } else {
-        attrsStr = 'HTML.Attrs(' + attrsArray.join(', ') + ')';
-      }
-    }
-
-    var argStrs = [];
-    if (attrsStr !== null)
-      argStrs.push(attrsStr);
-
-    if (children) {
-      for (var i = 0; i < children.length; i++)
-        argStrs.push(this.visit(children[i]));
-    }
-
-    return tagSymbol + '(' + argStrs.join(', ') + ')';
-  },
-  generateAttrsDictionary: function (attrsDict) {
-    if (attrsDict.toJS && (typeof (attrsDict.toJS) === 'function')) {
-      // not an attrs dictionary, but something else!  Like a template tag.
-      return attrsDict.toJS(this);
-    }
-
-    var kvStrs = [];
-    for (var k in attrsDict) {
-      if (! HTML.isNully(attrsDict[k]))
-        kvStrs.push(toObjectLiteralKey(k) + ': ' +
-                    this.visit(attrsDict[k]));
-    }
-    if (kvStrs.length)
-      return '{' + kvStrs.join(', ') + '}';
-    return null;
-  }
-});
-BlazeTools.ToJSVisitor = ToJSVisitor;
-
-BlazeTools.toJS = function (content) {
-  return (new ToJSVisitor).visit(content);
-};
diff --git a/packages/blaze-tools/token_tests.js b/packages/blaze-tools/token_tests.js
deleted file mode 100644
index 91aa8bd369..0000000000
--- a/packages/blaze-tools/token_tests.js
+++ /dev/null
@@ -1,78 +0,0 @@
-Tinytest.add("blaze-tools - token parsers", function (test) {
-
-  var run = function (func, input, expected) {
-    var scanner = new HTMLTools.Scanner('z' + input);
-    // make sure the parse function respects `scanner.pos`
-    scanner.pos = 1;
-    var result = func(scanner);
-    if (expected === null) {
-      test.equal(scanner.pos, 1);
-      test.equal(result, null);
-    } else {
-      test.isTrue(scanner.isEOF());
-      test.equal(result, expected);
-    }
-  };
-
-  var runValue = function (func, input, expectedValue) {
-    var expected;
-    if (expectedValue === null)
-      expected = null;
-    else
-      expected = { text: input, value: expectedValue };
-    run(func, input, expected);
-  };
-
-  var parseNumber = BlazeTools.parseNumber;
-  var parseIdentifierName = BlazeTools.parseIdentifierName;
-  var parseExtendedIdentifierName = BlazeTools.parseExtendedIdentifierName;
-  var parseStringLiteral = BlazeTools.parseStringLiteral;
-
-  runValue(parseNumber, "0", 0);
-  runValue(parseNumber, "-0", 0);
-  runValue(parseNumber, "-", null);
-  runValue(parseNumber, ".a", null);
-  runValue(parseNumber, ".1", 0.1);
-  runValue(parseNumber, "1.", 1);
-  runValue(parseNumber, "1.1", 1.1);
-  runValue(parseNumber, "0x", null);
-  runValue(parseNumber, "0xa", 10);
-  runValue(parseNumber, "-0xa", -10);
-  runValue(parseNumber, "1e+1", 10);
-
-  _.each([parseIdentifierName, parseExtendedIdentifierName], function (f) {
-    run(f, "a", "a");
-    run(f, "true", "true");
-    run(f, "null", "null");
-    run(f, "if", "if");
-    run(f, "1", null);
-    run(f, "1a", null);
-    run(f, "+a", null);
-    run(f, "a1", "a1");
-    run(f, "a1a", "a1a");
-    run(f, "_a8f_f8d88_", "_a8f_f8d88_");
-  });
-  run(parseIdentifierName, "@index", null);
-  run(parseExtendedIdentifierName, "@index", "@index");
-  run(parseExtendedIdentifierName, "@something", "@something");
-  run(parseExtendedIdentifierName, "@", null);
-
-  runValue(parseStringLiteral, '"a"', 'a');
-  runValue(parseStringLiteral, '"\'"', "'");
-  runValue(parseStringLiteral, '\'"\'', '"');
-  runValue(parseStringLiteral, '"a\\\nb"', 'ab'); // line continuation
-  runValue(parseStringLiteral, '"a\u0062c"', 'abc');
-  // Note: IE 8 doesn't correctly parse '\v' in JavaScript.
-  runValue(parseStringLiteral, '"\\0\\b\\f\\n\\r\\t\\v"', '\0\b\f\n\r\t\u000b');
-  runValue(parseStringLiteral, '"\\x41"', 'A');
-  runValue(parseStringLiteral, '"\\\\"', '\\');
-  runValue(parseStringLiteral, '"\\\""', '\"');
-  runValue(parseStringLiteral, '"\\\'"', '\'');
-  runValue(parseStringLiteral, "'\\\\'", '\\');
-  runValue(parseStringLiteral, "'\\\"'", '\"');
-  runValue(parseStringLiteral, "'\\\''", '\'');
-
-  test.throws(function () {
-    run(parseStringLiteral, "'this is my string");
-  }, /Unterminated string literal/);
-});
diff --git a/packages/blaze-tools/tokens.js b/packages/blaze-tools/tokens.js
deleted file mode 100644
index 441d070fb4..0000000000
--- a/packages/blaze-tools/tokens.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// Adapted from source code of http://xregexp.com/plugins/#unicode
-var unicodeCategories = {
-  Ll: "0061-007A00B500DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F05210523052505270561-05871D00-1D2B1D6B-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7B2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2CF32D00-2D252D272D2DA641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA661A663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CA78EA791A793A7A1A7A3A7A5A7A7A7A9A7FAFB00-FB06FB13-FB17FF41-FF5A",
-  Lm: "02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D6A1D781D9B-1DBF2071207F2090-209C2C7C2C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A7F8A7F9A9CFAA70AADDAAF3AAF4FF70FF9EFF9F",
-  Lo: "00AA00BA01BB01C0-01C3029405D0-05EA05F0-05F20620-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150840-085808A008A2-08AC0904-0939093D09500958-09610972-09770979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10CF10CF20D05-0D0C0D0E-0D100D12-0D3A0D3D0D4E0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC-0EDF0F000F40-0F470F49-0F6C0F88-0F8C1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA10FD-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1BBA-1BE51C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF11CF51CF62135-21382D30-2D672D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31BA31F0-31FF3400-4DB54E00-9FCCA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCAAE0-AAEAAAF2AB01-AB06AB09-AB0EAB11-AB16AB20-AB26AB28-AB2EABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",
-  Lt: "01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",
-  Lu: "0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E05200522052405260531-055610A0-10C510C710CD1E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CED2CF2A640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA660A662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BA78DA790A792A7A0A7A2A7A4A7A6A7A8A7AAFF21-FF3A",
-  Mc: "0903093B093E-09400949-094C094E094F0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1BAC1BAD1BE71BEA-1BEC1BEE1BF21BF31C24-1C2B1C341C351CE11CF21CF3302E302FA823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BAAEBAAEEAAEFAAF5ABE3ABE4ABE6ABE7ABE9ABEAABEC",
-  Mn: "0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065F067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0859-085B08E4-08FE0900-0902093A093C0941-0948094D0951-095709620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F8D-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135D-135F1712-17141732-1734175217531772177317B417B517B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91BAB1BE61BE81BE91BED1BEF-1BF11C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1CF41DC0-1DE61DFC-1DFF20D0-20DC20E120E5-20F02CEF-2CF12D7F2DE0-2DFF302A-302D3099309AA66FA674-A67DA69FA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1AAECAAEDAAF6ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",
-  Nd: "0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19D91A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",
-  Nl: "16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",
-  Pc: "005F203F20402054FE33FE34FE4D-FE4FFF3F"
-};
-
-var unicodeClass = function (abbrev) {
-  return '[' +
-    unicodeCategories[abbrev].replace(/[0-9A-F]{4}/ig, "\\u$&") + ']';
-};
-
-// See ECMA-262 spec, 3rd edition, Section 7.6
-// Match one or more characters that can start an identifier.
-// This is IdentifierStart+.
-var rIdentifierPrefix = new RegExp(
-  "^([a-zA-Z$_]+|\\\\u[0-9a-fA-F]{4}|" +
-    [unicodeClass('Lu'), unicodeClass('Ll'), unicodeClass('Lt'),
-     unicodeClass('Lm'), unicodeClass('Lo'), unicodeClass('Nl')].join('|') +
-    ")+");
-// Match one or more characters that can continue an identifier.
-// This is (IdentifierPart and not IdentifierStart)+.
-// To match a full identifier, match rIdentifierPrefix, then
-// match rIdentifierMiddle followed by rIdentifierPrefix until they both fail.
-var rIdentifierMiddle = new RegExp(
-  "^([0-9]|" + [unicodeClass('Mn'), unicodeClass('Mc'), unicodeClass('Nd'),
-                unicodeClass('Pc')].join('|') + ")+");
-
-
-// See ECMA-262 spec, 3rd edition, Section 7.8.3
-var rHexLiteral = /^0[xX][0-9a-fA-F]+(?!\w)/;
-var rDecLiteral =
-      /^(((0|[1-9][0-9]*)(\.[0-9]*)?)|\.[0-9]+)([Ee][+-]?[0-9]+)?(?!\w)/;
-
-// Section 7.8.4
-var rStringQuote = /^["']/;
-// Match one or more characters besides quotes, backslashes, or line ends
-var rStringMiddle = /^(?=.)[^"'\\]+?((?!.)|(?=["'\\]))/;
-// Match one escape sequence, including the backslash.
-var rEscapeSequence =
-      /^\\(['"\\bfnrtv]|0(?![0-9])|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|(?=.)[^ux0-9])/;
-// Match one ES5 line continuation
-var rLineContinuation =
-      /^\\(\r\n|[\u000A\u000D\u2028\u2029])/;
-
-
-BlazeTools.parseNumber = function (scanner) {
-  var startPos = scanner.pos;
-
-  var isNegative = false;
-  if (scanner.peek() === '-') {
-    scanner.pos++;
-    isNegative = true;
-  }
-  // Note that we allow `"-0xa"`, unlike `Number(...)`.
-
-  var rest = scanner.rest();
-  var match = rDecLiteral.exec(rest) || rHexLiteral.exec(rest);
-  if (! match) {
-    scanner.pos = startPos;
-    return null;
-  }
-  var matchText = match[0];
-  scanner.pos += matchText.length;
-
-  var text = (isNegative ? '-' : '') + matchText;
-  var value = Number(matchText);
-  value = (isNegative ? -value : value);
-  return { text: text, value: value };
-};
-
-BlazeTools.parseIdentifierName = function (scanner) {
-  var startPos = scanner.pos;
-  var rest = scanner.rest();
-  var match = rIdentifierPrefix.exec(rest);
-  if (! match)
-    return null;
-  scanner.pos += match[0].length;
-  rest = scanner.rest();
-  var foundMore = true;
-
-  while (foundMore) {
-    foundMore = false;
-
-    match = rIdentifierMiddle.exec(rest);
-    if (match) {
-      foundMore = true;
-      scanner.pos += match[0].length;
-      rest = scanner.rest();
-    }
-
-    match = rIdentifierPrefix.exec(rest);
-    if (match) {
-      foundMore = true;
-      scanner.pos += match[0].length;
-      rest = scanner.rest();
-    }
-  }
-
-  return scanner.input.substring(startPos, scanner.pos);
-};
-
-BlazeTools.parseExtendedIdentifierName = function (scanner) {
-  // parse an identifier name optionally preceded by '@'
-  if (scanner.peek() === '@') {
-    scanner.pos++;
-    var afterAt = BlazeTools.parseIdentifierName(scanner);
-    if (afterAt) {
-      return '@' + afterAt;
-    } else {
-      scanner.pos--;
-      return null;
-    }
-  } else {
-    return BlazeTools.parseIdentifierName(scanner);
-  }
-};
-
-BlazeTools.parseStringLiteral = function (scanner) {
-  var startPos = scanner.pos;
-  var rest = scanner.rest();
-  var match = rStringQuote.exec(rest);
-  if (! match)
-    return null;
-
-  var quote = match[0];
-  scanner.pos++;
-  rest = scanner.rest();
-
-  var jsonLiteral = '"';
-
-  while (match) {
-    match = rStringMiddle.exec(rest);
-    if (match) {
-      jsonLiteral += match[0];
-    } else {
-      match = rEscapeSequence.exec(rest);
-      if (match) {
-        var esc = match[0];
-        // Convert all string escapes to JSON-compatible string escapes, so we
-        // can use JSON.parse for some of the work.  JSON strings are not the
-        // same as JS strings.  They don't support `\0`, `\v`, `\'`, or hex
-        // escapes.
-        if (esc === '\\0')
-          jsonLiteral += '\\u0000';
-        else if (esc === '\\v')
-          // Note: IE 8 doesn't correctly parse '\v' in JavaScript.
-          jsonLiteral += '\\u000b';
-        else if (esc.charAt(1) === 'x')
-          jsonLiteral += '\\u00' + esc.slice(2);
-        else if (esc === '\\\'')
-          jsonLiteral += "'";
-        else
-          jsonLiteral += esc;
-      } else {
-        match = rLineContinuation.exec(rest);
-        if (! match) {
-          match = rStringQuote.exec(rest);
-          if (match) {
-            var c = match[0];
-            if (c !== quote) {
-              if (c === '"')
-                jsonLiteral += '\\';
-              jsonLiteral += c;
-            }
-          }
-        }
-      }
-    }
-    if (match) {
-      scanner.pos += match[0].length;
-      rest = scanner.rest();
-      if (match[0] === quote)
-        break;
-    }
-  }
-
-  if (! match || match[0] !== quote)
-    scanner.fatal("Unterminated string literal");
-
-  jsonLiteral += '"';
-  var text = scanner.input.substring(startPos, scanner.pos);
-  var value = JSON.parse(jsonLiteral);
-  return { text: text, value: value };
-};
diff --git a/packages/blaze/.gitignore b/packages/blaze/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/blaze/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/blaze/README.md b/packages/blaze/README.md
deleted file mode 100644
index 81d8298630..0000000000
--- a/packages/blaze/README.md
+++ /dev/null
@@ -1,318 +0,0 @@
-# Blaze
-
-Blaze is a powerful library for creating user interfaces by writing
-reactive HTML templates.  Compared to using a combination of
-traditional templates and jQuery, Blaze eliminates the need for all
-the "update logic" in your app that listens for data changes and
-manipulates the DOM.  Instead, familiar template directives like
-
-`{{#if}}` and `{{#each}}` integrate with
-[Tracker's](https://meteor.com/tracker) "transparent reactivity" and
-[Minimongo's](https://meteor.com/mini-databases) database cursors so
-that the DOM updates automatically.
-
-Read more on the Blaze [project page](http://www.meteor.com/blaze).
-
-## Details
-
-Blaze has two major parts:
-
-* A template compiler that compiles template files into JavaScript
-  code that runs against the Blaze runtime library.  Moreover, Blaze
-  provides a compiler toolchain (think LLVM) that can be used to
-  support arbitrary template syntaxes.  The flagship template syntax
-  is Spacebars, a variant of Handlebars, but a community alternative
-  based on Jade is already in use by many apps.
-
-* A reactive DOM engine that builds and manages the DOM at runtime,
-  invoked via templates or directly from the app, which features
-  reactively updating regions, lists, and attributes; event
-  delegation; and many callbacks and hooks to aid the app developer.
-
-Blaze is sometimes compared to frameworks like React, Angular, Ember,
-Polymer, Knockout, and others by virtue of its advanced templating
-system.  What sets Blaze apart is a relentless focus on the developer
-experience, using templating, transparent reactivity, and
-interoperability with existing libraries to create a gentle learning
-curve while enabling you to build world-class apps.
-
-## Examples
-
-Here are two Spacebars templates from an example app called
-"Leaderboard" which displays a sorted list of top players and their
-scores:
-
-```html
-<template name="leaderboard">
-  <ol class="leaderboard">
-    {{#each players}}
-      {{> player}}
-    {{/each}}
-  </ol>
-</template>
-
-<template name="player">
-  <li class="player {{selected}}">
-    <span class="name">{{name}}</span>
-    <span class="score">{{score}}</span>
-  </li>
-</template>
-```
-
-The template tags `{{name}}` and `{{score}}` refer to properties of
-the data context (the current player), while `players` and `selected`
-refer to helper functions.  Helper functions and event handlers are defined
-in JavaScript:
-
-```javascript
-Template.leaderboard.helpers({
-  players: function () {
-    // Perform a reactive database query against minimongo
-    return Players.find({}, { sort: { score: -1, name: 1 } });
-  }
-});
-
-Template.player.events({
-  'click': function () {
-    // click on a player to select it
-    Session.set("selectedPlayer", this._id);
-  }
-});
-
-Template.player.helpers({
-  selected: function () {
-    return Session.equals("selectedPlayer", this._id) ? "selected" : '';
-  }
-});
-```
-
-No additional UI code is necessary to ensure that the list of players
-stays up-to-date, or that the "selected" class is added and removed
-from the LI elements as appropriate when the user clicks on a player.
-
-Thanks to a powerful template language, it doesn't take much ceremony
-to write a loop, include another template, or bind an attribute (or
-part of an attribute).  And thanks to Tracker's transparent
-reactivity, there's no ceremony around depending on reactive data
-sources like the database or Session; it just happens when you read
-the value, and when the value changes, the DOM will be updated in a
-fine-grained way.
-
-# Principles
-
-## Gentle Learning Curve
-
-To get started with Blaze, you don't have to learn a lot of concepts
-or terminology.  As web developers, we are already students of HTML,
-CSS, and JavaScript, which are complex technologies described in thick
-books.  Blaze lets you apply your existing knowledge in exciting new
-ways without having to read another book first.
-
-Many factors go into making Blaze easy to pick up and use, including
-the other principles below.  In general, we prefer APIs that lead to
-simple and obvious-looking application code, and we recognize that
-developers have limited time and energy to learn new and unfamiliar
-terms and syntaxes.
-
-It may sound obvious to "keep it simple" and prioritize the developer
-experience when creating a system for reactive HTML, but it's also
-challenging, and we think it's not done often enough!  We use feedback
-from the Meteor community to ensure that Blaze's features stay simple,
-understandable, and useful.
-
-## Transparent Reactivity
-
-Under the hood, Blaze uses the [Tracker](https://meteor.com/tracker)
-library to automatically keep track of when to recalculate each
-template helper.  If a helper reads a value from the client-side
-database, for example, the helper will automatically be recalculated
-when the value changes.
-
-What this means for the developer is simple.  You don't have to
-explicitly declare when to update the DOM, or even perform any
-explicit "data-binding."  You don't have to know how Tracker works, or
-even exactly what "reactivity" means, to benefit.  The result is less
-thinking and less typing than other approaches.
-
-## Clean Templates
-
-Blaze embraces popular template syntaxes such as Handlebars and Jade
-which are clean, readable, and familiar to developers coming from
-other frameworks.
-
-A good template language should clearly distinguish the special
-"template directives" (often enclosed in curly braces) from the HTML,
-and it should not obscure the structure of the resulting HTML.  These
-properties make templating an easy concept to learn after static HTML
-(or alongside it), and make templates easy to read, easy to style with
-CSS, and easy to relate to the DOM.
-
-In contrast, some newer frameworks try to remake templates as just
-HTML (Angular, Polymer) or replace them with just JavaScript (React).
-These approaches tend to obscure either the structure of the template,
-or what is a real DOM element and what is not, or both.  In addition,
-since templates are generally precompiled anyway as a best practice,
-it's really not important that raw template source code be
-browser-parsable.  Meanwhile, the developer experience of reading,
-writing, and maintaining templates is hugely important.
-
-## Plugin Interoperability
-
-Web developers often share snippets of HTML, JavaScript, and CSS, or
-publish them as libraries, widgets, or jQuery plugins.  They want to
-embed videos, maps, and other third-party content.
-
-Blaze doesn't assume it owns the whole DOM, and it tries to make as
-few assumptions as possible about the DOM outside of its updates.
-It hooks into jQuery's clean-up routines to prevent memory leaks,
-and it preserves classes, attributes, and styles added to elements
-by jQuery or any third-party library.
-
-While it's certainly possible for Blaze and jQuery to step on each
-other's toes if you aren't careful, there are established patterns for
-keeping the peace, and Meteor users rightfully expect to be able to
-use the various widgets and enhancements cooked up by the broader web
-community in their apps.
-
-# Comparisons to other libraries
-
-Compared to Backbone and other libraries that simply re-render
-templates, Blaze does much less re-rendering and doesn't suffer from
-the dreaded "nested view" problem, which is when two templates can't
-be updated independently of each other because one is nested inside
-the other.  In addition, Blaze automatically determines when
-re-rendering must occur, using Tracker.
-
-Compared to Ember, Blaze offers finer-grained, automatic DOM updates.
-Because Blaze uses Tracker's transparent reactivity, you don't have to
-perform explicit "data-binding" to get data into your template, or
-declare the data dependencies of each template helper.
-
-Compared to Angular and Polymer, Blaze has a gentler learning curve,
-simpler concepts, and nicer template syntax that cleanly separates
-template directives and HTML.  Also, Blaze is targeted at today's
-browsers and not designed around a hypothetical "browser of the
-future."
-
-Compared to React, Blaze emphasizes HTML templates rather than
-JavaScript component classes.  Templates are more approachable than
-JavaScript code and easier to read, write, and style with CSS.
-Instead of using Tracker, React relies on a combination of explicit
-"setState" calls and data-model diffing in order to achieve efficient
-rendering.
-
-# Future Work
-
-### Components
-
-Blaze will get better patterns for creating reusable UI components.
-Templates already serve as reusable components, to a point.
-Improvements will focus on:
-
-* Argument-handling
-* Local reactive state
-* "Methods" that are callable from other components and have side
-  effects, versus the current "helpers" which are called from the
-  template language and are "pure"
-* Scoping and the lookup chain
-* Inheritance and configuration
-
-### Forms
-
-Most applications have a lot of forms, where input fields and other
-widgets are used to enter data, which must then be validated and
-turned into database changes.  Server-side frameworks like Rails and
-Django have well-honed patterns for this, but client-side frameworks
-are typically more lacking, perhaps because they are more estranged
-from the database.
-
-Meteor developers have already found ways and built packages to deal
-with forms and validation, but we think there's a great opportunity to
-make this part of the core, out-of-the-box Meteor experience.
-
-### Mobile and Animation
-
-Blaze will cater to the needs of the mobile web, including enhanced
-performance and patterns for touch and other mobile interaction.
-
-We'll also improve the ease with which developers can integrate
-animated transitions into their apps.
-
-### JavaScript Expressions in Templates
-
-We plan to support JavaScript expressions in templates.  This will
-make templates more expressive, and it will further shorten
-application code by eliminating the need for a certain class of
-one-line helpers.
-
-The usual argument against allowing JavaScript expressions in a
-template language is one of "separation of concerns" -- separating
-business logic from presentation, so that the business logic may be
-better organized, maintained, and tested independently.  Meanwhile,
-even "logicless" template languages often include some concessions in
-the form of microsyntax for filtering, querying, and transforming data
-before using it.  This special syntax (and its extension mechanisms)
-must then be learned.
-
-While keeping business logic out of templates is indeed good policy,
-there is a large class of "presentation logic" that is not really
-separable from the concerns of templates and HTML, such as the code to
-calculate styles and classes to apply to HTML elements or to massage
-data records into a better form for templating purposes.  In many
-cases where this code is short, it may be more convenient or more
-readable to embed the code in the template, and it's certainly better
-than evolving the template syntax in a direction that diverges from
-JavaScript.
-
-Because templates are already precompiled to JavaScript code, there is
-nothing fundamentally difficult or inelegant about allowing a large
-subset of JavaScript to be used within templates (see e.g. the project
-Ractive.js).
-
-### Other Template Enhancements
-
-Source maps for debugging templates.  Imagine seeing your template
-code in the browser's debugger!  Pretty slick.
-
-True lexical scoping.
-
-Better support for pluggable template syntax (e.g. Jade-like
-templates).  There is already a Jade package in use, but we should
-learn from it and clarify the abstraction boundary that authors of
-template syntaxes are programming against.
-
-### Pluggable Backends (don't require jQuery)
-
-While Blaze currently requires jQuery, it is architected to run
-against other "DOM backends" using a common adaptor interface.  You
-should be able to use Zepto, or some very small shim if browser
-compatibility is not a big deal for your application for some reason.
-At the moment, no such adaptors besides the jQuery one have been
-written.
-
-The Blaze team experimented with dropping jQuery and talking directly
-to "modern browsers," but it turns out there is about 5-10K of code at
-the heart of jQuery that you can't throw out even if you don't care
-about old browsers or supporting jQuery's app-facing API, which is
-required just to bring browsers up to the modest expectations of web
-developers.
-
-### Better Stand-alone Support
-
-Blaze will get better support for using it outside of Meteor, such as
-regular stand-alone builds.
-
-# Resources
-
-* [Templates API](http://docs.meteor.com/#templates_api)
-* [Blaze API](http://docs.meteor.com/#blaze)
-* [Spacebars syntax](https://github.com/meteor/meteor/blob/devel/packages/spacebars/README.md)
-
-# Packages
-
-* blaze
-* blaze-tools
-* html-tools
-* htmljs
-* spacebars
-* spacebars-compiler
diff --git a/packages/blaze/attrs.js b/packages/blaze/attrs.js
deleted file mode 100644
index 427f9cf8ec..0000000000
--- a/packages/blaze/attrs.js
+++ /dev/null
@@ -1,365 +0,0 @@
-var jsUrlsAllowed = false;
-Blaze._allowJavascriptUrls = function () {
-  jsUrlsAllowed = true;
-};
-Blaze._javascriptUrlsAllowed = function () {
-  return jsUrlsAllowed;
-};
-
-// An AttributeHandler object is responsible for updating a particular attribute
-// of a particular element.  AttributeHandler subclasses implement
-// browser-specific logic for dealing with particular attributes across
-// different browsers.
-//
-// To define a new type of AttributeHandler, use
-// `var FooHandler = AttributeHandler.extend({ update: function ... })`
-// where the `update` function takes arguments `(element, oldValue, value)`.
-// The `element` argument is always the same between calls to `update` on
-// the same instance.  `oldValue` and `value` are each either `null` or
-// a Unicode string of the type that might be passed to the value argument
-// of `setAttribute` (i.e. not an HTML string with character references).
-// When an AttributeHandler is installed, an initial call to `update` is
-// always made with `oldValue = null`.  The `update` method can access
-// `this.name` if the AttributeHandler class is a generic one that applies
-// to multiple attribute names.
-//
-// AttributeHandlers can store custom properties on `this`, as long as they
-// don't use the names `element`, `name`, `value`, and `oldValue`.
-//
-// AttributeHandlers can't influence how attributes appear in rendered HTML,
-// only how they are updated after materialization as DOM.
-
-AttributeHandler = function (name, value) {
-  this.name = name;
-  this.value = value;
-};
-Blaze._AttributeHandler = AttributeHandler;
-
-AttributeHandler.prototype.update = function (element, oldValue, value) {
-  if (value === null) {
-    if (oldValue !== null)
-      element.removeAttribute(this.name);
-  } else {
-    element.setAttribute(this.name, value);
-  }
-};
-
-AttributeHandler.extend = function (options) {
-  var curType = this;
-  var subType = function AttributeHandlerSubtype(/*arguments*/) {
-    AttributeHandler.apply(this, arguments);
-  };
-  subType.prototype = new curType;
-  subType.extend = curType.extend;
-  if (options)
-    _.extend(subType.prototype, options);
-  return subType;
-};
-
-/// Apply the diff between the attributes of "oldValue" and "value" to "element."
-//
-// Each subclass must implement a parseValue method which takes a string
-// as an input and returns a dict of attributes. The keys of the dict
-// are unique identifiers (ie. css properties in the case of styles), and the
-// values are the entire attribute which will be injected into the element.
-//
-// Extended below to support classes, SVG elements and styles.
-
-var DiffingAttributeHandler = AttributeHandler.extend({
-  update: function (element, oldValue, value) {
-    if (!this.getCurrentValue || !this.setValue || !this.parseValue)
-      throw new Error("Missing methods in subclass of 'DiffingAttributeHandler'");
-
-    var oldAttrsMap = oldValue ? this.parseValue(oldValue) : {};
-    var newAttrsMap = value ? this.parseValue(value) : {};
-
-    // the current attributes on the element, which we will mutate.
-
-    var attrString = this.getCurrentValue(element);
-    var attrsMap = attrString ? this.parseValue(attrString) : {};
-
-    _.each(_.keys(oldAttrsMap), function (t) {
-      if (! (t in newAttrsMap))
-        delete attrsMap[t];
-    });
-
-    _.each(_.keys(newAttrsMap), function (t) {
-      attrsMap[t] = newAttrsMap[t];
-    });
-
-    this.setValue(element, _.values(attrsMap).join(' '));
-  }
-});
-
-var ClassHandler = DiffingAttributeHandler.extend({
-  // @param rawValue {String}
-  getCurrentValue: function (element) {
-    return element.className;
-  },
-  setValue: function (element, className) {
-    element.className = className;
-  },
-  parseValue: function (attrString) {
-    var tokens = {};
-
-    _.each(attrString.split(' '), function(token) {
-      if (token)
-        tokens[token] = token;
-    });
-    return tokens;
-  }
-});
-
-var SVGClassHandler = ClassHandler.extend({
-  getCurrentValue: function (element) {
-    return element.className.baseVal;
-  },
-  setValue: function (element, className) {
-    element.setAttribute('class', className);
-  }
-});
-
-var StyleHandler = DiffingAttributeHandler.extend({
-  getCurrentValue: function (element) {
-    return element.getAttribute('style');
-  },
-  setValue: function (element, style) {
-    if (style === '') {
-      element.removeAttribute('style');
-    } else {
-      element.setAttribute('style', style);
-    }
-  },
-
-  // Parse a string to produce a map from property to attribute string.
-  //
-  // Example:
-  // "color:red; foo:12px" produces a token {color: "color:red", foo:"foo:12px"}
-  parseValue: function (attrString) {
-    var tokens = {};
-
-    // Regex for parsing a css attribute declaration, taken from css-parse:
-    // https://github.com/reworkcss/css-parse/blob/7cef3658d0bba872cde05a85339034b187cb3397/index.js#L219
-    var regex = /(\*?[-#\/\*\\\w]+(?:\[[0-9a-z_-]+\])?)\s*:\s*(?:\'(?:\\\'|.)*?\'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+[;\s]*/g;
-    var match = regex.exec(attrString);
-    while (match) {
-      // match[0] = entire matching string
-      // match[1] = css property
-      // Prefix the token to prevent conflicts with existing properties.
-
-      // XXX No `String.trim` on Safari 4. Swap out $.trim if we want to
-      // remove strong dep on jquery.
-      tokens[' ' + match[1]] = match[0].trim ?
-        match[0].trim() : $.trim(match[0]);
-
-      match = regex.exec(attrString);
-    }
-
-    return tokens;
-  }
-});
-
-var BooleanHandler = AttributeHandler.extend({
-  update: function (element, oldValue, value) {
-    var name = this.name;
-    if (value == null) {
-      if (oldValue != null)
-        element[name] = false;
-    } else {
-      element[name] = true;
-    }
-  }
-});
-
-var DOMPropertyHandler = AttributeHandler.extend({
-  update: function (element, oldValue, value) {
-    var name = this.name;
-    if (value !== element[name])
-      element[name] = value;
-  }
-});
-
-// attributes of the type 'xlink:something' should be set using
-// the correct namespace in order to work
-var XlinkHandler = AttributeHandler.extend({
-  update: function(element, oldValue, value) {
-    var NS = 'http://www.w3.org/1999/xlink';
-    if (value === null) {
-      if (oldValue !== null)
-        element.removeAttributeNS(NS, this.name);
-    } else {
-      element.setAttributeNS(NS, this.name, this.value);
-    }
-  }
-});
-
-// cross-browser version of `instanceof SVGElement`
-var isSVGElement = function (elem) {
-  return 'ownerSVGElement' in elem;
-};
-
-var isUrlAttribute = function (tagName, attrName) {
-  // Compiled from http://www.w3.org/TR/REC-html40/index/attributes.html
-  // and
-  // http://www.w3.org/html/wg/drafts/html/master/index.html#attributes-1
-  var urlAttrs = {
-    FORM: ['action'],
-    BODY: ['background'],
-    BLOCKQUOTE: ['cite'],
-    Q: ['cite'],
-    DEL: ['cite'],
-    INS: ['cite'],
-    OBJECT: ['classid', 'codebase', 'data', 'usemap'],
-    APPLET: ['codebase'],
-    A: ['href'],
-    AREA: ['href'],
-    LINK: ['href'],
-    BASE: ['href'],
-    IMG: ['longdesc', 'src', 'usemap'],
-    FRAME: ['longdesc', 'src'],
-    IFRAME: ['longdesc', 'src'],
-    HEAD: ['profile'],
-    SCRIPT: ['src'],
-    INPUT: ['src', 'usemap', 'formaction'],
-    BUTTON: ['formaction'],
-    BASE: ['href'],
-    MENUITEM: ['icon'],
-    HTML: ['manifest'],
-    VIDEO: ['poster']
-  };
-
-  if (attrName === 'itemid') {
-    return true;
-  }
-
-  var urlAttrNames = urlAttrs[tagName] || [];
-  return _.contains(urlAttrNames, attrName);
-};
-
-// To get the protocol for a URL, we let the browser normalize it for
-// us, by setting it as the href for an anchor tag and then reading out
-// the 'protocol' property.
-if (Meteor.isClient) {
-  var anchorForNormalization = document.createElement('A');
-}
-
-var getUrlProtocol = function (url) {
-  if (Meteor.isClient) {
-    anchorForNormalization.href = url;
-    return (anchorForNormalization.protocol || "").toLowerCase();
-  } else {
-    throw new Error('getUrlProtocol not implemented on the server');
-  }
-};
-
-// UrlHandler is an attribute handler for all HTML attributes that take
-// URL values. It disallows javascript: URLs, unless
-// Blaze._allowJavascriptUrls() has been called. To detect javascript:
-// urls, we set the attribute on a dummy anchor element and then read
-// out the 'protocol' property of the attribute.
-var origUpdate = AttributeHandler.prototype.update;
-var UrlHandler = AttributeHandler.extend({
-  update: function (element, oldValue, value) {
-    var self = this;
-    var args = arguments;
-
-    if (Blaze._javascriptUrlsAllowed()) {
-      origUpdate.apply(self, args);
-    } else {
-      var isJavascriptProtocol = (getUrlProtocol(value) === "javascript:");
-      var isVBScriptProtocol   = (getUrlProtocol(value) === "vbscript:");
-      if (isJavascriptProtocol || isVBScriptProtocol) {
-        Blaze._warn("URLs that use the 'javascript:' or 'vbscript:' protocol are not " +
-                    "allowed in URL attribute values. " +
-                    "Call Blaze._allowJavascriptUrls() " +
-                    "to enable them.");
-        origUpdate.apply(self, [element, oldValue, null]);
-      } else {
-        origUpdate.apply(self, args);
-      }
-    }
-  }
-});
-
-// XXX make it possible for users to register attribute handlers!
-makeAttributeHandler = function (elem, name, value) {
-  // generally, use setAttribute but certain attributes need to be set
-  // by directly setting a JavaScript property on the DOM element.
-  if (name === 'class') {
-    if (isSVGElement(elem)) {
-      return new SVGClassHandler(name, value);
-    } else {
-      return new ClassHandler(name, value);
-    }
-  } else if (name === 'style') {
-    return new StyleHandler(name, value);
-  } else if ((elem.tagName === 'OPTION' && name === 'selected') ||
-             (elem.tagName === 'INPUT' && name === 'checked')) {
-    return new BooleanHandler(name, value);
-  } else if ((elem.tagName === 'TEXTAREA' || elem.tagName === 'INPUT')
-             && name === 'value') {
-    // internally, TEXTAREAs tracks their value in the 'value'
-    // attribute just like INPUTs.
-    return new DOMPropertyHandler(name, value);
-  } else if (name.substring(0,6) === 'xlink:') {
-    return new XlinkHandler(name.substring(6), value);
-  } else if (isUrlAttribute(elem.tagName, name)) {
-    return new UrlHandler(name, value);
-  } else {
-    return new AttributeHandler(name, value);
-  }
-
-  // XXX will need one for 'style' on IE, though modern browsers
-  // seem to handle setAttribute ok.
-};
-
-
-ElementAttributesUpdater = function (elem) {
-  this.elem = elem;
-  this.handlers = {};
-};
-
-// Update attributes on `elem` to the dictionary `attrs`, whose
-// values are strings.
-ElementAttributesUpdater.prototype.update = function(newAttrs) {
-  var elem = this.elem;
-  var handlers = this.handlers;
-
-  for (var k in handlers) {
-    if (! _.has(newAttrs, k)) {
-      // remove attributes (and handlers) for attribute names
-      // that don't exist as keys of `newAttrs` and so won't
-      // be visited when traversing it.  (Attributes that
-      // exist in the `newAttrs` object but are `null`
-      // are handled later.)
-      var handler = handlers[k];
-      var oldValue = handler.value;
-      handler.value = null;
-      handler.update(elem, oldValue, null);
-      delete handlers[k];
-    }
-  }
-
-  for (var k in newAttrs) {
-    var handler = null;
-    var oldValue;
-    var value = newAttrs[k];
-    if (! _.has(handlers, k)) {
-      if (value !== null) {
-        // make new handler
-        handler = makeAttributeHandler(elem, k, value);
-        handlers[k] = handler;
-        oldValue = null;
-      }
-    } else {
-      handler = handlers[k];
-      oldValue = handler.value;
-    }
-    if (oldValue !== value) {
-      handler.value = value;
-      handler.update(elem, oldValue, value);
-      if (value === null)
-        delete handlers[k];
-    }
-  }
-};
diff --git a/packages/blaze/backcompat.js b/packages/blaze/backcompat.js
deleted file mode 100644
index d8c5d509d8..0000000000
--- a/packages/blaze/backcompat.js
+++ /dev/null
@@ -1,18 +0,0 @@
-UI = Blaze;
-
-Blaze.ReactiveVar = ReactiveVar;
-UI._templateInstance = Blaze.Template.instance;
-
-Handlebars = {};
-Handlebars.registerHelper = Blaze.registerHelper;
-
-Handlebars._escape = Blaze._escape;
-
-// Return these from {{...}} helpers to achieve the same as returning
-// strings from {{{...}}} helpers
-Handlebars.SafeString = function(string) {
-  this.string = string;
-};
-Handlebars.SafeString.prototype.toString = function() {
-  return this.string.toString();
-};
diff --git a/packages/blaze/builtins.js b/packages/blaze/builtins.js
deleted file mode 100644
index 4d883bcd97..0000000000
--- a/packages/blaze/builtins.js
+++ /dev/null
@@ -1,354 +0,0 @@
-Blaze._calculateCondition = function (cond) {
-  if (cond instanceof Array && cond.length === 0)
-    cond = false;
-  return !! cond;
-};
-
-/**
- * @summary Constructs a View that renders content with a data context.
- * @locus Client
- * @param {Object|Function} data An object to use as the data context, or a function returning such an object.  If a function is provided, it will be reactively re-run.
- * @param {Function} contentFunc A Function that returns [*renderable content*](#renderable_content).
- */
-Blaze.With = function (data, contentFunc) {
-  var view = Blaze.View('with', contentFunc);
-
-  view.dataVar = new ReactiveVar;
-
-  view.onViewCreated(function () {
-    if (typeof data === 'function') {
-      // `data` is a reactive function
-      view.autorun(function () {
-        view.dataVar.set(data());
-      }, view.parentView, 'setData');
-    } else {
-      view.dataVar.set(data);
-    }
-  });
-
-  return view;
-};
-
-/**
- * Attaches bindings to the instantiated view.
- * @param {Object} bindings A dictionary of bindings, each binding name
- * corresponds to a value or a function that will be reactively re-run.
- * @param {View} view The target.
- */
-Blaze._attachBindingsToView = function (bindings, view) {
-  view.onViewCreated(function () {
-    _.each(bindings, function (binding, name) {
-      view._scopeBindings[name] = new ReactiveVar;
-      if (typeof binding === 'function') {
-        view.autorun(function () {
-          view._scopeBindings[name].set(binding());
-        }, view.parentView);
-      } else {
-        view._scopeBindings[name].set(binding);
-      }
-    });
-  });
-};
-
-/**
- * @summary Constructs a View setting the local lexical scope in the block.
- * @param {Function} bindings Dictionary mapping names of bindings to
- * values or computations to reactively re-run.
- * @param {Function} contentFunc A Function that returns [*renderable content*](#renderable_content).
- */
-Blaze.Let = function (bindings, contentFunc) {
-  var view = Blaze.View('let', contentFunc);
-  Blaze._attachBindingsToView(bindings, view);
-
-  return view;
-};
-
-/**
- * @summary Constructs a View that renders content conditionally.
- * @locus Client
- * @param {Function} conditionFunc A function to reactively re-run.  Whether the result is truthy or falsy determines whether `contentFunc` or `elseFunc` is shown.  An empty array is considered falsy.
- * @param {Function} contentFunc A Function that returns [*renderable content*](#renderable_content).
- * @param {Function} [elseFunc] Optional.  A Function that returns [*renderable content*](#renderable_content).  If no `elseFunc` is supplied, no content is shown in the "else" case.
- */
-Blaze.If = function (conditionFunc, contentFunc, elseFunc, _not) {
-  var conditionVar = new ReactiveVar;
-
-  var view = Blaze.View(_not ? 'unless' : 'if', function () {
-    return conditionVar.get() ? contentFunc() :
-      (elseFunc ? elseFunc() : null);
-  });
-  view.__conditionVar = conditionVar;
-  view.onViewCreated(function () {
-    this.autorun(function () {
-      var cond = Blaze._calculateCondition(conditionFunc());
-      conditionVar.set(_not ? (! cond) : cond);
-    }, this.parentView, 'condition');
-  });
-
-  return view;
-};
-
-/**
- * @summary An inverted [`Blaze.If`](#blaze_if).
- * @locus Client
- * @param {Function} conditionFunc A function to reactively re-run.  If the result is falsy, `contentFunc` is shown, otherwise `elseFunc` is shown.  An empty array is considered falsy.
- * @param {Function} contentFunc A Function that returns [*renderable content*](#renderable_content).
- * @param {Function} [elseFunc] Optional.  A Function that returns [*renderable content*](#renderable_content).  If no `elseFunc` is supplied, no content is shown in the "else" case.
- */
-Blaze.Unless = function (conditionFunc, contentFunc, elseFunc) {
-  return Blaze.If(conditionFunc, contentFunc, elseFunc, true /*_not*/);
-};
-
-/**
- * @summary Constructs a View that renders `contentFunc` for each item in a sequence.
- * @locus Client
- * @param {Function} argFunc A function to reactively re-run. The function can
- * return one of two options:
- *
- * 1. An object with two fields: '_variable' and '_sequence'. Each iterates over
- *   '_sequence', it may be a Cursor, an array, null, or undefined. Inside the
- *   Each body you will be able to get the current item from the sequence using
- *   the name specified in the '_variable' field.
- *
- * 2. Just a sequence (Cursor, array, null, or undefined) not wrapped into an
- *   object. Inside the Each body, the current item will be set as the data
- *   context.
- * @param {Function} contentFunc A Function that returns  [*renderable
- * content*](#renderable_content).
- * @param {Function} [elseFunc] A Function that returns [*renderable
- * content*](#renderable_content) to display in the case when there are no items
- * in the sequence.
- */
-Blaze.Each = function (argFunc, contentFunc, elseFunc) {
-  var eachView = Blaze.View('each', function () {
-    var subviews = this.initialSubviews;
-    this.initialSubviews = null;
-    if (this._isCreatedForExpansion) {
-      this.expandedValueDep = new Tracker.Dependency;
-      this.expandedValueDep.depend();
-    }
-    return subviews;
-  });
-  eachView.initialSubviews = [];
-  eachView.numItems = 0;
-  eachView.inElseMode = false;
-  eachView.stopHandle = null;
-  eachView.contentFunc = contentFunc;
-  eachView.elseFunc = elseFunc;
-  eachView.argVar = new ReactiveVar;
-  eachView.variableName = null;
-
-  // update the @index value in the scope of all subviews in the range
-  var updateIndices = function (from, to) {
-    if (to === undefined) {
-      to = eachView.numItems - 1;
-    }
-
-    for (var i = from; i <= to; i++) {
-      var view = eachView._domrange.members[i].view;
-      view._scopeBindings['@index'].set(i);
-    }
-  };
-
-  eachView.onViewCreated(function () {
-    // We evaluate argFunc in an autorun to make sure
-    // Blaze.currentView is always set when it runs (rather than
-    // passing argFunc straight to ObserveSequence).
-    eachView.autorun(function () {
-      // argFunc can return either a sequence as is or a wrapper object with a
-      // _sequence and _variable fields set.
-      var arg = argFunc();
-      if (_.isObject(arg) && _.has(arg, '_sequence')) {
-        eachView.variableName = arg._variable || null;
-        arg = arg._sequence;
-      }
-
-      eachView.argVar.set(arg);
-    }, eachView.parentView, 'collection');
-
-    eachView.stopHandle = ObserveSequence.observe(function () {
-      return eachView.argVar.get();
-    }, {
-      addedAt: function (id, item, index) {
-        Tracker.nonreactive(function () {
-          var newItemView;
-          if (eachView.variableName) {
-            // new-style #each (as in {{#each item in items}})
-            // doesn't create a new data context
-            newItemView = Blaze.View('item', eachView.contentFunc);
-          } else {
-            newItemView = Blaze.With(item, eachView.contentFunc);
-          }
-
-          eachView.numItems++;
-
-          var bindings = {};
-          bindings['@index'] = index;
-          if (eachView.variableName) {
-            bindings[eachView.variableName] = item;
-          }
-          Blaze._attachBindingsToView(bindings, newItemView);
-
-          if (eachView.expandedValueDep) {
-            eachView.expandedValueDep.changed();
-          } else if (eachView._domrange) {
-            if (eachView.inElseMode) {
-              eachView._domrange.removeMember(0);
-              eachView.inElseMode = false;
-            }
-
-            var range = Blaze._materializeView(newItemView, eachView);
-            eachView._domrange.addMember(range, index);
-            updateIndices(index);
-          } else {
-            eachView.initialSubviews.splice(index, 0, newItemView);
-          }
-        });
-      },
-      removedAt: function (id, item, index) {
-        Tracker.nonreactive(function () {
-          eachView.numItems--;
-          if (eachView.expandedValueDep) {
-            eachView.expandedValueDep.changed();
-          } else if (eachView._domrange) {
-            eachView._domrange.removeMember(index);
-            updateIndices(index);
-            if (eachView.elseFunc && eachView.numItems === 0) {
-              eachView.inElseMode = true;
-              eachView._domrange.addMember(
-                Blaze._materializeView(
-                  Blaze.View('each_else',eachView.elseFunc),
-                  eachView), 0);
-            }
-          } else {
-            eachView.initialSubviews.splice(index, 1);
-          }
-        });
-      },
-      changedAt: function (id, newItem, oldItem, index) {
-        Tracker.nonreactive(function () {
-          if (eachView.expandedValueDep) {
-            eachView.expandedValueDep.changed();
-          } else {
-            var itemView;
-            if (eachView._domrange) {
-              itemView = eachView._domrange.getMember(index).view;
-            } else {
-              itemView = eachView.initialSubviews[index];
-            }
-            if (eachView.variableName) {
-              itemView._scopeBindings[eachView.variableName].set(newItem);
-            } else {
-              itemView.dataVar.set(newItem);
-            }
-          }
-        });
-      },
-      movedTo: function (id, item, fromIndex, toIndex) {
-        Tracker.nonreactive(function () {
-          if (eachView.expandedValueDep) {
-            eachView.expandedValueDep.changed();
-          } else if (eachView._domrange) {
-            eachView._domrange.moveMember(fromIndex, toIndex);
-            updateIndices(
-              Math.min(fromIndex, toIndex), Math.max(fromIndex, toIndex));
-          } else {
-            var subviews = eachView.initialSubviews;
-            var itemView = subviews[fromIndex];
-            subviews.splice(fromIndex, 1);
-            subviews.splice(toIndex, 0, itemView);
-          }
-        });
-      }
-    });
-
-    if (eachView.elseFunc && eachView.numItems === 0) {
-      eachView.inElseMode = true;
-      eachView.initialSubviews[0] =
-        Blaze.View('each_else', eachView.elseFunc);
-    }
-  });
-
-  eachView.onViewDestroyed(function () {
-    if (eachView.stopHandle)
-      eachView.stopHandle.stop();
-  });
-
-  return eachView;
-};
-
-Blaze._TemplateWith = function (arg, contentFunc) {
-  var w;
-
-  var argFunc = arg;
-  if (typeof arg !== 'function') {
-    argFunc = function () {
-      return arg;
-    };
-  }
-
-  // This is a little messy.  When we compile `{{> Template.contentBlock}}`, we
-  // wrap it in Blaze._InOuterTemplateScope in order to skip the intermediate
-  // parent Views in the current template.  However, when there's an argument
-  // (`{{> Template.contentBlock arg}}`), the argument needs to be evaluated
-  // in the original scope.  There's no good order to nest
-  // Blaze._InOuterTemplateScope and Spacebars.TemplateWith to achieve this,
-  // so we wrap argFunc to run it in the "original parentView" of the
-  // Blaze._InOuterTemplateScope.
-  //
-  // To make this better, reconsider _InOuterTemplateScope as a primitive.
-  // Longer term, evaluate expressions in the proper lexical scope.
-  var wrappedArgFunc = function () {
-    var viewToEvaluateArg = null;
-    if (w.parentView && w.parentView.name === 'InOuterTemplateScope') {
-      viewToEvaluateArg = w.parentView.originalParentView;
-    }
-    if (viewToEvaluateArg) {
-      return Blaze._withCurrentView(viewToEvaluateArg, argFunc);
-    } else {
-      return argFunc();
-    }
-  };
-
-  var wrappedContentFunc = function () {
-    var content = contentFunc.call(this);
-
-    // Since we are generating the Blaze._TemplateWith view for the
-    // user, set the flag on the child view.  If `content` is a template,
-    // construct the View so that we can set the flag.
-    if (content instanceof Blaze.Template) {
-      content = content.constructView();
-    }
-    if (content instanceof Blaze.View) {
-      content._hasGeneratedParent = true;
-    }
-
-    return content;
-  };
-
-  w = Blaze.With(wrappedArgFunc, wrappedContentFunc);
-  w.__isTemplateWith = true;
-  return w;
-};
-
-Blaze._InOuterTemplateScope = function (templateView, contentFunc) {
-  var view = Blaze.View('InOuterTemplateScope', contentFunc);
-  var parentView = templateView.parentView;
-
-  // Hack so that if you call `{{> foo bar}}` and it expands into
-  // `{{#with bar}}{{> foo}}{{/with}}`, and then `foo` is a template
-  // that inserts `{{> Template.contentBlock}}`, the data context for
-  // `Template.contentBlock` is not `bar` but the one enclosing that.
-  if (parentView.__isTemplateWith)
-    parentView = parentView.parentView;
-
-  view.onViewCreated(function () {
-    this.originalParentView = this.parentView;
-    this.parentView = parentView;
-    this.__childDoesntStartNewLexicalScope = true;
-  });
-  return view;
-};
-
-// XXX COMPAT WITH 0.9.0
-Blaze.InOuterTemplateScope = Blaze._InOuterTemplateScope;
diff --git a/packages/blaze/dombackend.js b/packages/blaze/dombackend.js
deleted file mode 100644
index 361e37ae5e..0000000000
--- a/packages/blaze/dombackend.js
+++ /dev/null
@@ -1,179 +0,0 @@
-var DOMBackend = {};
-Blaze._DOMBackend = DOMBackend;
-
-var $jq = (typeof jQuery !== 'undefined' ? jQuery :
-           (typeof Package !== 'undefined' ?
-            Package.jquery && Package.jquery.jQuery : null));
-if (! $jq)
-  throw new Error("jQuery not found");
-
-DOMBackend._$jq = $jq;
-
-DOMBackend.parseHTML = function (html) {
-  // Return an array of nodes.
-  //
-  // jQuery does fancy stuff like creating an appropriate
-  // container element and setting innerHTML on it, as well
-  // as working around various IE quirks.
-  return $jq.parseHTML(html) || [];
-};
-
-DOMBackend.Events = {
-  // `selector` is non-null.  `type` is one type (but
-  // may be in backend-specific form, e.g. have namespaces).
-  // Order fired must be order bound.
-  delegateEvents: function (elem, type, selector, handler) {
-    $jq(elem).on(type, selector, handler);
-  },
-
-  undelegateEvents: function (elem, type, handler) {
-    $jq(elem).off(type, '**', handler);
-  },
-
-  bindEventCapturer: function (elem, type, selector, handler) {
-    var $elem = $jq(elem);
-
-    var wrapper = function (event) {
-      event = $jq.event.fix(event);
-      event.currentTarget = event.target;
-
-      // Note: It might improve jQuery interop if we called into jQuery
-      // here somehow.  Since we don't use jQuery to dispatch the event,
-      // we don't fire any of jQuery's event hooks or anything.  However,
-      // since jQuery can't bind capturing handlers, it's not clear
-      // where we would hook in.  Internal jQuery functions like `dispatch`
-      // are too high-level.
-      var $target = $jq(event.currentTarget);
-      if ($target.is($elem.find(selector)))
-        handler.call(elem, event);
-    };
-
-    handler._meteorui_wrapper = wrapper;
-
-    type = DOMBackend.Events.parseEventType(type);
-    // add *capturing* event listener
-    elem.addEventListener(type, wrapper, true);
-  },
-
-  unbindEventCapturer: function (elem, type, handler) {
-    type = DOMBackend.Events.parseEventType(type);
-    elem.removeEventListener(type, handler._meteorui_wrapper, true);
-  },
-
-  parseEventType: function (type) {
-    // strip off namespaces
-    var dotLoc = type.indexOf('.');
-    if (dotLoc >= 0)
-      return type.slice(0, dotLoc);
-    return type;
-  }
-};
-
-
-///// Removal detection and interoperability.
-
-// For an explanation of this technique, see:
-// http://bugs.jquery.com/ticket/12213#comment:23 .
-//
-// In short, an element is considered "removed" when jQuery
-// cleans up its *private* userdata on the element,
-// which we can detect using a custom event with a teardown
-// hook.
-
-var NOOP = function () {};
-
-// Circular doubly-linked list
-var TeardownCallback = function (func) {
-  this.next = this;
-  this.prev = this;
-  this.func = func;
-};
-
-// Insert newElt before oldElt in the circular list
-TeardownCallback.prototype.linkBefore = function(oldElt) {
-  this.prev = oldElt.prev;
-  this.next = oldElt;
-  oldElt.prev.next = this;
-  oldElt.prev = this;
-};
-
-TeardownCallback.prototype.unlink = function () {
-  this.prev.next = this.next;
-  this.next.prev = this.prev;
-};
-
-TeardownCallback.prototype.go = function () {
-  var func = this.func;
-  func && func();
-};
-
-TeardownCallback.prototype.stop = TeardownCallback.prototype.unlink;
-
-DOMBackend.Teardown = {
-  _JQUERY_EVENT_NAME: 'blaze_teardown_watcher',
-  _CB_PROP: '$blaze_teardown_callbacks',
-  // Registers a callback function to be called when the given element or
-  // one of its ancestors is removed from the DOM via the backend library.
-  // The callback function is called at most once, and it receives the element
-  // in question as an argument.
-  onElementTeardown: function (elem, func) {
-    var elt = new TeardownCallback(func);
-
-    var propName = DOMBackend.Teardown._CB_PROP;
-    if (! elem[propName]) {
-      // create an empty node that is never unlinked
-      elem[propName] = new TeardownCallback;
-
-      // Set up the event, only the first time.
-      $jq(elem).on(DOMBackend.Teardown._JQUERY_EVENT_NAME, NOOP);
-    }
-
-    elt.linkBefore(elem[propName]);
-
-    return elt; // so caller can call stop()
-  },
-  // Recursively call all teardown hooks, in the backend and registered
-  // through DOMBackend.onElementTeardown.
-  tearDownElement: function (elem) {
-    var elems = [];
-    // Array.prototype.slice.call doesn't work when given a NodeList in
-    // IE8 ("JScript object expected").
-    var nodeList = elem.getElementsByTagName('*');
-    for (var i = 0; i < nodeList.length; i++) {
-      elems.push(nodeList[i]);
-    }
-    elems.push(elem);
-    $jq.cleanData(elems);
-  }
-};
-
-$jq.event.special[DOMBackend.Teardown._JQUERY_EVENT_NAME] = {
-  setup: function () {
-    // This "setup" callback is important even though it is empty!
-    // Without it, jQuery will call addEventListener, which is a
-    // performance hit, especially with Chrome's async stack trace
-    // feature enabled.
-  },
-  teardown: function() {
-    var elem = this;
-    var callbacks = elem[DOMBackend.Teardown._CB_PROP];
-    if (callbacks) {
-      var elt = callbacks.next;
-      while (elt !== callbacks) {
-        elt.go();
-        elt = elt.next;
-      }
-      callbacks.go();
-
-      elem[DOMBackend.Teardown._CB_PROP] = null;
-    }
-  }
-};
-
-
-// Must use jQuery semantics for `context`, not
-// querySelectorAll's.  In other words, all the parts
-// of `selector` must be found under `context`.
-DOMBackend.findBySelector = function (selector, context) {
-  return $jq(selector, context);
-};
diff --git a/packages/blaze/domrange.js b/packages/blaze/domrange.js
deleted file mode 100644
index ca39ac459c..0000000000
--- a/packages/blaze/domrange.js
+++ /dev/null
@@ -1,485 +0,0 @@
-
-// A constant empty array (frozen if the JS engine supports it).
-var _emptyArray = Object.freeze ? Object.freeze([]) : [];
-
-// `[new] Blaze._DOMRange([nodeAndRangeArray])`
-//
-// A DOMRange consists of an array of consecutive nodes and DOMRanges,
-// which may be replaced at any time with a new array.  If the DOMRange
-// has been attached to the DOM at some location, then updating
-// the array will cause the DOM to be updated at that location.
-Blaze._DOMRange = function (nodeAndRangeArray) {
-  if (! (this instanceof DOMRange))
-    // called without `new`
-    return new DOMRange(nodeAndRangeArray);
-
-  var members = (nodeAndRangeArray || _emptyArray);
-  if (! (members && (typeof members.length) === 'number'))
-    throw new Error("Expected array");
-
-  for (var i = 0; i < members.length; i++)
-    this._memberIn(members[i]);
-
-  this.members = members;
-  this.emptyRangePlaceholder = null;
-  this.attached = false;
-  this.parentElement = null;
-  this.parentRange = null;
-  this.attachedCallbacks = _emptyArray;
-};
-var DOMRange = Blaze._DOMRange;
-
-// In IE 8, don't use empty text nodes as placeholders
-// in empty DOMRanges, use comment nodes instead.  Using
-// empty text nodes in modern browsers is great because
-// it doesn't clutter the web inspector.  In IE 8, however,
-// it seems to lead in some roundabout way to the OAuth
-// pop-up crashing the browser completely.  In the past,
-// we didn't use empty text nodes on IE 8 because they
-// don't accept JS properties, so just use the same logic
-// even though we don't need to set properties on the
-// placeholder anymore.
-DOMRange._USE_COMMENT_PLACEHOLDERS = (function () {
-  var result = false;
-  var textNode = document.createTextNode("");
-  try {
-    textNode.someProp = true;
-  } catch (e) {
-    // IE 8
-    result = true;
-  }
-  return result;
-})();
-
-// static methods
-DOMRange._insert = function (rangeOrNode, parentElement, nextNode, _isMove) {
-  var m = rangeOrNode;
-  if (m instanceof DOMRange) {
-    m.attach(parentElement, nextNode, _isMove);
-  } else {
-    if (_isMove)
-      DOMRange._moveNodeWithHooks(m, parentElement, nextNode);
-    else
-      DOMRange._insertNodeWithHooks(m, parentElement, nextNode);
-  }
-};
-
-DOMRange._remove = function (rangeOrNode) {
-  var m = rangeOrNode;
-  if (m instanceof DOMRange) {
-    m.detach();
-  } else {
-    DOMRange._removeNodeWithHooks(m);
-  }
-};
-
-DOMRange._removeNodeWithHooks = function (n) {
-  if (! n.parentNode)
-    return;
-  if (n.nodeType === 1 &&
-      n.parentNode._uihooks && n.parentNode._uihooks.removeElement) {
-    n.parentNode._uihooks.removeElement(n);
-  } else {
-    n.parentNode.removeChild(n);
-  }
-};
-
-DOMRange._insertNodeWithHooks = function (n, parent, next) {
-  // `|| null` because IE throws an error if 'next' is undefined
-  next = next || null;
-  if (n.nodeType === 1 &&
-      parent._uihooks && parent._uihooks.insertElement) {
-    parent._uihooks.insertElement(n, next);
-  } else {
-    parent.insertBefore(n, next);
-  }
-};
-
-DOMRange._moveNodeWithHooks = function (n, parent, next) {
-  if (n.parentNode !== parent)
-    return;
-  // `|| null` because IE throws an error if 'next' is undefined
-  next = next || null;
-  if (n.nodeType === 1 &&
-      parent._uihooks && parent._uihooks.moveElement) {
-    parent._uihooks.moveElement(n, next);
-  } else {
-    parent.insertBefore(n, next);
-  }
-};
-
-DOMRange.forElement = function (elem) {
-  if (elem.nodeType !== 1)
-    throw new Error("Expected element, found: " + elem);
-  var range = null;
-  while (elem && ! range) {
-    range = (elem.$blaze_range || null);
-    if (! range)
-      elem = elem.parentNode;
-  }
-  return range;
-};
-
-DOMRange.prototype.attach = function (parentElement, nextNode, _isMove, _isReplace) {
-  // This method is called to insert the DOMRange into the DOM for
-  // the first time, but it's also used internally when
-  // updating the DOM.
-  //
-  // If _isMove is true, move this attached range to a different
-  // location under the same parentElement.
-  if (_isMove || _isReplace) {
-    if (! (this.parentElement === parentElement &&
-           this.attached))
-      throw new Error("Can only move or replace an attached DOMRange, and only under the same parent element");
-  }
-
-  var members = this.members;
-  if (members.length) {
-    this.emptyRangePlaceholder = null;
-    for (var i = 0; i < members.length; i++) {
-      DOMRange._insert(members[i], parentElement, nextNode, _isMove);
-    }
-  } else {
-    var placeholder = (
-      DOMRange._USE_COMMENT_PLACEHOLDERS ?
-        document.createComment("") :
-        document.createTextNode(""));
-    this.emptyRangePlaceholder = placeholder;
-    parentElement.insertBefore(placeholder, nextNode || null);
-  }
-  this.attached = true;
-  this.parentElement = parentElement;
-
-  if (! (_isMove || _isReplace)) {
-    for(var i = 0; i < this.attachedCallbacks.length; i++) {
-      var obj = this.attachedCallbacks[i];
-      obj.attached && obj.attached(this, parentElement);
-    }
-  }
-};
-
-DOMRange.prototype.setMembers = function (newNodeAndRangeArray) {
-  var newMembers = newNodeAndRangeArray;
-  if (! (newMembers && (typeof newMembers.length) === 'number'))
-    throw new Error("Expected array");
-
-  var oldMembers = this.members;
-
-  for (var i = 0; i < oldMembers.length; i++)
-    this._memberOut(oldMembers[i]);
-  for (var i = 0; i < newMembers.length; i++)
-    this._memberIn(newMembers[i]);
-
-  if (! this.attached) {
-    this.members = newMembers;
-  } else {
-    // don't do anything if we're going from empty to empty
-    if (newMembers.length || oldMembers.length) {
-      // detach the old members and insert the new members
-      var nextNode = this.lastNode().nextSibling;
-      var parentElement = this.parentElement;
-      // Use detach/attach, but don't fire attached/detached hooks
-      this.detach(true /*_isReplace*/);
-      this.members = newMembers;
-      this.attach(parentElement, nextNode, false, true /*_isReplace*/);
-    }
-  }
-};
-
-DOMRange.prototype.firstNode = function () {
-  if (! this.attached)
-    throw new Error("Must be attached");
-
-  if (! this.members.length)
-    return this.emptyRangePlaceholder;
-
-  var m = this.members[0];
-  return (m instanceof DOMRange) ? m.firstNode() : m;
-};
-
-DOMRange.prototype.lastNode = function () {
-  if (! this.attached)
-    throw new Error("Must be attached");
-
-  if (! this.members.length)
-    return this.emptyRangePlaceholder;
-
-  var m = this.members[this.members.length - 1];
-  return (m instanceof DOMRange) ? m.lastNode() : m;
-};
-
-DOMRange.prototype.detach = function (_isReplace) {
-  if (! this.attached)
-    throw new Error("Must be attached");
-
-  var oldParentElement = this.parentElement;
-  var members = this.members;
-  if (members.length) {
-    for (var i = 0; i < members.length; i++) {
-      DOMRange._remove(members[i]);
-    }
-  } else {
-    var placeholder = this.emptyRangePlaceholder;
-    this.parentElement.removeChild(placeholder);
-    this.emptyRangePlaceholder = null;
-  }
-
-  if (! _isReplace) {
-    this.attached = false;
-    this.parentElement = null;
-
-    for(var i = 0; i < this.attachedCallbacks.length; i++) {
-      var obj = this.attachedCallbacks[i];
-      obj.detached && obj.detached(this, oldParentElement);
-    }
-  }
-};
-
-DOMRange.prototype.addMember = function (newMember, atIndex, _isMove) {
-  var members = this.members;
-  if (! (atIndex >= 0 && atIndex <= members.length))
-    throw new Error("Bad index in range.addMember: " + atIndex);
-
-  if (! _isMove)
-    this._memberIn(newMember);
-
-  if (! this.attached) {
-    // currently detached; just updated members
-    members.splice(atIndex, 0, newMember);
-  } else if (members.length === 0) {
-    // empty; use the empty-to-nonempty handling of setMembers
-    this.setMembers([newMember]);
-  } else {
-    var nextNode;
-    if (atIndex === members.length) {
-      // insert at end
-      nextNode = this.lastNode().nextSibling;
-    } else {
-      var m = members[atIndex];
-      nextNode = (m instanceof DOMRange) ? m.firstNode() : m;
-    }
-    members.splice(atIndex, 0, newMember);
-    DOMRange._insert(newMember, this.parentElement, nextNode, _isMove);
-  }
-};
-
-DOMRange.prototype.removeMember = function (atIndex, _isMove) {
-  var members = this.members;
-  if (! (atIndex >= 0 && atIndex < members.length))
-    throw new Error("Bad index in range.removeMember: " + atIndex);
-
-  if (_isMove) {
-    members.splice(atIndex, 1);
-  } else {
-    var oldMember = members[atIndex];
-    this._memberOut(oldMember);
-
-    if (members.length === 1) {
-      // becoming empty; use the logic in setMembers
-      this.setMembers(_emptyArray);
-    } else {
-      members.splice(atIndex, 1);
-      if (this.attached)
-        DOMRange._remove(oldMember);
-    }
-  }
-};
-
-DOMRange.prototype.moveMember = function (oldIndex, newIndex) {
-  var member = this.members[oldIndex];
-  this.removeMember(oldIndex, true /*_isMove*/);
-  this.addMember(member, newIndex, true /*_isMove*/);
-};
-
-DOMRange.prototype.getMember = function (atIndex) {
-  var members = this.members;
-  if (! (atIndex >= 0 && atIndex < members.length))
-    throw new Error("Bad index in range.getMember: " + atIndex);
-  return this.members[atIndex];
-};
-
-DOMRange.prototype._memberIn = function (m) {
-  if (m instanceof DOMRange)
-    m.parentRange = this;
-  else if (m.nodeType === 1) // DOM Element
-    m.$blaze_range = this;
-};
-
-DOMRange._destroy = function (m, _skipNodes) {
-  if (m instanceof DOMRange) {
-    if (m.view)
-      Blaze._destroyView(m.view, _skipNodes);
-  } else if ((! _skipNodes) && m.nodeType === 1) {
-    // DOM Element
-    if (m.$blaze_range) {
-      Blaze._destroyNode(m);
-      m.$blaze_range = null;
-    }
-  }
-};
-
-DOMRange.prototype._memberOut = DOMRange._destroy;
-
-// Tear down, but don't remove, the members.  Used when chunks
-// of DOM are being torn down or replaced.
-DOMRange.prototype.destroyMembers = function (_skipNodes) {
-  var members = this.members;
-  for (var i = 0; i < members.length; i++)
-    this._memberOut(members[i], _skipNodes);
-};
-
-DOMRange.prototype.destroy = function (_skipNodes) {
-  DOMRange._destroy(this, _skipNodes);
-};
-
-DOMRange.prototype.containsElement = function (elem) {
-  if (! this.attached)
-    throw new Error("Must be attached");
-
-  // An element is contained in this DOMRange if it's possible to
-  // reach it by walking parent pointers, first through the DOM and
-  // then parentRange pointers.  In other words, the element or some
-  // ancestor of it is at our level of the DOM (a child of our
-  // parentElement), and this element is one of our members or
-  // is a member of a descendant Range.
-
-  // First check that elem is a descendant of this.parentElement,
-  // according to the DOM.
-  if (! Blaze._elementContains(this.parentElement, elem))
-    return false;
-
-  // If elem is not an immediate child of this.parentElement,
-  // walk up to its ancestor that is.
-  while (elem.parentNode !== this.parentElement)
-    elem = elem.parentNode;
-
-  var range = elem.$blaze_range;
-  while (range && range !== this)
-    range = range.parentRange;
-
-  return range === this;
-};
-
-DOMRange.prototype.containsRange = function (range) {
-  if (! this.attached)
-    throw new Error("Must be attached");
-
-  if (! range.attached)
-    return false;
-
-  // A DOMRange is contained in this DOMRange if it's possible
-  // to reach this range by following parent pointers.  If the
-  // DOMRange has the same parentElement, then it should be
-  // a member, or a member of a member etc.  Otherwise, we must
-  // contain its parentElement.
-
-  if (range.parentElement !== this.parentElement)
-    return this.containsElement(range.parentElement);
-
-  if (range === this)
-    return false; // don't contain self
-
-  while (range && range !== this)
-    range = range.parentRange;
-
-  return range === this;
-};
-
-DOMRange.prototype.onAttached = function (attached) {
-  this.onAttachedDetached({ attached: attached });
-};
-
-// callbacks are `attached(range, element)` and
-// `detached(range, element)`, and they may
-// access the `callbacks` object in `this`.
-// The arguments to `detached` are the same
-// range and element that were passed to `attached`.
-DOMRange.prototype.onAttachedDetached = function (callbacks) {
-  if (this.attachedCallbacks === _emptyArray)
-    this.attachedCallbacks = [];
-  this.attachedCallbacks.push(callbacks);
-};
-
-DOMRange.prototype.$ = function (selector) {
-  var self = this;
-
-  var parentNode = this.parentElement;
-  if (! parentNode)
-    throw new Error("Can't select in removed DomRange");
-
-  // Strategy: Find all selector matches under parentNode,
-  // then filter out the ones that aren't in this DomRange
-  // using `DOMRange#containsElement`.  This is
-  // asymptotically slow in the presence of O(N) sibling
-  // content that is under parentNode but not in our range,
-  // so if performance is an issue, the selector should be
-  // run on a child element.
-
-  // Since jQuery can't run selectors on a DocumentFragment,
-  // we don't expect findBySelector to work.
-  if (parentNode.nodeType === 11 /* DocumentFragment */)
-    throw new Error("Can't use $ on an offscreen range");
-
-  var results = Blaze._DOMBackend.findBySelector(selector, parentNode);
-
-  // We don't assume `results` has jQuery API; a plain array
-  // should do just as well.  However, if we do have a jQuery
-  // array, we want to end up with one also, so we use
-  // `.filter`.
-
-  // Function that selects only elements that are actually
-  // in this DomRange, rather than simply descending from
-  // `parentNode`.
-  var filterFunc = function (elem) {
-    // handle jQuery's arguments to filter, where the node
-    // is in `this` and the index is the first argument.
-    if (typeof elem === 'number')
-      elem = this;
-
-    return self.containsElement(elem);
-  };
-
-  if (! results.filter) {
-    // not a jQuery array, and not a browser with
-    // Array.prototype.filter (e.g. IE <9)
-    var newResults = [];
-    for (var i = 0; i < results.length; i++) {
-      var x = results[i];
-      if (filterFunc(x))
-        newResults.push(x);
-    }
-    results = newResults;
-  } else {
-    // `results.filter` is either jQuery's or ECMAScript's `filter`
-    results = results.filter(filterFunc);
-  }
-
-  return results;
-};
-
-// Returns true if element a contains node b and is not node b.
-//
-// The restriction that `a` be an element (not a document fragment,
-// say) is based on what's easy to implement cross-browser.
-Blaze._elementContains = function (a, b) {
-  if (a.nodeType !== 1) // ELEMENT
-    return false;
-  if (a === b)
-    return false;
-
-  if (a.compareDocumentPosition) {
-    return a.compareDocumentPosition(b) & 0x10;
-  } else {
-    // Should be only old IE and maybe other old browsers here.
-    // Modern Safari has both functions but seems to get contains() wrong.
-    // IE can't handle b being a text node.  We work around this
-    // by doing a direct parent test now.
-    b = b.parentNode;
-    if (! (b && b.nodeType === 1)) // ELEMENT
-      return false;
-    if (a === b)
-      return true;
-
-    return a.contains(b);
-  }
-};
diff --git a/packages/blaze/events.js b/packages/blaze/events.js
deleted file mode 100644
index 7b9faf10a1..0000000000
--- a/packages/blaze/events.js
+++ /dev/null
@@ -1,204 +0,0 @@
-var EventSupport = Blaze._EventSupport = {};
-
-var DOMBackend = Blaze._DOMBackend;
-
-// List of events to always delegate, never capture.
-// Since jQuery fakes bubbling for certain events in
-// certain browsers (like `submit`), we don't want to
-// get in its way.
-//
-// We could list all known bubbling
-// events here to avoid creating speculative capturers
-// for them, but it would only be an optimization.
-var eventsToDelegate = EventSupport.eventsToDelegate = {
-  blur: 1, change: 1, click: 1, focus: 1, focusin: 1,
-  focusout: 1, reset: 1, submit: 1
-};
-
-var EVENT_MODE = EventSupport.EVENT_MODE = {
-  TBD: 0,
-  BUBBLING: 1,
-  CAPTURING: 2
-};
-
-var NEXT_HANDLERREC_ID = 1;
-
-var HandlerRec = function (elem, type, selector, handler, recipient) {
-  this.elem = elem;
-  this.type = type;
-  this.selector = selector;
-  this.handler = handler;
-  this.recipient = recipient;
-  this.id = (NEXT_HANDLERREC_ID++);
-
-  this.mode = EVENT_MODE.TBD;
-
-  // It's important that delegatedHandler be a different
-  // instance for each handlerRecord, because its identity
-  // is used to remove it.
-  //
-  // It's also important that the closure have access to
-  // `this` when it is not called with it set.
-  this.delegatedHandler = (function (h) {
-    return function (evt) {
-      if ((! h.selector) && evt.currentTarget !== evt.target)
-        // no selector means only fire on target
-        return;
-      return h.handler.apply(h.recipient, arguments);
-    };
-  })(this);
-
-  // WHY CAPTURE AND DELEGATE: jQuery can't delegate
-  // non-bubbling events, because
-  // event capture doesn't work in IE 8.  However, there
-  // are all sorts of new-fangled non-bubbling events
-  // like "play" and "touchenter".  We delegate these
-  // events using capture in all browsers except IE 8.
-  // IE 8 doesn't support these events anyway.
-
-  var tryCapturing = elem.addEventListener &&
-        (! _.has(eventsToDelegate,
-                 DOMBackend.Events.parseEventType(type)));
-
-  if (tryCapturing) {
-    this.capturingHandler = (function (h) {
-      return function (evt) {
-        if (h.mode === EVENT_MODE.TBD) {
-          // must be first time we're called.
-          if (evt.bubbles) {
-            // this type of event bubbles, so don't
-            // get called again.
-            h.mode = EVENT_MODE.BUBBLING;
-            DOMBackend.Events.unbindEventCapturer(
-              h.elem, h.type, h.capturingHandler);
-            return;
-          } else {
-            // this type of event doesn't bubble,
-            // so unbind the delegation, preventing
-            // it from ever firing.
-            h.mode = EVENT_MODE.CAPTURING;
-            DOMBackend.Events.undelegateEvents(
-              h.elem, h.type, h.delegatedHandler);
-          }
-        }
-
-        h.delegatedHandler(evt);
-      };
-    })(this);
-
-  } else {
-    this.mode = EVENT_MODE.BUBBLING;
-  }
-};
-EventSupport.HandlerRec = HandlerRec;
-
-HandlerRec.prototype.bind = function () {
-  // `this.mode` may be EVENT_MODE_TBD, in which case we bind both. in
-  // this case, 'capturingHandler' is in charge of detecting the
-  // correct mode and turning off one or the other handlers.
-  if (this.mode !== EVENT_MODE.BUBBLING) {
-    DOMBackend.Events.bindEventCapturer(
-      this.elem, this.type, this.selector || '*',
-      this.capturingHandler);
-  }
-
-  if (this.mode !== EVENT_MODE.CAPTURING)
-    DOMBackend.Events.delegateEvents(
-      this.elem, this.type,
-      this.selector || '*', this.delegatedHandler);
-};
-
-HandlerRec.prototype.unbind = function () {
-  if (this.mode !== EVENT_MODE.BUBBLING)
-    DOMBackend.Events.unbindEventCapturer(this.elem, this.type,
-                                          this.capturingHandler);
-
-  if (this.mode !== EVENT_MODE.CAPTURING)
-    DOMBackend.Events.undelegateEvents(this.elem, this.type,
-                                       this.delegatedHandler);
-};
-
-EventSupport.listen = function (element, events, selector, handler, recipient, getParentRecipient) {
-
-  // Prevent this method from being JITed by Safari.  Due to a
-  // presumed JIT bug in Safari -- observed in Version 7.0.6
-  // (9537.78.2) -- this method may crash the Safari render process if
-  // it is JITed.
-  // Repro: https://github.com/dgreensp/public/tree/master/safari-crash
-  try { element = element; } finally {}
-
-  var eventTypes = [];
-  events.replace(/[^ /]+/g, function (e) {
-    eventTypes.push(e);
-  });
-
-  var newHandlerRecs = [];
-  for (var i = 0, N = eventTypes.length; i < N; i++) {
-    var type = eventTypes[i];
-
-    var eventDict = element.$blaze_events;
-    if (! eventDict)
-      eventDict = (element.$blaze_events = {});
-
-    var info = eventDict[type];
-    if (! info) {
-      info = eventDict[type] = {};
-      info.handlers = [];
-    }
-    var handlerList = info.handlers;
-    var handlerRec = new HandlerRec(
-      element, type, selector, handler, recipient);
-    newHandlerRecs.push(handlerRec);
-    handlerRec.bind();
-    handlerList.push(handlerRec);
-    // Move handlers of enclosing ranges to end, by unbinding and rebinding
-    // them.  In jQuery (or other DOMBackend) this causes them to fire
-    // later when the backend dispatches event handlers.
-    if (getParentRecipient) {
-      for (var r = getParentRecipient(recipient); r;
-           r = getParentRecipient(r)) {
-        // r is an enclosing range (recipient)
-        for (var j = 0, Nj = handlerList.length;
-             j < Nj; j++) {
-          var h = handlerList[j];
-          if (h.recipient === r) {
-            h.unbind();
-            h.bind();
-            handlerList.splice(j, 1); // remove handlerList[j]
-            handlerList.push(h);
-            j--; // account for removed handler
-            Nj--; // don't visit appended handlers
-          }
-        }
-      }
-    }
-  }
-
-  return {
-    // closes over just `element` and `newHandlerRecs`
-    stop: function () {
-      var eventDict = element.$blaze_events;
-      if (! eventDict)
-        return;
-      // newHandlerRecs has only one item unless you specify multiple
-      // event types.  If this code is slow, it's because we have to
-      // iterate over handlerList here.  Clearing a whole handlerList
-      // via stop() methods is O(N^2) in the number of handlers on
-      // an element.
-      for (var i = 0; i < newHandlerRecs.length; i++) {
-        var handlerToRemove = newHandlerRecs[i];
-        var info = eventDict[handlerToRemove.type];
-        if (! info)
-          continue;
-        var handlerList = info.handlers;
-        for (var j = handlerList.length - 1; j >= 0; j--) {
-          if (handlerList[j] === handlerToRemove) {
-            handlerToRemove.unbind();
-            handlerList.splice(j, 1); // remove handlerList[j]
-          }
-        }
-      }
-      newHandlerRecs.length = 0;
-    }
-  };
-};
diff --git a/packages/blaze/exceptions.js b/packages/blaze/exceptions.js
deleted file mode 100644
index 429ac82f73..0000000000
--- a/packages/blaze/exceptions.js
+++ /dev/null
@@ -1,56 +0,0 @@
-var debugFunc;
-
-// We call into user code in many places, and it's nice to catch exceptions
-// propagated from user code immediately so that the whole system doesn't just
-// break.  Catching exceptions is easy; reporting them is hard.  This helper
-// reports exceptions.
-//
-// Usage:
-//
-// ```
-// try {
-//   // ... someStuff ...
-// } catch (e) {
-//   reportUIException(e);
-// }
-// ```
-//
-// An optional second argument overrides the default message.
-
-// Set this to `true` to cause `reportException` to throw
-// the next exception rather than reporting it.  This is
-// useful in unit tests that test error messages.
-Blaze._throwNextException = false;
-
-Blaze._reportException = function (e, msg) {
-  if (Blaze._throwNextException) {
-    Blaze._throwNextException = false;
-    throw e;
-  }
-
-  if (! debugFunc)
-    // adapted from Tracker
-    debugFunc = function () {
-      return (typeof Meteor !== "undefined" ? Meteor._debug :
-              ((typeof console !== "undefined") && console.log ? console.log :
-               function () {}));
-    };
-
-  // In Chrome, `e.stack` is a multiline string that starts with the message
-  // and contains a stack trace.  Furthermore, `console.log` makes it clickable.
-  // `console.log` supplies the space between the two arguments.
-  debugFunc()(msg || 'Exception caught in template:', e.stack || e.message || e);
-};
-
-Blaze._wrapCatchingExceptions = function (f, where) {
-  if (typeof f !== 'function')
-    return f;
-
-  return function () {
-    try {
-      return f.apply(this, arguments);
-    } catch (e) {
-      Blaze._reportException(e, 'Exception in ' + where + ':');
-    }
-  };
-};
diff --git a/packages/blaze/lookup.js b/packages/blaze/lookup.js
deleted file mode 100644
index 932b82054d..0000000000
--- a/packages/blaze/lookup.js
+++ /dev/null
@@ -1,238 +0,0 @@
-Blaze._globalHelpers = {};
-
-// Documented as Template.registerHelper.
-// This definition also provides back-compat for `UI.registerHelper`.
-Blaze.registerHelper = function (name, func) {
-  Blaze._globalHelpers[name] = func;
-};
-
-// Also documented as Template.deregisterHelper
-Blaze.deregisterHelper = function(name) {
-  delete Blaze._globalHelpers[name];
-}
-
-var bindIfIsFunction = function (x, target) {
-  if (typeof x !== 'function')
-    return x;
-  return _.bind(x, target);
-};
-
-// If `x` is a function, binds the value of `this` for that function
-// to the current data context.
-var bindDataContext = function (x) {
-  if (typeof x === 'function') {
-    return function () {
-      var data = Blaze.getData();
-      if (data == null)
-        data = {};
-      return x.apply(data, arguments);
-    };
-  }
-  return x;
-};
-
-Blaze._OLDSTYLE_HELPER = {};
-
-Blaze._getTemplateHelper = function (template, name, tmplInstanceFunc) {
-  // XXX COMPAT WITH 0.9.3
-  var isKnownOldStyleHelper = false;
-
-  if (template.__helpers.has(name)) {
-    var helper = template.__helpers.get(name);
-    if (helper === Blaze._OLDSTYLE_HELPER) {
-      isKnownOldStyleHelper = true;
-    } else if (helper != null) {
-      return wrapHelper(bindDataContext(helper), tmplInstanceFunc);
-    } else {
-      return null;
-    }
-  }
-
-  // old-style helper
-  if (name in template) {
-    // Only warn once per helper
-    if (! isKnownOldStyleHelper) {
-      template.__helpers.set(name, Blaze._OLDSTYLE_HELPER);
-      if (! template._NOWARN_OLDSTYLE_HELPERS) {
-        Blaze._warn('Assigning helper with `' + template.viewName + '.' +
-                    name + ' = ...` is deprecated.  Use `' + template.viewName +
-                    '.helpers(...)` instead.');
-      }
-    }
-    if (template[name] != null) {
-      return wrapHelper(bindDataContext(template[name]), tmplInstanceFunc);
-    }
-  }
-
-  return null;
-};
-
-var wrapHelper = function (f, templateFunc) {
-  if (typeof f !== "function") {
-    return f;
-  }
-
-  return function () {
-    var self = this;
-    var args = arguments;
-
-    return Blaze.Template._withTemplateInstanceFunc(templateFunc, function () {
-      return Blaze._wrapCatchingExceptions(f, 'template helper').apply(self, args);
-    });
-  };
-};
-
-Blaze._lexicalBindingLookup = function (view, name) {
-  var currentView = view;
-  var blockHelpersStack = [];
-
-  // walk up the views stopping at a Spacebars.include or Template view that
-  // doesn't have an InOuterTemplateScope view as a parent
-  do {
-    // skip block helpers views
-    // if we found the binding on the scope, return it
-    if (_.has(currentView._scopeBindings, name)) {
-      var bindingReactiveVar = currentView._scopeBindings[name];
-      return function () {
-        return bindingReactiveVar.get();
-      };
-    }
-  } while (! (currentView.__startsNewLexicalScope &&
-              ! (currentView.parentView &&
-                 currentView.parentView.__childDoesntStartNewLexicalScope))
-           && (currentView = currentView.parentView));
-
-  return null;
-};
-
-// templateInstance argument is provided to be available for possible
-// alternative implementations of this function by 3rd party packages.
-Blaze._getTemplate = function (name, templateInstance) {
-  if ((name in Blaze.Template) && (Blaze.Template[name] instanceof Blaze.Template)) {
-    return Blaze.Template[name];
-  }
-  return null;
-};
-
-Blaze._getGlobalHelper = function (name, templateInstance) {
-  if (Blaze._globalHelpers[name] != null) {
-    return wrapHelper(bindDataContext(Blaze._globalHelpers[name]), templateInstance);
-  }
-  return null;
-};
-
-// Looks up a name, like "foo" or "..", as a helper of the
-// current template; the name of a template; a global helper;
-// or a property of the data context.  Called on the View of
-// a template (i.e. a View with a `.template` property,
-// where the helpers are).  Used for the first name in a
-// "path" in a template tag, like "foo" in `{{foo.bar}}` or
-// ".." in `{{frobulate ../blah}}`.
-//
-// Returns a function, a non-function value, or null.  If
-// a function is found, it is bound appropriately.
-//
-// NOTE: This function must not establish any reactive
-// dependencies itself.  If there is any reactivity in the
-// value, lookup should return a function.
-Blaze.View.prototype.lookup = function (name, _options) {
-  var template = this.template;
-  var lookupTemplate = _options && _options.template;
-  var helper;
-  var binding;
-  var boundTmplInstance;
-  var foundTemplate;
-
-  if (this.templateInstance) {
-    boundTmplInstance = _.bind(this.templateInstance, this);
-  }
-
-  // 0. looking up the parent data context with the special "../" syntax
-  if (/^\./.test(name)) {
-    // starts with a dot. must be a series of dots which maps to an
-    // ancestor of the appropriate height.
-    if (!/^(\.)+$/.test(name))
-      throw new Error("id starting with dot must be a series of dots");
-
-    return Blaze._parentData(name.length - 1, true /*_functionWrapped*/);
-
-  }
-
-  // 1. look up a helper on the current template
-  if (template && ((helper = Blaze._getTemplateHelper(template, name, boundTmplInstance)) != null)) {
-    return helper;
-  }
-
-  // 2. look up a binding by traversing the lexical view hierarchy inside the
-  // current template
-  if (template && (binding = Blaze._lexicalBindingLookup(Blaze.currentView, name)) != null) {
-    return binding;
-  }
-
-  // 3. look up a template by name
-  if (lookupTemplate && ((foundTemplate = Blaze._getTemplate(name, boundTmplInstance)) != null)) {
-    return foundTemplate;
-  }
-
-  // 4. look up a global helper
-  if ((helper = Blaze._getGlobalHelper(name, boundTmplInstance)) != null) {
-    return helper;
-  }
-
-  // 5. look up in a data context
-  return function () {
-    var isCalledAsFunction = (arguments.length > 0);
-    var data = Blaze.getData();
-    var x = data && data[name];
-    if (! x) {
-      if (lookupTemplate) {
-        throw new Error("No such template: " + name);
-      } else if (isCalledAsFunction) {
-        throw new Error("No such function: " + name);
-      } else if (name.charAt(0) === '@' && ((x === null) ||
-                                            (x === undefined))) {
-        // Throw an error if the user tries to use a `@directive`
-        // that doesn't exist.  We don't implement all directives
-        // from Handlebars, so there's a potential for confusion
-        // if we fail silently.  On the other hand, we want to
-        // throw late in case some app or package wants to provide
-        // a missing directive.
-        throw new Error("Unsupported directive: " + name);
-      }
-    }
-    if (! data) {
-      return null;
-    }
-    if (typeof x !== 'function') {
-      if (isCalledAsFunction) {
-        throw new Error("Can't call non-function: " + x);
-      }
-      return x;
-    }
-    return x.apply(data, arguments);
-  };
-};
-
-// Implement Spacebars' {{../..}}.
-// @param height {Number} The number of '..'s
-Blaze._parentData = function (height, _functionWrapped) {
-  // If height is null or undefined, we default to 1, the first parent.
-  if (height == null) {
-    height = 1;
-  }
-  var theWith = Blaze.getView('with');
-  for (var i = 0; (i < height) && theWith; i++) {
-    theWith = Blaze.getView(theWith, 'with');
-  }
-
-  if (! theWith)
-    return null;
-  if (_functionWrapped)
-    return function () { return theWith.dataVar.get(); };
-  return theWith.dataVar.get();
-};
-
-
-Blaze.View.prototype.lookupTemplate = function (name) {
-  return this.lookup(name, {template:true});
-};
diff --git a/packages/blaze/materializer.js b/packages/blaze/materializer.js
deleted file mode 100644
index 4986750e05..0000000000
--- a/packages/blaze/materializer.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Turns HTMLjs into DOM nodes and DOMRanges.
-//
-// - `htmljs`: the value to materialize, which may be any of the htmljs
-//   types (Tag, CharRef, Comment, Raw, array, string, boolean, number,
-//   null, or undefined) or a View or Template (which will be used to
-//   construct a View).
-// - `intoArray`: the array of DOM nodes and DOMRanges to push the output
-//   into (required)
-// - `parentView`: the View we are materializing content for (optional)
-// - `_existingWorkStack`: optional argument, only used for recursive
-//   calls when there is some other _materializeDOM on the call stack.
-//   If _materializeDOM called your function and passed in a workStack,
-//   pass it back when you call _materializeDOM (such as from a workStack
-//   task).
-//
-// Returns `intoArray`, which is especially useful if you pass in `[]`.
-Blaze._materializeDOM = function (htmljs, intoArray, parentView,
-                                  _existingWorkStack) {
-  // In order to use fewer stack frames, materializeDOMInner can push
-  // tasks onto `workStack`, and they will be popped off
-  // and run, last first, after materializeDOMInner returns.  The
-  // reason we use a stack instead of a queue is so that we recurse
-  // depth-first, doing newer tasks first.
-  var workStack = (_existingWorkStack || []);
-  materializeDOMInner(htmljs, intoArray, parentView, workStack);
-
-  if (! _existingWorkStack) {
-    // We created the work stack, so we are responsible for finishing
-    // the work.  Call each "task" function, starting with the top
-    // of the stack.
-    while (workStack.length) {
-      // Note that running task() may push new items onto workStack.
-      var task = workStack.pop();
-      task();
-    }
-  }
-
-  return intoArray;
-};
-
-var materializeDOMInner = function (htmljs, intoArray, parentView, workStack) {
-  if (htmljs == null) {
-    // null or undefined
-    return;
-  }
-
-  switch (typeof htmljs) {
-  case 'string': case 'boolean': case 'number':
-    intoArray.push(document.createTextNode(String(htmljs)));
-    return;
-  case 'object':
-    if (htmljs.htmljsType) {
-      switch (htmljs.htmljsType) {
-      case HTML.Tag.htmljsType:
-        intoArray.push(materializeTag(htmljs, parentView, workStack));
-        return;
-      case HTML.CharRef.htmljsType:
-        intoArray.push(document.createTextNode(htmljs.str));
-        return;
-      case HTML.Comment.htmljsType:
-        intoArray.push(document.createComment(htmljs.sanitizedValue));
-        return;
-      case HTML.Raw.htmljsType:
-        // Get an array of DOM nodes by using the browser's HTML parser
-        // (like innerHTML).
-        var nodes = Blaze._DOMBackend.parseHTML(htmljs.value);
-        for (var i = 0; i < nodes.length; i++)
-          intoArray.push(nodes[i]);
-        return;
-      }
-    } else if (HTML.isArray(htmljs)) {
-      for (var i = htmljs.length-1; i >= 0; i--) {
-        workStack.push(_.bind(Blaze._materializeDOM, null,
-                              htmljs[i], intoArray, parentView, workStack));
-      }
-      return;
-    } else {
-      if (htmljs instanceof Blaze.Template) {
-        htmljs = htmljs.constructView();
-        // fall through to Blaze.View case below
-      }
-      if (htmljs instanceof Blaze.View) {
-        Blaze._materializeView(htmljs, parentView, workStack, intoArray);
-        return;
-      }
-    }
-  }
-
-  throw new Error("Unexpected object in htmljs: " + htmljs);
-};
-
-var materializeTag = function (tag, parentView, workStack) {
-  var tagName = tag.tagName;
-  var elem;
-  if ((HTML.isKnownSVGElement(tagName) || isSVGAnchor(tag))
-      && document.createElementNS) {
-    // inline SVG
-    elem = document.createElementNS('http://www.w3.org/2000/svg', tagName);
-  } else {
-    // normal elements
-    elem = document.createElement(tagName);
-  }
-
-  var rawAttrs = tag.attrs;
-  var children = tag.children;
-  if (tagName === 'textarea' && tag.children.length &&
-      ! (rawAttrs && ('value' in rawAttrs))) {
-    // Provide very limited support for TEXTAREA tags with children
-    // rather than a "value" attribute.
-    // Reactivity in the form of Views nested in the tag's children
-    // won't work.  Compilers should compile textarea contents into
-    // the "value" attribute of the tag, wrapped in a function if there
-    // is reactivity.
-    if (typeof rawAttrs === 'function' ||
-        HTML.isArray(rawAttrs)) {
-      throw new Error("Can't have reactive children of TEXTAREA node; " +
-                      "use the 'value' attribute instead.");
-    }
-    rawAttrs = _.extend({}, rawAttrs || null);
-    rawAttrs.value = Blaze._expand(children, parentView);
-    children = [];
-  }
-
-  if (rawAttrs) {
-    var attrUpdater = new ElementAttributesUpdater(elem);
-    var updateAttributes = function () {
-      var expandedAttrs = Blaze._expandAttributes(rawAttrs, parentView);
-      var flattenedAttrs = HTML.flattenAttributes(expandedAttrs);
-      var stringAttrs = {};
-      for (var attrName in flattenedAttrs) {
-        stringAttrs[attrName] = Blaze._toText(flattenedAttrs[attrName],
-                                              parentView,
-                                              HTML.TEXTMODE.STRING);
-      }
-      attrUpdater.update(stringAttrs);
-    };
-    var updaterComputation;
-    if (parentView) {
-      updaterComputation =
-        parentView.autorun(updateAttributes, undefined, 'updater');
-    } else {
-      updaterComputation = Tracker.nonreactive(function () {
-        return Tracker.autorun(function () {
-          Tracker._withCurrentView(parentView, updateAttributes);
-        });
-      });
-    }
-    Blaze._DOMBackend.Teardown.onElementTeardown(elem, function attrTeardown() {
-      updaterComputation.stop();
-    });
-  }
-
-  if (children.length) {
-    var childNodesAndRanges = [];
-    // push this function first so that it's done last
-    workStack.push(function () {
-      for (var i = 0; i < childNodesAndRanges.length; i++) {
-        var x = childNodesAndRanges[i];
-        if (x instanceof Blaze._DOMRange)
-          x.attach(elem);
-        else
-          elem.appendChild(x);
-      }
-    });
-    // now push the task that calculates childNodesAndRanges
-    workStack.push(_.bind(Blaze._materializeDOM, null,
-                          children, childNodesAndRanges, parentView,
-                          workStack));
-  }
-
-  return elem;
-};
-
-
-var isSVGAnchor = function (node) {
-  // We generally aren't able to detect SVG <a> elements because
-  // if "A" were in our list of known svg element names, then all
-  // <a> nodes would be created using
-  // `document.createElementNS`. But in the special case of <a
-  // xlink:href="...">, we can at least detect that attribute and
-  // create an SVG <a> tag in that case.
-  //
-  // However, we still have a general problem of knowing when to
-  // use document.createElementNS and when to use
-  // document.createElement; for example, font tags will always
-  // be created as SVG elements which can cause other
-  // problems. #1977
-  return (node.tagName === "a" &&
-          node.attrs &&
-          node.attrs["xlink:href"] !== undefined);
-};
diff --git a/packages/blaze/microscore.js b/packages/blaze/microscore.js
deleted file mode 100644
index 56e78f6659..0000000000
--- a/packages/blaze/microscore.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Microscore is a partial polyfill for Underscore.  It implements
-// a subset of Underscore functions, and for some functions it
-// implements a subset of the full functionality.
-//
-// Code written against Microscore should just work with Underscore.
-// The reverse is not true, because Microscore doesn't support
-// all features of every function.  A list of known differences
-// between Underscore and Microscore is given with each function.
-//
-// This file should be curated to keep it small, so that it doesn't
-// grow into Underscore.
-//
-// In the future, we'll figure out something better, like package
-// slices and dead code elimination.
-
-if (typeof _ !== 'undefined')
-  throw new Error("If you have Underscore, don't use Microscore");
-
-_ = {};
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var objectToString = Object.prototype.toString;
-
-// Doesn't support more than two arguments (more than one "source"
-// object).
-_.extend = function (tgt, src) {
-  for (var k in src) {
-    if (hasOwnProperty.call(src, k))
-      tgt[k] = src[k];
-  }
-  return tgt;
-};
-
-_.has = function (obj, key) {
-  return hasOwnProperty.call(obj, key);
-};
-
-// Returns a copy of `array` with falsy elements removed.
-_.compact = function (array) {
-  var result = [];
-  for (var i = 0; i < array.length; i++) {
-    var item = array[i];
-    if (item)
-      result.push(item);
-  }
-  return result;
-};
-
-// Returns whether `array` contains an element that is
-// `=== item`.
-_.contains = function (array, item) {
-  for (var i = 0; i < array.length; i++) {
-    if (array[i] === item)
-      return true;
-  }
-  return false;
-};
-
-// Returns `array` filtered to exclude elements that are
-// `=== item`.  Similar to `_.without`.
-_.without = function (array, item) {
-  var result = [];
-  for (var i = 0; i < array.length; i++) {
-    var x = array[i];
-    if (x !== item)
-      result.push(x);
-  }
-  return result;
-};
-
-// Assembles an array by calling `func(oldElement, index)`
-// on each element of `array`.  Assumes argument is an array.
-_.map = function (array, func) {
-  var result = new Array(array.length);
-  for (var i = 0; i < array.length; i++) {
-    result[i] = func(array[i], i);
-  }
-  return result;
-};
-
-// Given an array: Calls `func(element, index)` on each element of
-// `array`.
-//
-// Given an object: Calls `func(value, key)` on each key/value of
-// `obj`.
-//
-// Only REAL arrays are treated as arrays.  No Arguments objects, jQuery
-// objects, etc.  This may be relaxed to the standard Meteor approach
-// if it is too constraining.
-//
-// Doesn't accept `null` as first argument.  Doesn't delegate to built-in
-// `forEach` (which is generally not faster anyway because it calls
-// across the C/JS boundary).  Doesn't mess with JavaScript's built-in
-// behavior if keys are added or removed during iteration (i.e. may
-// or may not visit them).
-
-_.each = function (arrayOrObject, func) {
-  if (objectToString.call(arrayOrObject) === '[object Array]') {
-    var array = arrayOrObject;
-    for (var i = 0; i < array.length; i++) {
-      func(array[i], i);
-    }
-  } else {
-    var obj = arrayOrObject;
-    for (var key in obj) {
-      if (_.has(obj, key))
-        func(obj[key], key);
-    }
-  }
-};
-
-_.bind = function (f, context) {
-  return function () {
-    return f.apply(target, context);
-  };
-};
diff --git a/packages/blaze/package.js b/packages/blaze/package.js
deleted file mode 100644
index 9bcacbb5bd..0000000000
--- a/packages/blaze/package.js
+++ /dev/null
@@ -1,55 +0,0 @@
-Package.describe({
-  summary: "Meteor Reactive Templating library",
-  version: '2.1.8'
-});
-
-Package.onUse(function (api) {
-  api.export(['Blaze', 'UI', 'Handlebars']);
-  api.use('jquery'); // should be a weak dep, by having multiple "DOM backends"
-  api.use('tracker');
-  api.use('check');
-  api.use('underscore'); // only the subset in microscore.js
-  api.use('htmljs');
-  api.imply('htmljs');
-  api.use('observe-sequence');
-  api.use('reactive-var');
-
-  api.addFiles([
-    'preamble.js'
-  ]);
-
-  // client-only files
-  api.addFiles([
-    'dombackend.js',
-    'domrange.js',
-    'events.js',
-    'attrs.js',
-    'materializer.js'
-  ], 'client');
-
-  // client and server
-  api.addFiles([
-    'exceptions.js',
-    'view.js',
-    'builtins.js',
-    'lookup.js',
-    'template.js',
-    'backcompat.js'
-  ]);
-});
-
-Package.onTest(function (api) {
-  api.use('tinytest');
-  api.use('jquery'); // strong dependency, for testing jQuery backend
-  api.use('blaze');
-  api.use('test-helpers');
-  api.use('underscore');
-  api.use('blaze-tools'); // for BlazeTools.toJS
-  api.use('html-tools');
-  api.use('reactive-var');
-  api.use('tracker');
-  api.use('templating');
-
-  api.addFiles('view_tests.js');
-  api.addFiles('render_tests.js', 'client');
-});
diff --git a/packages/blaze/preamble.js b/packages/blaze/preamble.js
deleted file mode 100644
index aba9384a76..0000000000
--- a/packages/blaze/preamble.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @namespace Blaze
- * @summary The namespace for all Blaze-related methods and classes.
- */
-Blaze = {};
-
-// Utility to HTML-escape a string.  Included for legacy reasons.
-Blaze._escape = (function() {
-  var escape_map = {
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#x27;",
-    "`": "&#x60;", /* IE allows backtick-delimited attributes?? */
-    "&": "&amp;"
-  };
-  var escape_one = function(c) {
-    return escape_map[c];
-  };
-
-  return function (x) {
-    return x.replace(/[&<>"'`]/g, escape_one);
-  };
-})();
-
-Blaze._warn = function (msg) {
-  msg = 'Warning: ' + msg;
-
-  if ((typeof console !== 'undefined') && console.warn) {
-    console.warn(msg);
-  }
-};
diff --git a/packages/blaze/render_tests.js b/packages/blaze/render_tests.js
deleted file mode 100644
index bccc001716..0000000000
--- a/packages/blaze/render_tests.js
+++ /dev/null
@@ -1,688 +0,0 @@
-var toCode = BlazeTools.toJS;
-
-var P = HTML.P;
-var CharRef = HTML.CharRef;
-var DIV = HTML.DIV;
-var Comment = HTML.Comment;
-var BR = HTML.BR;
-var A = HTML.A;
-var UL = HTML.UL;
-var LI = HTML.LI;
-var SPAN = HTML.SPAN;
-var HR = HTML.HR;
-var TEXTAREA = HTML.TEXTAREA;
-var INPUT = HTML.INPUT;
-
-var materialize = function (content, parent) {
-  var func = content;
-  if (typeof content !== 'function') {
-    func = function () {
-      return content;
-    };
-  }
-  Blaze.render(func, parent);
-};
-
-var toHTML = Blaze.toHTML;
-
-Tinytest.add("blaze - render - basic", function (test) {
-  var run = function (input, expectedInnerHTML, expectedHTML, expectedCode) {
-    var div = document.createElement("DIV");
-    materialize(input, div);
-    test.equal(canonicalizeHtml(div.innerHTML), expectedInnerHTML);
-    test.equal(toHTML(input), expectedHTML);
-    if (typeof expectedCode !== 'undefined')
-      test.equal(toCode(input), expectedCode);
-  };
-
-  run(P('Hello'),
-      '<p>Hello</p>',
-      '<p>Hello</p>',
-      'HTML.P("Hello")');
-
-  run([], '', '', '[]');
-  run([null, null], '', '', '[null, null]');
-
-  // Test crazy character references
-
-  // `&zopf;` is "Mathematical double-struck small z" a.k.a. "open-face z"
-  run(P(CharRef({html: '&zopf;', str: '\ud835\udd6b'})),
-      '<p>\ud835\udd6b</p>',
-      '<p>&zopf;</p>',
-      'HTML.P(HTML.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"}))');
-
-  run(P({id: CharRef({html: '&zopf;', str: '\ud835\udd6b'})}, 'Hello'),
-      '<p id="\ud835\udd6b">Hello</p>',
-      '<p id="&zopf;">Hello</p>',
-      'HTML.P({id: HTML.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"})}, "Hello")');
-
-  run(P({id: [CharRef({html: '&zopf;', str: '\ud835\udd6b'}), '!']}, 'Hello'),
-      '<p id="\ud835\udd6b!">Hello</p>',
-      '<p id="&zopf;!">Hello</p>',
-      'HTML.P({id: [HTML.CharRef({html: "&zopf;", str: "\\ud835\\udd6b"}), "!"]}, "Hello")');
-
-  // Test comments
-
-  run(DIV(Comment('Test')),
-      '<div><!----></div>', // our innerHTML-canonicalization function kills comment contents
-      '<div><!--Test--></div>',
-      'HTML.DIV(HTML.Comment("Test"))');
-
-  // Test arrays
-
-  run([P('Hello'), P('World')],
-      '<p>Hello</p><p>World</p>',
-      '<p>Hello</p><p>World</p>',
-      '[HTML.P("Hello"), HTML.P("World")]');
-
-  // Test slightly more complicated structure
-
-  run(DIV({'class': 'foo'}, UL(LI(P(A({href: '#one'}, 'One'))),
-                               LI(P('Two', BR(), 'Three')))),
-      '<div class="foo"><ul><li><p><a href="#one">One</a></p></li><li><p>Two<br>Three</p></li></ul></div>',
-      '<div class="foo"><ul><li><p><a href="#one">One</a></p></li><li><p>Two<br>Three</p></li></ul></div>',
-      'HTML.DIV({"class": "foo"}, HTML.UL(HTML.LI(HTML.P(HTML.A({href: "#one"}, "One"))), HTML.LI(HTML.P("Two", HTML.BR(), "Three"))))');
-
-
-  // Test nully attributes
-  run(BR({x: null,
-          y: [[], []],
-          a: [['']]}),
-      '<br a="">',
-      '<br a="">',
-      'HTML.BR({a: [[""]]})');
-
-  run(BR({
-    x: function () { return Blaze.View(function () { return Blaze.View(function () { return []; }); }); },
-    a: function () { return Blaze.View(function () { return Blaze.View(function () { return ''; }); }); }}),
-      '<br a="">',
-      '<br a="">');
-});
-
-// test that we correctly update the 'value' property on input fields
-// rather than the 'value' attribute. the 'value' attribute only sets
-// the initial value.
-Tinytest.add("blaze - render - input - value", function (test) {
-  var R = ReactiveVar("hello");
-  var div = document.createElement("DIV");
-  materialize(INPUT({value: function () { return R.get(); }}), div);
-  var inputEl = div.querySelector('input');
-  test.equal(inputEl.value, "hello");
-  inputEl.value = "goodbye";
-  R.set("hola");
-  Tracker.flush();
-  test.equal(inputEl.value, "hola");
-});
-
-// test that we correctly update the 'checked' property rather than
-// the 'checked' attribute on input fields of type 'checkbox'. the
-// 'checked' attribute only sets the initial value.
-Tinytest.add("blaze - render - input - checked", function (test) {
-  var R = ReactiveVar(null);
-  var div = document.createElement("DIV");
-  materialize(INPUT({type: "checkbox", checked: function () { return R.get(); }}), div);
-  var inputEl = div.querySelector('input');
-  test.equal(inputEl.checked, false);
-  inputEl.checked = true;
-
-  R.set("checked");
-  Tracker.flush();
-  R.set(null);
-  Tracker.flush();
-  test.equal(inputEl.checked, false);
-});
-
-Tinytest.add("blaze - render - textarea", function (test) {
-  var run = function (optNode, text, html, code) {
-    if (typeof optNode === 'string') {
-      // called with args (text, html, code)
-      code = html;
-      html = text;
-      text = optNode;
-      optNode = null;
-    }
-    var div = document.createElement("DIV");
-    var node = TEXTAREA({value: optNode || text});
-    materialize(node, div);
-
-    var value = div.querySelector('textarea').value;
-    value = value.replace(/\r\n/g, "\n"); // IE8 substitutes \n with \r\n
-    test.equal(value, text);
-
-    test.equal(toHTML(node), html);
-    if (typeof code === 'string')
-      test.equal(toCode(node), code);
-  };
-
-  run('Hello',
-      '<textarea>Hello</textarea>',
-      'HTML.TEXTAREA({value: "Hello"})');
-
-  run('\nHello',
-      '<textarea>\n\nHello</textarea>',
-      'HTML.TEXTAREA({value: "\\nHello"})');
-
-  run('</textarea>',
-      '<textarea>&lt;/textarea></textarea>',
-      'HTML.TEXTAREA({value: "</textarea>"})');
-
-  run(CharRef({html: '&amp;', str: '&'}),
-      '&',
-      '<textarea>&amp;</textarea>',
-      'HTML.TEXTAREA({value: HTML.CharRef({html: "&amp;", str: "&"})})');
-
-  run(function () {
-    return ['a', Blaze.View(function () { return 'b'; }), 'c'];
-  },
-      'abc',
-      '<textarea>abc</textarea>');
-
-  // test that reactivity of textarea "value" attribute works...
-  (function () {
-    var R = ReactiveVar('one');
-    var div = document.createElement("DIV");
-    var node = TEXTAREA({value: function () {
-      return Blaze.View(function () {
-        return R.get();
-      });
-    }});
-    materialize(node, div);
-    var textarea = div.querySelector('textarea');
-    test.equal(textarea.value, 'one');
-    R.set('two');
-    Tracker.flush();
-    test.equal(textarea.value, 'two');
-  })();
-
-  // ... while "content" reactivity simply doesn't update
-  // (but doesn't throw either)
-  (function () {
-    var R = ReactiveVar('one');
-    var div = document.createElement("DIV");
-    var node = TEXTAREA([Blaze.View(function () {
-      return R.get();
-    })]);
-    materialize(node, div);
-    var textarea = div.querySelector('textarea');
-    test.equal(textarea.value, 'one');
-    R.set('two');
-    Tracker.flush({_throwFirstError: true});
-    test.equal(textarea.value, 'one');
-  })();
-});
-
-Tinytest.add("blaze - render - view isolation", function (test) {
-
-  // Reactively change a text node
-  (function () {
-    var R = ReactiveVar('Hello');
-    var test1 = function () {
-      return P(Blaze.View(function () { return R.get(); }));
-    };
-
-    test.equal(toHTML(test1()), '<p>Hello</p>');
-
-    var div = document.createElement("DIV");
-    materialize(test1, div);
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>Hello</p>");
-
-    R.set('World');
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>World</p>");
-  })();
-
-  // Reactively change an array of text nodes
-  (function () {
-    var R = ReactiveVar(['Hello', ' World']);
-    var test1 = function () {
-      return P(Blaze.View(function () { return R.get(); }));
-    };
-
-    test.equal(toHTML(test1()), '<p>Hello World</p>');
-
-    var div = document.createElement("DIV");
-    materialize(test1, div);
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>Hello World</p>");
-
-    R.set(['Goodbye', ' World']);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>Goodbye World</p>");
-  })();
-
-});
-
-// IE strips malformed styles like "bar::d" from the `style`
-// attribute. We detect this to adjust expectations for the StyleHandler
-// test below.
-var malformedStylesAllowed = function () {
-  var div = document.createElement("div");
-  div.setAttribute("style", "bar::d;");
-  return (div.getAttribute("style") === "bar::d;");
-};
-
-Tinytest.add("blaze - render - view GC", function (test) {
-  // test that removing parent element removes listeners and stops autoruns.
-  (function () {
-    var R = ReactiveVar('Hello');
-    var test1 = P(Blaze.View(function () { return R.get(); }));
-
-    var div = document.createElement("DIV");
-    materialize(test1, div);
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>Hello</p>");
-
-    R.set('World');
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>World</p>");
-
-    test.equal(R._numListeners(), 1);
-
-    $(div).remove();
-
-    test.equal(R._numListeners(), 0);
-
-    R.set('Steve');
-    Tracker.flush();
-    // should not have changed:
-    test.equal(canonicalizeHtml(div.innerHTML), "<p>World</p>");
-  })();
-
-});
-
-Tinytest.add("blaze - render - reactive attributes", function (test) {
-  (function () {
-    var R = ReactiveVar({'class': ['david gre', CharRef({html: '&euml;', str: '\u00eb'}), 'nspan'],
-                         id: 'foo'});
-
-    var spanFunc = function () {
-      return SPAN(HTML.Attrs(
-        function () { return R.get(); }));
-    };
-
-    test.equal(Blaze.toHTML(spanFunc()),
-               '<span class="david gre&euml;nspan" id="foo"></span>');
-
-    test.equal(R._numListeners(), 0);
-
-    var div = document.createElement("DIV");
-    Blaze.render(spanFunc, div);
-    test.equal(canonicalizeHtml(div.innerHTML), '<span class="david gre\u00ebnspan" id="foo"></span>');
-
-    test.equal(R._numListeners(), 1);
-
-    var span = div.firstChild;
-    test.equal(span.nodeName, 'SPAN');
-    span.className += ' blah'; // change the element's class outside of Blaze. this simulates what a jQuery could do
-
-    R.set({'class': 'david smith', id: 'bar'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span class="david blah smith" id="bar"></span>');
-    test.equal(R._numListeners(), 1);
-
-    R.set({});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span class="blah"></span>');
-    test.equal(R._numListeners(), 1);
-
-    $(div).remove();
-
-    test.equal(R._numListeners(), 0);
-  })();
-
-  // Test styles.
-  (function () {
-    // Test the case where there is a semicolon in the css attribute.
-    var R = ReactiveVar({'style': 'foo: "a;aa"; bar: b;',
-      id: 'foo'});
-
-    var spanFunc = function () {
-      return SPAN(HTML.Attrs(function () { return R.get(); }));
-    };
-
-    test.equal(Blaze.toHTML(spanFunc()), '<span style="foo: &quot;a;aa&quot;; bar: b;" id="foo"></span>');
-
-    test.equal(R._numListeners(), 0);
-
-    var div = document.createElement("DIV");
-    Blaze.render(spanFunc, div);
-    test.equal(canonicalizeHtml(div.innerHTML), '<span id="foo" style="foo: &quot;a;aa&quot;; bar: b"></span>');
-
-    test.equal(R._numListeners(), 1);
-    var span = div.firstChild;
-    test.equal(span.nodeName, 'SPAN');
-
-    span.setAttribute('style', span.getAttribute('style') + '; jquery-style: hidden');
-
-    R.set({'style': 'foo: "a;zz;aa";', id: 'bar'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML, true), '<span id="bar" style="foo: &quot;a;zz;aa&quot;; jquery-style: hidden"></span>');
-    test.equal(R._numListeners(), 1);
-
-    R.set({});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="jquery-style: hidden"></span>');
-    test.equal(R._numListeners(), 1);
-
-    $(div).remove();
-
-    test.equal(R._numListeners(), 0);
-  })();
-
-  // Test that identical styles are successfully overwritten.
-  (function () {
-
-    var R = ReactiveVar({'style': 'foo: a;'});
-
-    var spanFunc = function () {
-      return SPAN(HTML.Attrs(function () { return R.get(); }));
-    };
-
-    var div = document.createElement("DIV");
-    document.body.appendChild(div);
-    Blaze.render(spanFunc, div);
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="foo: a"></span>');
-
-    var span = div.firstChild;
-    test.equal(span.nodeName, 'SPAN');
-    span.setAttribute("style", 'foo: b;');
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="foo: b"></span>');
-
-    R.set({'style': 'foo: c;'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="foo: c"></span>');
-
-    // test malformed styles - different expectations in IE (which
-    // strips malformed styles) from other browsers
-    R.set({'style': 'foo: a; bar::d;:e; baz: c;'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML),
-      malformedStylesAllowed() ?
-               '<span style="foo: a; bar::d; baz: c"></span>' :
-               '<span style="foo: a; baz: c"></span>');
-
-    // Test strange styles
-    R.set({'style': ' foo: c; constructor: a; __proto__: b;'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="foo: c; constructor: a; __proto__: b"></span>');
-
-    R.set({});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span></span>');
-
-    R.set({'style': 'foo: bar;'});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span style="foo: bar"></span>');
-  })();
-
-  // Test `null`, `undefined`, and `[]` attributes
-  (function () {
-    var R = ReactiveVar({id: 'foo',
-                         aaa: null,
-                         bbb: undefined,
-                         ccc: [],
-                         ddd: [null],
-                         eee: [undefined],
-                         fff: [[]],
-                         ggg: ['x', ['y', ['z']]]});
-
-    var spanFunc = function () {
-      return SPAN(HTML.Attrs(
-        function () { return R.get(); }));
-    };
-
-    test.equal(Blaze.toHTML(spanFunc()), '<span id="foo" ggg="xyz"></span>');
-    test.equal(toCode(SPAN(R.get())),
-               'HTML.SPAN({id: "foo", ggg: ["x", ["y", ["z"]]]})');
-
-    var div = document.createElement("DIV");
-    Blaze.render(spanFunc, div);
-    var span = div.firstChild;
-    test.equal(span.nodeName, 'SPAN');
-
-    test.equal(canonicalizeHtml(div.innerHTML), '<span ggg="xyz" id="foo"></span>');
-    R.set({id: 'foo', ggg: [[], [], []]});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span id="foo"></span>');
-
-    R.set({id: 'foo', ggg: null});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span id="foo"></span>');
-
-    R.set({id: 'foo', ggg: ''});
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '<span ggg="" id="foo"></span>');
-
-    $(div).remove();
-
-    test.equal(R._numListeners(), 0);
-  })();
-});
-
-Tinytest.add("blaze - render - templates and views", function (test) {
-  (function () {
-    var counter = 1;
-    var buf = [];
-
-    var myTemplate = Blaze.Template(
-      'myTemplate',
-      function () {
-        return [String(this.number),
-                (this.number < 3 ? makeView() : HR())];
-      });
-
-    myTemplate.constructView = function (number) {
-      var view = Template.prototype.constructView.call(this);
-      view.number = number;
-      return view;
-    };
-
-    myTemplate.created = function () {
-      test.isFalse(Tracker.active);
-      var view = this.view;
-      var parent = Blaze.getView(view, 'myTemplate');
-      if (parent) {
-        buf.push('parent of ' + view.number + ' is ' +
-                 parent.number);
-      }
-
-      buf.push('created ' + Template.currentData());
-    };
-
-    myTemplate.onRendered(function () {
-      test.isFalse(Tracker.active);
-      var nodeDescr = function (node) {
-        if (node.nodeType === 8) // comment
-          return '';
-        if (node.nodeType === 3) // text
-          return node.nodeValue;
-
-        return node.nodeName;
-      };
-
-      var view = this.view;
-      var start = view.firstNode();
-      var end = view.lastNode();
-      // skip marker nodes
-      while (start !== end && ! nodeDescr(start))
-        start = start.nextSibling;
-      while (end !== start && ! nodeDescr(end))
-        end = end.previousSibling;
-
-      buf.push('dom-' + Template.currentData() +
-               ' is ' + nodeDescr(start) +'..' +
-               nodeDescr(end));
-    });
-
-    myTemplate.onDestroyed(function () {
-      test.isFalse(Tracker.active);
-      buf.push('destroyed ' + Template.currentData());
-    });
-
-    var makeView = function () {
-      var number = counter++;
-      return Blaze.With(number, function () {
-        return myTemplate.constructView(number);
-      });
-    };
-
-    var div = document.createElement("DIV");
-
-    Blaze.render(makeView, div);
-    buf.push('---flush---');
-    Tracker.flush();
-    test.equal(buf, ['created 1',
-                     'parent of 2 is 1',
-                     'created 2',
-                     'parent of 3 is 2',
-                     'created 3',
-                     '---flush---',
-                     // (proper order for these has not be thought out:)
-                     'dom-3 is 3..HR',
-                     'dom-2 is 2..HR',
-                     'dom-1 is 1..HR']);
-
-    test.equal(canonicalizeHtml(div.innerHTML), '123<hr>');
-
-    buf.length = 0;
-    $(div).remove();
-    buf.sort();
-    test.equal(buf, ['destroyed 1', 'destroyed 2', 'destroyed 3']);
-
-    // Now use toHTML.  Should still get most of the callbacks (not `rendered`).
-
-    buf.length = 0;
-    counter = 1;
-
-    var html = Blaze.toHTML(makeView());
-
-    test.equal(buf, ['created 1',
-                     'parent of 2 is 1',
-                     'created 2',
-                     'parent of 3 is 2',
-                     'created 3',
-                     'destroyed 3',
-                     'destroyed 2',
-                     'destroyed 1']);
-
-    test.equal(html, '123<hr>');
-  })();
-});
-
-Tinytest.add("blaze - render - findAll", function (test) {
-  var found = null;
-  var $found = null;
-
-  var myTemplate = new Template(
-    'findAllTest',
-    function() {
-      return DIV([P('first'), P('second')]);
-    });
-  myTemplate.rendered = function() {
-    found = this.findAll('p');
-    $found = this.$('p');
-  };
-
-  var div = document.createElement("DIV");
-
-  Blaze.render(myTemplate, div);
-  Tracker.flush();
-
-  test.equal(_.isArray(found), true);
-  test.equal(_.isArray($found), false);
-  test.equal(found.length, 2);
-  test.equal($found.length, 2);
-});
-
-Tinytest.add("blaze - render - reactive attributes 2", function (test) {
-  var R1 = ReactiveVar(['foo']);
-  var R2 = ReactiveVar(['bar']);
-
-  var spanFunc = function () {
-    return SPAN(HTML.Attrs(
-      { blah: function () { return R1.get(); } },
-      function () { return { blah: R2.get() }; }));
-  };
-
-  var div = document.createElement("DIV");
-  Blaze.render(spanFunc, div);
-  var check = function (expected) {
-    test.equal(Blaze.toHTML(spanFunc()), expected);
-    test.equal(canonicalizeHtml(div.innerHTML), expected);
-  };
-  check('<span blah="bar"></span>');
-
-  test.equal(R1._numListeners(), 1);
-  test.equal(R2._numListeners(), 1);
-
-  R2.set([[]]);
-  Tracker.flush();
-  // We combine `['foo']` with what evaluates to `[[[]]]`, which is nully.
-  check('<span blah="foo"></span>');
-
-  R2.set([['']]);
-  Tracker.flush();
-  // We combine `['foo']` with what evaluates to `[[['']]]`, which is non-nully.
-  check('<span blah=""></span>');
-
-  R2.set(null);
-  Tracker.flush();
-  // We combine `['foo']` with `[null]`, which is nully.
-  check('<span blah="foo"></span>');
-
-  R1.set([[], []]);
-  Tracker.flush();
-  // We combine two nully values.
-  check('<span></span>');
-
-  R1.set([[], ['foo']]);
-  Tracker.flush();
-  check('<span blah="foo"></span>');
-
-  // clean up
-
-  $(div).remove();
-
-  test.equal(R1._numListeners(), 0);
-  test.equal(R2._numListeners(), 0);
-});
-
-Tinytest.add("blaze - render - SVG", function (test) {
-  if (! document.createElementNS) {
-    // IE 8
-    return;
-  }
-
-  var fillColor = ReactiveVar('red');
-  var classes = ReactiveVar('one two');
-
-  var content = DIV({'class': 'container'}, HTML.SVG(
-    {width: 100, height: 100},
-    HTML.CIRCLE({cx: 50, cy: 50, r: 40,
-                 stroke: 'black', 'stroke-width': 3,
-                 'class': function () { return classes.get(); },
-                 fill: function () { return fillColor.get(); }})));
-
-  var div = document.createElement("DIV");
-  materialize(content, div);
-
-  var circle = div.querySelector('.container > svg > circle');
-  test.equal(circle.getAttribute('fill'), 'red');
-  test.equal(circle.className.baseVal, 'one two');
-
-  fillColor.set('green');
-  classes.set('two three');
-  Tracker.flush();
-  test.equal(circle.getAttribute('fill'), 'green');
-  test.equal(circle.className.baseVal, 'two three');
-
-  test.equal(circle.nodeName, 'circle');
-  test.equal(circle.namespaceURI, "http://www.w3.org/2000/svg");
-  test.equal(circle.parentNode.namespaceURI, "http://www.w3.org/2000/svg");
-});
-
-Tinytest.add("ui - attributes", function (test) {
-  var SPAN = HTML.SPAN;
-  var amp = HTML.CharRef({html: '&amp;', str: '&'});
-
-  test.equal(HTML.toHTML(SPAN({title: ['M', amp, 'Ms']}, 'M', amp, 'M candies')),
-             '<span title="M&amp;Ms">M&amp;M candies</span>');
-});
diff --git a/packages/blaze/template.js b/packages/blaze/template.js
deleted file mode 100644
index 4a6b5842d8..0000000000
--- a/packages/blaze/template.js
+++ /dev/null
@@ -1,565 +0,0 @@
-// [new] Blaze.Template([viewName], renderFunction)
-//
-// `Blaze.Template` is the class of templates, like `Template.foo` in
-// Meteor, which is `instanceof Template`.
-//
-// `viewKind` is a string that looks like "Template.foo" for templates
-// defined by the compiler.
-
-/**
- * @class
- * @summary Constructor for a Template, which is used to construct Views with particular name and content.
- * @locus Client
- * @param {String} [viewName] Optional.  A name for Views constructed by this Template.  See [`view.name`](#view_name).
- * @param {Function} renderFunction A function that returns [*renderable content*](#renderable_content).  This function is used as the `renderFunction` for Views constructed by this Template.
- */
-Blaze.Template = function (viewName, renderFunction) {
-  if (! (this instanceof Blaze.Template))
-    // called without `new`
-    return new Blaze.Template(viewName, renderFunction);
-
-  if (typeof viewName === 'function') {
-    // omitted "viewName" argument
-    renderFunction = viewName;
-    viewName = '';
-  }
-  if (typeof viewName !== 'string')
-    throw new Error("viewName must be a String (or omitted)");
-  if (typeof renderFunction !== 'function')
-    throw new Error("renderFunction must be a function");
-
-  this.viewName = viewName;
-  this.renderFunction = renderFunction;
-
-  this.__helpers = new HelperMap;
-  this.__eventMaps = [];
-
-  this._callbacks = {
-    created: [],
-    rendered: [],
-    destroyed: []
-  };
-};
-var Template = Blaze.Template;
-
-var HelperMap = function () {};
-HelperMap.prototype.get = function (name) {
-  return this[' '+name];
-};
-HelperMap.prototype.set = function (name, helper) {
-  this[' '+name] = helper;
-};
-HelperMap.prototype.has = function (name) {
-  return (' '+name) in this;
-};
-
-/**
- * @summary Returns true if `value` is a template object like `Template.myTemplate`.
- * @locus Client
- * @param {Any} value The value to test.
- */
-Blaze.isTemplate = function (t) {
-  return (t instanceof Blaze.Template);
-};
-
-/**
- * @name  onCreated
- * @instance
- * @memberOf Template
- * @summary Register a function to be called when an instance of this template is created.
- * @param {Function} callback A function to be added as a callback.
- * @locus Client
- * @importFromPackage templating
- */
-Template.prototype.onCreated = function (cb) {
-  this._callbacks.created.push(cb);
-};
-
-/**
- * @name  onRendered
- * @instance
- * @memberOf Template
- * @summary Register a function to be called when an instance of this template is inserted into the DOM.
- * @param {Function} callback A function to be added as a callback.
- * @locus Client
- * @importFromPackage templating
- */
-Template.prototype.onRendered = function (cb) {
-  this._callbacks.rendered.push(cb);
-};
-
-/**
- * @name  onDestroyed
- * @instance
- * @memberOf Template
- * @summary Register a function to be called when an instance of this template is removed from the DOM and destroyed.
- * @param {Function} callback A function to be added as a callback.
- * @locus Client
- * @importFromPackage templating
- */
-Template.prototype.onDestroyed = function (cb) {
-  this._callbacks.destroyed.push(cb);
-};
-
-Template.prototype._getCallbacks = function (which) {
-  var self = this;
-  var callbacks = self[which] ? [self[which]] : [];
-  // Fire all callbacks added with the new API (Template.onRendered())
-  // as well as the old-style callback (e.g. Template.rendered) for
-  // backwards-compatibility.
-  callbacks = callbacks.concat(self._callbacks[which]);
-  return callbacks;
-};
-
-var fireCallbacks = function (callbacks, template) {
-  Template._withTemplateInstanceFunc(
-    function () { return template; },
-    function () {
-      for (var i = 0, N = callbacks.length; i < N; i++) {
-        callbacks[i].call(template);
-      }
-    });
-};
-
-Template.prototype.constructView = function (contentFunc, elseFunc) {
-  var self = this;
-  var view = Blaze.View(self.viewName, self.renderFunction);
-  view.template = self;
-
-  view.templateContentBlock = (
-    contentFunc ? new Template('(contentBlock)', contentFunc) : null);
-  view.templateElseBlock = (
-    elseFunc ? new Template('(elseBlock)', elseFunc) : null);
-
-  if (self.__eventMaps || typeof self.events === 'object') {
-    view._onViewRendered(function () {
-      if (view.renderCount !== 1)
-        return;
-
-      if (! self.__eventMaps.length && typeof self.events === "object") {
-        // Provide limited back-compat support for `.events = {...}`
-        // syntax.  Pass `template.events` to the original `.events(...)`
-        // function.  This code must run only once per template, in
-        // order to not bind the handlers more than once, which is
-        // ensured by the fact that we only do this when `__eventMaps`
-        // is falsy, and we cause it to be set now.
-        Template.prototype.events.call(self, self.events);
-      }
-
-      _.each(self.__eventMaps, function (m) {
-        Blaze._addEventMap(view, m, view);
-      });
-    });
-  }
-
-  view._templateInstance = new Blaze.TemplateInstance(view);
-  view.templateInstance = function () {
-    // Update data, firstNode, and lastNode, and return the TemplateInstance
-    // object.
-    var inst = view._templateInstance;
-
-    /**
-     * @instance
-     * @memberOf Blaze.TemplateInstance
-     * @name  data
-     * @summary The data context of this instance's latest invocation.
-     * @locus Client
-     */
-    inst.data = Blaze.getData(view);
-
-    if (view._domrange && !view.isDestroyed) {
-      inst.firstNode = view._domrange.firstNode();
-      inst.lastNode = view._domrange.lastNode();
-    } else {
-      // on 'created' or 'destroyed' callbacks we don't have a DomRange
-      inst.firstNode = null;
-      inst.lastNode = null;
-    }
-
-    return inst;
-  };
-
-  /**
-   * @name  created
-   * @instance
-   * @memberOf Template
-   * @summary Provide a callback when an instance of a template is created.
-   * @locus Client
-   * @deprecated in 1.1
-   */
-  // To avoid situations when new callbacks are added in between view
-  // instantiation and event being fired, decide on all callbacks to fire
-  // immediately and then fire them on the event.
-  var createdCallbacks = self._getCallbacks('created');
-  view.onViewCreated(function () {
-    fireCallbacks(createdCallbacks, view.templateInstance());
-  });
-
-  /**
-   * @name  rendered
-   * @instance
-   * @memberOf Template
-   * @summary Provide a callback when an instance of a template is rendered.
-   * @locus Client
-   * @deprecated in 1.1
-   */
-  var renderedCallbacks = self._getCallbacks('rendered');
-  view.onViewReady(function () {
-    fireCallbacks(renderedCallbacks, view.templateInstance());
-  });
-
-  /**
-   * @name  destroyed
-   * @instance
-   * @memberOf Template
-   * @summary Provide a callback when an instance of a template is destroyed.
-   * @locus Client
-   * @deprecated in 1.1
-   */
-  var destroyedCallbacks = self._getCallbacks('destroyed');
-  view.onViewDestroyed(function () {
-    fireCallbacks(destroyedCallbacks, view.templateInstance());
-  });
-
-  return view;
-};
-
-/**
- * @class
- * @summary The class for template instances
- * @param {Blaze.View} view
- * @instanceName template
- */
-Blaze.TemplateInstance = function (view) {
-  if (! (this instanceof Blaze.TemplateInstance))
-    // called without `new`
-    return new Blaze.TemplateInstance(view);
-
-  if (! (view instanceof Blaze.View))
-    throw new Error("View required");
-
-  view._templateInstance = this;
-
-  /**
-   * @name view
-   * @memberOf Blaze.TemplateInstance
-   * @instance
-   * @summary The [View](#blaze_view) object for this invocation of the template.
-   * @locus Client
-   * @type {Blaze.View}
-   */
-  this.view = view;
-  this.data = null;
-
-  /**
-   * @name firstNode
-   * @memberOf Blaze.TemplateInstance
-   * @instance
-   * @summary The first top-level DOM node in this template instance.
-   * @locus Client
-   * @type {DOMNode}
-   */
-  this.firstNode = null;
-
-  /**
-   * @name lastNode
-   * @memberOf Blaze.TemplateInstance
-   * @instance
-   * @summary The last top-level DOM node in this template instance.
-   * @locus Client
-   * @type {DOMNode}
-   */
-  this.lastNode = null;
-
-  // This dependency is used to identify state transitions in
-  // _subscriptionHandles which could cause the result of
-  // TemplateInstance#subscriptionsReady to change. Basically this is triggered
-  // whenever a new subscription handle is added or when a subscription handle
-  // is removed and they are not ready.
-  this._allSubsReadyDep = new Tracker.Dependency();
-  this._allSubsReady = false;
-
-  this._subscriptionHandles = {};
-};
-
-/**
- * @summary Find all elements matching `selector` in this template instance, and return them as a JQuery object.
- * @locus Client
- * @param {String} selector The CSS selector to match, scoped to the template contents.
- * @returns {DOMNode[]}
- */
-Blaze.TemplateInstance.prototype.$ = function (selector) {
-  var view = this.view;
-  if (! view._domrange)
-    throw new Error("Can't use $ on template instance with no DOM");
-  return view._domrange.$(selector);
-};
-
-/**
- * @summary Find all elements matching `selector` in this template instance.
- * @locus Client
- * @param {String} selector The CSS selector to match, scoped to the template contents.
- * @returns {DOMElement[]}
- */
-Blaze.TemplateInstance.prototype.findAll = function (selector) {
-  return Array.prototype.slice.call(this.$(selector));
-};
-
-/**
- * @summary Find one element matching `selector` in this template instance.
- * @locus Client
- * @param {String} selector The CSS selector to match, scoped to the template contents.
- * @returns {DOMElement}
- */
-Blaze.TemplateInstance.prototype.find = function (selector) {
-  var result = this.$(selector);
-  return result[0] || null;
-};
-
-/**
- * @summary A version of [Tracker.autorun](#tracker_autorun) that is stopped when the template is destroyed.
- * @locus Client
- * @param {Function} runFunc The function to run. It receives one argument: a Tracker.Computation object.
- */
-Blaze.TemplateInstance.prototype.autorun = function (f) {
-  return this.view.autorun(f);
-};
-
-/**
- * @summary A version of [Meteor.subscribe](#meteor_subscribe) that is stopped
- * when the template is destroyed.
- * @return {SubscriptionHandle} The subscription handle to the newly made
- * subscription. Call `handle.stop()` to manually stop the subscription, or
- * `handle.ready()` to find out if this particular subscription has loaded all
- * of its inital data.
- * @locus Client
- * @param {String} name Name of the subscription.  Matches the name of the
- * server's `publish()` call.
- * @param {Any} [arg1,arg2...] Optional arguments passed to publisher function
- * on server.
- * @param {Function|Object} [options] If a function is passed instead of an
- * object, it is interpreted as an `onReady` callback.
- * @param {Function} [options.onReady] Passed to [`Meteor.subscribe`](#meteor_subscribe).
- * @param {Function} [options.onStop] Passed to [`Meteor.subscribe`](#meteor_subscribe).
- * @param {DDP.Connection} [options.connection] The connection on which to make the
- * subscription.
- */
-Blaze.TemplateInstance.prototype.subscribe = function (/* arguments */) {
-  var self = this;
-
-  var subHandles = self._subscriptionHandles;
-  var args = _.toArray(arguments);
-
-  // Duplicate logic from Meteor.subscribe
-  var options = {};
-  if (args.length) {
-    var lastParam = _.last(args);
-
-    // Match pattern to check if the last arg is an options argument
-    var lastParamOptionsPattern = {
-      onReady: Match.Optional(Function),
-      // XXX COMPAT WITH 1.0.3.1 onError used to exist, but now we use
-      // onStop with an error callback instead.
-      onError: Match.Optional(Function),
-      onStop: Match.Optional(Function),
-      connection: Match.Optional(Match.Any)
-    };
-
-    if (_.isFunction(lastParam)) {
-      options.onReady = args.pop();
-    } else if (lastParam && ! _.isEmpty(lastParam) && Match.test(lastParam, lastParamOptionsPattern)) {
-      options = args.pop();
-    }
-  }
-
-  var subHandle;
-  var oldStopped = options.onStop;
-  options.onStop = function (error) {
-    // When the subscription is stopped, remove it from the set of tracked
-    // subscriptions to avoid this list growing without bound
-    delete subHandles[subHandle.subscriptionId];
-
-    // Removing a subscription can only change the result of subscriptionsReady
-    // if we are not ready (that subscription could be the one blocking us being
-    // ready).
-    if (! self._allSubsReady) {
-      self._allSubsReadyDep.changed();
-    }
-
-    if (oldStopped) {
-      oldStopped(error);
-    }
-  };
-
-  var connection = options.connection;
-  var callbacks = _.pick(options, ["onReady", "onError", "onStop"]);
-
-  // The callbacks are passed as the last item in the arguments array passed to
-  // View#subscribe
-  args.push(callbacks);
-
-  // View#subscribe takes the connection as one of the options in the last
-  // argument
-  subHandle = self.view.subscribe.call(self.view, args, {
-    connection: connection
-  });
-
-  if (! _.has(subHandles, subHandle.subscriptionId)) {
-    subHandles[subHandle.subscriptionId] = subHandle;
-
-    // Adding a new subscription will always cause us to transition from ready
-    // to not ready, but if we are already not ready then this can't make us
-    // ready.
-    if (self._allSubsReady) {
-      self._allSubsReadyDep.changed();
-    }
-  }
-
-  return subHandle;
-};
-
-/**
- * @summary A reactive function that returns true when all of the subscriptions
- * called with [this.subscribe](#TemplateInstance-subscribe) are ready.
- * @return {Boolean} True if all subscriptions on this template instance are
- * ready.
- */
-Blaze.TemplateInstance.prototype.subscriptionsReady = function () {
-  this._allSubsReadyDep.depend();
-
-  this._allSubsReady = _.all(this._subscriptionHandles, function (handle) {
-    return handle.ready();
-  });
-
-  return this._allSubsReady;
-};
-
-/**
- * @summary Specify template helpers available to this template.
- * @locus Client
- * @param {Object} helpers Dictionary of helper functions by name.
- * @importFromPackage templating
- */
-Template.prototype.helpers = function (dict) {
-  if (! _.isObject(dict)) {
-    throw new Error("Helpers dictionary has to be an object");
-  }
-
-  for (var k in dict)
-    this.__helpers.set(k, dict[k]);
-};
-
-// Kind of like Blaze.currentView but for the template instance.
-// This is a function, not a value -- so that not all helpers
-// are implicitly dependent on the current template instance's `data` property,
-// which would make them dependenct on the data context of the template
-// inclusion.
-Template._currentTemplateInstanceFunc = null;
-
-Template._withTemplateInstanceFunc = function (templateInstanceFunc, func) {
-  if (typeof func !== 'function')
-    throw new Error("Expected function, got: " + func);
-  var oldTmplInstanceFunc = Template._currentTemplateInstanceFunc;
-  try {
-    Template._currentTemplateInstanceFunc = templateInstanceFunc;
-    return func();
-  } finally {
-    Template._currentTemplateInstanceFunc = oldTmplInstanceFunc;
-  }
-};
-
-/**
- * @summary Specify event handlers for this template.
- * @locus Client
- * @param {EventMap} eventMap Event handlers to associate with this template.
- * @importFromPackage templating
- */
-Template.prototype.events = function (eventMap) {
-  if (! _.isObject(eventMap)) {
-    throw new Error("Event map has to be an object");
-  }
-
-  var template = this;
-  var eventMap2 = {};
-  for (var k in eventMap) {
-    eventMap2[k] = (function (k, v) {
-      return function (event/*, ...*/) {
-        var view = this; // passed by EventAugmenter
-        var data = Blaze.getData(event.currentTarget);
-        if (data == null)
-          data = {};
-        var args = Array.prototype.slice.call(arguments);
-        var tmplInstanceFunc = _.bind(view.templateInstance, view);
-        args.splice(1, 0, tmplInstanceFunc());
-
-        return Template._withTemplateInstanceFunc(tmplInstanceFunc, function () {
-          return v.apply(data, args);
-        });
-      };
-    })(k, eventMap[k]);
-  }
-
-  template.__eventMaps.push(eventMap2);
-};
-
-/**
- * @function
- * @name instance
- * @memberOf Template
- * @summary The [template instance](#template_inst) corresponding to the current template helper, event handler, callback, or autorun.  If there isn't one, `null`.
- * @locus Client
- * @returns {Blaze.TemplateInstance}
- * @importFromPackage templating
- */
-Template.instance = function () {
-  return Template._currentTemplateInstanceFunc
-    && Template._currentTemplateInstanceFunc();
-};
-
-// Note: Template.currentData() is documented to take zero arguments,
-// while Blaze.getData takes up to one.
-
-/**
- * @summary
- *
- * - Inside an `onCreated`, `onRendered`, or `onDestroyed` callback, returns
- * the data context of the template.
- * - Inside an event handler, returns the data context of the template on which
- * this event handler was defined.
- * - Inside a helper, returns the data context of the DOM node where the helper
- * was used.
- *
- * Establishes a reactive dependency on the result.
- * @locus Client
- * @function
- * @importFromPackage templating
- */
-Template.currentData = Blaze.getData;
-
-/**
- * @summary Accesses other data contexts that enclose the current data context.
- * @locus Client
- * @function
- * @param {Integer} [numLevels] The number of levels beyond the current data context to look. Defaults to 1.
- * @importFromPackage templating
- */
-Template.parentData = Blaze._parentData;
-
-/**
- * @summary Defines a [helper function](#template_helpers) which can be used from all templates.
- * @locus Client
- * @function
- * @param {String} name The name of the helper function you are defining.
- * @param {Function} function The helper function itself.
- * @importFromPackage templating
- */
-Template.registerHelper = Blaze.registerHelper;
-
-/**
- * @summary Removes a global [helper function](#template_helpers).
- * @locus Client
- * @function
- * @param {String} name The name of the helper function you are defining.
- * @importFromPackage templating
- */
-Template.deregisterHelper = Blaze.deregisterHelper;
diff --git a/packages/blaze/view.js b/packages/blaze/view.js
deleted file mode 100644
index 3a17d3487d..0000000000
--- a/packages/blaze/view.js
+++ /dev/null
@@ -1,900 +0,0 @@
-/// [new] Blaze.View([name], renderMethod)
-///
-/// Blaze.View is the building block of reactive DOM.  Views have
-/// the following features:
-///
-/// * lifecycle callbacks - Views are created, rendered, and destroyed,
-///   and callbacks can be registered to fire when these things happen.
-///
-/// * parent pointer - A View points to its parentView, which is the
-///   View that caused it to be rendered.  These pointers form a
-///   hierarchy or tree of Views.
-///
-/// * render() method - A View's render() method specifies the DOM
-///   (or HTML) content of the View.  If the method establishes
-///   reactive dependencies, it may be re-run.
-///
-/// * a DOMRange - If a View is rendered to DOM, its position and
-///   extent in the DOM are tracked using a DOMRange object.
-///
-/// When a View is constructed by calling Blaze.View, the View is
-/// not yet considered "created."  It doesn't have a parentView yet,
-/// and no logic has been run to initialize the View.  All real
-/// work is deferred until at least creation time, when the onViewCreated
-/// callbacks are fired, which happens when the View is "used" in
-/// some way that requires it to be rendered.
-///
-/// ...more lifecycle stuff
-///
-/// `name` is an optional string tag identifying the View.  The only
-/// time it's used is when looking in the View tree for a View of a
-/// particular name; for example, data contexts are stored on Views
-/// of name "with".  Names are also useful when debugging, so in
-/// general it's good for functions that create Views to set the name.
-/// Views associated with templates have names of the form "Template.foo".
-
-/**
- * @class
- * @summary Constructor for a View, which represents a reactive region of DOM.
- * @locus Client
- * @param {String} [name] Optional.  A name for this type of View.  See [`view.name`](#view_name).
- * @param {Function} renderFunction A function that returns [*renderable content*](#renderable_content).  In this function, `this` is bound to the View.
- */
-Blaze.View = function (name, render) {
-  if (! (this instanceof Blaze.View))
-    // called without `new`
-    return new Blaze.View(name, render);
-
-  if (typeof name === 'function') {
-    // omitted "name" argument
-    render = name;
-    name = '';
-  }
-  this.name = name;
-  this._render = render;
-
-  this._callbacks = {
-    created: null,
-    rendered: null,
-    destroyed: null
-  };
-
-  // Setting all properties here is good for readability,
-  // and also may help Chrome optimize the code by keeping
-  // the View object from changing shape too much.
-  this.isCreated = false;
-  this._isCreatedForExpansion = false;
-  this.isRendered = false;
-  this._isAttached = false;
-  this.isDestroyed = false;
-  this._isInRender = false;
-  this.parentView = null;
-  this._domrange = null;
-  // This flag is normally set to false except for the cases when view's parent
-  // was generated as part of expanding some syntactic sugar expressions or
-  // methods.
-  // Ex.: Blaze.renderWithData is an equivalent to creating a view with regular
-  // Blaze.render and wrapping it into {{#with data}}{{/with}} view. Since the
-  // users don't know anything about these generated parent views, Blaze needs
-  // this information to be available on views to make smarter decisions. For
-  // example: removing the generated parent view with the view on Blaze.remove.
-  this._hasGeneratedParent = false;
-  // Bindings accessible to children views (via view.lookup('name')) within the
-  // closest template view.
-  this._scopeBindings = {};
-
-  this.renderCount = 0;
-};
-
-Blaze.View.prototype._render = function () { return null; };
-
-Blaze.View.prototype.onViewCreated = function (cb) {
-  this._callbacks.created = this._callbacks.created || [];
-  this._callbacks.created.push(cb);
-};
-
-Blaze.View.prototype._onViewRendered = function (cb) {
-  this._callbacks.rendered = this._callbacks.rendered || [];
-  this._callbacks.rendered.push(cb);
-};
-
-Blaze.View.prototype.onViewReady = function (cb) {
-  var self = this;
-  var fire = function () {
-    Tracker.afterFlush(function () {
-      if (! self.isDestroyed) {
-        Blaze._withCurrentView(self, function () {
-          cb.call(self);
-        });
-      }
-    });
-  };
-  self._onViewRendered(function onViewRendered() {
-    if (self.isDestroyed)
-      return;
-    if (! self._domrange.attached)
-      self._domrange.onAttached(fire);
-    else
-      fire();
-  });
-};
-
-Blaze.View.prototype.onViewDestroyed = function (cb) {
-  this._callbacks.destroyed = this._callbacks.destroyed || [];
-  this._callbacks.destroyed.push(cb);
-};
-Blaze.View.prototype.removeViewDestroyedListener = function (cb) {
-  var destroyed = this._callbacks.destroyed;
-  if (! destroyed)
-    return;
-  var index = _.lastIndexOf(destroyed, cb);
-  if (index !== -1) {
-    // XXX You'd think the right thing to do would be splice, but _fireCallbacks
-    // gets sad if you remove callbacks while iterating over the list.  Should
-    // change this to use callback-hook or EventEmitter or something else that
-    // properly supports removal.
-    destroyed[index] = null;
-  }
-};
-
-/// View#autorun(func)
-///
-/// Sets up a Tracker autorun that is "scoped" to this View in two
-/// important ways: 1) Blaze.currentView is automatically set
-/// on every re-run, and 2) the autorun is stopped when the
-/// View is destroyed.  As with Tracker.autorun, the first run of
-/// the function is immediate, and a Computation object that can
-/// be used to stop the autorun is returned.
-///
-/// View#autorun is meant to be called from View callbacks like
-/// onViewCreated, or from outside the rendering process.  It may not
-/// be called before the onViewCreated callbacks are fired (too early),
-/// or from a render() method (too confusing).
-///
-/// Typically, autoruns that update the state
-/// of the View (as in Blaze.With) should be started from an onViewCreated
-/// callback.  Autoruns that update the DOM should be started
-/// from either onViewCreated (guarded against the absence of
-/// view._domrange), or onViewReady.
-Blaze.View.prototype.autorun = function (f, _inViewScope, displayName) {
-  var self = this;
-
-  // The restrictions on when View#autorun can be called are in order
-  // to avoid bad patterns, like creating a Blaze.View and immediately
-  // calling autorun on it.  A freshly created View is not ready to
-  // have logic run on it; it doesn't have a parentView, for example.
-  // It's when the View is materialized or expanded that the onViewCreated
-  // handlers are fired and the View starts up.
-  //
-  // Letting the render() method call `this.autorun()` is problematic
-  // because of re-render.  The best we can do is to stop the old
-  // autorun and start a new one for each render, but that's a pattern
-  // we try to avoid internally because it leads to helpers being
-  // called extra times, in the case where the autorun causes the
-  // view to re-render (and thus the autorun to be torn down and a
-  // new one established).
-  //
-  // We could lift these restrictions in various ways.  One interesting
-  // idea is to allow you to call `view.autorun` after instantiating
-  // `view`, and automatically wrap it in `view.onViewCreated`, deferring
-  // the autorun so that it starts at an appropriate time.  However,
-  // then we can't return the Computation object to the caller, because
-  // it doesn't exist yet.
-  if (! self.isCreated) {
-    throw new Error("View#autorun must be called from the created callback at the earliest");
-  }
-  if (this._isInRender) {
-    throw new Error("Can't call View#autorun from inside render(); try calling it from the created or rendered callback");
-  }
-  if (Tracker.active) {
-    throw new Error("Can't call View#autorun from a Tracker Computation; try calling it from the created or rendered callback");
-  }
-
-  var templateInstanceFunc = Blaze.Template._currentTemplateInstanceFunc;
-
-  var func = function viewAutorun(c) {
-    return Blaze._withCurrentView(_inViewScope || self, function () {
-      return Blaze.Template._withTemplateInstanceFunc(
-        templateInstanceFunc, function () {
-          return f.call(self, c);
-        });
-    });
-  };
-
-  // Give the autorun function a better name for debugging and profiling.
-  // The `displayName` property is not part of the spec but browsers like Chrome
-  // and Firefox prefer it in debuggers over the name function was declared by.
-  func.displayName =
-    (self.name || 'anonymous') + ':' + (displayName || 'anonymous');
-  var comp = Tracker.autorun(func);
-
-  var stopComputation = function () { comp.stop(); };
-  self.onViewDestroyed(stopComputation);
-  comp.onStop(function () {
-    self.removeViewDestroyedListener(stopComputation);
-  });
-
-  return comp;
-};
-
-Blaze.View.prototype._errorIfShouldntCallSubscribe = function () {
-  var self = this;
-
-  if (! self.isCreated) {
-    throw new Error("View#subscribe must be called from the created callback at the earliest");
-  }
-  if (self._isInRender) {
-    throw new Error("Can't call View#subscribe from inside render(); try calling it from the created or rendered callback");
-  }
-  if (self.isDestroyed) {
-    throw new Error("Can't call View#subscribe from inside the destroyed callback, try calling it inside created or rendered.");
-  }
-};
-
-/**
- * Just like Blaze.View#autorun, but with Meteor.subscribe instead of
- * Tracker.autorun. Stop the subscription when the view is destroyed.
- * @return {SubscriptionHandle} A handle to the subscription so that you can
- * see if it is ready, or stop it manually
- */
-Blaze.View.prototype.subscribe = function (args, options) {
-  var self = this;
-  options = options || {};
-
-  self._errorIfShouldntCallSubscribe();
-
-  var subHandle;
-  if (options.connection) {
-    subHandle = options.connection.subscribe.apply(options.connection, args);
-  } else {
-    subHandle = Meteor.subscribe.apply(Meteor, args);
-  }
-
-  self.onViewDestroyed(function () {
-    subHandle.stop();
-  });
-
-  return subHandle;
-};
-
-Blaze.View.prototype.firstNode = function () {
-  if (! this._isAttached)
-    throw new Error("View must be attached before accessing its DOM");
-
-  return this._domrange.firstNode();
-};
-
-Blaze.View.prototype.lastNode = function () {
-  if (! this._isAttached)
-    throw new Error("View must be attached before accessing its DOM");
-
-  return this._domrange.lastNode();
-};
-
-Blaze._fireCallbacks = function (view, which) {
-  Blaze._withCurrentView(view, function () {
-    Tracker.nonreactive(function fireCallbacks() {
-      var cbs = view._callbacks[which];
-      for (var i = 0, N = (cbs && cbs.length); i < N; i++)
-        cbs[i] && cbs[i].call(view);
-    });
-  });
-};
-
-Blaze._createView = function (view, parentView, forExpansion) {
-  if (view.isCreated)
-    throw new Error("Can't render the same View twice");
-
-  view.parentView = (parentView || null);
-  view.isCreated = true;
-  if (forExpansion)
-    view._isCreatedForExpansion = true;
-
-  Blaze._fireCallbacks(view, 'created');
-};
-
-var doFirstRender = function (view, initialContent) {
-  var domrange = new Blaze._DOMRange(initialContent);
-  view._domrange = domrange;
-  domrange.view = view;
-  view.isRendered = true;
-  Blaze._fireCallbacks(view, 'rendered');
-
-  var teardownHook = null;
-
-  domrange.onAttached(function attached(range, element) {
-    view._isAttached = true;
-
-    teardownHook = Blaze._DOMBackend.Teardown.onElementTeardown(
-      element, function teardown() {
-        Blaze._destroyView(view, true /* _skipNodes */);
-      });
-  });
-
-  // tear down the teardown hook
-  view.onViewDestroyed(function () {
-    teardownHook && teardownHook.stop();
-    teardownHook = null;
-  });
-
-  return domrange;
-};
-
-// Take an uncreated View `view` and create and render it to DOM,
-// setting up the autorun that updates the View.  Returns a new
-// DOMRange, which has been associated with the View.
-//
-// The private arguments `_workStack` and `_intoArray` are passed in
-// by Blaze._materializeDOM and are only present for recursive calls
-// (when there is some other _materializeView on the stack).  If
-// provided, then we avoid the mutual recursion of calling back into
-// Blaze._materializeDOM so that deep View hierarchies don't blow the
-// stack.  Instead, we push tasks onto workStack for the initial
-// rendering and subsequent setup of the View, and they are done after
-// we return.  When there is a _workStack, we do not return the new
-// DOMRange, but instead push it into _intoArray from a _workStack
-// task.
-Blaze._materializeView = function (view, parentView, _workStack, _intoArray) {
-  Blaze._createView(view, parentView);
-
-  var domrange;
-  var lastHtmljs;
-  // We don't expect to be called in a Computation, but just in case,
-  // wrap in Tracker.nonreactive.
-  Tracker.nonreactive(function () {
-    view.autorun(function doRender(c) {
-      // `view.autorun` sets the current view.
-      view.renderCount++;
-      view._isInRender = true;
-      // Any dependencies that should invalidate this Computation come
-      // from this line:
-      var htmljs = view._render();
-      view._isInRender = false;
-
-      if (! c.firstRun) {
-        Tracker.nonreactive(function doMaterialize() {
-          // re-render
-          var rangesAndNodes = Blaze._materializeDOM(htmljs, [], view);
-          if (! Blaze._isContentEqual(lastHtmljs, htmljs)) {
-            domrange.setMembers(rangesAndNodes);
-            Blaze._fireCallbacks(view, 'rendered');
-          }
-        });
-      }
-      lastHtmljs = htmljs;
-
-      // Causes any nested views to stop immediately, not when we call
-      // `setMembers` the next time around the autorun.  Otherwise,
-      // helpers in the DOM tree to be replaced might be scheduled
-      // to re-run before we have a chance to stop them.
-      Tracker.onInvalidate(function () {
-        if (domrange) {
-          domrange.destroyMembers();
-        }
-      });
-    }, undefined, 'materialize');
-
-    // first render.  lastHtmljs is the first htmljs.
-    var initialContents;
-    if (! _workStack) {
-      initialContents = Blaze._materializeDOM(lastHtmljs, [], view);
-      domrange = doFirstRender(view, initialContents);
-      initialContents = null; // help GC because we close over this scope a lot
-    } else {
-      // We're being called from Blaze._materializeDOM, so to avoid
-      // recursion and save stack space, provide a description of the
-      // work to be done instead of doing it.  Tasks pushed onto
-      // _workStack will be done in LIFO order after we return.
-      // The work will still be done within a Tracker.nonreactive,
-      // because it will be done by some call to Blaze._materializeDOM
-      // (which is always called in a Tracker.nonreactive).
-      initialContents = [];
-      // push this function first so that it happens last
-      _workStack.push(function () {
-        domrange = doFirstRender(view, initialContents);
-        initialContents = null; // help GC because of all the closures here
-        _intoArray.push(domrange);
-      });
-      // now push the task that calculates initialContents
-      _workStack.push(_.bind(Blaze._materializeDOM, null,
-                             lastHtmljs, initialContents, view, _workStack));
-    }
-  });
-
-  if (! _workStack) {
-    return domrange;
-  } else {
-    return null;
-  }
-};
-
-// Expands a View to HTMLjs, calling `render` recursively on all
-// Views and evaluating any dynamic attributes.  Calls the `created`
-// callback, but not the `materialized` or `rendered` callbacks.
-// Destroys the view immediately, unless called in a Tracker Computation,
-// in which case the view will be destroyed when the Computation is
-// invalidated.  If called in a Tracker Computation, the result is a
-// reactive string; that is, the Computation will be invalidated
-// if any changes are made to the view or subviews that might affect
-// the HTML.
-Blaze._expandView = function (view, parentView) {
-  Blaze._createView(view, parentView, true /*forExpansion*/);
-
-  view._isInRender = true;
-  var htmljs = Blaze._withCurrentView(view, function () {
-    return view._render();
-  });
-  view._isInRender = false;
-
-  var result = Blaze._expand(htmljs, view);
-
-  if (Tracker.active) {
-    Tracker.onInvalidate(function () {
-      Blaze._destroyView(view);
-    });
-  } else {
-    Blaze._destroyView(view);
-  }
-
-  return result;
-};
-
-// Options: `parentView`
-Blaze._HTMLJSExpander = HTML.TransformingVisitor.extend();
-Blaze._HTMLJSExpander.def({
-  visitObject: function (x) {
-    if (x instanceof Blaze.Template)
-      x = x.constructView();
-    if (x instanceof Blaze.View)
-      return Blaze._expandView(x, this.parentView);
-
-    // this will throw an error; other objects are not allowed!
-    return HTML.TransformingVisitor.prototype.visitObject.call(this, x);
-  },
-  visitAttributes: function (attrs) {
-    // expand dynamic attributes
-    if (typeof attrs === 'function')
-      attrs = Blaze._withCurrentView(this.parentView, attrs);
-
-    // call super (e.g. for case where `attrs` is an array)
-    return HTML.TransformingVisitor.prototype.visitAttributes.call(this, attrs);
-  },
-  visitAttribute: function (name, value, tag) {
-    // expand attribute values that are functions.  Any attribute value
-    // that contains Views must be wrapped in a function.
-    if (typeof value === 'function')
-      value = Blaze._withCurrentView(this.parentView, value);
-
-    return HTML.TransformingVisitor.prototype.visitAttribute.call(
-      this, name, value, tag);
-  }
-});
-
-// Return Blaze.currentView, but only if it is being rendered
-// (i.e. we are in its render() method).
-var currentViewIfRendering = function () {
-  var view = Blaze.currentView;
-  return (view && view._isInRender) ? view : null;
-};
-
-Blaze._expand = function (htmljs, parentView) {
-  parentView = parentView || currentViewIfRendering();
-  return (new Blaze._HTMLJSExpander(
-    {parentView: parentView})).visit(htmljs);
-};
-
-Blaze._expandAttributes = function (attrs, parentView) {
-  parentView = parentView || currentViewIfRendering();
-  return (new Blaze._HTMLJSExpander(
-    {parentView: parentView})).visitAttributes(attrs);
-};
-
-Blaze._destroyView = function (view, _skipNodes) {
-  if (view.isDestroyed)
-    return;
-  view.isDestroyed = true;
-
-  Blaze._fireCallbacks(view, 'destroyed');
-
-  // Destroy views and elements recursively.  If _skipNodes,
-  // only recurse up to views, not elements, for the case where
-  // the backend (jQuery) is recursing over the elements already.
-
-  if (view._domrange)
-    view._domrange.destroyMembers(_skipNodes);
-};
-
-Blaze._destroyNode = function (node) {
-  if (node.nodeType === 1)
-    Blaze._DOMBackend.Teardown.tearDownElement(node);
-};
-
-// Are the HTMLjs entities `a` and `b` the same?  We could be
-// more elaborate here but the point is to catch the most basic
-// cases.
-Blaze._isContentEqual = function (a, b) {
-  if (a instanceof HTML.Raw) {
-    return (b instanceof HTML.Raw) && (a.value === b.value);
-  } else if (a == null) {
-    return (b == null);
-  } else {
-    return (a === b) &&
-      ((typeof a === 'number') || (typeof a === 'boolean') ||
-       (typeof a === 'string'));
-  }
-};
-
-/**
- * @summary The View corresponding to the current template helper, event handler, callback, or autorun.  If there isn't one, `null`.
- * @locus Client
- * @type {Blaze.View}
- */
-Blaze.currentView = null;
-
-Blaze._withCurrentView = function (view, func) {
-  var oldView = Blaze.currentView;
-  try {
-    Blaze.currentView = view;
-    return func();
-  } finally {
-    Blaze.currentView = oldView;
-  }
-};
-
-// Blaze.render publicly takes a View or a Template.
-// Privately, it takes any HTMLJS (extended with Views and Templates)
-// except null or undefined, or a function that returns any extended
-// HTMLJS.
-var checkRenderContent = function (content) {
-  if (content === null)
-    throw new Error("Can't render null");
-  if (typeof content === 'undefined')
-    throw new Error("Can't render undefined");
-
-  if ((content instanceof Blaze.View) ||
-      (content instanceof Blaze.Template) ||
-      (typeof content === 'function'))
-    return;
-
-  try {
-    // Throw if content doesn't look like HTMLJS at the top level
-    // (i.e. verify that this is an HTML.Tag, or an array,
-    // or a primitive, etc.)
-    (new HTML.Visitor).visit(content);
-  } catch (e) {
-    // Make error message suitable for public API
-    throw new Error("Expected Template or View");
-  }
-};
-
-// For Blaze.render and Blaze.toHTML, take content and
-// wrap it in a View, unless it's a single View or
-// Template already.
-var contentAsView = function (content) {
-  checkRenderContent(content);
-
-  if (content instanceof Blaze.Template) {
-    return content.constructView();
-  } else if (content instanceof Blaze.View) {
-    return content;
-  } else {
-    var func = content;
-    if (typeof func !== 'function') {
-      func = function () {
-        return content;
-      };
-    }
-    return Blaze.View('render', func);
-  }
-};
-
-// For Blaze.renderWithData and Blaze.toHTMLWithData, wrap content
-// in a function, if necessary, so it can be a content arg to
-// a Blaze.With.
-var contentAsFunc = function (content) {
-  checkRenderContent(content);
-
-  if (typeof content !== 'function') {
-    return function () {
-      return content;
-    };
-  } else {
-    return content;
-  }
-};
-
-/**
- * @summary Renders a template or View to DOM nodes and inserts it into the DOM, returning a rendered [View](#blaze_view) which can be passed to [`Blaze.remove`](#blaze_remove).
- * @locus Client
- * @param {Template|Blaze.View} templateOrView The template (e.g. `Template.myTemplate`) or View object to render.  If a template, a View object is [constructed](#template_constructview).  If a View, it must be an unrendered View, which becomes a rendered View and is returned.
- * @param {DOMNode} parentNode The node that will be the parent of the rendered template.  It must be an Element node.
- * @param {DOMNode} [nextNode] Optional. If provided, must be a child of <em>parentNode</em>; the template will be inserted before this node. If not provided, the template will be inserted as the last child of parentNode.
- * @param {Blaze.View} [parentView] Optional. If provided, it will be set as the rendered View's [`parentView`](#view_parentview).
- */
-Blaze.render = function (content, parentElement, nextNode, parentView) {
-  if (! parentElement) {
-    Blaze._warn("Blaze.render without a parent element is deprecated. " +
-                "You must specify where to insert the rendered content.");
-  }
-
-  if (nextNode instanceof Blaze.View) {
-    // handle omitted nextNode
-    parentView = nextNode;
-    nextNode = null;
-  }
-
-  // parentElement must be a DOM node. in particular, can't be the
-  // result of a call to `$`. Can't check if `parentElement instanceof
-  // Node` since 'Node' is undefined in IE8.
-  if (parentElement && typeof parentElement.nodeType !== 'number')
-    throw new Error("'parentElement' must be a DOM node");
-  if (nextNode && typeof nextNode.nodeType !== 'number') // 'nextNode' is optional
-    throw new Error("'nextNode' must be a DOM node");
-
-  parentView = parentView || currentViewIfRendering();
-
-  var view = contentAsView(content);
-  Blaze._materializeView(view, parentView);
-
-  if (parentElement) {
-    view._domrange.attach(parentElement, nextNode);
-  }
-
-  return view;
-};
-
-Blaze.insert = function (view, parentElement, nextNode) {
-  Blaze._warn("Blaze.insert has been deprecated.  Specify where to insert the " +
-              "rendered content in the call to Blaze.render.");
-
-  if (! (view && (view._domrange instanceof Blaze._DOMRange)))
-    throw new Error("Expected template rendered with Blaze.render");
-
-  view._domrange.attach(parentElement, nextNode);
-};
-
-/**
- * @summary Renders a template or View to DOM nodes with a data context.  Otherwise identical to `Blaze.render`.
- * @locus Client
- * @param {Template|Blaze.View} templateOrView The template (e.g. `Template.myTemplate`) or View object to render.
- * @param {Object|Function} data The data context to use, or a function returning a data context.  If a function is provided, it will be reactively re-run.
- * @param {DOMNode} parentNode The node that will be the parent of the rendered template.  It must be an Element node.
- * @param {DOMNode} [nextNode] Optional. If provided, must be a child of <em>parentNode</em>; the template will be inserted before this node. If not provided, the template will be inserted as the last child of parentNode.
- * @param {Blaze.View} [parentView] Optional. If provided, it will be set as the rendered View's [`parentView`](#view_parentview).
- */
-Blaze.renderWithData = function (content, data, parentElement, nextNode, parentView) {
-  // We defer the handling of optional arguments to Blaze.render.  At this point,
-  // `nextNode` may actually be `parentView`.
-  return Blaze.render(Blaze._TemplateWith(data, contentAsFunc(content)),
-                          parentElement, nextNode, parentView);
-};
-
-/**
- * @summary Removes a rendered View from the DOM, stopping all reactive updates and event listeners on it. Also destroys the Blaze.Template instance associated with the view.
- * @locus Client
- * @param {Blaze.View} renderedView The return value from `Blaze.render` or `Blaze.renderWithData`, or the `view` property of a Blaze.Template instance. Calling `Blaze.remove(Template.instance().view)` from within a template event handler will destroy the view as well as that template and trigger the template's `onDestroyed` handlers.
- */
-Blaze.remove = function (view) {
-  if (! (view && (view._domrange instanceof Blaze._DOMRange)))
-    throw new Error("Expected template rendered with Blaze.render");
-
-  while (view) {
-    if (! view.isDestroyed) {
-      var range = view._domrange;
-      if (range.attached && ! range.parentRange)
-        range.detach();
-      range.destroy();
-    }
-
-    view = view._hasGeneratedParent && view.parentView;
-  }
-};
-
-/**
- * @summary Renders a template or View to a string of HTML.
- * @locus Client
- * @param {Template|Blaze.View} templateOrView The template (e.g. `Template.myTemplate`) or View object from which to generate HTML.
- */
-Blaze.toHTML = function (content, parentView) {
-  parentView = parentView || currentViewIfRendering();
-
-  return HTML.toHTML(Blaze._expandView(contentAsView(content), parentView));
-};
-
-/**
- * @summary Renders a template or View to HTML with a data context.  Otherwise identical to `Blaze.toHTML`.
- * @locus Client
- * @param {Template|Blaze.View} templateOrView The template (e.g. `Template.myTemplate`) or View object from which to generate HTML.
- * @param {Object|Function} data The data context to use, or a function returning a data context.
- */
-Blaze.toHTMLWithData = function (content, data, parentView) {
-  parentView = parentView || currentViewIfRendering();
-
-  return HTML.toHTML(Blaze._expandView(Blaze._TemplateWith(
-    data, contentAsFunc(content)), parentView));
-};
-
-Blaze._toText = function (htmljs, parentView, textMode) {
-  if (typeof htmljs === 'function')
-    throw new Error("Blaze._toText doesn't take a function, just HTMLjs");
-
-  if ((parentView != null) && ! (parentView instanceof Blaze.View)) {
-    // omitted parentView argument
-    textMode = parentView;
-    parentView = null;
-  }
-  parentView = parentView || currentViewIfRendering();
-
-  if (! textMode)
-    throw new Error("textMode required");
-  if (! (textMode === HTML.TEXTMODE.STRING ||
-         textMode === HTML.TEXTMODE.RCDATA ||
-         textMode === HTML.TEXTMODE.ATTRIBUTE))
-    throw new Error("Unknown textMode: " + textMode);
-
-  return HTML.toText(Blaze._expand(htmljs, parentView), textMode);
-};
-
-/**
- * @summary Returns the current data context, or the data context that was used when rendering a particular DOM element or View from a Meteor template.
- * @locus Client
- * @param {DOMElement|Blaze.View} [elementOrView] Optional.  An element that was rendered by a Meteor, or a View.
- */
-Blaze.getData = function (elementOrView) {
-  var theWith;
-
-  if (! elementOrView) {
-    theWith = Blaze.getView('with');
-  } else if (elementOrView instanceof Blaze.View) {
-    var view = elementOrView;
-    theWith = (view.name === 'with' ? view :
-               Blaze.getView(view, 'with'));
-  } else if (typeof elementOrView.nodeType === 'number') {
-    if (elementOrView.nodeType !== 1)
-      throw new Error("Expected DOM element");
-    theWith = Blaze.getView(elementOrView, 'with');
-  } else {
-    throw new Error("Expected DOM element or View");
-  }
-
-  return theWith ? theWith.dataVar.get() : null;
-};
-
-// For back-compat
-Blaze.getElementData = function (element) {
-  Blaze._warn("Blaze.getElementData has been deprecated.  Use " +
-              "Blaze.getData(element) instead.");
-
-  if (element.nodeType !== 1)
-    throw new Error("Expected DOM element");
-
-  return Blaze.getData(element);
-};
-
-// Both arguments are optional.
-
-/**
- * @summary Gets either the current View, or the View enclosing the given DOM element.
- * @locus Client
- * @param {DOMElement} [element] Optional.  If specified, the View enclosing `element` is returned.
- */
-Blaze.getView = function (elementOrView, _viewName) {
-  var viewName = _viewName;
-
-  if ((typeof elementOrView) === 'string') {
-    // omitted elementOrView; viewName present
-    viewName = elementOrView;
-    elementOrView = null;
-  }
-
-  // We could eventually shorten the code by folding the logic
-  // from the other methods into this method.
-  if (! elementOrView) {
-    return Blaze._getCurrentView(viewName);
-  } else if (elementOrView instanceof Blaze.View) {
-    return Blaze._getParentView(elementOrView, viewName);
-  } else if (typeof elementOrView.nodeType === 'number') {
-    return Blaze._getElementView(elementOrView, viewName);
-  } else {
-    throw new Error("Expected DOM element or View");
-  }
-};
-
-// Gets the current view or its nearest ancestor of name
-// `name`.
-Blaze._getCurrentView = function (name) {
-  var view = Blaze.currentView;
-  // Better to fail in cases where it doesn't make sense
-  // to use Blaze._getCurrentView().  There will be a current
-  // view anywhere it does.  You can check Blaze.currentView
-  // if you want to know whether there is one or not.
-  if (! view)
-    throw new Error("There is no current view");
-
-  if (name) {
-    while (view && view.name !== name)
-      view = view.parentView;
-    return view || null;
-  } else {
-    // Blaze._getCurrentView() with no arguments just returns
-    // Blaze.currentView.
-    return view;
-  }
-};
-
-Blaze._getParentView = function (view, name) {
-  var v = view.parentView;
-
-  if (name) {
-    while (v && v.name !== name)
-      v = v.parentView;
-  }
-
-  return v || null;
-};
-
-Blaze._getElementView = function (elem, name) {
-  var range = Blaze._DOMRange.forElement(elem);
-  var view = null;
-  while (range && ! view) {
-    view = (range.view || null);
-    if (! view) {
-      if (range.parentRange)
-        range = range.parentRange;
-      else
-        range = Blaze._DOMRange.forElement(range.parentElement);
-    }
-  }
-
-  if (name) {
-    while (view && view.name !== name)
-      view = view.parentView;
-    return view || null;
-  } else {
-    return view;
-  }
-};
-
-Blaze._addEventMap = function (view, eventMap, thisInHandler) {
-  thisInHandler = (thisInHandler || null);
-  var handles = [];
-
-  if (! view._domrange)
-    throw new Error("View must have a DOMRange");
-
-  view._domrange.onAttached(function attached_eventMaps(range, element) {
-    _.each(eventMap, function (handler, spec) {
-      var clauses = spec.split(/,\s+/);
-      // iterate over clauses of spec, e.g. ['click .foo', 'click .bar']
-      _.each(clauses, function (clause) {
-        var parts = clause.split(/\s+/);
-        if (parts.length === 0)
-          return;
-
-        var newEvents = parts.shift();
-        var selector = parts.join(' ');
-        handles.push(Blaze._EventSupport.listen(
-          element, newEvents, selector,
-          function (evt) {
-            if (! range.containsElement(evt.currentTarget))
-              return null;
-            var handlerThis = thisInHandler || this;
-            var handlerArgs = arguments;
-            return Blaze._withCurrentView(view, function () {
-              return handler.apply(handlerThis, handlerArgs);
-            });
-          },
-          range, function (r) {
-            return r.parentRange;
-          }));
-      });
-    });
-  });
-
-  view.onViewDestroyed(function () {
-    _.each(handles, function (h) {
-      h.stop();
-    });
-    handles.length = 0;
-  });
-};
diff --git a/packages/blaze/view_tests.js b/packages/blaze/view_tests.js
deleted file mode 100644
index c9f271723d..0000000000
--- a/packages/blaze/view_tests.js
+++ /dev/null
@@ -1,59 +0,0 @@
-if (Meteor.isClient) {
-
-  Tinytest.add("blaze - view - callbacks", function (test) {
-    var R = ReactiveVar('foo');
-
-    var buf = '';
-
-    var v = Blaze.View(function () {
-      return R.get();
-    });
-
-    v.onViewCreated(function () {
-      buf += 'c' + v.renderCount;
-    });
-    v._onViewRendered(function () {
-      buf += 'r' + v.renderCount;
-    });
-    v.onViewReady(function () {
-      buf += 'y' + v.renderCount;
-    });
-    v.onViewDestroyed(function () {
-      buf += 'd' + v.renderCount;
-    });
-
-    test.equal(buf, '');
-
-    var div = document.createElement("DIV");
-    test.isFalse(v.isRendered);
-    test.isFalse(v._isAttached);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-    test.throws(function () { v.firstNode(); }, /View must be attached/);
-    test.throws(function () { v.lastNode(); }, /View must be attached/);
-    Blaze.render(v, div);
-    test.equal(buf, 'c0r1');
-    test.equal(typeof (v.firstNode().nodeType), "number");
-    test.equal(typeof (v.lastNode().nodeType), "number");
-    test.isTrue(v.isRendered);
-    test.isTrue(v._isAttached);
-    test.equal(buf, 'c0r1');
-    test.equal(canonicalizeHtml(div.innerHTML), "foo");
-    Tracker.flush();
-    test.equal(buf, 'c0r1y1');
-
-    R.set("bar");
-    Tracker.flush();
-    test.equal(buf, 'c0r1y1r2y2');
-    test.equal(canonicalizeHtml(div.innerHTML), "bar");
-
-    Blaze.remove(v);
-    test.equal(buf, 'c0r1y1r2y2d2');
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    buf = "";
-    R.set("baz");
-    Tracker.flush();
-    test.equal(buf, "");
-  });
-
-}
diff --git a/packages/caching-html-compiler/README.md b/packages/caching-html-compiler/README.md
deleted file mode 100644
index d64298c59f..0000000000
--- a/packages/caching-html-compiler/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# caching-html-compiler
-
-Provides a pluggable class used to compile HTML-style templates in Meteor build plugins. This abstracts out a lot of the functionality you would need to implement the following plugins:
-
-1. `templating`
-2. `static-html`
-3. `simple:markdown-templating`
-
-It provides automatic caching and handles communicating with the build plugin APIs. The actual functions that convert HTML into compiled form are passed in as arguments into the constructor, allowing those functions to be unit tested separately from the caching and file system functionality.
-
--------
-
-### new CachingHtmlCompiler(name, tagScannerFunc, tagHandlerFunc)
-
-Constructs a new CachingHtmlCompiler that can be passed into `Plugin.registerCompiler`.
-
-#### Arguments
-
-1. `name` The name of the compiler, used when printing errors. Should probably be the same as the name of the build plugin and package it is used in.
-2. `tagScannerFunc` A function that takes a string representing a template file as input, and returns an array of Tag objects. See the README for `templating-tools` for more information about the Tag object.
-3. `tagHandlerFunc` A function that takes an array of Tag objects (the output of the previous argument) and returns an object with `js`, `body`, `head`, and `bodyAttr` properties, which will be added to the app through the build plugin API.
-
-#### Example
-
-Here is some example code from the `templating` package:
-
-```js
-Plugin.registerCompiler({
-  extensions: ['html'],
-  archMatching: 'web',
-  isTemplate: true
-}, () => new CachingHtmlCompiler(
-  "templating",
-  TemplatingTools.scanHtmlForTags,
-  TemplatingTools.compileTagsWithSpacebars
-));
-```
diff --git a/packages/caching-html-compiler/caching-html-compiler.js b/packages/caching-html-compiler/caching-html-compiler.js
deleted file mode 100644
index 43e01ee3ef..0000000000
--- a/packages/caching-html-compiler/caching-html-compiler.js
+++ /dev/null
@@ -1,141 +0,0 @@
-const path = Plugin.path;
-
-// The CompileResult type for this CachingCompiler is the return value of
-// htmlScanner.scan: a {js, head, body, bodyAttrs} object.
-CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler {
-  /**
-   * Constructor for CachingHtmlCompiler
-   * @param  {String} name The name of the compiler, printed in errors -
-   * should probably always be the same as the name of the build
-   * plugin/package
-   * @param  {Function} tagScannerFunc Transforms a template file (commonly
-   * .html) into an array of Tags
-   * @param  {Function} tagHandlerFunc Transforms an array of tags into a
-   * results object with js, body, head, and bodyAttrs properties
-   */
-  constructor(name, tagScannerFunc, tagHandlerFunc) {
-    super({
-      compilerName: name,
-      defaultCacheSize: 1024*1024*10,
-    });
-
-    this._bodyAttrInfo = null;
-
-    this.tagScannerFunc = tagScannerFunc;
-    this.tagHandlerFunc = tagHandlerFunc;
-  }
-
-  // Implements method from CachingCompilerBase
-  compileResultSize(compileResult) {
-    function lengthOrZero(field) {
-      return field ? field.length : 0;
-    }
-    return lengthOrZero(compileResult.head) + lengthOrZero(compileResult.body) +
-      lengthOrZero(compileResult.js);
-  }
-
-  // Overrides method from CachingCompiler
-  processFilesForTarget(inputFiles) {
-    this._bodyAttrInfo = {};
-    super.processFilesForTarget(inputFiles);
-  }
-
-  // Implements method from CachingCompilerBase
-  getCacheKey(inputFile) {
-    // Note: the path is only used for errors, so it doesn't have to be part
-    // of the cache key.
-    return inputFile.getSourceHash();
-  }
-
-  // Implements method from CachingCompiler
-  compileOneFile(inputFile) {
-    const contents = inputFile.getContentsAsString();
-    const inputPath = inputFile.getPathInPackage();
-    try {
-      const tags = this.tagScannerFunc({
-        sourceName: inputPath,
-        contents: contents,
-        tagNames: ["body", "head", "template"]
-      });
-
-      return this.tagHandlerFunc(tags);
-    } catch (e) {
-      if (e instanceof TemplatingTools.CompileError) {
-        inputFile.error({
-          message: e.message,
-          line: e.line
-        });
-        return null;
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  // Implements method from CachingCompilerBase
-  addCompileResult(inputFile, compileResult) {
-    let allJavaScript = "";
-
-    if (compileResult.head) {
-      inputFile.addHtml({ section: "head", data: compileResult.head });
-    }
-
-    if (compileResult.body) {
-      inputFile.addHtml({ section: "body", data: compileResult.body });
-    }
-
-    if (compileResult.js) {
-      allJavaScript += compileResult.js;
-    }
-
-    if (! _.isEmpty(compileResult.bodyAttrs)) {
-      Object.keys(compileResult.bodyAttrs).forEach((attr) => {
-        const value = compileResult.bodyAttrs[attr];
-        if (this._bodyAttrInfo.hasOwnProperty(attr) &&
-            this._bodyAttrInfo[attr].value !== value) {
-          // two conflicting attributes on <body> tags in two different template
-          // files
-          inputFile.error({
-            message:
-            `<body> declarations have conflicting values for the '${ attr }' ` +
-              `attribute in the following files: ` +
-              this._bodyAttrInfo[attr].inputFile.getPathInPackage() +
-              `, ${ inputFile.getPathInPackage() }`
-          });
-        } else {
-          this._bodyAttrInfo[attr] = {inputFile, value};
-        }
-      });
-
-      // Add JavaScript code to set attributes on body
-      allJavaScript +=
-`Meteor.startup(function() {
-  var attrs = ${JSON.stringify(compileResult.bodyAttrs)};
-  for (var prop in attrs) {
-    document.body.setAttribute(prop, attrs[prop]);
-  }
-});
-`;
-    }
-    
-
-    if (allJavaScript) {
-      const filePath = inputFile.getPathInPackage();
-      // XXX this path manipulation may be unnecessarily complex
-      let pathPart = path.dirname(filePath);
-      if (pathPart === '.')
-        pathPart = '';
-      if (pathPart.length && pathPart !== path.sep)
-        pathPart = pathPart + path.sep;
-      const ext = path.extname(filePath);
-      const basename = path.basename(filePath, ext);
-
-      // XXX generate a source map
-
-      inputFile.addJavaScript({
-        path: path.join(pathPart, "template." + basename + ".js"),
-        data: allJavaScript
-      });
-    }
-  }
-}
diff --git a/packages/caching-html-compiler/package.js b/packages/caching-html-compiler/package.js
deleted file mode 100644
index df7d81a1d1..0000000000
--- a/packages/caching-html-compiler/package.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Package.describe({
-  version: '1.0.6',
-  // Brief, one-line summary of the package.
-  summary: 'Pluggable class for compiling HTML into templates',
-  // By default, Meteor will default to using README.md for documentation.
-  // To avoid submitting documentation, set this field to null.
-  documentation: 'README.md'
-});
-
-Package.onUse(function(api) {
-  api.use([
-    'underscore',
-    'caching-compiler',
-    'templating-tools',
-    'ecmascript'
-  ]);
-
-  api.addFiles('caching-html-compiler.js', 'server');
-
-  api.export("CachingHtmlCompiler", 'server');
-});
diff --git a/packages/html-tools/.gitignore b/packages/html-tools/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/html-tools/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/html-tools/README.md b/packages/html-tools/README.md
deleted file mode 100644
index 5b60bae263..0000000000
--- a/packages/html-tools/README.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# html-tools
-
-A lightweight HTML tokenizer and parser which outputs to the HTMLjs
-object representation.  Special hooks allow the syntax to be extended
-to parse an HTML-like template language like Spacebars.
-
-```
-HTMLTools.parseFragment("<div class=greeting>Hello<br>World</div>")
-
-=> HTML.DIV({'class':'greeting'}, "Hello", HTML.BR(), "World"))
-```
-
-This package is used by the Spacebars compiler, which normally only
-runs at bundle time but can also be used at runtime on the client or
-server.
-
-## Invoking the Parser
-
-`HTMLTools.parseFragment(input, options)` - Takes an input string or Scanner object and returns HTMLjs.
-
-In the basic case, where no options are passed, `parseFragment` will consume the entire input (the full string or the rest of the Scanner).
-
-The options are as follows:
-
-#### getTemplateTag
-
-This option extends the HTML parser to parse template tags such as `{{foo}}`.
-
-`getTemplateTag: function (scanner, templateTagPosition) { ... }` - A function for the parser to call after every HTML token and at various positions within tags.  If the function returns an instanceof `HTMLTools.TemplateTag`, it is inserted into the HTMLjs tree at the appropriate location.  The constructor is `HTMLTools.TemplateTag(props)`, where props is an object whose properties are copied to the `TemplateTag` instance.  You can also call the constructor with no arguments and assign whatever properties you want, or you can subclass `TemplateTag`.
-
-There are four possible outcomes when `getTemplateTag` is called:
-
-* Not a template tag - Leave the scanner as is, and return `null`.  A quick peek at the next character should bail to this case if the start of a template tag is not seen.
-* Bad template tag - Call `scanner.fatal`, which aborts parsing completely.  Once the beginning of a template tag is seen, `getTemplateTag` will generally want to commit, and either succeed or fail trying).
-* Good template tag - Advance the scanner to the end of the template tag and return an `HTMLTools.TemplateTag` object.
-* Comment tag - Advance the scanner and return `null`.  For example, a Spacebars comment is `{{! foo}}`.
-
-The `templateTagPosition` argument to `getTemplateTag` is one of:
-
-* `HTMLTools.TEMPLATE_TAG_POSITION.ELEMENT` - At "element level," meaning somewhere an HTML tag could be.
-* `HTMLTools.TEMPLATE_TAG_POSITION.IN_START_TAG` - Inside a start tag, as in `<div {{foo}}>`, where you might otherwise find `name=value`.
-* `HTMLTools.TEMPLATE_TAG_POSITION.IN_ATTRIBUTE` - Inside the value of an HTML attribute, as in `<div class={{foo}}>`.
-* `HTMLTools.TEMPLATE_TAG_POSITION.IN_RCDATA` - Inside a TEXTAREA or a block helper inside an attribute, where character references are allowed ("replaced character data") but not tags.
-* `HTMLTools.TEMPLATE_TAG_POSITION.IN_RAWTEXT` - In a context where character references are not parsed, such as a script tag, style tag, or markdown helper.
-
-It's completely normal for `getTemplateTag` to invoke `HTMLTools.parseFragment` recursively on the same scanner (see `shouldStop`).  If it does so, the same value of `getTemplateTag` must be passed to the second invocation.
-
-At the moment, template tags must begin with `{`.  The parser does not try calling `getTemplateTag` for every character of an HTML document, only at token boundaries, and it knows to always end a token at `{`.
-
-#### textMode
-
-The `textMode` option, if present, causes the parser to parse text (such as the contents of a `<textarea>` tag or part of an attribute) instead of HTML.  In a text mode, for example, the input `"<"` is not a parse error (because a bare `<` is allowed in a textarea or attribute).
-
-The value of `textMode` must be one of:
-
-* `HTML.TEXTMODE.RCDATA` - Interpret character references (the usual case)
-* `HTML.TEXTMODE.STRING` - Don't interpret character references (the RAWTEXT case)
-
-#### shouldStop
-
-`shouldStop: function (scanner) { ... }` - A function that the parser invokes between tokens to check whether it should stop parsing.  The function should return a boolean value.
-
-The `shouldStop` function provides a way to put a "wall" in the input stream for the purpose of parsing HTML content embedded in a template tag.  For example, take the template `{{#if happy}}yay{{/if}}`.  The scanner will be advanced to the start of the word `yay` before `parseFragment` is called to parse the contents of the tag.  (Note that the caller happens to be the `getTemplateTag` function of an enclosing `parseFragment`.)  When parsing from `yay`, the `shouldStop` function is used to end the fragment at `{{/if}}`, which, like `{{/blah}}` or `{{else}}`, couldn't possibly be actual content that belongs in the fragment.  Even if HTML tags are not closed, as in the malformed template `{{#if foo}}<div>{{else}}`, the fragment stops at the `{{else}}`, and the error is an unclosed `<div>` (before the parser notices the unclosed `{{#if}}`).
-
-## HTMLTools.Scanner class
-
-To write `getTemplateTag` and `shouldStop` functions, you have to
-interface with the `HTMLTools.Scanner` class used by html-tools.  It's a
-general class that could be used by any parser/lexer/tokenizer.
-
-A Scanner has an immutable source document and a mutable pointer into
-the document.
-
-* `new Scanner(input)` - constructs a Scanner with source string `input`
-* `scanner.input` (read-only) - the entire source string
-* `scanner.pos` (read/write) - the current index into the source string
-
-Scanners provide these methods for convenience:
-
-* `scanner.rest()` - `input.slice(pos)` (the rest of the document)
-* `scanner.peek()` - `input.charAt(pos)` (the next character)
-* `scanner.isEOF()` - true if `pos` is at or beyond the end of `input`
-* `scanner.fatal(msg)` - throw an error indicating a problem at `pos`
-
-Even though `scanner.rest()` performs a substring operation, it should be considered fast and O(1), because all known JavaScript runtimes in use have constant-time substring.  It would be possible, but extremely clumsy, to avoid such a substring operation while performing the usual business of a parser, which is to try to match a regex anchored at a particular index.
-
-Functions that take scanners generally have three possible outcomes:
-
-* Success:  Advance `scanner.pos` and return some truthy value
-* Failure: Leave `scanner.pos` alone and return `null`
-* Fatal: Throw an exception via `scanner.fatal`
-
-It's particularly important that in the Failure case, the function restores the scanner to the state it found it.  This makes it possible to immediately try another parse function when one fails and form alternations such as `foo(scanner) || bar(scanner)`.
-
-It's often easiest to avoid the Failure case altogether, writing parse functions that always succeed or throw.  This requires less bookkeeping and leads to good error messages.  A Failure case may be added if it is simple to check for up front and makes the function easier to use in an alternation.  We say a function has "committed" or "will succeed or fail fatally trying" when it has reached a point where it must return a value or throw.  Any parse function that has moved the scanner position and not remembered the original position is necessarily committed.  Usually, committing is completely natural in the context of the language being parsed; for example, `{{` in a template always starts a template tag or throws an error about a malformed template tag.
-
-## HTML Dialect
-
-HTML has many dialects and potential degrees of permissiveness.  We
-use the WHATWG syntax spec and are pretty strict, failing on any
-"parse error" cases, which basically means the input has to be
-valid "HTML5" (except for the template tags).
-
-HTML syntax references:
-
-* [Human-readable syntax guide](http://developers.whatwg.org/syntax.html#syntax)
-* [Tokenization state machine](http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html)
-
-The WHATWG parser without error recovery is strict compared to
-browsers (which will recover from almost anything), but lenient
-compared to the now-defunct XHTML spec (which required lowercase tag
-names and lots more escaping of special characters).
-
-The following are examples of **errors**:
-
-* A stray or unclosed `<` character
-* An unknown character reference like `&asdf;`
-* Self-closing tags like `<div/>` (except for BR, HR, INPUT, and other "void" elements)
-* End tags for void elements (BR, HR, INPUT, etc.)
-* Missing end tags, in most cases (e.g. missing `</div>`)
-
-The following are **permitted**:
-
-* Bare `>` characters
-* Bare `&` that can't be confused with a character reference
-* Uppercase or lowercase tag and attribute names (case insensitive)
-* Unquoted and valueless attributes - `<input type=checkbox checked>`
-* Most characters in attribute values - `<img alt=x,y>`
-* Embedded SVG elements
-
-Note: Currently you have to close your Ps, LIs, and other tags for
-which the spec allows the end tag to be omitted in many cases
-
-## Character References
-
-This package contains a lookup table for all known named character references in HTML, of which there are over 2,000, from `&Aacute;` (capital A, acute accent) to `&zwnj;` (zero-width non-joiner), as well as code for interpreting numeric character entities like `&#65;`.
-
-Since character references are parsed into `HTML.CharRef` objects which contain both the raw and interpreted form, we never have to convert between the forms except at parse time.
-
diff --git a/packages/html-tools/charref.js b/packages/html-tools/charref.js
deleted file mode 100644
index ff437ee8b8..0000000000
--- a/packages/html-tools/charref.js
+++ /dev/null
@@ -1,2414 +0,0 @@
-
-// http://www.whatwg.org/specs/web-apps/current-work/multipage/entities.json
-
-
-// Note that some entities don't have a final semicolon!  These are used to
-// make `&lt` (for example) with no semicolon a parse error but `&abcde` not.
-
-var ENTITIES = {
-  "&Aacute;": { "codepoints": [193], "characters": "\u00C1" },
-  "&Aacute": { "codepoints": [193], "characters": "\u00C1" },
-  "&aacute;": { "codepoints": [225], "characters": "\u00E1" },
-  "&aacute": { "codepoints": [225], "characters": "\u00E1" },
-  "&Abreve;": { "codepoints": [258], "characters": "\u0102" },
-  "&abreve;": { "codepoints": [259], "characters": "\u0103" },
-  "&ac;": { "codepoints": [8766], "characters": "\u223E" },
-  "&acd;": { "codepoints": [8767], "characters": "\u223F" },
-  "&acE;": { "codepoints": [8766, 819], "characters": "\u223E\u0333" },
-  "&Acirc;": { "codepoints": [194], "characters": "\u00C2" },
-  "&Acirc": { "codepoints": [194], "characters": "\u00C2" },
-  "&acirc;": { "codepoints": [226], "characters": "\u00E2" },
-  "&acirc": { "codepoints": [226], "characters": "\u00E2" },
-  "&acute;": { "codepoints": [180], "characters": "\u00B4" },
-  "&acute": { "codepoints": [180], "characters": "\u00B4" },
-  "&Acy;": { "codepoints": [1040], "characters": "\u0410" },
-  "&acy;": { "codepoints": [1072], "characters": "\u0430" },
-  "&AElig;": { "codepoints": [198], "characters": "\u00C6" },
-  "&AElig": { "codepoints": [198], "characters": "\u00C6" },
-  "&aelig;": { "codepoints": [230], "characters": "\u00E6" },
-  "&aelig": { "codepoints": [230], "characters": "\u00E6" },
-  "&af;": { "codepoints": [8289], "characters": "\u2061" },
-  "&Afr;": { "codepoints": [120068], "characters": "\uD835\uDD04" },
-  "&afr;": { "codepoints": [120094], "characters": "\uD835\uDD1E" },
-  "&Agrave;": { "codepoints": [192], "characters": "\u00C0" },
-  "&Agrave": { "codepoints": [192], "characters": "\u00C0" },
-  "&agrave;": { "codepoints": [224], "characters": "\u00E0" },
-  "&agrave": { "codepoints": [224], "characters": "\u00E0" },
-  "&alefsym;": { "codepoints": [8501], "characters": "\u2135" },
-  "&aleph;": { "codepoints": [8501], "characters": "\u2135" },
-  "&Alpha;": { "codepoints": [913], "characters": "\u0391" },
-  "&alpha;": { "codepoints": [945], "characters": "\u03B1" },
-  "&Amacr;": { "codepoints": [256], "characters": "\u0100" },
-  "&amacr;": { "codepoints": [257], "characters": "\u0101" },
-  "&amalg;": { "codepoints": [10815], "characters": "\u2A3F" },
-  "&amp;": { "codepoints": [38], "characters": "\u0026" },
-  "&amp": { "codepoints": [38], "characters": "\u0026" },
-  "&AMP;": { "codepoints": [38], "characters": "\u0026" },
-  "&AMP": { "codepoints": [38], "characters": "\u0026" },
-  "&andand;": { "codepoints": [10837], "characters": "\u2A55" },
-  "&And;": { "codepoints": [10835], "characters": "\u2A53" },
-  "&and;": { "codepoints": [8743], "characters": "\u2227" },
-  "&andd;": { "codepoints": [10844], "characters": "\u2A5C" },
-  "&andslope;": { "codepoints": [10840], "characters": "\u2A58" },
-  "&andv;": { "codepoints": [10842], "characters": "\u2A5A" },
-  "&ang;": { "codepoints": [8736], "characters": "\u2220" },
-  "&ange;": { "codepoints": [10660], "characters": "\u29A4" },
-  "&angle;": { "codepoints": [8736], "characters": "\u2220" },
-  "&angmsdaa;": { "codepoints": [10664], "characters": "\u29A8" },
-  "&angmsdab;": { "codepoints": [10665], "characters": "\u29A9" },
-  "&angmsdac;": { "codepoints": [10666], "characters": "\u29AA" },
-  "&angmsdad;": { "codepoints": [10667], "characters": "\u29AB" },
-  "&angmsdae;": { "codepoints": [10668], "characters": "\u29AC" },
-  "&angmsdaf;": { "codepoints": [10669], "characters": "\u29AD" },
-  "&angmsdag;": { "codepoints": [10670], "characters": "\u29AE" },
-  "&angmsdah;": { "codepoints": [10671], "characters": "\u29AF" },
-  "&angmsd;": { "codepoints": [8737], "characters": "\u2221" },
-  "&angrt;": { "codepoints": [8735], "characters": "\u221F" },
-  "&angrtvb;": { "codepoints": [8894], "characters": "\u22BE" },
-  "&angrtvbd;": { "codepoints": [10653], "characters": "\u299D" },
-  "&angsph;": { "codepoints": [8738], "characters": "\u2222" },
-  "&angst;": { "codepoints": [197], "characters": "\u00C5" },
-  "&angzarr;": { "codepoints": [9084], "characters": "\u237C" },
-  "&Aogon;": { "codepoints": [260], "characters": "\u0104" },
-  "&aogon;": { "codepoints": [261], "characters": "\u0105" },
-  "&Aopf;": { "codepoints": [120120], "characters": "\uD835\uDD38" },
-  "&aopf;": { "codepoints": [120146], "characters": "\uD835\uDD52" },
-  "&apacir;": { "codepoints": [10863], "characters": "\u2A6F" },
-  "&ap;": { "codepoints": [8776], "characters": "\u2248" },
-  "&apE;": { "codepoints": [10864], "characters": "\u2A70" },
-  "&ape;": { "codepoints": [8778], "characters": "\u224A" },
-  "&apid;": { "codepoints": [8779], "characters": "\u224B" },
-  "&apos;": { "codepoints": [39], "characters": "\u0027" },
-  "&ApplyFunction;": { "codepoints": [8289], "characters": "\u2061" },
-  "&approx;": { "codepoints": [8776], "characters": "\u2248" },
-  "&approxeq;": { "codepoints": [8778], "characters": "\u224A" },
-  "&Aring;": { "codepoints": [197], "characters": "\u00C5" },
-  "&Aring": { "codepoints": [197], "characters": "\u00C5" },
-  "&aring;": { "codepoints": [229], "characters": "\u00E5" },
-  "&aring": { "codepoints": [229], "characters": "\u00E5" },
-  "&Ascr;": { "codepoints": [119964], "characters": "\uD835\uDC9C" },
-  "&ascr;": { "codepoints": [119990], "characters": "\uD835\uDCB6" },
-  "&Assign;": { "codepoints": [8788], "characters": "\u2254" },
-  "&ast;": { "codepoints": [42], "characters": "\u002A" },
-  "&asymp;": { "codepoints": [8776], "characters": "\u2248" },
-  "&asympeq;": { "codepoints": [8781], "characters": "\u224D" },
-  "&Atilde;": { "codepoints": [195], "characters": "\u00C3" },
-  "&Atilde": { "codepoints": [195], "characters": "\u00C3" },
-  "&atilde;": { "codepoints": [227], "characters": "\u00E3" },
-  "&atilde": { "codepoints": [227], "characters": "\u00E3" },
-  "&Auml;": { "codepoints": [196], "characters": "\u00C4" },
-  "&Auml": { "codepoints": [196], "characters": "\u00C4" },
-  "&auml;": { "codepoints": [228], "characters": "\u00E4" },
-  "&auml": { "codepoints": [228], "characters": "\u00E4" },
-  "&awconint;": { "codepoints": [8755], "characters": "\u2233" },
-  "&awint;": { "codepoints": [10769], "characters": "\u2A11" },
-  "&backcong;": { "codepoints": [8780], "characters": "\u224C" },
-  "&backepsilon;": { "codepoints": [1014], "characters": "\u03F6" },
-  "&backprime;": { "codepoints": [8245], "characters": "\u2035" },
-  "&backsim;": { "codepoints": [8765], "characters": "\u223D" },
-  "&backsimeq;": { "codepoints": [8909], "characters": "\u22CD" },
-  "&Backslash;": { "codepoints": [8726], "characters": "\u2216" },
-  "&Barv;": { "codepoints": [10983], "characters": "\u2AE7" },
-  "&barvee;": { "codepoints": [8893], "characters": "\u22BD" },
-  "&barwed;": { "codepoints": [8965], "characters": "\u2305" },
-  "&Barwed;": { "codepoints": [8966], "characters": "\u2306" },
-  "&barwedge;": { "codepoints": [8965], "characters": "\u2305" },
-  "&bbrk;": { "codepoints": [9141], "characters": "\u23B5" },
-  "&bbrktbrk;": { "codepoints": [9142], "characters": "\u23B6" },
-  "&bcong;": { "codepoints": [8780], "characters": "\u224C" },
-  "&Bcy;": { "codepoints": [1041], "characters": "\u0411" },
-  "&bcy;": { "codepoints": [1073], "characters": "\u0431" },
-  "&bdquo;": { "codepoints": [8222], "characters": "\u201E" },
-  "&becaus;": { "codepoints": [8757], "characters": "\u2235" },
-  "&because;": { "codepoints": [8757], "characters": "\u2235" },
-  "&Because;": { "codepoints": [8757], "characters": "\u2235" },
-  "&bemptyv;": { "codepoints": [10672], "characters": "\u29B0" },
-  "&bepsi;": { "codepoints": [1014], "characters": "\u03F6" },
-  "&bernou;": { "codepoints": [8492], "characters": "\u212C" },
-  "&Bernoullis;": { "codepoints": [8492], "characters": "\u212C" },
-  "&Beta;": { "codepoints": [914], "characters": "\u0392" },
-  "&beta;": { "codepoints": [946], "characters": "\u03B2" },
-  "&beth;": { "codepoints": [8502], "characters": "\u2136" },
-  "&between;": { "codepoints": [8812], "characters": "\u226C" },
-  "&Bfr;": { "codepoints": [120069], "characters": "\uD835\uDD05" },
-  "&bfr;": { "codepoints": [120095], "characters": "\uD835\uDD1F" },
-  "&bigcap;": { "codepoints": [8898], "characters": "\u22C2" },
-  "&bigcirc;": { "codepoints": [9711], "characters": "\u25EF" },
-  "&bigcup;": { "codepoints": [8899], "characters": "\u22C3" },
-  "&bigodot;": { "codepoints": [10752], "characters": "\u2A00" },
-  "&bigoplus;": { "codepoints": [10753], "characters": "\u2A01" },
-  "&bigotimes;": { "codepoints": [10754], "characters": "\u2A02" },
-  "&bigsqcup;": { "codepoints": [10758], "characters": "\u2A06" },
-  "&bigstar;": { "codepoints": [9733], "characters": "\u2605" },
-  "&bigtriangledown;": { "codepoints": [9661], "characters": "\u25BD" },
-  "&bigtriangleup;": { "codepoints": [9651], "characters": "\u25B3" },
-  "&biguplus;": { "codepoints": [10756], "characters": "\u2A04" },
-  "&bigvee;": { "codepoints": [8897], "characters": "\u22C1" },
-  "&bigwedge;": { "codepoints": [8896], "characters": "\u22C0" },
-  "&bkarow;": { "codepoints": [10509], "characters": "\u290D" },
-  "&blacklozenge;": { "codepoints": [10731], "characters": "\u29EB" },
-  "&blacksquare;": { "codepoints": [9642], "characters": "\u25AA" },
-  "&blacktriangle;": { "codepoints": [9652], "characters": "\u25B4" },
-  "&blacktriangledown;": { "codepoints": [9662], "characters": "\u25BE" },
-  "&blacktriangleleft;": { "codepoints": [9666], "characters": "\u25C2" },
-  "&blacktriangleright;": { "codepoints": [9656], "characters": "\u25B8" },
-  "&blank;": { "codepoints": [9251], "characters": "\u2423" },
-  "&blk12;": { "codepoints": [9618], "characters": "\u2592" },
-  "&blk14;": { "codepoints": [9617], "characters": "\u2591" },
-  "&blk34;": { "codepoints": [9619], "characters": "\u2593" },
-  "&block;": { "codepoints": [9608], "characters": "\u2588" },
-  "&bne;": { "codepoints": [61, 8421], "characters": "\u003D\u20E5" },
-  "&bnequiv;": { "codepoints": [8801, 8421], "characters": "\u2261\u20E5" },
-  "&bNot;": { "codepoints": [10989], "characters": "\u2AED" },
-  "&bnot;": { "codepoints": [8976], "characters": "\u2310" },
-  "&Bopf;": { "codepoints": [120121], "characters": "\uD835\uDD39" },
-  "&bopf;": { "codepoints": [120147], "characters": "\uD835\uDD53" },
-  "&bot;": { "codepoints": [8869], "characters": "\u22A5" },
-  "&bottom;": { "codepoints": [8869], "characters": "\u22A5" },
-  "&bowtie;": { "codepoints": [8904], "characters": "\u22C8" },
-  "&boxbox;": { "codepoints": [10697], "characters": "\u29C9" },
-  "&boxdl;": { "codepoints": [9488], "characters": "\u2510" },
-  "&boxdL;": { "codepoints": [9557], "characters": "\u2555" },
-  "&boxDl;": { "codepoints": [9558], "characters": "\u2556" },
-  "&boxDL;": { "codepoints": [9559], "characters": "\u2557" },
-  "&boxdr;": { "codepoints": [9484], "characters": "\u250C" },
-  "&boxdR;": { "codepoints": [9554], "characters": "\u2552" },
-  "&boxDr;": { "codepoints": [9555], "characters": "\u2553" },
-  "&boxDR;": { "codepoints": [9556], "characters": "\u2554" },
-  "&boxh;": { "codepoints": [9472], "characters": "\u2500" },
-  "&boxH;": { "codepoints": [9552], "characters": "\u2550" },
-  "&boxhd;": { "codepoints": [9516], "characters": "\u252C" },
-  "&boxHd;": { "codepoints": [9572], "characters": "\u2564" },
-  "&boxhD;": { "codepoints": [9573], "characters": "\u2565" },
-  "&boxHD;": { "codepoints": [9574], "characters": "\u2566" },
-  "&boxhu;": { "codepoints": [9524], "characters": "\u2534" },
-  "&boxHu;": { "codepoints": [9575], "characters": "\u2567" },
-  "&boxhU;": { "codepoints": [9576], "characters": "\u2568" },
-  "&boxHU;": { "codepoints": [9577], "characters": "\u2569" },
-  "&boxminus;": { "codepoints": [8863], "characters": "\u229F" },
-  "&boxplus;": { "codepoints": [8862], "characters": "\u229E" },
-  "&boxtimes;": { "codepoints": [8864], "characters": "\u22A0" },
-  "&boxul;": { "codepoints": [9496], "characters": "\u2518" },
-  "&boxuL;": { "codepoints": [9563], "characters": "\u255B" },
-  "&boxUl;": { "codepoints": [9564], "characters": "\u255C" },
-  "&boxUL;": { "codepoints": [9565], "characters": "\u255D" },
-  "&boxur;": { "codepoints": [9492], "characters": "\u2514" },
-  "&boxuR;": { "codepoints": [9560], "characters": "\u2558" },
-  "&boxUr;": { "codepoints": [9561], "characters": "\u2559" },
-  "&boxUR;": { "codepoints": [9562], "characters": "\u255A" },
-  "&boxv;": { "codepoints": [9474], "characters": "\u2502" },
-  "&boxV;": { "codepoints": [9553], "characters": "\u2551" },
-  "&boxvh;": { "codepoints": [9532], "characters": "\u253C" },
-  "&boxvH;": { "codepoints": [9578], "characters": "\u256A" },
-  "&boxVh;": { "codepoints": [9579], "characters": "\u256B" },
-  "&boxVH;": { "codepoints": [9580], "characters": "\u256C" },
-  "&boxvl;": { "codepoints": [9508], "characters": "\u2524" },
-  "&boxvL;": { "codepoints": [9569], "characters": "\u2561" },
-  "&boxVl;": { "codepoints": [9570], "characters": "\u2562" },
-  "&boxVL;": { "codepoints": [9571], "characters": "\u2563" },
-  "&boxvr;": { "codepoints": [9500], "characters": "\u251C" },
-  "&boxvR;": { "codepoints": [9566], "characters": "\u255E" },
-  "&boxVr;": { "codepoints": [9567], "characters": "\u255F" },
-  "&boxVR;": { "codepoints": [9568], "characters": "\u2560" },
-  "&bprime;": { "codepoints": [8245], "characters": "\u2035" },
-  "&breve;": { "codepoints": [728], "characters": "\u02D8" },
-  "&Breve;": { "codepoints": [728], "characters": "\u02D8" },
-  "&brvbar;": { "codepoints": [166], "characters": "\u00A6" },
-  "&brvbar": { "codepoints": [166], "characters": "\u00A6" },
-  "&bscr;": { "codepoints": [119991], "characters": "\uD835\uDCB7" },
-  "&Bscr;": { "codepoints": [8492], "characters": "\u212C" },
-  "&bsemi;": { "codepoints": [8271], "characters": "\u204F" },
-  "&bsim;": { "codepoints": [8765], "characters": "\u223D" },
-  "&bsime;": { "codepoints": [8909], "characters": "\u22CD" },
-  "&bsolb;": { "codepoints": [10693], "characters": "\u29C5" },
-  "&bsol;": { "codepoints": [92], "characters": "\u005C" },
-  "&bsolhsub;": { "codepoints": [10184], "characters": "\u27C8" },
-  "&bull;": { "codepoints": [8226], "characters": "\u2022" },
-  "&bullet;": { "codepoints": [8226], "characters": "\u2022" },
-  "&bump;": { "codepoints": [8782], "characters": "\u224E" },
-  "&bumpE;": { "codepoints": [10926], "characters": "\u2AAE" },
-  "&bumpe;": { "codepoints": [8783], "characters": "\u224F" },
-  "&Bumpeq;": { "codepoints": [8782], "characters": "\u224E" },
-  "&bumpeq;": { "codepoints": [8783], "characters": "\u224F" },
-  "&Cacute;": { "codepoints": [262], "characters": "\u0106" },
-  "&cacute;": { "codepoints": [263], "characters": "\u0107" },
-  "&capand;": { "codepoints": [10820], "characters": "\u2A44" },
-  "&capbrcup;": { "codepoints": [10825], "characters": "\u2A49" },
-  "&capcap;": { "codepoints": [10827], "characters": "\u2A4B" },
-  "&cap;": { "codepoints": [8745], "characters": "\u2229" },
-  "&Cap;": { "codepoints": [8914], "characters": "\u22D2" },
-  "&capcup;": { "codepoints": [10823], "characters": "\u2A47" },
-  "&capdot;": { "codepoints": [10816], "characters": "\u2A40" },
-  "&CapitalDifferentialD;": { "codepoints": [8517], "characters": "\u2145" },
-  "&caps;": { "codepoints": [8745, 65024], "characters": "\u2229\uFE00" },
-  "&caret;": { "codepoints": [8257], "characters": "\u2041" },
-  "&caron;": { "codepoints": [711], "characters": "\u02C7" },
-  "&Cayleys;": { "codepoints": [8493], "characters": "\u212D" },
-  "&ccaps;": { "codepoints": [10829], "characters": "\u2A4D" },
-  "&Ccaron;": { "codepoints": [268], "characters": "\u010C" },
-  "&ccaron;": { "codepoints": [269], "characters": "\u010D" },
-  "&Ccedil;": { "codepoints": [199], "characters": "\u00C7" },
-  "&Ccedil": { "codepoints": [199], "characters": "\u00C7" },
-  "&ccedil;": { "codepoints": [231], "characters": "\u00E7" },
-  "&ccedil": { "codepoints": [231], "characters": "\u00E7" },
-  "&Ccirc;": { "codepoints": [264], "characters": "\u0108" },
-  "&ccirc;": { "codepoints": [265], "characters": "\u0109" },
-  "&Cconint;": { "codepoints": [8752], "characters": "\u2230" },
-  "&ccups;": { "codepoints": [10828], "characters": "\u2A4C" },
-  "&ccupssm;": { "codepoints": [10832], "characters": "\u2A50" },
-  "&Cdot;": { "codepoints": [266], "characters": "\u010A" },
-  "&cdot;": { "codepoints": [267], "characters": "\u010B" },
-  "&cedil;": { "codepoints": [184], "characters": "\u00B8" },
-  "&cedil": { "codepoints": [184], "characters": "\u00B8" },
-  "&Cedilla;": { "codepoints": [184], "characters": "\u00B8" },
-  "&cemptyv;": { "codepoints": [10674], "characters": "\u29B2" },
-  "&cent;": { "codepoints": [162], "characters": "\u00A2" },
-  "&cent": { "codepoints": [162], "characters": "\u00A2" },
-  "&centerdot;": { "codepoints": [183], "characters": "\u00B7" },
-  "&CenterDot;": { "codepoints": [183], "characters": "\u00B7" },
-  "&cfr;": { "codepoints": [120096], "characters": "\uD835\uDD20" },
-  "&Cfr;": { "codepoints": [8493], "characters": "\u212D" },
-  "&CHcy;": { "codepoints": [1063], "characters": "\u0427" },
-  "&chcy;": { "codepoints": [1095], "characters": "\u0447" },
-  "&check;": { "codepoints": [10003], "characters": "\u2713" },
-  "&checkmark;": { "codepoints": [10003], "characters": "\u2713" },
-  "&Chi;": { "codepoints": [935], "characters": "\u03A7" },
-  "&chi;": { "codepoints": [967], "characters": "\u03C7" },
-  "&circ;": { "codepoints": [710], "characters": "\u02C6" },
-  "&circeq;": { "codepoints": [8791], "characters": "\u2257" },
-  "&circlearrowleft;": { "codepoints": [8634], "characters": "\u21BA" },
-  "&circlearrowright;": { "codepoints": [8635], "characters": "\u21BB" },
-  "&circledast;": { "codepoints": [8859], "characters": "\u229B" },
-  "&circledcirc;": { "codepoints": [8858], "characters": "\u229A" },
-  "&circleddash;": { "codepoints": [8861], "characters": "\u229D" },
-  "&CircleDot;": { "codepoints": [8857], "characters": "\u2299" },
-  "&circledR;": { "codepoints": [174], "characters": "\u00AE" },
-  "&circledS;": { "codepoints": [9416], "characters": "\u24C8" },
-  "&CircleMinus;": { "codepoints": [8854], "characters": "\u2296" },
-  "&CirclePlus;": { "codepoints": [8853], "characters": "\u2295" },
-  "&CircleTimes;": { "codepoints": [8855], "characters": "\u2297" },
-  "&cir;": { "codepoints": [9675], "characters": "\u25CB" },
-  "&cirE;": { "codepoints": [10691], "characters": "\u29C3" },
-  "&cire;": { "codepoints": [8791], "characters": "\u2257" },
-  "&cirfnint;": { "codepoints": [10768], "characters": "\u2A10" },
-  "&cirmid;": { "codepoints": [10991], "characters": "\u2AEF" },
-  "&cirscir;": { "codepoints": [10690], "characters": "\u29C2" },
-  "&ClockwiseContourIntegral;": { "codepoints": [8754], "characters": "\u2232" },
-  "&CloseCurlyDoubleQuote;": { "codepoints": [8221], "characters": "\u201D" },
-  "&CloseCurlyQuote;": { "codepoints": [8217], "characters": "\u2019" },
-  "&clubs;": { "codepoints": [9827], "characters": "\u2663" },
-  "&clubsuit;": { "codepoints": [9827], "characters": "\u2663" },
-  "&colon;": { "codepoints": [58], "characters": "\u003A" },
-  "&Colon;": { "codepoints": [8759], "characters": "\u2237" },
-  "&Colone;": { "codepoints": [10868], "characters": "\u2A74" },
-  "&colone;": { "codepoints": [8788], "characters": "\u2254" },
-  "&coloneq;": { "codepoints": [8788], "characters": "\u2254" },
-  "&comma;": { "codepoints": [44], "characters": "\u002C" },
-  "&commat;": { "codepoints": [64], "characters": "\u0040" },
-  "&comp;": { "codepoints": [8705], "characters": "\u2201" },
-  "&compfn;": { "codepoints": [8728], "characters": "\u2218" },
-  "&complement;": { "codepoints": [8705], "characters": "\u2201" },
-  "&complexes;": { "codepoints": [8450], "characters": "\u2102" },
-  "&cong;": { "codepoints": [8773], "characters": "\u2245" },
-  "&congdot;": { "codepoints": [10861], "characters": "\u2A6D" },
-  "&Congruent;": { "codepoints": [8801], "characters": "\u2261" },
-  "&conint;": { "codepoints": [8750], "characters": "\u222E" },
-  "&Conint;": { "codepoints": [8751], "characters": "\u222F" },
-  "&ContourIntegral;": { "codepoints": [8750], "characters": "\u222E" },
-  "&copf;": { "codepoints": [120148], "characters": "\uD835\uDD54" },
-  "&Copf;": { "codepoints": [8450], "characters": "\u2102" },
-  "&coprod;": { "codepoints": [8720], "characters": "\u2210" },
-  "&Coproduct;": { "codepoints": [8720], "characters": "\u2210" },
-  "&copy;": { "codepoints": [169], "characters": "\u00A9" },
-  "&copy": { "codepoints": [169], "characters": "\u00A9" },
-  "&COPY;": { "codepoints": [169], "characters": "\u00A9" },
-  "&COPY": { "codepoints": [169], "characters": "\u00A9" },
-  "&copysr;": { "codepoints": [8471], "characters": "\u2117" },
-  "&CounterClockwiseContourIntegral;": { "codepoints": [8755], "characters": "\u2233" },
-  "&crarr;": { "codepoints": [8629], "characters": "\u21B5" },
-  "&cross;": { "codepoints": [10007], "characters": "\u2717" },
-  "&Cross;": { "codepoints": [10799], "characters": "\u2A2F" },
-  "&Cscr;": { "codepoints": [119966], "characters": "\uD835\uDC9E" },
-  "&cscr;": { "codepoints": [119992], "characters": "\uD835\uDCB8" },
-  "&csub;": { "codepoints": [10959], "characters": "\u2ACF" },
-  "&csube;": { "codepoints": [10961], "characters": "\u2AD1" },
-  "&csup;": { "codepoints": [10960], "characters": "\u2AD0" },
-  "&csupe;": { "codepoints": [10962], "characters": "\u2AD2" },
-  "&ctdot;": { "codepoints": [8943], "characters": "\u22EF" },
-  "&cudarrl;": { "codepoints": [10552], "characters": "\u2938" },
-  "&cudarrr;": { "codepoints": [10549], "characters": "\u2935" },
-  "&cuepr;": { "codepoints": [8926], "characters": "\u22DE" },
-  "&cuesc;": { "codepoints": [8927], "characters": "\u22DF" },
-  "&cularr;": { "codepoints": [8630], "characters": "\u21B6" },
-  "&cularrp;": { "codepoints": [10557], "characters": "\u293D" },
-  "&cupbrcap;": { "codepoints": [10824], "characters": "\u2A48" },
-  "&cupcap;": { "codepoints": [10822], "characters": "\u2A46" },
-  "&CupCap;": { "codepoints": [8781], "characters": "\u224D" },
-  "&cup;": { "codepoints": [8746], "characters": "\u222A" },
-  "&Cup;": { "codepoints": [8915], "characters": "\u22D3" },
-  "&cupcup;": { "codepoints": [10826], "characters": "\u2A4A" },
-  "&cupdot;": { "codepoints": [8845], "characters": "\u228D" },
-  "&cupor;": { "codepoints": [10821], "characters": "\u2A45" },
-  "&cups;": { "codepoints": [8746, 65024], "characters": "\u222A\uFE00" },
-  "&curarr;": { "codepoints": [8631], "characters": "\u21B7" },
-  "&curarrm;": { "codepoints": [10556], "characters": "\u293C" },
-  "&curlyeqprec;": { "codepoints": [8926], "characters": "\u22DE" },
-  "&curlyeqsucc;": { "codepoints": [8927], "characters": "\u22DF" },
-  "&curlyvee;": { "codepoints": [8910], "characters": "\u22CE" },
-  "&curlywedge;": { "codepoints": [8911], "characters": "\u22CF" },
-  "&curren;": { "codepoints": [164], "characters": "\u00A4" },
-  "&curren": { "codepoints": [164], "characters": "\u00A4" },
-  "&curvearrowleft;": { "codepoints": [8630], "characters": "\u21B6" },
-  "&curvearrowright;": { "codepoints": [8631], "characters": "\u21B7" },
-  "&cuvee;": { "codepoints": [8910], "characters": "\u22CE" },
-  "&cuwed;": { "codepoints": [8911], "characters": "\u22CF" },
-  "&cwconint;": { "codepoints": [8754], "characters": "\u2232" },
-  "&cwint;": { "codepoints": [8753], "characters": "\u2231" },
-  "&cylcty;": { "codepoints": [9005], "characters": "\u232D" },
-  "&dagger;": { "codepoints": [8224], "characters": "\u2020" },
-  "&Dagger;": { "codepoints": [8225], "characters": "\u2021" },
-  "&daleth;": { "codepoints": [8504], "characters": "\u2138" },
-  "&darr;": { "codepoints": [8595], "characters": "\u2193" },
-  "&Darr;": { "codepoints": [8609], "characters": "\u21A1" },
-  "&dArr;": { "codepoints": [8659], "characters": "\u21D3" },
-  "&dash;": { "codepoints": [8208], "characters": "\u2010" },
-  "&Dashv;": { "codepoints": [10980], "characters": "\u2AE4" },
-  "&dashv;": { "codepoints": [8867], "characters": "\u22A3" },
-  "&dbkarow;": { "codepoints": [10511], "characters": "\u290F" },
-  "&dblac;": { "codepoints": [733], "characters": "\u02DD" },
-  "&Dcaron;": { "codepoints": [270], "characters": "\u010E" },
-  "&dcaron;": { "codepoints": [271], "characters": "\u010F" },
-  "&Dcy;": { "codepoints": [1044], "characters": "\u0414" },
-  "&dcy;": { "codepoints": [1076], "characters": "\u0434" },
-  "&ddagger;": { "codepoints": [8225], "characters": "\u2021" },
-  "&ddarr;": { "codepoints": [8650], "characters": "\u21CA" },
-  "&DD;": { "codepoints": [8517], "characters": "\u2145" },
-  "&dd;": { "codepoints": [8518], "characters": "\u2146" },
-  "&DDotrahd;": { "codepoints": [10513], "characters": "\u2911" },
-  "&ddotseq;": { "codepoints": [10871], "characters": "\u2A77" },
-  "&deg;": { "codepoints": [176], "characters": "\u00B0" },
-  "&deg": { "codepoints": [176], "characters": "\u00B0" },
-  "&Del;": { "codepoints": [8711], "characters": "\u2207" },
-  "&Delta;": { "codepoints": [916], "characters": "\u0394" },
-  "&delta;": { "codepoints": [948], "characters": "\u03B4" },
-  "&demptyv;": { "codepoints": [10673], "characters": "\u29B1" },
-  "&dfisht;": { "codepoints": [10623], "characters": "\u297F" },
-  "&Dfr;": { "codepoints": [120071], "characters": "\uD835\uDD07" },
-  "&dfr;": { "codepoints": [120097], "characters": "\uD835\uDD21" },
-  "&dHar;": { "codepoints": [10597], "characters": "\u2965" },
-  "&dharl;": { "codepoints": [8643], "characters": "\u21C3" },
-  "&dharr;": { "codepoints": [8642], "characters": "\u21C2" },
-  "&DiacriticalAcute;": { "codepoints": [180], "characters": "\u00B4" },
-  "&DiacriticalDot;": { "codepoints": [729], "characters": "\u02D9" },
-  "&DiacriticalDoubleAcute;": { "codepoints": [733], "characters": "\u02DD" },
-  "&DiacriticalGrave;": { "codepoints": [96], "characters": "\u0060" },
-  "&DiacriticalTilde;": { "codepoints": [732], "characters": "\u02DC" },
-  "&diam;": { "codepoints": [8900], "characters": "\u22C4" },
-  "&diamond;": { "codepoints": [8900], "characters": "\u22C4" },
-  "&Diamond;": { "codepoints": [8900], "characters": "\u22C4" },
-  "&diamondsuit;": { "codepoints": [9830], "characters": "\u2666" },
-  "&diams;": { "codepoints": [9830], "characters": "\u2666" },
-  "&die;": { "codepoints": [168], "characters": "\u00A8" },
-  "&DifferentialD;": { "codepoints": [8518], "characters": "\u2146" },
-  "&digamma;": { "codepoints": [989], "characters": "\u03DD" },
-  "&disin;": { "codepoints": [8946], "characters": "\u22F2" },
-  "&div;": { "codepoints": [247], "characters": "\u00F7" },
-  "&divide;": { "codepoints": [247], "characters": "\u00F7" },
-  "&divide": { "codepoints": [247], "characters": "\u00F7" },
-  "&divideontimes;": { "codepoints": [8903], "characters": "\u22C7" },
-  "&divonx;": { "codepoints": [8903], "characters": "\u22C7" },
-  "&DJcy;": { "codepoints": [1026], "characters": "\u0402" },
-  "&djcy;": { "codepoints": [1106], "characters": "\u0452" },
-  "&dlcorn;": { "codepoints": [8990], "characters": "\u231E" },
-  "&dlcrop;": { "codepoints": [8973], "characters": "\u230D" },
-  "&dollar;": { "codepoints": [36], "characters": "\u0024" },
-  "&Dopf;": { "codepoints": [120123], "characters": "\uD835\uDD3B" },
-  "&dopf;": { "codepoints": [120149], "characters": "\uD835\uDD55" },
-  "&Dot;": { "codepoints": [168], "characters": "\u00A8" },
-  "&dot;": { "codepoints": [729], "characters": "\u02D9" },
-  "&DotDot;": { "codepoints": [8412], "characters": "\u20DC" },
-  "&doteq;": { "codepoints": [8784], "characters": "\u2250" },
-  "&doteqdot;": { "codepoints": [8785], "characters": "\u2251" },
-  "&DotEqual;": { "codepoints": [8784], "characters": "\u2250" },
-  "&dotminus;": { "codepoints": [8760], "characters": "\u2238" },
-  "&dotplus;": { "codepoints": [8724], "characters": "\u2214" },
-  "&dotsquare;": { "codepoints": [8865], "characters": "\u22A1" },
-  "&doublebarwedge;": { "codepoints": [8966], "characters": "\u2306" },
-  "&DoubleContourIntegral;": { "codepoints": [8751], "characters": "\u222F" },
-  "&DoubleDot;": { "codepoints": [168], "characters": "\u00A8" },
-  "&DoubleDownArrow;": { "codepoints": [8659], "characters": "\u21D3" },
-  "&DoubleLeftArrow;": { "codepoints": [8656], "characters": "\u21D0" },
-  "&DoubleLeftRightArrow;": { "codepoints": [8660], "characters": "\u21D4" },
-  "&DoubleLeftTee;": { "codepoints": [10980], "characters": "\u2AE4" },
-  "&DoubleLongLeftArrow;": { "codepoints": [10232], "characters": "\u27F8" },
-  "&DoubleLongLeftRightArrow;": { "codepoints": [10234], "characters": "\u27FA" },
-  "&DoubleLongRightArrow;": { "codepoints": [10233], "characters": "\u27F9" },
-  "&DoubleRightArrow;": { "codepoints": [8658], "characters": "\u21D2" },
-  "&DoubleRightTee;": { "codepoints": [8872], "characters": "\u22A8" },
-  "&DoubleUpArrow;": { "codepoints": [8657], "characters": "\u21D1" },
-  "&DoubleUpDownArrow;": { "codepoints": [8661], "characters": "\u21D5" },
-  "&DoubleVerticalBar;": { "codepoints": [8741], "characters": "\u2225" },
-  "&DownArrowBar;": { "codepoints": [10515], "characters": "\u2913" },
-  "&downarrow;": { "codepoints": [8595], "characters": "\u2193" },
-  "&DownArrow;": { "codepoints": [8595], "characters": "\u2193" },
-  "&Downarrow;": { "codepoints": [8659], "characters": "\u21D3" },
-  "&DownArrowUpArrow;": { "codepoints": [8693], "characters": "\u21F5" },
-  "&DownBreve;": { "codepoints": [785], "characters": "\u0311" },
-  "&downdownarrows;": { "codepoints": [8650], "characters": "\u21CA" },
-  "&downharpoonleft;": { "codepoints": [8643], "characters": "\u21C3" },
-  "&downharpoonright;": { "codepoints": [8642], "characters": "\u21C2" },
-  "&DownLeftRightVector;": { "codepoints": [10576], "characters": "\u2950" },
-  "&DownLeftTeeVector;": { "codepoints": [10590], "characters": "\u295E" },
-  "&DownLeftVectorBar;": { "codepoints": [10582], "characters": "\u2956" },
-  "&DownLeftVector;": { "codepoints": [8637], "characters": "\u21BD" },
-  "&DownRightTeeVector;": { "codepoints": [10591], "characters": "\u295F" },
-  "&DownRightVectorBar;": { "codepoints": [10583], "characters": "\u2957" },
-  "&DownRightVector;": { "codepoints": [8641], "characters": "\u21C1" },
-  "&DownTeeArrow;": { "codepoints": [8615], "characters": "\u21A7" },
-  "&DownTee;": { "codepoints": [8868], "characters": "\u22A4" },
-  "&drbkarow;": { "codepoints": [10512], "characters": "\u2910" },
-  "&drcorn;": { "codepoints": [8991], "characters": "\u231F" },
-  "&drcrop;": { "codepoints": [8972], "characters": "\u230C" },
-  "&Dscr;": { "codepoints": [119967], "characters": "\uD835\uDC9F" },
-  "&dscr;": { "codepoints": [119993], "characters": "\uD835\uDCB9" },
-  "&DScy;": { "codepoints": [1029], "characters": "\u0405" },
-  "&dscy;": { "codepoints": [1109], "characters": "\u0455" },
-  "&dsol;": { "codepoints": [10742], "characters": "\u29F6" },
-  "&Dstrok;": { "codepoints": [272], "characters": "\u0110" },
-  "&dstrok;": { "codepoints": [273], "characters": "\u0111" },
-  "&dtdot;": { "codepoints": [8945], "characters": "\u22F1" },
-  "&dtri;": { "codepoints": [9663], "characters": "\u25BF" },
-  "&dtrif;": { "codepoints": [9662], "characters": "\u25BE" },
-  "&duarr;": { "codepoints": [8693], "characters": "\u21F5" },
-  "&duhar;": { "codepoints": [10607], "characters": "\u296F" },
-  "&dwangle;": { "codepoints": [10662], "characters": "\u29A6" },
-  "&DZcy;": { "codepoints": [1039], "characters": "\u040F" },
-  "&dzcy;": { "codepoints": [1119], "characters": "\u045F" },
-  "&dzigrarr;": { "codepoints": [10239], "characters": "\u27FF" },
-  "&Eacute;": { "codepoints": [201], "characters": "\u00C9" },
-  "&Eacute": { "codepoints": [201], "characters": "\u00C9" },
-  "&eacute;": { "codepoints": [233], "characters": "\u00E9" },
-  "&eacute": { "codepoints": [233], "characters": "\u00E9" },
-  "&easter;": { "codepoints": [10862], "characters": "\u2A6E" },
-  "&Ecaron;": { "codepoints": [282], "characters": "\u011A" },
-  "&ecaron;": { "codepoints": [283], "characters": "\u011B" },
-  "&Ecirc;": { "codepoints": [202], "characters": "\u00CA" },
-  "&Ecirc": { "codepoints": [202], "characters": "\u00CA" },
-  "&ecirc;": { "codepoints": [234], "characters": "\u00EA" },
-  "&ecirc": { "codepoints": [234], "characters": "\u00EA" },
-  "&ecir;": { "codepoints": [8790], "characters": "\u2256" },
-  "&ecolon;": { "codepoints": [8789], "characters": "\u2255" },
-  "&Ecy;": { "codepoints": [1069], "characters": "\u042D" },
-  "&ecy;": { "codepoints": [1101], "characters": "\u044D" },
-  "&eDDot;": { "codepoints": [10871], "characters": "\u2A77" },
-  "&Edot;": { "codepoints": [278], "characters": "\u0116" },
-  "&edot;": { "codepoints": [279], "characters": "\u0117" },
-  "&eDot;": { "codepoints": [8785], "characters": "\u2251" },
-  "&ee;": { "codepoints": [8519], "characters": "\u2147" },
-  "&efDot;": { "codepoints": [8786], "characters": "\u2252" },
-  "&Efr;": { "codepoints": [120072], "characters": "\uD835\uDD08" },
-  "&efr;": { "codepoints": [120098], "characters": "\uD835\uDD22" },
-  "&eg;": { "codepoints": [10906], "characters": "\u2A9A" },
-  "&Egrave;": { "codepoints": [200], "characters": "\u00C8" },
-  "&Egrave": { "codepoints": [200], "characters": "\u00C8" },
-  "&egrave;": { "codepoints": [232], "characters": "\u00E8" },
-  "&egrave": { "codepoints": [232], "characters": "\u00E8" },
-  "&egs;": { "codepoints": [10902], "characters": "\u2A96" },
-  "&egsdot;": { "codepoints": [10904], "characters": "\u2A98" },
-  "&el;": { "codepoints": [10905], "characters": "\u2A99" },
-  "&Element;": { "codepoints": [8712], "characters": "\u2208" },
-  "&elinters;": { "codepoints": [9191], "characters": "\u23E7" },
-  "&ell;": { "codepoints": [8467], "characters": "\u2113" },
-  "&els;": { "codepoints": [10901], "characters": "\u2A95" },
-  "&elsdot;": { "codepoints": [10903], "characters": "\u2A97" },
-  "&Emacr;": { "codepoints": [274], "characters": "\u0112" },
-  "&emacr;": { "codepoints": [275], "characters": "\u0113" },
-  "&empty;": { "codepoints": [8709], "characters": "\u2205" },
-  "&emptyset;": { "codepoints": [8709], "characters": "\u2205" },
-  "&EmptySmallSquare;": { "codepoints": [9723], "characters": "\u25FB" },
-  "&emptyv;": { "codepoints": [8709], "characters": "\u2205" },
-  "&EmptyVerySmallSquare;": { "codepoints": [9643], "characters": "\u25AB" },
-  "&emsp13;": { "codepoints": [8196], "characters": "\u2004" },
-  "&emsp14;": { "codepoints": [8197], "characters": "\u2005" },
-  "&emsp;": { "codepoints": [8195], "characters": "\u2003" },
-  "&ENG;": { "codepoints": [330], "characters": "\u014A" },
-  "&eng;": { "codepoints": [331], "characters": "\u014B" },
-  "&ensp;": { "codepoints": [8194], "characters": "\u2002" },
-  "&Eogon;": { "codepoints": [280], "characters": "\u0118" },
-  "&eogon;": { "codepoints": [281], "characters": "\u0119" },
-  "&Eopf;": { "codepoints": [120124], "characters": "\uD835\uDD3C" },
-  "&eopf;": { "codepoints": [120150], "characters": "\uD835\uDD56" },
-  "&epar;": { "codepoints": [8917], "characters": "\u22D5" },
-  "&eparsl;": { "codepoints": [10723], "characters": "\u29E3" },
-  "&eplus;": { "codepoints": [10865], "characters": "\u2A71" },
-  "&epsi;": { "codepoints": [949], "characters": "\u03B5" },
-  "&Epsilon;": { "codepoints": [917], "characters": "\u0395" },
-  "&epsilon;": { "codepoints": [949], "characters": "\u03B5" },
-  "&epsiv;": { "codepoints": [1013], "characters": "\u03F5" },
-  "&eqcirc;": { "codepoints": [8790], "characters": "\u2256" },
-  "&eqcolon;": { "codepoints": [8789], "characters": "\u2255" },
-  "&eqsim;": { "codepoints": [8770], "characters": "\u2242" },
-  "&eqslantgtr;": { "codepoints": [10902], "characters": "\u2A96" },
-  "&eqslantless;": { "codepoints": [10901], "characters": "\u2A95" },
-  "&Equal;": { "codepoints": [10869], "characters": "\u2A75" },
-  "&equals;": { "codepoints": [61], "characters": "\u003D" },
-  "&EqualTilde;": { "codepoints": [8770], "characters": "\u2242" },
-  "&equest;": { "codepoints": [8799], "characters": "\u225F" },
-  "&Equilibrium;": { "codepoints": [8652], "characters": "\u21CC" },
-  "&equiv;": { "codepoints": [8801], "characters": "\u2261" },
-  "&equivDD;": { "codepoints": [10872], "characters": "\u2A78" },
-  "&eqvparsl;": { "codepoints": [10725], "characters": "\u29E5" },
-  "&erarr;": { "codepoints": [10609], "characters": "\u2971" },
-  "&erDot;": { "codepoints": [8787], "characters": "\u2253" },
-  "&escr;": { "codepoints": [8495], "characters": "\u212F" },
-  "&Escr;": { "codepoints": [8496], "characters": "\u2130" },
-  "&esdot;": { "codepoints": [8784], "characters": "\u2250" },
-  "&Esim;": { "codepoints": [10867], "characters": "\u2A73" },
-  "&esim;": { "codepoints": [8770], "characters": "\u2242" },
-  "&Eta;": { "codepoints": [919], "characters": "\u0397" },
-  "&eta;": { "codepoints": [951], "characters": "\u03B7" },
-  "&ETH;": { "codepoints": [208], "characters": "\u00D0" },
-  "&ETH": { "codepoints": [208], "characters": "\u00D0" },
-  "&eth;": { "codepoints": [240], "characters": "\u00F0" },
-  "&eth": { "codepoints": [240], "characters": "\u00F0" },
-  "&Euml;": { "codepoints": [203], "characters": "\u00CB" },
-  "&Euml": { "codepoints": [203], "characters": "\u00CB" },
-  "&euml;": { "codepoints": [235], "characters": "\u00EB" },
-  "&euml": { "codepoints": [235], "characters": "\u00EB" },
-  "&euro;": { "codepoints": [8364], "characters": "\u20AC" },
-  "&excl;": { "codepoints": [33], "characters": "\u0021" },
-  "&exist;": { "codepoints": [8707], "characters": "\u2203" },
-  "&Exists;": { "codepoints": [8707], "characters": "\u2203" },
-  "&expectation;": { "codepoints": [8496], "characters": "\u2130" },
-  "&exponentiale;": { "codepoints": [8519], "characters": "\u2147" },
-  "&ExponentialE;": { "codepoints": [8519], "characters": "\u2147" },
-  "&fallingdotseq;": { "codepoints": [8786], "characters": "\u2252" },
-  "&Fcy;": { "codepoints": [1060], "characters": "\u0424" },
-  "&fcy;": { "codepoints": [1092], "characters": "\u0444" },
-  "&female;": { "codepoints": [9792], "characters": "\u2640" },
-  "&ffilig;": { "codepoints": [64259], "characters": "\uFB03" },
-  "&fflig;": { "codepoints": [64256], "characters": "\uFB00" },
-  "&ffllig;": { "codepoints": [64260], "characters": "\uFB04" },
-  "&Ffr;": { "codepoints": [120073], "characters": "\uD835\uDD09" },
-  "&ffr;": { "codepoints": [120099], "characters": "\uD835\uDD23" },
-  "&filig;": { "codepoints": [64257], "characters": "\uFB01" },
-  "&FilledSmallSquare;": { "codepoints": [9724], "characters": "\u25FC" },
-  "&FilledVerySmallSquare;": { "codepoints": [9642], "characters": "\u25AA" },
-  "&fjlig;": { "codepoints": [102, 106], "characters": "\u0066\u006A" },
-  "&flat;": { "codepoints": [9837], "characters": "\u266D" },
-  "&fllig;": { "codepoints": [64258], "characters": "\uFB02" },
-  "&fltns;": { "codepoints": [9649], "characters": "\u25B1" },
-  "&fnof;": { "codepoints": [402], "characters": "\u0192" },
-  "&Fopf;": { "codepoints": [120125], "characters": "\uD835\uDD3D" },
-  "&fopf;": { "codepoints": [120151], "characters": "\uD835\uDD57" },
-  "&forall;": { "codepoints": [8704], "characters": "\u2200" },
-  "&ForAll;": { "codepoints": [8704], "characters": "\u2200" },
-  "&fork;": { "codepoints": [8916], "characters": "\u22D4" },
-  "&forkv;": { "codepoints": [10969], "characters": "\u2AD9" },
-  "&Fouriertrf;": { "codepoints": [8497], "characters": "\u2131" },
-  "&fpartint;": { "codepoints": [10765], "characters": "\u2A0D" },
-  "&frac12;": { "codepoints": [189], "characters": "\u00BD" },
-  "&frac12": { "codepoints": [189], "characters": "\u00BD" },
-  "&frac13;": { "codepoints": [8531], "characters": "\u2153" },
-  "&frac14;": { "codepoints": [188], "characters": "\u00BC" },
-  "&frac14": { "codepoints": [188], "characters": "\u00BC" },
-  "&frac15;": { "codepoints": [8533], "characters": "\u2155" },
-  "&frac16;": { "codepoints": [8537], "characters": "\u2159" },
-  "&frac18;": { "codepoints": [8539], "characters": "\u215B" },
-  "&frac23;": { "codepoints": [8532], "characters": "\u2154" },
-  "&frac25;": { "codepoints": [8534], "characters": "\u2156" },
-  "&frac34;": { "codepoints": [190], "characters": "\u00BE" },
-  "&frac34": { "codepoints": [190], "characters": "\u00BE" },
-  "&frac35;": { "codepoints": [8535], "characters": "\u2157" },
-  "&frac38;": { "codepoints": [8540], "characters": "\u215C" },
-  "&frac45;": { "codepoints": [8536], "characters": "\u2158" },
-  "&frac56;": { "codepoints": [8538], "characters": "\u215A" },
-  "&frac58;": { "codepoints": [8541], "characters": "\u215D" },
-  "&frac78;": { "codepoints": [8542], "characters": "\u215E" },
-  "&frasl;": { "codepoints": [8260], "characters": "\u2044" },
-  "&frown;": { "codepoints": [8994], "characters": "\u2322" },
-  "&fscr;": { "codepoints": [119995], "characters": "\uD835\uDCBB" },
-  "&Fscr;": { "codepoints": [8497], "characters": "\u2131" },
-  "&gacute;": { "codepoints": [501], "characters": "\u01F5" },
-  "&Gamma;": { "codepoints": [915], "characters": "\u0393" },
-  "&gamma;": { "codepoints": [947], "characters": "\u03B3" },
-  "&Gammad;": { "codepoints": [988], "characters": "\u03DC" },
-  "&gammad;": { "codepoints": [989], "characters": "\u03DD" },
-  "&gap;": { "codepoints": [10886], "characters": "\u2A86" },
-  "&Gbreve;": { "codepoints": [286], "characters": "\u011E" },
-  "&gbreve;": { "codepoints": [287], "characters": "\u011F" },
-  "&Gcedil;": { "codepoints": [290], "characters": "\u0122" },
-  "&Gcirc;": { "codepoints": [284], "characters": "\u011C" },
-  "&gcirc;": { "codepoints": [285], "characters": "\u011D" },
-  "&Gcy;": { "codepoints": [1043], "characters": "\u0413" },
-  "&gcy;": { "codepoints": [1075], "characters": "\u0433" },
-  "&Gdot;": { "codepoints": [288], "characters": "\u0120" },
-  "&gdot;": { "codepoints": [289], "characters": "\u0121" },
-  "&ge;": { "codepoints": [8805], "characters": "\u2265" },
-  "&gE;": { "codepoints": [8807], "characters": "\u2267" },
-  "&gEl;": { "codepoints": [10892], "characters": "\u2A8C" },
-  "&gel;": { "codepoints": [8923], "characters": "\u22DB" },
-  "&geq;": { "codepoints": [8805], "characters": "\u2265" },
-  "&geqq;": { "codepoints": [8807], "characters": "\u2267" },
-  "&geqslant;": { "codepoints": [10878], "characters": "\u2A7E" },
-  "&gescc;": { "codepoints": [10921], "characters": "\u2AA9" },
-  "&ges;": { "codepoints": [10878], "characters": "\u2A7E" },
-  "&gesdot;": { "codepoints": [10880], "characters": "\u2A80" },
-  "&gesdoto;": { "codepoints": [10882], "characters": "\u2A82" },
-  "&gesdotol;": { "codepoints": [10884], "characters": "\u2A84" },
-  "&gesl;": { "codepoints": [8923, 65024], "characters": "\u22DB\uFE00" },
-  "&gesles;": { "codepoints": [10900], "characters": "\u2A94" },
-  "&Gfr;": { "codepoints": [120074], "characters": "\uD835\uDD0A" },
-  "&gfr;": { "codepoints": [120100], "characters": "\uD835\uDD24" },
-  "&gg;": { "codepoints": [8811], "characters": "\u226B" },
-  "&Gg;": { "codepoints": [8921], "characters": "\u22D9" },
-  "&ggg;": { "codepoints": [8921], "characters": "\u22D9" },
-  "&gimel;": { "codepoints": [8503], "characters": "\u2137" },
-  "&GJcy;": { "codepoints": [1027], "characters": "\u0403" },
-  "&gjcy;": { "codepoints": [1107], "characters": "\u0453" },
-  "&gla;": { "codepoints": [10917], "characters": "\u2AA5" },
-  "&gl;": { "codepoints": [8823], "characters": "\u2277" },
-  "&glE;": { "codepoints": [10898], "characters": "\u2A92" },
-  "&glj;": { "codepoints": [10916], "characters": "\u2AA4" },
-  "&gnap;": { "codepoints": [10890], "characters": "\u2A8A" },
-  "&gnapprox;": { "codepoints": [10890], "characters": "\u2A8A" },
-  "&gne;": { "codepoints": [10888], "characters": "\u2A88" },
-  "&gnE;": { "codepoints": [8809], "characters": "\u2269" },
-  "&gneq;": { "codepoints": [10888], "characters": "\u2A88" },
-  "&gneqq;": { "codepoints": [8809], "characters": "\u2269" },
-  "&gnsim;": { "codepoints": [8935], "characters": "\u22E7" },
-  "&Gopf;": { "codepoints": [120126], "characters": "\uD835\uDD3E" },
-  "&gopf;": { "codepoints": [120152], "characters": "\uD835\uDD58" },
-  "&grave;": { "codepoints": [96], "characters": "\u0060" },
-  "&GreaterEqual;": { "codepoints": [8805], "characters": "\u2265" },
-  "&GreaterEqualLess;": { "codepoints": [8923], "characters": "\u22DB" },
-  "&GreaterFullEqual;": { "codepoints": [8807], "characters": "\u2267" },
-  "&GreaterGreater;": { "codepoints": [10914], "characters": "\u2AA2" },
-  "&GreaterLess;": { "codepoints": [8823], "characters": "\u2277" },
-  "&GreaterSlantEqual;": { "codepoints": [10878], "characters": "\u2A7E" },
-  "&GreaterTilde;": { "codepoints": [8819], "characters": "\u2273" },
-  "&Gscr;": { "codepoints": [119970], "characters": "\uD835\uDCA2" },
-  "&gscr;": { "codepoints": [8458], "characters": "\u210A" },
-  "&gsim;": { "codepoints": [8819], "characters": "\u2273" },
-  "&gsime;": { "codepoints": [10894], "characters": "\u2A8E" },
-  "&gsiml;": { "codepoints": [10896], "characters": "\u2A90" },
-  "&gtcc;": { "codepoints": [10919], "characters": "\u2AA7" },
-  "&gtcir;": { "codepoints": [10874], "characters": "\u2A7A" },
-  "&gt;": { "codepoints": [62], "characters": "\u003E" },
-  "&gt": { "codepoints": [62], "characters": "\u003E" },
-  "&GT;": { "codepoints": [62], "characters": "\u003E" },
-  "&GT": { "codepoints": [62], "characters": "\u003E" },
-  "&Gt;": { "codepoints": [8811], "characters": "\u226B" },
-  "&gtdot;": { "codepoints": [8919], "characters": "\u22D7" },
-  "&gtlPar;": { "codepoints": [10645], "characters": "\u2995" },
-  "&gtquest;": { "codepoints": [10876], "characters": "\u2A7C" },
-  "&gtrapprox;": { "codepoints": [10886], "characters": "\u2A86" },
-  "&gtrarr;": { "codepoints": [10616], "characters": "\u2978" },
-  "&gtrdot;": { "codepoints": [8919], "characters": "\u22D7" },
-  "&gtreqless;": { "codepoints": [8923], "characters": "\u22DB" },
-  "&gtreqqless;": { "codepoints": [10892], "characters": "\u2A8C" },
-  "&gtrless;": { "codepoints": [8823], "characters": "\u2277" },
-  "&gtrsim;": { "codepoints": [8819], "characters": "\u2273" },
-  "&gvertneqq;": { "codepoints": [8809, 65024], "characters": "\u2269\uFE00" },
-  "&gvnE;": { "codepoints": [8809, 65024], "characters": "\u2269\uFE00" },
-  "&Hacek;": { "codepoints": [711], "characters": "\u02C7" },
-  "&hairsp;": { "codepoints": [8202], "characters": "\u200A" },
-  "&half;": { "codepoints": [189], "characters": "\u00BD" },
-  "&hamilt;": { "codepoints": [8459], "characters": "\u210B" },
-  "&HARDcy;": { "codepoints": [1066], "characters": "\u042A" },
-  "&hardcy;": { "codepoints": [1098], "characters": "\u044A" },
-  "&harrcir;": { "codepoints": [10568], "characters": "\u2948" },
-  "&harr;": { "codepoints": [8596], "characters": "\u2194" },
-  "&hArr;": { "codepoints": [8660], "characters": "\u21D4" },
-  "&harrw;": { "codepoints": [8621], "characters": "\u21AD" },
-  "&Hat;": { "codepoints": [94], "characters": "\u005E" },
-  "&hbar;": { "codepoints": [8463], "characters": "\u210F" },
-  "&Hcirc;": { "codepoints": [292], "characters": "\u0124" },
-  "&hcirc;": { "codepoints": [293], "characters": "\u0125" },
-  "&hearts;": { "codepoints": [9829], "characters": "\u2665" },
-  "&heartsuit;": { "codepoints": [9829], "characters": "\u2665" },
-  "&hellip;": { "codepoints": [8230], "characters": "\u2026" },
-  "&hercon;": { "codepoints": [8889], "characters": "\u22B9" },
-  "&hfr;": { "codepoints": [120101], "characters": "\uD835\uDD25" },
-  "&Hfr;": { "codepoints": [8460], "characters": "\u210C" },
-  "&HilbertSpace;": { "codepoints": [8459], "characters": "\u210B" },
-  "&hksearow;": { "codepoints": [10533], "characters": "\u2925" },
-  "&hkswarow;": { "codepoints": [10534], "characters": "\u2926" },
-  "&hoarr;": { "codepoints": [8703], "characters": "\u21FF" },
-  "&homtht;": { "codepoints": [8763], "characters": "\u223B" },
-  "&hookleftarrow;": { "codepoints": [8617], "characters": "\u21A9" },
-  "&hookrightarrow;": { "codepoints": [8618], "characters": "\u21AA" },
-  "&hopf;": { "codepoints": [120153], "characters": "\uD835\uDD59" },
-  "&Hopf;": { "codepoints": [8461], "characters": "\u210D" },
-  "&horbar;": { "codepoints": [8213], "characters": "\u2015" },
-  "&HorizontalLine;": { "codepoints": [9472], "characters": "\u2500" },
-  "&hscr;": { "codepoints": [119997], "characters": "\uD835\uDCBD" },
-  "&Hscr;": { "codepoints": [8459], "characters": "\u210B" },
-  "&hslash;": { "codepoints": [8463], "characters": "\u210F" },
-  "&Hstrok;": { "codepoints": [294], "characters": "\u0126" },
-  "&hstrok;": { "codepoints": [295], "characters": "\u0127" },
-  "&HumpDownHump;": { "codepoints": [8782], "characters": "\u224E" },
-  "&HumpEqual;": { "codepoints": [8783], "characters": "\u224F" },
-  "&hybull;": { "codepoints": [8259], "characters": "\u2043" },
-  "&hyphen;": { "codepoints": [8208], "characters": "\u2010" },
-  "&Iacute;": { "codepoints": [205], "characters": "\u00CD" },
-  "&Iacute": { "codepoints": [205], "characters": "\u00CD" },
-  "&iacute;": { "codepoints": [237], "characters": "\u00ED" },
-  "&iacute": { "codepoints": [237], "characters": "\u00ED" },
-  "&ic;": { "codepoints": [8291], "characters": "\u2063" },
-  "&Icirc;": { "codepoints": [206], "characters": "\u00CE" },
-  "&Icirc": { "codepoints": [206], "characters": "\u00CE" },
-  "&icirc;": { "codepoints": [238], "characters": "\u00EE" },
-  "&icirc": { "codepoints": [238], "characters": "\u00EE" },
-  "&Icy;": { "codepoints": [1048], "characters": "\u0418" },
-  "&icy;": { "codepoints": [1080], "characters": "\u0438" },
-  "&Idot;": { "codepoints": [304], "characters": "\u0130" },
-  "&IEcy;": { "codepoints": [1045], "characters": "\u0415" },
-  "&iecy;": { "codepoints": [1077], "characters": "\u0435" },
-  "&iexcl;": { "codepoints": [161], "characters": "\u00A1" },
-  "&iexcl": { "codepoints": [161], "characters": "\u00A1" },
-  "&iff;": { "codepoints": [8660], "characters": "\u21D4" },
-  "&ifr;": { "codepoints": [120102], "characters": "\uD835\uDD26" },
-  "&Ifr;": { "codepoints": [8465], "characters": "\u2111" },
-  "&Igrave;": { "codepoints": [204], "characters": "\u00CC" },
-  "&Igrave": { "codepoints": [204], "characters": "\u00CC" },
-  "&igrave;": { "codepoints": [236], "characters": "\u00EC" },
-  "&igrave": { "codepoints": [236], "characters": "\u00EC" },
-  "&ii;": { "codepoints": [8520], "characters": "\u2148" },
-  "&iiiint;": { "codepoints": [10764], "characters": "\u2A0C" },
-  "&iiint;": { "codepoints": [8749], "characters": "\u222D" },
-  "&iinfin;": { "codepoints": [10716], "characters": "\u29DC" },
-  "&iiota;": { "codepoints": [8489], "characters": "\u2129" },
-  "&IJlig;": { "codepoints": [306], "characters": "\u0132" },
-  "&ijlig;": { "codepoints": [307], "characters": "\u0133" },
-  "&Imacr;": { "codepoints": [298], "characters": "\u012A" },
-  "&imacr;": { "codepoints": [299], "characters": "\u012B" },
-  "&image;": { "codepoints": [8465], "characters": "\u2111" },
-  "&ImaginaryI;": { "codepoints": [8520], "characters": "\u2148" },
-  "&imagline;": { "codepoints": [8464], "characters": "\u2110" },
-  "&imagpart;": { "codepoints": [8465], "characters": "\u2111" },
-  "&imath;": { "codepoints": [305], "characters": "\u0131" },
-  "&Im;": { "codepoints": [8465], "characters": "\u2111" },
-  "&imof;": { "codepoints": [8887], "characters": "\u22B7" },
-  "&imped;": { "codepoints": [437], "characters": "\u01B5" },
-  "&Implies;": { "codepoints": [8658], "characters": "\u21D2" },
-  "&incare;": { "codepoints": [8453], "characters": "\u2105" },
-  "&in;": { "codepoints": [8712], "characters": "\u2208" },
-  "&infin;": { "codepoints": [8734], "characters": "\u221E" },
-  "&infintie;": { "codepoints": [10717], "characters": "\u29DD" },
-  "&inodot;": { "codepoints": [305], "characters": "\u0131" },
-  "&intcal;": { "codepoints": [8890], "characters": "\u22BA" },
-  "&int;": { "codepoints": [8747], "characters": "\u222B" },
-  "&Int;": { "codepoints": [8748], "characters": "\u222C" },
-  "&integers;": { "codepoints": [8484], "characters": "\u2124" },
-  "&Integral;": { "codepoints": [8747], "characters": "\u222B" },
-  "&intercal;": { "codepoints": [8890], "characters": "\u22BA" },
-  "&Intersection;": { "codepoints": [8898], "characters": "\u22C2" },
-  "&intlarhk;": { "codepoints": [10775], "characters": "\u2A17" },
-  "&intprod;": { "codepoints": [10812], "characters": "\u2A3C" },
-  "&InvisibleComma;": { "codepoints": [8291], "characters": "\u2063" },
-  "&InvisibleTimes;": { "codepoints": [8290], "characters": "\u2062" },
-  "&IOcy;": { "codepoints": [1025], "characters": "\u0401" },
-  "&iocy;": { "codepoints": [1105], "characters": "\u0451" },
-  "&Iogon;": { "codepoints": [302], "characters": "\u012E" },
-  "&iogon;": { "codepoints": [303], "characters": "\u012F" },
-  "&Iopf;": { "codepoints": [120128], "characters": "\uD835\uDD40" },
-  "&iopf;": { "codepoints": [120154], "characters": "\uD835\uDD5A" },
-  "&Iota;": { "codepoints": [921], "characters": "\u0399" },
-  "&iota;": { "codepoints": [953], "characters": "\u03B9" },
-  "&iprod;": { "codepoints": [10812], "characters": "\u2A3C" },
-  "&iquest;": { "codepoints": [191], "characters": "\u00BF" },
-  "&iquest": { "codepoints": [191], "characters": "\u00BF" },
-  "&iscr;": { "codepoints": [119998], "characters": "\uD835\uDCBE" },
-  "&Iscr;": { "codepoints": [8464], "characters": "\u2110" },
-  "&isin;": { "codepoints": [8712], "characters": "\u2208" },
-  "&isindot;": { "codepoints": [8949], "characters": "\u22F5" },
-  "&isinE;": { "codepoints": [8953], "characters": "\u22F9" },
-  "&isins;": { "codepoints": [8948], "characters": "\u22F4" },
-  "&isinsv;": { "codepoints": [8947], "characters": "\u22F3" },
-  "&isinv;": { "codepoints": [8712], "characters": "\u2208" },
-  "&it;": { "codepoints": [8290], "characters": "\u2062" },
-  "&Itilde;": { "codepoints": [296], "characters": "\u0128" },
-  "&itilde;": { "codepoints": [297], "characters": "\u0129" },
-  "&Iukcy;": { "codepoints": [1030], "characters": "\u0406" },
-  "&iukcy;": { "codepoints": [1110], "characters": "\u0456" },
-  "&Iuml;": { "codepoints": [207], "characters": "\u00CF" },
-  "&Iuml": { "codepoints": [207], "characters": "\u00CF" },
-  "&iuml;": { "codepoints": [239], "characters": "\u00EF" },
-  "&iuml": { "codepoints": [239], "characters": "\u00EF" },
-  "&Jcirc;": { "codepoints": [308], "characters": "\u0134" },
-  "&jcirc;": { "codepoints": [309], "characters": "\u0135" },
-  "&Jcy;": { "codepoints": [1049], "characters": "\u0419" },
-  "&jcy;": { "codepoints": [1081], "characters": "\u0439" },
-  "&Jfr;": { "codepoints": [120077], "characters": "\uD835\uDD0D" },
-  "&jfr;": { "codepoints": [120103], "characters": "\uD835\uDD27" },
-  "&jmath;": { "codepoints": [567], "characters": "\u0237" },
-  "&Jopf;": { "codepoints": [120129], "characters": "\uD835\uDD41" },
-  "&jopf;": { "codepoints": [120155], "characters": "\uD835\uDD5B" },
-  "&Jscr;": { "codepoints": [119973], "characters": "\uD835\uDCA5" },
-  "&jscr;": { "codepoints": [119999], "characters": "\uD835\uDCBF" },
-  "&Jsercy;": { "codepoints": [1032], "characters": "\u0408" },
-  "&jsercy;": { "codepoints": [1112], "characters": "\u0458" },
-  "&Jukcy;": { "codepoints": [1028], "characters": "\u0404" },
-  "&jukcy;": { "codepoints": [1108], "characters": "\u0454" },
-  "&Kappa;": { "codepoints": [922], "characters": "\u039A" },
-  "&kappa;": { "codepoints": [954], "characters": "\u03BA" },
-  "&kappav;": { "codepoints": [1008], "characters": "\u03F0" },
-  "&Kcedil;": { "codepoints": [310], "characters": "\u0136" },
-  "&kcedil;": { "codepoints": [311], "characters": "\u0137" },
-  "&Kcy;": { "codepoints": [1050], "characters": "\u041A" },
-  "&kcy;": { "codepoints": [1082], "characters": "\u043A" },
-  "&Kfr;": { "codepoints": [120078], "characters": "\uD835\uDD0E" },
-  "&kfr;": { "codepoints": [120104], "characters": "\uD835\uDD28" },
-  "&kgreen;": { "codepoints": [312], "characters": "\u0138" },
-  "&KHcy;": { "codepoints": [1061], "characters": "\u0425" },
-  "&khcy;": { "codepoints": [1093], "characters": "\u0445" },
-  "&KJcy;": { "codepoints": [1036], "characters": "\u040C" },
-  "&kjcy;": { "codepoints": [1116], "characters": "\u045C" },
-  "&Kopf;": { "codepoints": [120130], "characters": "\uD835\uDD42" },
-  "&kopf;": { "codepoints": [120156], "characters": "\uD835\uDD5C" },
-  "&Kscr;": { "codepoints": [119974], "characters": "\uD835\uDCA6" },
-  "&kscr;": { "codepoints": [120000], "characters": "\uD835\uDCC0" },
-  "&lAarr;": { "codepoints": [8666], "characters": "\u21DA" },
-  "&Lacute;": { "codepoints": [313], "characters": "\u0139" },
-  "&lacute;": { "codepoints": [314], "characters": "\u013A" },
-  "&laemptyv;": { "codepoints": [10676], "characters": "\u29B4" },
-  "&lagran;": { "codepoints": [8466], "characters": "\u2112" },
-  "&Lambda;": { "codepoints": [923], "characters": "\u039B" },
-  "&lambda;": { "codepoints": [955], "characters": "\u03BB" },
-  "&lang;": { "codepoints": [10216], "characters": "\u27E8" },
-  "&Lang;": { "codepoints": [10218], "characters": "\u27EA" },
-  "&langd;": { "codepoints": [10641], "characters": "\u2991" },
-  "&langle;": { "codepoints": [10216], "characters": "\u27E8" },
-  "&lap;": { "codepoints": [10885], "characters": "\u2A85" },
-  "&Laplacetrf;": { "codepoints": [8466], "characters": "\u2112" },
-  "&laquo;": { "codepoints": [171], "characters": "\u00AB" },
-  "&laquo": { "codepoints": [171], "characters": "\u00AB" },
-  "&larrb;": { "codepoints": [8676], "characters": "\u21E4" },
-  "&larrbfs;": { "codepoints": [10527], "characters": "\u291F" },
-  "&larr;": { "codepoints": [8592], "characters": "\u2190" },
-  "&Larr;": { "codepoints": [8606], "characters": "\u219E" },
-  "&lArr;": { "codepoints": [8656], "characters": "\u21D0" },
-  "&larrfs;": { "codepoints": [10525], "characters": "\u291D" },
-  "&larrhk;": { "codepoints": [8617], "characters": "\u21A9" },
-  "&larrlp;": { "codepoints": [8619], "characters": "\u21AB" },
-  "&larrpl;": { "codepoints": [10553], "characters": "\u2939" },
-  "&larrsim;": { "codepoints": [10611], "characters": "\u2973" },
-  "&larrtl;": { "codepoints": [8610], "characters": "\u21A2" },
-  "&latail;": { "codepoints": [10521], "characters": "\u2919" },
-  "&lAtail;": { "codepoints": [10523], "characters": "\u291B" },
-  "&lat;": { "codepoints": [10923], "characters": "\u2AAB" },
-  "&late;": { "codepoints": [10925], "characters": "\u2AAD" },
-  "&lates;": { "codepoints": [10925, 65024], "characters": "\u2AAD\uFE00" },
-  "&lbarr;": { "codepoints": [10508], "characters": "\u290C" },
-  "&lBarr;": { "codepoints": [10510], "characters": "\u290E" },
-  "&lbbrk;": { "codepoints": [10098], "characters": "\u2772" },
-  "&lbrace;": { "codepoints": [123], "characters": "\u007B" },
-  "&lbrack;": { "codepoints": [91], "characters": "\u005B" },
-  "&lbrke;": { "codepoints": [10635], "characters": "\u298B" },
-  "&lbrksld;": { "codepoints": [10639], "characters": "\u298F" },
-  "&lbrkslu;": { "codepoints": [10637], "characters": "\u298D" },
-  "&Lcaron;": { "codepoints": [317], "characters": "\u013D" },
-  "&lcaron;": { "codepoints": [318], "characters": "\u013E" },
-  "&Lcedil;": { "codepoints": [315], "characters": "\u013B" },
-  "&lcedil;": { "codepoints": [316], "characters": "\u013C" },
-  "&lceil;": { "codepoints": [8968], "characters": "\u2308" },
-  "&lcub;": { "codepoints": [123], "characters": "\u007B" },
-  "&Lcy;": { "codepoints": [1051], "characters": "\u041B" },
-  "&lcy;": { "codepoints": [1083], "characters": "\u043B" },
-  "&ldca;": { "codepoints": [10550], "characters": "\u2936" },
-  "&ldquo;": { "codepoints": [8220], "characters": "\u201C" },
-  "&ldquor;": { "codepoints": [8222], "characters": "\u201E" },
-  "&ldrdhar;": { "codepoints": [10599], "characters": "\u2967" },
-  "&ldrushar;": { "codepoints": [10571], "characters": "\u294B" },
-  "&ldsh;": { "codepoints": [8626], "characters": "\u21B2" },
-  "&le;": { "codepoints": [8804], "characters": "\u2264" },
-  "&lE;": { "codepoints": [8806], "characters": "\u2266" },
-  "&LeftAngleBracket;": { "codepoints": [10216], "characters": "\u27E8" },
-  "&LeftArrowBar;": { "codepoints": [8676], "characters": "\u21E4" },
-  "&leftarrow;": { "codepoints": [8592], "characters": "\u2190" },
-  "&LeftArrow;": { "codepoints": [8592], "characters": "\u2190" },
-  "&Leftarrow;": { "codepoints": [8656], "characters": "\u21D0" },
-  "&LeftArrowRightArrow;": { "codepoints": [8646], "characters": "\u21C6" },
-  "&leftarrowtail;": { "codepoints": [8610], "characters": "\u21A2" },
-  "&LeftCeiling;": { "codepoints": [8968], "characters": "\u2308" },
-  "&LeftDoubleBracket;": { "codepoints": [10214], "characters": "\u27E6" },
-  "&LeftDownTeeVector;": { "codepoints": [10593], "characters": "\u2961" },
-  "&LeftDownVectorBar;": { "codepoints": [10585], "characters": "\u2959" },
-  "&LeftDownVector;": { "codepoints": [8643], "characters": "\u21C3" },
-  "&LeftFloor;": { "codepoints": [8970], "characters": "\u230A" },
-  "&leftharpoondown;": { "codepoints": [8637], "characters": "\u21BD" },
-  "&leftharpoonup;": { "codepoints": [8636], "characters": "\u21BC" },
-  "&leftleftarrows;": { "codepoints": [8647], "characters": "\u21C7" },
-  "&leftrightarrow;": { "codepoints": [8596], "characters": "\u2194" },
-  "&LeftRightArrow;": { "codepoints": [8596], "characters": "\u2194" },
-  "&Leftrightarrow;": { "codepoints": [8660], "characters": "\u21D4" },
-  "&leftrightarrows;": { "codepoints": [8646], "characters": "\u21C6" },
-  "&leftrightharpoons;": { "codepoints": [8651], "characters": "\u21CB" },
-  "&leftrightsquigarrow;": { "codepoints": [8621], "characters": "\u21AD" },
-  "&LeftRightVector;": { "codepoints": [10574], "characters": "\u294E" },
-  "&LeftTeeArrow;": { "codepoints": [8612], "characters": "\u21A4" },
-  "&LeftTee;": { "codepoints": [8867], "characters": "\u22A3" },
-  "&LeftTeeVector;": { "codepoints": [10586], "characters": "\u295A" },
-  "&leftthreetimes;": { "codepoints": [8907], "characters": "\u22CB" },
-  "&LeftTriangleBar;": { "codepoints": [10703], "characters": "\u29CF" },
-  "&LeftTriangle;": { "codepoints": [8882], "characters": "\u22B2" },
-  "&LeftTriangleEqual;": { "codepoints": [8884], "characters": "\u22B4" },
-  "&LeftUpDownVector;": { "codepoints": [10577], "characters": "\u2951" },
-  "&LeftUpTeeVector;": { "codepoints": [10592], "characters": "\u2960" },
-  "&LeftUpVectorBar;": { "codepoints": [10584], "characters": "\u2958" },
-  "&LeftUpVector;": { "codepoints": [8639], "characters": "\u21BF" },
-  "&LeftVectorBar;": { "codepoints": [10578], "characters": "\u2952" },
-  "&LeftVector;": { "codepoints": [8636], "characters": "\u21BC" },
-  "&lEg;": { "codepoints": [10891], "characters": "\u2A8B" },
-  "&leg;": { "codepoints": [8922], "characters": "\u22DA" },
-  "&leq;": { "codepoints": [8804], "characters": "\u2264" },
-  "&leqq;": { "codepoints": [8806], "characters": "\u2266" },
-  "&leqslant;": { "codepoints": [10877], "characters": "\u2A7D" },
-  "&lescc;": { "codepoints": [10920], "characters": "\u2AA8" },
-  "&les;": { "codepoints": [10877], "characters": "\u2A7D" },
-  "&lesdot;": { "codepoints": [10879], "characters": "\u2A7F" },
-  "&lesdoto;": { "codepoints": [10881], "characters": "\u2A81" },
-  "&lesdotor;": { "codepoints": [10883], "characters": "\u2A83" },
-  "&lesg;": { "codepoints": [8922, 65024], "characters": "\u22DA\uFE00" },
-  "&lesges;": { "codepoints": [10899], "characters": "\u2A93" },
-  "&lessapprox;": { "codepoints": [10885], "characters": "\u2A85" },
-  "&lessdot;": { "codepoints": [8918], "characters": "\u22D6" },
-  "&lesseqgtr;": { "codepoints": [8922], "characters": "\u22DA" },
-  "&lesseqqgtr;": { "codepoints": [10891], "characters": "\u2A8B" },
-  "&LessEqualGreater;": { "codepoints": [8922], "characters": "\u22DA" },
-  "&LessFullEqual;": { "codepoints": [8806], "characters": "\u2266" },
-  "&LessGreater;": { "codepoints": [8822], "characters": "\u2276" },
-  "&lessgtr;": { "codepoints": [8822], "characters": "\u2276" },
-  "&LessLess;": { "codepoints": [10913], "characters": "\u2AA1" },
-  "&lesssim;": { "codepoints": [8818], "characters": "\u2272" },
-  "&LessSlantEqual;": { "codepoints": [10877], "characters": "\u2A7D" },
-  "&LessTilde;": { "codepoints": [8818], "characters": "\u2272" },
-  "&lfisht;": { "codepoints": [10620], "characters": "\u297C" },
-  "&lfloor;": { "codepoints": [8970], "characters": "\u230A" },
-  "&Lfr;": { "codepoints": [120079], "characters": "\uD835\uDD0F" },
-  "&lfr;": { "codepoints": [120105], "characters": "\uD835\uDD29" },
-  "&lg;": { "codepoints": [8822], "characters": "\u2276" },
-  "&lgE;": { "codepoints": [10897], "characters": "\u2A91" },
-  "&lHar;": { "codepoints": [10594], "characters": "\u2962" },
-  "&lhard;": { "codepoints": [8637], "characters": "\u21BD" },
-  "&lharu;": { "codepoints": [8636], "characters": "\u21BC" },
-  "&lharul;": { "codepoints": [10602], "characters": "\u296A" },
-  "&lhblk;": { "codepoints": [9604], "characters": "\u2584" },
-  "&LJcy;": { "codepoints": [1033], "characters": "\u0409" },
-  "&ljcy;": { "codepoints": [1113], "characters": "\u0459" },
-  "&llarr;": { "codepoints": [8647], "characters": "\u21C7" },
-  "&ll;": { "codepoints": [8810], "characters": "\u226A" },
-  "&Ll;": { "codepoints": [8920], "characters": "\u22D8" },
-  "&llcorner;": { "codepoints": [8990], "characters": "\u231E" },
-  "&Lleftarrow;": { "codepoints": [8666], "characters": "\u21DA" },
-  "&llhard;": { "codepoints": [10603], "characters": "\u296B" },
-  "&lltri;": { "codepoints": [9722], "characters": "\u25FA" },
-  "&Lmidot;": { "codepoints": [319], "characters": "\u013F" },
-  "&lmidot;": { "codepoints": [320], "characters": "\u0140" },
-  "&lmoustache;": { "codepoints": [9136], "characters": "\u23B0" },
-  "&lmoust;": { "codepoints": [9136], "characters": "\u23B0" },
-  "&lnap;": { "codepoints": [10889], "characters": "\u2A89" },
-  "&lnapprox;": { "codepoints": [10889], "characters": "\u2A89" },
-  "&lne;": { "codepoints": [10887], "characters": "\u2A87" },
-  "&lnE;": { "codepoints": [8808], "characters": "\u2268" },
-  "&lneq;": { "codepoints": [10887], "characters": "\u2A87" },
-  "&lneqq;": { "codepoints": [8808], "characters": "\u2268" },
-  "&lnsim;": { "codepoints": [8934], "characters": "\u22E6" },
-  "&loang;": { "codepoints": [10220], "characters": "\u27EC" },
-  "&loarr;": { "codepoints": [8701], "characters": "\u21FD" },
-  "&lobrk;": { "codepoints": [10214], "characters": "\u27E6" },
-  "&longleftarrow;": { "codepoints": [10229], "characters": "\u27F5" },
-  "&LongLeftArrow;": { "codepoints": [10229], "characters": "\u27F5" },
-  "&Longleftarrow;": { "codepoints": [10232], "characters": "\u27F8" },
-  "&longleftrightarrow;": { "codepoints": [10231], "characters": "\u27F7" },
-  "&LongLeftRightArrow;": { "codepoints": [10231], "characters": "\u27F7" },
-  "&Longleftrightarrow;": { "codepoints": [10234], "characters": "\u27FA" },
-  "&longmapsto;": { "codepoints": [10236], "characters": "\u27FC" },
-  "&longrightarrow;": { "codepoints": [10230], "characters": "\u27F6" },
-  "&LongRightArrow;": { "codepoints": [10230], "characters": "\u27F6" },
-  "&Longrightarrow;": { "codepoints": [10233], "characters": "\u27F9" },
-  "&looparrowleft;": { "codepoints": [8619], "characters": "\u21AB" },
-  "&looparrowright;": { "codepoints": [8620], "characters": "\u21AC" },
-  "&lopar;": { "codepoints": [10629], "characters": "\u2985" },
-  "&Lopf;": { "codepoints": [120131], "characters": "\uD835\uDD43" },
-  "&lopf;": { "codepoints": [120157], "characters": "\uD835\uDD5D" },
-  "&loplus;": { "codepoints": [10797], "characters": "\u2A2D" },
-  "&lotimes;": { "codepoints": [10804], "characters": "\u2A34" },
-  "&lowast;": { "codepoints": [8727], "characters": "\u2217" },
-  "&lowbar;": { "codepoints": [95], "characters": "\u005F" },
-  "&LowerLeftArrow;": { "codepoints": [8601], "characters": "\u2199" },
-  "&LowerRightArrow;": { "codepoints": [8600], "characters": "\u2198" },
-  "&loz;": { "codepoints": [9674], "characters": "\u25CA" },
-  "&lozenge;": { "codepoints": [9674], "characters": "\u25CA" },
-  "&lozf;": { "codepoints": [10731], "characters": "\u29EB" },
-  "&lpar;": { "codepoints": [40], "characters": "\u0028" },
-  "&lparlt;": { "codepoints": [10643], "characters": "\u2993" },
-  "&lrarr;": { "codepoints": [8646], "characters": "\u21C6" },
-  "&lrcorner;": { "codepoints": [8991], "characters": "\u231F" },
-  "&lrhar;": { "codepoints": [8651], "characters": "\u21CB" },
-  "&lrhard;": { "codepoints": [10605], "characters": "\u296D" },
-  "&lrm;": { "codepoints": [8206], "characters": "\u200E" },
-  "&lrtri;": { "codepoints": [8895], "characters": "\u22BF" },
-  "&lsaquo;": { "codepoints": [8249], "characters": "\u2039" },
-  "&lscr;": { "codepoints": [120001], "characters": "\uD835\uDCC1" },
-  "&Lscr;": { "codepoints": [8466], "characters": "\u2112" },
-  "&lsh;": { "codepoints": [8624], "characters": "\u21B0" },
-  "&Lsh;": { "codepoints": [8624], "characters": "\u21B0" },
-  "&lsim;": { "codepoints": [8818], "characters": "\u2272" },
-  "&lsime;": { "codepoints": [10893], "characters": "\u2A8D" },
-  "&lsimg;": { "codepoints": [10895], "characters": "\u2A8F" },
-  "&lsqb;": { "codepoints": [91], "characters": "\u005B" },
-  "&lsquo;": { "codepoints": [8216], "characters": "\u2018" },
-  "&lsquor;": { "codepoints": [8218], "characters": "\u201A" },
-  "&Lstrok;": { "codepoints": [321], "characters": "\u0141" },
-  "&lstrok;": { "codepoints": [322], "characters": "\u0142" },
-  "&ltcc;": { "codepoints": [10918], "characters": "\u2AA6" },
-  "&ltcir;": { "codepoints": [10873], "characters": "\u2A79" },
-  "&lt;": { "codepoints": [60], "characters": "\u003C" },
-  "&lt": { "codepoints": [60], "characters": "\u003C" },
-  "&LT;": { "codepoints": [60], "characters": "\u003C" },
-  "&LT": { "codepoints": [60], "characters": "\u003C" },
-  "&Lt;": { "codepoints": [8810], "characters": "\u226A" },
-  "&ltdot;": { "codepoints": [8918], "characters": "\u22D6" },
-  "&lthree;": { "codepoints": [8907], "characters": "\u22CB" },
-  "&ltimes;": { "codepoints": [8905], "characters": "\u22C9" },
-  "&ltlarr;": { "codepoints": [10614], "characters": "\u2976" },
-  "&ltquest;": { "codepoints": [10875], "characters": "\u2A7B" },
-  "&ltri;": { "codepoints": [9667], "characters": "\u25C3" },
-  "&ltrie;": { "codepoints": [8884], "characters": "\u22B4" },
-  "&ltrif;": { "codepoints": [9666], "characters": "\u25C2" },
-  "&ltrPar;": { "codepoints": [10646], "characters": "\u2996" },
-  "&lurdshar;": { "codepoints": [10570], "characters": "\u294A" },
-  "&luruhar;": { "codepoints": [10598], "characters": "\u2966" },
-  "&lvertneqq;": { "codepoints": [8808, 65024], "characters": "\u2268\uFE00" },
-  "&lvnE;": { "codepoints": [8808, 65024], "characters": "\u2268\uFE00" },
-  "&macr;": { "codepoints": [175], "characters": "\u00AF" },
-  "&macr": { "codepoints": [175], "characters": "\u00AF" },
-  "&male;": { "codepoints": [9794], "characters": "\u2642" },
-  "&malt;": { "codepoints": [10016], "characters": "\u2720" },
-  "&maltese;": { "codepoints": [10016], "characters": "\u2720" },
-  "&Map;": { "codepoints": [10501], "characters": "\u2905" },
-  "&map;": { "codepoints": [8614], "characters": "\u21A6" },
-  "&mapsto;": { "codepoints": [8614], "characters": "\u21A6" },
-  "&mapstodown;": { "codepoints": [8615], "characters": "\u21A7" },
-  "&mapstoleft;": { "codepoints": [8612], "characters": "\u21A4" },
-  "&mapstoup;": { "codepoints": [8613], "characters": "\u21A5" },
-  "&marker;": { "codepoints": [9646], "characters": "\u25AE" },
-  "&mcomma;": { "codepoints": [10793], "characters": "\u2A29" },
-  "&Mcy;": { "codepoints": [1052], "characters": "\u041C" },
-  "&mcy;": { "codepoints": [1084], "characters": "\u043C" },
-  "&mdash;": { "codepoints": [8212], "characters": "\u2014" },
-  "&mDDot;": { "codepoints": [8762], "characters": "\u223A" },
-  "&measuredangle;": { "codepoints": [8737], "characters": "\u2221" },
-  "&MediumSpace;": { "codepoints": [8287], "characters": "\u205F" },
-  "&Mellintrf;": { "codepoints": [8499], "characters": "\u2133" },
-  "&Mfr;": { "codepoints": [120080], "characters": "\uD835\uDD10" },
-  "&mfr;": { "codepoints": [120106], "characters": "\uD835\uDD2A" },
-  "&mho;": { "codepoints": [8487], "characters": "\u2127" },
-  "&micro;": { "codepoints": [181], "characters": "\u00B5" },
-  "&micro": { "codepoints": [181], "characters": "\u00B5" },
-  "&midast;": { "codepoints": [42], "characters": "\u002A" },
-  "&midcir;": { "codepoints": [10992], "characters": "\u2AF0" },
-  "&mid;": { "codepoints": [8739], "characters": "\u2223" },
-  "&middot;": { "codepoints": [183], "characters": "\u00B7" },
-  "&middot": { "codepoints": [183], "characters": "\u00B7" },
-  "&minusb;": { "codepoints": [8863], "characters": "\u229F" },
-  "&minus;": { "codepoints": [8722], "characters": "\u2212" },
-  "&minusd;": { "codepoints": [8760], "characters": "\u2238" },
-  "&minusdu;": { "codepoints": [10794], "characters": "\u2A2A" },
-  "&MinusPlus;": { "codepoints": [8723], "characters": "\u2213" },
-  "&mlcp;": { "codepoints": [10971], "characters": "\u2ADB" },
-  "&mldr;": { "codepoints": [8230], "characters": "\u2026" },
-  "&mnplus;": { "codepoints": [8723], "characters": "\u2213" },
-  "&models;": { "codepoints": [8871], "characters": "\u22A7" },
-  "&Mopf;": { "codepoints": [120132], "characters": "\uD835\uDD44" },
-  "&mopf;": { "codepoints": [120158], "characters": "\uD835\uDD5E" },
-  "&mp;": { "codepoints": [8723], "characters": "\u2213" },
-  "&mscr;": { "codepoints": [120002], "characters": "\uD835\uDCC2" },
-  "&Mscr;": { "codepoints": [8499], "characters": "\u2133" },
-  "&mstpos;": { "codepoints": [8766], "characters": "\u223E" },
-  "&Mu;": { "codepoints": [924], "characters": "\u039C" },
-  "&mu;": { "codepoints": [956], "characters": "\u03BC" },
-  "&multimap;": { "codepoints": [8888], "characters": "\u22B8" },
-  "&mumap;": { "codepoints": [8888], "characters": "\u22B8" },
-  "&nabla;": { "codepoints": [8711], "characters": "\u2207" },
-  "&Nacute;": { "codepoints": [323], "characters": "\u0143" },
-  "&nacute;": { "codepoints": [324], "characters": "\u0144" },
-  "&nang;": { "codepoints": [8736, 8402], "characters": "\u2220\u20D2" },
-  "&nap;": { "codepoints": [8777], "characters": "\u2249" },
-  "&napE;": { "codepoints": [10864, 824], "characters": "\u2A70\u0338" },
-  "&napid;": { "codepoints": [8779, 824], "characters": "\u224B\u0338" },
-  "&napos;": { "codepoints": [329], "characters": "\u0149" },
-  "&napprox;": { "codepoints": [8777], "characters": "\u2249" },
-  "&natural;": { "codepoints": [9838], "characters": "\u266E" },
-  "&naturals;": { "codepoints": [8469], "characters": "\u2115" },
-  "&natur;": { "codepoints": [9838], "characters": "\u266E" },
-  "&nbsp;": { "codepoints": [160], "characters": "\u00A0" },
-  "&nbsp": { "codepoints": [160], "characters": "\u00A0" },
-  "&nbump;": { "codepoints": [8782, 824], "characters": "\u224E\u0338" },
-  "&nbumpe;": { "codepoints": [8783, 824], "characters": "\u224F\u0338" },
-  "&ncap;": { "codepoints": [10819], "characters": "\u2A43" },
-  "&Ncaron;": { "codepoints": [327], "characters": "\u0147" },
-  "&ncaron;": { "codepoints": [328], "characters": "\u0148" },
-  "&Ncedil;": { "codepoints": [325], "characters": "\u0145" },
-  "&ncedil;": { "codepoints": [326], "characters": "\u0146" },
-  "&ncong;": { "codepoints": [8775], "characters": "\u2247" },
-  "&ncongdot;": { "codepoints": [10861, 824], "characters": "\u2A6D\u0338" },
-  "&ncup;": { "codepoints": [10818], "characters": "\u2A42" },
-  "&Ncy;": { "codepoints": [1053], "characters": "\u041D" },
-  "&ncy;": { "codepoints": [1085], "characters": "\u043D" },
-  "&ndash;": { "codepoints": [8211], "characters": "\u2013" },
-  "&nearhk;": { "codepoints": [10532], "characters": "\u2924" },
-  "&nearr;": { "codepoints": [8599], "characters": "\u2197" },
-  "&neArr;": { "codepoints": [8663], "characters": "\u21D7" },
-  "&nearrow;": { "codepoints": [8599], "characters": "\u2197" },
-  "&ne;": { "codepoints": [8800], "characters": "\u2260" },
-  "&nedot;": { "codepoints": [8784, 824], "characters": "\u2250\u0338" },
-  "&NegativeMediumSpace;": { "codepoints": [8203], "characters": "\u200B" },
-  "&NegativeThickSpace;": { "codepoints": [8203], "characters": "\u200B" },
-  "&NegativeThinSpace;": { "codepoints": [8203], "characters": "\u200B" },
-  "&NegativeVeryThinSpace;": { "codepoints": [8203], "characters": "\u200B" },
-  "&nequiv;": { "codepoints": [8802], "characters": "\u2262" },
-  "&nesear;": { "codepoints": [10536], "characters": "\u2928" },
-  "&nesim;": { "codepoints": [8770, 824], "characters": "\u2242\u0338" },
-  "&NestedGreaterGreater;": { "codepoints": [8811], "characters": "\u226B" },
-  "&NestedLessLess;": { "codepoints": [8810], "characters": "\u226A" },
-  "&NewLine;": { "codepoints": [10], "characters": "\u000A" },
-  "&nexist;": { "codepoints": [8708], "characters": "\u2204" },
-  "&nexists;": { "codepoints": [8708], "characters": "\u2204" },
-  "&Nfr;": { "codepoints": [120081], "characters": "\uD835\uDD11" },
-  "&nfr;": { "codepoints": [120107], "characters": "\uD835\uDD2B" },
-  "&ngE;": { "codepoints": [8807, 824], "characters": "\u2267\u0338" },
-  "&nge;": { "codepoints": [8817], "characters": "\u2271" },
-  "&ngeq;": { "codepoints": [8817], "characters": "\u2271" },
-  "&ngeqq;": { "codepoints": [8807, 824], "characters": "\u2267\u0338" },
-  "&ngeqslant;": { "codepoints": [10878, 824], "characters": "\u2A7E\u0338" },
-  "&nges;": { "codepoints": [10878, 824], "characters": "\u2A7E\u0338" },
-  "&nGg;": { "codepoints": [8921, 824], "characters": "\u22D9\u0338" },
-  "&ngsim;": { "codepoints": [8821], "characters": "\u2275" },
-  "&nGt;": { "codepoints": [8811, 8402], "characters": "\u226B\u20D2" },
-  "&ngt;": { "codepoints": [8815], "characters": "\u226F" },
-  "&ngtr;": { "codepoints": [8815], "characters": "\u226F" },
-  "&nGtv;": { "codepoints": [8811, 824], "characters": "\u226B\u0338" },
-  "&nharr;": { "codepoints": [8622], "characters": "\u21AE" },
-  "&nhArr;": { "codepoints": [8654], "characters": "\u21CE" },
-  "&nhpar;": { "codepoints": [10994], "characters": "\u2AF2" },
-  "&ni;": { "codepoints": [8715], "characters": "\u220B" },
-  "&nis;": { "codepoints": [8956], "characters": "\u22FC" },
-  "&nisd;": { "codepoints": [8954], "characters": "\u22FA" },
-  "&niv;": { "codepoints": [8715], "characters": "\u220B" },
-  "&NJcy;": { "codepoints": [1034], "characters": "\u040A" },
-  "&njcy;": { "codepoints": [1114], "characters": "\u045A" },
-  "&nlarr;": { "codepoints": [8602], "characters": "\u219A" },
-  "&nlArr;": { "codepoints": [8653], "characters": "\u21CD" },
-  "&nldr;": { "codepoints": [8229], "characters": "\u2025" },
-  "&nlE;": { "codepoints": [8806, 824], "characters": "\u2266\u0338" },
-  "&nle;": { "codepoints": [8816], "characters": "\u2270" },
-  "&nleftarrow;": { "codepoints": [8602], "characters": "\u219A" },
-  "&nLeftarrow;": { "codepoints": [8653], "characters": "\u21CD" },
-  "&nleftrightarrow;": { "codepoints": [8622], "characters": "\u21AE" },
-  "&nLeftrightarrow;": { "codepoints": [8654], "characters": "\u21CE" },
-  "&nleq;": { "codepoints": [8816], "characters": "\u2270" },
-  "&nleqq;": { "codepoints": [8806, 824], "characters": "\u2266\u0338" },
-  "&nleqslant;": { "codepoints": [10877, 824], "characters": "\u2A7D\u0338" },
-  "&nles;": { "codepoints": [10877, 824], "characters": "\u2A7D\u0338" },
-  "&nless;": { "codepoints": [8814], "characters": "\u226E" },
-  "&nLl;": { "codepoints": [8920, 824], "characters": "\u22D8\u0338" },
-  "&nlsim;": { "codepoints": [8820], "characters": "\u2274" },
-  "&nLt;": { "codepoints": [8810, 8402], "characters": "\u226A\u20D2" },
-  "&nlt;": { "codepoints": [8814], "characters": "\u226E" },
-  "&nltri;": { "codepoints": [8938], "characters": "\u22EA" },
-  "&nltrie;": { "codepoints": [8940], "characters": "\u22EC" },
-  "&nLtv;": { "codepoints": [8810, 824], "characters": "\u226A\u0338" },
-  "&nmid;": { "codepoints": [8740], "characters": "\u2224" },
-  "&NoBreak;": { "codepoints": [8288], "characters": "\u2060" },
-  "&NonBreakingSpace;": { "codepoints": [160], "characters": "\u00A0" },
-  "&nopf;": { "codepoints": [120159], "characters": "\uD835\uDD5F" },
-  "&Nopf;": { "codepoints": [8469], "characters": "\u2115" },
-  "&Not;": { "codepoints": [10988], "characters": "\u2AEC" },
-  "&not;": { "codepoints": [172], "characters": "\u00AC" },
-  "&not": { "codepoints": [172], "characters": "\u00AC" },
-  "&NotCongruent;": { "codepoints": [8802], "characters": "\u2262" },
-  "&NotCupCap;": { "codepoints": [8813], "characters": "\u226D" },
-  "&NotDoubleVerticalBar;": { "codepoints": [8742], "characters": "\u2226" },
-  "&NotElement;": { "codepoints": [8713], "characters": "\u2209" },
-  "&NotEqual;": { "codepoints": [8800], "characters": "\u2260" },
-  "&NotEqualTilde;": { "codepoints": [8770, 824], "characters": "\u2242\u0338" },
-  "&NotExists;": { "codepoints": [8708], "characters": "\u2204" },
-  "&NotGreater;": { "codepoints": [8815], "characters": "\u226F" },
-  "&NotGreaterEqual;": { "codepoints": [8817], "characters": "\u2271" },
-  "&NotGreaterFullEqual;": { "codepoints": [8807, 824], "characters": "\u2267\u0338" },
-  "&NotGreaterGreater;": { "codepoints": [8811, 824], "characters": "\u226B\u0338" },
-  "&NotGreaterLess;": { "codepoints": [8825], "characters": "\u2279" },
-  "&NotGreaterSlantEqual;": { "codepoints": [10878, 824], "characters": "\u2A7E\u0338" },
-  "&NotGreaterTilde;": { "codepoints": [8821], "characters": "\u2275" },
-  "&NotHumpDownHump;": { "codepoints": [8782, 824], "characters": "\u224E\u0338" },
-  "&NotHumpEqual;": { "codepoints": [8783, 824], "characters": "\u224F\u0338" },
-  "&notin;": { "codepoints": [8713], "characters": "\u2209" },
-  "&notindot;": { "codepoints": [8949, 824], "characters": "\u22F5\u0338" },
-  "&notinE;": { "codepoints": [8953, 824], "characters": "\u22F9\u0338" },
-  "&notinva;": { "codepoints": [8713], "characters": "\u2209" },
-  "&notinvb;": { "codepoints": [8951], "characters": "\u22F7" },
-  "&notinvc;": { "codepoints": [8950], "characters": "\u22F6" },
-  "&NotLeftTriangleBar;": { "codepoints": [10703, 824], "characters": "\u29CF\u0338" },
-  "&NotLeftTriangle;": { "codepoints": [8938], "characters": "\u22EA" },
-  "&NotLeftTriangleEqual;": { "codepoints": [8940], "characters": "\u22EC" },
-  "&NotLess;": { "codepoints": [8814], "characters": "\u226E" },
-  "&NotLessEqual;": { "codepoints": [8816], "characters": "\u2270" },
-  "&NotLessGreater;": { "codepoints": [8824], "characters": "\u2278" },
-  "&NotLessLess;": { "codepoints": [8810, 824], "characters": "\u226A\u0338" },
-  "&NotLessSlantEqual;": { "codepoints": [10877, 824], "characters": "\u2A7D\u0338" },
-  "&NotLessTilde;": { "codepoints": [8820], "characters": "\u2274" },
-  "&NotNestedGreaterGreater;": { "codepoints": [10914, 824], "characters": "\u2AA2\u0338" },
-  "&NotNestedLessLess;": { "codepoints": [10913, 824], "characters": "\u2AA1\u0338" },
-  "&notni;": { "codepoints": [8716], "characters": "\u220C" },
-  "&notniva;": { "codepoints": [8716], "characters": "\u220C" },
-  "&notnivb;": { "codepoints": [8958], "characters": "\u22FE" },
-  "&notnivc;": { "codepoints": [8957], "characters": "\u22FD" },
-  "&NotPrecedes;": { "codepoints": [8832], "characters": "\u2280" },
-  "&NotPrecedesEqual;": { "codepoints": [10927, 824], "characters": "\u2AAF\u0338" },
-  "&NotPrecedesSlantEqual;": { "codepoints": [8928], "characters": "\u22E0" },
-  "&NotReverseElement;": { "codepoints": [8716], "characters": "\u220C" },
-  "&NotRightTriangleBar;": { "codepoints": [10704, 824], "characters": "\u29D0\u0338" },
-  "&NotRightTriangle;": { "codepoints": [8939], "characters": "\u22EB" },
-  "&NotRightTriangleEqual;": { "codepoints": [8941], "characters": "\u22ED" },
-  "&NotSquareSubset;": { "codepoints": [8847, 824], "characters": "\u228F\u0338" },
-  "&NotSquareSubsetEqual;": { "codepoints": [8930], "characters": "\u22E2" },
-  "&NotSquareSuperset;": { "codepoints": [8848, 824], "characters": "\u2290\u0338" },
-  "&NotSquareSupersetEqual;": { "codepoints": [8931], "characters": "\u22E3" },
-  "&NotSubset;": { "codepoints": [8834, 8402], "characters": "\u2282\u20D2" },
-  "&NotSubsetEqual;": { "codepoints": [8840], "characters": "\u2288" },
-  "&NotSucceeds;": { "codepoints": [8833], "characters": "\u2281" },
-  "&NotSucceedsEqual;": { "codepoints": [10928, 824], "characters": "\u2AB0\u0338" },
-  "&NotSucceedsSlantEqual;": { "codepoints": [8929], "characters": "\u22E1" },
-  "&NotSucceedsTilde;": { "codepoints": [8831, 824], "characters": "\u227F\u0338" },
-  "&NotSuperset;": { "codepoints": [8835, 8402], "characters": "\u2283\u20D2" },
-  "&NotSupersetEqual;": { "codepoints": [8841], "characters": "\u2289" },
-  "&NotTilde;": { "codepoints": [8769], "characters": "\u2241" },
-  "&NotTildeEqual;": { "codepoints": [8772], "characters": "\u2244" },
-  "&NotTildeFullEqual;": { "codepoints": [8775], "characters": "\u2247" },
-  "&NotTildeTilde;": { "codepoints": [8777], "characters": "\u2249" },
-  "&NotVerticalBar;": { "codepoints": [8740], "characters": "\u2224" },
-  "&nparallel;": { "codepoints": [8742], "characters": "\u2226" },
-  "&npar;": { "codepoints": [8742], "characters": "\u2226" },
-  "&nparsl;": { "codepoints": [11005, 8421], "characters": "\u2AFD\u20E5" },
-  "&npart;": { "codepoints": [8706, 824], "characters": "\u2202\u0338" },
-  "&npolint;": { "codepoints": [10772], "characters": "\u2A14" },
-  "&npr;": { "codepoints": [8832], "characters": "\u2280" },
-  "&nprcue;": { "codepoints": [8928], "characters": "\u22E0" },
-  "&nprec;": { "codepoints": [8832], "characters": "\u2280" },
-  "&npreceq;": { "codepoints": [10927, 824], "characters": "\u2AAF\u0338" },
-  "&npre;": { "codepoints": [10927, 824], "characters": "\u2AAF\u0338" },
-  "&nrarrc;": { "codepoints": [10547, 824], "characters": "\u2933\u0338" },
-  "&nrarr;": { "codepoints": [8603], "characters": "\u219B" },
-  "&nrArr;": { "codepoints": [8655], "characters": "\u21CF" },
-  "&nrarrw;": { "codepoints": [8605, 824], "characters": "\u219D\u0338" },
-  "&nrightarrow;": { "codepoints": [8603], "characters": "\u219B" },
-  "&nRightarrow;": { "codepoints": [8655], "characters": "\u21CF" },
-  "&nrtri;": { "codepoints": [8939], "characters": "\u22EB" },
-  "&nrtrie;": { "codepoints": [8941], "characters": "\u22ED" },
-  "&nsc;": { "codepoints": [8833], "characters": "\u2281" },
-  "&nsccue;": { "codepoints": [8929], "characters": "\u22E1" },
-  "&nsce;": { "codepoints": [10928, 824], "characters": "\u2AB0\u0338" },
-  "&Nscr;": { "codepoints": [119977], "characters": "\uD835\uDCA9" },
-  "&nscr;": { "codepoints": [120003], "characters": "\uD835\uDCC3" },
-  "&nshortmid;": { "codepoints": [8740], "characters": "\u2224" },
-  "&nshortparallel;": { "codepoints": [8742], "characters": "\u2226" },
-  "&nsim;": { "codepoints": [8769], "characters": "\u2241" },
-  "&nsime;": { "codepoints": [8772], "characters": "\u2244" },
-  "&nsimeq;": { "codepoints": [8772], "characters": "\u2244" },
-  "&nsmid;": { "codepoints": [8740], "characters": "\u2224" },
-  "&nspar;": { "codepoints": [8742], "characters": "\u2226" },
-  "&nsqsube;": { "codepoints": [8930], "characters": "\u22E2" },
-  "&nsqsupe;": { "codepoints": [8931], "characters": "\u22E3" },
-  "&nsub;": { "codepoints": [8836], "characters": "\u2284" },
-  "&nsubE;": { "codepoints": [10949, 824], "characters": "\u2AC5\u0338" },
-  "&nsube;": { "codepoints": [8840], "characters": "\u2288" },
-  "&nsubset;": { "codepoints": [8834, 8402], "characters": "\u2282\u20D2" },
-  "&nsubseteq;": { "codepoints": [8840], "characters": "\u2288" },
-  "&nsubseteqq;": { "codepoints": [10949, 824], "characters": "\u2AC5\u0338" },
-  "&nsucc;": { "codepoints": [8833], "characters": "\u2281" },
-  "&nsucceq;": { "codepoints": [10928, 824], "characters": "\u2AB0\u0338" },
-  "&nsup;": { "codepoints": [8837], "characters": "\u2285" },
-  "&nsupE;": { "codepoints": [10950, 824], "characters": "\u2AC6\u0338" },
-  "&nsupe;": { "codepoints": [8841], "characters": "\u2289" },
-  "&nsupset;": { "codepoints": [8835, 8402], "characters": "\u2283\u20D2" },
-  "&nsupseteq;": { "codepoints": [8841], "characters": "\u2289" },
-  "&nsupseteqq;": { "codepoints": [10950, 824], "characters": "\u2AC6\u0338" },
-  "&ntgl;": { "codepoints": [8825], "characters": "\u2279" },
-  "&Ntilde;": { "codepoints": [209], "characters": "\u00D1" },
-  "&Ntilde": { "codepoints": [209], "characters": "\u00D1" },
-  "&ntilde;": { "codepoints": [241], "characters": "\u00F1" },
-  "&ntilde": { "codepoints": [241], "characters": "\u00F1" },
-  "&ntlg;": { "codepoints": [8824], "characters": "\u2278" },
-  "&ntriangleleft;": { "codepoints": [8938], "characters": "\u22EA" },
-  "&ntrianglelefteq;": { "codepoints": [8940], "characters": "\u22EC" },
-  "&ntriangleright;": { "codepoints": [8939], "characters": "\u22EB" },
-  "&ntrianglerighteq;": { "codepoints": [8941], "characters": "\u22ED" },
-  "&Nu;": { "codepoints": [925], "characters": "\u039D" },
-  "&nu;": { "codepoints": [957], "characters": "\u03BD" },
-  "&num;": { "codepoints": [35], "characters": "\u0023" },
-  "&numero;": { "codepoints": [8470], "characters": "\u2116" },
-  "&numsp;": { "codepoints": [8199], "characters": "\u2007" },
-  "&nvap;": { "codepoints": [8781, 8402], "characters": "\u224D\u20D2" },
-  "&nvdash;": { "codepoints": [8876], "characters": "\u22AC" },
-  "&nvDash;": { "codepoints": [8877], "characters": "\u22AD" },
-  "&nVdash;": { "codepoints": [8878], "characters": "\u22AE" },
-  "&nVDash;": { "codepoints": [8879], "characters": "\u22AF" },
-  "&nvge;": { "codepoints": [8805, 8402], "characters": "\u2265\u20D2" },
-  "&nvgt;": { "codepoints": [62, 8402], "characters": "\u003E\u20D2" },
-  "&nvHarr;": { "codepoints": [10500], "characters": "\u2904" },
-  "&nvinfin;": { "codepoints": [10718], "characters": "\u29DE" },
-  "&nvlArr;": { "codepoints": [10498], "characters": "\u2902" },
-  "&nvle;": { "codepoints": [8804, 8402], "characters": "\u2264\u20D2" },
-  "&nvlt;": { "codepoints": [60, 8402], "characters": "\u003C\u20D2" },
-  "&nvltrie;": { "codepoints": [8884, 8402], "characters": "\u22B4\u20D2" },
-  "&nvrArr;": { "codepoints": [10499], "characters": "\u2903" },
-  "&nvrtrie;": { "codepoints": [8885, 8402], "characters": "\u22B5\u20D2" },
-  "&nvsim;": { "codepoints": [8764, 8402], "characters": "\u223C\u20D2" },
-  "&nwarhk;": { "codepoints": [10531], "characters": "\u2923" },
-  "&nwarr;": { "codepoints": [8598], "characters": "\u2196" },
-  "&nwArr;": { "codepoints": [8662], "characters": "\u21D6" },
-  "&nwarrow;": { "codepoints": [8598], "characters": "\u2196" },
-  "&nwnear;": { "codepoints": [10535], "characters": "\u2927" },
-  "&Oacute;": { "codepoints": [211], "characters": "\u00D3" },
-  "&Oacute": { "codepoints": [211], "characters": "\u00D3" },
-  "&oacute;": { "codepoints": [243], "characters": "\u00F3" },
-  "&oacute": { "codepoints": [243], "characters": "\u00F3" },
-  "&oast;": { "codepoints": [8859], "characters": "\u229B" },
-  "&Ocirc;": { "codepoints": [212], "characters": "\u00D4" },
-  "&Ocirc": { "codepoints": [212], "characters": "\u00D4" },
-  "&ocirc;": { "codepoints": [244], "characters": "\u00F4" },
-  "&ocirc": { "codepoints": [244], "characters": "\u00F4" },
-  "&ocir;": { "codepoints": [8858], "characters": "\u229A" },
-  "&Ocy;": { "codepoints": [1054], "characters": "\u041E" },
-  "&ocy;": { "codepoints": [1086], "characters": "\u043E" },
-  "&odash;": { "codepoints": [8861], "characters": "\u229D" },
-  "&Odblac;": { "codepoints": [336], "characters": "\u0150" },
-  "&odblac;": { "codepoints": [337], "characters": "\u0151" },
-  "&odiv;": { "codepoints": [10808], "characters": "\u2A38" },
-  "&odot;": { "codepoints": [8857], "characters": "\u2299" },
-  "&odsold;": { "codepoints": [10684], "characters": "\u29BC" },
-  "&OElig;": { "codepoints": [338], "characters": "\u0152" },
-  "&oelig;": { "codepoints": [339], "characters": "\u0153" },
-  "&ofcir;": { "codepoints": [10687], "characters": "\u29BF" },
-  "&Ofr;": { "codepoints": [120082], "characters": "\uD835\uDD12" },
-  "&ofr;": { "codepoints": [120108], "characters": "\uD835\uDD2C" },
-  "&ogon;": { "codepoints": [731], "characters": "\u02DB" },
-  "&Ograve;": { "codepoints": [210], "characters": "\u00D2" },
-  "&Ograve": { "codepoints": [210], "characters": "\u00D2" },
-  "&ograve;": { "codepoints": [242], "characters": "\u00F2" },
-  "&ograve": { "codepoints": [242], "characters": "\u00F2" },
-  "&ogt;": { "codepoints": [10689], "characters": "\u29C1" },
-  "&ohbar;": { "codepoints": [10677], "characters": "\u29B5" },
-  "&ohm;": { "codepoints": [937], "characters": "\u03A9" },
-  "&oint;": { "codepoints": [8750], "characters": "\u222E" },
-  "&olarr;": { "codepoints": [8634], "characters": "\u21BA" },
-  "&olcir;": { "codepoints": [10686], "characters": "\u29BE" },
-  "&olcross;": { "codepoints": [10683], "characters": "\u29BB" },
-  "&oline;": { "codepoints": [8254], "characters": "\u203E" },
-  "&olt;": { "codepoints": [10688], "characters": "\u29C0" },
-  "&Omacr;": { "codepoints": [332], "characters": "\u014C" },
-  "&omacr;": { "codepoints": [333], "characters": "\u014D" },
-  "&Omega;": { "codepoints": [937], "characters": "\u03A9" },
-  "&omega;": { "codepoints": [969], "characters": "\u03C9" },
-  "&Omicron;": { "codepoints": [927], "characters": "\u039F" },
-  "&omicron;": { "codepoints": [959], "characters": "\u03BF" },
-  "&omid;": { "codepoints": [10678], "characters": "\u29B6" },
-  "&ominus;": { "codepoints": [8854], "characters": "\u2296" },
-  "&Oopf;": { "codepoints": [120134], "characters": "\uD835\uDD46" },
-  "&oopf;": { "codepoints": [120160], "characters": "\uD835\uDD60" },
-  "&opar;": { "codepoints": [10679], "characters": "\u29B7" },
-  "&OpenCurlyDoubleQuote;": { "codepoints": [8220], "characters": "\u201C" },
-  "&OpenCurlyQuote;": { "codepoints": [8216], "characters": "\u2018" },
-  "&operp;": { "codepoints": [10681], "characters": "\u29B9" },
-  "&oplus;": { "codepoints": [8853], "characters": "\u2295" },
-  "&orarr;": { "codepoints": [8635], "characters": "\u21BB" },
-  "&Or;": { "codepoints": [10836], "characters": "\u2A54" },
-  "&or;": { "codepoints": [8744], "characters": "\u2228" },
-  "&ord;": { "codepoints": [10845], "characters": "\u2A5D" },
-  "&order;": { "codepoints": [8500], "characters": "\u2134" },
-  "&orderof;": { "codepoints": [8500], "characters": "\u2134" },
-  "&ordf;": { "codepoints": [170], "characters": "\u00AA" },
-  "&ordf": { "codepoints": [170], "characters": "\u00AA" },
-  "&ordm;": { "codepoints": [186], "characters": "\u00BA" },
-  "&ordm": { "codepoints": [186], "characters": "\u00BA" },
-  "&origof;": { "codepoints": [8886], "characters": "\u22B6" },
-  "&oror;": { "codepoints": [10838], "characters": "\u2A56" },
-  "&orslope;": { "codepoints": [10839], "characters": "\u2A57" },
-  "&orv;": { "codepoints": [10843], "characters": "\u2A5B" },
-  "&oS;": { "codepoints": [9416], "characters": "\u24C8" },
-  "&Oscr;": { "codepoints": [119978], "characters": "\uD835\uDCAA" },
-  "&oscr;": { "codepoints": [8500], "characters": "\u2134" },
-  "&Oslash;": { "codepoints": [216], "characters": "\u00D8" },
-  "&Oslash": { "codepoints": [216], "characters": "\u00D8" },
-  "&oslash;": { "codepoints": [248], "characters": "\u00F8" },
-  "&oslash": { "codepoints": [248], "characters": "\u00F8" },
-  "&osol;": { "codepoints": [8856], "characters": "\u2298" },
-  "&Otilde;": { "codepoints": [213], "characters": "\u00D5" },
-  "&Otilde": { "codepoints": [213], "characters": "\u00D5" },
-  "&otilde;": { "codepoints": [245], "characters": "\u00F5" },
-  "&otilde": { "codepoints": [245], "characters": "\u00F5" },
-  "&otimesas;": { "codepoints": [10806], "characters": "\u2A36" },
-  "&Otimes;": { "codepoints": [10807], "characters": "\u2A37" },
-  "&otimes;": { "codepoints": [8855], "characters": "\u2297" },
-  "&Ouml;": { "codepoints": [214], "characters": "\u00D6" },
-  "&Ouml": { "codepoints": [214], "characters": "\u00D6" },
-  "&ouml;": { "codepoints": [246], "characters": "\u00F6" },
-  "&ouml": { "codepoints": [246], "characters": "\u00F6" },
-  "&ovbar;": { "codepoints": [9021], "characters": "\u233D" },
-  "&OverBar;": { "codepoints": [8254], "characters": "\u203E" },
-  "&OverBrace;": { "codepoints": [9182], "characters": "\u23DE" },
-  "&OverBracket;": { "codepoints": [9140], "characters": "\u23B4" },
-  "&OverParenthesis;": { "codepoints": [9180], "characters": "\u23DC" },
-  "&para;": { "codepoints": [182], "characters": "\u00B6" },
-  "&para": { "codepoints": [182], "characters": "\u00B6" },
-  "&parallel;": { "codepoints": [8741], "characters": "\u2225" },
-  "&par;": { "codepoints": [8741], "characters": "\u2225" },
-  "&parsim;": { "codepoints": [10995], "characters": "\u2AF3" },
-  "&parsl;": { "codepoints": [11005], "characters": "\u2AFD" },
-  "&part;": { "codepoints": [8706], "characters": "\u2202" },
-  "&PartialD;": { "codepoints": [8706], "characters": "\u2202" },
-  "&Pcy;": { "codepoints": [1055], "characters": "\u041F" },
-  "&pcy;": { "codepoints": [1087], "characters": "\u043F" },
-  "&percnt;": { "codepoints": [37], "characters": "\u0025" },
-  "&period;": { "codepoints": [46], "characters": "\u002E" },
-  "&permil;": { "codepoints": [8240], "characters": "\u2030" },
-  "&perp;": { "codepoints": [8869], "characters": "\u22A5" },
-  "&pertenk;": { "codepoints": [8241], "characters": "\u2031" },
-  "&Pfr;": { "codepoints": [120083], "characters": "\uD835\uDD13" },
-  "&pfr;": { "codepoints": [120109], "characters": "\uD835\uDD2D" },
-  "&Phi;": { "codepoints": [934], "characters": "\u03A6" },
-  "&phi;": { "codepoints": [966], "characters": "\u03C6" },
-  "&phiv;": { "codepoints": [981], "characters": "\u03D5" },
-  "&phmmat;": { "codepoints": [8499], "characters": "\u2133" },
-  "&phone;": { "codepoints": [9742], "characters": "\u260E" },
-  "&Pi;": { "codepoints": [928], "characters": "\u03A0" },
-  "&pi;": { "codepoints": [960], "characters": "\u03C0" },
-  "&pitchfork;": { "codepoints": [8916], "characters": "\u22D4" },
-  "&piv;": { "codepoints": [982], "characters": "\u03D6" },
-  "&planck;": { "codepoints": [8463], "characters": "\u210F" },
-  "&planckh;": { "codepoints": [8462], "characters": "\u210E" },
-  "&plankv;": { "codepoints": [8463], "characters": "\u210F" },
-  "&plusacir;": { "codepoints": [10787], "characters": "\u2A23" },
-  "&plusb;": { "codepoints": [8862], "characters": "\u229E" },
-  "&pluscir;": { "codepoints": [10786], "characters": "\u2A22" },
-  "&plus;": { "codepoints": [43], "characters": "\u002B" },
-  "&plusdo;": { "codepoints": [8724], "characters": "\u2214" },
-  "&plusdu;": { "codepoints": [10789], "characters": "\u2A25" },
-  "&pluse;": { "codepoints": [10866], "characters": "\u2A72" },
-  "&PlusMinus;": { "codepoints": [177], "characters": "\u00B1" },
-  "&plusmn;": { "codepoints": [177], "characters": "\u00B1" },
-  "&plusmn": { "codepoints": [177], "characters": "\u00B1" },
-  "&plussim;": { "codepoints": [10790], "characters": "\u2A26" },
-  "&plustwo;": { "codepoints": [10791], "characters": "\u2A27" },
-  "&pm;": { "codepoints": [177], "characters": "\u00B1" },
-  "&Poincareplane;": { "codepoints": [8460], "characters": "\u210C" },
-  "&pointint;": { "codepoints": [10773], "characters": "\u2A15" },
-  "&popf;": { "codepoints": [120161], "characters": "\uD835\uDD61" },
-  "&Popf;": { "codepoints": [8473], "characters": "\u2119" },
-  "&pound;": { "codepoints": [163], "characters": "\u00A3" },
-  "&pound": { "codepoints": [163], "characters": "\u00A3" },
-  "&prap;": { "codepoints": [10935], "characters": "\u2AB7" },
-  "&Pr;": { "codepoints": [10939], "characters": "\u2ABB" },
-  "&pr;": { "codepoints": [8826], "characters": "\u227A" },
-  "&prcue;": { "codepoints": [8828], "characters": "\u227C" },
-  "&precapprox;": { "codepoints": [10935], "characters": "\u2AB7" },
-  "&prec;": { "codepoints": [8826], "characters": "\u227A" },
-  "&preccurlyeq;": { "codepoints": [8828], "characters": "\u227C" },
-  "&Precedes;": { "codepoints": [8826], "characters": "\u227A" },
-  "&PrecedesEqual;": { "codepoints": [10927], "characters": "\u2AAF" },
-  "&PrecedesSlantEqual;": { "codepoints": [8828], "characters": "\u227C" },
-  "&PrecedesTilde;": { "codepoints": [8830], "characters": "\u227E" },
-  "&preceq;": { "codepoints": [10927], "characters": "\u2AAF" },
-  "&precnapprox;": { "codepoints": [10937], "characters": "\u2AB9" },
-  "&precneqq;": { "codepoints": [10933], "characters": "\u2AB5" },
-  "&precnsim;": { "codepoints": [8936], "characters": "\u22E8" },
-  "&pre;": { "codepoints": [10927], "characters": "\u2AAF" },
-  "&prE;": { "codepoints": [10931], "characters": "\u2AB3" },
-  "&precsim;": { "codepoints": [8830], "characters": "\u227E" },
-  "&prime;": { "codepoints": [8242], "characters": "\u2032" },
-  "&Prime;": { "codepoints": [8243], "characters": "\u2033" },
-  "&primes;": { "codepoints": [8473], "characters": "\u2119" },
-  "&prnap;": { "codepoints": [10937], "characters": "\u2AB9" },
-  "&prnE;": { "codepoints": [10933], "characters": "\u2AB5" },
-  "&prnsim;": { "codepoints": [8936], "characters": "\u22E8" },
-  "&prod;": { "codepoints": [8719], "characters": "\u220F" },
-  "&Product;": { "codepoints": [8719], "characters": "\u220F" },
-  "&profalar;": { "codepoints": [9006], "characters": "\u232E" },
-  "&profline;": { "codepoints": [8978], "characters": "\u2312" },
-  "&profsurf;": { "codepoints": [8979], "characters": "\u2313" },
-  "&prop;": { "codepoints": [8733], "characters": "\u221D" },
-  "&Proportional;": { "codepoints": [8733], "characters": "\u221D" },
-  "&Proportion;": { "codepoints": [8759], "characters": "\u2237" },
-  "&propto;": { "codepoints": [8733], "characters": "\u221D" },
-  "&prsim;": { "codepoints": [8830], "characters": "\u227E" },
-  "&prurel;": { "codepoints": [8880], "characters": "\u22B0" },
-  "&Pscr;": { "codepoints": [119979], "characters": "\uD835\uDCAB" },
-  "&pscr;": { "codepoints": [120005], "characters": "\uD835\uDCC5" },
-  "&Psi;": { "codepoints": [936], "characters": "\u03A8" },
-  "&psi;": { "codepoints": [968], "characters": "\u03C8" },
-  "&puncsp;": { "codepoints": [8200], "characters": "\u2008" },
-  "&Qfr;": { "codepoints": [120084], "characters": "\uD835\uDD14" },
-  "&qfr;": { "codepoints": [120110], "characters": "\uD835\uDD2E" },
-  "&qint;": { "codepoints": [10764], "characters": "\u2A0C" },
-  "&qopf;": { "codepoints": [120162], "characters": "\uD835\uDD62" },
-  "&Qopf;": { "codepoints": [8474], "characters": "\u211A" },
-  "&qprime;": { "codepoints": [8279], "characters": "\u2057" },
-  "&Qscr;": { "codepoints": [119980], "characters": "\uD835\uDCAC" },
-  "&qscr;": { "codepoints": [120006], "characters": "\uD835\uDCC6" },
-  "&quaternions;": { "codepoints": [8461], "characters": "\u210D" },
-  "&quatint;": { "codepoints": [10774], "characters": "\u2A16" },
-  "&quest;": { "codepoints": [63], "characters": "\u003F" },
-  "&questeq;": { "codepoints": [8799], "characters": "\u225F" },
-  "&quot;": { "codepoints": [34], "characters": "\u0022" },
-  "&quot": { "codepoints": [34], "characters": "\u0022" },
-  "&QUOT;": { "codepoints": [34], "characters": "\u0022" },
-  "&QUOT": { "codepoints": [34], "characters": "\u0022" },
-  "&rAarr;": { "codepoints": [8667], "characters": "\u21DB" },
-  "&race;": { "codepoints": [8765, 817], "characters": "\u223D\u0331" },
-  "&Racute;": { "codepoints": [340], "characters": "\u0154" },
-  "&racute;": { "codepoints": [341], "characters": "\u0155" },
-  "&radic;": { "codepoints": [8730], "characters": "\u221A" },
-  "&raemptyv;": { "codepoints": [10675], "characters": "\u29B3" },
-  "&rang;": { "codepoints": [10217], "characters": "\u27E9" },
-  "&Rang;": { "codepoints": [10219], "characters": "\u27EB" },
-  "&rangd;": { "codepoints": [10642], "characters": "\u2992" },
-  "&range;": { "codepoints": [10661], "characters": "\u29A5" },
-  "&rangle;": { "codepoints": [10217], "characters": "\u27E9" },
-  "&raquo;": { "codepoints": [187], "characters": "\u00BB" },
-  "&raquo": { "codepoints": [187], "characters": "\u00BB" },
-  "&rarrap;": { "codepoints": [10613], "characters": "\u2975" },
-  "&rarrb;": { "codepoints": [8677], "characters": "\u21E5" },
-  "&rarrbfs;": { "codepoints": [10528], "characters": "\u2920" },
-  "&rarrc;": { "codepoints": [10547], "characters": "\u2933" },
-  "&rarr;": { "codepoints": [8594], "characters": "\u2192" },
-  "&Rarr;": { "codepoints": [8608], "characters": "\u21A0" },
-  "&rArr;": { "codepoints": [8658], "characters": "\u21D2" },
-  "&rarrfs;": { "codepoints": [10526], "characters": "\u291E" },
-  "&rarrhk;": { "codepoints": [8618], "characters": "\u21AA" },
-  "&rarrlp;": { "codepoints": [8620], "characters": "\u21AC" },
-  "&rarrpl;": { "codepoints": [10565], "characters": "\u2945" },
-  "&rarrsim;": { "codepoints": [10612], "characters": "\u2974" },
-  "&Rarrtl;": { "codepoints": [10518], "characters": "\u2916" },
-  "&rarrtl;": { "codepoints": [8611], "characters": "\u21A3" },
-  "&rarrw;": { "codepoints": [8605], "characters": "\u219D" },
-  "&ratail;": { "codepoints": [10522], "characters": "\u291A" },
-  "&rAtail;": { "codepoints": [10524], "characters": "\u291C" },
-  "&ratio;": { "codepoints": [8758], "characters": "\u2236" },
-  "&rationals;": { "codepoints": [8474], "characters": "\u211A" },
-  "&rbarr;": { "codepoints": [10509], "characters": "\u290D" },
-  "&rBarr;": { "codepoints": [10511], "characters": "\u290F" },
-  "&RBarr;": { "codepoints": [10512], "characters": "\u2910" },
-  "&rbbrk;": { "codepoints": [10099], "characters": "\u2773" },
-  "&rbrace;": { "codepoints": [125], "characters": "\u007D" },
-  "&rbrack;": { "codepoints": [93], "characters": "\u005D" },
-  "&rbrke;": { "codepoints": [10636], "characters": "\u298C" },
-  "&rbrksld;": { "codepoints": [10638], "characters": "\u298E" },
-  "&rbrkslu;": { "codepoints": [10640], "characters": "\u2990" },
-  "&Rcaron;": { "codepoints": [344], "characters": "\u0158" },
-  "&rcaron;": { "codepoints": [345], "characters": "\u0159" },
-  "&Rcedil;": { "codepoints": [342], "characters": "\u0156" },
-  "&rcedil;": { "codepoints": [343], "characters": "\u0157" },
-  "&rceil;": { "codepoints": [8969], "characters": "\u2309" },
-  "&rcub;": { "codepoints": [125], "characters": "\u007D" },
-  "&Rcy;": { "codepoints": [1056], "characters": "\u0420" },
-  "&rcy;": { "codepoints": [1088], "characters": "\u0440" },
-  "&rdca;": { "codepoints": [10551], "characters": "\u2937" },
-  "&rdldhar;": { "codepoints": [10601], "characters": "\u2969" },
-  "&rdquo;": { "codepoints": [8221], "characters": "\u201D" },
-  "&rdquor;": { "codepoints": [8221], "characters": "\u201D" },
-  "&rdsh;": { "codepoints": [8627], "characters": "\u21B3" },
-  "&real;": { "codepoints": [8476], "characters": "\u211C" },
-  "&realine;": { "codepoints": [8475], "characters": "\u211B" },
-  "&realpart;": { "codepoints": [8476], "characters": "\u211C" },
-  "&reals;": { "codepoints": [8477], "characters": "\u211D" },
-  "&Re;": { "codepoints": [8476], "characters": "\u211C" },
-  "&rect;": { "codepoints": [9645], "characters": "\u25AD" },
-  "&reg;": { "codepoints": [174], "characters": "\u00AE" },
-  "&reg": { "codepoints": [174], "characters": "\u00AE" },
-  "&REG;": { "codepoints": [174], "characters": "\u00AE" },
-  "&REG": { "codepoints": [174], "characters": "\u00AE" },
-  "&ReverseElement;": { "codepoints": [8715], "characters": "\u220B" },
-  "&ReverseEquilibrium;": { "codepoints": [8651], "characters": "\u21CB" },
-  "&ReverseUpEquilibrium;": { "codepoints": [10607], "characters": "\u296F" },
-  "&rfisht;": { "codepoints": [10621], "characters": "\u297D" },
-  "&rfloor;": { "codepoints": [8971], "characters": "\u230B" },
-  "&rfr;": { "codepoints": [120111], "characters": "\uD835\uDD2F" },
-  "&Rfr;": { "codepoints": [8476], "characters": "\u211C" },
-  "&rHar;": { "codepoints": [10596], "characters": "\u2964" },
-  "&rhard;": { "codepoints": [8641], "characters": "\u21C1" },
-  "&rharu;": { "codepoints": [8640], "characters": "\u21C0" },
-  "&rharul;": { "codepoints": [10604], "characters": "\u296C" },
-  "&Rho;": { "codepoints": [929], "characters": "\u03A1" },
-  "&rho;": { "codepoints": [961], "characters": "\u03C1" },
-  "&rhov;": { "codepoints": [1009], "characters": "\u03F1" },
-  "&RightAngleBracket;": { "codepoints": [10217], "characters": "\u27E9" },
-  "&RightArrowBar;": { "codepoints": [8677], "characters": "\u21E5" },
-  "&rightarrow;": { "codepoints": [8594], "characters": "\u2192" },
-  "&RightArrow;": { "codepoints": [8594], "characters": "\u2192" },
-  "&Rightarrow;": { "codepoints": [8658], "characters": "\u21D2" },
-  "&RightArrowLeftArrow;": { "codepoints": [8644], "characters": "\u21C4" },
-  "&rightarrowtail;": { "codepoints": [8611], "characters": "\u21A3" },
-  "&RightCeiling;": { "codepoints": [8969], "characters": "\u2309" },
-  "&RightDoubleBracket;": { "codepoints": [10215], "characters": "\u27E7" },
-  "&RightDownTeeVector;": { "codepoints": [10589], "characters": "\u295D" },
-  "&RightDownVectorBar;": { "codepoints": [10581], "characters": "\u2955" },
-  "&RightDownVector;": { "codepoints": [8642], "characters": "\u21C2" },
-  "&RightFloor;": { "codepoints": [8971], "characters": "\u230B" },
-  "&rightharpoondown;": { "codepoints": [8641], "characters": "\u21C1" },
-  "&rightharpoonup;": { "codepoints": [8640], "characters": "\u21C0" },
-  "&rightleftarrows;": { "codepoints": [8644], "characters": "\u21C4" },
-  "&rightleftharpoons;": { "codepoints": [8652], "characters": "\u21CC" },
-  "&rightrightarrows;": { "codepoints": [8649], "characters": "\u21C9" },
-  "&rightsquigarrow;": { "codepoints": [8605], "characters": "\u219D" },
-  "&RightTeeArrow;": { "codepoints": [8614], "characters": "\u21A6" },
-  "&RightTee;": { "codepoints": [8866], "characters": "\u22A2" },
-  "&RightTeeVector;": { "codepoints": [10587], "characters": "\u295B" },
-  "&rightthreetimes;": { "codepoints": [8908], "characters": "\u22CC" },
-  "&RightTriangleBar;": { "codepoints": [10704], "characters": "\u29D0" },
-  "&RightTriangle;": { "codepoints": [8883], "characters": "\u22B3" },
-  "&RightTriangleEqual;": { "codepoints": [8885], "characters": "\u22B5" },
-  "&RightUpDownVector;": { "codepoints": [10575], "characters": "\u294F" },
-  "&RightUpTeeVector;": { "codepoints": [10588], "characters": "\u295C" },
-  "&RightUpVectorBar;": { "codepoints": [10580], "characters": "\u2954" },
-  "&RightUpVector;": { "codepoints": [8638], "characters": "\u21BE" },
-  "&RightVectorBar;": { "codepoints": [10579], "characters": "\u2953" },
-  "&RightVector;": { "codepoints": [8640], "characters": "\u21C0" },
-  "&ring;": { "codepoints": [730], "characters": "\u02DA" },
-  "&risingdotseq;": { "codepoints": [8787], "characters": "\u2253" },
-  "&rlarr;": { "codepoints": [8644], "characters": "\u21C4" },
-  "&rlhar;": { "codepoints": [8652], "characters": "\u21CC" },
-  "&rlm;": { "codepoints": [8207], "characters": "\u200F" },
-  "&rmoustache;": { "codepoints": [9137], "characters": "\u23B1" },
-  "&rmoust;": { "codepoints": [9137], "characters": "\u23B1" },
-  "&rnmid;": { "codepoints": [10990], "characters": "\u2AEE" },
-  "&roang;": { "codepoints": [10221], "characters": "\u27ED" },
-  "&roarr;": { "codepoints": [8702], "characters": "\u21FE" },
-  "&robrk;": { "codepoints": [10215], "characters": "\u27E7" },
-  "&ropar;": { "codepoints": [10630], "characters": "\u2986" },
-  "&ropf;": { "codepoints": [120163], "characters": "\uD835\uDD63" },
-  "&Ropf;": { "codepoints": [8477], "characters": "\u211D" },
-  "&roplus;": { "codepoints": [10798], "characters": "\u2A2E" },
-  "&rotimes;": { "codepoints": [10805], "characters": "\u2A35" },
-  "&RoundImplies;": { "codepoints": [10608], "characters": "\u2970" },
-  "&rpar;": { "codepoints": [41], "characters": "\u0029" },
-  "&rpargt;": { "codepoints": [10644], "characters": "\u2994" },
-  "&rppolint;": { "codepoints": [10770], "characters": "\u2A12" },
-  "&rrarr;": { "codepoints": [8649], "characters": "\u21C9" },
-  "&Rrightarrow;": { "codepoints": [8667], "characters": "\u21DB" },
-  "&rsaquo;": { "codepoints": [8250], "characters": "\u203A" },
-  "&rscr;": { "codepoints": [120007], "characters": "\uD835\uDCC7" },
-  "&Rscr;": { "codepoints": [8475], "characters": "\u211B" },
-  "&rsh;": { "codepoints": [8625], "characters": "\u21B1" },
-  "&Rsh;": { "codepoints": [8625], "characters": "\u21B1" },
-  "&rsqb;": { "codepoints": [93], "characters": "\u005D" },
-  "&rsquo;": { "codepoints": [8217], "characters": "\u2019" },
-  "&rsquor;": { "codepoints": [8217], "characters": "\u2019" },
-  "&rthree;": { "codepoints": [8908], "characters": "\u22CC" },
-  "&rtimes;": { "codepoints": [8906], "characters": "\u22CA" },
-  "&rtri;": { "codepoints": [9657], "characters": "\u25B9" },
-  "&rtrie;": { "codepoints": [8885], "characters": "\u22B5" },
-  "&rtrif;": { "codepoints": [9656], "characters": "\u25B8" },
-  "&rtriltri;": { "codepoints": [10702], "characters": "\u29CE" },
-  "&RuleDelayed;": { "codepoints": [10740], "characters": "\u29F4" },
-  "&ruluhar;": { "codepoints": [10600], "characters": "\u2968" },
-  "&rx;": { "codepoints": [8478], "characters": "\u211E" },
-  "&Sacute;": { "codepoints": [346], "characters": "\u015A" },
-  "&sacute;": { "codepoints": [347], "characters": "\u015B" },
-  "&sbquo;": { "codepoints": [8218], "characters": "\u201A" },
-  "&scap;": { "codepoints": [10936], "characters": "\u2AB8" },
-  "&Scaron;": { "codepoints": [352], "characters": "\u0160" },
-  "&scaron;": { "codepoints": [353], "characters": "\u0161" },
-  "&Sc;": { "codepoints": [10940], "characters": "\u2ABC" },
-  "&sc;": { "codepoints": [8827], "characters": "\u227B" },
-  "&sccue;": { "codepoints": [8829], "characters": "\u227D" },
-  "&sce;": { "codepoints": [10928], "characters": "\u2AB0" },
-  "&scE;": { "codepoints": [10932], "characters": "\u2AB4" },
-  "&Scedil;": { "codepoints": [350], "characters": "\u015E" },
-  "&scedil;": { "codepoints": [351], "characters": "\u015F" },
-  "&Scirc;": { "codepoints": [348], "characters": "\u015C" },
-  "&scirc;": { "codepoints": [349], "characters": "\u015D" },
-  "&scnap;": { "codepoints": [10938], "characters": "\u2ABA" },
-  "&scnE;": { "codepoints": [10934], "characters": "\u2AB6" },
-  "&scnsim;": { "codepoints": [8937], "characters": "\u22E9" },
-  "&scpolint;": { "codepoints": [10771], "characters": "\u2A13" },
-  "&scsim;": { "codepoints": [8831], "characters": "\u227F" },
-  "&Scy;": { "codepoints": [1057], "characters": "\u0421" },
-  "&scy;": { "codepoints": [1089], "characters": "\u0441" },
-  "&sdotb;": { "codepoints": [8865], "characters": "\u22A1" },
-  "&sdot;": { "codepoints": [8901], "characters": "\u22C5" },
-  "&sdote;": { "codepoints": [10854], "characters": "\u2A66" },
-  "&searhk;": { "codepoints": [10533], "characters": "\u2925" },
-  "&searr;": { "codepoints": [8600], "characters": "\u2198" },
-  "&seArr;": { "codepoints": [8664], "characters": "\u21D8" },
-  "&searrow;": { "codepoints": [8600], "characters": "\u2198" },
-  "&sect;": { "codepoints": [167], "characters": "\u00A7" },
-  "&sect": { "codepoints": [167], "characters": "\u00A7" },
-  "&semi;": { "codepoints": [59], "characters": "\u003B" },
-  "&seswar;": { "codepoints": [10537], "characters": "\u2929" },
-  "&setminus;": { "codepoints": [8726], "characters": "\u2216" },
-  "&setmn;": { "codepoints": [8726], "characters": "\u2216" },
-  "&sext;": { "codepoints": [10038], "characters": "\u2736" },
-  "&Sfr;": { "codepoints": [120086], "characters": "\uD835\uDD16" },
-  "&sfr;": { "codepoints": [120112], "characters": "\uD835\uDD30" },
-  "&sfrown;": { "codepoints": [8994], "characters": "\u2322" },
-  "&sharp;": { "codepoints": [9839], "characters": "\u266F" },
-  "&SHCHcy;": { "codepoints": [1065], "characters": "\u0429" },
-  "&shchcy;": { "codepoints": [1097], "characters": "\u0449" },
-  "&SHcy;": { "codepoints": [1064], "characters": "\u0428" },
-  "&shcy;": { "codepoints": [1096], "characters": "\u0448" },
-  "&ShortDownArrow;": { "codepoints": [8595], "characters": "\u2193" },
-  "&ShortLeftArrow;": { "codepoints": [8592], "characters": "\u2190" },
-  "&shortmid;": { "codepoints": [8739], "characters": "\u2223" },
-  "&shortparallel;": { "codepoints": [8741], "characters": "\u2225" },
-  "&ShortRightArrow;": { "codepoints": [8594], "characters": "\u2192" },
-  "&ShortUpArrow;": { "codepoints": [8593], "characters": "\u2191" },
-  "&shy;": { "codepoints": [173], "characters": "\u00AD" },
-  "&shy": { "codepoints": [173], "characters": "\u00AD" },
-  "&Sigma;": { "codepoints": [931], "characters": "\u03A3" },
-  "&sigma;": { "codepoints": [963], "characters": "\u03C3" },
-  "&sigmaf;": { "codepoints": [962], "characters": "\u03C2" },
-  "&sigmav;": { "codepoints": [962], "characters": "\u03C2" },
-  "&sim;": { "codepoints": [8764], "characters": "\u223C" },
-  "&simdot;": { "codepoints": [10858], "characters": "\u2A6A" },
-  "&sime;": { "codepoints": [8771], "characters": "\u2243" },
-  "&simeq;": { "codepoints": [8771], "characters": "\u2243" },
-  "&simg;": { "codepoints": [10910], "characters": "\u2A9E" },
-  "&simgE;": { "codepoints": [10912], "characters": "\u2AA0" },
-  "&siml;": { "codepoints": [10909], "characters": "\u2A9D" },
-  "&simlE;": { "codepoints": [10911], "characters": "\u2A9F" },
-  "&simne;": { "codepoints": [8774], "characters": "\u2246" },
-  "&simplus;": { "codepoints": [10788], "characters": "\u2A24" },
-  "&simrarr;": { "codepoints": [10610], "characters": "\u2972" },
-  "&slarr;": { "codepoints": [8592], "characters": "\u2190" },
-  "&SmallCircle;": { "codepoints": [8728], "characters": "\u2218" },
-  "&smallsetminus;": { "codepoints": [8726], "characters": "\u2216" },
-  "&smashp;": { "codepoints": [10803], "characters": "\u2A33" },
-  "&smeparsl;": { "codepoints": [10724], "characters": "\u29E4" },
-  "&smid;": { "codepoints": [8739], "characters": "\u2223" },
-  "&smile;": { "codepoints": [8995], "characters": "\u2323" },
-  "&smt;": { "codepoints": [10922], "characters": "\u2AAA" },
-  "&smte;": { "codepoints": [10924], "characters": "\u2AAC" },
-  "&smtes;": { "codepoints": [10924, 65024], "characters": "\u2AAC\uFE00" },
-  "&SOFTcy;": { "codepoints": [1068], "characters": "\u042C" },
-  "&softcy;": { "codepoints": [1100], "characters": "\u044C" },
-  "&solbar;": { "codepoints": [9023], "characters": "\u233F" },
-  "&solb;": { "codepoints": [10692], "characters": "\u29C4" },
-  "&sol;": { "codepoints": [47], "characters": "\u002F" },
-  "&Sopf;": { "codepoints": [120138], "characters": "\uD835\uDD4A" },
-  "&sopf;": { "codepoints": [120164], "characters": "\uD835\uDD64" },
-  "&spades;": { "codepoints": [9824], "characters": "\u2660" },
-  "&spadesuit;": { "codepoints": [9824], "characters": "\u2660" },
-  "&spar;": { "codepoints": [8741], "characters": "\u2225" },
-  "&sqcap;": { "codepoints": [8851], "characters": "\u2293" },
-  "&sqcaps;": { "codepoints": [8851, 65024], "characters": "\u2293\uFE00" },
-  "&sqcup;": { "codepoints": [8852], "characters": "\u2294" },
-  "&sqcups;": { "codepoints": [8852, 65024], "characters": "\u2294\uFE00" },
-  "&Sqrt;": { "codepoints": [8730], "characters": "\u221A" },
-  "&sqsub;": { "codepoints": [8847], "characters": "\u228F" },
-  "&sqsube;": { "codepoints": [8849], "characters": "\u2291" },
-  "&sqsubset;": { "codepoints": [8847], "characters": "\u228F" },
-  "&sqsubseteq;": { "codepoints": [8849], "characters": "\u2291" },
-  "&sqsup;": { "codepoints": [8848], "characters": "\u2290" },
-  "&sqsupe;": { "codepoints": [8850], "characters": "\u2292" },
-  "&sqsupset;": { "codepoints": [8848], "characters": "\u2290" },
-  "&sqsupseteq;": { "codepoints": [8850], "characters": "\u2292" },
-  "&square;": { "codepoints": [9633], "characters": "\u25A1" },
-  "&Square;": { "codepoints": [9633], "characters": "\u25A1" },
-  "&SquareIntersection;": { "codepoints": [8851], "characters": "\u2293" },
-  "&SquareSubset;": { "codepoints": [8847], "characters": "\u228F" },
-  "&SquareSubsetEqual;": { "codepoints": [8849], "characters": "\u2291" },
-  "&SquareSuperset;": { "codepoints": [8848], "characters": "\u2290" },
-  "&SquareSupersetEqual;": { "codepoints": [8850], "characters": "\u2292" },
-  "&SquareUnion;": { "codepoints": [8852], "characters": "\u2294" },
-  "&squarf;": { "codepoints": [9642], "characters": "\u25AA" },
-  "&squ;": { "codepoints": [9633], "characters": "\u25A1" },
-  "&squf;": { "codepoints": [9642], "characters": "\u25AA" },
-  "&srarr;": { "codepoints": [8594], "characters": "\u2192" },
-  "&Sscr;": { "codepoints": [119982], "characters": "\uD835\uDCAE" },
-  "&sscr;": { "codepoints": [120008], "characters": "\uD835\uDCC8" },
-  "&ssetmn;": { "codepoints": [8726], "characters": "\u2216" },
-  "&ssmile;": { "codepoints": [8995], "characters": "\u2323" },
-  "&sstarf;": { "codepoints": [8902], "characters": "\u22C6" },
-  "&Star;": { "codepoints": [8902], "characters": "\u22C6" },
-  "&star;": { "codepoints": [9734], "characters": "\u2606" },
-  "&starf;": { "codepoints": [9733], "characters": "\u2605" },
-  "&straightepsilon;": { "codepoints": [1013], "characters": "\u03F5" },
-  "&straightphi;": { "codepoints": [981], "characters": "\u03D5" },
-  "&strns;": { "codepoints": [175], "characters": "\u00AF" },
-  "&sub;": { "codepoints": [8834], "characters": "\u2282" },
-  "&Sub;": { "codepoints": [8912], "characters": "\u22D0" },
-  "&subdot;": { "codepoints": [10941], "characters": "\u2ABD" },
-  "&subE;": { "codepoints": [10949], "characters": "\u2AC5" },
-  "&sube;": { "codepoints": [8838], "characters": "\u2286" },
-  "&subedot;": { "codepoints": [10947], "characters": "\u2AC3" },
-  "&submult;": { "codepoints": [10945], "characters": "\u2AC1" },
-  "&subnE;": { "codepoints": [10955], "characters": "\u2ACB" },
-  "&subne;": { "codepoints": [8842], "characters": "\u228A" },
-  "&subplus;": { "codepoints": [10943], "characters": "\u2ABF" },
-  "&subrarr;": { "codepoints": [10617], "characters": "\u2979" },
-  "&subset;": { "codepoints": [8834], "characters": "\u2282" },
-  "&Subset;": { "codepoints": [8912], "characters": "\u22D0" },
-  "&subseteq;": { "codepoints": [8838], "characters": "\u2286" },
-  "&subseteqq;": { "codepoints": [10949], "characters": "\u2AC5" },
-  "&SubsetEqual;": { "codepoints": [8838], "characters": "\u2286" },
-  "&subsetneq;": { "codepoints": [8842], "characters": "\u228A" },
-  "&subsetneqq;": { "codepoints": [10955], "characters": "\u2ACB" },
-  "&subsim;": { "codepoints": [10951], "characters": "\u2AC7" },
-  "&subsub;": { "codepoints": [10965], "characters": "\u2AD5" },
-  "&subsup;": { "codepoints": [10963], "characters": "\u2AD3" },
-  "&succapprox;": { "codepoints": [10936], "characters": "\u2AB8" },
-  "&succ;": { "codepoints": [8827], "characters": "\u227B" },
-  "&succcurlyeq;": { "codepoints": [8829], "characters": "\u227D" },
-  "&Succeeds;": { "codepoints": [8827], "characters": "\u227B" },
-  "&SucceedsEqual;": { "codepoints": [10928], "characters": "\u2AB0" },
-  "&SucceedsSlantEqual;": { "codepoints": [8829], "characters": "\u227D" },
-  "&SucceedsTilde;": { "codepoints": [8831], "characters": "\u227F" },
-  "&succeq;": { "codepoints": [10928], "characters": "\u2AB0" },
-  "&succnapprox;": { "codepoints": [10938], "characters": "\u2ABA" },
-  "&succneqq;": { "codepoints": [10934], "characters": "\u2AB6" },
-  "&succnsim;": { "codepoints": [8937], "characters": "\u22E9" },
-  "&succsim;": { "codepoints": [8831], "characters": "\u227F" },
-  "&SuchThat;": { "codepoints": [8715], "characters": "\u220B" },
-  "&sum;": { "codepoints": [8721], "characters": "\u2211" },
-  "&Sum;": { "codepoints": [8721], "characters": "\u2211" },
-  "&sung;": { "codepoints": [9834], "characters": "\u266A" },
-  "&sup1;": { "codepoints": [185], "characters": "\u00B9" },
-  "&sup1": { "codepoints": [185], "characters": "\u00B9" },
-  "&sup2;": { "codepoints": [178], "characters": "\u00B2" },
-  "&sup2": { "codepoints": [178], "characters": "\u00B2" },
-  "&sup3;": { "codepoints": [179], "characters": "\u00B3" },
-  "&sup3": { "codepoints": [179], "characters": "\u00B3" },
-  "&sup;": { "codepoints": [8835], "characters": "\u2283" },
-  "&Sup;": { "codepoints": [8913], "characters": "\u22D1" },
-  "&supdot;": { "codepoints": [10942], "characters": "\u2ABE" },
-  "&supdsub;": { "codepoints": [10968], "characters": "\u2AD8" },
-  "&supE;": { "codepoints": [10950], "characters": "\u2AC6" },
-  "&supe;": { "codepoints": [8839], "characters": "\u2287" },
-  "&supedot;": { "codepoints": [10948], "characters": "\u2AC4" },
-  "&Superset;": { "codepoints": [8835], "characters": "\u2283" },
-  "&SupersetEqual;": { "codepoints": [8839], "characters": "\u2287" },
-  "&suphsol;": { "codepoints": [10185], "characters": "\u27C9" },
-  "&suphsub;": { "codepoints": [10967], "characters": "\u2AD7" },
-  "&suplarr;": { "codepoints": [10619], "characters": "\u297B" },
-  "&supmult;": { "codepoints": [10946], "characters": "\u2AC2" },
-  "&supnE;": { "codepoints": [10956], "characters": "\u2ACC" },
-  "&supne;": { "codepoints": [8843], "characters": "\u228B" },
-  "&supplus;": { "codepoints": [10944], "characters": "\u2AC0" },
-  "&supset;": { "codepoints": [8835], "characters": "\u2283" },
-  "&Supset;": { "codepoints": [8913], "characters": "\u22D1" },
-  "&supseteq;": { "codepoints": [8839], "characters": "\u2287" },
-  "&supseteqq;": { "codepoints": [10950], "characters": "\u2AC6" },
-  "&supsetneq;": { "codepoints": [8843], "characters": "\u228B" },
-  "&supsetneqq;": { "codepoints": [10956], "characters": "\u2ACC" },
-  "&supsim;": { "codepoints": [10952], "characters": "\u2AC8" },
-  "&supsub;": { "codepoints": [10964], "characters": "\u2AD4" },
-  "&supsup;": { "codepoints": [10966], "characters": "\u2AD6" },
-  "&swarhk;": { "codepoints": [10534], "characters": "\u2926" },
-  "&swarr;": { "codepoints": [8601], "characters": "\u2199" },
-  "&swArr;": { "codepoints": [8665], "characters": "\u21D9" },
-  "&swarrow;": { "codepoints": [8601], "characters": "\u2199" },
-  "&swnwar;": { "codepoints": [10538], "characters": "\u292A" },
-  "&szlig;": { "codepoints": [223], "characters": "\u00DF" },
-  "&szlig": { "codepoints": [223], "characters": "\u00DF" },
-  "&Tab;": { "codepoints": [9], "characters": "\u0009" },
-  "&target;": { "codepoints": [8982], "characters": "\u2316" },
-  "&Tau;": { "codepoints": [932], "characters": "\u03A4" },
-  "&tau;": { "codepoints": [964], "characters": "\u03C4" },
-  "&tbrk;": { "codepoints": [9140], "characters": "\u23B4" },
-  "&Tcaron;": { "codepoints": [356], "characters": "\u0164" },
-  "&tcaron;": { "codepoints": [357], "characters": "\u0165" },
-  "&Tcedil;": { "codepoints": [354], "characters": "\u0162" },
-  "&tcedil;": { "codepoints": [355], "characters": "\u0163" },
-  "&Tcy;": { "codepoints": [1058], "characters": "\u0422" },
-  "&tcy;": { "codepoints": [1090], "characters": "\u0442" },
-  "&tdot;": { "codepoints": [8411], "characters": "\u20DB" },
-  "&telrec;": { "codepoints": [8981], "characters": "\u2315" },
-  "&Tfr;": { "codepoints": [120087], "characters": "\uD835\uDD17" },
-  "&tfr;": { "codepoints": [120113], "characters": "\uD835\uDD31" },
-  "&there4;": { "codepoints": [8756], "characters": "\u2234" },
-  "&therefore;": { "codepoints": [8756], "characters": "\u2234" },
-  "&Therefore;": { "codepoints": [8756], "characters": "\u2234" },
-  "&Theta;": { "codepoints": [920], "characters": "\u0398" },
-  "&theta;": { "codepoints": [952], "characters": "\u03B8" },
-  "&thetasym;": { "codepoints": [977], "characters": "\u03D1" },
-  "&thetav;": { "codepoints": [977], "characters": "\u03D1" },
-  "&thickapprox;": { "codepoints": [8776], "characters": "\u2248" },
-  "&thicksim;": { "codepoints": [8764], "characters": "\u223C" },
-  "&ThickSpace;": { "codepoints": [8287, 8202], "characters": "\u205F\u200A" },
-  "&ThinSpace;": { "codepoints": [8201], "characters": "\u2009" },
-  "&thinsp;": { "codepoints": [8201], "characters": "\u2009" },
-  "&thkap;": { "codepoints": [8776], "characters": "\u2248" },
-  "&thksim;": { "codepoints": [8764], "characters": "\u223C" },
-  "&THORN;": { "codepoints": [222], "characters": "\u00DE" },
-  "&THORN": { "codepoints": [222], "characters": "\u00DE" },
-  "&thorn;": { "codepoints": [254], "characters": "\u00FE" },
-  "&thorn": { "codepoints": [254], "characters": "\u00FE" },
-  "&tilde;": { "codepoints": [732], "characters": "\u02DC" },
-  "&Tilde;": { "codepoints": [8764], "characters": "\u223C" },
-  "&TildeEqual;": { "codepoints": [8771], "characters": "\u2243" },
-  "&TildeFullEqual;": { "codepoints": [8773], "characters": "\u2245" },
-  "&TildeTilde;": { "codepoints": [8776], "characters": "\u2248" },
-  "&timesbar;": { "codepoints": [10801], "characters": "\u2A31" },
-  "&timesb;": { "codepoints": [8864], "characters": "\u22A0" },
-  "&times;": { "codepoints": [215], "characters": "\u00D7" },
-  "&times": { "codepoints": [215], "characters": "\u00D7" },
-  "&timesd;": { "codepoints": [10800], "characters": "\u2A30" },
-  "&tint;": { "codepoints": [8749], "characters": "\u222D" },
-  "&toea;": { "codepoints": [10536], "characters": "\u2928" },
-  "&topbot;": { "codepoints": [9014], "characters": "\u2336" },
-  "&topcir;": { "codepoints": [10993], "characters": "\u2AF1" },
-  "&top;": { "codepoints": [8868], "characters": "\u22A4" },
-  "&Topf;": { "codepoints": [120139], "characters": "\uD835\uDD4B" },
-  "&topf;": { "codepoints": [120165], "characters": "\uD835\uDD65" },
-  "&topfork;": { "codepoints": [10970], "characters": "\u2ADA" },
-  "&tosa;": { "codepoints": [10537], "characters": "\u2929" },
-  "&tprime;": { "codepoints": [8244], "characters": "\u2034" },
-  "&trade;": { "codepoints": [8482], "characters": "\u2122" },
-  "&TRADE;": { "codepoints": [8482], "characters": "\u2122" },
-  "&triangle;": { "codepoints": [9653], "characters": "\u25B5" },
-  "&triangledown;": { "codepoints": [9663], "characters": "\u25BF" },
-  "&triangleleft;": { "codepoints": [9667], "characters": "\u25C3" },
-  "&trianglelefteq;": { "codepoints": [8884], "characters": "\u22B4" },
-  "&triangleq;": { "codepoints": [8796], "characters": "\u225C" },
-  "&triangleright;": { "codepoints": [9657], "characters": "\u25B9" },
-  "&trianglerighteq;": { "codepoints": [8885], "characters": "\u22B5" },
-  "&tridot;": { "codepoints": [9708], "characters": "\u25EC" },
-  "&trie;": { "codepoints": [8796], "characters": "\u225C" },
-  "&triminus;": { "codepoints": [10810], "characters": "\u2A3A" },
-  "&TripleDot;": { "codepoints": [8411], "characters": "\u20DB" },
-  "&triplus;": { "codepoints": [10809], "characters": "\u2A39" },
-  "&trisb;": { "codepoints": [10701], "characters": "\u29CD" },
-  "&tritime;": { "codepoints": [10811], "characters": "\u2A3B" },
-  "&trpezium;": { "codepoints": [9186], "characters": "\u23E2" },
-  "&Tscr;": { "codepoints": [119983], "characters": "\uD835\uDCAF" },
-  "&tscr;": { "codepoints": [120009], "characters": "\uD835\uDCC9" },
-  "&TScy;": { "codepoints": [1062], "characters": "\u0426" },
-  "&tscy;": { "codepoints": [1094], "characters": "\u0446" },
-  "&TSHcy;": { "codepoints": [1035], "characters": "\u040B" },
-  "&tshcy;": { "codepoints": [1115], "characters": "\u045B" },
-  "&Tstrok;": { "codepoints": [358], "characters": "\u0166" },
-  "&tstrok;": { "codepoints": [359], "characters": "\u0167" },
-  "&twixt;": { "codepoints": [8812], "characters": "\u226C" },
-  "&twoheadleftarrow;": { "codepoints": [8606], "characters": "\u219E" },
-  "&twoheadrightarrow;": { "codepoints": [8608], "characters": "\u21A0" },
-  "&Uacute;": { "codepoints": [218], "characters": "\u00DA" },
-  "&Uacute": { "codepoints": [218], "characters": "\u00DA" },
-  "&uacute;": { "codepoints": [250], "characters": "\u00FA" },
-  "&uacute": { "codepoints": [250], "characters": "\u00FA" },
-  "&uarr;": { "codepoints": [8593], "characters": "\u2191" },
-  "&Uarr;": { "codepoints": [8607], "characters": "\u219F" },
-  "&uArr;": { "codepoints": [8657], "characters": "\u21D1" },
-  "&Uarrocir;": { "codepoints": [10569], "characters": "\u2949" },
-  "&Ubrcy;": { "codepoints": [1038], "characters": "\u040E" },
-  "&ubrcy;": { "codepoints": [1118], "characters": "\u045E" },
-  "&Ubreve;": { "codepoints": [364], "characters": "\u016C" },
-  "&ubreve;": { "codepoints": [365], "characters": "\u016D" },
-  "&Ucirc;": { "codepoints": [219], "characters": "\u00DB" },
-  "&Ucirc": { "codepoints": [219], "characters": "\u00DB" },
-  "&ucirc;": { "codepoints": [251], "characters": "\u00FB" },
-  "&ucirc": { "codepoints": [251], "characters": "\u00FB" },
-  "&Ucy;": { "codepoints": [1059], "characters": "\u0423" },
-  "&ucy;": { "codepoints": [1091], "characters": "\u0443" },
-  "&udarr;": { "codepoints": [8645], "characters": "\u21C5" },
-  "&Udblac;": { "codepoints": [368], "characters": "\u0170" },
-  "&udblac;": { "codepoints": [369], "characters": "\u0171" },
-  "&udhar;": { "codepoints": [10606], "characters": "\u296E" },
-  "&ufisht;": { "codepoints": [10622], "characters": "\u297E" },
-  "&Ufr;": { "codepoints": [120088], "characters": "\uD835\uDD18" },
-  "&ufr;": { "codepoints": [120114], "characters": "\uD835\uDD32" },
-  "&Ugrave;": { "codepoints": [217], "characters": "\u00D9" },
-  "&Ugrave": { "codepoints": [217], "characters": "\u00D9" },
-  "&ugrave;": { "codepoints": [249], "characters": "\u00F9" },
-  "&ugrave": { "codepoints": [249], "characters": "\u00F9" },
-  "&uHar;": { "codepoints": [10595], "characters": "\u2963" },
-  "&uharl;": { "codepoints": [8639], "characters": "\u21BF" },
-  "&uharr;": { "codepoints": [8638], "characters": "\u21BE" },
-  "&uhblk;": { "codepoints": [9600], "characters": "\u2580" },
-  "&ulcorn;": { "codepoints": [8988], "characters": "\u231C" },
-  "&ulcorner;": { "codepoints": [8988], "characters": "\u231C" },
-  "&ulcrop;": { "codepoints": [8975], "characters": "\u230F" },
-  "&ultri;": { "codepoints": [9720], "characters": "\u25F8" },
-  "&Umacr;": { "codepoints": [362], "characters": "\u016A" },
-  "&umacr;": { "codepoints": [363], "characters": "\u016B" },
-  "&uml;": { "codepoints": [168], "characters": "\u00A8" },
-  "&uml": { "codepoints": [168], "characters": "\u00A8" },
-  "&UnderBar;": { "codepoints": [95], "characters": "\u005F" },
-  "&UnderBrace;": { "codepoints": [9183], "characters": "\u23DF" },
-  "&UnderBracket;": { "codepoints": [9141], "characters": "\u23B5" },
-  "&UnderParenthesis;": { "codepoints": [9181], "characters": "\u23DD" },
-  "&Union;": { "codepoints": [8899], "characters": "\u22C3" },
-  "&UnionPlus;": { "codepoints": [8846], "characters": "\u228E" },
-  "&Uogon;": { "codepoints": [370], "characters": "\u0172" },
-  "&uogon;": { "codepoints": [371], "characters": "\u0173" },
-  "&Uopf;": { "codepoints": [120140], "characters": "\uD835\uDD4C" },
-  "&uopf;": { "codepoints": [120166], "characters": "\uD835\uDD66" },
-  "&UpArrowBar;": { "codepoints": [10514], "characters": "\u2912" },
-  "&uparrow;": { "codepoints": [8593], "characters": "\u2191" },
-  "&UpArrow;": { "codepoints": [8593], "characters": "\u2191" },
-  "&Uparrow;": { "codepoints": [8657], "characters": "\u21D1" },
-  "&UpArrowDownArrow;": { "codepoints": [8645], "characters": "\u21C5" },
-  "&updownarrow;": { "codepoints": [8597], "characters": "\u2195" },
-  "&UpDownArrow;": { "codepoints": [8597], "characters": "\u2195" },
-  "&Updownarrow;": { "codepoints": [8661], "characters": "\u21D5" },
-  "&UpEquilibrium;": { "codepoints": [10606], "characters": "\u296E" },
-  "&upharpoonleft;": { "codepoints": [8639], "characters": "\u21BF" },
-  "&upharpoonright;": { "codepoints": [8638], "characters": "\u21BE" },
-  "&uplus;": { "codepoints": [8846], "characters": "\u228E" },
-  "&UpperLeftArrow;": { "codepoints": [8598], "characters": "\u2196" },
-  "&UpperRightArrow;": { "codepoints": [8599], "characters": "\u2197" },
-  "&upsi;": { "codepoints": [965], "characters": "\u03C5" },
-  "&Upsi;": { "codepoints": [978], "characters": "\u03D2" },
-  "&upsih;": { "codepoints": [978], "characters": "\u03D2" },
-  "&Upsilon;": { "codepoints": [933], "characters": "\u03A5" },
-  "&upsilon;": { "codepoints": [965], "characters": "\u03C5" },
-  "&UpTeeArrow;": { "codepoints": [8613], "characters": "\u21A5" },
-  "&UpTee;": { "codepoints": [8869], "characters": "\u22A5" },
-  "&upuparrows;": { "codepoints": [8648], "characters": "\u21C8" },
-  "&urcorn;": { "codepoints": [8989], "characters": "\u231D" },
-  "&urcorner;": { "codepoints": [8989], "characters": "\u231D" },
-  "&urcrop;": { "codepoints": [8974], "characters": "\u230E" },
-  "&Uring;": { "codepoints": [366], "characters": "\u016E" },
-  "&uring;": { "codepoints": [367], "characters": "\u016F" },
-  "&urtri;": { "codepoints": [9721], "characters": "\u25F9" },
-  "&Uscr;": { "codepoints": [119984], "characters": "\uD835\uDCB0" },
-  "&uscr;": { "codepoints": [120010], "characters": "\uD835\uDCCA" },
-  "&utdot;": { "codepoints": [8944], "characters": "\u22F0" },
-  "&Utilde;": { "codepoints": [360], "characters": "\u0168" },
-  "&utilde;": { "codepoints": [361], "characters": "\u0169" },
-  "&utri;": { "codepoints": [9653], "characters": "\u25B5" },
-  "&utrif;": { "codepoints": [9652], "characters": "\u25B4" },
-  "&uuarr;": { "codepoints": [8648], "characters": "\u21C8" },
-  "&Uuml;": { "codepoints": [220], "characters": "\u00DC" },
-  "&Uuml": { "codepoints": [220], "characters": "\u00DC" },
-  "&uuml;": { "codepoints": [252], "characters": "\u00FC" },
-  "&uuml": { "codepoints": [252], "characters": "\u00FC" },
-  "&uwangle;": { "codepoints": [10663], "characters": "\u29A7" },
-  "&vangrt;": { "codepoints": [10652], "characters": "\u299C" },
-  "&varepsilon;": { "codepoints": [1013], "characters": "\u03F5" },
-  "&varkappa;": { "codepoints": [1008], "characters": "\u03F0" },
-  "&varnothing;": { "codepoints": [8709], "characters": "\u2205" },
-  "&varphi;": { "codepoints": [981], "characters": "\u03D5" },
-  "&varpi;": { "codepoints": [982], "characters": "\u03D6" },
-  "&varpropto;": { "codepoints": [8733], "characters": "\u221D" },
-  "&varr;": { "codepoints": [8597], "characters": "\u2195" },
-  "&vArr;": { "codepoints": [8661], "characters": "\u21D5" },
-  "&varrho;": { "codepoints": [1009], "characters": "\u03F1" },
-  "&varsigma;": { "codepoints": [962], "characters": "\u03C2" },
-  "&varsubsetneq;": { "codepoints": [8842, 65024], "characters": "\u228A\uFE00" },
-  "&varsubsetneqq;": { "codepoints": [10955, 65024], "characters": "\u2ACB\uFE00" },
-  "&varsupsetneq;": { "codepoints": [8843, 65024], "characters": "\u228B\uFE00" },
-  "&varsupsetneqq;": { "codepoints": [10956, 65024], "characters": "\u2ACC\uFE00" },
-  "&vartheta;": { "codepoints": [977], "characters": "\u03D1" },
-  "&vartriangleleft;": { "codepoints": [8882], "characters": "\u22B2" },
-  "&vartriangleright;": { "codepoints": [8883], "characters": "\u22B3" },
-  "&vBar;": { "codepoints": [10984], "characters": "\u2AE8" },
-  "&Vbar;": { "codepoints": [10987], "characters": "\u2AEB" },
-  "&vBarv;": { "codepoints": [10985], "characters": "\u2AE9" },
-  "&Vcy;": { "codepoints": [1042], "characters": "\u0412" },
-  "&vcy;": { "codepoints": [1074], "characters": "\u0432" },
-  "&vdash;": { "codepoints": [8866], "characters": "\u22A2" },
-  "&vDash;": { "codepoints": [8872], "characters": "\u22A8" },
-  "&Vdash;": { "codepoints": [8873], "characters": "\u22A9" },
-  "&VDash;": { "codepoints": [8875], "characters": "\u22AB" },
-  "&Vdashl;": { "codepoints": [10982], "characters": "\u2AE6" },
-  "&veebar;": { "codepoints": [8891], "characters": "\u22BB" },
-  "&vee;": { "codepoints": [8744], "characters": "\u2228" },
-  "&Vee;": { "codepoints": [8897], "characters": "\u22C1" },
-  "&veeeq;": { "codepoints": [8794], "characters": "\u225A" },
-  "&vellip;": { "codepoints": [8942], "characters": "\u22EE" },
-  "&verbar;": { "codepoints": [124], "characters": "\u007C" },
-  "&Verbar;": { "codepoints": [8214], "characters": "\u2016" },
-  "&vert;": { "codepoints": [124], "characters": "\u007C" },
-  "&Vert;": { "codepoints": [8214], "characters": "\u2016" },
-  "&VerticalBar;": { "codepoints": [8739], "characters": "\u2223" },
-  "&VerticalLine;": { "codepoints": [124], "characters": "\u007C" },
-  "&VerticalSeparator;": { "codepoints": [10072], "characters": "\u2758" },
-  "&VerticalTilde;": { "codepoints": [8768], "characters": "\u2240" },
-  "&VeryThinSpace;": { "codepoints": [8202], "characters": "\u200A" },
-  "&Vfr;": { "codepoints": [120089], "characters": "\uD835\uDD19" },
-  "&vfr;": { "codepoints": [120115], "characters": "\uD835\uDD33" },
-  "&vltri;": { "codepoints": [8882], "characters": "\u22B2" },
-  "&vnsub;": { "codepoints": [8834, 8402], "characters": "\u2282\u20D2" },
-  "&vnsup;": { "codepoints": [8835, 8402], "characters": "\u2283\u20D2" },
-  "&Vopf;": { "codepoints": [120141], "characters": "\uD835\uDD4D" },
-  "&vopf;": { "codepoints": [120167], "characters": "\uD835\uDD67" },
-  "&vprop;": { "codepoints": [8733], "characters": "\u221D" },
-  "&vrtri;": { "codepoints": [8883], "characters": "\u22B3" },
-  "&Vscr;": { "codepoints": [119985], "characters": "\uD835\uDCB1" },
-  "&vscr;": { "codepoints": [120011], "characters": "\uD835\uDCCB" },
-  "&vsubnE;": { "codepoints": [10955, 65024], "characters": "\u2ACB\uFE00" },
-  "&vsubne;": { "codepoints": [8842, 65024], "characters": "\u228A\uFE00" },
-  "&vsupnE;": { "codepoints": [10956, 65024], "characters": "\u2ACC\uFE00" },
-  "&vsupne;": { "codepoints": [8843, 65024], "characters": "\u228B\uFE00" },
-  "&Vvdash;": { "codepoints": [8874], "characters": "\u22AA" },
-  "&vzigzag;": { "codepoints": [10650], "characters": "\u299A" },
-  "&Wcirc;": { "codepoints": [372], "characters": "\u0174" },
-  "&wcirc;": { "codepoints": [373], "characters": "\u0175" },
-  "&wedbar;": { "codepoints": [10847], "characters": "\u2A5F" },
-  "&wedge;": { "codepoints": [8743], "characters": "\u2227" },
-  "&Wedge;": { "codepoints": [8896], "characters": "\u22C0" },
-  "&wedgeq;": { "codepoints": [8793], "characters": "\u2259" },
-  "&weierp;": { "codepoints": [8472], "characters": "\u2118" },
-  "&Wfr;": { "codepoints": [120090], "characters": "\uD835\uDD1A" },
-  "&wfr;": { "codepoints": [120116], "characters": "\uD835\uDD34" },
-  "&Wopf;": { "codepoints": [120142], "characters": "\uD835\uDD4E" },
-  "&wopf;": { "codepoints": [120168], "characters": "\uD835\uDD68" },
-  "&wp;": { "codepoints": [8472], "characters": "\u2118" },
-  "&wr;": { "codepoints": [8768], "characters": "\u2240" },
-  "&wreath;": { "codepoints": [8768], "characters": "\u2240" },
-  "&Wscr;": { "codepoints": [119986], "characters": "\uD835\uDCB2" },
-  "&wscr;": { "codepoints": [120012], "characters": "\uD835\uDCCC" },
-  "&xcap;": { "codepoints": [8898], "characters": "\u22C2" },
-  "&xcirc;": { "codepoints": [9711], "characters": "\u25EF" },
-  "&xcup;": { "codepoints": [8899], "characters": "\u22C3" },
-  "&xdtri;": { "codepoints": [9661], "characters": "\u25BD" },
-  "&Xfr;": { "codepoints": [120091], "characters": "\uD835\uDD1B" },
-  "&xfr;": { "codepoints": [120117], "characters": "\uD835\uDD35" },
-  "&xharr;": { "codepoints": [10231], "characters": "\u27F7" },
-  "&xhArr;": { "codepoints": [10234], "characters": "\u27FA" },
-  "&Xi;": { "codepoints": [926], "characters": "\u039E" },
-  "&xi;": { "codepoints": [958], "characters": "\u03BE" },
-  "&xlarr;": { "codepoints": [10229], "characters": "\u27F5" },
-  "&xlArr;": { "codepoints": [10232], "characters": "\u27F8" },
-  "&xmap;": { "codepoints": [10236], "characters": "\u27FC" },
-  "&xnis;": { "codepoints": [8955], "characters": "\u22FB" },
-  "&xodot;": { "codepoints": [10752], "characters": "\u2A00" },
-  "&Xopf;": { "codepoints": [120143], "characters": "\uD835\uDD4F" },
-  "&xopf;": { "codepoints": [120169], "characters": "\uD835\uDD69" },
-  "&xoplus;": { "codepoints": [10753], "characters": "\u2A01" },
-  "&xotime;": { "codepoints": [10754], "characters": "\u2A02" },
-  "&xrarr;": { "codepoints": [10230], "characters": "\u27F6" },
-  "&xrArr;": { "codepoints": [10233], "characters": "\u27F9" },
-  "&Xscr;": { "codepoints": [119987], "characters": "\uD835\uDCB3" },
-  "&xscr;": { "codepoints": [120013], "characters": "\uD835\uDCCD" },
-  "&xsqcup;": { "codepoints": [10758], "characters": "\u2A06" },
-  "&xuplus;": { "codepoints": [10756], "characters": "\u2A04" },
-  "&xutri;": { "codepoints": [9651], "characters": "\u25B3" },
-  "&xvee;": { "codepoints": [8897], "characters": "\u22C1" },
-  "&xwedge;": { "codepoints": [8896], "characters": "\u22C0" },
-  "&Yacute;": { "codepoints": [221], "characters": "\u00DD" },
-  "&Yacute": { "codepoints": [221], "characters": "\u00DD" },
-  "&yacute;": { "codepoints": [253], "characters": "\u00FD" },
-  "&yacute": { "codepoints": [253], "characters": "\u00FD" },
-  "&YAcy;": { "codepoints": [1071], "characters": "\u042F" },
-  "&yacy;": { "codepoints": [1103], "characters": "\u044F" },
-  "&Ycirc;": { "codepoints": [374], "characters": "\u0176" },
-  "&ycirc;": { "codepoints": [375], "characters": "\u0177" },
-  "&Ycy;": { "codepoints": [1067], "characters": "\u042B" },
-  "&ycy;": { "codepoints": [1099], "characters": "\u044B" },
-  "&yen;": { "codepoints": [165], "characters": "\u00A5" },
-  "&yen": { "codepoints": [165], "characters": "\u00A5" },
-  "&Yfr;": { "codepoints": [120092], "characters": "\uD835\uDD1C" },
-  "&yfr;": { "codepoints": [120118], "characters": "\uD835\uDD36" },
-  "&YIcy;": { "codepoints": [1031], "characters": "\u0407" },
-  "&yicy;": { "codepoints": [1111], "characters": "\u0457" },
-  "&Yopf;": { "codepoints": [120144], "characters": "\uD835\uDD50" },
-  "&yopf;": { "codepoints": [120170], "characters": "\uD835\uDD6A" },
-  "&Yscr;": { "codepoints": [119988], "characters": "\uD835\uDCB4" },
-  "&yscr;": { "codepoints": [120014], "characters": "\uD835\uDCCE" },
-  "&YUcy;": { "codepoints": [1070], "characters": "\u042E" },
-  "&yucy;": { "codepoints": [1102], "characters": "\u044E" },
-  "&yuml;": { "codepoints": [255], "characters": "\u00FF" },
-  "&yuml": { "codepoints": [255], "characters": "\u00FF" },
-  "&Yuml;": { "codepoints": [376], "characters": "\u0178" },
-  "&Zacute;": { "codepoints": [377], "characters": "\u0179" },
-  "&zacute;": { "codepoints": [378], "characters": "\u017A" },
-  "&Zcaron;": { "codepoints": [381], "characters": "\u017D" },
-  "&zcaron;": { "codepoints": [382], "characters": "\u017E" },
-  "&Zcy;": { "codepoints": [1047], "characters": "\u0417" },
-  "&zcy;": { "codepoints": [1079], "characters": "\u0437" },
-  "&Zdot;": { "codepoints": [379], "characters": "\u017B" },
-  "&zdot;": { "codepoints": [380], "characters": "\u017C" },
-  "&zeetrf;": { "codepoints": [8488], "characters": "\u2128" },
-  "&ZeroWidthSpace;": { "codepoints": [8203], "characters": "\u200B" },
-  "&Zeta;": { "codepoints": [918], "characters": "\u0396" },
-  "&zeta;": { "codepoints": [950], "characters": "\u03B6" },
-  "&zfr;": { "codepoints": [120119], "characters": "\uD835\uDD37" },
-  "&Zfr;": { "codepoints": [8488], "characters": "\u2128" },
-  "&ZHcy;": { "codepoints": [1046], "characters": "\u0416" },
-  "&zhcy;": { "codepoints": [1078], "characters": "\u0436" },
-  "&zigrarr;": { "codepoints": [8669], "characters": "\u21DD" },
-  "&zopf;": { "codepoints": [120171], "characters": "\uD835\uDD6B" },
-  "&Zopf;": { "codepoints": [8484], "characters": "\u2124" },
-  "&Zscr;": { "codepoints": [119989], "characters": "\uD835\uDCB5" },
-  "&zscr;": { "codepoints": [120015], "characters": "\uD835\uDCCF" },
-  "&zwj;": { "codepoints": [8205], "characters": "\u200D" },
-  "&zwnj;": { "codepoints": [8204], "characters": "\u200C" }
-};
-
-var ALPHANUMERIC = /^[a-zA-Z0-9]/;
-var getPossibleNamedEntityStart = makeRegexMatcher(/^&[a-zA-Z0-9]/);
-var getApparentNamedEntity = makeRegexMatcher(/^&[a-zA-Z0-9]+;/);
-
-var getNamedEntityByFirstChar = {};
-(function () {
-  var namedEntitiesByFirstChar = {};
-  for (var ent in ENTITIES) {
-    var chr = ent.charAt(1);
-    namedEntitiesByFirstChar[chr] = (namedEntitiesByFirstChar[chr] || []);
-    namedEntitiesByFirstChar[chr].push(ent.slice(2));
-  }
-  for (var chr in namedEntitiesByFirstChar) {
-    getNamedEntityByFirstChar[chr] = makeRegexMatcher(
-      new RegExp('^&' + chr + '(?:' +
-                 namedEntitiesByFirstChar[chr].join('|') + ')'));
-  }
-})();
-
-// Run a provided "matcher" function but reset the current position afterwards.
-// Fatal failure of the matcher is not suppressed.
-var peekMatcher = function (scanner, matcher) {
-  var start = scanner.pos;
-  var result = matcher(scanner);
-  scanner.pos = start;
-  return result;
-};
-
-// Returns a string like "&amp;" or a falsy value if no match.  Fails fatally
-// if something looks like a named entity but isn't.
-var getNamedCharRef = function (scanner, inAttribute) {
-  // look for `&` followed by alphanumeric
-  if (! peekMatcher(scanner, getPossibleNamedEntityStart))
-    return null;
-
-  var matcher = getNamedEntityByFirstChar[scanner.rest().charAt(1)];
-  var entity = null;
-  if (matcher)
-    entity = peekMatcher(scanner, matcher);
-
-  if (entity) {
-    if (entity.slice(-1) !== ';') {
-      // Certain character references with no semi are an error, like `&lt`.
-      // In attribute values, however, this is not fatal if the next character
-      // is alphanumeric.
-      //
-      // This rule affects href attributes, for example, deeming "/?foo=bar&ltc=abc"
-      // to be ok but "/?foo=bar&lt=abc" to not be.
-      if (inAttribute && ALPHANUMERIC.test(scanner.rest().charAt(entity.length)))
-        return null;
-      scanner.fatal("Character reference requires semicolon: " + entity);
-    } else {
-      scanner.pos += entity.length;
-      return entity;
-    }
-  } else {
-    // we couldn't match any real entity, so see if this is a bad entity
-    // or something we can overlook.
-    var badEntity = peekMatcher(scanner, getApparentNamedEntity);
-    if (badEntity)
-      scanner.fatal("Invalid character reference: " + badEntity);
-    // `&aaaa` is ok with no semicolon
-    return null;
-  }
-};
-
-// Returns the sequence of one or two codepoints making up an entity as an array.
-// Codepoints in the array are integers and may be out of the single-char JavaScript
-// range.
-var getCodePoints = function (namedEntity) {
-  return ENTITIES[namedEntity].codepoints;
-};
-
-var ALLOWED_AFTER_AMP = /^[\u0009\u000a\u000c <&]/;
-
-var getCharRefNumber = makeRegexMatcher(/^(?:[xX][0-9a-fA-F]+|[0-9]+);/);
-
-var BIG_BAD_CODEPOINTS = (function (obj) {
-  var list = [0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE, 0x3FFFF,
-              0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF, 0x6FFFE, 0x6FFFF,
-              0x7FFFE, 0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE, 0x9FFFF,
-              0xAFFFE, 0xAFFFF, 0xBFFFE, 0xBFFFF, 0xCFFFE, 0xCFFFF,
-              0xDFFFE, 0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF,
-              0x10FFFE, 0x10FFFF];
-  for (var i = 0; i < list.length; i++)
-    obj[list[i]] = true;
-
-  return obj;
-})({});
-
-var isLegalCodepoint = function (cp) {
-  if ((cp === 0) ||
-      (cp >= 0x80 && cp <= 0x9f) ||
-      (cp >= 0xd800 && cp <= 0xdfff) ||
-      (cp >= 0x10ffff) ||
-      (cp >= 0x1 && cp <= 0x8) ||
-      (cp === 0xb) ||
-      (cp >= 0xd && cp <= 0x1f) ||
-      (cp >= 0x7f && cp <= 0x9f) ||
-      (cp >= 0xfdd0 && cp <= 0xfdef) ||
-      (cp === 0xfffe) ||
-      (cp === 0xffff) ||
-      (cp >= 0x10000 && BIG_BAD_CODEPOINTS[cp]))
-    return false;
-
-  return true;
-};
-
-// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#consume-a-character-reference
-//
-// Matches a character reference if possible, including the initial `&`.
-// Fails fatally in error cases (assuming an initial `&` is matched), like a disallowed codepoint
-// number or a bad named character reference.
-//
-// `inAttribute` is truthy if we are in an attribute value.
-//
-// `allowedChar` is an optional character that,
-// if found after the initial `&`, aborts parsing silently rather than failing fatally.  In real use it is
-// either `"`, `'`, or `>` and is supplied when parsing attribute values.  NOTE: In the current spec, the
-// value of `allowedChar` doesn't actually seem to end up mattering, but there is still some debate about
-// the right approach to ampersands.
-getCharacterReference = HTMLTools.Parse.getCharacterReference = function (scanner, inAttribute, allowedChar) {
-  if (scanner.peek() !== '&')
-    // no ampersand
-    return null;
-
-  var afterAmp = scanner.rest().charAt(1);
-
-  if (afterAmp === '#') {
-    scanner.pos += 2;
-    // refNumber includes possible initial `x` and final semicolon
-    var refNumber = getCharRefNumber(scanner);
-    // At this point we've consumed the input, so we're committed to returning
-    // something or failing fatally.
-    if (! refNumber)
-      scanner.fatal("Invalid numerical character reference starting with &#");
-    var codepoint;
-    if (refNumber.charAt(0) === 'x' || refNumber.charAt(0) === 'X') {
-      // hex
-      var hex = refNumber.slice(1, -1);
-      while (hex.charAt(0) === '0')
-        hex = hex.slice(1);
-      if (hex.length > 6)
-        scanner.fatal("Numerical character reference too large: 0x" + hex);
-      codepoint = parseInt(hex || "0", 16);
-    } else {
-      var dec = refNumber.slice(0, -1);
-      while (dec.charAt(0) === '0')
-        dec = dec.slice(1);
-      if (dec.length > 7)
-        scanner.fatal("Numerical character reference too large: " + dec);
-      codepoint = parseInt(dec || "0", 10);
-    }
-    if (! isLegalCodepoint(codepoint))
-      scanner.fatal("Illegal codepoint in numerical character reference: &#" + refNumber);
-    return { t: 'CharRef',
-             v: '&#' + refNumber,
-             cp: [codepoint] };
-  } else if ((! afterAmp) // EOF
-             || (allowedChar && afterAmp === allowedChar)
-             || ALLOWED_AFTER_AMP.test(afterAmp)) {
-    return null;
-  } else {
-    var namedEntity = getNamedCharRef(scanner, inAttribute);
-    if (namedEntity) {
-      return { t: 'CharRef',
-               v: namedEntity,
-               cp: getCodePoints(namedEntity) };
-    } else {
-      return null;
-    }
-  }
-};
diff --git a/packages/html-tools/charref_tests.js b/packages/html-tools/charref_tests.js
deleted file mode 100644
index 35a991aeb4..0000000000
--- a/packages/html-tools/charref_tests.js
+++ /dev/null
@@ -1,114 +0,0 @@
-var Scanner = HTMLTools.Scanner;
-var getCharacterReference = HTMLTools.Parse.getCharacterReference;
-
-Tinytest.add("html-tools - entities", function (test) {
-  var succeed = function (input, match, codepoints) {
-    if (typeof input === 'string')
-      input = {input: input};
-
-    // match arg is optional; codepoints is never a string
-    if (typeof match !== 'string') {
-      codepoints = match;
-      match = input.input;
-    }
-
-    var scanner = new Scanner(input.input);
-    var result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
-    test.isTrue(result);
-    test.equal(scanner.pos, match.length);
-    test.equal(result, {
-      t: 'CharRef',
-      v: match,
-      cp: _.map(codepoints,
-                function (x) { return (typeof x === 'string' ?
-                                       x.charCodeAt(0) : x); })
-    });
-  };
-
-  var ignore = function (input) {
-    if (typeof input === 'string')
-      input = {input: input};
-
-    var scanner = new Scanner(input.input);
-    var result = getCharacterReference(scanner, input.inAttribute, input.allowedChar);
-    test.isFalse(result);
-    test.equal(scanner.pos, 0);
-  };
-
-  var fatal = function (input, messageContains) {
-    if (typeof input === 'string')
-      input = {input: input};
-
-    var scanner = new Scanner(input.input);
-    var error;
-    try {
-      getCharacterReference(scanner, input.inAttribute, input.allowedChar);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (error)
-      test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-  ignore('a');
-  ignore('&');
-  ignore('&&');
-  ignore('&\t');
-  ignore('& ');
-  fatal('&#', 'Invalid numerical character reference starting with &#');
-  ignore('&a');
-  fatal('&a;', 'Invalid character reference: &a;');
-  ignore({input: '&"', allowedChar: '"'});
-  ignore('&"');
-
-  succeed('&gt;', ['>']);
-  fatal('&gt', 'Character reference requires semicolon');
-  ignore('&aaa');
-  fatal('&gta', 'Character reference requires semicolon');
-  ignore({input: '&gta', inAttribute: true});
-  fatal({input: '&gt=', inAttribute: true}, 'Character reference requires semicolon: &gt');
-
-  succeed('&gt;;', '&gt;', ['>']);
-
-  fatal('&asdflkj;', 'Invalid character reference: &asdflkj;');
-  fatal('&A0asdflkj;', 'Invalid character reference: &A0asdflkj;');
-  ignore('&A0asdflkj');
-
-  succeed('&zopf;', [120171]);
-  succeed('&acE;', [8766, 819]);
-
-  succeed('&#10;', [10]);
-  fatal('&#10', 'Invalid numerical character reference starting with &#');
-  fatal('&#xg;', 'Invalid numerical character reference starting with &#');
-  fatal('&#;', 'Invalid numerical character reference starting with &#');
-  fatal('&#a;', 'Invalid numerical character reference starting with &#');
-  fatal('&#a', 'Invalid numerical character reference starting with &#');
-  fatal('&#z', 'Invalid numerical character reference starting with &#');
-  succeed('&#000000000000010;', [10]);
-  fatal('&#0001000000000010;', 'Numerical character reference too large: 1000000000010');
-  succeed('&#x00000000000000000000a;', [10]);
-  fatal('&#x000100000000000a;', 'Numerical character reference too large: 0x100000000000a');
-  succeed('&#010;', [10]);
-  succeed('&#xa;', [10]);
-  succeed('&#Xa;', [10]);
-  succeed('&#XA;', [10]);
-  succeed('&#xA;', [10]);
-
-  fatal('&#0;', 'Illegal codepoint in numerical character reference: &#0;');
-  fatal('&#x0;', 'Illegal codepoint in numerical character reference: &#x0;');
-
-  fatal('&#xb;', 'Illegal codepoint in numerical character reference: &#xb;');
-  succeed('&#xc;', [12]);
-  fatal('&#11;', 'Illegal codepoint in numerical character reference: &#11;');
-  succeed('&#12;', [12]);
-
-  fatal('&#x10ffff;', 'Illegal codepoint in numerical character reference');
-  fatal('&#x10fffe;', 'Illegal codepoint in numerical character reference');
-  succeed('&#x10fffd;', [0x10fffd]);
-
-  fatal('&#1114111;', 'Illegal codepoint in numerical character reference');
-  fatal('&#1114110;', 'Illegal codepoint in numerical character reference');
-  succeed('&#1114109;', [0x10fffd]);
-
-});
diff --git a/packages/html-tools/package.js b/packages/html-tools/package.js
deleted file mode 100644
index 6653bc61f0..0000000000
--- a/packages/html-tools/package.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Package.describe({
-  summary: "Standards-compliant HTML tools",
-  version: '1.0.10'
-});
-
-Package.onUse(function (api) {
-  api.use('htmljs');
-  api.imply('htmljs');
-
-  api.export('HTMLTools');
-
-  api.addFiles(['utils.js',
-                 'scanner.js',
-                 'charref.js',
-                 'tokenize.js',
-                 'templatetag.js',
-                 'parse.js']);
-});
-
-Package.onTest(function (api) {
-  api.use('tinytest');
-  api.use('html-tools');
-  api.use('underscore');
-  api.use('htmljs');
-  api.use('blaze-tools'); // for `toJS`
-  api.addFiles(['charref_tests.js',
-                 'tokenize_tests.js',
-                 'parse_tests.js']);
-});
diff --git a/packages/html-tools/parse.js b/packages/html-tools/parse.js
deleted file mode 100644
index 109e9fa2f3..0000000000
--- a/packages/html-tools/parse.js
+++ /dev/null
@@ -1,358 +0,0 @@
-
-// Parse a "fragment" of HTML, up to the end of the input or a particular
-// template tag (using the "shouldStop" option).
-HTMLTools.parseFragment = function (input, options) {
-  var scanner;
-  if (typeof input === 'string')
-    scanner = new Scanner(input);
-  else
-    // input can be a scanner.  We'd better not have a different
-    // value for the "getTemplateTag" option as when the scanner
-    // was created, because we don't do anything special to reset
-    // the value (which is attached to the scanner).
-    scanner = input;
-
-  // ```
-  // { getTemplateTag: function (scanner, templateTagPosition) {
-  //     if (templateTagPosition === HTMLTools.TEMPLATE_TAG_POSITION.ELEMENT) {
-  //       ...
-  // ```
-  if (options && options.getTemplateTag)
-    scanner.getTemplateTag = options.getTemplateTag;
-
-  // function (scanner) -> boolean
-  var shouldStop = options && options.shouldStop;
-
-  var result;
-  if (options && options.textMode) {
-    if (options.textMode === HTML.TEXTMODE.STRING) {
-      result = getRawText(scanner, null, shouldStop);
-    } else if (options.textMode === HTML.TEXTMODE.RCDATA) {
-      result = getRCData(scanner, null, shouldStop);
-    } else {
-      throw new Error("Unsupported textMode: " + options.textMode);
-    }
-  } else {
-    result = getContent(scanner, shouldStop);
-  }
-  if (! scanner.isEOF()) {
-    // If we aren't at the end of the input, we either stopped at an unmatched
-    // HTML end tag or at a template tag (like `{{else}}` or `{{/if}}`).
-    // Detect the former case (stopped at an HTML end tag) and throw a good
-    // error.
-
-    var posBefore = scanner.pos;
-
-    try {
-      var endTag = getHTMLToken(scanner);
-    } catch (e) {
-      // ignore errors from getTemplateTag
-    }
-
-    // XXX we make some assumptions about shouldStop here, like that it
-    // won't tell us to stop at an HTML end tag.  Should refactor
-    // `shouldStop` into something more suitable.
-    if (endTag && endTag.t === 'Tag' && endTag.isEnd) {
-      var closeTag = endTag.n;
-      var isVoidElement = HTML.isVoidElement(closeTag);
-      scanner.fatal("Unexpected HTML close tag" +
-                    (isVoidElement ?
-                     '.  <' + endTag.n + '> should have no close tag.' : ''));
-    }
-
-    scanner.pos = posBefore; // rewind, we'll continue parsing as usual
-
-    // If no "shouldStop" option was provided, we should have consumed the whole
-    // input.
-    if (! shouldStop)
-      scanner.fatal("Expected EOF");
-  }
-
-  return result;
-};
-
-// Take a numeric Unicode code point, which may be larger than 16 bits,
-// and encode it as a JavaScript UTF-16 string.
-//
-// Adapted from
-// http://stackoverflow.com/questions/7126384/expressing-utf-16-unicode-characters-in-javascript/7126661.
-codePointToString = HTMLTools.codePointToString = function(cp) {
-  if (cp >= 0 && cp <= 0xD7FF || cp >= 0xE000 && cp <= 0xFFFF) {
-    return String.fromCharCode(cp);
-  } else if (cp >= 0x10000 && cp <= 0x10FFFF) {
-
-    // we substract 0x10000 from cp to get a 20-bit number
-    // in the range 0..0xFFFF
-    cp -= 0x10000;
-
-    // we add 0xD800 to the number formed by the first 10 bits
-    // to give the first byte
-    var first = ((0xffc00 & cp) >> 10) + 0xD800;
-
-    // we add 0xDC00 to the number formed by the low 10 bits
-    // to give the second byte
-    var second = (0x3ff & cp) + 0xDC00;
-
-    return String.fromCharCode(first) + String.fromCharCode(second);
-  } else {
-    return '';
-  }
-};
-
-getContent = HTMLTools.Parse.getContent = function (scanner, shouldStopFunc) {
-  var items = [];
-
-  while (! scanner.isEOF()) {
-    if (shouldStopFunc && shouldStopFunc(scanner))
-      break;
-
-    var posBefore = scanner.pos;
-    var token = getHTMLToken(scanner);
-    if (! token)
-      // tokenizer reached EOF on its own, e.g. while scanning
-      // template comments like `{{! foo}}`.
-      continue;
-
-    if (token.t === 'Doctype') {
-      scanner.fatal("Unexpected Doctype");
-    } else if (token.t === 'Chars') {
-      pushOrAppendString(items, token.v);
-    } else if (token.t === 'CharRef') {
-      items.push(convertCharRef(token));
-    } else if (token.t === 'Comment') {
-      items.push(HTML.Comment(token.v));
-    } else if (token.t === 'TemplateTag') {
-      items.push(token.v);
-    } else if (token.t === 'Tag') {
-      if (token.isEnd) {
-        // Stop when we encounter an end tag at the top level.
-        // Rewind; we'll re-parse the end tag later.
-        scanner.pos = posBefore;
-        break;
-      }
-
-      var tagName = token.n;
-      // is this an element with no close tag (a BR, HR, IMG, etc.) based
-      // on its name?
-      var isVoid = HTML.isVoidElement(tagName);
-      if (token.isSelfClosing) {
-        if (! (isVoid || HTML.isKnownSVGElement(tagName) || tagName.indexOf(':') >= 0))
-          scanner.fatal('Only certain elements like BR, HR, IMG, etc. (and foreign elements like SVG) are allowed to self-close');
-      }
-
-      // result of parseAttrs may be null
-      var attrs = parseAttrs(token.attrs);
-      // arrays need to be wrapped in HTML.Attrs(...)
-      // when used to construct tags
-      if (HTML.isArray(attrs))
-        attrs = HTML.Attrs.apply(null, attrs);
-
-      var tagFunc = HTML.getTag(tagName);
-      if (isVoid || token.isSelfClosing) {
-        items.push(attrs ? tagFunc(attrs) : tagFunc());
-      } else {
-        // parse HTML tag contents.
-
-        // HTML treats a final `/` in a tag as part of an attribute, as in `<a href=/foo/>`, but the template author who writes `<circle r={{r}}/>`, say, may not be thinking about that, so generate a good error message in the "looks like self-close" case.
-        var looksLikeSelfClose = (scanner.input.substr(scanner.pos - 2, 2) === '/>');
-
-        var content = null;
-        if (token.n === 'textarea') {
-          if (scanner.peek() === '\n')
-            scanner.pos++;
-          var textareaValue = getRCData(scanner, token.n, shouldStopFunc);
-          if (textareaValue) {
-            if (attrs instanceof HTML.Attrs) {
-              attrs = HTML.Attrs.apply(
-                null, attrs.value.concat([{value: textareaValue}]));
-            } else {
-              attrs = (attrs || {});
-              attrs.value = textareaValue;
-            }
-          }
-        } else if (token.n === 'script' || token.n === 'style') {
-          content = getRawText(scanner, token.n, shouldStopFunc);
-        } else {
-          content = getContent(scanner, shouldStopFunc);
-        }
-
-        var endTag = getHTMLToken(scanner);
-
-        if (! (endTag && endTag.t === 'Tag' && endTag.isEnd && endTag.n === tagName))
-          scanner.fatal('Expected "' + tagName + '" end tag' + (looksLikeSelfClose ? ' -- if the "<' + token.n + ' />" tag was supposed to self-close, try adding a space before the "/"' : ''));
-
-        // XXX support implied end tags in cases allowed by the spec
-
-        // make `content` into an array suitable for applying tag constructor
-        // as in `FOO.apply(null, content)`.
-        if (content == null)
-          content = [];
-        else if (! (content instanceof Array))
-          content = [content];
-
-        items.push(HTML.getTag(tagName).apply(
-          null, (attrs ? [attrs] : []).concat(content)));
-      }
-    } else {
-      scanner.fatal("Unknown token type: " + token.t);
-    }
-  }
-
-  if (items.length === 0)
-    return null;
-  else if (items.length === 1)
-    return items[0];
-  else
-    return items;
-};
-
-var pushOrAppendString = function (items, string) {
-  if (items.length &&
-      typeof items[items.length - 1] === 'string')
-    items[items.length - 1] += string;
-  else
-    items.push(string);
-};
-
-// get RCDATA to go in the lowercase (or camel case) tagName (e.g. "textarea")
-getRCData = HTMLTools.Parse.getRCData = function (scanner, tagName, shouldStopFunc) {
-  var items = [];
-
-  while (! scanner.isEOF()) {
-    // break at appropriate end tag
-    if (tagName && isLookingAtEndTag(scanner, tagName))
-      break;
-
-    if (shouldStopFunc && shouldStopFunc(scanner))
-      break;
-
-    var token = getHTMLToken(scanner, 'rcdata');
-    if (! token)
-      // tokenizer reached EOF on its own, e.g. while scanning
-      // template comments like `{{! foo}}`.
-      continue;
-
-    if (token.t === 'Chars') {
-      pushOrAppendString(items, token.v);
-    } else if (token.t === 'CharRef') {
-      items.push(convertCharRef(token));
-    } else if (token.t === 'TemplateTag') {
-      items.push(token.v);
-    } else {
-      // (can't happen)
-      scanner.fatal("Unknown or unexpected token type: " + token.t);
-    }
-  }
-
-  if (items.length === 0)
-    return null;
-  else if (items.length === 1)
-    return items[0];
-  else
-    return items;
-};
-
-var getRawText = function (scanner, tagName, shouldStopFunc) {
-  var items = [];
-
-  while (! scanner.isEOF()) {
-    // break at appropriate end tag
-    if (tagName && isLookingAtEndTag(scanner, tagName))
-      break;
-
-    if (shouldStopFunc && shouldStopFunc(scanner))
-      break;
-
-    var token = getHTMLToken(scanner, 'rawtext');
-    if (! token)
-      // tokenizer reached EOF on its own, e.g. while scanning
-      // template comments like `{{! foo}}`.
-      continue;
-
-    if (token.t === 'Chars') {
-      pushOrAppendString(items, token.v);
-    } else if (token.t === 'TemplateTag') {
-      items.push(token.v);
-    } else {
-      // (can't happen)
-      scanner.fatal("Unknown or unexpected token type: " + token.t);
-    }
-  }
-
-  if (items.length === 0)
-    return null;
-  else if (items.length === 1)
-    return items[0];
-  else
-    return items;
-};
-
-// Input: A token like `{ t: 'CharRef', v: '&amp;', cp: [38] }`.
-//
-// Output: A tag like `HTML.CharRef({ html: '&amp;', str: '&' })`.
-var convertCharRef = function (token) {
-  var codePoints = token.cp;
-  var str = '';
-  for (var i = 0; i < codePoints.length; i++)
-    str += codePointToString(codePoints[i]);
-  return HTML.CharRef({ html: token.v, str: str });
-};
-
-// Input is always a dictionary (even if zero attributes) and each
-// value in the dictionary is an array of `Chars`, `CharRef`,
-// and maybe `TemplateTag` tokens.
-//
-// Output is null if there are zero attributes, and otherwise a
-// dictionary, or an array of dictionaries and template tags.
-// Each value in the dictionary is HTMLjs (e.g. a
-// string or an array of `Chars`, `CharRef`, and `TemplateTag`
-// nodes).
-//
-// An attribute value with no input tokens is represented as "",
-// not an empty array, in order to prop open empty attributes
-// with no template tags.
-var parseAttrs = function (attrs) {
-  var result = null;
-
-  if (HTML.isArray(attrs)) {
-    // first element is nondynamic attrs, rest are template tags
-    var nondynamicAttrs = parseAttrs(attrs[0]);
-    if (nondynamicAttrs) {
-      result = (result || []);
-      result.push(nondynamicAttrs);
-    }
-    for (var i = 1; i < attrs.length; i++) {
-      var token = attrs[i];
-      if (token.t !== 'TemplateTag')
-        throw new Error("Expected TemplateTag token");
-      result = (result || []);
-      result.push(token.v);
-    }
-    return result;
-  }
-
-  for (var k in attrs) {
-    if (! result)
-      result = {};
-
-    var inValue = attrs[k];
-    var outParts = [];
-    for (var i = 0; i < inValue.length; i++) {
-      var token = inValue[i];
-      if (token.t === 'CharRef') {
-        outParts.push(convertCharRef(token));
-      } else if (token.t === 'TemplateTag') {
-        outParts.push(token.v);
-      } else if (token.t === 'Chars') {
-        pushOrAppendString(outParts, token.v);
-      }
-    }
-
-    var outValue = (inValue.length === 0 ? '' :
-                    (outParts.length === 1 ? outParts[0] : outParts));
-    var properKey = HTMLTools.properCaseAttributeName(k);
-    result[properKey] = outValue;
-  }
-
-  return result;
-};
diff --git a/packages/html-tools/parse_tests.js b/packages/html-tools/parse_tests.js
deleted file mode 100644
index 3bc69be8c3..0000000000
--- a/packages/html-tools/parse_tests.js
+++ /dev/null
@@ -1,404 +0,0 @@
-var Scanner = HTMLTools.Scanner;
-var getContent = HTMLTools.Parse.getContent;
-
-var CharRef = HTML.CharRef;
-var Comment = HTML.Comment;
-var TemplateTag = HTMLTools.TemplateTag;
-var Attrs = HTML.Attrs;
-
-var BR = HTML.BR;
-var HR = HTML.HR;
-var INPUT = HTML.INPUT;
-var A = HTML.A;
-var DIV = HTML.DIV;
-var P = HTML.P;
-var TEXTAREA = HTML.TEXTAREA;
-var SCRIPT = HTML.SCRIPT;
-var STYLE = HTML.STYLE;
-
-Tinytest.add("html-tools - parser getContent", function (test) {
-
-  var succeed = function (input, expected) {
-    var endPos = input.indexOf('^^^');
-    if (endPos < 0)
-      endPos = input.length;
-
-    var scanner = new Scanner(input.replace('^^^', ''));
-    var result = getContent(scanner);
-    test.equal(scanner.pos, endPos);
-    test.equal(BlazeTools.toJS(result), BlazeTools.toJS(expected));
-  };
-
-  var fatal = function (input, messageContains) {
-    var scanner = new Scanner(input);
-    var error;
-    try {
-      getContent(scanner);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (messageContains)
-      test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-
-  succeed('', null);
-  succeed('abc', 'abc');
-  succeed('abc^^^</x>', 'abc');
-  succeed('a&lt;b', ['a', CharRef({html: '&lt;', str: '<'}), 'b']);
-  succeed('<!-- x -->', Comment(' x '));
-  succeed('&acE;', CharRef({html: '&acE;', str: '\u223e\u0333'}));
-  succeed('&zopf;', CharRef({html: '&zopf;', str: '\ud835\udd6b'}));
-  succeed('&&>&g&gt;;', ['&&>&g', CharRef({html: '&gt;', str: '>'}), ';']);
-
-  // Can't have an unescaped `&` if followed by certain names like `gt`
-  fatal('&gt&');
-  // tests for other failure cases
-  fatal('<');
-
-  succeed('<br>', BR());
-  succeed('<br/>', BR());
-  fatal('<div/>', 'self-close');
-
-  succeed('<hr id=foo>', HR({id:'foo'}));
-  succeed('<hr id=&lt;foo&gt;>', HR({id:[CharRef({html:'&lt;', str:'<'}),
-                                         'foo',
-                                         CharRef({html:'&gt;', str:'>'})]}));
-  succeed('<input selected>', INPUT({selected: ''}));
-  succeed('<input selected/>', INPUT({selected: ''}));
-  succeed('<input selected />', INPUT({selected: ''}));
-  var FOO = HTML.getTag('foo');
-  succeed('<foo bar></foo>', FOO({bar: ''}));
-  succeed('<foo bar baz ></foo>', FOO({bar: '', baz: ''}));
-  succeed('<foo bar=x baz qux=y blah ></foo>',
-          FOO({bar: 'x', baz: '', qux: 'y', blah: ''}));
-  succeed('<foo bar="x" baz qux="y" blah ></foo>',
-          FOO({bar: 'x', baz: '', qux: 'y', blah: ''}));
-  fatal('<input bar"baz">');
-  fatal('<input x="y"z >');
-  fatal('<input x=\'y\'z >');
-  succeed('<br x=&&&>', BR({x: '&&&'}));
-  succeed('<br><br><br>', [BR(), BR(), BR()]);
-  succeed('aaa<br>\nbbb<br>\nccc<br>', ['aaa', BR(), '\nbbb', BR(), '\nccc', BR()]);
-
-  succeed('<a></a>', A());
-  fatal('<');
-  fatal('<a');
-  fatal('<a>');
-  fatal('<a><');
-  fatal('<a></');
-  fatal('<a></a');
-
-  succeed('<a href="http://www.apple.com/">Apple</a>',
-          A({href: "http://www.apple.com/"}, 'Apple'));
-
-  (function () {
-    var A = HTML.getTag('a');
-    var B = HTML.getTag('b');
-    var C = HTML.getTag('c');
-    var D = HTML.getTag('d');
-
-    succeed('<a>1<b>2<c>3<d>4</d>5</c>6</b>7</a>8',
-            [A('1', B('2', C('3', D('4'), '5'), '6'), '7'), '8']);
-  })();
-
-  fatal('<b>hello <i>there</b> world</i>');
-
-  // XXX support implied end tags in cases allowed by the spec
-  fatal('<p>');
-
-  fatal('<a>Foo</a/>');
-  fatal('<a>Foo</a b=c>');
-
-  succeed('<textarea>asdf</textarea>', TEXTAREA({value: "asdf"}));
-  succeed('<textarea x=y>asdf</textarea>', TEXTAREA({x: "y", value: "asdf"}));
-  succeed('<textarea><p></textarea>', TEXTAREA({value: "<p>"}));
-  succeed('<textarea>a&amp;b</textarea>',
-          TEXTAREA({value: ["a", CharRef({html: '&amp;', str: '&'}), "b"]}));
-  succeed('<textarea></textarea</textarea>', TEXTAREA({value: "</textarea"}));
-  // absorb up to one initial newline, as per HTML parsing spec
-  succeed('<textarea>\n</textarea>', TEXTAREA());
-  succeed('<textarea>\nasdf</textarea>', TEXTAREA({value: "asdf"}));
-  succeed('<textarea>\n\nasdf</textarea>', TEXTAREA({value: "\nasdf"}));
-  succeed('<textarea>\n\n</textarea>', TEXTAREA({value: "\n"}));
-  succeed('<textarea>\nasdf\n</textarea>', TEXTAREA({value: "asdf\n"}));
-  succeed('<textarea><!-- --></textarea>', TEXTAREA({value: "<!-- -->"}));
-  succeed('<tExTaReA>asdf</TEXTarea>', TEXTAREA({value: "asdf"}));
-  fatal('<textarea>asdf');
-  fatal('<textarea>asdf</textarea');
-  fatal('<textarea>&davidgreenspan;</textarea>');
-  succeed('<textarea>&</textarea>', TEXTAREA({value: "&"}));
-  succeed('<textarea></textarea  \n<</textarea  \n>asdf',
-          [TEXTAREA({value: "</textarea  \n<"}), "asdf"]);
-  // regression test for a bug that happened with textarea content
-  // handling after an element with content
-  succeed('<div>x</div><textarea></textarea>', [DIV("x"), TEXTAREA()]);
-
-  // CR/LF behavior
-  succeed('<br\r\n x>', BR({x:''}));
-  succeed('<br\r x>', BR({x:''}));
-  succeed('<br x="y"\r\n>', BR({x:'y'}));
-  succeed('<br x="y"\r>', BR({x:'y'}));
-  succeed('<br x=\r\n"y">', BR({x:'y'}));
-  succeed('<br x=\r"y">', BR({x:'y'}));
-  succeed('<br x\r=\r"y">', BR({x:'y'}));
-  succeed('<!--\r\n-->', Comment('\n'));
-  succeed('<!--\r-->', Comment('\n'));
-  succeed('<textarea>a\r\nb\r\nc</textarea>', TEXTAREA({value: 'a\nb\nc'}));
-  succeed('<textarea>a\rb\rc</textarea>', TEXTAREA({value: 'a\nb\nc'}));
-  succeed('<br x="\r\n\r\n">', BR({x:'\n\n'}));
-  succeed('<br x="\r\r">', BR({x:'\n\n'}));
-  succeed('<br x=y\r>', BR({x:'y'}));
-  fatal('<br x=\r>');
-
-  succeed('<script>var x="<div>";</script>',SCRIPT('var x="<div>";'));
-  succeed('<script>var x=1 && 0;</script>',SCRIPT('var x=1 && 0;'));
-
-  succeed('<script>asdf</script>', SCRIPT("asdf"));
-  succeed('<script x=y>asdf</script>', SCRIPT({x: "y"}, "asdf"));
-  succeed('<script><p></script>', SCRIPT("<p>"));
-  succeed('<script>a&amp;b</script>', SCRIPT("a&amp;b"));
-  succeed('<script></script</script>', SCRIPT("</script"));
-  succeed('<script>\n</script>', SCRIPT("\n"));
-  succeed('<script><!-- --></script>', SCRIPT("<!-- -->"));
-  succeed('<sCrIpT>asdf</SCRipt>', SCRIPT("asdf"));
-  fatal('<script>asdf');
-  fatal('<script>asdf</script');
-  succeed('<script>&davidgreenspan;</script>', SCRIPT("&davidgreenspan;"));
-  succeed('<script>&</script>', SCRIPT("&"));
-  succeed('<script></script  \n<</script  \n>asdf',
-          [SCRIPT("</script  \n<"), "asdf"]);
-
-  succeed('<style>asdf</style>', STYLE("asdf"));
-  succeed('<style x=y>asdf</style>', STYLE({x: "y"}, "asdf"));
-  succeed('<style><p></style>', STYLE("<p>"));
-  succeed('<style>a&amp;b</style>', STYLE("a&amp;b"));
-  succeed('<style></style</style>', STYLE("</style"));
-  succeed('<style>\n</style>', STYLE("\n"));
-  succeed('<style><!-- --></style>', STYLE("<!-- -->"));
-  succeed('<sTyLe>asdf</STYle>', STYLE("asdf"));
-  fatal('<style>asdf');
-  fatal('<style>asdf</style');
-  succeed('<style>&davidgreenspan;</style>', STYLE("&davidgreenspan;"));
-  succeed('<style>&</style>', STYLE("&"));
-  succeed('<style></style  \n<</style  \n>asdf',
-          [STYLE("</style  \n<"), "asdf"]);
-});
-
-Tinytest.add("html-tools - parseFragment", function (test) {
-  test.equal(BlazeTools.toJS(HTMLTools.parseFragment("<div><p id=foo>Hello</p></div>")),
-             BlazeTools.toJS(DIV(P({id:'foo'}, 'Hello'))));
-
-  _.each(['asdf</br>', '{{!foo}}</br>', '{{!foo}} </br>',
-          'asdf</a>', '{{!foo}}</a>', '{{!foo}} </a>'], function (badFrag) {
-            test.throws(function() {
-              HTMLTools.parseFragment(badFrag);
-            }, /Unexpected HTML close tag/);
-          });
-
-  (function () {
-    var p = HTMLTools.parseFragment('<p></p>');
-    test.equal(p.tagName, 'p');
-    test.equal(p.attrs, null);
-    test.isTrue(p instanceof HTML.Tag);
-    test.equal(p.children.length, 0);
-  })();
-
-  (function () {
-    var p = HTMLTools.parseFragment('<p>x</p>');
-    test.equal(p.tagName, 'p');
-    test.equal(p.attrs, null);
-    test.isTrue(p instanceof HTML.Tag);
-    test.equal(p.children.length, 1);
-    test.equal(p.children[0], 'x');
-  })();
-
-  (function () {
-    var p = HTMLTools.parseFragment('<p>x&#65;</p>');
-    test.equal(p.tagName, 'p');
-    test.equal(p.attrs, null);
-    test.isTrue(p instanceof HTML.Tag);
-    test.equal(p.children.length, 2);
-    test.equal(p.children[0], 'x');
-
-    test.isTrue(p.children[1] instanceof HTML.CharRef);
-    test.equal(p.children[1].html, '&#65;');
-    test.equal(p.children[1].str, 'A');
-  })();
-
-  (function () {
-    var pp = HTMLTools.parseFragment('<p>x</p><p>y</p>');
-    test.isTrue(pp instanceof Array);
-    test.equal(pp.length, 2);
-
-    test.equal(pp[0].tagName, 'p');
-    test.equal(pp[0].attrs, null);
-    test.isTrue(pp[0] instanceof HTML.Tag);
-    test.equal(pp[0].children.length, 1);
-    test.equal(pp[0].children[0], 'x');
-
-    test.equal(pp[1].tagName, 'p');
-    test.equal(pp[1].attrs, null);
-    test.isTrue(pp[1] instanceof HTML.Tag);
-    test.equal(pp[1].children.length, 1);
-    test.equal(pp[1].children[0], 'y');
-  })();
-
-  var scanner = new Scanner('asdf');
-  scanner.pos = 1;
-  test.equal(HTMLTools.parseFragment(scanner), 'sdf');
-
-  test.throws(function () {
-    var scanner = new Scanner('asdf</p>');
-    scanner.pos = 1;
-    HTMLTools.parseFragment(scanner);
-  });
-});
-
-Tinytest.add("html-tools - getTemplateTag", function (test) {
-
-  // match a simple tag consisting of `{{`, an optional `!`, one
-  // or more ASCII letters, spaces or html tags, and a closing `}}`.
-  var mustache = /^\{\{(!?[a-zA-Z 0-9</>]+)\}\}/;
-
-  // This implementation of `getTemplateTag` looks for "{{" and if it
-  // finds it, it will match the regex above or fail fatally trying.
-  // The object it returns is opaque to the tokenizer/parser and can
-  // be anything we want.
-  var getTemplateTag = function (scanner, position) {
-    if (! (scanner.peek() === '{' && // one-char peek is just an optimization
-           scanner.rest().slice(0, 2) === '{{'))
-      return null;
-
-    var match = mustache.exec(scanner.rest());
-    if (! match)
-      scanner.fatal("Bad mustache");
-
-    scanner.pos += match[0].length;
-
-    if (match[1].charAt(0) === '!')
-      return null; // `{{!foo}}` is like a comment
-
-    return TemplateTag({ stuff: match[1] });
-  };
-
-
-
-  var succeed = function (input, expected) {
-    var endPos = input.indexOf('^^^');
-    if (endPos < 0)
-      endPos = input.length;
-
-    var scanner = new Scanner(input.replace('^^^', ''));
-    scanner.getTemplateTag = getTemplateTag;
-    var result;
-    try {
-      result = getContent(scanner);
-    } catch (e) {
-      result = String(e);
-    }
-    test.equal(scanner.pos, endPos);
-    test.equal(BlazeTools.toJS(result), BlazeTools.toJS(expected));
-  };
-
-  var fatal = function (input, messageContains) {
-    var scanner = new Scanner(input);
-    scanner.getTemplateTag = getTemplateTag;
-    var error;
-    try {
-      getContent(scanner);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (messageContains)
-      test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-
-  succeed('{{foo}}', TemplateTag({stuff: 'foo'}));
-
-  succeed('<a href=http://www.apple.com/>{{foo}}</a>',
-          A({href: "http://www.apple.com/"}, TemplateTag({stuff: 'foo'})));
-
-  // tags not parsed in comments
-  succeed('<!--{{foo}}-->', Comment("{{foo}}"));
-  succeed('<!--{{foo-->', Comment("{{foo"));
-
-  succeed('&am{{foo}}p;', ['&am', TemplateTag({stuff: 'foo'}), 'p;']);
-
-  // can't start a mustache and not finish it
-  fatal('{{foo');
-  fatal('<a>{{</a>');
-
-  // no mustache allowed in tag name
-  fatal('<{{a}}>');
-  fatal('<{{a}}b>');
-  fatal('<a{{b}}>');
-
-  // single curly brace is no biggie
-  succeed('a{b', 'a{b');
-  succeed('<br x={ />', BR({x:'{'}));
-  succeed('<br x={foo} />', BR({x:'{foo}'}));
-
-  succeed('<br {{x}}>', BR(Attrs(TemplateTag({stuff: 'x'}))));
-  succeed('<br {{x}} {{y}}>', BR(Attrs(TemplateTag({stuff: 'x'}),
-                                       TemplateTag({stuff: 'y'}))));
-  succeed('<br {{x}} y>', BR(Attrs({y: ''}, TemplateTag({stuff: 'x'}))));
-  fatal('<br {{x}}y>');
-  fatal('<br {{x}}=y>');
-  succeed('<br x={{y}} z>', BR({x: TemplateTag({stuff: 'y'}), z: ''}));
-  succeed('<br x=y{{z}}w>', BR({x: ['y', TemplateTag({stuff: 'z'}), 'w']}));
-  succeed('<br x="y{{z}}w">', BR({x: ['y', TemplateTag({stuff: 'z'}), 'w']}));
-  succeed('<br x="y {{z}}{{w}} v">', BR({x: ['y ', TemplateTag({stuff: 'z'}),
-                                             TemplateTag({stuff: 'w'}), ' v']}));
-  // Slash is parsed as part of unquoted attribute!  This is consistent with
-  // the HTML tokenization spec.  It seems odd for some inputs but is probably
-  // for cases like `<a href=http://foo.com/>` or `<a href=/foo/>`.
-  succeed('<br x={{y}}/>', BR({x: [TemplateTag({stuff: 'y'}), '/']}));
-  succeed('<br x={{z}}{{w}}>', BR({x: [TemplateTag({stuff: 'z'}),
-                                       TemplateTag({stuff: 'w'})]}));
-  fatal('<br x="y"{{z}}>');
-
-  succeed('<br x=&amp;>', BR({x:CharRef({html: '&amp;', str: '&'})}));
-
-
-  // check tokenization of stache tags with spaces
-  succeed('<br {{x 1}}>', BR(Attrs(TemplateTag({stuff: 'x 1'}))));
-  succeed('<br {{x 1}} {{y 2}}>', BR(Attrs(TemplateTag({stuff: 'x 1'}),
-                                           TemplateTag({stuff: 'y 2'}))));
-  succeed('<br {{x 1}} y>', BR(Attrs({y:''}, TemplateTag({stuff: 'x 1'}))));
-  fatal('<br {{x 1}}y>');
-  fatal('<br {{x 1}}=y>');
-  succeed('<br x={{y 2}} z>', BR({x: TemplateTag({stuff: 'y 2'}), z: ''}));
-  succeed('<br x=y{{z 3}}w>', BR({x: ['y', TemplateTag({stuff: 'z 3'}), 'w']}));
-  succeed('<br x="y{{z 3}}w">', BR({x: ['y', TemplateTag({stuff: 'z 3'}), 'w']}));
-  succeed('<br x="y {{z 3}}{{w 4}} v">', BR({x: ['y ', TemplateTag({stuff: 'z 3'}),
-                                                 TemplateTag({stuff: 'w 4'}), ' v']}));
-  succeed('<br x={{y 2}}/>', BR({x: [TemplateTag({stuff: 'y 2'}), '/']}));
-  succeed('<br x={{z 3}}{{w 4}}>', BR({x: [TemplateTag({stuff: 'z 3'}),
-                                           TemplateTag({stuff: 'w 4'})]}));
-
-  succeed('<p></p>', P());
-
-  succeed('x{{foo}}{{bar}}y', ['x', TemplateTag({stuff: 'foo'}),
-                               TemplateTag({stuff: 'bar'}), 'y']);
-  succeed('x{{!foo}}{{!bar}}y', 'xy');
-  succeed('x{{!foo}}{{bar}}y', ['x', TemplateTag({stuff: 'bar'}), 'y']);
-  succeed('x{{foo}}{{!bar}}y', ['x', TemplateTag({stuff: 'foo'}), 'y']);
-  succeed('<div>{{!foo}}{{!bar}}</div>', DIV());
-  succeed('<div>{{!foo}}<br />{{!bar}}</div>', DIV(BR()));
-  succeed('<div> {{!foo}} {{!bar}} </div>', DIV("   "));
-  succeed('<div> {{!foo}} <br /> {{!bar}}</div>', DIV("  ", BR(), " "));
-  succeed('{{! <div></div> }}', null);
-  succeed('{{!<div></div>}}', null);
-
-  succeed('', null);
-  succeed('{{!foo}}', null);
-
-  succeed('<textarea {{a}} x=1 {{b}}></textarea>',
-          TEXTAREA(Attrs({x:"1"}, TemplateTag({stuff: 'a'}),
-                         TemplateTag({stuff: 'b'}))));
-
-});
diff --git a/packages/html-tools/scanner.js b/packages/html-tools/scanner.js
deleted file mode 100644
index d110a8a814..0000000000
--- a/packages/html-tools/scanner.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// This is a Scanner class suitable for any parser/lexer/tokenizer.
-//
-// A Scanner has an immutable source document (string) `input` and a current
-// position `pos`, an index into the string, which can be set at will.
-//
-// * `new Scanner(input)` - constructs a Scanner with source string `input`
-// * `scanner.rest()` - returns the rest of the input after `pos`
-// * `scanner.peek()` - returns the character at `pos`
-// * `scanner.isEOF()` - true if `pos` is at or beyond the end of `input`
-// * `scanner.fatal(msg)` - throw an error indicating a problem at `pos`
-
-Scanner = HTMLTools.Scanner = function (input) {
-  this.input = input; // public, read-only
-  this.pos = 0; // public, read-write
-};
-
-Scanner.prototype.rest = function () {
-  // Slicing a string is O(1) in modern JavaScript VMs (including old IE).
-  return this.input.slice(this.pos);
-};
-
-Scanner.prototype.isEOF = function () {
-  return this.pos >= this.input.length;
-};
-
-Scanner.prototype.fatal = function (msg) {
-  // despite this default, you should always provide a message!
-  msg = (msg || "Parse error");
-
-  var CONTEXT_AMOUNT = 20;
-
-  var input = this.input;
-  var pos = this.pos;
-  var pastInput = input.substring(pos - CONTEXT_AMOUNT - 1, pos);
-  if (pastInput.length > CONTEXT_AMOUNT)
-    pastInput = '...' + pastInput.substring(-CONTEXT_AMOUNT);
-
-  var upcomingInput = input.substring(pos, pos + CONTEXT_AMOUNT + 1);
-  if (upcomingInput.length > CONTEXT_AMOUNT)
-    upcomingInput = upcomingInput.substring(0, CONTEXT_AMOUNT) + '...';
-
-  var positionDisplay = ((pastInput + upcomingInput).replace(/\n/g, ' ') + '\n' +
-                         (new Array(pastInput.length + 1).join(' ')) + "^");
-
-  var e = new Error(msg + "\n" + positionDisplay);
-
-  e.offset = pos;
-  var allPastInput = input.substring(0, pos);
-  e.line = (1 + (allPastInput.match(/\n/g) || []).length);
-  e.col = (1 + pos - allPastInput.lastIndexOf('\n'));
-  e.scanner = this;
-
-  throw e;
-};
-
-// Peek at the next character.
-//
-// If `isEOF`, returns an empty string.
-Scanner.prototype.peek = function () {
-  return this.input.charAt(this.pos);
-};
-
-// Constructs a `getFoo` function where `foo` is specified with a regex.
-// The regex should start with `^`.  The constructed function will return
-// match group 1, if it exists and matches a non-empty string, or else
-// the entire matched string (or null if there is no match).
-//
-// A `getFoo` function tries to match and consume a foo.  If it succeeds,
-// the current position of the scanner is advanced.  If it fails, the
-// current position is not advanced and a falsy value (typically null)
-// is returned.
-makeRegexMatcher = function (regex) {
-  return function (scanner) {
-    var match = regex.exec(scanner.rest());
-
-    if (! match)
-      return null;
-
-    scanner.pos += match[0].length;
-    return match[1] || match[0];
-  };
-};
diff --git a/packages/html-tools/templatetag.js b/packages/html-tools/templatetag.js
deleted file mode 100644
index f94f9fd214..0000000000
--- a/packages/html-tools/templatetag.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// _assign is like _.extend or the upcoming Object.assign.
-// Copy src's own, enumerable properties onto tgt and return
-// tgt.
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-var _assign = function (tgt, src) {
-  for (var k in src) {
-    if (_hasOwnProperty.call(src, k))
-      tgt[k] = src[k];
-  }
-  return tgt;
-};
-
-
-HTMLTools.TemplateTag = function (props) {
-  if (! (this instanceof HTMLTools.TemplateTag))
-    // called without `new`
-    return new HTMLTools.TemplateTag;
-
-  if (props)
-    _assign(this, props);
-};
-
-_assign(HTMLTools.TemplateTag.prototype, {
-  constructorName: 'HTMLTools.TemplateTag',
-  toJS: function (visitor) {
-    return visitor.generateCall(this.constructorName,
-                                _assign({}, this));
-  }
-});
diff --git a/packages/html-tools/tokenize.js b/packages/html-tools/tokenize.js
deleted file mode 100644
index de0b9c0662..0000000000
--- a/packages/html-tools/tokenize.js
+++ /dev/null
@@ -1,513 +0,0 @@
-// Token types:
-//
-// { t: 'Doctype',
-//   v: String (entire Doctype declaration from the source),
-//   name: String,
-//   systemId: String (optional),
-//   publicId: String (optional)
-// }
-//
-// { t: 'Comment',
-//   v: String (not including "<!--" and "-->")
-// }
-//
-// { t: 'Chars',
-//   v: String (pure text like you might pass to document.createTextNode,
-//              no character references)
-// }
-//
-// { t: 'Tag',
-//   isEnd: Boolean (optional),
-//   isSelfClosing: Boolean (optional),
-//   n: String (tag name, in lowercase or camel case),
-//   attrs: dictionary of { String: [tokens] }
-//          OR [{ String: [tokens] }, TemplateTag tokens...]
-//     (only for start tags; required)
-// }
-//
-// { t: 'CharRef',
-//   v: String (entire character reference from the source, e.g. "&amp;"),
-//   cp: [Integer] (array of Unicode code point numbers it expands to)
-// }
-//
-// We keep around both the original form of the character reference and its
-// expansion so that subsequent processing steps have the option to
-// re-emit it (if they are generating HTML) or interpret it.  Named and
-// numerical code points may be more than 16 bits, in which case they
-// need to passed through codePointToString to make a JavaScript string.
-// Most named entities and all numeric character references are one codepoint
-// (e.g. "&amp;" is [38]), but a few are two codepoints.
-//
-// { t: 'TemplateTag',
-//   v: HTMLTools.TemplateTag
-// }
-
-// The HTML tokenization spec says to preprocess the input stream to replace
-// CR(LF)? with LF.  However, preprocessing `scanner` would complicate things
-// by making indexes not match the input (e.g. for error messages), so we just
-// keep in mind as we go along that an LF might be represented by CRLF or CR.
-// In most cases, it doesn't actually matter what combination of whitespace
-// characters are present (e.g. inside tags).
-var HTML_SPACE = /^[\f\n\r\t ]/;
-
-var convertCRLF = function (str) {
-  return str.replace(/\r\n?/g, '\n');
-};
-
-getComment = HTMLTools.Parse.getComment = function (scanner) {
-  if (scanner.rest().slice(0, 4) !== '<!--')
-    return null;
-  scanner.pos += 4;
-
-  // Valid comments are easy to parse; they end at the first `--`!
-  // Our main job is throwing errors.
-
-  var rest = scanner.rest();
-  if (rest.charAt(0) === '>' || rest.slice(0, 2) === '->')
-    scanner.fatal("HTML comment can't start with > or ->");
-
-  var closePos = rest.indexOf('-->');
-  if (closePos < 0)
-    scanner.fatal("Unclosed HTML comment");
-
-  var commentContents = rest.slice(0, closePos);
-  if (commentContents.slice(-1) === '-')
-    scanner.fatal("HTML comment must end at first `--`");
-  if (commentContents.indexOf("--") >= 0)
-    scanner.fatal("HTML comment cannot contain `--` anywhere");
-  if (commentContents.indexOf('\u0000') >= 0)
-    scanner.fatal("HTML comment cannot contain NULL");
-
-  scanner.pos += closePos + 3;
-
-  return { t: 'Comment',
-           v: convertCRLF(commentContents) };
-};
-
-var skipSpaces = function (scanner) {
-  while (HTML_SPACE.test(scanner.peek()))
-    scanner.pos++;
-};
-
-var requireSpaces = function (scanner) {
-  if (! HTML_SPACE.test(scanner.peek()))
-    scanner.fatal("Expected space");
-  skipSpaces(scanner);
-};
-
-var getDoctypeQuotedString = function (scanner) {
-  var quote = scanner.peek();
-  if (! (quote === '"' || quote === "'"))
-    scanner.fatal("Expected single or double quote in DOCTYPE");
-  scanner.pos++;
-
-  if (scanner.peek() === quote)
-    // prevent a falsy return value (empty string)
-    scanner.fatal("Malformed DOCTYPE");
-
-  var str = '';
-  var ch;
-  while ((ch = scanner.peek()), ch !== quote) {
-    if ((! ch) || (ch === '\u0000') || (ch === '>'))
-      scanner.fatal("Malformed DOCTYPE");
-    str += ch;
-    scanner.pos++;
-  }
-
-  scanner.pos++;
-
-  return str;
-};
-
-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#the-doctype.
-//
-// If `getDocType` sees "<!DOCTYPE" (case-insensitive), it will match or fail fatally.
-getDoctype = HTMLTools.Parse.getDoctype = function (scanner) {
-  if (HTMLTools.asciiLowerCase(scanner.rest().slice(0, 9)) !== '<!doctype')
-    return null;
-  var start = scanner.pos;
-  scanner.pos += 9;
-
-  requireSpaces(scanner);
-
-  var ch = scanner.peek();
-  if ((! ch) || (ch === '>') || (ch === '\u0000'))
-    scanner.fatal('Malformed DOCTYPE');
-  var name = ch;
-  scanner.pos++;
-
-  while ((ch = scanner.peek()), ! (HTML_SPACE.test(ch) || ch === '>')) {
-    if ((! ch) || (ch === '\u0000'))
-      scanner.fatal('Malformed DOCTYPE');
-    name += ch;
-    scanner.pos++;
-  }
-  name = HTMLTools.asciiLowerCase(name);
-
-  // Now we're looking at a space or a `>`.
-  skipSpaces(scanner);
-
-  var systemId = null;
-  var publicId = null;
-
-  if (scanner.peek() !== '>') {
-    // Now we're essentially in the "After DOCTYPE name state" of the tokenizer,
-    // but we're not looking at space or `>`.
-
-    // this should be "public" or "system".
-    var publicOrSystem = HTMLTools.asciiLowerCase(scanner.rest().slice(0, 6));
-
-    if (publicOrSystem === 'system') {
-      scanner.pos += 6;
-      requireSpaces(scanner);
-      systemId = getDoctypeQuotedString(scanner);
-      skipSpaces(scanner);
-      if (scanner.peek() !== '>')
-        scanner.fatal("Malformed DOCTYPE");
-    } else if (publicOrSystem === 'public') {
-      scanner.pos += 6;
-      requireSpaces(scanner);
-      publicId = getDoctypeQuotedString(scanner);
-      if (scanner.peek() !== '>') {
-        requireSpaces(scanner);
-        if (scanner.peek() !== '>') {
-          systemId = getDoctypeQuotedString(scanner);
-          skipSpaces(scanner);
-          if (scanner.peek() !== '>')
-            scanner.fatal("Malformed DOCTYPE");
-        }
-      }
-    } else {
-      scanner.fatal("Expected PUBLIC or SYSTEM in DOCTYPE");
-    }
-  }
-
-  // looking at `>`
-  scanner.pos++;
-  var result = { t: 'Doctype',
-                 v: scanner.input.slice(start, scanner.pos),
-                 name: name };
-
-  if (systemId)
-    result.systemId = systemId;
-  if (publicId)
-    result.publicId = publicId;
-
-  return result;
-};
-
-// The special character `{` is only allowed as the first character
-// of a Chars, so that we have a chance to detect template tags.
-var getChars = makeRegexMatcher(/^[^&<\u0000][^&<\u0000{]*/);
-
-var assertIsTemplateTag = function (x) {
-  if (! (x instanceof HTMLTools.TemplateTag))
-    throw new Error("Expected an instance of HTMLTools.TemplateTag");
-  return x;
-};
-
-// Returns the next HTML token, or `null` if we reach EOF.
-//
-// Note that if we have a `getTemplateTag` function that sometimes
-// consumes characters and emits nothing (e.g. in the case of template
-// comments), we may go from not-at-EOF to at-EOF and return `null`,
-// while otherwise we always find some token to return.
-getHTMLToken = HTMLTools.Parse.getHTMLToken = function (scanner, dataMode) {
-  var result = null;
-  if (scanner.getTemplateTag) {
-    // Try to parse a template tag by calling out to the provided
-    // `getTemplateTag` function.  If the function returns `null` but
-    // consumes characters, it must have parsed a comment or something,
-    // so we loop and try it again.  If it ever returns `null` without
-    // consuming anything, that means it didn't see anything interesting
-    // so we look for a normal token.  If it returns a truthy value,
-    // the value must be instanceof HTMLTools.TemplateTag.  We wrap it
-    // in a Special token.
-    var lastPos = scanner.pos;
-    result = scanner.getTemplateTag(
-      scanner,
-      (dataMode === 'rcdata' ? TEMPLATE_TAG_POSITION.IN_RCDATA :
-       (dataMode === 'rawtext' ? TEMPLATE_TAG_POSITION.IN_RAWTEXT :
-        TEMPLATE_TAG_POSITION.ELEMENT)));
-
-    if (result)
-      return { t: 'TemplateTag', v: assertIsTemplateTag(result) };
-    else if (scanner.pos > lastPos)
-      return null;
-  }
-
-  var chars = getChars(scanner);
-  if (chars)
-    return { t: 'Chars',
-             v: convertCRLF(chars) };
-
-  var ch = scanner.peek();
-  if (! ch)
-    return null; // EOF
-
-  if (ch === '\u0000')
-    scanner.fatal("Illegal NULL character");
-
-  if (ch === '&') {
-    if (dataMode !== 'rawtext') {
-      var charRef = getCharacterReference(scanner);
-      if (charRef)
-        return charRef;
-    }
-
-    scanner.pos++;
-    return { t: 'Chars',
-             v: '&' };
-  }
-
-  // If we're here, we're looking at `<`.
-
-  if (scanner.peek() === '<' && dataMode) {
-    // don't interpret tags
-    scanner.pos++;
-    return { t: 'Chars',
-             v: '<' };
-  }
-
-  // `getTag` will claim anything starting with `<` not followed by `!`.
-  // `getComment` takes `<!--` and getDoctype takes `<!doctype`.
-  result = (getTagToken(scanner) || getComment(scanner) || getDoctype(scanner));
-
-  if (result)
-    return result;
-
-  scanner.fatal("Unexpected `<!` directive.");
-};
-
-var getTagName = makeRegexMatcher(/^[a-zA-Z][^\f\n\r\t />{]*/);
-var getClangle = makeRegexMatcher(/^>/);
-var getSlash = makeRegexMatcher(/^\//);
-var getAttributeName = makeRegexMatcher(/^[^>/\u0000"'<=\f\n\r\t ][^\f\n\r\t /=>"'<\u0000]*/);
-
-// Try to parse `>` or `/>`, mutating `tag` to be self-closing in the latter
-// case (and failing fatally if `/` isn't followed by `>`).
-// Return tag if successful.
-var handleEndOfTag = function (scanner, tag) {
-  if (getClangle(scanner))
-    return tag;
-
-  if (getSlash(scanner)) {
-    if (! getClangle(scanner))
-      scanner.fatal("Expected `>` after `/`");
-    tag.isSelfClosing = true;
-    return tag;
-  }
-
-  return null;
-};
-
-// Scan a quoted or unquoted attribute value (omit `quote` for unquoted).
-var getAttributeValue = function (scanner, quote) {
-  if (quote) {
-    if (scanner.peek() !== quote)
-      return null;
-    scanner.pos++;
-  }
-
-  var tokens = [];
-  var charsTokenToExtend = null;
-
-  var charRef;
-  while (true) {
-    var ch = scanner.peek();
-    var templateTag;
-    var curPos = scanner.pos;
-    if (quote && ch === quote) {
-      scanner.pos++;
-      return tokens;
-    } else if ((! quote) && (HTML_SPACE.test(ch) || ch === '>')) {
-      return tokens;
-    } else if (! ch) {
-      scanner.fatal("Unclosed attribute in tag");
-    } else if (quote ? ch === '\u0000' : ('\u0000"\'<=`'.indexOf(ch) >= 0)) {
-      scanner.fatal("Unexpected character in attribute value");
-    } else if (ch === '&' &&
-               (charRef = getCharacterReference(scanner, true,
-                                                quote || '>'))) {
-      tokens.push(charRef);
-      charsTokenToExtend = null;
-    } else if (scanner.getTemplateTag &&
-               ((templateTag = scanner.getTemplateTag(
-                 scanner, TEMPLATE_TAG_POSITION.IN_ATTRIBUTE)) ||
-                scanner.pos > curPos /* `{{! comment}}` */)) {
-      if (templateTag) {
-        tokens.push({t: 'TemplateTag',
-                     v: assertIsTemplateTag(templateTag)});
-        charsTokenToExtend = null;
-      }
-    } else {
-      if (! charsTokenToExtend) {
-        charsTokenToExtend = { t: 'Chars', v: '' };
-        tokens.push(charsTokenToExtend);
-      }
-      charsTokenToExtend.v += (ch === '\r' ? '\n' : ch);
-      scanner.pos++;
-      if (quote && ch === '\r' && scanner.peek() === '\n')
-        scanner.pos++;
-    }
-  }
-};
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-getTagToken = HTMLTools.Parse.getTagToken = function (scanner) {
-  if (! (scanner.peek() === '<' && scanner.rest().charAt(1) !== '!'))
-    return null;
-  scanner.pos++;
-
-  var tag = { t: 'Tag' };
-
-  // now looking at the character after `<`, which is not a `!`
-  if (scanner.peek() === '/') {
-    tag.isEnd = true;
-    scanner.pos++;
-  }
-
-  var tagName = getTagName(scanner);
-  if (! tagName)
-    scanner.fatal("Expected tag name after `<`");
-  tag.n = HTMLTools.properCaseTagName(tagName);
-
-  if (scanner.peek() === '/' && tag.isEnd)
-    scanner.fatal("End tag can't have trailing slash");
-  if (handleEndOfTag(scanner, tag))
-    return tag;
-
-  if (scanner.isEOF())
-    scanner.fatal("Unclosed `<`");
-
-  if (! HTML_SPACE.test(scanner.peek()))
-    // e.g. `<a{{b}}>`
-    scanner.fatal("Expected space after tag name");
-
-  // we're now in "Before attribute name state" of the tokenizer
-  skipSpaces(scanner);
-
-  if (scanner.peek() === '/' && tag.isEnd)
-    scanner.fatal("End tag can't have trailing slash");
-  if (handleEndOfTag(scanner, tag))
-    return tag;
-
-  if (tag.isEnd)
-    scanner.fatal("End tag can't have attributes");
-
-  tag.attrs = {};
-  var nondynamicAttrs = tag.attrs;
-
-  while (true) {
-    // Note: at the top of this loop, we've already skipped any spaces.
-
-    // This will be set to true if after parsing the attribute, we should
-    // require spaces (or else an end of tag, i.e. `>` or `/>`).
-    var spacesRequiredAfter = false;
-
-    // first, try for a template tag.
-    var curPos = scanner.pos;
-    var templateTag = (scanner.getTemplateTag &&
-                       scanner.getTemplateTag(
-                         scanner, TEMPLATE_TAG_POSITION.IN_START_TAG));
-    if (templateTag || (scanner.pos > curPos)) {
-      if (templateTag) {
-        if (tag.attrs === nondynamicAttrs)
-          tag.attrs = [nondynamicAttrs];
-        tag.attrs.push({ t: 'TemplateTag',
-                         v: assertIsTemplateTag(templateTag) });
-      } // else, must have scanned a `{{! comment}}`
-
-      spacesRequiredAfter = true;
-    } else {
-
-      var attributeName = getAttributeName(scanner);
-      if (! attributeName)
-        scanner.fatal("Expected attribute name in tag");
-      // Throw error on `{` in attribute name.  This provides *some* error message
-      // if someone writes `<a x{{y}}>` or `<a x{{y}}=z>`.  The HTML tokenization
-      // spec doesn't say that `{` is invalid, but the DOM API (setAttribute) won't
-      // allow it, so who cares.
-      if (attributeName.indexOf('{') >= 0)
-        scanner.fatal("Unexpected `{` in attribute name.");
-      attributeName = HTMLTools.properCaseAttributeName(attributeName);
-
-      if (hasOwnProperty.call(nondynamicAttrs, attributeName))
-        scanner.fatal("Duplicate attribute in tag: " + attributeName);
-
-      nondynamicAttrs[attributeName] = [];
-
-      skipSpaces(scanner);
-
-      if (handleEndOfTag(scanner, tag))
-        return tag;
-
-      var ch = scanner.peek();
-      if (! ch)
-        scanner.fatal("Unclosed <");
-      if ('\u0000"\'<'.indexOf(ch) >= 0)
-        scanner.fatal("Unexpected character after attribute name in tag");
-
-      if (ch === '=') {
-        scanner.pos++;
-
-        skipSpaces(scanner);
-
-        ch = scanner.peek();
-        if (! ch)
-          scanner.fatal("Unclosed <");
-        if ('\u0000><=`'.indexOf(ch) >= 0)
-          scanner.fatal("Unexpected character after = in tag");
-
-        if ((ch === '"') || (ch === "'"))
-          nondynamicAttrs[attributeName] = getAttributeValue(scanner, ch);
-        else
-          nondynamicAttrs[attributeName] = getAttributeValue(scanner);
-
-        spacesRequiredAfter = true;
-      }
-    }
-    // now we are in the "post-attribute" position, whether it was a template tag
-    // attribute (like `{{x}}`) or a normal one (like `x` or `x=y`).
-
-    if (handleEndOfTag(scanner, tag))
-      return tag;
-
-    if (scanner.isEOF())
-      scanner.fatal("Unclosed `<`");
-
-    if (spacesRequiredAfter)
-      requireSpaces(scanner);
-    else
-      skipSpaces(scanner);
-
-    if (handleEndOfTag(scanner, tag))
-      return tag;
-  }
-};
-
-TEMPLATE_TAG_POSITION = HTMLTools.TEMPLATE_TAG_POSITION = {
-  ELEMENT: 1,
-  IN_START_TAG: 2,
-  IN_ATTRIBUTE: 3,
-  IN_RCDATA: 4,
-  IN_RAWTEXT: 5
-};
-
-// tagName must be proper case
-isLookingAtEndTag = function (scanner, tagName) {
-  var rest = scanner.rest();
-  var pos = 0; // into rest
-  var firstPart = /^<\/([a-zA-Z]+)/.exec(rest);
-  if (firstPart &&
-      HTMLTools.properCaseTagName(firstPart[1]) === tagName) {
-    // we've seen `</foo`, now see if the end tag continues
-    pos += firstPart[0].length;
-    while (pos < rest.length && HTML_SPACE.test(rest.charAt(pos)))
-      pos++;
-    if (pos < rest.length && rest.charAt(pos) === '>')
-      return true;
-  }
-  return false;
-};
diff --git a/packages/html-tools/tokenize_tests.js b/packages/html-tools/tokenize_tests.js
deleted file mode 100644
index 752eb2ee5d..0000000000
--- a/packages/html-tools/tokenize_tests.js
+++ /dev/null
@@ -1,344 +0,0 @@
-var Scanner = HTMLTools.Scanner;
-var getComment = HTMLTools.Parse.getComment;
-var getDoctype = HTMLTools.Parse.getDoctype;
-var getHTMLToken = HTMLTools.Parse.getHTMLToken;
-
-// "tokenize" is not really a great operation for real use, because
-// it ignores the special content rules for tags like "style" and
-// "script".
-var tokenize = function (input) {
-  var scanner = new Scanner(input);
-  var tokens = [];
-  while (! scanner.isEOF()) {
-    var token = getHTMLToken(scanner);
-    if (token)
-      tokens.push(token);
-  }
-
-  return tokens;
-};
-
-
-Tinytest.add("html-tools - comments", function (test) {
-  var succeed = function (input, content) {
-    var scanner = new Scanner(input);
-    var result = getComment(scanner);
-    test.isTrue(result);
-    test.equal(scanner.pos, content.length + 7);
-    test.equal(result, {
-      t: 'Comment',
-      v: content
-    });
-  };
-
-  var ignore = function (input) {
-    var scanner = new Scanner(input);
-    var result = getComment(scanner);;
-    test.isFalse(result);
-    test.equal(scanner.pos, 0);
-  };
-
-  var fatal = function (input, messageContains) {
-    var scanner = new Scanner(input);
-    var error;
-    try {
-      getComment(scanner);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (error)
-      test.isTrue(messageContains && error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-  test.equal(getComment(new Scanner("<!-- hello -->")),
-             { t: 'Comment', v: ' hello ' });
-
-  ignore("<!DOCTYPE>");
-  ignore("<!-a");
-  ignore("<--");
-  ignore("<!");
-  ignore("abc");
-  ignore("<a");
-
-  fatal('<!--', 'Unclosed');
-  fatal('<!---', 'Unclosed');
-  fatal('<!----', 'Unclosed');
-  fatal('<!-- -', 'Unclosed');
-  fatal('<!-- --', 'Unclosed');
-  fatal('<!-- -- abcd', 'Unclosed');
-  fatal('<!-- ->', 'Unclosed');
-  fatal('<!-- a--b -->', 'cannot contain');
-  fatal('<!--x--->', 'must end at first');
-
-  fatal('<!-- a\u0000b -->', 'cannot contain');
-  fatal('<!--\u0000 x-->', 'cannot contain');
-
-  succeed('<!---->', '');
-  succeed('<!---x-->', '-x');
-  succeed('<!--x-->', 'x');
-  succeed('<!-- hello - - world -->', ' hello - - world ');
-});
-
-Tinytest.add("html-tools - doctype", function (test) {
-  var succeed = function (input, expectedProps) {
-    var scanner = new Scanner(input);
-    var result = getDoctype(scanner);
-    test.isTrue(result);
-    test.equal(scanner.pos, result.v.length);
-    test.equal(input.slice(0, result.v.length), result.v);
-    var actualProps = _.extend({}, result);
-    delete actualProps.t;
-    delete actualProps.v;
-    test.equal(actualProps, expectedProps);
-  };
-
-  var fatal = function (input, messageContains) {
-    var scanner = new Scanner(input);
-    var error;
-    try {
-      getDoctype(scanner);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (messageContains)
-      test.isTrue(error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-  test.equal(getDoctype(new Scanner("<!DOCTYPE html>x")),
-             { t: 'Doctype',
-               v: '<!DOCTYPE html>',
-               name: 'html' });
-
-  test.equal(getDoctype(new Scanner("<!DOCTYPE html SYSTEM 'about:legacy-compat'>x")),
-             { t: 'Doctype',
-               v: "<!DOCTYPE html SYSTEM 'about:legacy-compat'>",
-               name: 'html',
-               systemId: 'about:legacy-compat' });
-
-  test.equal(getDoctype(new Scanner("<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.0//EN'>x")),
-             { t: 'Doctype',
-               v: "<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.0//EN'>",
-               name: 'html',
-               publicId: '-//W3C//DTD HTML 4.0//EN' });
-
-  test.equal(getDoctype(new Scanner("<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.0//EN' 'http://www.w3.org/TR/html4/strict.dtd'>x")),
-             { t: 'Doctype',
-               v: "<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.0//EN' 'http://www.w3.org/TR/html4/strict.dtd'>",
-               name: 'html',
-               publicId: '-//W3C//DTD HTML 4.0//EN',
-               systemId: 'http://www.w3.org/TR/html4/strict.dtd' });
-
-  succeed('<!DOCTYPE html>', {name: 'html'});
-  succeed('<!DOCTYPE htML>', {name: 'html'});
-  succeed('<!DOCTYPE HTML>', {name: 'html'});
-  succeed('<!doctype html>', {name: 'html'});
-  succeed('<!doctYPE html>', {name: 'html'});
-  succeed('<!DOCTYPE html \u000c>', {name: 'html'});
-  fatal('<!DOCTYPE', 'Expected space');
-  fatal('<!DOCTYPE ', 'Malformed DOCTYPE');
-  fatal('<!DOCTYPE  ', 'Malformed DOCTYPE');
-  fatal('<!DOCTYPE>', 'Expected space');
-  fatal('<!DOCTYPE >', 'Malformed DOCTYPE');
-  fatal('<!DOCTYPE\u0000', 'Expected space');
-  fatal('<!DOCTYPE \u0000', 'Malformed DOCTYPE');
-  fatal('<!DOCTYPE html\u0000>', 'Malformed DOCTYPE');
-  fatal('<!DOCTYPE html', 'Malformed DOCTYPE');
-
-  succeed('<!DOCTYPE html SYSTEM "about:legacy-compat">', {name: 'html', systemId: 'about:legacy-compat'});
-  succeed('<!doctype HTML system "about:legacy-compat">', {name: 'html', systemId: 'about:legacy-compat'});
-  succeed("<!DOCTYPE html SYSTEM 'about:legacy-compat'>", {name: 'html', systemId: 'about:legacy-compat'});
-  succeed("<!dOcTyPe HtMl sYsTeM 'about:legacy-compat'>", {name: 'html', systemId: 'about:legacy-compat'});
-  succeed('<!DOCTYPE  html\tSYSTEM\t"about:legacy-compat"   \t>', {name: 'html', systemId: 'about:legacy-compat'});
-  fatal('<!DOCTYPE html SYSTE "about:legacy-compat">', 'Expected PUBLIC or SYSTEM');
-  fatal('<!DOCTYPE html SYSTE', 'Expected PUBLIC or SYSTEM');
-  fatal('<!DOCTYPE html SYSTEM"about:legacy-compat">', 'Expected space');
-  fatal('<!DOCTYPE html SYSTEM');
-  fatal('<!DOCTYPE html SYSTEM ');
-  fatal('<!DOCTYPE html SYSTEM>');
-  fatal('<!DOCTYPE html SYSTEM >');
-  fatal('<!DOCTYPE html SYSTEM ">">');
-  fatal('<!DOCTYPE html SYSTEM "\u0000about:legacy-compat">');
-  fatal('<!DOCTYPE html SYSTEM "about:legacy-compat\u0000">');
-  fatal('<!DOCTYPE html SYSTEM "');
-  fatal('<!DOCTYPE html SYSTEM "">');
-  fatal('<!DOCTYPE html SYSTEM \'');
-  fatal('<!DOCTYPE html SYSTEM\'a\'>');
-  fatal('<!DOCTYPE html SYSTEM about:legacy-compat>');
-
-  succeed('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN'});
-  succeed('<!DOCTYPE html PUBLIC \'-//W3C//DTD HTML 4.0//EN\'>',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN'});
-  succeed('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN',
-            systemId: 'http://www.w3.org/TR/REC-html40/strict.dtd'});
-  succeed('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" \'http://www.w3.org/TR/REC-html40/strict.dtd\'>',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN',
-            systemId: 'http://www.w3.org/TR/REC-html40/strict.dtd'});
-  succeed('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' \'http://www.w3.org/TR/REC-html40/strict.dtd\'>',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN',
-            systemId: 'http://www.w3.org/TR/REC-html40/strict.dtd'});
-  succeed('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\'\t\'http://www.w3.org/TR/REC-html40/strict.dtd\'   >',
-          { name: 'html',
-            publicId: '-//W3C//DTD HTML 4.0//EN',
-            systemId: 'http://www.w3.org/TR/REC-html40/strict.dtd'});
-  fatal('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' \'http://www.w3.org/TR/REC-html40/strict.dtd\'');
-  fatal('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' \'http://www.w3.org/TR/REC-html40/strict.dtd\'');
-  fatal('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' \'http://www.w3.org/TR/REC-html40/strict.dtd');
-  fatal('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' \'');
-  fatal('<!DOCTYPE html public \'-//W3C//DTD HTML 4.0//EN\' ');
-  fatal('<!DOCTYPE html public \'- ');
-  fatal('<!DOCTYPE html public>');
-  fatal('<!DOCTYPE html public "-//W3C//DTD HTML 4.0//EN""http://www.w3.org/TR/REC-html40/strict.dtd">');
-});
-
-Tinytest.add("html-tools - tokenize", function (test) {
-
-  var fatal = function (input, messageContains) {
-    var error;
-    try {
-      tokenize(input);
-    } catch (e) {
-      error = e;
-    }
-    test.isTrue(error);
-    if (messageContains)
-      test.isTrue(error.message.indexOf(messageContains) >= 0, error.message);
-  };
-
-
-  test.equal(tokenize(''), []);
-  test.equal(tokenize('abc'), [{t: 'Chars', v: 'abc'}]);
-  test.equal(tokenize('&'), [{t: 'Chars', v: '&'}]);
-  test.equal(tokenize('&amp;'), [{t: 'CharRef', v: '&amp;', cp: [38]}]);
-  test.equal(tokenize('ok&#32;fine'),
-             [{t: 'Chars', v: 'ok'},
-              {t: 'CharRef', v: '&#32;', cp: [32]},
-              {t: 'Chars', v: 'fine'}]);
-
-  test.equal(tokenize('a<!--b-->c'),
-             [{t: 'Chars',
-               v: 'a'},
-              {t: 'Comment',
-               v: 'b'},
-              {t: 'Chars',
-               v: 'c'}]);
-
-  test.equal(tokenize('<a>'), [{t: 'Tag', n: 'a'}]);
-
-  fatal('<');
-  fatal('<x');
-  fatal('<x ');
-  fatal('<x a');
-  fatal('<x a ');
-  fatal('<x a =');
-  fatal('<x a = ');
-  fatal('<x a = b');
-  fatal('<x a = "b');
-  fatal('<x a = \'b');
-  fatal('<x a = b ');
-  fatal('<x a = b /');
-  test.equal(tokenize('<x a = b />'),
-             [{t: 'Tag', n: 'x',
-               attrs: { a: [{t: 'Chars', v: 'b'}] },
-               isSelfClosing: true}]);
-
-  test.equal(tokenize('<a>X</a>'),
-             [{t: 'Tag', n: 'a'},
-              {t: 'Chars', v: 'X'},
-              {t: 'Tag', n: 'a', isEnd: true}]);
-
-  fatal('<x a a>'); // duplicate attribute value
-  test.equal(tokenize('<a b  >'),
-             [{t: 'Tag', n: 'a', attrs: { b: [] }}]);
-  fatal('< a>');
-  fatal('< /a>');
-  fatal('</ a>');
-
-  // Slash does not end an unquoted attribute, interestingly
-  test.equal(tokenize('<a b=/>'),
-             [{t: 'Tag', n: 'a', attrs: { b: [{t: 'Chars', v: '/'}] }}]);
-
-  test.equal(tokenize('<a b="c" d=e f=\'g\' h \t>'),
-             [{t: 'Tag', n: 'a',
-               attrs: { b: [{t: 'Chars', v: 'c'}],
-                        d: [{t: 'Chars', v: 'e'}],
-                        f: [{t: 'Chars', v: 'g'}],
-                        h: [] }}]);
-
-  fatal('</a b="c" d=e f=\'g\' h \t\u0000>');
-  fatal('</a b="c" d=ef=\'g\' h \t>');
-  fatal('</a b="c"d=e f=\'g\' h \t>');
-
-  test.equal(tokenize('<a/>'), [{t: 'Tag', n: 'a', isSelfClosing: true}]);
-
-  fatal('<a/ >');
-  fatal('<a/b>');
-  fatal('<a b=c`>');
-  fatal('<a b=c<>');
-
-  test.equal(tokenize('<a# b0="c@" d1=e2 f#=\'g  \' h \t>'),
-             [{t: 'Tag', n: 'a#',
-               attrs: { b0: [{t: 'Chars', v: 'c@'}],
-                        d1: [{t: 'Chars', v: 'e2'}],
-                        'f#': [{t: 'Chars', v: 'g  '}],
-                        h: [] }}]);
-
-  test.equal(tokenize('<div class=""></div>'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [] }},
-              {t: 'Tag', n: 'div', isEnd: true}]);
-
-  test.equal(tokenize('<div class="&">'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [{t: 'Chars', v: '&'}] }}]);
-  test.equal(tokenize('<div class=&>'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [{t: 'Chars', v: '&'}] }}]);
-  test.equal(tokenize('<div class=&amp;>'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [{t: 'CharRef', v: '&amp;', cp: [38]}] }}]);
-
-  test.equal(tokenize('<div class=aa&&zopf;&acE;&bb>'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [
-               {t: 'Chars', v: 'aa&'},
-               {t: 'CharRef', v: '&zopf;', cp: [120171]},
-               {t: 'CharRef', v: '&acE;', cp: [8766, 819]},
-               {t: 'Chars', v: '&bb'}
-             ] }}]);
-
-  test.equal(tokenize('<div class="aa &&zopf;&acE;& bb">'),
-             [{t: 'Tag', n: 'div', attrs: { 'class': [
-               {t: 'Chars', v: 'aa &'},
-               {t: 'CharRef', v: '&zopf;', cp: [120171]},
-               {t: 'CharRef', v: '&acE;', cp: [8766, 819]},
-               {t: 'Chars', v: '& bb'}
-             ] }}]);
-
-  test.equal(tokenize('<a b="\'`<>&">'),
-             [{t: 'Tag', n: 'a', attrs: { b: [{t: 'Chars', v: '\'`<>&'}] }}]);
-  test.equal(tokenize('<a b=\'"`<>&\'>'),
-             [{t: 'Tag', n: 'a', attrs: { b: [{t: 'Chars', v: '"`<>&'}] }}]);
-
-  fatal('&gt');
-  fatal('&gtc');
-  test.equal(tokenize('<a b=&gtc>'),
-             [{t: 'Tag', n: 'a', attrs: { b: [{t: 'Chars', v: '&gtc' }] }}]);
-  test.equal(tokenize('<a b="&gtc">'),
-             [{t: 'Tag', n: 'a', attrs: { b: [{t: 'Chars', v: '&gtc' }] }}]);
-  fatal('<a b=&gt>');
-  fatal('<a b="&gt">');
-  fatal('<a b="&gt=">');
-
-  fatal('<!');
-  fatal('<!x>');
-
-  fatal('<a{{b}}>');
-  fatal('<{{a}}>');
-  fatal('</a b=c>'); // end tag can't have attributes
-  fatal('</a/>'); // end tag can't be self-closing
-  fatal('</a  />');
-});
diff --git a/packages/html-tools/utils.js b/packages/html-tools/utils.js
deleted file mode 100644
index 934bc09e02..0000000000
--- a/packages/html-tools/utils.js
+++ /dev/null
@@ -1,50 +0,0 @@
-
-HTMLTools = {};
-HTMLTools.Parse = {};
-
-var asciiLowerCase = HTMLTools.asciiLowerCase = function (str) {
-  return str.replace(/[A-Z]/g, function (c) {
-    return String.fromCharCode(c.charCodeAt(0) + 32);
-  });
-};
-
-var svgCamelCaseAttributes = 'attributeName attributeType baseFrequency baseProfile calcMode clipPathUnits contentScriptType contentStyleType diffuseConstant edgeMode externalResourcesRequired filterRes filterUnits glyphRef glyphRef gradientTransform gradientTransform gradientUnits gradientUnits kernelMatrix kernelUnitLength kernelUnitLength kernelUnitLength keyPoints keySplines keyTimes lengthAdjust limitingConeAngle markerHeight markerUnits markerWidth maskContentUnits maskUnits numOctaves pathLength patternContentUnits patternTransform patternUnits pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits refX refY repeatCount repeatDur requiredExtensions requiredFeatures specularConstant specularExponent specularExponent spreadMethod spreadMethod startOffset stdDeviation stitchTiles surfaceScale surfaceScale systemLanguage tableValues targetX targetY textLength textLength viewBox viewTarget xChannelSelector yChannelSelector zoomAndPan'.split(' ');
-
-var properAttributeCaseMap = (function (map) {
-  for (var i = 0; i < svgCamelCaseAttributes.length; i++) {
-    var a = svgCamelCaseAttributes[i];
-    map[asciiLowerCase(a)] = a;
-  }
-  return map;
-})({});
-
-var properTagCaseMap = (function (map) {
-  var knownElements = HTML.knownElementNames;
-  for (var i = 0; i < knownElements.length; i++) {
-    var a = knownElements[i];
-    map[asciiLowerCase(a)] = a;
-  }
-  return map;
-})({});
-
-// Take a tag name in any case and make it the proper case for HTML.
-//
-// Modern browsers let you embed SVG in HTML, but SVG elements are special
-// in that they have a case-sensitive DOM API (nodeName, getAttribute,
-// setAttribute).  For example, it has to be `setAttribute("viewBox")`,
-// not `"viewbox"`.  However, the browser's HTML parser is NOT case sensitive
-// and will fix the case for you, so if you write `<svg viewbox="...">`
-// you actually get a `"viewBox"` attribute.  Any HTML-parsing toolchain
-// must do the same.
-HTMLTools.properCaseTagName = function (name) {
-  var lowered = asciiLowerCase(name);
-  return properTagCaseMap.hasOwnProperty(lowered) ?
-    properTagCaseMap[lowered] : lowered;
-};
-
-// See docs for properCaseTagName.
-HTMLTools.properCaseAttributeName = function (name) {
-  var lowered = asciiLowerCase(name);
-  return properAttributeCaseMap.hasOwnProperty(lowered) ?
-    properAttributeCaseMap[lowered] : lowered;
-};
diff --git a/packages/htmljs/.gitignore b/packages/htmljs/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/htmljs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/htmljs/README.md b/packages/htmljs/README.md
deleted file mode 100644
index d2b06c4b00..0000000000
--- a/packages/htmljs/README.md
+++ /dev/null
@@ -1,427 +0,0 @@
-# HTMLjs
-
-HTMLjs is a small library for expressing HTML trees with a concise
-syntax.  It is used to render content in Blaze and to represent
-templates during compilation.
-
-```
-var UL = HTML.UL, LI = HTML.LI, B = HTML.B;
-
-HTML.toHTML(
-  UL({id: 'mylist'},
-     LI({'class': 'item'}, "Hello ", B("world"), "!"),
-     LI({'class': 'item'}, "Goodbye, world")))
-```
-
-```
-<ul id="mylist">
-  <li class="item">Hello <b>world</b>!</li>
-  <li class="item">Goodbye, world</li>
-</ul>
-```
-
-The functions `UL`, `LI`, and `B` are constructors which
-return instances of `HTML.Tag`.  These tag objects can
-then be converted to an HTML string or directly into DOM nodes.
-
-The flexible structure of HTMLjs allows different kinds of Blaze
-directives to be embedded in the tree.  HTMLjs does not know about
-these directives, which are considered "foreign objects."
-
-# Built-in Types
-
-The following types are built into HTMLjs.  Built-in methods like
-`HTML.toHTML` require a tree consisting only of these types.
-
-* __`null`, `undefined`__ - Render to nothing.
-
-* __boolean, number__ - Render to the string form of the boolean or number.
-
-* __string__ - Renders to a text node (or part of an attribute value).  All characters are safe, and no HTML injection is possible.  The string `"<a>"` renders `&lt;a>` in HTML, and `document.createTextNode("<a>")` in DOM.
-
-* __Array__ - Renders to its elements in order.  An array may be empty.  Arrays are detected using `HTML.isArray(...)`.
-
-* __`HTML.Tag`__ - Renders to an HTML element (including start tag, contents, and end tag).
-
-* __`HTML.CharRef({html: ..., str: ...})`__ - Renders to a character reference (such as `&nbsp`) when generating HTML.
-
-* __`HTML.Comment(text)`__ - Renders to an HTML comment.
-
-* __`HTML.Raw(html)`__ - Renders to a string of HTML to include verbatim.
-
-The `new` keyword is not required before constructors of HTML object types.
-
-All objects and arrays should be considered immutable.  Instance properties
-are public, but they should only be read, not written.  Arrays should not
-be spliced in place.  This convention allows for clean patterns of
-processing and transforming HTMLjs trees.
-
-
-## HTML.Tag
-
-An `HTML.Tag` is created using a tag-specific constructor, like
-`HTML.P` for a `<p>` tag or `HTML.INPUT` for an `<input>` tag.  The
-resulting object is `instanceof HTML.Tag`.  (The `HTML.Tag`
-constructor should not be called directly.)
-
-Tag constructors take an optional attributes dictionary followed
-by zero or more children:
-
-```
-HTML.HR()
-
-HTML.DIV(HTML.P("First paragraph"),
-         HTML.P("Second paragraph"))
-
-HTML.INPUT({type: "text"})
-
-HTML.SPAN({'class': "foo"}, "Some text")
-```
-
-### Instance properties
-
-Tags have the following properties:
-
-* `tagName` - The tag name in lowercase (or camelCase)
-* `children` - An array of children (always present)
-* `attrs` - An attributes dictionary, `null`, or an array (see below)
-
-
-### Special forms of attributes
-
-The attributes of a Tag may be an array of dictionaries.  In order
-for a tag constructor to recognize an array as the attributes argument,
-it must be written as `HTML.Attrs(attrs1, attrs2, ...)`, as in this
-example:
-
-```
-var extraAttrs = {'class': "container"};
-
-var div = HTML.DIV(HTML.Attrs({id: "main"}, extraAttrs),
-                   "This is the content.");
-
-div.attrs // => [{id: "main"}, {'class': "container"}]
-```
-
-`HTML.Attrs` may also be used to pass a foreign object in place of
-an attributes dictionary of a tag.
-
-
-
-### Normalized Case for Tag Names
-
-The `tagName` field is always in "normalized case," which is the
-official case for that particular element name (usually lowercase).
-For example, `HTML.DIV().tagName` is `"div"`.  For some elements
-used in inline SVG graphics, the correct case is "camelCase."  For
-example, there is an element named `clipPath`.
-
-Web browsers have a confusing policy about case.  They perform case
-normalization when parsing HTML, but not when creating SVG elements
-at runtime; the correct case is required.
-
-Therefore, in order to avoid ever having to normalize case at
-runtime, the policy of HTMLjs is to put the burden on the caller
-of functions like `HTML.ensureTag` -- for example, a template
-engine -- of supplying correct normalized case.
-
-Briefly put, normlized case is usually lowercase, except for certain
-elements where it is camelCase.
-
-
-### Known Elements
-
-HTMLjs comes preloaded with constructors for all "known" HTML and
-SVG elements.  You can use `HTML.P`, `HTML.DIV`, and so on out of
-the box.  If you want to create a tag like `<foo>` for some reason,
-you have to tell HTMLjs to create the `HTML.FOO` constructor for you
-using `HTML.ensureTag` or `HTML.getTag`.
-
-HTMLjs's lists of known elements are public because they are useful to
-other packages that provide additional functions not found here, like
-functions for normalizing case.
-
-
-
-## Foreign objects
-
-Arbitrary objects are allowed in HTMLjs trees, which is useful for
-adapting HTMLjs to a wide variety of uses.  Such objects are called
-foreign objects.
-
-The one restriction on foreign objects is that they must be
-instances of a class -- so-called "constructed objects" (see
-`HTML.isConstructedObject`) -- so that they can be distinguished
-from the vanilla JS objects that represent attributes dictionaries
-when constructing Tags.
-
-Functions are also considered foreign objects.
-
-## HTML.getTag(tagName)
-
-* `tagName` - A string in normalized case
-
-Creates a tag constructor for `tagName`, assigns it to the `HTML`
-namespace object, and returns it.
-
-For example, `HTML.getTag("p")` returns `HTML.P`.  `HTML.getTag("foo")`
-will create and return `HTML.FOO`.
-
-It's very important that `tagName` be in normalized case, or else
-an incorrect tag constructor will be registered and used henceforth.
-
-
-## HTML.ensureTag(tagName)
-
-* `tagName` - A string in normalized case
-
-Ensures that a tag constructor (like `HTML.FOO`) exists for a tag
-name (like `"foo"`), creating it if necessary.  Like `HTML.getTag`
-but does not return the tag constructor.
-
-
-## HTML.isTagEnsured(tagName)
-
-* `tagName` - A string in normalized case
-
-Returns whether a particular tag is guaranteed to be available on
-the `HTML` object (under the name returned by `HTML.getSymbolName`).
-
-Useful for code generators.
-
-
-## HTML.getSymbolName(tagName)
-
-* `tagName` - A string in normalized case
-
-Returns the name of the all-caps constructor (like `"FOO"`) for a
-tag name in normalized case (like `"foo"`).
-
-In addition to converting `tagName` to all-caps, hyphens (`-`) in
-tag names are converted to underscores (`_`).
-
-Useful for code generators.
-
-
-## HTML.knownElementNames
-
-An array of all known HTML5 and SVG element names in normalized case.
-
-
-## HTML.knownSVGElementNames
-
-An array of all known SVG element names in normalized case.
-
-The `"a"` element is not included because it is primarily a non-SVG
-element.
-
-
-## HTML.voidElementNames
-
-An array of all "void" element names in normalized case.  Void
-elements are elements with a start tag and no end tag, such as BR,
-HR, IMG, and INPUT.
-
-The HTML spec defines a closed class of void elements.
-
-
-## HTML.isKnownElement(tagName)
-
-* `tagName` - A string in normalized case
-
-Returns whether `tagName` is a known HTML5 or SVG element.
-
-
-## HTML.isKnownSVGElement(tagName)
-
-* `tagName` - A string in normalized case
-
-Returns whether `tagName` is the name of a known SVG element.
-
-
-## HTML.isVoidElement(tagName)
-
-* `tagName` - A string in normalized case
-
-Returns whether `tagName` is the name of a void element.
-
-
-## HTML.CharRef({html: ..., str: ...})
-
-Represents a character reference like `&nbsp;`.
-
-A CharRef is not required for escaping special characters like `<`,
-which are automatically escaped by HTMLjs.  For example,
-`HTML.toHTML("<")` is `"&lt;"`.  Also, now that browsers speak
-Unicode, non-ASCII characters typically do not need to be expressed
-as character references either.  The purpose of `CharRef` is offer
-control over the generated HTML, allowing template engines to
-preserve any character references that they come across.
-
-Constructing a CharRef requires two strings, the uninterpreted
-"HTML" form and the interpreted "string" form.  Both are required
-to be present, and it is up to the caller to make sure the
-information is accurate.
-
-Examples of valid CharRefs:
-
-* `HTML.CharRef({html: '&amp;', str: '&'})`
-* `HTML.CharRef({html: '&nbsp;', str: '\u00A0'})
-
-Instance properties: `.html`, `.str`
-
-
-## HTML.Comment(value)
-
-* `value` - String
-
-Represents an HTML Comment.  For example, `HTML.Comment("foo")` represents
-the comment `<!--foo-->`.
-
-The value string should not contain two consecutive hyphens (`--`) or start
-or end with a hyphen.  If it does, the offending hyphens will be stripped
-before generating HTML.
-
-Instance properties: `value`
-
-
-## HTML.Raw(value)
-
-* `value` - String
-
-Represents HTML code to be inserted verbatim.  `value` must consist
-of a valid, complete fragment of HTML, with all tags closed and
-all required end tags present.
-
-No security checks are performed, and no special characters are
-escaped.  `Raw` should not be used if there are other ways of
-accomplishing the same result.  HTML supplied by an application
-user should not be rendered unless the user is trusted, and even
-then, there could be strange results if required end tags are
-missing.
-
-Instance properties: `value`
-
-
-## HTML.isArray(x)
-
-Returns whether `x` is considered an array for the purposes of
-HTMLjs.  An array is an object created using `[...]` or
-`new Array`.
-
-This function is provided because there are several common ways to
-determine whether an object should be treated as an array in
-JavaScript.
-
-
-## HTML.isConstructedObject(x)
-
-Returns whether `x` is a "constructed object," which is (loosely
-speaking) an object that was created with `new Foo` (for some `Foo`)
-rather than with `{...}` (a vanilla object).  Vanilla objects are used
-as attribute dictionaries when constructing tags, while constructed
-objects are used as children.
-
-For example, in `HTML.DIV({id:"foo"})`, `{id:"foo"}` is a vanilla
-object.  In `HTML.DIV(HTML.SPAN("text"))`, the `HTML.SPAN` is a
-constructed object.
-
-A simple constructed object can be created as follows:
-
-```
-var Foo = function () {};
-var x = new Foo; // x is a constructed object
-```
-
-In particular, the test is that `x` is an object and `x.constructor`
-is set, but on a prototype of the object, not the object itself.
-The above example works because JavaScript sets
-`Foo.prototype.constructor = Foo` when you create a function `Foo`.
-
-
-## HTML.isNully(content)
-
-Returns true if `content` is `null`, `undefined`, an empty array,
-or an array of only "nully" elements.
-
-
-## HTML.isValidAttributeName(name)
-
-Returns whether `name` is a valid name for an attribute of an HTML tag
-or element.  `name` must:
-
-* Start with `:`, `_`, `A-Z` or `a-z`
-* Consist only of those characters plus `-`, `.`, and `0-9`.
-
-Discussion: The HTML spec and the DOM API (`setAttribute`) have different
-definitions of what characters are legal in an attribute.  The HTML
-parser is extremely permissive (allowing, for example, `<a %=%>`), while
-`setAttribute` seems to use something like the XML grammar for names (and
-throws an error if a name is invalid, making that attribute unsettable).
-If we knew exactly what grammar browsers used for `setAttribute`, we could
-include various Unicode ranges in what's legal.  For now, we allow ASCII chars
-that are known to be valid XML, valid HTML, and settable via `setAttribute`.
-
-See <http://www.w3.org/TR/REC-xml/#NT-Name> and
-<http://dev.w3.org/html5/markup/syntax.html#syntax-attributes>.
-
-
-## HTML.flattenAttributes(attrs)
-
-If `attrs` is an array, the attribute dictionaries in the array are
-combined into a single attributes dictionary, which is returned.
-Any "nully" attribute values (see `HTML.isNully`) are ignored in
-the process.  If `attrs` is a single attribute dictionary, a copy
-is returned with any nully attributes removed.  If `attrs` is
-equal to null or an empty array, `null` is returned.
-
-Attribute dictionaries are combined by assigning the name/value
-pairs in array order, with later values overwriting previous
-values.
-
-`attrs` must not contain any foreign objects.
-
-
-## HTML.toHTML(content)
-
-* `content` - any HTMLjs content
-
-Returns a string of HTML generated from `content`.
-
-For example:
-
-```
-HTML.toHTML(HTML.HR()) // => "<hr>"
-```
-
-Foreign objects are not allowed in `content`.  To generate HTML
-containing foreign objects, create a subclass of
-`HTML.ToHTMLVisitor` and override `visitObject`.
-
-
-## HTML.toText(content, textMode)
-
-* `content` - any HTMLjs content
-* `textMode` - the type of text to generate; one of
-  `HTML.TEXTMODE.STRING`, `HTML.TEXTMODE.RCDATA`, or
-  `HTML.TEXTMODE.ATTRIBUTE`
-
-Generating HTML or DOM from HTMLjs content requires generating text
-for attribute values and for the contents of TEXTAREA elements,
-among others.  The input content may contain strings, arrays,
-booleans, numbers, nulls, and CharRefs.  Behavior on other types
-is undefined.
-
-The required `textMode` argument specifies the type of text to
-generate:
-
-* `HTML.TEXTMODE.STRING` - a string with no special
-  escaping or encoding performed, suitable for passing to
-  `setAttribute` or `document.createTextNode`.
-* `HTML.TEXTMODE.RCDATA` - a string with `<` and `&` encoded
-  as character references (and CharRefs included in their
-  "HTML" form), suitable for including in a string of HTML
-* `HTML.TEXTMODE.ATTRIBUTE` - a string with `"` and `&` encoded
-  as character references (and CharRefs included in their
-  "HTML" form), suitable for including in an HTML attribute
-  value surrounded by double quotes
diff --git a/packages/htmljs/html.js b/packages/htmljs/html.js
deleted file mode 100644
index ce758772dc..0000000000
--- a/packages/htmljs/html.js
+++ /dev/null
@@ -1,268 +0,0 @@
-
-
-HTML.Tag = function () {};
-HTML.Tag.prototype.tagName = ''; // this will be set per Tag subclass
-HTML.Tag.prototype.attrs = null;
-HTML.Tag.prototype.children = Object.freeze ? Object.freeze([]) : [];
-HTML.Tag.prototype.htmljsType = HTML.Tag.htmljsType = ['Tag'];
-
-// Given "p" create the function `HTML.P`.
-var makeTagConstructor = function (tagName) {
-  // HTMLTag is the per-tagName constructor of a HTML.Tag subclass
-  var HTMLTag = function (/*arguments*/) {
-    // Work with or without `new`.  If not called with `new`,
-    // perform instantiation by recursively calling this constructor.
-    // We can't pass varargs, so pass no args.
-    var instance = (this instanceof HTML.Tag) ? this : new HTMLTag;
-
-    var i = 0;
-    var attrs = arguments.length && arguments[0];
-    if (attrs && (typeof attrs === 'object')) {
-      // Treat vanilla JS object as an attributes dictionary.
-      if (! HTML.isConstructedObject(attrs)) {
-        instance.attrs = attrs;
-        i++;
-      } else if (attrs instanceof HTML.Attrs) {
-        var array = attrs.value;
-        if (array.length === 1) {
-          instance.attrs = array[0];
-        } else if (array.length > 1) {
-          instance.attrs = array;
-        }
-        i++;
-      }
-    }
-
-
-    // If no children, don't create an array at all, use the prototype's
-    // (frozen, empty) array.  This way we don't create an empty array
-    // every time someone creates a tag without `new` and this constructor
-    // calls itself with no arguments (above).
-    if (i < arguments.length)
-      instance.children = SLICE.call(arguments, i);
-
-    return instance;
-  };
-  HTMLTag.prototype = new HTML.Tag;
-  HTMLTag.prototype.constructor = HTMLTag;
-  HTMLTag.prototype.tagName = tagName;
-
-  return HTMLTag;
-};
-
-// Not an HTMLjs node, but a wrapper to pass multiple attrs dictionaries
-// to a tag (for the purpose of implementing dynamic attributes).
-var Attrs = HTML.Attrs = function (/*attrs dictionaries*/) {
-  // Work with or without `new`.  If not called with `new`,
-  // perform instantiation by recursively calling this constructor.
-  // We can't pass varargs, so pass no args.
-  var instance = (this instanceof Attrs) ? this : new Attrs;
-
-  instance.value = SLICE.call(arguments);
-
-  return instance;
-};
-
-////////////////////////////// KNOWN ELEMENTS
-
-HTML.getTag = function (tagName) {
-  var symbolName = HTML.getSymbolName(tagName);
-  if (symbolName === tagName) // all-caps tagName
-    throw new Error("Use the lowercase or camelCase form of '" + tagName + "' here");
-
-  if (! HTML[symbolName])
-    HTML[symbolName] = makeTagConstructor(tagName);
-
-  return HTML[symbolName];
-};
-
-HTML.ensureTag = function (tagName) {
-  HTML.getTag(tagName); // don't return it
-};
-
-HTML.isTagEnsured = function (tagName) {
-  return HTML.isKnownElement(tagName);
-};
-
-HTML.getSymbolName = function (tagName) {
-  // "foo-bar" -> "FOO_BAR"
-  return tagName.toUpperCase().replace(/-/g, '_');
-};
-
-HTML.knownElementNames = 'a abbr acronym address applet area article aside audio b base basefont bdi bdo big blockquote body br button canvas caption center cite code col colgroup command data datagrid datalist dd del details dfn dir div dl dt em embed eventsource fieldset figcaption figure font footer form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins isindex kbd keygen label legend li link main map mark menu meta meter nav noframes noscript object ol optgroup option output p param pre progress q rp rt ruby s samp script section select small source span strike strong style sub summary sup table tbody td textarea tfoot th thead time title tr track tt u ul var video wbr'.split(' ');
-// (we add the SVG ones below)
-
-HTML.knownSVGElementNames = 'altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion animateTransform circle clipPath color-profile cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter font font-face font-face-format font-face-name font-face-src font-face-uri foreignObject g glyph glyphRef hkern image line linearGradient marker mask metadata missing-glyph path pattern polygon polyline radialGradient rect set stop style svg switch symbol text textPath title tref tspan use view vkern'.split(' ');
-// Append SVG element names to list of known element names
-HTML.knownElementNames = HTML.knownElementNames.concat(HTML.knownSVGElementNames);
-
-HTML.voidElementNames = 'area base br col command embed hr img input keygen link meta param source track wbr'.split(' ');
-
-// Speed up search through lists of known elements by creating internal "sets"
-// of strings.
-var YES = {yes:true};
-var makeSet = function (array) {
-  var set = {};
-  for (var i = 0; i < array.length; i++)
-    set[array[i]] = YES;
-  return set;
-};
-var voidElementSet = makeSet(HTML.voidElementNames);
-var knownElementSet = makeSet(HTML.knownElementNames);
-var knownSVGElementSet = makeSet(HTML.knownSVGElementNames);
-
-HTML.isKnownElement = function (tagName) {
-  return knownElementSet[tagName] === YES;
-};
-
-HTML.isKnownSVGElement = function (tagName) {
-  return knownSVGElementSet[tagName] === YES;
-};
-
-HTML.isVoidElement = function (tagName) {
-  return voidElementSet[tagName] === YES;
-};
-
-
-// Ensure tags for all known elements
-for (var i = 0; i < HTML.knownElementNames.length; i++)
-  HTML.ensureTag(HTML.knownElementNames[i]);
-
-
-var CharRef = HTML.CharRef = function (attrs) {
-  if (! (this instanceof CharRef))
-    // called without `new`
-    return new CharRef(attrs);
-
-  if (! (attrs && attrs.html && attrs.str))
-    throw new Error(
-      "HTML.CharRef must be constructed with ({html:..., str:...})");
-
-  this.html = attrs.html;
-  this.str = attrs.str;
-};
-CharRef.prototype.htmljsType = CharRef.htmljsType = ['CharRef'];
-
-var Comment = HTML.Comment = function (value) {
-  if (! (this instanceof Comment))
-    // called without `new`
-    return new Comment(value);
-
-  if (typeof value !== 'string')
-    throw new Error('HTML.Comment must be constructed with a string');
-
-  this.value = value;
-  // Kill illegal hyphens in comment value (no way to escape them in HTML)
-  this.sanitizedValue = value.replace(/^-|--+|-$/g, '');
-};
-Comment.prototype.htmljsType = Comment.htmljsType = ['Comment'];
-
-var Raw = HTML.Raw = function (value) {
-  if (! (this instanceof Raw))
-    // called without `new`
-    return new Raw(value);
-
-  if (typeof value !== 'string')
-    throw new Error('HTML.Raw must be constructed with a string');
-
-  this.value = value;
-};
-Raw.prototype.htmljsType = Raw.htmljsType = ['Raw'];
-
-
-HTML.isArray = function (x) {
-  // could change this to use the more convoluted Object.prototype.toString
-  // approach that works when objects are passed between frames, but does
-  // it matter?
-  return (x instanceof Array);
-};
-
-HTML.isConstructedObject = function (x) {
-  // Figure out if `x` is "an instance of some class" or just a plain
-  // object literal.  It correctly treats an object literal like
-  // `{ constructor: ... }` as an object literal.  It won't detect
-  // instances of classes that lack a `constructor` property (e.g.
-  // if you assign to a prototype when setting up the class as in:
-  // `Foo = function () { ... }; Foo.prototype = { ... }`, then
-  // `(new Foo).constructor` is `Object`, not `Foo`).
-  return (x && (typeof x === 'object') &&
-          (x.constructor !== Object) &&
-          (typeof x.constructor === 'function') &&
-          (x instanceof x.constructor));
-};
-
-HTML.isNully = function (node) {
-  if (node == null)
-    // null or undefined
-    return true;
-
-  if (HTML.isArray(node)) {
-    // is it an empty array or an array of all nully items?
-    for (var i = 0; i < node.length; i++)
-      if (! HTML.isNully(node[i]))
-        return false;
-    return true;
-  }
-
-  return false;
-};
-
-HTML.isValidAttributeName = function (name) {
-  return /^[:_A-Za-z][:_A-Za-z0-9.\-]*/.test(name);
-};
-
-// If `attrs` is an array of attributes dictionaries, combines them
-// into one.  Removes attributes that are "nully."
-HTML.flattenAttributes = function (attrs) {
-  if (! attrs)
-    return attrs;
-
-  var isArray = HTML.isArray(attrs);
-  if (isArray && attrs.length === 0)
-    return null;
-
-  var result = {};
-  for (var i = 0, N = (isArray ? attrs.length : 1); i < N; i++) {
-    var oneAttrs = (isArray ? attrs[i] : attrs);
-    if ((typeof oneAttrs !== 'object') ||
-        HTML.isConstructedObject(oneAttrs))
-      throw new Error("Expected plain JS object as attrs, found: " + oneAttrs);
-    for (var name in oneAttrs) {
-      if (! HTML.isValidAttributeName(name))
-        throw new Error("Illegal HTML attribute name: " + name);
-      var value = oneAttrs[name];
-      if (! HTML.isNully(value))
-        result[name] = value;
-    }
-  }
-
-  return result;
-};
-
-
-
-////////////////////////////// TOHTML
-
-HTML.toHTML = function (content) {
-  return (new HTML.ToHTMLVisitor).visit(content);
-};
-
-// Escaping modes for outputting text when generating HTML.
-HTML.TEXTMODE = {
-  STRING: 1,
-  RCDATA: 2,
-  ATTRIBUTE: 3
-};
-
-
-HTML.toText = function (content, textMode) {
-  if (! textMode)
-    throw new Error("textMode required for HTML.toText");
-  if (! (textMode === HTML.TEXTMODE.STRING ||
-         textMode === HTML.TEXTMODE.RCDATA ||
-         textMode === HTML.TEXTMODE.ATTRIBUTE))
-    throw new Error("Unknown textMode: " + textMode);
-
-  var visitor = new HTML.ToTextVisitor({textMode: textMode});;
-  return visitor.visit(content);
-};
diff --git a/packages/htmljs/htmljs_test.js b/packages/htmljs/htmljs_test.js
deleted file mode 100644
index c0ef819fa8..0000000000
--- a/packages/htmljs/htmljs_test.js
+++ /dev/null
@@ -1,87 +0,0 @@
-
-Tinytest.add("htmljs - getTag", function (test) {
-  var FOO = HTML.getTag('foo');
-  test.isTrue(HTML.FOO === FOO);
-  var x = FOO();
-
-  test.equal(x.tagName, 'foo');
-  test.isTrue(x instanceof HTML.FOO);
-  test.isTrue(x instanceof HTML.Tag);
-  test.equal(x.children, []);
-  test.equal(x.attrs, null);
-
-  test.isTrue((new FOO) instanceof HTML.FOO);
-  test.isTrue((new FOO) instanceof HTML.Tag);
-  test.isFalse((new HTML.P) instanceof HTML.FOO);
-
-  var result = HTML.ensureTag('Bar');
-  test.equal(typeof result, 'undefined');
-  var BAR = HTML.BAR;
-  test.equal(BAR().tagName, 'Bar');
-});
-
-Tinytest.add("htmljs - construction", function (test) {
-  var A = HTML.getTag('a');
-  var B = HTML.getTag('b');
-  var C = HTML.getTag('c');
-
-  var a = A(0, B({q:0}, C(A(B({})), 'foo')));
-  test.equal(a.tagName, 'a');
-  test.equal(a.attrs, null);
-  test.equal(a.children.length, 2);
-  test.equal(a.children[0], 0);
-  var b = a.children[1];
-  test.equal(b.tagName, 'b');
-  test.equal(b.attrs, {q:0});
-  test.equal(b.children.length, 1);
-  var c = b.children[0];
-  test.equal(c.tagName, 'c');
-  test.equal(c.attrs, null);
-  test.equal(c.children.length, 2);
-  test.equal(c.children[0].tagName, 'a');
-  test.equal(c.children[0].attrs, null);
-  test.equal(c.children[0].children.length, 1);
-  test.equal(c.children[0].children[0].tagName, 'b');
-  test.equal(c.children[0].children[0].children.length, 0);
-  test.equal(c.children[0].children[0].attrs, {});
-  test.equal(c.children[1], 'foo');
-
-  var a2 = new A({m:1}, {n:2}, B(), {o:3}, 'foo');
-  test.equal(a2.tagName, 'a');
-  test.equal(a2.attrs, {m:1});
-  test.equal(a2.children.length, 4);
-  test.equal(a2.children[0], {n:2});
-  test.equal(a2.children[1].tagName, 'b');
-  test.equal(a2.children[2], {o:3});
-  test.equal(a2.children[3], 'foo');
-
-  // tests of HTML.isConstructedObject (indirectly)
-  test.equal(A({x:1}).children.length, 0);
-  var f = function () {};
-  test.equal(A(new f).children.length, 1);
-  test.equal(A(new Date).children.length, 1);
-  test.equal(A({constructor: 'blah'}).children.length, 0);
-  test.equal(A({constructor: Object}).children.length, 0);
-
-  test.equal(HTML.toHTML(HTML.CharRef({html: '&amp;', str: '&'})), '&amp;');
-  test.throws(function () {
-    HTML.CharRef({html: '&amp;'}); // no 'str'
-  });
-});
-
-Tinytest.add("htmljs - utils", function (test) {
-
-  test.notEqual("\u00c9".toLowerCase(), "\u00c9");
-  test.equal(HTMLTools.asciiLowerCase("\u00c9"), "\u00c9");
-
-  test.equal(HTMLTools.asciiLowerCase("Hello There"), "hello there");
-
-  test.isTrue(HTML.isVoidElement("br"));
-  test.isFalse(HTML.isVoidElement("div"));
-  test.isTrue(HTML.isKnownElement("div"));
-
-});
-
-Tinytest.add("htmljs - details", function (test) {
-  test.equal(HTML.toHTML(false), "false");
-});
diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js
deleted file mode 100644
index 4e04ef077d..0000000000
--- a/packages/htmljs/package.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Package.describe({
-  summary: "Small library for expressing HTML trees",
-  version: '1.0.10'
-});
-
-Package.onUse(function (api) {
-  api.use('deps');
-  api.export('HTML');
-
-  api.addFiles(['preamble.js',
-                 'visitors.js',
-                 'html.js']);
-});
-
-Package.onTest(function (api) {
-  api.use('htmljs');
-  api.use('html-tools');
-  api.use('tinytest');
-  api.use('underscore');
-  api.addFiles(['htmljs_test.js']);
-});
diff --git a/packages/htmljs/preamble.js b/packages/htmljs/preamble.js
deleted file mode 100644
index 160e038041..0000000000
--- a/packages/htmljs/preamble.js
+++ /dev/null
@@ -1,4 +0,0 @@
-HTML = {};
-
-IDENTITY = function (x) { return x; };
-SLICE = Array.prototype.slice;
diff --git a/packages/htmljs/visitors.js b/packages/htmljs/visitors.js
deleted file mode 100644
index 15160e759a..0000000000
--- a/packages/htmljs/visitors.js
+++ /dev/null
@@ -1,331 +0,0 @@
-////////////////////////////// VISITORS
-
-// _assign is like _.extend or the upcoming Object.assign.
-// Copy src's own, enumerable properties onto tgt and return
-// tgt.
-var _hasOwnProperty = Object.prototype.hasOwnProperty;
-var _assign = function (tgt, src) {
-  for (var k in src) {
-    if (_hasOwnProperty.call(src, k))
-      tgt[k] = src[k];
-  }
-  return tgt;
-};
-
-HTML.Visitor = function (props) {
-  _assign(this, props);
-};
-
-HTML.Visitor.def = function (options) {
-  _assign(this.prototype, options);
-};
-
-HTML.Visitor.extend = function (options) {
-  var curType = this;
-  var subType = function HTMLVisitorSubtype(/*arguments*/) {
-    HTML.Visitor.apply(this, arguments);
-  };
-  subType.prototype = new curType;
-  subType.extend = curType.extend;
-  subType.def = curType.def;
-  if (options)
-    _assign(subType.prototype, options);
-  return subType;
-};
-
-HTML.Visitor.def({
-  visit: function (content/*, ...*/) {
-    if (content == null)
-      // null or undefined.
-      return this.visitNull.apply(this, arguments);
-
-    if (typeof content === 'object') {
-      if (content.htmljsType) {
-        switch (content.htmljsType) {
-        case HTML.Tag.htmljsType:
-          return this.visitTag.apply(this, arguments);
-        case HTML.CharRef.htmljsType:
-          return this.visitCharRef.apply(this, arguments);
-        case HTML.Comment.htmljsType:
-          return this.visitComment.apply(this, arguments);
-        case HTML.Raw.htmljsType:
-          return this.visitRaw.apply(this, arguments);
-        default:
-          throw new Error("Unknown htmljs type: " + content.htmljsType);
-        }
-      }
-
-      if (HTML.isArray(content))
-        return this.visitArray.apply(this, arguments);
-
-      return this.visitObject.apply(this, arguments);
-
-    } else if ((typeof content === 'string') ||
-               (typeof content === 'boolean') ||
-               (typeof content === 'number')) {
-      return this.visitPrimitive.apply(this, arguments);
-
-    } else if (typeof content === 'function') {
-      return this.visitFunction.apply(this, arguments);
-    }
-
-    throw new Error("Unexpected object in htmljs: " + content);
-
-  },
-  visitNull: function (nullOrUndefined/*, ...*/) {},
-  visitPrimitive: function (stringBooleanOrNumber/*, ...*/) {},
-  visitArray: function (array/*, ...*/) {},
-  visitComment: function (comment/*, ...*/) {},
-  visitCharRef: function (charRef/*, ...*/) {},
-  visitRaw: function (raw/*, ...*/) {},
-  visitTag: function (tag/*, ...*/) {},
-  visitObject: function (obj/*, ...*/) {
-    throw new Error("Unexpected object in htmljs: " + obj);
-  },
-  visitFunction: function (fn/*, ...*/) {
-    throw new Error("Unexpected function in htmljs: " + fn);
-  }
-});
-
-HTML.TransformingVisitor = HTML.Visitor.extend();
-HTML.TransformingVisitor.def({
-  visitNull: IDENTITY,
-  visitPrimitive: IDENTITY,
-  visitArray: function (array/*, ...*/) {
-    var argsCopy = SLICE.call(arguments);
-    var result = array;
-    for (var i = 0; i < array.length; i++) {
-      var oldItem = array[i];
-      argsCopy[0] = oldItem;
-      var newItem = this.visit.apply(this, argsCopy);
-      if (newItem !== oldItem) {
-        // copy `array` on write
-        if (result === array)
-          result = array.slice();
-        result[i] = newItem;
-      }
-    }
-    return result;
-  },
-  visitComment: IDENTITY,
-  visitCharRef: IDENTITY,
-  visitRaw: IDENTITY,
-  visitObject: IDENTITY,
-  visitFunction: IDENTITY,
-  visitTag: function (tag/*, ...*/) {
-    var oldChildren = tag.children;
-    var argsCopy = SLICE.call(arguments);
-    argsCopy[0] = oldChildren;
-    var newChildren = this.visitChildren.apply(this, argsCopy);
-
-    var oldAttrs = tag.attrs;
-    argsCopy[0] = oldAttrs;
-    var newAttrs = this.visitAttributes.apply(this, argsCopy);
-
-    if (newAttrs === oldAttrs && newChildren === oldChildren)
-      return tag;
-
-    var newTag = HTML.getTag(tag.tagName).apply(null, newChildren);
-    newTag.attrs = newAttrs;
-    return newTag;
-  },
-  visitChildren: function (children/*, ...*/) {
-    return this.visitArray.apply(this, arguments);
-  },
-  // Transform the `.attrs` property of a tag, which may be a dictionary,
-  // an array, or in some uses, a foreign object (such as
-  // a template tag).
-  visitAttributes: function (attrs/*, ...*/) {
-    if (HTML.isArray(attrs)) {
-      var argsCopy = SLICE.call(arguments);
-      var result = attrs;
-      for (var i = 0; i < attrs.length; i++) {
-        var oldItem = attrs[i];
-        argsCopy[0] = oldItem;
-        var newItem = this.visitAttributes.apply(this, argsCopy);
-        if (newItem !== oldItem) {
-          // copy on write
-          if (result === attrs)
-            result = attrs.slice();
-          result[i] = newItem;
-        }
-      }
-      return result;
-    }
-
-    if (attrs && HTML.isConstructedObject(attrs)) {
-      throw new Error("The basic HTML.TransformingVisitor does not support " +
-                      "foreign objects in attributes.  Define a custom " +
-                      "visitAttributes for this case.");
-    }
-
-    var oldAttrs = attrs;
-    var newAttrs = oldAttrs;
-    if (oldAttrs) {
-      var attrArgs = [null, null];
-      attrArgs.push.apply(attrArgs, arguments);
-      for (var k in oldAttrs) {
-        var oldValue = oldAttrs[k];
-        attrArgs[0] = k;
-        attrArgs[1] = oldValue;
-        var newValue = this.visitAttribute.apply(this, attrArgs);
-        if (newValue !== oldValue) {
-          // copy on write
-          if (newAttrs === oldAttrs)
-            newAttrs = _assign({}, oldAttrs);
-          newAttrs[k] = newValue;
-        }
-      }
-    }
-
-    return newAttrs;
-  },
-  // Transform the value of one attribute name/value in an
-  // attributes dictionary.
-  visitAttribute: function (name, value, tag/*, ...*/) {
-    var args = SLICE.call(arguments, 2);
-    args[0] = value;
-    return this.visit.apply(this, args);
-  }
-});
-
-
-HTML.ToTextVisitor = HTML.Visitor.extend();
-HTML.ToTextVisitor.def({
-  visitNull: function (nullOrUndefined) {
-    return '';
-  },
-  visitPrimitive: function (stringBooleanOrNumber) {
-    var str = String(stringBooleanOrNumber);
-    if (this.textMode === HTML.TEXTMODE.RCDATA) {
-      return str.replace(/&/g, '&amp;').replace(/</g, '&lt;');
-    } else if (this.textMode === HTML.TEXTMODE.ATTRIBUTE) {
-      // escape `&` and `"` this time, not `&` and `<`
-      return str.replace(/&/g, '&amp;').replace(/"/g, '&quot;');
-    } else {
-      return str;
-    }
-  },
-  visitArray: function (array) {
-    var parts = [];
-    for (var i = 0; i < array.length; i++)
-      parts.push(this.visit(array[i]));
-    return parts.join('');
-  },
-  visitComment: function (comment) {
-    throw new Error("Can't have a comment here");
-  },
-  visitCharRef: function (charRef) {
-    if (this.textMode === HTML.TEXTMODE.RCDATA ||
-        this.textMode === HTML.TEXTMODE.ATTRIBUTE) {
-      return charRef.html;
-    } else {
-      return charRef.str;
-    }
-  },
-  visitRaw: function (raw) {
-    return raw.value;
-  },
-  visitTag: function (tag) {
-    // Really we should just disallow Tags here.  However, at the
-    // moment it's useful to stringify any HTML we find.  In
-    // particular, when you include a template within `{{#markdown}}`,
-    // we render the template as text, and since there's currently
-    // no way to make the template be *parsed* as text (e.g. `<template
-    // type="text">`), we hackishly support HTML tags in markdown
-    // in templates by parsing them and stringifying them.
-    return this.visit(this.toHTML(tag));
-  },
-  visitObject: function (x) {
-    throw new Error("Unexpected object in htmljs in toText: " + x);
-  },
-  toHTML: function (node) {
-    return HTML.toHTML(node);
-  }
-});
-
-
-
-HTML.ToHTMLVisitor = HTML.Visitor.extend();
-HTML.ToHTMLVisitor.def({
-  visitNull: function (nullOrUndefined) {
-    return '';
-  },
-  visitPrimitive: function (stringBooleanOrNumber) {
-    var str = String(stringBooleanOrNumber);
-    return str.replace(/&/g, '&amp;').replace(/</g, '&lt;');
-  },
-  visitArray: function (array) {
-    var parts = [];
-    for (var i = 0; i < array.length; i++)
-      parts.push(this.visit(array[i]));
-    return parts.join('');
-  },
-  visitComment: function (comment) {
-    return '<!--' + comment.sanitizedValue + '-->';
-  },
-  visitCharRef: function (charRef) {
-    return charRef.html;
-  },
-  visitRaw: function (raw) {
-    return raw.value;
-  },
-  visitTag: function (tag) {
-    var attrStrs = [];
-
-    var tagName = tag.tagName;
-    var children = tag.children;
-
-    var attrs = tag.attrs;
-    if (attrs) {
-      attrs = HTML.flattenAttributes(attrs);
-      for (var k in attrs) {
-        if (k === 'value' && tagName === 'textarea') {
-          children = [attrs[k], children];
-        } else {
-          var v = this.toText(attrs[k], HTML.TEXTMODE.ATTRIBUTE);
-          attrStrs.push(' ' + k + '="' + v + '"');
-        }
-      }
-    }
-
-    var startTag = '<' + tagName + attrStrs.join('') + '>';
-
-    var childStrs = [];
-    var content;
-    if (tagName === 'textarea') {
-
-      for (var i = 0; i < children.length; i++)
-        childStrs.push(this.toText(children[i], HTML.TEXTMODE.RCDATA));
-
-      content = childStrs.join('');
-      if (content.slice(0, 1) === '\n')
-        // TEXTAREA will absorb a newline, so if we see one, add
-        // another one.
-        content = '\n' + content;
-
-    } else {
-      for (var i = 0; i < children.length; i++)
-        childStrs.push(this.visit(children[i]));
-
-      content = childStrs.join('');
-    }
-
-    var result = startTag + content;
-
-    if (children.length || ! HTML.isVoidElement(tagName)) {
-      // "Void" elements like BR are the only ones that don't get a close
-      // tag in HTML5.  They shouldn't have contents, either, so we could
-      // throw an error upon seeing contents here.
-      result += '</' + tagName + '>';
-    }
-
-    return result;
-  },
-  visitObject: function (x) {
-    throw new Error("Unexpected object in htmljs in toHTML: " + x);
-  },
-  toText: function (node, textMode) {
-    return HTML.toText(node, textMode);
-  }
-});
diff --git a/packages/spacebars-compiler/.gitignore b/packages/spacebars-compiler/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/spacebars-compiler/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/spacebars-compiler/README.md b/packages/spacebars-compiler/README.md
deleted file mode 100644
index f0720673f6..0000000000
--- a/packages/spacebars-compiler/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# spacebars-compiler
-
-The Spacebars compiler that is invoked at build time to compile
-templates to JavaScript.
-
-While this code is not normally ever shipped to the client, it can be
-used at runtime on the server or the client by using the
-`SpacebarsCompiler` symbol from this package.
-
-The `spacebars` package, in contrast, contains the `Spacebars` symbol
-and the Spacebars runtime, which is shipped to the client as part of
-the app.
-
-Read more about Spacebars, Blaze, and Meteor templating on the Blaze
-[project page](https://www.meteor.com/blaze).
diff --git a/packages/spacebars-compiler/codegen.js b/packages/spacebars-compiler/codegen.js
deleted file mode 100644
index 3147a4a18a..0000000000
--- a/packages/spacebars-compiler/codegen.js
+++ /dev/null
@@ -1,389 +0,0 @@
-// ============================================================
-// Code-generation of template tags
-
-// The `CodeGen` class currently has no instance state, but in theory
-// it could be useful to track per-function state, like whether we
-// need to emit `var self = this` or not.
-var CodeGen = SpacebarsCompiler.CodeGen = function () {};
-
-var builtInBlockHelpers = SpacebarsCompiler._builtInBlockHelpers = {
-  'if': 'Blaze.If',
-  'unless': 'Blaze.Unless',
-  'with': 'Spacebars.With',
-  'each': 'Blaze.Each',
-  'let': 'Blaze.Let'
-};
-
-
-// Mapping of "macros" which, when preceded by `Template.`, expand
-// to special code rather than following the lookup rules for dotted
-// symbols.
-var builtInTemplateMacros = {
-  // `view` is a local variable defined in the generated render
-  // function for the template in which `Template.contentBlock` or
-  // `Template.elseBlock` is invoked.
-  'contentBlock': 'view.templateContentBlock',
-  'elseBlock': 'view.templateElseBlock',
-
-  // Confusingly, this makes `{{> Template.dynamic}}` an alias
-  // for `{{> __dynamic}}`, where "__dynamic" is the template that
-  // implements the dynamic template feature.
-  'dynamic': 'Template.__dynamic',
-
-  'subscriptionsReady': 'view.templateInstance().subscriptionsReady()'
-};
-
-var additionalReservedNames = ["body", "toString", "instance",  "constructor",
-  "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf",
-  "propertyIsEnumerable", "__defineGetter__", "__lookupGetter__",
-  "__defineSetter__", "__lookupSetter__", "__proto__", "dynamic",
-  "registerHelper", "currentData", "parentData"];
-
-// A "reserved name" can't be used as a <template> name.  This
-// function is used by the template file scanner.
-//
-// Note that the runtime imposes additional restrictions, for example
-// banning the name "body" and names of built-in object properties
-// like "toString".
-SpacebarsCompiler.isReservedName = function (name) {
-  return builtInBlockHelpers.hasOwnProperty(name) ||
-    builtInTemplateMacros.hasOwnProperty(name) ||
-    _.indexOf(additionalReservedNames, name) > -1;
-};
-
-var makeObjectLiteral = function (obj) {
-  var parts = [];
-  for (var k in obj)
-    parts.push(BlazeTools.toObjectLiteralKey(k) + ': ' + obj[k]);
-  return '{' + parts.join(', ') + '}';
-};
-
-_.extend(CodeGen.prototype, {
-  codeGenTemplateTag: function (tag) {
-    var self = this;
-    if (tag.position === HTMLTools.TEMPLATE_TAG_POSITION.IN_START_TAG) {
-      // Special dynamic attributes: `<div {{attrs}}>...`
-      // only `tag.type === 'DOUBLE'` allowed (by earlier validation)
-      return BlazeTools.EmitCode('function () { return ' +
-          self.codeGenMustache(tag.path, tag.args, 'attrMustache')
-          + '; }');
-    } else {
-      if (tag.type === 'DOUBLE' || tag.type === 'TRIPLE') {
-        var code = self.codeGenMustache(tag.path, tag.args);
-        if (tag.type === 'TRIPLE') {
-          code = 'Spacebars.makeRaw(' + code + ')';
-        }
-        if (tag.position !== HTMLTools.TEMPLATE_TAG_POSITION.IN_ATTRIBUTE) {
-          // Reactive attributes are already wrapped in a function,
-          // and there's no fine-grained reactivity.
-          // Anywhere else, we need to create a View.
-          code = 'Blaze.View(' +
-            BlazeTools.toJSLiteral('lookup:' + tag.path.join('.')) + ', ' +
-            'function () { return ' + code + '; })';
-        }
-        return BlazeTools.EmitCode(code);
-      } else if (tag.type === 'INCLUSION' || tag.type === 'BLOCKOPEN') {
-        var path = tag.path;
-        var args = tag.args;
-
-        if (tag.type === 'BLOCKOPEN' &&
-            builtInBlockHelpers.hasOwnProperty(path[0])) {
-          // if, unless, with, each.
-          //
-          // If someone tries to do `{{> if}}`, we don't
-          // get here, but an error is thrown when we try to codegen the path.
-
-          // Note: If we caught these errors earlier, while scanning, we'd be able to
-          // provide nice line numbers.
-          if (path.length > 1)
-            throw new Error("Unexpected dotted path beginning with " + path[0]);
-          if (! args.length)
-            throw new Error("#" + path[0] + " requires an argument");
-
-          var dataCode = null;
-          // #each has a special treatment as it features two different forms:
-          // - {{#each people}}
-          // - {{#each person in people}}
-          if (path[0] === 'each' && args.length >= 2 && args[1][0] === 'PATH' &&
-              args[1][1].length && args[1][1][0] === 'in') {
-            // minimum conditions are met for each-in.  now validate this
-            // isn't some weird case.
-            var eachUsage = "Use either {{#each items}} or " +
-                  "{{#each item in items}} form of #each.";
-            var inArg = args[1];
-            if (! (args.length >= 3 && inArg[1].length === 1)) {
-              // we don't have at least 3 space-separated parts after #each, or
-              // inArg doesn't look like ['PATH',['in']]
-              throw new Error("Malformed #each. " + eachUsage);
-            }
-            // split out the variable name and sequence arguments
-            var variableArg = args[0];
-            if (! (variableArg[0] === "PATH" && variableArg[1].length === 1 &&
-                   variableArg[1][0].replace(/\./g, ''))) {
-              throw new Error("Bad variable name in #each");
-            }
-            var variable = variableArg[1][0];
-            dataCode = 'function () { return { _sequence: ' +
-              self.codeGenInclusionData(args.slice(2)) +
-              ', _variable: ' + BlazeTools.toJSLiteral(variable) + ' }; }';
-          } else if (path[0] === 'let') {
-            var dataProps = {};
-            _.each(args, function (arg) {
-              if (arg.length !== 3) {
-                // not a keyword arg (x=y)
-                throw new Error("Incorrect form of #let");
-              }
-              var argKey = arg[2];
-              dataProps[argKey] =
-                'function () { return Spacebars.call(' +
-                self.codeGenArgValue(arg) + '); }';
-            });
-            dataCode = makeObjectLiteral(dataProps);
-          }
-
-          if (! dataCode) {
-            // `args` must exist (tag.args.length > 0)
-            dataCode = self.codeGenInclusionDataFunc(args) || 'null';
-          }
-
-          // `content` must exist
-          var contentBlock = (('content' in tag) ?
-                              self.codeGenBlock(tag.content) : null);
-          // `elseContent` may not exist
-          var elseContentBlock = (('elseContent' in tag) ?
-                                  self.codeGenBlock(tag.elseContent) : null);
-
-          var callArgs = [dataCode, contentBlock];
-          if (elseContentBlock)
-            callArgs.push(elseContentBlock);
-
-          return BlazeTools.EmitCode(
-            builtInBlockHelpers[path[0]] + '(' + callArgs.join(', ') + ')');
-
-        } else {
-          var compCode = self.codeGenPath(path, {lookupTemplate: true});
-          if (path.length > 1) {
-            // capture reactivity
-            compCode = 'function () { return Spacebars.call(' + compCode +
-              '); }';
-          }
-
-          var dataCode = self.codeGenInclusionDataFunc(tag.args);
-          var content = (('content' in tag) ?
-                         self.codeGenBlock(tag.content) : null);
-          var elseContent = (('elseContent' in tag) ?
-                             self.codeGenBlock(tag.elseContent) : null);
-
-          var includeArgs = [compCode];
-          if (content) {
-            includeArgs.push(content);
-            if (elseContent)
-              includeArgs.push(elseContent);
-          }
-
-          var includeCode =
-                'Spacebars.include(' + includeArgs.join(', ') + ')';
-
-          // calling convention compat -- set the data context around the
-          // entire inclusion, so that if the name of the inclusion is
-          // a helper function, it gets the data context in `this`.
-          // This makes for a pretty confusing calling convention --
-          // In `{{#foo bar}}`, `foo` is evaluated in the context of `bar`
-          // -- but it's what we shipped for 0.8.0.  The rationale is that
-          // `{{#foo bar}}` is sugar for `{{#with bar}}{{#foo}}...`.
-          if (dataCode) {
-            includeCode =
-              'Blaze._TemplateWith(' + dataCode + ', function () { return ' +
-              includeCode + '; })';
-          }
-
-          // XXX BACK COMPAT - UI is the old name, Template is the new
-          if ((path[0] === 'UI' || path[0] === 'Template') &&
-              (path[1] === 'contentBlock' || path[1] === 'elseBlock')) {
-            // Call contentBlock and elseBlock in the appropriate scope
-            includeCode = 'Blaze._InOuterTemplateScope(view, function () { return '
-              + includeCode + '; })';
-          }
-
-          return BlazeTools.EmitCode(includeCode);
-        }
-      } else if (tag.type === 'ESCAPE') {
-        return tag.value;
-      } else {
-        // Can't get here; TemplateTag validation should catch any
-        // inappropriate tag types that might come out of the parser.
-        throw new Error("Unexpected template tag type: " + tag.type);
-      }
-    }
-  },
-
-  // `path` is an array of at least one string.
-  //
-  // If `path.length > 1`, the generated code may be reactive
-  // (i.e. it may invalidate the current computation).
-  //
-  // No code is generated to call the result if it's a function.
-  //
-  // Options:
-  //
-  // - lookupTemplate {Boolean} If true, generated code also looks in
-  //   the list of templates. (After helpers, before data context).
-  //   Used when generating code for `{{> foo}}` or `{{#foo}}`. Only
-  //   used for non-dotted paths.
-  codeGenPath: function (path, opts) {
-    if (builtInBlockHelpers.hasOwnProperty(path[0]))
-      throw new Error("Can't use the built-in '" + path[0] + "' here");
-    // Let `{{#if Template.contentBlock}}` check whether this template was
-    // invoked via inclusion or as a block helper, in addition to supporting
-    // `{{> Template.contentBlock}}`.
-    // XXX BACK COMPAT - UI is the old name, Template is the new
-    if (path.length >= 2 &&
-        (path[0] === 'UI' || path[0] === 'Template')
-        && builtInTemplateMacros.hasOwnProperty(path[1])) {
-      if (path.length > 2)
-        throw new Error("Unexpected dotted path beginning with " +
-                        path[0] + '.' + path[1]);
-      return builtInTemplateMacros[path[1]];
-    }
-
-    var firstPathItem = BlazeTools.toJSLiteral(path[0]);
-    var lookupMethod = 'lookup';
-    if (opts && opts.lookupTemplate && path.length === 1)
-      lookupMethod = 'lookupTemplate';
-    var code = 'view.' + lookupMethod + '(' + firstPathItem + ')';
-
-    if (path.length > 1) {
-      code = 'Spacebars.dot(' + code + ', ' +
-        _.map(path.slice(1), BlazeTools.toJSLiteral).join(', ') + ')';
-    }
-
-    return code;
-  },
-
-  // Generates code for an `[argType, argValue]` argument spec,
-  // ignoring the third element (keyword argument name) if present.
-  //
-  // The resulting code may be reactive (in the case of a PATH of
-  // more than one element) and is not wrapped in a closure.
-  codeGenArgValue: function (arg) {
-    var self = this;
-
-    var argType = arg[0];
-    var argValue = arg[1];
-
-    var argCode;
-    switch (argType) {
-    case 'STRING':
-    case 'NUMBER':
-    case 'BOOLEAN':
-    case 'NULL':
-      argCode = BlazeTools.toJSLiteral(argValue);
-      break;
-    case 'PATH':
-      argCode = self.codeGenPath(argValue);
-      break;
-    case 'EXPR':
-      // The format of EXPR is ['EXPR', { type: 'EXPR', path: [...], args: { ... } }]
-      argCode = self.codeGenMustache(argValue.path, argValue.args, 'dataMustache');
-      break;
-    default:
-      // can't get here
-      throw new Error("Unexpected arg type: " + argType);
-    }
-
-    return argCode;
-  },
-
-  // Generates a call to `Spacebars.fooMustache` on evaluated arguments.
-  // The resulting code has no function literals and must be wrapped in
-  // one for fine-grained reactivity.
-  codeGenMustache: function (path, args, mustacheType) {
-    var self = this;
-
-    var nameCode = self.codeGenPath(path);
-    var argCode = self.codeGenMustacheArgs(args);
-    var mustache = (mustacheType || 'mustache');
-
-    return 'Spacebars.' + mustache + '(' + nameCode +
-      (argCode ? ', ' + argCode.join(', ') : '') + ')';
-  },
-
-  // returns: array of source strings, or null if no
-  // args at all.
-  codeGenMustacheArgs: function (tagArgs) {
-    var self = this;
-
-    var kwArgs = null; // source -> source
-    var args = null; // [source]
-
-    // tagArgs may be null
-    _.each(tagArgs, function (arg) {
-      var argCode = self.codeGenArgValue(arg);
-
-      if (arg.length > 2) {
-        // keyword argument (represented as [type, value, name])
-        kwArgs = (kwArgs || {});
-        kwArgs[arg[2]] = argCode;
-      } else {
-        // positional argument
-        args = (args || []);
-        args.push(argCode);
-      }
-    });
-
-    // put kwArgs in options dictionary at end of args
-    if (kwArgs) {
-      args = (args || []);
-      args.push('Spacebars.kw(' + makeObjectLiteral(kwArgs) + ')');
-    }
-
-    return args;
-  },
-
-  codeGenBlock: function (content) {
-    return SpacebarsCompiler.codeGen(content);
-  },
-
-  codeGenInclusionData: function (args) {
-    var self = this;
-
-    if (! args.length) {
-      // e.g. `{{#foo}}`
-      return null;
-    } else if (args[0].length === 3) {
-      // keyword arguments only, e.g. `{{> point x=1 y=2}}`
-      var dataProps = {};
-      _.each(args, function (arg) {
-        var argKey = arg[2];
-        dataProps[argKey] = 'Spacebars.call(' + self.codeGenArgValue(arg) + ')';
-      });
-      return makeObjectLiteral(dataProps);
-    } else if (args[0][0] !== 'PATH') {
-      // literal first argument, e.g. `{{> foo "blah"}}`
-      //
-      // tag validation has confirmed, in this case, that there is only
-      // one argument (`args.length === 1`)
-      return self.codeGenArgValue(args[0]);
-    } else if (args.length === 1) {
-      // one argument, must be a PATH
-      return 'Spacebars.call(' + self.codeGenPath(args[0][1]) + ')';
-    } else {
-      // Multiple positional arguments; treat them as a nested
-      // "data mustache"
-      return self.codeGenMustache(args[0][1], args.slice(1),
-                                  'dataMustache');
-    }
-
-  },
-
-  codeGenInclusionDataFunc: function (args) {
-    var self = this;
-    var dataCode = self.codeGenInclusionData(args);
-    if (dataCode) {
-      return 'function () { return ' + dataCode + '; }';
-    } else {
-      return null;
-    }
-  }
-
-});
diff --git a/packages/spacebars-compiler/compile_tests.js b/packages/spacebars-compiler/compile_tests.js
deleted file mode 100644
index 5560a7922f..0000000000
--- a/packages/spacebars-compiler/compile_tests.js
+++ /dev/null
@@ -1,114 +0,0 @@
-Tinytest.add("spacebars-compiler - compiler output", function (test) {
-
-  var run = function (input, expected) {
-    if (expected.fail) {
-      var expectedMessage = expected.fail;
-      // test for error starting with expectedMessage
-      var msg = '';
-      test.throws(function () {
-        try {
-          SpacebarsCompiler.compile(input, {isTemplate: true});
-        } catch (e) {
-          msg = e.message;
-          throw e;
-        }
-      });
-      test.equal(msg.slice(0, expectedMessage.length),
-                 expectedMessage);
-    } else {
-      var output = SpacebarsCompiler.compile(input, {isTemplate: true});
-      var postProcess = function (string) {
-        // remove initial and trailing parens
-        string = string.replace(/^\(([\S\s]*)\)$/, '$1');
-        if (! (Package['minifier-js'] && Package['minifier-js'].UglifyJSMinify)) {
-          // these tests work a lot better with access to beautification,
-          // but let's at least do some sort of test without it.
-          // These regexes may have to be adjusted if new tests are added.
-
-          // Remove single-line comments, including line nums from build system.
-          string = string.replace(/\/\/.*$/mg, '');
-          string = string.replace(/\s+/g, ''); // kill whitespace
-        }
-        return string;
-      };
-      // compare using Function .toString()!
-      test._stringEqual(
-        postProcess(output.toString()),
-        postProcess(
-          SpacebarsCompiler._beautify('(' + expected.toString() + ')')),
-        input);
-    }
-  };
-
-  coffee.runCompilerOutputTests(run);
-});
-
-coffee = {
-  runCompilerOutputTests: null // implemented in compiler_output_tests.coffee
-};
-
-
-Tinytest.add("spacebars-compiler - compiler errors", function (test) {
-
-  var getError = function (input) {
-    try {
-      SpacebarsCompiler.compile(input);
-    } catch (e) {
-      return e.message;
-    }
-    test.fail("Didn't throw an error: " + input);
-    return '';
-  };
-
-  var assertStartsWith = function (a, b) {
-    test.equal(a.substring(0, b.length), b);
-  };
-
-  var isError = function (input, errorStart) {
-    assertStartsWith(getError(input), errorStart);
-  };
-
-  isError("<input></input>",
-          "Unexpected HTML close tag.  <input> should have no close tag.");
-  isError("{{#each foo}}<input></input>{{/foo}}",
-          "Unexpected HTML close tag.  <input> should have no close tag.");
-
-  isError("{{#if}}{{/if}}", "#if requires an argument");
-  isError("{{#with}}{{/with}}", "#with requires an argument");
-  isError("{{#each}}{{/each}}", "#each requires an argument");
-  isError("{{#unless}}{{/unless}}", "#unless requires an argument");
-
-  isError("{{0 0}}", "Expected IDENTIFIER");
-
-  isError("{{> foo 0 0}}",
-          "First argument must be a function");
-  isError("{{> foo 0 x=0}}",
-          "First argument must be a function");
-  isError("{{#foo 0 0}}{{/foo}}",
-          "First argument must be a function");
-  isError("{{#foo 0 x=0}}{{/foo}}",
-          "First argument must be a function");
-
-  _.each(['asdf</br>', '{{!foo}}</br>', '{{!foo}} </br>',
-          'asdf</a>', '{{!foo}}</a>', '{{!foo}} </a>'], function (badFrag) {
-            isError(badFrag, "Unexpected HTML close tag");
-          });
-
-  isError("{{#let myHelper}}{{/let}}", "Incorrect form of #let");
-  isError("{{#each foo in.in bar}}{{/each}}", "Malformed #each");
-  isError("{{#each foo.bar in baz}}{{/each}}", "Bad variable name in #each");
-  isError("{{#each ../foo in baz}}{{/each}}", "Bad variable name in #each");
-  isError("{{#each 3 in baz}}{{/each}}", "Bad variable name in #each");
-
-  // errors using `{{> React}}`
-  isError("{{> React component=emptyComponent}}",
-          "{{> React}} must be used in a container element");
-  isError("<div>{{#if include}}{{> React component=emptyComponent}}{{/if}}</div>",
-          "{{> React}} must be used in a container element");
-  isError("<div><div>Sibling</div>{{> React component=emptyComponent}}</div>",
-          "{{> React}} must be used as the only child in a container element");
-  isError("<div>Sibling{{> React component=emptyComponent}}</div>",
-          "{{> React}} must be used as the only child in a container element");
-  isError("<div>{{#if sibling}}Sibling{{/if}}{{> React component=emptyComponent}}</div>",
-          "{{> React}} must be used as the only child in a container element");
-});
diff --git a/packages/spacebars-compiler/compiler.js b/packages/spacebars-compiler/compiler.js
deleted file mode 100644
index 602d585bfd..0000000000
--- a/packages/spacebars-compiler/compiler.js
+++ /dev/null
@@ -1,116 +0,0 @@
-
-SpacebarsCompiler.parse = function (input) {
-
-  var tree = HTMLTools.parseFragment(
-    input,
-    { getTemplateTag: TemplateTag.parseCompleteTag });
-
-  return tree;
-};
-
-SpacebarsCompiler.compile = function (input, options) {
-  var tree = SpacebarsCompiler.parse(input);
-  return SpacebarsCompiler.codeGen(tree, options);
-};
-
-SpacebarsCompiler._TemplateTagReplacer = HTML.TransformingVisitor.extend();
-SpacebarsCompiler._TemplateTagReplacer.def({
-  visitObject: function (x) {
-    if (x instanceof HTMLTools.TemplateTag) {
-
-      // Make sure all TemplateTags in attributes have the right
-      // `.position` set on them.  This is a bit of a hack
-      // (we shouldn't be mutating that here), but it allows
-      // cleaner codegen of "synthetic" attributes like TEXTAREA's
-      // "value", where the template tags were originally not
-      // in an attribute.
-      if (this.inAttributeValue)
-        x.position = HTMLTools.TEMPLATE_TAG_POSITION.IN_ATTRIBUTE;
-
-      return this.codegen.codeGenTemplateTag(x);
-    }
-
-    return HTML.TransformingVisitor.prototype.visitObject.call(this, x);
-  },
-  visitAttributes: function (attrs) {
-    if (attrs instanceof HTMLTools.TemplateTag)
-      return this.codegen.codeGenTemplateTag(attrs);
-
-    // call super (e.g. for case where `attrs` is an array)
-    return HTML.TransformingVisitor.prototype.visitAttributes.call(this, attrs);
-  },
-  visitAttribute: function (name, value, tag) {
-    this.inAttributeValue = true;
-    var result = this.visit(value);
-    this.inAttributeValue = false;
-
-    if (result !== value) {
-      // some template tags must have been replaced, because otherwise
-      // we try to keep things `===` when transforming.  Wrap the code
-      // in a function as per the rules.  You can't have
-      // `{id: Blaze.View(...)}` as an attributes dict because the View
-      // would be rendered more than once; you need to wrap it in a function
-      // so that it's a different View each time.
-      return BlazeTools.EmitCode(this.codegen.codeGenBlock(result));
-    }
-    return result;
-  }
-});
-
-SpacebarsCompiler.codeGen = function (parseTree, options) {
-  // is this a template, rather than a block passed to
-  // a block helper, say
-  var isTemplate = (options && options.isTemplate);
-  var isBody = (options && options.isBody);
-  var sourceName = (options && options.sourceName);
-
-  var tree = parseTree;
-
-  // The flags `isTemplate` and `isBody` are kind of a hack.
-  if (isTemplate || isBody) {
-    // optimizing fragments would require being smarter about whether we are
-    // in a TEXTAREA, say.
-    tree = SpacebarsCompiler.optimize(tree);
-  }
-
-  // throws an error if using `{{> React}}` with siblings
-  new ReactComponentSiblingForbidder({sourceName: sourceName})
-    .visit(tree);
-
-  var codegen = new SpacebarsCompiler.CodeGen;
-  tree = (new SpacebarsCompiler._TemplateTagReplacer(
-    {codegen: codegen})).visit(tree);
-
-  var code = '(function () { ';
-  if (isTemplate || isBody) {
-    code += 'var view = this; ';
-  }
-  code += 'return ';
-  code += BlazeTools.toJS(tree);
-  code += '; })';
-
-  code = SpacebarsCompiler._beautify(code);
-
-  return code;
-};
-
-SpacebarsCompiler._beautify = function (code) {
-  if (Package['minifier-js'] && Package['minifier-js'].UglifyJSMinify) {
-    var result = Package['minifier-js'].UglifyJSMinify(
-      code,
-      { fromString: true,
-        mangle: false,
-        compress: false,
-        output: { beautify: true,
-                  indent_level: 2,
-                  width: 80 } });
-    var output = result.code;
-    // Uglify interprets our expression as a statement and may add a semicolon.
-    // Strip trailing semicolon.
-    output = output.replace(/;$/, '');
-    return output;
-  } else {
-    // don't actually beautify; no UglifyJS
-    return code;
-  }
-};
diff --git a/packages/spacebars-compiler/compiler_output_tests.coffee b/packages/spacebars-compiler/compiler_output_tests.coffee
deleted file mode 100644
index 38ab9cd979..0000000000
--- a/packages/spacebars-compiler/compiler_output_tests.coffee
+++ /dev/null
@@ -1,296 +0,0 @@
-coffee.runCompilerOutputTests = (run) ->
-  run "abc",
-  """
-  function () {
-    var view = this;
-    return "abc";
-  }
-  """
-
-  run "{{foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    });
-  }
-  """
-
-  run "{{foo bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"),
-                                view.lookup("bar"));
-    });
-  }
-  """
-
-  run "{{foo x=bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
-        x: view.lookup("bar")
-      }));
-    });
-  }
-  """
-
-  run "{{foo.bar baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo.bar", function() {
-      return Spacebars.mustache(Spacebars.dot(
-               view.lookup("foo"), "bar"),
-               view.lookup("baz"));
-    });
-  }
-  """
-
-  run "{{foo.bar (baz qux)}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo.bar", function() {
-      return Spacebars.mustache(Spacebars.dot(
-               view.lookup("foo"), "bar"),
-               Spacebars.dataMustache(view.lookup("baz"), view.lookup("qux")));
-    });
-  }
-  """
-
-
-  run "{{foo bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"),
-             Spacebars.dot(view.lookup("bar"), "baz"));
-    });
-  }
-  """
-
-  run "{{foo x=bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
-        x: Spacebars.dot(view.lookup("bar"), "baz")
-      }));
-    });
-  }
-  """
-
-  run "{{#foo}}abc{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Spacebars.include(view.lookupTemplate("foo"), (function() {
-      return "abc";
-    }));
-  }
-  """
-
-  run "{{#if cond}}aaa{{else}}bbb{{/if}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.If(function () {
-      return Spacebars.call(view.lookup("cond"));
-    }, (function() {
-      return "aaa";
-    }), (function() {
-      return "bbb";
-    }));
-  }
-  """
-
-  run "{{!-- --}}{{#if cond}}aaa{{!\n}}{{else}}{{!}}bbb{{!-- --}}{{/if}}{{!}}",
-  """
-function() {
-  var view = this;
-  return Blaze.If(function () {
-    return Spacebars.call(view.lookup("cond"));
-  }, (function() {
-    return "aaa";
-  }), (function() {
-    return "bbb";
-  }));
-}
-  """
-
-  run "{{> foo bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.call(view.lookup("bar"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo x=bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return {
-        x: Spacebars.call(view.lookup("bar"))
-      };
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-
-  """
-
-  run "{{> foo bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo x=bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return {
-        x: Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"))
-      };
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo bar baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-
-  """
-
-  run "{{#foo bar baz}}aaa{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"), (function() {
-        return "aaa";
-      }));
-    });
-  }
-  """
-
-  run "{{#foo p.q r.s}}aaa{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(Spacebars.dot(view.lookup("p"), "q"), Spacebars.dot(view.lookup("r"), "s"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"), (function() {
-        return "aaa";
-      }));
-    });
-  }
-  """
-
-  run "<a {{b}}></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A(HTML.Attrs(function() {
-      return Spacebars.attrMustache(view.lookup("b"));
-    }));
-  }
-  """
-
-  run "<a {{b}} c=d{{e}}f></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A(HTML.Attrs({
-      c: (function() { return [
-        "d",
-        Spacebars.mustache(view.lookup("e")),
-        "f" ]; })
-    }, function() {
-      return Spacebars.attrMustache(view.lookup("b"));
-    }));
-  }
-  """
-
-  run "<asdf>{{foo}}</asdf>",
-  """
-  function() {
-    var view = this;
-    return HTML.getTag("asdf")(Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }));
-  }
-  """
-
-  run "<textarea>{{foo}}</textarea>",
-  """
-  function() {
-    var view = this;
-    return HTML.TEXTAREA({value: (function () {
-      return Spacebars.mustache(view.lookup("foo"));
-    }) });
-  }
-  """
-
-  run "<textarea>{{{{|{{|foo}}</textarea>",
-  """
-  function() {
-    var view = this;
-    return HTML.TEXTAREA({value: (function () {
-      return [ "{{{{", "{{", "foo}}" ];
-    }) });
-  }
-  """
-
-  run "{{|foo}}",
-  """
-  function() {
-    var view = this;
-    return [ "{{", "foo}}" ];
-  }
-  """
-
-  run "<a b={{{|></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A({
-      b: (function () {
-        return "{{{";
-      })
-    });
-  }
-  """
diff --git a/packages/spacebars-compiler/optimizer.js b/packages/spacebars-compiler/optimizer.js
deleted file mode 100644
index cdf93b2476..0000000000
--- a/packages/spacebars-compiler/optimizer.js
+++ /dev/null
@@ -1,189 +0,0 @@
-// Optimize parts of an HTMLjs tree into raw HTML strings when they don't
-// contain template tags.
-
-var constant = function (value) {
-  return function () { return value; };
-};
-
-var OPTIMIZABLE = {
-  NONE: 0,
-  PARTS: 1,
-  FULL: 2
-};
-
-// We can only turn content into an HTML string if it contains no template
-// tags and no "tricky" HTML tags.  If we can optimize the entire content
-// into a string, we return OPTIMIZABLE.FULL.  If the we are given an
-// unoptimizable node, we return OPTIMIZABLE.NONE.  If we are given a tree
-// that contains an unoptimizable node somewhere, we return OPTIMIZABLE.PARTS.
-//
-// For example, we always create SVG elements programmatically, since SVG
-// doesn't have innerHTML.  If we are given an SVG element, we return NONE.
-// However, if we are given a big tree that contains SVG somewhere, we
-// return PARTS so that the optimizer can descend into the tree and optimize
-// other parts of it.
-var CanOptimizeVisitor = HTML.Visitor.extend();
-CanOptimizeVisitor.def({
-  visitNull: constant(OPTIMIZABLE.FULL),
-  visitPrimitive: constant(OPTIMIZABLE.FULL),
-  visitComment: constant(OPTIMIZABLE.FULL),
-  visitCharRef: constant(OPTIMIZABLE.FULL),
-  visitRaw: constant(OPTIMIZABLE.FULL),
-  visitObject: constant(OPTIMIZABLE.NONE),
-  visitFunction: constant(OPTIMIZABLE.NONE),
-  visitArray: function (x) {
-    for (var i = 0; i < x.length; i++)
-      if (this.visit(x[i]) !== OPTIMIZABLE.FULL)
-        return OPTIMIZABLE.PARTS;
-    return OPTIMIZABLE.FULL;
-  },
-  visitTag: function (tag) {
-    var tagName = tag.tagName;
-    if (tagName === 'textarea') {
-      // optimizing into a TEXTAREA's RCDATA would require being a little
-      // more clever.
-      return OPTIMIZABLE.NONE;
-    } else if (tagName === 'script') {
-      // script tags don't work when rendered from strings
-      return OPTIMIZABLE.NONE;
-    } else if (! (HTML.isKnownElement(tagName) &&
-                  ! HTML.isKnownSVGElement(tagName))) {
-      // foreign elements like SVG can't be stringified for innerHTML.
-      return OPTIMIZABLE.NONE;
-    } else if (tagName === 'table') {
-      // Avoid ever producing HTML containing `<table><tr>...`, because the
-      // browser will insert a TBODY.  If we just `createElement("table")` and
-      // `createElement("tr")`, on the other hand, no TBODY is necessary
-      // (assuming IE 8+).
-      return OPTIMIZABLE.NONE;
-    }
-
-    var children = tag.children;
-    for (var i = 0; i < children.length; i++)
-      if (this.visit(children[i]) !== OPTIMIZABLE.FULL)
-        return OPTIMIZABLE.PARTS;
-
-    if (this.visitAttributes(tag.attrs) !== OPTIMIZABLE.FULL)
-      return OPTIMIZABLE.PARTS;
-
-    return OPTIMIZABLE.FULL;
-  },
-  visitAttributes: function (attrs) {
-    if (attrs) {
-      var isArray = HTML.isArray(attrs);
-      for (var i = 0; i < (isArray ? attrs.length : 1); i++) {
-        var a = (isArray ? attrs[i] : attrs);
-        if ((typeof a !== 'object') || (a instanceof HTMLTools.TemplateTag))
-          return OPTIMIZABLE.PARTS;
-        for (var k in a)
-          if (this.visit(a[k]) !== OPTIMIZABLE.FULL)
-            return OPTIMIZABLE.PARTS;
-      }
-    }
-    return OPTIMIZABLE.FULL;
-  }
-});
-
-var getOptimizability = function (content) {
-  return (new CanOptimizeVisitor).visit(content);
-};
-
-var toRaw = function (x) {
-  return HTML.Raw(HTML.toHTML(x));
-};
-
-var TreeTransformer = HTML.TransformingVisitor.extend();
-TreeTransformer.def({
-  visitAttributes: function (attrs/*, ...*/) {
-    // pass template tags through by default
-    if (attrs instanceof HTMLTools.TemplateTag)
-      return attrs;
-
-    return HTML.TransformingVisitor.prototype.visitAttributes.apply(
-      this, arguments);
-  }
-});
-
-// Replace parts of the HTMLjs tree that have no template tags (or
-// tricky HTML tags) with HTML.Raw objects containing raw HTML.
-var OptimizingVisitor = TreeTransformer.extend();
-OptimizingVisitor.def({
-  visitNull: toRaw,
-  visitPrimitive: toRaw,
-  visitComment: toRaw,
-  visitCharRef: toRaw,
-  visitArray: function (array) {
-    var optimizability = getOptimizability(array);
-    if (optimizability === OPTIMIZABLE.FULL) {
-      return toRaw(array);
-    } else if (optimizability === OPTIMIZABLE.PARTS) {
-      return TreeTransformer.prototype.visitArray.call(this, array);
-    } else {
-      return array;
-    }
-  },
-  visitTag: function (tag) {
-    var optimizability = getOptimizability(tag);
-    if (optimizability === OPTIMIZABLE.FULL) {
-      return toRaw(tag);
-    } else if (optimizability === OPTIMIZABLE.PARTS) {
-      return TreeTransformer.prototype.visitTag.call(this, tag);
-    } else {
-      return tag;
-    }
-  },
-  visitChildren: function (children) {
-    // don't optimize the children array into a Raw object!
-    return TreeTransformer.prototype.visitArray.call(this, children);
-  },
-  visitAttributes: function (attrs) {
-    return attrs;
-  }
-});
-
-// Combine consecutive HTML.Raws.  Remove empty ones.
-var RawCompactingVisitor = TreeTransformer.extend();
-RawCompactingVisitor.def({
-  visitArray: function (array) {
-    var result = [];
-    for (var i = 0; i < array.length; i++) {
-      var item = array[i];
-      if ((item instanceof HTML.Raw) &&
-          ((! item.value) ||
-           (result.length &&
-            (result[result.length - 1] instanceof HTML.Raw)))) {
-        // two cases: item is an empty Raw, or previous item is
-        // a Raw as well.  In the latter case, replace the previous
-        // Raw with a longer one that includes the new Raw.
-        if (item.value) {
-          result[result.length - 1] = HTML.Raw(
-            result[result.length - 1].value + item.value);
-        }
-      } else {
-        result.push(item);
-      }
-    }
-    return result;
-  }
-});
-
-// Replace pointless Raws like `HTMl.Raw('foo')` that contain no special
-// characters with simple strings.
-var RawReplacingVisitor = TreeTransformer.extend();
-RawReplacingVisitor.def({
-  visitRaw: function (raw) {
-    var html = raw.value;
-    if (html.indexOf('&') < 0 && html.indexOf('<') < 0) {
-      return html;
-    } else {
-      return raw;
-    }
-  }
-});
-
-SpacebarsCompiler.optimize = function (tree) {
-  tree = (new OptimizingVisitor).visit(tree);
-  tree = (new RawCompactingVisitor).visit(tree);
-  tree = (new RawReplacingVisitor).visit(tree);
-  return tree;
-};
diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js
deleted file mode 100644
index 2d5f886c74..0000000000
--- a/packages/spacebars-compiler/package.js
+++ /dev/null
@@ -1,38 +0,0 @@
-Package.describe({
-  summary: "Compiler for Spacebars template language",
-  version: '1.0.12'
-});
-
-Package.onUse(function (api) {
-  api.export('SpacebarsCompiler');
-
-  api.use('htmljs');
-  api.use('html-tools');
-  api.use('blaze-tools');
-
-  api.use('underscore');
-  // The templating plugin will pull in minifier-js, so that generated code will
-  // be beautified. But it's a weak dependency so that eg boilerplate-generator
-  // doesn't pull in the minifier.
-  api.use('minifier-js', ['server'], { weak: true });
-  api.addFiles(['templatetag.js',
-                 'optimizer.js',
-                 'react.js',
-                 'codegen.js',
-                 'compiler.js']);
-});
-
-Package.onTest(function (api) {
-  api.use([
-    'underscore',
-    'spacebars-compiler',
-    'tinytest',
-    'blaze-tools',
-    'coffeescript',
-    'spacebars',
-    'blaze'
-  ]);
-  api.addFiles('spacebars_tests.js');
-  api.addFiles('compile_tests.js');
-  api.addFiles('compiler_output_tests.coffee');
-});
diff --git a/packages/spacebars-compiler/react.js b/packages/spacebars-compiler/react.js
deleted file mode 100644
index f119aac2b2..0000000000
--- a/packages/spacebars-compiler/react.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// A visitor to ensure that React components included via the `{{>
-// React}}` template defined in the react-template-helper package are
-// the only child in their parent component. Otherwise `React.render`
-// would eliminate all of their sibling nodes.
-//
-// It's a little strange that this logic is in spacebars-compiler if
-// it's only relevant to a specific package but there's no way to have
-// a package hook into a build plugin.
-ReactComponentSiblingForbidder = HTML.Visitor.extend();
-ReactComponentSiblingForbidder.def({
-  visitArray: function (array, parentTag) {
-    for (var i = 0; i < array.length; i++) {
-      this.visit(array[i], parentTag);
-    }
-  },
-  visitObject: function (obj, parentTag) {
-    if (obj.type === "INCLUSION" && obj.path.length === 1 && obj.path[0] === "React") {
-      if (!parentTag) {
-        throw new Error(
-          "{{> React}} must be used in a container element"
-            + (this.sourceName ? (" in " + this.sourceName) : "")
-               + ". Learn more at https://github.com/meteor/meteor/wiki/React-components-must-be-the-only-thing-in-their-wrapper-element");
-      }
-
-      var numSiblings = 0;
-      for (var i = 0; i < parentTag.children.length; i++) {
-        var child = parentTag.children[i];
-        if (child !== obj && !(typeof child === "string" && child.match(/^\s*$/))) {
-          numSiblings++;
-        }
-      }
-
-      if (numSiblings > 0) {
-        throw new Error(
-          "{{> React}} must be used as the only child in a container element"
-            + (this.sourceName ? (" in " + this.sourceName) : "")
-               + ". Learn more at https://github.com/meteor/meteor/wiki/React-components-must-be-the-only-thing-in-their-wrapper-element");
-      }
-    }
-  },
-  visitTag: function (tag) {
-    this.visitArray(tag.children, tag /*parentTag*/);
-  }
-});
diff --git a/packages/spacebars-compiler/spacebars_tests.js b/packages/spacebars-compiler/spacebars_tests.js
deleted file mode 100644
index 020eff8d36..0000000000
--- a/packages/spacebars-compiler/spacebars_tests.js
+++ /dev/null
@@ -1,317 +0,0 @@
-Tinytest.add("spacebars-compiler - stache tags", function (test) {
-
-  var run = function (input, expected) {
-    if (typeof expected === "string") {
-      // test for error starting with string `expected`
-      var msg = '';
-      test.throws(function () {
-        try {
-          SpacebarsCompiler.TemplateTag.parse(input);
-        } catch (e) {
-          msg = e.message;
-          throw e;
-        }
-      });
-      test.equal(msg.slice(0, expected.length), expected);
-    } else {
-      var result = SpacebarsCompiler.TemplateTag.parse(input);
-      test.equal(result, expected);
-    }
-  };
-
-  run('{{foo}}', {type: 'DOUBLE', path: ['foo'], args: []});
-  run('{{foo3}}', {type: 'DOUBLE', path: ['foo3'], args: []});
-  run('{{{foo}}}', {type: 'TRIPLE', path: ['foo'], args: []});
-  run('{{{foo}}', "Expected `}}}`");
-  run('{{{foo', "Expected");
-  run('{{foo', "Expected");
-  run('{{ {foo}}}', "Unknown stache tag");
-  run('{{{{foo}}}}', "Unknown stache tag");
-  run('{{{>foo}}}', "Unknown stache tag");
-  run('{{>>foo}}', "Unknown stache tag");
-  run('{{! asdf }}', {type: 'COMMENT', value: ' asdf '});
-  run('{{ ! asdf }}', {type: 'COMMENT', value: ' asdf '});
-  run('{{ ! asdf }asdf', "Unclosed");
-  run('{{!-- asdf --}}', {type: 'BLOCKCOMMENT', value: ' asdf '});
-  run('{{ !-- asdf -- }}', {type: 'BLOCKCOMMENT', value: ' asdf '});
-  run('{{ !-- {{asdf}} -- }}', {type: 'BLOCKCOMMENT', value: ' {{asdf}} '});
-  run('{{ !-- {{as--df}} --}}', {type: 'BLOCKCOMMENT', value: ' {{as--df}} '});
-  run('{{ !-- asdf }asdf', "Unclosed");
-  run('{{ !-- asdf --}asdf', "Unclosed");
-  run('{{else}}', {type: 'ELSE'});
-  run('{{ else }}', {type: 'ELSE'});
-  run('{{else x}}', "Expected");
-  run('{{else_x}}', {type: 'DOUBLE', path: ['else_x'], args: []});
-  run('{{/if}}', {type: 'BLOCKCLOSE', path: ['if']});
-  run('{{ / if }}', {type: 'BLOCKCLOSE', path: ['if']});
-  run('{{/if x}}', "Expected");
-  run('{{#if}}', {type: 'BLOCKOPEN', path: ['if'], args: []});
-  run('{{ # if }}', {type: 'BLOCKOPEN', path: ['if'], args: []});
-  run('{{#if_3}}', {type: 'BLOCKOPEN', path: ['if_3'], args: []});
-  run('{{>x}}', {type: 'INCLUSION', path: ['x'], args: []});
-  run('{{ > x }}', {type: 'INCLUSION', path: ['x'], args: []});
-  run('{{>x_3}}', {type: 'INCLUSION', path: ['x_3'], args: []});
-
-
-
-  run('{{foo 3}}', {type: 'DOUBLE', path: ['foo'], args: [['NUMBER', 3]]});
-  run('{{ foo  3 }}', {type: 'DOUBLE', path: ['foo'], args: [['NUMBER', 3]]});
-  run('{{#foo 3}}', {type: 'BLOCKOPEN', path: ['foo'], args: [['NUMBER', 3]]});
-  run('{{ # foo  3 }}', {type: 'BLOCKOPEN', path: ['foo'],
-                         args: [['NUMBER', 3]]});
-  run('{{>foo 3}}', {type: 'INCLUSION', path: ['foo'], args: [['NUMBER', 3]]});
-  run('{{ > foo  3 }}', {type: 'INCLUSION', path: ['foo'],
-                         args: [['NUMBER', 3]]});
-  run('{{{foo 3}}}', {type: 'TRIPLE', path: ['foo'], args: [['NUMBER', 3]]});
-
-  run('{{foo bar ./foo foo/bar a.b.c baz=qux x3=.}}',
-      {type: 'DOUBLE', path: ['foo'],
-       args: [['PATH', ['bar']],
-              ['PATH', ['.', 'foo']],
-              ['PATH', ['foo', 'bar']],
-              ['PATH', ['a', 'b', 'c']],
-              ['PATH', ['qux'], 'baz'],
-              ['PATH', ['.'], 'x3']]});
-
-  // nested expressions
-  run('{{helper (subhelper ./arg) arg.sub (args.passedHelper)}}', {
-    type: 'DOUBLE', path: ['helper'],
-    args: [
-      [
-        'EXPR', {
-          type: "EXPR", path: ["subhelper"],
-          args: [["PATH", [".", "arg"]]]
-        }
-      ], [
-        "PATH", ["arg", "sub"]
-      ], [
-        "EXPR", {
-          type: "EXPR",
-          path: ["args", "passedHelper"],
-          args: []
-        }
-      ]
-    ]
-  });
-  run('{{helper (h arg}}', "Expected `)`");
-  run('{{helper (h arg))}}', "Expected");
-  run('{{helper ) h arg}}', "Expected");
-  run('{{(dyn) arg}}', "Expected ID");
-
-  run('{{{x 0.3 [0].[3] .4 ./[4]}}}',
-      {type: 'TRIPLE', path: ['x'],
-       args: [['NUMBER', 0.3],
-              ['PATH', ['0', '3']],
-              ['NUMBER', .4],
-              ['PATH', ['.', '4']]]});
-
-  run('{{# foo this this.x null z=null}}',
-      {type: 'BLOCKOPEN', path: ['foo'],
-       args: [['PATH', ['.']],
-              ['PATH', ['.', 'x']],
-              ['NULL', null],
-              ['NULL', null, 'z']]});
-
-  run('{{./foo 3}}', {type: 'DOUBLE', path: ['.', 'foo'], args: [['NUMBER', 3]]});
-  run('{{this/foo 3}}', {type: 'DOUBLE', path: ['.', 'foo'], args: [['NUMBER', 3]]});
-  run('{{../foo 3}}', {type: 'DOUBLE', path: ['..', 'foo'], args: [['NUMBER', 3]]});
-  run('{{../../foo 3}}', {type: 'DOUBLE', path: ['...', 'foo'], args: [['NUMBER', 3]]});
-
-  run('{{foo x/..}}', "Expected");
-  run('{{foo x/.}}', "Expected");
-
-  run('{{#a.b.c}}', {type: 'BLOCKOPEN', path: ['a', 'b', 'c'],
-                     args: []});
-  run('{{> a.b.c}}', {type: 'INCLUSION', path: ['a', 'b', 'c'],
-                      args: []});
-
-  run('{{foo.[]/[]}}', {type: 'DOUBLE', path: ['foo', '', ''],
-                        args: []});
-  run('{{x foo.[=]}}', {type: 'DOUBLE', path: ['x'],
-                        args: [['PATH', ['foo', '=']]]});
-  run('{{[].foo}}', "Path can't start with empty string");
-
-  run('{{foo null}}', {type: 'DOUBLE', path: ['foo'],
-                       args: [['NULL', null]]});
-  run('{{foo false}}', {type: 'DOUBLE', path: ['foo'],
-                       args: [['BOOLEAN', false]]});
-  run('{{foo true}}', {type: 'DOUBLE', path: ['foo'],
-                       args: [['BOOLEAN', true]]});
-  run('{{foo "bar"}}', {type: 'DOUBLE', path: ['foo'],
-                        args: [['STRING', 'bar']]});
-  run("{{foo 'bar'}}", {type: 'DOUBLE', path: ['foo'],
-                        args: [['STRING', 'bar']]});
-
-  run('{{foo -1 -2}}', {type: 'DOUBLE', path: ['foo'],
-                        args: [['NUMBER', -1], ['NUMBER', -2]]});
-
-  run('{{x "\'"}}', {type: 'DOUBLE', path: ['x'], args: [['STRING', "'"]]});
-  run('{{x \'"\'}}', {type: 'DOUBLE', path: ['x'], args: [['STRING', '"']]});
-
-  run('{{> foo x=1 y=2}}',
-      {type: 'INCLUSION', path: ['foo'],
-       args: [['NUMBER', 1, 'x'],
-              ['NUMBER', 2, 'y']]});
-  // spaces around '=' are fine
-  run('{{> foo x = 1 y = 2}}',
-      {type: 'INCLUSION', path: ['foo'],
-       args: [['NUMBER', 1, 'x'],
-              ['NUMBER', 2, 'y']]});
-  run('{{> foo with-dashes=1 another-one=2}}',
-      {type: 'INCLUSION', path: ['foo'],
-       args: [['NUMBER', 1, 'with-dashes'],
-              ['NUMBER', 2, 'another-one']]});
-  run('{{> foo 1="keyword can start with a number"}}',
-      {type: 'INCLUSION', path: ['foo'],
-       args: [['STRING', 'keyword can start with a number', '1']]});
-  run('{{> foo disallow-dashes-in-posarg}}',
-      "Expected");
-  run('{{> foo disallow-#=1}}',
-      "Expected");
-  run('{{> foo disallow->=1}}',
-      "Expected");
-  run('{{> foo disallow-{=1}}',
-      "Expected");
-  run('{{> foo disallow-(=1}}',
-      "Expected");
-  run('{{> foo disallow-}=1}}',
-      "Expected");
-  run('{{> foo disallow-)=1}}',
-      "Expected");
-  run('{{> foo x=1 y=2 z}}',
-      "Can't have a non-keyword argument");
-
-  run('{{true.foo}}', "Can't use");
-  run('{{foo.this}}', "Can only use");
-  run('{{./this}}', "Can only use");
-  run('{{../this}}', "Can only use");
-
-  run('{{foo "="}}', {type: 'DOUBLE', path: ['foo'],
-                        args: [['STRING', '=']]});
-
-  run('{{| asdf', { type: 'ESCAPE', value: '{{' });
-  run('{{{| asdf', { type: 'ESCAPE', value: '{{{' });
-  run('{{{{| asdf', { type: 'ESCAPE', value: '{{{{' });
-});
-
-
-Tinytest.add("spacebars-compiler - Spacebars.dot", function (test) {
-  test.equal(Spacebars.dot(null, 'foo'), null);
-  test.equal(Spacebars.dot('foo', 'foo'), undefined);
-  test.equal(Spacebars.dot({x:1}, 'x'), 1);
-  test.equal(Spacebars.dot(
-    {x:1, y: function () { return this.x+1; }}, 'y')(), 2);
-  test.equal(Spacebars.dot(
-    function () {
-      return {x:1, y: function () { return this.x+1; }};
-    }, 'y')(), 2);
-
-  var m = 1;
-  var mget = function () {
-    return {
-      answer: m,
-      getAnswer: function () {
-        return this.answer;
-      }
-    };
-  };
-  var mgetDotAnswer = Spacebars.dot(mget, 'answer');
-  test.equal(mgetDotAnswer, 1);
-
-  m = 3;
-  var mgetDotGetAnswer = Spacebars.dot(mget, 'getAnswer');
-  test.equal(mgetDotGetAnswer(), 3);
-  m = 4;
-  test.equal(mgetDotGetAnswer(), 3);
-
-  var closet = {
-    mget: mget,
-    mget2: function () {
-      return this.mget();
-    }
-  };
-
-  m = 5;
-  var f1 = Spacebars.dot(closet, 'mget', 'answer');
-  m = 6;
-  var f2 = Spacebars.dot(closet, 'mget2', 'answer');
-  test.equal(f2, 6);
-  m = 8;
-  var f3 = Spacebars.dot(closet, 'mget2', 'getAnswer');
-  m = 9;
-  test.equal(f3(), 8);
-
-  test.equal(Spacebars.dot(0, 'abc', 'def'), 0);
-  test.equal(Spacebars.dot(function () { return null; }, 'abc', 'def'), null);
-  test.equal(Spacebars.dot(function () { return 0; }, 'abc', 'def'), 0);
-
-  // test that in `foo.bar`, `bar` may be a function that takes arguments.
-  test.equal(Spacebars.dot(
-    { one: 1, inc: function (x) { return this.one + x; } }, 'inc')(6), 7);
-  test.equal(Spacebars.dot(
-    function () {
-      return { one: 1, inc: function (x) { return this.one + x; } };
-    }, 'inc')(8), 9);
-
-});
-
-//////////////////////////////////////////////////
-
-Tinytest.add("spacebars-compiler - parse", function (test) {
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('{{foo}}')),
-             'SpacebarsCompiler.TemplateTag({type: "DOUBLE", path: ["foo"]})');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('{{!foo}}')), 'null');
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('x{{!foo}}y')), '"xy"');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('{{!--foo--}}')), 'null');
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('x{{!--foo--}}y')), '"xy"');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('{{#foo}}x{{/foo}}')),
-             'SpacebarsCompiler.TemplateTag({type: "BLOCKOPEN", path: ["foo"], content: "x"})');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('{{#foo}}{{#bar}}{{/bar}}{{/foo}}')),
-             'SpacebarsCompiler.TemplateTag({type: "BLOCKOPEN", path: ["foo"], content: SpacebarsCompiler.TemplateTag({type: "BLOCKOPEN", path: ["bar"]})})');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<div>hello</div> {{#foo}}<div>{{#bar}}world{{/bar}}</div>{{/foo}}')),
-             '[HTML.DIV("hello"), " ", SpacebarsCompiler.TemplateTag({type: "BLOCKOPEN", path: ["foo"], content: HTML.DIV(SpacebarsCompiler.TemplateTag({type: "BLOCKOPEN", path: ["bar"], content: "world"}))})]');
-
-
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a {{{x}}}></a>');
-  });
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a {{#if x}}{{/if}}></a>');
-  });
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a {{k}}={[v}}></a>');
-  });
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a x{{y}}></a>');
-  });
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a x{{y}}=z></a>');
-  });
-  test.throws(function () {
-    SpacebarsCompiler.parse('<a {{> x}}></a>');
-  });
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<a {{! x--}} b=c{{! x}} {{! x}}></a>')),
-             'HTML.A({b: "c"})');
-
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<a {{!-- x--}} b=c{{ !-- x --}} {{!-- x -- }}></a>')),
-             'HTML.A({b: "c"})');
-
-  // currently, if there are only comments, the attribute is truthy.  This is
-  // because comments are stripped during tokenization.  If we include
-  // comments in the token stream, these cases will become falsy for selected.
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<input selected={{!foo}}>')),
-             'HTML.INPUT({selected: ""})');
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<input selected={{!foo}}{{!bar}}>')),
-             'HTML.INPUT({selected: ""})');
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<input selected={{!--foo--}}>')),
-    'HTML.INPUT({selected: ""})');
-  test.equal(BlazeTools.toJS(SpacebarsCompiler.parse('<input selected={{!--foo--}}{{!--bar--}}>')),
-    'HTML.INPUT({selected: ""})');
-
-});
diff --git a/packages/spacebars-compiler/templatetag.js b/packages/spacebars-compiler/templatetag.js
deleted file mode 100644
index 757096193f..0000000000
--- a/packages/spacebars-compiler/templatetag.js
+++ /dev/null
@@ -1,506 +0,0 @@
-SpacebarsCompiler = {};
-
-// A TemplateTag is the result of parsing a single `{{...}}` tag.
-//
-// The `.type` of a TemplateTag is one of:
-//
-// - `"DOUBLE"` - `{{foo}}`
-// - `"TRIPLE"` - `{{{foo}}}`
-// - `"EXPR"` - `(foo)`
-// - `"COMMENT"` - `{{! foo}}`
-// - `"BLOCKCOMMENT" - `{{!-- foo--}}`
-// - `"INCLUSION"` - `{{> foo}}`
-// - `"BLOCKOPEN"` - `{{#foo}}`
-// - `"BLOCKCLOSE"` - `{{/foo}}`
-// - `"ELSE"` - `{{else}}`
-// - `"ESCAPE"` - `{{|`, `{{{|`, `{{{{|` and so on
-//
-// Besides `type`, the mandatory properties of a TemplateTag are:
-//
-// - `path` - An array of one or more strings.  The path of `{{foo.bar}}`
-//   is `["foo", "bar"]`.  Applies to DOUBLE, TRIPLE, INCLUSION, BLOCKOPEN,
-//   and BLOCKCLOSE.
-//
-// - `args` - An array of zero or more argument specs.  An argument spec
-//   is a two or three element array, consisting of a type, value, and
-//   optional keyword name.  For example, the `args` of `{{foo "bar" x=3}}`
-//   are `[["STRING", "bar"], ["NUMBER", 3, "x"]]`.  Applies to DOUBLE,
-//   TRIPLE, INCLUSION, and BLOCKOPEN.
-//
-// - `value` - A string of the comment's text. Applies to COMMENT and
-//   BLOCKCOMMENT.
-//
-// These additional are typically set during parsing:
-//
-// - `position` - The HTMLTools.TEMPLATE_TAG_POSITION specifying at what sort
-//   of site the TemplateTag was encountered (e.g. at element level or as
-//   part of an attribute value). Its absence implies
-//   TEMPLATE_TAG_POSITION.ELEMENT.
-//
-// - `content` and `elseContent` - When a BLOCKOPEN tag's contents are
-//   parsed, they are put here.  `elseContent` will only be present if
-//   an `{{else}}` was found.
-
-var TEMPLATE_TAG_POSITION = HTMLTools.TEMPLATE_TAG_POSITION;
-
-TemplateTag = SpacebarsCompiler.TemplateTag = function () {
-  HTMLTools.TemplateTag.apply(this, arguments);
-};
-TemplateTag.prototype = new HTMLTools.TemplateTag;
-TemplateTag.prototype.constructorName = 'SpacebarsCompiler.TemplateTag';
-
-var makeStacheTagStartRegex = function (r) {
-  return new RegExp(r.source + /(?![{>!#/])/.source,
-                    r.ignoreCase ? 'i' : '');
-};
-
-// "starts" regexes are used to see what type of template
-// tag the parser is looking at.  They must match a non-empty
-// result, but not the interesting part of the tag.
-var starts = {
-  ESCAPE: /^\{\{(?=\{*\|)/,
-  ELSE: makeStacheTagStartRegex(/^\{\{\s*else(?=[\s}])/i),
-  DOUBLE: makeStacheTagStartRegex(/^\{\{\s*(?!\s)/),
-  TRIPLE: makeStacheTagStartRegex(/^\{\{\{\s*(?!\s)/),
-  BLOCKCOMMENT: makeStacheTagStartRegex(/^\{\{\s*!--/),
-  COMMENT: makeStacheTagStartRegex(/^\{\{\s*!/),
-  INCLUSION: makeStacheTagStartRegex(/^\{\{\s*>\s*(?!\s)/),
-  BLOCKOPEN: makeStacheTagStartRegex(/^\{\{\s*#\s*(?!\s)/),
-  BLOCKCLOSE: makeStacheTagStartRegex(/^\{\{\s*\/\s*(?!\s)/)
-};
-
-var ends = {
-  DOUBLE: /^\s*\}\}/,
-  TRIPLE: /^\s*\}\}\}/,
-  EXPR: /^\s*\)/
-};
-
-var endsString = {
-  DOUBLE: '}}',
-  TRIPLE: '}}}',
-  EXPR: ')'
-};
-
-// Parse a tag from the provided scanner or string.  If the input
-// doesn't start with `{{`, returns null.  Otherwise, either succeeds
-// and returns a SpacebarsCompiler.TemplateTag, or throws an error (using
-// `scanner.fatal` if a scanner is provided).
-TemplateTag.parse = function (scannerOrString) {
-  var scanner = scannerOrString;
-  if (typeof scanner === 'string')
-    scanner = new HTMLTools.Scanner(scannerOrString);
-
-  if (! (scanner.peek() === '{' &&
-         (scanner.rest()).slice(0, 2) === '{{'))
-    return null;
-
-  var run = function (regex) {
-    // regex is assumed to start with `^`
-    var result = regex.exec(scanner.rest());
-    if (! result)
-      return null;
-    var ret = result[0];
-    scanner.pos += ret.length;
-    return ret;
-  };
-
-  var advance = function (amount) {
-    scanner.pos += amount;
-  };
-
-  var scanIdentifier = function (isFirstInPath) {
-    var id = BlazeTools.parseExtendedIdentifierName(scanner);
-    if (! id) {
-      expected('IDENTIFIER');
-    }
-    if (isFirstInPath &&
-        (id === 'null' || id === 'true' || id === 'false'))
-      scanner.fatal("Can't use null, true, or false, as an identifier at start of path");
-
-    return id;
-  };
-
-  var scanPath = function () {
-    var segments = [];
-
-    // handle initial `.`, `..`, `./`, `../`, `../..`, `../../`, etc
-    var dots;
-    if ((dots = run(/^[\.\/]+/))) {
-      var ancestorStr = '.'; // eg `../../..` maps to `....`
-      var endsWithSlash = /\/$/.test(dots);
-
-      if (endsWithSlash)
-        dots = dots.slice(0, -1);
-
-      _.each(dots.split('/'), function(dotClause, index) {
-        if (index === 0) {
-          if (dotClause !== '.' && dotClause !== '..')
-            expected("`.`, `..`, `./` or `../`");
-        } else {
-          if (dotClause !== '..')
-            expected("`..` or `../`");
-        }
-
-        if (dotClause === '..')
-          ancestorStr += '.';
-      });
-
-      segments.push(ancestorStr);
-
-      if (!endsWithSlash)
-        return segments;
-    }
-
-    while (true) {
-      // scan a path segment
-
-      if (run(/^\[/)) {
-        var seg = run(/^[\s\S]*?\]/);
-        if (! seg)
-          error("Unterminated path segment");
-        seg = seg.slice(0, -1);
-        if (! seg && ! segments.length)
-          error("Path can't start with empty string");
-        segments.push(seg);
-      } else {
-        var id = scanIdentifier(! segments.length);
-        if (id === 'this') {
-          if (! segments.length) {
-            // initial `this`
-            segments.push('.');
-          } else {
-            error("Can only use `this` at the beginning of a path.\nInstead of `foo.this` or `../this`, just write `foo` or `..`.");
-          }
-        } else {
-          segments.push(id);
-        }
-      }
-
-      var sep = run(/^[\.\/]/);
-      if (! sep)
-        break;
-    }
-
-    return segments;
-  };
-
-  // scan the keyword portion of a keyword argument
-  // (the "foo" portion in "foo=bar").
-  // Result is either the keyword matched, or null
-  // if we're not at a keyword argument position.
-  var scanArgKeyword = function () {
-    var match = /^([^\{\}\(\)\>#=\s"'\[\]]+)\s*=\s*/.exec(scanner.rest());
-    if (match) {
-      scanner.pos += match[0].length;
-      return match[1];
-    } else {
-      return null;
-    }
-  };
-
-  // scan an argument; succeeds or errors.
-  // Result is an array of two or three items:
-  // type , value, and (indicating a keyword argument)
-  // keyword name.
-  var scanArg = function () {
-    var keyword = scanArgKeyword(); // null if not parsing a kwarg
-    var value = scanArgValue();
-    return keyword ? value.concat(keyword) : value;
-  };
-
-  // scan an argument value (for keyword or positional arguments);
-  // succeeds or errors.  Result is an array of type, value.
-  var scanArgValue = function () {
-    var startPos = scanner.pos;
-    var result;
-    if ((result = BlazeTools.parseNumber(scanner))) {
-      return ['NUMBER', result.value];
-    } else if ((result = BlazeTools.parseStringLiteral(scanner))) {
-      return ['STRING', result.value];
-    } else if (/^[\.\[]/.test(scanner.peek())) {
-      return ['PATH', scanPath()];
-    } else if (run(/^\(/)) {
-      return ['EXPR', scanExpr('EXPR')];
-    } else if ((result = BlazeTools.parseExtendedIdentifierName(scanner))) {
-      var id = result;
-      if (id === 'null') {
-        return ['NULL', null];
-      } else if (id === 'true' || id === 'false') {
-        return ['BOOLEAN', id === 'true'];
-      } else {
-        scanner.pos = startPos; // unconsume `id`
-        return ['PATH', scanPath()];
-      }
-    } else {
-      expected('identifier, number, string, boolean, null, or a sub expression enclosed in "(", ")"');
-    }
-  };
-
-  var scanExpr = function (type) {
-    var endType = type;
-    if (type === 'INCLUSION' || type === 'BLOCKOPEN')
-      endType = 'DOUBLE';
-
-    var tag = new TemplateTag;
-    tag.type = type;
-    tag.path = scanPath();
-    tag.args = [];
-    var foundKwArg = false;
-    while (true) {
-      run(/^\s*/);
-      if (run(ends[endType]))
-        break;
-      else if (/^[})]/.test(scanner.peek())) {
-        expected('`' + endsString[endType] + '`');
-      }
-      var newArg = scanArg();
-      if (newArg.length === 3) {
-        foundKwArg = true;
-      } else {
-        if (foundKwArg)
-          error("Can't have a non-keyword argument after a keyword argument");
-      }
-      tag.args.push(newArg);
-
-      // expect a whitespace or a closing ')' or '}'
-      if (run(/^(?=[\s})])/) !== '')
-        expected('space');
-    }
-
-    return tag;
-  };
-
-  var type;
-
-  var error = function (msg) {
-    scanner.fatal(msg);
-  };
-
-  var expected = function (what) {
-    error('Expected ' + what);
-  };
-
-  // must do ESCAPE first, immediately followed by ELSE
-  // order of others doesn't matter
-  if (run(starts.ESCAPE)) type = 'ESCAPE';
-  else if (run(starts.ELSE)) type = 'ELSE';
-  else if (run(starts.DOUBLE)) type = 'DOUBLE';
-  else if (run(starts.TRIPLE)) type = 'TRIPLE';
-  else if (run(starts.BLOCKCOMMENT)) type = 'BLOCKCOMMENT';
-  else if (run(starts.COMMENT)) type = 'COMMENT';
-  else if (run(starts.INCLUSION)) type = 'INCLUSION';
-  else if (run(starts.BLOCKOPEN)) type = 'BLOCKOPEN';
-  else if (run(starts.BLOCKCLOSE)) type = 'BLOCKCLOSE';
-  else
-    error('Unknown stache tag');
-
-  var tag = new TemplateTag;
-  tag.type = type;
-
-  if (type === 'BLOCKCOMMENT') {
-    var result = run(/^[\s\S]*?--\s*?\}\}/);
-    if (! result)
-      error("Unclosed block comment");
-    tag.value = result.slice(0, result.lastIndexOf('--'));
-  } else if (type === 'COMMENT') {
-    var result = run(/^[\s\S]*?\}\}/);
-    if (! result)
-      error("Unclosed comment");
-    tag.value = result.slice(0, -2);
-  } else if (type === 'BLOCKCLOSE') {
-    tag.path = scanPath();
-    if (! run(ends.DOUBLE))
-      expected('`}}`');
-  } else if (type === 'ELSE') {
-    if (! run(ends.DOUBLE))
-      expected('`}}`');
-  } else if (type === 'ESCAPE') {
-    var result = run(/^\{*\|/);
-    tag.value = '{{' + result.slice(0, -1);
-  } else {
-    // DOUBLE, TRIPLE, BLOCKOPEN, INCLUSION
-    tag = scanExpr(type);
-  }
-
-  return tag;
-};
-
-// Returns a SpacebarsCompiler.TemplateTag parsed from `scanner`, leaving scanner
-// at its original position.
-//
-// An error will still be thrown if there is not a valid template tag at
-// the current position.
-TemplateTag.peek = function (scanner) {
-  var startPos = scanner.pos;
-  var result = TemplateTag.parse(scanner);
-  scanner.pos = startPos;
-  return result;
-};
-
-// Like `TemplateTag.parse`, but in the case of blocks, parse the complete
-// `{{#foo}}...{{/foo}}` with `content` and possible `elseContent`, rather
-// than just the BLOCKOPEN tag.
-//
-// In addition:
-//
-// - Throws an error if `{{else}}` or `{{/foo}}` tag is encountered.
-//
-// - Returns `null` for a COMMENT.  (This case is distinguishable from
-//   parsing no tag by the fact that the scanner is advanced.)
-//
-// - Takes an HTMLTools.TEMPLATE_TAG_POSITION `position` and sets it as the
-//   TemplateTag's `.position` property.
-//
-// - Validates the tag's well-formedness and legality at in its position.
-TemplateTag.parseCompleteTag = function (scannerOrString, position) {
-  var scanner = scannerOrString;
-  if (typeof scanner === 'string')
-    scanner = new HTMLTools.Scanner(scannerOrString);
-
-  var startPos = scanner.pos; // for error messages
-  var result = TemplateTag.parse(scannerOrString);
-  if (! result)
-    return result;
-
-  if (result.type === 'BLOCKCOMMENT')
-    return null;
-
-  if (result.type === 'COMMENT')
-    return null;
-
-  if (result.type === 'ELSE')
-    scanner.fatal("Unexpected {{else}}");
-
-  if (result.type === 'BLOCKCLOSE')
-    scanner.fatal("Unexpected closing template tag");
-
-  position = (position || TEMPLATE_TAG_POSITION.ELEMENT);
-  if (position !== TEMPLATE_TAG_POSITION.ELEMENT)
-    result.position = position;
-
-  if (result.type === 'BLOCKOPEN') {
-    // parse block contents
-
-    // Construct a string version of `.path` for comparing start and
-    // end tags.  For example, `foo/[0]` was parsed into `["foo", "0"]`
-    // and now becomes `foo,0`.  This form may also show up in error
-    // messages.
-    var blockName = result.path.join(',');
-
-    var textMode = null;
-      if (blockName === 'markdown' ||
-          position === TEMPLATE_TAG_POSITION.IN_RAWTEXT) {
-        textMode = HTML.TEXTMODE.STRING;
-      } else if (position === TEMPLATE_TAG_POSITION.IN_RCDATA ||
-                 position === TEMPLATE_TAG_POSITION.IN_ATTRIBUTE) {
-        textMode = HTML.TEXTMODE.RCDATA;
-      }
-      var parserOptions = {
-        getTemplateTag: TemplateTag.parseCompleteTag,
-        shouldStop: isAtBlockCloseOrElse,
-        textMode: textMode
-      };
-    result.content = HTMLTools.parseFragment(scanner, parserOptions);
-
-    if (scanner.rest().slice(0, 2) !== '{{')
-      scanner.fatal("Expected {{else}} or block close for " + blockName);
-
-    var lastPos = scanner.pos; // save for error messages
-    var tmplTag = TemplateTag.parse(scanner); // {{else}} or {{/foo}}
-
-    if (tmplTag.type === 'ELSE') {
-      // parse {{else}} and content up to close tag
-      result.elseContent = HTMLTools.parseFragment(scanner, parserOptions);
-
-      if (scanner.rest().slice(0, 2) !== '{{')
-        scanner.fatal("Expected block close for " + blockName);
-
-      lastPos = scanner.pos;
-      tmplTag = TemplateTag.parse(scanner);
-    }
-
-    if (tmplTag.type === 'BLOCKCLOSE') {
-      var blockName2 = tmplTag.path.join(',');
-      if (blockName !== blockName2) {
-        scanner.pos = lastPos;
-        scanner.fatal('Expected tag to close ' + blockName + ', found ' +
-                      blockName2);
-      }
-    } else {
-      scanner.pos = lastPos;
-      scanner.fatal('Expected tag to close ' + blockName + ', found ' +
-                    tmplTag.type);
-    }
-  }
-
-  var finalPos = scanner.pos;
-  scanner.pos = startPos;
-  validateTag(result, scanner);
-  scanner.pos = finalPos;
-
-  return result;
-};
-
-var isAtBlockCloseOrElse = function (scanner) {
-  // Detect `{{else}}` or `{{/foo}}`.
-  //
-  // We do as much work ourselves before deferring to `TemplateTag.peek`,
-  // for efficiency (we're called for every input token) and to be
-  // less obtrusive, because `TemplateTag.peek` will throw an error if it
-  // sees `{{` followed by a malformed tag.
-  var rest, type;
-  return (scanner.peek() === '{' &&
-          (rest = scanner.rest()).slice(0, 2) === '{{' &&
-          /^\{\{\s*(\/|else\b)/.test(rest) &&
-          (type = TemplateTag.peek(scanner).type) &&
-          (type === 'BLOCKCLOSE' || type === 'ELSE'));
-};
-
-// Validate that `templateTag` is correctly formed and legal for its
-// HTML position.  Use `scanner` to report errors. On success, does
-// nothing.
-var validateTag = function (ttag, scanner) {
-
-  if (ttag.type === 'INCLUSION' || ttag.type === 'BLOCKOPEN') {
-    var args = ttag.args;
-    if (ttag.path[0] === 'each' && args[1] && args[1][0] === 'PATH' &&
-        args[1][1][0] === 'in') {
-      // For slightly better error messages, we detect the each-in case
-      // here in order not to complain if the user writes `{{#each 3 in x}}`
-      // that "3 is not a function"
-    } else {
-      if (args.length > 1 && args[0].length === 2 && args[0][0] !== 'PATH') {
-        // we have a positional argument that is not a PATH followed by
-        // other arguments
-        scanner.fatal("First argument must be a function, to be called on " +
-                      "the rest of the arguments; found " + args[0][0]);
-      }
-    }
-  }
-
-  var position = ttag.position || TEMPLATE_TAG_POSITION.ELEMENT;
-  if (position === TEMPLATE_TAG_POSITION.IN_ATTRIBUTE) {
-    if (ttag.type === 'DOUBLE' || ttag.type === 'ESCAPE') {
-      return;
-    } else if (ttag.type === 'BLOCKOPEN') {
-      var path = ttag.path;
-      var path0 = path[0];
-      if (! (path.length === 1 && (path0 === 'if' ||
-                                   path0 === 'unless' ||
-                                   path0 === 'with' ||
-                                   path0 === 'each'))) {
-        scanner.fatal("Custom block helpers are not allowed in an HTML attribute, only built-in ones like #each and #if");
-      }
-    } else {
-      scanner.fatal(ttag.type + " template tag is not allowed in an HTML attribute");
-    }
-  } else if (position === TEMPLATE_TAG_POSITION.IN_START_TAG) {
-    if (! (ttag.type === 'DOUBLE')) {
-      scanner.fatal("Reactive HTML attributes must either have a constant name or consist of a single {{helper}} providing a dictionary of names and values.  A template tag of type " + ttag.type + " is not allowed here.");
-    }
-    if (scanner.peek() === '=') {
-      scanner.fatal("Template tags are not allowed in attribute names, only in attribute values or in the form of a single {{helper}} that evaluates to a dictionary of name=value pairs.");
-    }
-  }
-
-};
diff --git a/packages/spacebars-tests/.gitignore b/packages/spacebars-tests/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/spacebars-tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/spacebars-tests/README.md b/packages/spacebars-tests/README.md
deleted file mode 100644
index ec37b267c6..0000000000
--- a/packages/spacebars-tests/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/spacebars-tests/assets/markdown_basic.html b/packages/spacebars-tests/assets/markdown_basic.html
deleted file mode 100644
index dbb49ca965..0000000000
--- a/packages/spacebars-tests/assets/markdown_basic.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<p><i>hi</i>
-/each}}</p>
-
-<p><b><i>hi</i></b>
-<b>/each}}</b></p>
-
-<ul>
-<li><i>hi</i></li>
-<li><p>/each}}</p></li>
-<li><p><b><i>hi</i></b></p></li>
-<li><b>/each}}</b></li>
-</ul>
-
-<p>some paragraph to fix showdown's four space parsing below.</p>
-
-<pre><code>&lt;i&gt;hi&lt;/i&gt;
-/each}}
-
-&lt;b&gt;&lt;i&gt;hi&lt;/i&gt;&lt;/b&gt;
-&lt;b&gt;/each}}&lt;/b&gt;
-</code></pre>
-
-<p>&amp;gt</p>
-
-<ul>
-<li>&amp;gt</li>
-</ul>
-
-<p><code>&amp;gt</code></p>
-
-<pre><code>&amp;gt
-</code></pre>
-
-<p>&gt;</p>
-
-<ul>
-<li>&gt;</li>
-</ul>
-
-<p><code>&amp;gt;</code></p>
-
-<pre><code>&amp;gt;
-</code></pre>
-
-<p><code>&lt;i&gt;hi&lt;/i&gt;</code>
-<code>/each}}</code></p>
-
-<p><code>&lt;b&gt;&lt;i&gt;hi&lt;/i&gt;&lt;/b&gt;</code>
-<code>&lt;b&gt;/each}}</code></p>
diff --git a/packages/spacebars-tests/assets/markdown_each1.html b/packages/spacebars-tests/assets/markdown_each1.html
deleted file mode 100644
index 111f7e535b..0000000000
--- a/packages/spacebars-tests/assets/markdown_each1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<p><b></b></p>
-
-<ul>
-<li></li>
-<li><b></b></li>
-</ul>
-
-<p>some paragraph to fix showdown's four space parsing below.</p>
-
-<pre><code>&lt;b&gt;&lt;/b&gt;
-</code></pre>
-
-<p>``</p>
-
-<p><code>&lt;b&gt;&lt;/b&gt;</code></p>
diff --git a/packages/spacebars-tests/assets/markdown_each2.html b/packages/spacebars-tests/assets/markdown_each2.html
deleted file mode 100644
index 52613cfb61..0000000000
--- a/packages/spacebars-tests/assets/markdown_each2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>item</p>
-
-<p><b>item</b></p>
-
-<ul>
-<li><p>item</p></li>
-<li><p><b>item</b></p></li>
-</ul>
-
-<p>some paragraph to fix showdown's four space parsing below.</p>
-
-<pre><code>item
-
-&lt;b&gt;item&lt;/b&gt;
-</code></pre>
-
-<p><code>item</code></p>
-
-<p><code>&lt;b&gt;item&lt;/b&gt;</code></p>
diff --git a/packages/spacebars-tests/assets/markdown_if1.html b/packages/spacebars-tests/assets/markdown_if1.html
deleted file mode 100644
index 378522b316..0000000000
--- a/packages/spacebars-tests/assets/markdown_if1.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>false</p>
-
-<p><b>false</b></p>
-
-<ul>
-<li><p>false</p></li>
-<li><p><b>false</b></p></li>
-</ul>
-
-<p>some paragraph to fix showdown's four space parsing below.</p>
-
-<pre><code>false
-
-&lt;b&gt;false&lt;/b&gt;
-</code></pre>
-
-<p><code>false</code></p>
-
-<p><code>&lt;b&gt;false&lt;/b&gt;</code></p>
diff --git a/packages/spacebars-tests/assets/markdown_if2.html b/packages/spacebars-tests/assets/markdown_if2.html
deleted file mode 100644
index 603c070c8a..0000000000
--- a/packages/spacebars-tests/assets/markdown_if2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>true</p>
-
-<p><b>true</b></p>
-
-<ul>
-<li><p>true</p></li>
-<li><p><b>true</b></p></li>
-</ul>
-
-<p>some paragraph to fix showdown's four space parsing below.</p>
-
-<pre><code>true
-
-&lt;b&gt;true&lt;/b&gt;
-</code></pre>
-
-<p><code>true</code></p>
-
-<p><code>&lt;b&gt;true&lt;/b&gt;</code></p>
diff --git a/packages/spacebars-tests/old_templates.js b/packages/spacebars-tests/old_templates.js
deleted file mode 100644
index e92edcb877..0000000000
--- a/packages/spacebars-tests/old_templates.js
+++ /dev/null
@@ -1,2058 +0,0 @@
-// This file contains templates compiled with a pre-0.9.0 version of
-// spacebars-compiler. We run the entire suite of tests as we had on
-// 0.9.0 against these compiled template. The test suits is found
-// in old_templates_tests.js
-//
-// Why? Packages are published in built form. With Meteor 0.9.1, we
-// didn't bump the major version of the 'templating' package (which
-// would force packages that define templates to publish new versions
-// of their package). Instead, we decided to keep backcompat with the
-// old Blaze runtime APIs.
-//
-// If these tests ever break in the future, and backcompat is too hard
-// to achieve (or undesirable), we can simply bump the major version
-// of the 'templating' package, and get rid of these tests.
-Template.__define__("old_spacebars_template_test_aaa", (function() {
-  var view = this;
-  return "aaa";
-}));
-
-Template.__define__("old_spacebars_template_test_bbb", (function() {
-  var view = this;
-  return "bbb";
-}));
-
-Template.__define__("old_spacebars_template_test_bracketed_this", (function() {
-  var view = this;
-  return [ "[", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("."));
-  }), "]" ];
-}));
-
-Template.__define__("old_spacebars_template_test_span_this", (function() {
-  var view = this;
-  return HTML.SPAN(Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("."));
-  }));
-}));
-
-Template.__define__("old_spacebars_template_test_content", (function() {
-  var view = this;
-  return Blaze.InOuterTemplateScope(view, function() {
-    return Spacebars.include(function() {
-      return Spacebars.call(view.templateContentBlock);
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_elsecontent", (function() {
-  var view = this;
-  return Blaze.InOuterTemplateScope(view, function() {
-    return Spacebars.include(function() {
-      return Spacebars.call(view.templateElseBlock);
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_iftemplate", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("condition"));
-  }, function() {
-    return [ "\n    ", Blaze.InOuterTemplateScope(view, function() {
-      return Spacebars.include(function() {
-        return Spacebars.call(view.templateContentBlock);
-      });
-    }), "\n  " ];
-  }, function() {
-    return [ "\n    ", Blaze.InOuterTemplateScope(view, function() {
-      return Spacebars.include(function() {
-        return Spacebars.call(view.templateElseBlock);
-      });
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_simple_helper", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"), view.lookup("bar"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_dynamic_template", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("foo"));
-}));
-
-Template.__define__("old_spacebars_template_test_interpolate_attribute", (function() {
-  var view = this;
-  return HTML.DIV({
-    "class": function() {
-      return [ "aaa", Spacebars.mustache(view.lookup("foo"), view.lookup("bar")), "zzz" ];
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_dynamic_attrs", (function() {
-  var view = this;
-  return HTML.SPAN(HTML.Attrs(function() {
-    return Spacebars.attrMustache(view.lookup("attrsObj"));
-  }, function() {
-    return Spacebars.attrMustache(view.lookup("singleAttr"));
-  }, function() {
-    return Spacebars.attrMustache(view.lookup("nonexistent"));
-  }), "hi");
-}));
-
-Template.__define__("old_spacebars_template_test_triple", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("html")));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_triple2", (function() {
-  var view = this;
-  return [ "x", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("html")));
-  }), Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("html2")));
-  }), Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("html3")));
-  }), "y" ];
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_args", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.call(view.lookup("bar"));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_args2", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.dataMustache(view.lookup("bar"), Spacebars.kw({
-      q: view.lookup("baz")
-    }));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_dotted_args", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_slashed_args", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("foo"), function() {
-    return "\n    bar\n  ";
-  }, function() {
-    return "\n    baz\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper_function_one_string_arg", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return "bar";
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"), function() {
-      return "\n    content\n  ";
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper_function_one_helper_arg", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.call(view.lookup("bar"));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"), function() {
-      return "\n    content\n  ";
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper_component_one_helper_arg", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("bar"));
-  }, function() {
-    return "\n    content\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper_component_three_helper_args", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.dataMustache(view.lookup("equals"), view.lookup("bar_or_baz"), "bar");
-  }, function() {
-    return "\n    content\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helper_dotted_arg", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return Spacebars.dataMustache(Spacebars.dot(view.lookup("bar"), "baz"), view.lookup("qux"));
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("foo"), function() {
-      return null;
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_nested_content", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return {
-      condition: Spacebars.call(view.lookup("flag"))
-    };
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("old_spacebars_template_test_iftemplate"), function() {
-      return "\n    hello\n  ";
-    }, function() {
-      return "\n    world\n  ";
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_iftemplate2", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return {
-      condition: Spacebars.call(view.lookup("flag"))
-    };
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("old_spacebars_template_test_iftemplate"), function() {
-      return [ "\n    ", Blaze.InOuterTemplateScope(view, function() {
-        return Spacebars.include(function() {
-          return Spacebars.call(view.templateContentBlock);
-        });
-      }), "\n  " ];
-    }, function() {
-      return [ "\n    ", Blaze.InOuterTemplateScope(view, function() {
-        return Spacebars.include(function() {
-          return Spacebars.call(view.templateElseBlock);
-        });
-      }), "\n  " ];
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_nested_content2", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return {
-      flag: Spacebars.call(view.lookup("x"))
-    };
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("old_spacebars_template_test_iftemplate2"), function() {
-      return "\n    hello\n  ";
-    }, function() {
-      return "\n    world\n  ";
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_if", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("bar"));
-    }), "\n  " ];
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("baz"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_if_in_with", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("bar"));
-    }), "\n    ", Blaze.If(function() {
-      return true;
-    }, function() {
-      return [ "\n      ", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("bar"));
-      }), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_each", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("text"));
-    }), "\n  " ];
-  }, function() {
-    return "\n    else-clause\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_dots", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    A\n    ", Spacebars.With(function() {
-      return Spacebars.call(view.lookup("bar"));
-    }, function() {
-      return [ "\n      B\n      \n      ", Blaze.If(function() {
-        return true;
-      }, function() {
-        return [ "\n        C\n        ", Blaze.Each(function() {
-          return Spacebars.call(view.lookup("items"));
-        }, function() {
-          return [ "\n          D\n          \n          ", Spacebars.include(view.lookupTemplate("old_spacebars_template_test_dots_subtemplate")), "\n          ", Spacebars.TemplateWith(function() {
-            return Spacebars.call(view.lookup(".."));
-          }, function() {
-            return Spacebars.include(view.lookupTemplate("old_spacebars_template_test_dots_subtemplate"));
-          }), "\n        " ];
-        }), "\n      " ];
-      }), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_dots_subtemplate", (function() {
-  var view = this;
-  return [ "TITLE\n  1", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("title"));
-  }), "\n  2", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("."), "title"));
-  }), "\n  3", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup(".."), "title"));
-  }), "\n  4", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("..."), "title"));
-  }), "\n\n  GETTITLE\n  5", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("getTitle"), view.lookup("."));
-  }), "\n  6", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("getTitle"), view.lookup(".."));
-  }), "\n  7", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("getTitle"), view.lookup("..."));
-  }) ];
-}));
-
-Template.__define__("old_spacebars_template_test_select_tag", (function() {
-  var view = this;
-  return HTML.SELECT("\n    ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("optgroups"));
-  }, function() {
-    return [ "\n      ", HTML.OPTGROUP({
-      label: function() {
-        return Spacebars.mustache(view.lookup("label"));
-      }
-    }, "\n        ", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("options"));
-    }, function() {
-      return [ "\n          ", HTML.OPTION(HTML.Attrs({
-        value: function() {
-          return Spacebars.mustache(view.lookup("value"));
-        }
-      }, function() {
-        return Spacebars.attrMustache(view.lookup("selectedAttr"));
-      }), Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("label"));
-      })), "\n        " ];
-    }), "\n      "), "\n    " ];
-  }), "\n  ");
-}));
-
-Template.__define__("old_test_template_issue770", (function() {
-  var view = this;
-  return [ Spacebars.With(function() {
-    return Spacebars.call(view.lookup("value1"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  }, function() {
-    return "\n    xxx\n  ";
-  }), "\n\n  ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("value2"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  }, function() {
-    return "\n    xxx\n  ";
-  }), "\n\n  ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("value1"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  }), "\n\n  ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("value2"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  }) ];
-}));
-
-Template.__define__("old_spacebars_template_test_tricky_attrs", (function() {
-  var view = this;
-  return [ HTML.INPUT({
-    type: function() {
-      return Spacebars.mustache(view.lookup("theType"));
-    }
-  }), HTML.INPUT({
-    type: "checkbox",
-    "class": function() {
-      return Spacebars.mustache(view.lookup("theClass"));
-    }
-  }) ];
-}));
-
-Template.__define__("old_spacebars_template_test_no_data", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("."), "foo"));
-  }), Blaze.Unless(function() {
-    return Spacebars.call(Spacebars.dot(view.lookup("."), "bar"));
-  }, function() {
-    return "asdf";
-  }) ];
-}));
-
-Template.__define__("old_spacebars_template_test_textarea", (function() {
-  var view = this;
-  return HTML.TEXTAREA({
-    value: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_textarea2", (function() {
-  var view = this;
-  return HTML.TEXTAREA({
-    value: function() {
-      return Blaze.If(function() {
-        return Spacebars.call(view.lookup("foo"));
-      }, function() {
-        return "</not a tag>";
-      }, function() {
-        return "<also not a tag>";
-      });
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_textarea3", (function() {
-  var view = this;
-  return HTML.TEXTAREA({
-    id: "myTextarea",
-    value: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_textarea_each", (function() {
-  var view = this;
-  return HTML.TEXTAREA({
-    value: function() {
-      return Blaze.Each(function() {
-        return Spacebars.call(view.lookup("foo"));
-      }, function() {
-        return [ "<not a tag ", Blaze.View(function() {
-          return Spacebars.mustache(view.lookup("."));
-        }), " " ];
-      }, function() {
-        return "<>";
-      });
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_defer_in_rendered", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_template_test_defer_in_rendered_subtemplate")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_defer_in_rendered_subtemplate", (function() {
-  var view = this;
-  return "";
-}));
-
-Template.__define__("old_spacebars_template_test_with_someData", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("someData"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }), " ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("bar"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_each_stops", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return "\n    x\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_block_helpers_in_attribute", (function() {
-  var view = this;
-  return HTML.DIV({
-    "class": function() {
-      return Blaze.Each(function() {
-        return Spacebars.call(view.lookup("classes"));
-      }, function() {
-        return Blaze.If(function() {
-          return Spacebars.dataMustache(view.lookup("startsLowerCase"), view.lookup("name"));
-        }, function() {
-          return [ Blaze.View(function() {
-            return Spacebars.mustache(view.lookup("name"));
-          }), " " ];
-        });
-      }, function() {
-        return "none";
-      });
-    }
-  }, "Smurf");
-}));
-
-Template.__define__("old_spacebars_template_test_block_helpers_in_attribute_2", (function() {
-  var view = this;
-  return HTML.INPUT({
-    value: function() {
-      return Blaze.If(function() {
-        return Spacebars.call(view.lookup("foo"));
-      }, function() {
-        return '"';
-      }, function() {
-        return [ "&", HTML.CharRef({
-          html: "&lt;",
-          str: "<"
-        }), "></x>" ];
-      });
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_constant_each_argument", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("someData"));
-  }, function() {
-    return [ "\n    ", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("anArray"));
-    }, function() {
-      return [ "\n      ", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("justReturn"), view.lookup("."));
-      }), "\n    " ];
-    }), "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_basic", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("obj"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("markdown"), function() {
-      return [ "\n", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "\n/each}}\n\n<b>", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "</b>\n<b>/each}}</b>\n\n* ", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "\n* /each}}\n\n* <b>", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "</b>\n* <b>/each}}</b>\n\nsome paragraph to fix showdown's four space parsing below.\n\n    ", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "\n    /each}}\n\n    <b>", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "</b>\n    <b>/each}}</b>\n\n&gt\n\n* &gt\n\n`&gt`\n\n    &gt\n\n&gt;\n\n* &gt;\n\n`&gt;`\n\n    &gt;\n\n`", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "`\n`/each}}`\n\n`<b>", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("hi"));
-      }), "</b>`\n`<b>/each}}`\n\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_if", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("markdown"), function() {
-    return [ "\n\n", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "\n\n<b>", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "</b>\n\n* ", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "\n\n* <b>", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "</b>\n\nsome paragraph to fix showdown's four space parsing below.\n\n    ", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "\n\n    <b>", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "</b>\n\n`", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "`\n\n`<b>", Blaze.If(function() {
-      return Spacebars.call(view.lookup("cond"));
-    }, function() {
-      return "true";
-    }, function() {
-      return "false";
-    }), "</b>`\n\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_each", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("markdown"), function() {
-    return [ "\n\n", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "\n\n<b>", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "</b>\n\n* ", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "\n\n* <b>", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "</b>\n\nsome paragraph to fix showdown's four space parsing below.\n\n    ", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "\n\n    <b>", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "</b>\n\n`", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "`\n\n`<b>", Blaze.Each(function() {
-      return Spacebars.call(view.lookup("seq"));
-    }, function() {
-      return Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("."));
-      });
-    }), "</b>`\n\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_inclusion", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("markdown"), function() {
-    return [ "\n", Spacebars.include(view.lookupTemplate("old_spacebars_template_test_markdown_inclusion_subtmpl")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_inclusion_subtmpl", (function() {
-  var view = this;
-  return HTML.SPAN(Blaze.If(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "Foo is ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }), "." ];
-  }));
-}));
-
-Template.__define__("old_spacebars_template_test_markdown_block_helpers", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("markdown"), function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_template_test_just_content"), function() {
-      return "\nHi there!\n    ";
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_just_content", (function() {
-  var view = this;
-  return Blaze.InOuterTemplateScope(view, function() {
-    return Spacebars.include(function() {
-      return Spacebars.call(view.templateContentBlock);
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_simple_helpers_are_isolated", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_attr_helpers_are_isolated", (function() {
-  var view = this;
-  return HTML.P({
-    attr: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_attr_object_helpers_are_isolated", (function() {
-  var view = this;
-  return HTML.P(HTML.Attrs(function() {
-    return Spacebars.attrMustache(view.lookup("attrs"));
-  }));
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_helpers_are_isolated", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("foo"));
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_helpers_are_isolated_subtemplate", (function() {
-  var view = this;
-  return "";
-}));
-
-Template.__define__("old_spacebars_template_test_nully_attributes0", (function() {
-  var view = this;
-  return HTML.Raw('<input type="checkbox" checked="" stuff="">');
-}));
-
-Template.__define__("old_spacebars_template_test_nully_attributes1", (function() {
-  var view = this;
-  return HTML.INPUT({
-    type: "checkbox",
-    checked: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    },
-    stuff: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_nully_attributes2", (function() {
-  var view = this;
-  return HTML.INPUT({
-    type: "checkbox",
-    checked: function() {
-      return [ Spacebars.mustache(view.lookup("foo")), Spacebars.mustache(view.lookup("bar")) ];
-    },
-    stuff: function() {
-      return [ Spacebars.mustache(view.lookup("foo")), Spacebars.mustache(view.lookup("bar")) ];
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_nully_attributes3", (function() {
-  var view = this;
-  return HTML.INPUT({
-    type: "checkbox",
-    checked: function() {
-      return Blaze.If(function() {
-        return Spacebars.call(view.lookup("foo"));
-      }, function() {
-        return null;
-      });
-    },
-    stuff: function() {
-      return Blaze.If(function() {
-        return Spacebars.call(view.lookup("foo"));
-      }, function() {
-        return null;
-      });
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_double", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_lookup", (function() {
-  var view = this;
-  return [ Spacebars.include(view.lookupTemplate("old_spacebars_template_test_inclusion_lookup_subtmpl")), "\n  ", Spacebars.include(view.lookupTemplate("dataContextSubtmpl")) ];
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_lookup_subtmpl", (function() {
-  var view = this;
-  return "This is the template.";
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_lookup_subtmpl2", (function() {
-  var view = this;
-  return "This is generated by a helper with the same name.";
-}));
-
-Template.__define__("old_spacebars_template_test_inclusion_lookup_subtmpl3", (function() {
-  var view = this;
-  return "This is a template passed in the data context.";
-}));
-
-Template.__define__("old_spacebars_template_test_content_context", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Spacebars.With(function() {
-      return Spacebars.call(view.lookup("bar"));
-    }, function() {
-      return [ "\n      ", Spacebars.TemplateWith(function() {
-        return {
-          condition: Spacebars.call(view.lookup("cond"))
-        };
-      }, function() {
-        return Spacebars.include(view.lookupTemplate("old_spacebars_template_test_iftemplate"), function() {
-          return [ "\n        ", Blaze.View(function() {
-            return Spacebars.mustache(view.lookup("firstLetter"));
-          }), Blaze.View(function() {
-            return Spacebars.mustache(Spacebars.dot(view.lookup(".."), "secondLetter"));
-          }), "\n      " ];
-        }, function() {
-          return [ "\n        ", Blaze.View(function() {
-            return Spacebars.mustache(Spacebars.dot(view.lookup(".."), "firstLetter"));
-          }), Blaze.View(function() {
-            return Spacebars.mustache(view.lookup("secondLetter"));
-          }), "\n      " ];
-        });
-      }), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_control_input", (function() {
-  var view = this;
-  return HTML.INPUT({
-    type: function() {
-      return Spacebars.mustache(view.lookup("type"));
-    },
-    value: function() {
-      return Spacebars.mustache(view.lookup("value"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_test_control_textarea", (function() {
-  var view = this;
-  return HTML.TEXTAREA({
-    value: function() {
-      return Spacebars.mustache(view.lookup("value"));
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_test_control_select", (function() {
-  var view = this;
-  return HTML.SELECT("\n    ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return [ "\n      ", HTML.OPTION({
-      selected: function() {
-        return Spacebars.mustache(view.lookup("selected"));
-      }
-    }, Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    })), "\n    " ];
-  }), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_control_radio", (function() {
-  var view = this;
-  return [ "Band:\n\n  ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("bands"));
-  }, function() {
-    return [ "\n    ", HTML.INPUT({
-      name: "bands",
-      type: "radio",
-      value: function() {
-        return Spacebars.mustache(view.lookup("."));
-      },
-      checked: function() {
-        return Spacebars.mustache(view.lookup("isChecked"));
-      }
-    }), "\n  " ];
-  }), "\n\n  ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("band"));
-  }) ];
-}));
-
-Template.__define__("old_spacebars_test_control_checkbox", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("labels"));
-  }, function() {
-    return [ "\n    ", HTML.INPUT({
-      type: "checkbox",
-      value: function() {
-        return Spacebars.mustache(view.lookup("."));
-      },
-      checked: function() {
-        return Spacebars.mustache(view.lookup("isChecked"));
-      }
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_nonexistent_template", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("this_template_lives_in_outer_space"));
-}));
-
-Template.__define__("old_spacebars_test_if_helper", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return "\n    true\n  ";
-  }, function() {
-    return "\n    false\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_block_helper_function", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("foo"), function() {
-    return "\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_onetwo", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("showOne"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("one")), "\n  " ];
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("two")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_onetwo_attribute", (function() {
-  var view = this;
-  return HTML.BR({
-    "data-stuff": function() {
-      return Blaze.If(function() {
-        return Spacebars.call(view.lookup("showOne"));
-      }, function() {
-        return [ "\n    ", Spacebars.include(view.lookupTemplate("one")), "\n  " ];
-      }, function() {
-        return [ "\n    ", Spacebars.include(view.lookupTemplate("two")), "\n  " ];
-      });
-    }
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with1", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    one\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with2", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    two\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_each1", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    one\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_each2", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    two\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_each1", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_helpers_stop_with_each3")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_each2", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_helpers_stop_with_each3")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_each3", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("."));
-  }, function() {
-    return "\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_if1", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    one\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_if2", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    two\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_inclusion1", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("options"));
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_inclusion2", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("options"));
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_inclusion3", (function() {
-  var view = this;
-  return "blah";
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_callbacks1", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_helpers_stop_with_callbacks3")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_callbacks2", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_helpers_stop_with_callbacks3")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_with_callbacks3", (function() {
-  var view = this;
-  return "blah";
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_unless1", (function() {
-  var view = this;
-  return Blaze.Unless(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    one\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_stop_unless2", (function() {
-  var view = this;
-  return Blaze.Unless(function() {
-    return Spacebars.call(view.lookup("options"));
-  }, function() {
-    return "\n    two\n  ";
-  });
-}));
-
-Template.__define__("old_spacebars_test_no_data_context", (function() {
-  var view = this;
-  return [ HTML.Raw("<button></button>\n  "), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }) ];
-}));
-
-Template.__define__("old_spacebars_test_falsy_with", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("obj"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("greekLetter"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_dont_leak", (function() {
-  var view = this;
-  return Spacebars.TemplateWith(function() {
-    return {
-      foo: Spacebars.call("correct")
-    };
-  }, function() {
-    return Spacebars.include(view.lookupTemplate("old_spacebars_test_helpers_dont_leak2"));
-  });
-}));
-
-Template.__define__("old_spacebars_test_helpers_dont_leak2", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("bar"));
-  }), " ", Spacebars.include(view.lookupTemplate("old_spacebars_template_test_content"), function() {
-    return Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("bonus"));
-    });
-  }) ];
-}));
-
-Template.__define__("old_spacebars_test_event_returns_false", (function() {
-  var view = this;
-  return HTML.Raw('<a href="#bad-url" id="spacebars_test_event_returns_false_link">click me</a>');
-}));
-
-Template.__define__("old_spacebars_test_event_selectors1", (function() {
-  var view = this;
-  return HTML.DIV(Spacebars.include(view.lookupTemplate("old_spacebars_test_event_selectors2")));
-}));
-
-Template.__define__("old_spacebars_test_event_selectors2", (function() {
-  var view = this;
-  return HTML.Raw('<p class="p1">Not it</p>\n  <div><p class="p2">It</p></div>');
-}));
-
-Template.__define__("old_spacebars_test_event_selectors_capturing1", (function() {
-  var view = this;
-  return HTML.DIV(Spacebars.include(view.lookupTemplate("old_spacebars_test_event_selectors_capturing2")));
-}));
-
-Template.__define__("old_spacebars_test_event_selectors_capturing2", (function() {
-  var view = this;
-  return HTML.Raw('<video class="video1">\n    <source id="mp4" src="http://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">\n  </video>\n  <div>\n    <video class="video2">\n      <source id="mp4" src="http://media.w3.org/2010/05/sintel/trailer.mp4" type="video/mp4">\n    </video>\n  </div>');
-}));
-
-Template.__define__("old_spacebars_test_tables1", (function() {
-  var view = this;
-  return HTML.TABLE(HTML.TR(HTML.TD("Foo")));
-}));
-
-Template.__define__("old_spacebars_test_tables2", (function() {
-  var view = this;
-  return HTML.TABLE(HTML.TR(HTML.TD(Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }))));
-}));
-
-Template.__define__("old_spacebars_test_jquery_events", (function() {
-  var view = this;
-  return HTML.Raw('<button type="button">button</button>');
-}));
-
-Template.__define__("old_spacebars_test_tohtml_basic", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  });
-}));
-
-Template.__define__("old_spacebars_test_tohtml_if", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return true;
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_tohtml_with", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_tohtml_each", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("foos"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_tohtml_include_with", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("old_spacebars_test_tohtml_with"));
-}));
-
-Template.__define__("old_spacebars_test_tohtml_include_each", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("old_spacebars_test_tohtml_each"));
-}));
-
-Template.__define__("old_spacebars_test_block_comment", (function() {
-  var view = this;
-  return "\n  ";
-}));
-
-Template.__define__("old_spacebars_test_with_mutated_data_context", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("value"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_url_attribute", (function() {
-  var view = this;
-  return [ HTML.A({
-    href: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  }), "\n  ", HTML.A({
-    href: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  }), "\n  ", HTML.FORM({
-    action: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  }), "\n  ", HTML.IMG({
-    src: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  }), "\n  ", HTML.INPUT({
-    value: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  }) ];
-}));
-
-Template.__define__("old_spacebars_test_event_handler_cleanup", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_event_handler_cleanup_sub")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_event_handler_cleanup_sub", (function() {
-  var view = this;
-  return HTML.Raw("<div></div>");
-}));
-
-Template.__define__("old_spacebars_test_data_context_for_event_handler_in_if", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return {
-      foo: Spacebars.call("bar")
-    };
-  }, function() {
-    return [ "\n    ", Blaze.If(function() {
-      return true;
-    }, function() {
-      return [ "\n      ", HTML.SPAN("Click me!"), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_each_with_autorun_insert", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("name"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_ui_hooks", (function() {
-  var view = this;
-  return HTML.DIV({
-    "class": "test-ui-hooks"
-  }, "\n    ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return [ "\n      ", HTML.DIV({
-      "class": "item"
-    }, Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("_id"));
-    })), "\n    " ];
-  }), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_ui_hooks_nested", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_ui_hooks_nested_sub")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_ui_hooks_nested_sub", (function() {
-  var view = this;
-  return HTML.DIV("\n    ", Spacebars.With(function() {
-    return true;
-  }, function() {
-    return [ "\n      ", HTML.P("hello"), "\n    " ];
-  }), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_template_instance_helper", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return true;
-  }, function() {
-    return Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    });
-  });
-}));
-
-Template.__define__("old_spacebars_test_with_cleanup", (function() {
-  var view = this;
-  return HTML.DIV({
-    "class": "test-with-cleanup"
-  }, "\n    ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n      ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    }), "\n    " ];
-  }), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_template_parent_data_helper", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return "parent";
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_template_parent_data_helper_child")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_template_parent_data_helper_child", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("a"));
-  }, function() {
-    return [ "\n    ", Spacebars.With(function() {
-      return Spacebars.call(view.lookup("b"));
-    }, function() {
-      return [ "\n      ", Blaze.If(function() {
-        return Spacebars.call(view.lookup("c"));
-      }, function() {
-        return [ "\n        ", Spacebars.With(function() {
-          return "d";
-        }, function() {
-          return [ "\n          ", Blaze.View(function() {
-            return Spacebars.mustache(view.lookup("foo"));
-          }), "\n        " ];
-        }), "\n      " ];
-      }), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_svg_anchor", (function() {
-  var view = this;
-  return HTML.SVG("\n    ", HTML.A({
-    "xlink:href": "http://www.example.com"
-  }, "Foo"), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_template_created_rendered_destroyed_each", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("items"));
-  }, function() {
-    return [ "\n    ", HTML.DIV(Spacebars.TemplateWith(function() {
-      return Spacebars.call(view.lookup("_id"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("old_spacebars_test_template_created_rendered_destroyed_each_sub"));
-    })), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_template_created_rendered_destroyed_each_sub", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("."));
-  });
-}));
-
-Template.__define__("old_spacebars_test_ui_getElementData", (function() {
-  var view = this;
-  return HTML.Raw("<span></span>");
-}));
-
-Template.__define__("old_spacebars_test_ui_render", (function() {
-  var view = this;
-  return HTML.SPAN(Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("greeting"));
-  }), " ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("r"));
-  }));
-}));
-
-Template.__define__("old_spacebars_test_parent_removal", (function() {
-  var view = this;
-  return HTML.DIV({
-    "class": "a"
-  }, "\n    ", HTML.DIV({
-    "class": "b"
-  }, "\n      ", HTML.DIV({
-    "class": "toremove"
-  }, "\n        ", HTML.DIV({
-    "class": "c"
-  }, "\n          ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("A"), 1);
-  }), "\n          ", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("A"), 2));
-  }), "\n          ", Spacebars.With(function() {
-    return Spacebars.dataMustache(view.lookup("A"), 3);
-  }, function() {
-    return [ "\n            ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("A"), 4);
-    }), "\n            ", Spacebars.With(function() {
-      return Spacebars.dataMustache(view.lookup("A"), 5);
-    }, function() {
-      return [ "\n              ", Blaze.View(function() {
-        return Spacebars.mustache(view.lookup("A"), 6);
-      }), "\n            " ];
-    }), "\n          " ];
-  }), "\n          ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("B"));
-  }, function() {
-    return [ "\n            ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("A"), 7);
-    }), "\n          " ];
-  }), "\n          ", Blaze.If(function() {
-    return Spacebars.dataMustache(view.lookup("A"), 8);
-  }, function() {
-    return [ "\n            ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("A"), 9);
-    }), "\n          " ];
-  }, function() {
-    return [ "\n            ", Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("A"), "a");
-    }), "\n          " ];
-  }), "\n        "), "\n      "), "\n    "), "\n  ");
-}));
-
-Template.__define__("old_spacebars_test_focus_blur_outer", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("cond"));
-  }, function() {
-    return [ "\n    a ", Spacebars.include(view.lookupTemplate("old_spacebars_test_focus_blur_inner")), "\n  " ];
-  }, function() {
-    return [ "\n    b ", Spacebars.include(view.lookupTemplate("old_spacebars_test_focus_blur_inner")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_focus_blur_inner", (function() {
-  var view = this;
-  return HTML.Raw('<input type="text">');
-}));
-
-Template.__define__("old_spacebars_test_event_cleanup_on_destroyed_outer", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("cond"));
-  }, function() {
-    return [ "\n    ", HTML.DIV("a ", Spacebars.include(view.lookupTemplate("old_spacebars_test_event_cleanup_on_destroyed_inner"))), "\n  " ];
-  }, function() {
-    return [ "\n    ", HTML.DIV("b ", Spacebars.include(view.lookupTemplate("old_spacebars_test_event_cleanup_on_destroyed_inner"))), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_event_cleanup_on_destroyed_inner", (function() {
-  var view = this;
-  return HTML.Raw("<span>foo</span>");
-}));
-
-Template.__define__("old_spacebars_test_isolated_lookup_inclusion", (function() {
-  var view = this;
-  return "x";
-}));
-
-Template.__define__("old_spacebars_test_isolated_lookup1", (function() {
-  var view = this;
-  return [ Spacebars.include(view.lookupTemplate("foo")), "--", Spacebars.include(view.lookupTemplate("old_spacebars_test_isolated_lookup_inclusion")) ];
-}));
-
-Template.__define__("old_spacebars_test_isolated_lookup2", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n    ", Spacebars.With(function() {
-      return {
-        z: Spacebars.call(1)
-      };
-    }, function() {
-      return [ "\n      ", Spacebars.include(view.lookupTemplate("..")), "--", Spacebars.include(view.lookupTemplate("old_spacebars_test_isolated_lookup_inclusion")), "\n    " ];
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_isolated_lookup3", (function() {
-  var view = this;
-  return [ Spacebars.include(view.lookupTemplate("bar")), "--", Spacebars.include(view.lookupTemplate("old_spacebars_test_isolated_lookup_inclusion")) ];
-}));
-
-Template.__define__("old_spacebars_test_current_view_in_event", (function() {
-  var view = this;
-  return HTML.SPAN(Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("."));
-  }));
-}));
-
-Template.__define__("old_spacebars_test_textarea_attrs", (function() {
-  var view = this;
-  return HTML.TEXTAREA(HTML.Attrs(function() {
-    return Spacebars.attrMustache(view.lookup("attrs"));
-  }));
-}));
-
-Template.__define__("old_spacebars_test_textarea_attrs_contents", (function() {
-  var view = this;
-  return HTML.TEXTAREA(HTML.Attrs(function() {
-    return Spacebars.attrMustache(view.lookup("attrs"));
-  }, {
-    value: function() {
-      return [ "Hello ", Spacebars.mustache(view.lookup("name")) ];
-    }
-  }));
-}));
-
-Template.__define__("old_spacebars_test_textarea_attrs_array_contents", (function() {
-  var view = this;
-  return HTML.TEXTAREA(HTML.Attrs({
-    "class": "bar"
-  }, function() {
-    return Spacebars.attrMustache(view.lookup("attrs"));
-  }, {
-    value: function() {
-      return [ "Hello ", Spacebars.mustache(view.lookup("name")) ];
-    }
-  }));
-}));
-
-Template.__define__("old_spacebars_test_autorun", (function() {
-  var view = this;
-  return Blaze.If(function() {
-    return Spacebars.call(view.lookup("show"));
-  }, function() {
-    return [ "\n    ", Spacebars.include(view.lookupTemplate("old_spacebars_test_autorun_inner")), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_autorun_inner", (function() {
-  var view = this;
-  return "Hello";
-}));
-
-Template.__define__("old_spacebars_test_contentBlock_arg", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("old_spacebars_test_contentBlock_arg_inner"), function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(Spacebars.dot(view.lookup("."), "bar"));
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_test_contentBlock_arg_inner", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return {
-      foo: Spacebars.call("AAA"),
-      bar: Spacebars.call("BBB")
-    };
-  }, function() {
-    return [ "\n    ", Blaze.View(function() {
-      return Spacebars.mustache(Spacebars.dot(view.lookup("."), "foo"));
-    }), " ", Blaze.InOuterTemplateScope(view, function() {
-      return Spacebars.TemplateWith(function() {
-        return Spacebars.call(view.lookup("."));
-      }, function() {
-        return Spacebars.include(function() {
-          return Spacebars.call(view.templateContentBlock);
-        });
-      });
-    }), "\n  " ];
-  });
-}));
-
-Template.__define__("old_spacebars_template_test_input_field_to_same_value", (function() {
-  var view = this;
-  return HTML.INPUT({
-    type: "text",
-    value: function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }
-  });
-}));
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-Template.__define__("old_test_assembly_a0", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("test_assembly_a1"));
-}));
-
-Template.__define__("old_test_assembly_a1", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("test_assembly_a2"));
-}));
-
-Template.__define__("old_test_assembly_a2", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("test_assembly_a3"));
-}));
-
-Template.__define__("old_test_assembly_a3", (function() {
-  var view = this;
-  return "Hi";
-}));
-
-Template.__define__("old_test_assembly_b0", (function() {
-  var view = this;
-  return Spacebars.include(view.lookupTemplate("test_assembly_b1"));
-}));
-
-Template.__define__("old_test_assembly_b1", (function() {
-  var view = this;
-  return [ "x", Blaze.If(function() {
-    return Spacebars.call(view.lookup("stuff"));
-  }, function() {
-    return "y";
-  }), Spacebars.include(view.lookupTemplate("test_assembly_b2")) ];
-}));
-
-Template.__define__("old_test_assembly_b2", (function() {
-  var view = this;
-  return "hi";
-}));
-
-Template.__define__("old_test_table_b0", (function() {
-  var view = this;
-  return HTML.TABLE("\n    ", HTML.TBODY("\n      ", Spacebars.include(view.lookupTemplate("test_table_b1")), "\n      ", Spacebars.include(view.lookupTemplate("test_table_b1")), "\n      ", Spacebars.include(view.lookupTemplate("test_table_b1")), "\n    "), "\n  ");
-}));
-
-Template.__define__("old_test_table_b1", (function() {
-  var view = this;
-  return HTML.TR("\n    ", Spacebars.include(view.lookupTemplate("test_table_b2")), "\n  ");
-}));
-
-Template.__define__("old_test_table_b2", (function() {
-  var view = this;
-  return HTML.TD("\n    ", Spacebars.include(view.lookupTemplate("test_table_b3")), "\n  ");
-}));
-
-Template.__define__("old_test_table_b3", (function() {
-  var view = this;
-  return "Foo.";
-}));
-
-Template.__define__("old_test_table_each", (function() {
-  var view = this;
-  return HTML.TABLE("\n    ", HTML.TBODY("\n      ", Blaze.Each(function() {
-    return Spacebars.call(view.lookup("foo"));
-  }, function() {
-    return [ "\n        ", HTML.TR(HTML.TD(Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("bar"));
-    }))), "\n      " ];
-  }), "\n    "), "\n  ");
-}));
-
-Template.__define__("old_test_event_data_with", (function() {
-  var view = this;
-  return HTML.DIV("\n  xxx\n  ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("TWO"));
-  }, function() {
-    return [ "\n    ", HTML.DIV("\n      xxx\n      ", Spacebars.With(function() {
-      return Spacebars.call(view.lookup("THREE"));
-    }, function() {
-      return [ "\n        ", HTML.DIV("\n          xxx\n        "), "\n      " ];
-    }), "\n    "), "\n  " ];
-  }), "\n");
-}));
-
-Template.__define__("old_test_capture_events", (function() {
-  var view = this;
-  return HTML.Raw('<video class="video1">\n    <source id="mp4" src="" type="video/mp4">\n  </video>\n  <video class="video2">\n    <source id="mp4" src="" type="video/mp4">\n  </video>\n  <video class="video2">\n    <source id="mp4" src="" type="video/mp4">\n  </video>');
-}));
-
-Template.__define__("old_test_safestring_a", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }), " ", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("foo")));
-  }), " ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("bar"));
-  }), " ", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("bar")));
-  }), "\n  ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("fooprop"));
-  }), " ", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("fooprop")));
-  }), " ", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("barprop"));
-  }), " ", Blaze.View(function() {
-    return Spacebars.makeRaw(Spacebars.mustache(view.lookup("barprop")));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_a", (function() {
-  var view = this;
-  return [ "platypus=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("platypus"));
-  }), "\n  watermelon=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("watermelon"));
-  }), "\n  daisy=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("daisy"));
-  }), "\n  tree=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("tree"));
-  }), "\n  warthog=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("warthog"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_b", (function() {
-  var view = this;
-  return [ "unknown=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("unknown"));
-  }), "\n  zero=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("zero"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_c", (function() {
-  var view = this;
-  return [ "platypus.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("platypus"), "X"));
-  }), "\n  watermelon.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("watermelon"), "X"));
-  }), "\n  daisy.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("daisy"), "X"));
-  }), "\n  tree.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("tree"), "X"));
-  }), "\n  warthog.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("warthog"), "X"));
-  }), "\n  getNull.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("getNull"), "X"));
-  }), "\n  getUndefined.X=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("getUndefined"), "X"));
-  }), "\n  getUndefined.X.Y=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("getUndefined"), "X", "Y"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_d", (function() {
-  var view = this;
-  return [ "daisygetter=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("daisygetter"));
-  }), "\n  thisTest=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("thisTest"));
-  }), "\n  ", Spacebars.With(function() {
-    return Spacebars.call(view.lookup("fancy"));
-  }, function() {
-    return [ "\n    ../thisTest=", Blaze.View(function() {
-      return Spacebars.mustache(Spacebars.dot(view.lookup(".."), "thisTest"));
-    }), "\n  " ];
-  }), "\n  ", Spacebars.With(function() {
-    return "foo";
-  }, function() {
-    return [ "\n    ../fancy.currentFruit=", Blaze.View(function() {
-      return Spacebars.mustache(Spacebars.dot(view.lookup(".."), "fancy", "currentFruit"));
-    }), "\n  " ];
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_e", (function() {
-  var view = this;
-  return [ "fancy.foo=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "foo"));
-  }), "\n  fancy.apple.banana=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "apple", "banana"));
-  }), "\n  fancy.currentFruit=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "currentFruit"));
-  }), "\n  fancy.currentCountry.name=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "currentCountry", "name"));
-  }), "\n  fancy.currentCountry.population=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "currentCountry", "population"));
-  }), "\n  fancy.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancy"), "currentCountry", "unicorns"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_f", (function() {
-  var view = this;
-  return [ "fancyhelper.foo=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "foo"));
-  }), "\n  fancyhelper.apple.banana=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "apple", "banana"));
-  }), "\n  fancyhelper.currentFruit=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"));
-  }), "\n  fancyhelper.currentCountry.name=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "name"));
-  }), "\n  fancyhelper.currentCountry.population=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "population"));
-  }), "\n  fancyhelper.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_g", (function() {
-  var view = this;
-  return [ "platypus=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("platypus"));
-  }), "\n  this.platypus=", Blaze.View(function() {
-    return Spacebars.mustache(Spacebars.dot(view.lookup("."), "platypus"));
-  }) ];
-}));
-
-Template.__define__("old_test_helpers_h", (function() {
-  var view = this;
-  return [ "(methodListFour 6 7 8 9=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("methodListFour"), 6, 7, 8, 9);
-  }), ")\n  (methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("methodListFour"), view.lookup("platypus"), view.lookup("thisTest"), Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"), Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns"));
-  }), ")\n  (methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("methodListFour"), view.lookup("platypus"), view.lookup("thisTest"), Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"), Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns"), Spacebars.kw({
-      a: view.lookup("platypus"),
-      b: view.lookup("thisTest"),
-      c: Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"),
-      d: Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns")
-    }));
-  }), ")\n  (helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("helperListFour"), view.lookup("platypus"), view.lookup("thisTest"), Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"), Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns"));
-  }), ")\n  (helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns=", Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("helperListFour"), view.lookup("platypus"), view.lookup("thisTest"), Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"), Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns"), Spacebars.kw({
-      a: view.lookup("platypus"),
-      b: view.lookup("thisTest"),
-      c: Spacebars.dot(view.lookup("fancyhelper"), "currentFruit"),
-      d: Spacebars.dot(view.lookup("fancyhelper"), "currentCountry", "unicorns")
-    }));
-  }), ")" ];
-}));
-
-Template.__define__("old_test_render_a", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }), HTML.Raw("<br><hr>") ];
-}));
-
-Template.__define__("old_test_render_b", (function() {
-  var view = this;
-  return Spacebars.With(function() {
-    return 200;
-  }, function() {
-    return [ Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }), HTML.BR(), HTML.HR() ];
-  });
-}));
-
-Template.__define__("old_test_render_c", (function() {
-  var view = this;
-  return HTML.Raw("<br><hr>");
-}));
-
-Template.__define__("old_test_template_arg_a", (function() {
-  var view = this;
-  return HTML.Raw("<b>Foo</b> <i>Bar</i> <u>Baz</u>");
-}));
-
-Template.__define__("old_test_template_helpers_a", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("foo"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("bar"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("baz"));
-  }) ];
-}));
-
-Template.__define__("old_test_template_helpers_b", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("name"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("arity"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("toString"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("length"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("var"));
-  }) ];
-}));
-
-Template.__define__("old_test_template_helpers_c", (function() {
-  var view = this;
-  return [ Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("name"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("arity"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("length"));
-  }), Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("var"));
-  }), "x" ];
-}));
-
-Template.__define__("old_test_template_events_a", (function() {
-  var view = this;
-  return HTML.Raw("<b>foo</b><u>bar</u><i>baz</i>");
-}));
-
-Template.__define__("old_test_template_events_b", (function() {
-  var view = this;
-  return HTML.Raw("<b>foo</b><u>bar</u><i>baz</i>");
-}));
-
-Template.__define__("old_test_template_events_c", (function() {
-  var view = this;
-  return HTML.Raw("<b>foo</b><u>bar</u><i>baz</i>");
-}));
-
-Template.__define__("old_test_type_casting", (function() {
-  var view = this;
-  return Blaze.View(function() {
-    return Spacebars.mustache(view.lookup("testTypeCasting"), "true", "false", true, false, 0, 1, -1, 10, -10);
-  });
-}));
-
-Template.__define__("old_test_template_issue801", (function() {
-  var view = this;
-  return Blaze.Each(function() {
-    return Spacebars.call(view.lookup("values"));
-  }, function() {
-    return Blaze.View(function() {
-      return Spacebars.mustache(view.lookup("."));
-    });
-  });
-}));
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/packages/spacebars-tests/old_templates_tests.js b/packages/spacebars-tests/old_templates_tests.js
deleted file mode 100644
index e034a8c5dc..0000000000
--- a/packages/spacebars-tests/old_templates_tests.js
+++ /dev/null
@@ -1,2749 +0,0 @@
-//
-// This file is used to ensure old built templates still work with the
-// new Blaze APIs. More in a comment at the top of old_templates.js
-//
-
-var divRendersTo = function (test, div, html) {
-  Tracker.flush({_throwFirstError: true});
-  var actual = canonicalizeHtml(div.innerHTML);
-  test.equal(actual, html);
-};
-
-var nodesToArray = function (array) {
-  // Starting in underscore 1.4, _.toArray does not work right on a node
-  // list in IE8. This is a workaround to support IE8.
-  return _.map(array, _.identity);
-};
-
-Tinytest.add("spacebars-tests - old - template_tests - simple helper", function (test) {
-  var tmpl = Template.old_spacebars_template_test_simple_helper;
-  var R = ReactiveVar(1);
-  tmpl.foo = function (x) {
-    return x + R.get();
-  };
-  tmpl.bar = function () {
-    return 123;
-  };
-  var div = renderToDiv(tmpl);
-
-  test.equal(canonicalizeHtml(div.innerHTML), "124");
-  R.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "125");
-
-  // Test that `{{foo bar}}` throws if `foo` is missing or not a function.
-  tmpl.foo = 3;
-  test.throws(function () {
-    renderToDiv(tmpl);
-  }, /Can't call non-function/);
-
-  delete tmpl.foo;
-  test.throws(function () {
-    renderToDiv(tmpl);
-  }, /No such function/);
-
-  tmpl.foo = function () {};
-  // doesn't throw
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-
-  // now "foo" is a function in the data context
-  delete tmpl.foo;
-
-  R = ReactiveVar(1);
-  div = renderToDiv(tmpl, { foo: function (x) {
-    return x + R.get();
-  } });
-  test.equal(canonicalizeHtml(div.innerHTML), "124");
-  R.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "125");
-
-  test.throws(function () {
-    renderToDiv(tmpl, {foo: 3});
-  }, /Can't call non-function/);
-
-  test.throws(function () {
-    renderToDiv(tmpl, {foo: null});
-  }, /No such function/);
-
-  test.throws(function () {
-    renderToDiv(tmpl, {});
-  }, /No such function/);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - dynamic template", function (test) {
-  var tmpl = Template.old_spacebars_template_test_dynamic_template;
-  var aaa = Template.old_spacebars_template_test_aaa;
-  var bbb = Template.old_spacebars_template_test_bbb;
-  var R = ReactiveVar("aaa");
-  tmpl.foo = function () {
-    return R.get() === 'aaa' ? aaa : bbb;
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "aaa");
-
-  R.set('bbb');
-  Tracker.flush();
-
-  test.equal(canonicalizeHtml(div.innerHTML), "bbb");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - interpolate attribute", function (test) {
-  var tmpl = Template.old_spacebars_template_test_interpolate_attribute;
-  tmpl.foo = function (x) {
-    return x+1;
-  };
-  tmpl.bar = function () {
-    return 123;
-  };
-  var div = renderToDiv(tmpl);
-
-  test.equal($(div).find('div')[0].className, "aaa124zzz");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - dynamic attrs", function (test) {
-  var tmpl = Template.old_spacebars_template_test_dynamic_attrs;
-
-  var R2 = ReactiveVar({x: "X"});
-  var R3 = ReactiveVar('selected');
-  tmpl.attrsObj = function () { return R2.get(); };
-  tmpl.singleAttr = function () { return R3.get(); };
-
-  var div = renderToDiv(tmpl);
-  var span = $(div).find('span')[0];
-  test.equal(span.innerHTML, 'hi');
-  test.isTrue(span.hasAttribute('selected'));
-  test.equal(span.getAttribute('x'), 'X');
-
-  R2.set({y: "Y", z: "Z"});
-  R3.set('');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(span.innerHTML), 'hi');
-  test.isFalse(span.hasAttribute('selected'));
-  test.isFalse(span.hasAttribute('x'));
-  test.equal(span.getAttribute('y'), 'Y');
-  test.equal(span.getAttribute('z'), 'Z');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - triple", function (test) {
-  var tmpl = Template.old_spacebars_template_test_triple;
-
-  var R = ReactiveVar('<span class="hi">blah</span>');
-  tmpl.html = function () { return R.get(); };
-
-  var div = renderToDiv(tmpl);
-  var elems = $(div).find("> *");
-  test.equal(elems.length, 1);
-  test.equal(elems[0].nodeName, 'SPAN');
-  var span = elems[0];
-  test.equal(span.className, 'hi');
-  test.equal(span.innerHTML, 'blah');
-
-  R.set('asdf');
-  Tracker.flush();
-  elems = $(div).find("> *");
-  test.equal(elems.length, 0);
-  test.equal(canonicalizeHtml(div.innerHTML), 'asdf');
-
-  R.set('<span class="hi">blah</span>');
-  Tracker.flush();
-  elems = $(div).find("> *");
-  test.equal(elems.length, 1);
-  test.equal(elems[0].nodeName, 'SPAN');
-  span = elems[0];
-  test.equal(span.className, 'hi');
-  test.equal(canonicalizeHtml(span.innerHTML), 'blah');
-
-  var tmpl = Template.old_spacebars_template_test_triple2;
-  tmpl.html = function () {};
-  tmpl.html2 = function () { return null; };
-  // no tmpl.html3
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'xy');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - inclusion args", function (test) {
-  var tmpl = Template.old_spacebars_template_test_inclusion_args;
-
-  var R = ReactiveVar(Template.old_spacebars_template_test_aaa);
-  tmpl.foo = function () { return R.get(); };
-
-  var div = renderToDiv(tmpl);
-  // `{{> foo bar}}`, with `foo` resolving to Template.aaa,
-  // which consists of "aaa"
-  test.equal(canonicalizeHtml(div.innerHTML), 'aaa');
-  R.set(Template.old_spacebars_template_test_bbb);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'bbb');
-
-  ////// Ok, now `foo` *is* Template.aaa
-  tmpl.foo = Template.old_spacebars_template_test_aaa;
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'aaa');
-
-  ////// Ok, now `foo` is a template that takes an argument; bar is a string.
-  tmpl.foo = Template.old_spacebars_template_test_bracketed_this;
-  tmpl.bar = 'david';
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '[david]');
-
-  ////// Now `foo` is a template that takes an arg; bar is a function.
-  tmpl.foo = Template.old_spacebars_template_test_span_this;
-  R = ReactiveVar('david');
-  tmpl.bar = function () { return R.get(); };
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>david</span>');
-  var span1 = div.querySelector('span');
-  R.set('avi');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>avi</span>');
-  var span2 = div.querySelector('span');
-  test.isTrue(span1 === span2);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - inclusion args 2", function (test) {
-  // `{{> foo bar q=baz}}`
-  var tmpl = Template.old_spacebars_template_test_inclusion_args2;
-
-  tmpl.foo = Template.old_spacebars_template_test_span_this;
-  tmpl.bar = function (options) {
-    return options.hash.q;
-  };
-
-  var R = ReactiveVar('david!');
-  tmpl.baz = function () { return R.get().slice(0,5); };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>david</span>');
-  var span1 = div.querySelector('span');
-  R.set('brillo');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>brill</span>');
-  var span2 = div.querySelector('span');
-  test.isTrue(span1 === span2);
-});
-
-// maybe use created callback on the template instead of this?
-var extendTemplateWithInit = function (template, initFunc) {
-  var tmpl = new Template(template.viewName+'-extended', template.renderFunction);
-  tmpl.constructView = function (/*args*/) {
-    var view = Template.prototype.constructView.apply(this, arguments);
-    initFunc(view);
-    return view;
-  };
-  return tmpl;
-};
-
-Tinytest.add("spacebars-tests - old - template_tests - inclusion dotted args", function (test) {
-  // `{{> foo bar.baz}}`
-  var tmpl = Template.old_spacebars_template_test_inclusion_dotted_args;
-
-  var initCount = 0;
-  tmpl.foo = extendTemplateWithInit(
-    Template.old_spacebars_template_test_bracketed_this,
-    function () { initCount++; });
-
-  var R = ReactiveVar('david');
-  tmpl.bar = function () {
-    // make sure `this` is bound correctly
-    return { baz: this.symbol + R.get() };
-  };
-
-  var div = renderToDiv(tmpl, {symbol:'%'});
-  test.equal(initCount, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), '[%david]');
-
-  R.set('avi');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '[%avi]');
-  // check that invalidating the argument to `foo` doesn't require
-  // creating a new `foo`.
-  test.equal(initCount, 1);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - inclusion slashed args", function (test) {
-  // `{{> foo bar/baz}}`
-  var tmpl = Template.old_spacebars_template_test_inclusion_dotted_args;
-
-  var initCount = 0;
-  tmpl.foo = extendTemplateWithInit(
-    Template.old_spacebars_template_test_bracketed_this,
-    function () { initCount++; });
-  var R = ReactiveVar('david');
-  tmpl.bar = function () {
-    // make sure `this` is bound correctly
-    return { baz: this.symbol + R.get() };
-  };
-
-  var div = renderToDiv(tmpl, {symbol:'%'});
-  test.equal(initCount, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), '[%david]');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper", function (test) {
-  // test the case where `foo` is a calculated template that changes
-  // reactively.
-  // `{{#foo}}bar{{else}}baz{{/foo}}`
-  var tmpl = Template.old_spacebars_template_test_block_helper;
-  var R = ReactiveVar(Template.old_spacebars_template_test_content);
-  tmpl.foo = function () {
-    return R.get();
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "bar");
-
-  R.set(Template.old_spacebars_template_test_elsecontent);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "baz");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper function with one string arg", function (test) {
-  // `{{#foo "bar"}}content{{/foo}}`
-  var tmpl = Template.old_spacebars_template_test_block_helper_function_one_string_arg;
-  tmpl.foo = function () {
-    if (String(this) === "bar")
-      return Template.old_spacebars_template_test_content;
-    else
-      return null;
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper function with one helper arg", function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helper_function_one_helper_arg;
-  var R = ReactiveVar("bar");
-  tmpl.bar = function () { return R.get(); };
-  tmpl.foo = function () {
-    if (String(this) === "bar")
-      return Template.old_spacebars_template_test_content;
-    else
-      return null;
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set("baz");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper component with one helper arg", function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helper_component_one_helper_arg;
-  var R = ReactiveVar(true);
-  tmpl.bar = function () { return R.get(); };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper component with three helper args", function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helper_component_three_helper_args;
-  var R = ReactiveVar("bar");
-  tmpl.bar_or_baz = function () {
-    return R.get();
-  };
-  tmpl.equals = function (x, y) {
-    return x === y;
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set("baz");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block helper with dotted arg", function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helper_dotted_arg;
-  var R1 = ReactiveVar(1);
-  var R2 = ReactiveVar(10);
-  var R3 = ReactiveVar(100);
-
-  var initCount = 0;
-  tmpl.foo = extendTemplateWithInit(
-    Template.old_spacebars_template_test_bracketed_this,
-    function () { initCount++; });
-  tmpl.bar = function () {
-    return {
-      r1: R1.get(),
-      baz: function (r3) {
-        return this.r1 + R2.get() + r3;
-      }
-    };
-  };
-  tmpl.qux = function () { return R3.get(); };
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "[111]");
-  test.equal(initCount, 1);
-
-  R1.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[112]");
-  test.equal(initCount, 1);
-
-  R2.set(20);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[122]");
-  test.equal(initCount, 1);
-
-  R3.set(200);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[222]");
-  test.equal(initCount, 1);
-
-  R2.set(30);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[232]");
-  test.equal(initCount, 1);
-
-  R1.set(3);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[233]");
-  test.equal(initCount, 1);
-
-  R3.set(300);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[333]");
-  test.equal(initCount, 1);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - nested content", function (test) {
-  // Test that `{{> UI.contentBlock}}` in an `{{#if}}` works.
-
-  // ```
-  // <template name="spacebars_template_test_iftemplate">
-  //   {{#if condition}}
-  //     {{> UI.contentBlock}}
-  //   {{else}}
-  //     {{> UI.elseBlock}}
-  //   {{/if}}
-  // </template>
-  // ```
-
-  // ```
-  //  {{#spacebars_template_test_iftemplate flag}}
-  //    hello
-  //  {{else}}
-  //    world
-  //  {{/spacebars_template_test_iftemplate}}
-  // ```
-
-  var tmpl = Template.old_spacebars_template_test_nested_content;
-  var R = ReactiveVar(true);
-  tmpl.flag = function () {
-    return R.get();
-  };
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-  R.set(true);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-
-  // Also test that `{{> UI.contentBlock}}` in a custom block helper works.
-  tmpl = Template.old_spacebars_template_test_nested_content2;
-  R = ReactiveVar(true);
-  tmpl.x = function () {
-    return R.get();
-  };
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-  R.set(true);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - if", function (test) {
-  var tmpl = Template.old_spacebars_template_test_if;
-  var R = ReactiveVar(true);
-  tmpl.foo = function () {
-    return R.get();
-  };
-  tmpl.bar = 1;
-  tmpl.baz = 2;
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("1");
-  R.set(false);
-  rendersTo("2");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - if in with", function (test) {
-  var tmpl = Template.old_spacebars_template_test_if_in_with;
-  tmpl.foo = {bar: "bar"};
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "bar bar");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - each on cursor", function (test) {
-  var tmpl = Template.old_spacebars_template_test_each;
-  var coll = new Mongo.Collection(null);
-  tmpl.items = function () {
-    return coll.find({}, {sort: {pos: 1}});
-  };
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("else-clause");
-  coll.insert({text: "one", pos: 1});
-  rendersTo("one");
-  coll.insert({text: "two", pos: 2});
-  rendersTo("one two");
-  coll.update({text: "two"}, {$set: {text: "three"}});
-  rendersTo("one three");
-  coll.update({text: "three"}, {$set: {pos: 0}});
-  rendersTo("three one");
-  coll.remove({});
-  rendersTo("else-clause");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - each on array", function (test) {
-  var tmpl = Template.old_spacebars_template_test_each;
-  var R = new ReactiveVar([]);
-  tmpl.items = function () {
-    return R.get();
-  };
-  tmpl.text = function () {
-    return this;
-  };
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("else-clause");
-  R.set([""]);
-  rendersTo("");
-  R.set(["x", "", "toString"]);
-  rendersTo("x toString");
-  R.set(["toString"]);
-  rendersTo("toString");
-  R.set([]);
-  rendersTo("else-clause");
-  R.set([0, 1, 2]);
-  rendersTo("0 1 2");
-  R.set([]);
-  rendersTo("else-clause");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - ..", function (test) {
-  var tmpl = Template.old_spacebars_template_test_dots;
-  Template.old_spacebars_template_test_dots_subtemplate.getTitle = function (from) {
-    return from.title;
-  };
-
-  tmpl.foo = {title: "foo"};
-  tmpl.foo.bar = {title: "bar"};
-  tmpl.foo.bar.items = [{title: "item"}];
-  var div = renderToDiv(tmpl);
-
-  test.equal(canonicalizeHtml(div.innerHTML), [
-    "A", "B", "C", "D",
-    // {{> spacebars_template_test_dots_subtemplate}}
-    "TITLE", "1item", "2item", "3bar", "4foo", "GETTITLE", "5item", "6bar", "7foo",
-    // {{> spacebars_template_test_dots_subtemplate ..}}
-    "TITLE", "1bar", "2bar", "3item", "4bar", "GETTITLE", "5bar", "6item", "7bar"].join(" "));
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - select tags", function (test) {
-  var tmpl = Template.old_spacebars_template_test_select_tag;
-
-  // {label: (string)}
-  var optgroups = new Mongo.Collection(null);
-
-  // {optgroup: (id), value: (string), selected: (boolean), label: (string)}
-  var options = new Mongo.Collection(null);
-
-  tmpl.optgroups = function () { return optgroups.find(); };
-  tmpl.options = function () { return options.find({optgroup: this._id}); };
-  tmpl.selectedAttr = function () { return this.selected ? {selected: true} : {}; };
-
-  var div = renderToDiv(tmpl);
-  var selectEl = $(div).find('select')[0];
-
-  // returns canonicalized contents of `div` in the form eg
-  // ["<select>", "</select>"]. strip out selected attributes -- we
-  // verify correctness by observing the `selected` property
-  var divContent = function () {
-    return canonicalizeHtml(
-      div.innerHTML.replace(/selected="[^"]*"/g, '').replace(/selected/g, ''))
-          .replace(/\>\s*\</g, '>\n<')
-          .split('\n');
-  };
-
-  test.equal(divContent(), ["<select>", "</select>"]);
-
-  var optgroup1 = optgroups.insert({label: "one"});
-  var optgroup2 = optgroups.insert({label: "two"});
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-
-  options.insert({optgroup: optgroup1, value: "value1", selected: false, label: "label1"});
-  options.insert({optgroup: optgroup1, value: "value2", selected: true, label: "label2"});
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1">label1</option>',
-    '<option value="value2">label2</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value2");
-  test.equal($(selectEl).find('option')[0].selected, false);
-  test.equal($(selectEl).find('option')[1].selected, true);
-
-  // swap selection
-  options.update({value: "value1"}, {$set: {selected: true}});
-  options.update({value: "value2"}, {$set: {selected: false}});
-  Tracker.flush();
-
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1">label1</option>',
-    '<option value="value2">label2</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value1");
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, false);
-
-  // change value and label
-  options.update({value: "value1"}, {$set: {value: "value1.0"}});
-  options.update({value: "value2"}, {$set: {label: "label2.0"}});
-  Tracker.flush();
-
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1.0">label1</option>',
-    '<option value="value2">label2.0</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value1.0");
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, false);
-
-  // unselect and then select both options. normally, the second is
-  // selected (since it got selected later). then switch to <select
-  // multiple="">. both should be selected.
-  options.update({}, {$set: {selected: false}}, {multi: true});
-  Tracker.flush();
-  options.update({}, {$set: {selected: true}}, {multi: true});
-  Tracker.flush();
-  test.equal($(selectEl).find('option')[0].selected, false);
-  test.equal($(selectEl).find('option')[1].selected, true);
-
-  selectEl.multiple = true; // allow multiple selection
-  options.update({}, {$set: {selected: false}}, {multi: true});
-  Tracker.flush();
-  options.update({}, {$set: {selected: true}}, {multi: true});
-  window.avital = true;
-  Tracker.flush();
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, true);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - {{#with}} falsy; issue #770', function (test) {
-  Template.old_test_template_issue770.value1 = function () { return "abc"; };
-  Template.old_test_template_issue770.value2 = function () { return false; };
-  var div = renderToDiv(Template.old_test_template_issue770);
-  test.equal(canonicalizeHtml(div.innerHTML),
-             "abc xxx abc");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - tricky attrs", function (test) {
-  var tmpl = Template.old_spacebars_template_test_tricky_attrs;
-  tmpl.theType = function () { return 'text'; };
-  var R = ReactiveVar('foo');
-  tmpl.theClass = function () { return R.get(); };
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML).slice(0, 30),
-             '<input type="text"><input class="foo" type="checkbox">'.slice(0, 30));
-
-  R.set('bar');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML),
-             '<input type="text"><input class="bar" type="checkbox">');
-
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - no data context', function (test) {
-  var tmpl = Template.old_spacebars_template_test_no_data;
-
-  // failure is if an exception is thrown here
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'asdf');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - textarea', function (test) {
-  var tmpl = Template.old_spacebars_template_test_textarea;
-
-  var R = ReactiveVar('hello');
-
-  tmpl.foo = function () {
-    return R.get();
-  };
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, 'hello');
-
-  R.set('world');
-  Tracker.flush();
-  test.equal(textarea.value, 'world');
-
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - textarea 2', function (test) {
-  var tmpl = Template.old_spacebars_template_test_textarea2;
-
-  var R = ReactiveVar(true);
-
-  tmpl.foo = function () {
-    return R.get();
-  };
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, '</not a tag>');
-
-  R.set(false);
-  Tracker.flush();
-  test.equal(textarea.value, '<also not a tag>');
-
-  R.set(true);
-  Tracker.flush();
-  test.equal(textarea.value, '</not a tag>');
-
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - textarea 3', function (test) {
-  var tmpl = Template.old_spacebars_template_test_textarea3;
-
-  var R = ReactiveVar('hello');
-
-  tmpl.foo = function () {
-    return R.get();
-  };
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.id, 'myTextarea');
-  test.equal(textarea.value, 'hello');
-
-  R.set('world');
-  Tracker.flush();
-  test.equal(textarea.value, 'world');
-
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - textarea each', function (test) {
-  var tmpl = Template.old_spacebars_template_test_textarea_each;
-
-  var R = ReactiveVar(['APPLE', 'BANANA']);
-
-  tmpl.foo = function () {
-    return R.get();
-  };
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, '<not a tag APPLE <not a tag BANANA ');
-
-  R.set([]);
-  Tracker.flush();
-  test.equal(textarea.value, '<>');
-
-  R.set(['CUCUMBER']);
-  Tracker.flush();
-  test.equal(textarea.value, '<not a tag CUCUMBER ');
-
-});
-
-testAsyncMulti('spacebars-tests - old - template_tests - rendered template is DOM in rendered callbacks', [
-  function (test, expect) {
-    var tmpl = Template.old_spacebars_template_test_aaa;
-    tmpl.rendered = expect(function () {
-      test.equal(canonicalizeHtml(div.innerHTML), "aaa");
-    });
-    var div = renderToDiv(tmpl);
-    Tracker.flush();
-  }
-]);
-
-// Test that in:
-//
-// ```
-// {{#with someData}}
-//   {{foo}} {{bar}}
-// {{/with}}
-// ```
-//
-// ... we run `someData` once even if `foo` re-renders.
-Tinytest.add('spacebars-tests - old - template_tests - with someData', function (test) {
-  var tmpl = Template.old_spacebars_template_test_with_someData;
-
-  var foo = ReactiveVar('AAA');
-  var someDataRuns = 0;
-
-  tmpl.someData = function () {
-    someDataRuns++;
-    return {};
-  };
-  tmpl.foo = function () {
-    return foo.get();
-  };
-  tmpl.bar = function () {
-    return 'YO';
-  };
-
-  var div = renderToDiv(tmpl);
-
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'AAA YO');
-
-  foo.set('BBB');
-  Tracker.flush();
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'BBB YO');
-
-  foo.set('CCC');
-  Tracker.flush();
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'CCC YO');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - #each stops when rendered element is removed', function (test) {
-  var tmpl = Template.old_spacebars_template_test_each_stops;
-  var coll = new Mongo.Collection(null);
-  coll.insert({});
-  tmpl.items = function () { return coll.find(); };
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, 'x');
-
-  // trigger #each component destroyed
-  $(div).remove();
-
-  // insert another document. cursor should no longer be observed so
-  // should have no effect.
-  coll.insert({});
-  divRendersTo(test, div, 'x');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - block helpers in attribute', function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helpers_in_attribute;
-
-  var coll = new Mongo.Collection(null);
-  tmpl.classes = function () {
-    return coll.find({}, {sort: {name: 1}});
-  };
-  tmpl.startsLowerCase = function (name) {
-    return /^[a-z]/.test(name);
-  };
-  coll.insert({name: 'David'});
-  coll.insert({name: 'noodle'});
-  coll.insert({name: 'donut'});
-  coll.insert({name: 'frankfurter'});
-  coll.insert({name: 'Steve'});
-
-  var containerDiv = renderToDiv(tmpl);
-  var div = containerDiv.querySelector('div');
-
-  var shouldBe = function (className) {
-    Tracker.flush();
-    test.equal(div.innerHTML, "Smurf");
-    test.equal(div.className, className);
-    var result = canonicalizeHtml(containerDiv.innerHTML);
-    if (result === '<div>Smurf</div>')
-      result = '<div class="">Smurf</div>'; // e.g. IE 9 and 10
-    test.equal(result, '<div class="' + className + '">Smurf</div>');
-  };
-
-  shouldBe('donut frankfurter noodle');
-  coll.remove({name: 'frankfurter'}); // (it was kind of a mouthful)
-  shouldBe('donut noodle');
-  coll.remove({name: 'donut'});
-  shouldBe('noodle');
-  coll.remove({name: 'noodle'});
-  shouldBe(''); // 'David' and 'Steve' appear in the #each but fail the #if
-  coll.remove({});
-  shouldBe('none'); // now the `{{else}}` case kicks in
-  coll.insert({name: 'bubblegum'});
-  shouldBe('bubblegum');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - block helpers in attribute 2', function (test) {
-  var tmpl = Template.old_spacebars_template_test_block_helpers_in_attribute_2;
-
-  var R = ReactiveVar(true);
-
-  tmpl.foo = function () { return R.get(); };
-
-  var div = renderToDiv(tmpl);
-  var input = div.querySelector('input');
-
-  test.equal(input.value, '"');
-  R.set(false);
-  Tracker.flush();
-  test.equal(input.value, '&<></x>');
-});
-
-
-// Test that if the argument to #each is a constant, it doesn't establish a
-// dependency on the data context, so when the context changes, items of
-// the #each are not "changed" and helpers do not rerun.
-Tinytest.add('spacebars-tests - old - template_tests - constant #each argument', function (test) {
-  var tmpl = Template.old_spacebars_template_test_constant_each_argument;
-
-  var justReturnRuns = 0; // how many times `justReturn` is called
-  var R = ReactiveVar(1);
-
-  tmpl.someData = function () {
-    return R.get();
-  };
-  tmpl.anArray = ['foo', 'bar'];
-  tmpl.justReturn = function (x) {
-    justReturnRuns++;
-    return String(x);
-  };
-
-  var div = renderToDiv(tmpl);
-
-  test.equal(justReturnRuns, 2);
-  test.equal(canonicalizeHtml(div.innerHTML).replace(/\s+/g, ' '),
-             'foo bar 1');
-
-  R.set(2);
-  Tracker.flush();
-
-  test.equal(justReturnRuns, 2); // still 2, no new runs!
-  test.equal(canonicalizeHtml(div.innerHTML).replace(/\s+/g, ' '),
-             'foo bar 2');
-});
-
-Tinytest.addAsync('spacebars-tests - old - template_tests - #markdown - basic', function (test, onComplete) {
-  var tmpl = Template.old_spacebars_template_test_markdown_basic;
-  tmpl.obj = {snippet: "<i>hi</i>"};
-  tmpl.hi = function () {
-    return this.snippet;
-  };
-  var div = renderToDiv(tmpl);
-
-  Meteor.call("getAsset", "markdown_basic.html", function (err, html) {
-    test.isFalse(err);
-    test.equal(canonicalizeHtml(div.innerHTML),
-               canonicalizeHtml(html));
-    onComplete();
-  });
-});
-
-testAsyncMulti('spacebars-tests - old - template_tests - #markdown - if', [
-  function (test, expect) {
-    var self = this;
-    Meteor.call("getAsset", "markdown_if1.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html1 = html;
-    }));
-    Meteor.call("getAsset", "markdown_if2.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html2 = html;
-    }));
-  },
-
-  function (test, expect) {
-    var self = this;
-    var tmpl = Template.old_spacebars_template_test_markdown_if;
-    var R = new ReactiveVar(false);
-    tmpl.cond = function () { return R.get(); };
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html1));
-    R.set(true);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html2));
-  }
-]);
-
-testAsyncMulti('spacebars-tests - old - template_tests - #markdown - each', [
-  function (test, expect) {
-    var self = this;
-    Meteor.call("getAsset", "markdown_each1.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html1 = html;
-    }));
-    Meteor.call("getAsset", "markdown_each2.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html2 = html;
-    }));
-  },
-
-  function (test, expect) {
-    var self = this;
-    var tmpl = Template.old_spacebars_template_test_markdown_each;
-    var R = new ReactiveVar([]);
-    tmpl.seq = function () { return R.get(); };
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html1));
-
-    R.set(["item"]);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html2));
-  }
-]);
-
-Tinytest.add('spacebars-tests - old - template_tests - #markdown - inclusion', function (test) {
-  var tmpl = Template.old_spacebars_template_test_markdown_inclusion;
-  var subtmpl = Template.old_spacebars_template_test_markdown_inclusion_subtmpl;
-  subtmpl.foo = "bar";
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<p><span>Foo is bar.</span></p>");
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - #markdown - block helpers', function (test) {
-  var tmpl = Template.old_spacebars_template_test_markdown_block_helpers;
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<p>Hi there!</p>");
-});
-
-// Test that when a simple helper re-runs due to a dependency changing
-// but the return value is the same, the DOM text node is not
-// re-rendered.
-Tinytest.add('spacebars-tests - old - template_tests - simple helpers are isolated', function (test) {
-  var runs = [{
-    helper: function () { return "foo"; },
-    nodeValue: "foo"
-  }, {
-    helper: function () { return new Spacebars.SafeString("bar"); },
-    nodeValue: "bar"
-  }];
-
-  _.each(runs, function (run) {
-    var tmpl = Template.old_spacebars_template_test_simple_helpers_are_isolated;
-    var dep = new Tracker.Dependency;
-    tmpl.foo = function () {
-      dep.depend();
-      return run.helper();
-    };
-    var div = renderToDiv(tmpl);
-    var fooTextNode = _.find(div.childNodes, function (node) {
-      return node.nodeValue === run.nodeValue;
-    });
-
-    test.isTrue(fooTextNode);
-
-    dep.changed();
-    Tracker.flush();
-    var newFooTextNode = _.find(div.childNodes, function (node) {
-      return node.nodeValue === run.nodeValue;
-    });
-
-    test.equal(fooTextNode, newFooTextNode);
-  });
-});
-
-// Test that when a helper in an element attribute re-runs due to a
-// dependency changing but the return value is the same, the attribute
-// value is not set.
-Tinytest.add('spacebars-tests - old - template_tests - attribute helpers are isolated', function (test) {
-  var tmpl = Template.old_spacebars_template_test_attr_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  tmpl.foo = function () {
-    dep.depend();
-    return "foo";
-  };
-  var div = renderToDiv(tmpl);
-  var pElement = div.querySelector('p');
-
-  test.equal(pElement.getAttribute('attr'), 'foo');
-
-  // set the attribute to something else, afterwards check that it
-  // hasn't been updated back to the correct value.
-  pElement.setAttribute('attr', 'not-foo');
-  dep.changed();
-  Tracker.flush();
-  test.equal(pElement.getAttribute('attr'), 'not-foo');
-});
-
-// A helper can return an object with a set of element attributes via
-// `<p {{attrs}}>`. When it re-runs due to a dependency changing the
-// value for a given attribute might stay the same. Test that the
-// attribute is not set on the DOM element.
-Tinytest.add('spacebars-tests - old - template_tests - attribute object helpers are isolated', function (test) {
-  var tmpl = Template.old_spacebars_template_test_attr_object_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  tmpl.attrs = function () {
-    dep.depend();
-    return {foo: "bar"};
-  };
-  var div = renderToDiv(tmpl);
-  var pElement = div.querySelector('p');
-
-  test.equal(pElement.getAttribute('foo'), 'bar');
-
-  // set the attribute to something else, afterwards check that it
-  // hasn't been updated back to the correct value.
-  pElement.setAttribute('foo', 'not-bar');
-  dep.changed();
-  Tracker.flush();
-  test.equal(pElement.getAttribute('foo'), 'not-bar');
-});
-
-// Test that when a helper in an inclusion directive (`{{> foo }}`)
-// re-runs due to a dependency changing but the return value is the
-// same, the template is not re-rendered.
-//
-// Also, verify that an error is thrown if the return value from such
-// a helper is not a component.
-Tinytest.add('spacebars-tests - old - template_tests - inclusion helpers are isolated', function (test) {
-  var tmpl = Template.old_spacebars_template_test_inclusion_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  var subtmpl = Template.old_spacebars_template_test_inclusion_helpers_are_isolated_subtemplate;
-  // make a copy so we can set "rendered" without mutating the original
-  var subtmplCopy = new Template(subtmpl.viewName, subtmpl.renderFunction);
-
-  var R = new ReactiveVar(subtmplCopy);
-  tmpl.foo = function () {
-    dep.depend();
-    return R.get();
-  };
-
-  var div = renderToDiv(tmpl);
-    subtmplCopy.rendered = function () {
-    test.fail("shouldn't re-render when same value returned from helper");
-  };
-
-  dep.changed();
-  Tracker.flush({_throwFirstError: true}); // `subtmplCopy.rendered` not called
-
-  R.set(null);
-  Tracker.flush({_throwFirstError: true}); // no error thrown
-
-  R.set("neither a component nor null");
-
-  test.throws(function () {
-    Tracker.flush({_throwFirstError: true});
-  }, /Expected template or null/);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - nully attributes', function (test) {
-  var tmpls = {
-    0: Template.old_spacebars_template_test_nully_attributes0,
-    1: Template.old_spacebars_template_test_nully_attributes1,
-    2: Template.old_spacebars_template_test_nully_attributes2,
-    3: Template.old_spacebars_template_test_nully_attributes3,
-    4: Template.old_spacebars_template_test_nully_attributes4,
-    5: Template.old_spacebars_template_test_nully_attributes5,
-    6: Template.old_spacebars_template_test_nully_attributes6
-  };
-
-  var run = function (whichTemplate, data, expectTrue) {
-    var div = renderToDiv(tmpls[whichTemplate], data);
-    var input = div.querySelector('input');
-    var descr = JSON.stringify([whichTemplate, data, expectTrue]);
-    if (expectTrue) {
-      test.isTrue(input.checked, descr);
-      test.equal(typeof input.getAttribute('stuff'), 'string', descr);
-    } else {
-      test.isFalse(input.checked);
-      test.equal(JSON.stringify(input.getAttribute('stuff')), 'null', descr);
-    }
-
-    var html = Blaze.toHTML(Blaze.With(data, function () {
-      return tmpls[whichTemplate];
-    }));
-
-    test.equal(/ checked="[^"]*"/.test(html), !! expectTrue);
-    test.equal(/ stuff="[^"]*"/.test(html), !! expectTrue);
-  };
-
-  run(0, {}, true);
-
-  var truthies = [true, ''];
-  var falsies = [false, null, undefined];
-
-  _.each(truthies, function (x) {
-    run(1, {foo: x}, true);
-  });
-  _.each(falsies, function (x) {
-    run(1, {foo: x}, false);
-  });
-
-  _.each(truthies, function (x) {
-    _.each(truthies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-    _.each(falsies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-  });
-  _.each(falsies, function (x) {
-    _.each(truthies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-    _.each(falsies, function (y) {
-      run(2, {foo: x, bar: y}, false);
-    });
-  });
-
-  run(3, {foo: true}, false);
-  run(3, {foo: false}, false);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - double", function (test) {
-  var tmpl = Template.old_spacebars_template_test_double;
-
-  var run = function (foo, expectedResult) {
-    tmpl.foo = foo;
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), expectedResult);
-  };
-
-  run('asdf', 'asdf');
-  run(1.23, '1.23');
-  run(0, '0');
-  run(true, 'true');
-  run(false, '');
-  run(null, '');
-  run(undefined, '');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - inclusion lookup order", function (test) {
-  // test that {{> foo}} looks for a helper named 'foo', then a
-  // template named 'foo', then a 'foo' field in the data context.
-  var tmpl = Template.old_spacebars_template_test_inclusion_lookup;
-  var tmplData = function () {
-    return {
-      // shouldn't have an effect since we define a helper with the
-      // same name.
-      old_spacebars_template_test_inclusion_lookup_subtmpl: Template.
-        old_spacebars_template_test_inclusion_lookup_subtmpl3,
-      dataContextSubtmpl: Template.
-        old_spacebars_template_test_inclusion_lookup_subtmpl3};
-  };
-
-  tmpl.old_spacebars_template_test_inclusion_lookup_subtmpl =
-    Template.old_spacebars_template_test_inclusion_lookup_subtmpl2;
-
-  test.equal(canonicalizeHtml(renderToDiv(tmpl, tmplData).innerHTML),
-    ["This is generated by a helper with the same name.",
-     "This is a template passed in the data context."].join(' '));
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - content context", function (test) {
-  var tmpl = Template.old_spacebars_template_test_content_context;
-  var R = ReactiveVar(true);
-  tmpl.foo = {
-    firstLetter: 'F',
-    secondLetter: 'O',
-    bar: {
-      cond: function () { return R.get(); },
-      firstLetter: 'B',
-      secondLetter: 'A'
-    }
-  };
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'BO');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'FA');
-});
-
-_.each(['textarea', 'text', 'password', 'submit', 'button',
-        'reset', 'select', 'hidden'], function (type) {
-  Tinytest.add("spacebars-tests - old - template_tests - controls - " + type, function(test) {
-    var R = ReactiveVar({x:"test"});
-    var R2 = ReactiveVar("");
-    var tmpl;
-
-    if (type === 'select') {
-      tmpl = Template.old_spacebars_test_control_select;
-      tmpl.options = ['This is a test', 'This is a fridge',
-                      'This is a frog', 'This is a new frog', 'foobar',
-                      'This is a photograph', 'This is a monkey',
-                      'This is a donkey'];
-      tmpl.selected = function () {
-        R2.get();  // Re-render when R2 is changed, even though it
-                   // doesn't affect HTML.
-        return ('This is a ' + R.get().x) === this.toString();
-      };
-    } else if (type === 'textarea') {
-      tmpl = Template.old_spacebars_test_control_textarea;
-      tmpl.value = function () {
-        R2.get();  // Re-render when R2 is changed, even though it
-                   // doesn't affect HTML.
-        return 'This is a ' + R.get().x;
-      };
-    } else {
-      tmpl = Template.old_spacebars_test_control_input;
-      tmpl.value = function () {
-        R2.get();  // Re-render when R2 is changed, even though it
-                   // doesn't affect HTML.
-        return 'This is a ' + R.get().x;
-      };
-      tmpl.type = type;
-    };
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    var canFocus = (type !== 'hidden');
-
-    // find first element child, ignoring any marker nodes
-    var input = div.firstChild;
-    while (input.nodeType !== 1)
-      input = input.nextSibling;
-
-    if (type === 'textarea' || type === 'select') {
-      test.equal(input.nodeName, type.toUpperCase());
-    } else {
-      test.equal(input.nodeName, 'INPUT');
-      test.equal(input.type, type);
-    }
-    test.equal(DomUtils.getElementValue(input), "This is a test");
-
-    // value updates reactively
-    R.set({x:"fridge"});
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "This is a fridge");
-
-    if (canFocus) {
-      // ...if focused, it still updates but focus isn't lost.
-      focusElement(input);
-      DomUtils.setElementValue(input, "something else");
-      R.set({x:"frog"});
-
-      Tracker.flush();
-      test.equal(DomUtils.getElementValue(input), "This is a frog");
-      test.equal(document.activeElement, input);
-    }
-
-    // Setting a value (similar to user typing) should prevent value from being
-    // reverted if the div is re-rendered but the rendered value (ie, R) does
-    // not change.
-    DomUtils.setElementValue(input, "foobar");
-    R2.set("change");
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "foobar");
-
-    // ... but if the actual rendered value changes, that should take effect.
-    R.set({x:"photograph"});
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "This is a photograph");
-
-    document.body.removeChild(div);
-  });
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - radio", function(test) {
-  var R = ReactiveVar("");
-  var R2 = ReactiveVar("");
-  var change_buf = [];
-  var tmpl = Template.old_spacebars_test_control_radio;
-  tmpl.bands = ["AM", "FM", "XM"];
-  tmpl.isChecked = function () {
-    return R.get() === this.toString();
-  };
-  tmpl.band = function () {
-    return R.get();
-  };
-  tmpl.events({
-    'change input': function (event) {
-      var btn = event.target;
-      var band = btn.value;
-      change_buf.push(band);
-      R.set(band);
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-
-  // get the three buttons; they should not change identities!
-  var btns = nodesToArray(div.getElementsByTagName("INPUT"));
-  var text = function () {
-    var text = div.innerText || div.textContent;
-    return text.replace(/[ \n\r]+/g, " ");
-  };
-
-  test.equal(_.pluck(btns, 'checked'), [false, false, false]);
-  test.equal(text(), "Band: ");
-
-  clickIt(btns[0]);
-  test.equal(change_buf, ['AM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
-  test.equal(text(), "Band: AM");
-
-  R2.set("change");
-  Tracker.flush();
-  test.length(change_buf, 0);
-  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
-  test.equal(text(), "Band: AM");
-
-  clickIt(btns[1]);
-  test.equal(change_buf, ['FM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, true, false]);
-  test.equal(text(), "Band: FM");
-
-  clickIt(btns[2]);
-  test.equal(change_buf, ['XM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, false, true]);
-  test.equal(text(), "Band: XM");
-
-  clickIt(btns[1]);
-  test.equal(change_buf, ['FM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, true, false]);
-  test.equal(text(), "Band: FM");
-
-  document.body.removeChild(div);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - checkbox", function(test) {
-  var tmpl = Template.old_spacebars_test_control_checkbox;
-  tmpl.labels = ["Foo", "Bar", "Baz"];
-  var Rs = {};
-  _.each(tmpl.labels, function (label) {
-    Rs[label] = ReactiveVar(false);
-  });
-  tmpl.isChecked = function () {
-    return Rs[this.toString()].get();
-  };
-  var changeBuf = [];
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-
-  var boxes = nodesToArray(div.getElementsByTagName("INPUT"));
-
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // Re-render with first one checked.
-  Rs.Foo.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
-
-  // Re-render with first one unchecked again.
-  Rs.Foo.set(false);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // User clicks the second one.
-  clickElement(boxes[1]);
-  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
-
-  // Re-render with third one checked. Second one should stay checked because
-  // it's a user update!
-  Rs.Baz.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, true, true]);
-
-  // User turns second and third off.
-  clickElement(boxes[1]);
-  clickElement(boxes[2]);
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // Re-render with first one checked. Third should stay off because it's a user
-  // update!
-  Rs.Foo.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
-
-  // Re-render with first one unchecked. Third should still stay off.
-  Rs.Foo.set(false);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  document.body.removeChild(div);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - unfound template', function (test) {
-  test.throws(function () {
-    renderToDiv(Template.old_spacebars_test_nonexistent_template);
-  }, /No such template/);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - helper passed to #if called exactly once when invalidated', function (test) {
-  var tmpl = Template.old_spacebars_test_if_helper;
-
-  var count = 0;
-  var d = new Tracker.Dependency;
-  tmpl.foo = function () {
-    d.depend();
-    count++;
-    return foo;
-  };
-
-  foo = false;
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "false");
-  test.equal(count, 1);
-
-  foo = true;
-  d.changed();
-  divRendersTo(test, div, "true");
-  test.equal(count, 2);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - custom block helper functions called exactly once when invalidated', function (test) {
-  var tmpl = Template.old_spacebars_test_block_helper_function;
-
-  var count = 0;
-  var d = new Tracker.Dependency;
-  tmpl.foo = function () {
-    d.depend();
-    count++;
-    return Template.old_spacebars_template_test_aaa;
-  };
-
-  foo = false;
-  renderToDiv(tmpl);
-  Tracker.flush();
-  test.equal(count, 1);
-
-  foo = true;
-  d.changed();
-  Tracker.flush();
-  test.equal(count, 2);
-});
-
-var runOneTwoTest = function (test, subTemplateName, optionsData) {
-  _.each([Template.old_spacebars_test_helpers_stop_onetwo,
-          Template.old_spacebars_test_helpers_stop_onetwo_attribute],
-         function (tmpl) {
-
-           tmpl.one = Template[subTemplateName + '1'];
-           tmpl.two = Template[subTemplateName + '2'];
-
-           var buf = '';
-
-           var showOne = ReactiveVar(true);
-           var dummy = ReactiveVar(0);
-
-           tmpl.showOne = function () { return showOne.get(); };
-           tmpl.one.options = function () {
-             var x = dummy.get();
-             buf += '1';
-             if (optionsData)
-               return optionsData[x];
-             else
-               return ['something'];
-           };
-           tmpl.two.options = function () {
-             var x = dummy.get();
-             buf += '2';
-             if (optionsData)
-               return optionsData[x];
-             else
-               return ['something'];
-           };
-
-           var div = renderToDiv(tmpl);
-           Tracker.flush();
-           test.equal(buf, '1');
-
-           showOne.set(false);
-           dummy.set(1);
-           Tracker.flush();
-           test.equal(buf, '12');
-
-           showOne.set(true);
-           dummy.set(2);
-           Tracker.flush();
-           test.equal(buf, '121');
-
-           // clean up the div
-           $(div).remove();
-           test.equal(showOne._numListeners(), 0);
-           test.equal(dummy._numListeners(), 0);
-         });
-};
-
-Tinytest.add('spacebars-tests - old - template_tests - with stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_with');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - each stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_each');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - each inside with stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_with_each');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - if stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_if', ['a', 'b', 'a']);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - unless stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_unless', ['a', 'b', 'a']);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - inclusion stops without re-running function', function (test) {
-  var t = Template.old_spacebars_test_helpers_stop_inclusion3;
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_inclusion', [t, t, t]);
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - template with callbacks inside with stops without recalculating data', function (test) {
-  var tmpl = Template.old_spacebars_test_helpers_stop_with_callbacks3;
-  tmpl.created = function () {};
-  tmpl.rendered = function () {};
-  tmpl.destroyed = function () {};
-  runOneTwoTest(test, 'old_spacebars_test_helpers_stop_with_callbacks');
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - no data context is seen as an empty object', function (test) {
-  var tmpl = Template.old_spacebars_test_no_data_context;
-
-  var dataInHelper = 'UNSET';
-  var dataInRendered = 'UNSET';
-  var dataInCreated = 'UNSET';
-  var dataInDestroyed = 'UNSET';
-  var dataInEvent = 'UNSET';
-
-  tmpl.foo = function () {
-    dataInHelper = this;
-  };
-  tmpl.created = function () {
-    dataInCreated = this.data;
-  };
-  tmpl.rendered = function () {
-    dataInRendered = this.data;
-  };
-  tmpl.destroyed = function () {
-    dataInDestroyed = this.data;
-  };
-  tmpl.events({
-    'click': function () {
-      dataInEvent = this;
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-  clickElement(div.querySelector('button'));
-  Tracker.flush(); // rendered gets called afterFlush
-  $(div).remove();
-
-  test.isFalse(dataInHelper === window);
-  test.equal(dataInHelper, {});
-  test.equal(dataInCreated, null);
-  test.equal(dataInRendered, null);
-  test.equal(dataInDestroyed, null);
-  test.isFalse(dataInEvent === window);
-  test.equal(dataInEvent, {});
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - falsy with', function (test) {
-  var tmpl = Template.old_spacebars_test_falsy_with;
-  var R = ReactiveVar(null);
-  tmpl.obj = function () { return R.get(); };
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "");
-
-  R.set({greekLetter: 'alpha'});
-  divRendersTo(test, div, "alpha");
-
-  R.set(null);
-  divRendersTo(test, div, "");
-
-  R.set({greekLetter: 'alpha'});
-  divRendersTo(test, div, "alpha");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - helpers don't leak", function (test) {
-  var tmpl = Template.old_spacebars_test_helpers_dont_leak;
-  tmpl.foo = "wrong";
-  tmpl.bar = function () { return "WRONG"; };
-
-  // Also test that custom block helpers (implemented as templates) do NOT
-  // interfere with helper lookup in the current template
-  Template.old_spacebars_test_helpers_dont_leak2.bonus =
-    function () { return 'BONUS'; };
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "correct BONUS");
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - event handler returns false",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_event_returns_false;
-    var elemId = "spacebars_test_event_returns_false_link";
-    tmpl.events({
-      'click a': function (evt) { return false; }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    clickIt(document.getElementById(elemId));
-    // NOTE: This failure can stick across test runs!  Try
-    // removing '#bad-url' from the location bar and run
-    // the tests again. :)
-    test.isFalse(/#bad-url/.test(window.location.hash));
-    document.body.removeChild(div);
-  }
-);
-
-// Make sure that if you bind an event on "div p", for example,
-// both the div and the p need to be in the template.  jQuery's
-// `$(elem).find(...)` works this way, but the browser's
-// querySelector doesn't.
-Tinytest.add(
-  "spacebars-tests - old - template_tests - event map selector scope",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_event_selectors1;
-    var tmpl2 = Template.old_spacebars_test_event_selectors2;
-    var buf = [];
-    tmpl2.events({
-      'click div p': function (evt) { buf.push(evt.currentTarget.className); }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    test.equal(buf.join(), '');
-    clickIt(div.querySelector('.p1'));
-    test.equal(buf.join(), '');
-    clickIt(div.querySelector('.p2'));
-    test.equal(buf.join(), 'p2');
-    document.body.removeChild(div);
-  }
-);
-
-if (document.addEventListener) {
-  // see note about non-bubbling events in the "capuring events"
-  // templating test for why we use the VIDEO tag.  (It would be
-  // nice to get rid of the network dependency, though.)
-  // We skip this test in IE 8.
-  Tinytest.add(
-    "spacebars-tests - old - template_tests - event map selector scope (capturing)",
-    function (test) {
-      var tmpl = Template.old_spacebars_test_event_selectors_capturing1;
-      var tmpl2 = Template.old_spacebars_test_event_selectors_capturing2;
-      var buf = [];
-      tmpl2.events({
-        'play div video': function (evt) { buf.push(evt.currentTarget.className); }
-      });
-
-      var div = renderToDiv(tmpl);
-      document.body.appendChild(div);
-      test.equal(buf.join(), '');
-      simulateEvent(div.querySelector(".video1"),
-                    "play", {}, {bubbles: false});
-      test.equal(buf.join(), '');
-      simulateEvent(div.querySelector(".video2"),
-                    "play", {}, {bubbles: false});
-      test.equal(buf.join(), 'video2');
-      document.body.removeChild(div);
-    }
-  );
-}
-
-Tinytest.add("spacebars-tests - old - template_tests - tables", function (test) {
-  var tmpl1 = Template.old_spacebars_test_tables1;
-
-  var div = renderToDiv(tmpl1);
-  test.equal(_.pluck(div.querySelectorAll('*'), 'tagName'),
-             ['TABLE', 'TR', 'TD']);
-  divRendersTo(test, div, '<table><tr><td>Foo</td></tr></table>');
-
-  var tmpl2 = Template.old_spacebars_test_tables2;
-  tmpl2.foo = 'Foo';
-  div = renderToDiv(tmpl2);
-  test.equal(_.pluck(div.querySelectorAll('*'), 'tagName'),
-             ['TABLE', 'TR', 'TD']);
-  divRendersTo(test, div, '<table><tr><td>Foo</td></tr></table>');
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - jQuery.trigger extraParameters are passed to the event callback",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_jquery_events;
-    var captured = false;
-    var args = ["param1", "param2", {option: 1}, 1, 2, 3];
-
-    tmpl.events({
-      'someCustomEvent': function (event, template) {
-        var i;
-        for (i=0; i<args.length; i++) {
-          // expect the arguments to be just after template
-          test.equal(arguments[i+2], args[i]);
-        }
-        captured = true;
-      }
-    });
-
-    tmpl.rendered = function () {
-      $(this.find('button')).trigger('someCustomEvent', args);
-    };
-
-    renderToDiv(tmpl);
-    Tracker.flush();
-    test.equal(captured, true);
-  }
-);
-
-Tinytest.add("spacebars-tests - old - template_tests - toHTML", function (test) {
-  // run once, verifying that autoruns are stopped
-  var once = function (tmplToRender, tmplForHelper, helper, val) {
-    var count = 0;
-    var R = new ReactiveVar;
-    var getR = function () {
-      count++;
-      return R.get();
-    };
-
-    R.set(val);
-    tmplForHelper[helper] = getR;
-    test.equal(canonicalizeHtml(Blaze.toHTML(tmplToRender)), "bar");
-    test.equal(count, 1);
-    R.set("");
-    Tracker.flush();
-    test.equal(count, 1); // all autoruns stopped
-  };
-
-  once(Template.old_spacebars_test_tohtml_basic,
-       Template.old_spacebars_test_tohtml_basic, "foo", "bar");
-  once(Template.old_spacebars_test_tohtml_if,
-       Template.old_spacebars_test_tohtml_if, "foo", "bar");
-  once(Template.old_spacebars_test_tohtml_with,
-       Template.old_spacebars_test_tohtml_with, "foo", "bar");
-  once(Template.old_spacebars_test_tohtml_each,
-       Template.old_spacebars_test_tohtml_each, "foos", ["bar"]);
-
-  once(Template.old_spacebars_test_tohtml_include_with,
-       Template.old_spacebars_test_tohtml_with, "foo", "bar");
-  once(Template.old_spacebars_test_tohtml_include_each,
-       Template.old_spacebars_test_tohtml_each, "foos", ["bar"]);
-});
-
-Tinytest.add("spacebars-tests - old - template_tests - block comments should not be displayed",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_block_comment;
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), '');
-  }
-);
-
-// Originally reported at https://github.com/meteor/meteor/issues/2046
-Tinytest.add("spacebars-tests - old - template_tests - {{#with}} with mutated data context",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_with_mutated_data_context;
-    var foo = {value: 0};
-    var dep = new Tracker.Dependency;
-    tmpl.foo = function () {
-      dep.depend();
-      return foo;
-    };
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), '0');
-
-    foo.value = 1;
-    dep.changed();
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '1');
-  });
-
-Tinytest.add("spacebars-tests - old - template_tests - event handlers get cleaned up when template is removed",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_event_handler_cleanup;
-    var subtmpl = Template.old_spacebars_test_event_handler_cleanup_sub;
-
-    var rv = new ReactiveVar(true);
-    tmpl.foo = function () {
-      return rv.get();
-    };
-
-    subtmpl.events({
-      "click/mouseover": function () { }
-    });
-
-    var div = renderToDiv(tmpl);
-
-    test.equal(div.$blaze_events["click"].handlers.length, 1);
-    test.equal(div.$blaze_events["mouseover"].handlers.length, 1);
-
-    rv.set(false);
-    Tracker.flush();
-
-    test.equal(div.$blaze_events["click"].handlers.length, 0);
-    test.equal(div.$blaze_events["mouseover"].handlers.length, 0);
-  }
-);
-
-// This test makes sure that Blaze correctly finds the controller
-// heirarchy surrounding an element that itself doesn't have a
-// controller.
-Tinytest.add(
-  "spacebars-tests - old - template_tests - data context in event handlers on elements inside {{#if}}",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_data_context_for_event_handler_in_if;
-    var data = null;
-    tmpl.events({
-      'click span': function () {
-        data = this;
-      }
-    });
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    clickIt(div.querySelector('span'));
-    test.equal(data, {foo: "bar"});
-    document.body.removeChild(div);
-  });
-
-// https://github.com/meteor/meteor/issues/2156
-Tinytest.add(
-  "spacebars-tests - old - template_tests - each with inserts inside autorun",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_each_with_autorun_insert;
-    var coll = new Mongo.Collection(null);
-    var rv = new ReactiveVar;
-
-    tmpl.items = function () {
-      return coll.find();
-    };
-
-    var div = renderToDiv(tmpl);
-
-    Tracker.autorun(function () {
-      if (rv.get()) {
-        coll.insert({ name: rv.get() });
-      }
-    });
-
-    rv.set("foo1");
-    Tracker.flush();
-    var firstId = coll.findOne()._id;
-
-    rv.set("foo2");
-    Tracker.flush();
-
-    test.equal(canonicalizeHtml(div.innerHTML), "foo1 foo2");
-
-    coll.update(firstId, { $set: { name: "foo3" } });
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "foo3 foo2");
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - ui hooks",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_ui_hooks;
-    var rv = new ReactiveVar([]);
-    tmpl.items = function () {
-      return rv.get();
-    };
-
-    var div = renderToDiv(tmpl);
-
-    var hooks = [];
-    var container = div.querySelector(".test-ui-hooks");
-
-    // Before we attach the ui hooks, put two items in the DOM.
-    var origVal = [{ _id: 'foo1' }, { _id: 'foo2' }];
-    rv.set(origVal);
-    Tracker.flush();
-
-    container._uihooks = {
-      insertElement: function (n, next) {
-        hooks.push("insert");
-
-        // check that the element hasn't actually been added yet
-        test.isTrue((! n.parentNode) ||
-                    n.parentNode.nodeType === 11 /*DOCUMENT_FRAGMENT_NODE*/);
-      },
-      removeElement: function (n) {
-        hooks.push("remove");
-        // check that the element hasn't actually been removed yet
-        test.isTrue(n.parentNode === container);
-      },
-      moveElement: function (n, next) {
-        hooks.push("move");
-        // check that the element hasn't actually been moved yet
-        test.isFalse(n.nextNode === next);
-      }
-    };
-
-    var testDomUnchanged = function () {
-      var items = div.querySelectorAll(".item");
-      test.equal(items.length, 2);
-      test.equal(canonicalizeHtml(items[0].innerHTML), "foo1");
-      test.equal(canonicalizeHtml(items[1].innerHTML), "foo2");
-    };
-
-    var newVal = _.clone(origVal);
-    newVal.push({ _id: 'foo3' });
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert']);
-    testDomUnchanged();
-
-    newVal.reverse();
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert', 'move']);
-    testDomUnchanged();
-
-    newVal = [origVal[0]];
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert', 'move', 'remove']);
-    testDomUnchanged();
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - ui hooks - nested domranges",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_ui_hooks_nested;
-    var rv = new ReactiveVar(true);
-
-    tmpl.foo = function () {
-      return rv.get();
-    };
-
-    var subtmpl = Template.old_spacebars_test_ui_hooks_nested_sub;
-    var uiHookCalled = false;
-    subtmpl.rendered = function () {
-      this.firstNode.parentNode._uihooks = {
-        removeElement: function (node) {
-          uiHookCalled = true;
-        }
-      };
-    };
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    Tracker.flush();
-
-    var htmlBeforeRemove = canonicalizeHtml(div.innerHTML);
-    rv.set(false);
-    Tracker.flush();
-    test.isTrue(uiHookCalled);
-    var htmlAfterRemove = canonicalizeHtml(div.innerHTML);
-    test.equal(htmlBeforeRemove, htmlAfterRemove);
-    document.body.removeChild(div);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - Template.instance from helper",
-  function (test) {
-    // Set a property on the template instance; check that it's still
-    // there from a helper.
-
-    var tmpl = Template.old_spacebars_test_template_instance_helper;
-    var value = Random.id();
-    var instanceFromHelper;
-
-    tmpl.created = function () {
-      this.value = value;
-    };
-    tmpl.foo = function () {
-      instanceFromHelper = Template.instance();
-    };
-
-    var div = renderToDiv(tmpl);
-    test.equal(instanceFromHelper.value, value);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - Template.instance from helper, " +
-    "template instance is kept up-to-date",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_template_instance_helper;
-    var rv = new ReactiveVar("");
-    var instanceFromHelper;
-
-    tmpl.foo = function () {
-      return Template.instance().data;
-    };
-
-    var div = renderToDiv(tmpl, function () { return rv.get(); });
-    rv.set("first");
-    divRendersTo(test, div, "first");
-
-    rv.set("second");
-    Tracker.flush();
-    divRendersTo(test, div, "second");
-
-    // Template.instance() returns null when no template instance
-    test.isTrue(Template.instance() === null);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - {{#with}} autorun is cleaned up",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_with_cleanup;
-    var rv = new ReactiveVar("");
-    var helperCalled = false;
-    tmpl.foo = function () {
-      helperCalled = true;
-      return rv.get();
-    };
-
-    var div = renderToDiv(tmpl);
-    rv.set("first");
-    Tracker.flush();
-    test.equal(helperCalled, true);
-
-    helperCalled = false;
-    $(div).find(".test-with-cleanup").remove();
-
-    rv.set("second");
-    Tracker.flush();
-    test.equal(helperCalled, false);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - UI.parentData from helpers",
-  function (test) {
-    var childTmpl = Template.old_spacebars_test_template_parent_data_helper_child;
-    var parentTmpl = Template.old_spacebars_test_template_parent_data_helper;
-
-    var height = new ReactiveVar(0);
-    var bar = new ReactiveVar("bar");
-
-    childTmpl.a = ["a"];
-    childTmpl.b = function () { return bar.get(); };
-    childTmpl.c = ["c"];
-
-    childTmpl.foo = function () {
-      var a = Template.parentData(height.get());
-      var b = UI._parentData(height.get()); // back-compat
-      test.equal(a, b);
-      return a;
-    };
-
-    var div = renderToDiv(parentTmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "d");
-
-    height.set(1);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "bar");
-
-    // Test UI.parentData() reactivity
-
-    bar.set("baz");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "baz");
-
-    height.set(2);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "a");
-
-    height.set(3);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "parent");
-  }
-);
-
-Tinytest.add(
-  "spacebars - old - SVG <a> elements",
-  function (test) {
-    if (! document.createElementNS) {
-      // IE 8
-      return;
-    }
-
-    var tmpl = Template.old_spacebars_test_svg_anchor;
-    var div = renderToDiv(tmpl);
-
-    var anchNamespace = $(div).find("a").get(0).namespaceURI;
-    test.equal(anchNamespace, "http://www.w3.org/2000/svg");
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - created/rendered/destroyed by each",
-  function (test) {
-    var outerTmpl =
-          Template.old_spacebars_test_template_created_rendered_destroyed_each;
-    var innerTmpl =
-          Template.old_spacebars_test_template_created_rendered_destroyed_each_sub;
-
-    var buf = '';
-
-    innerTmpl.created = function () { buf += 'C' + String(this.data).toLowerCase(); };
-    innerTmpl.rendered = function () { buf += 'R' + String(this.data).toLowerCase(); };
-    innerTmpl.destroyed = function () { buf += 'D' + String(this.data).toLowerCase(); };
-
-    var R = ReactiveVar([{_id: 'A'}]);
-
-    outerTmpl.items = function () {
-      return R.get();
-    };
-
-    var div = renderToDiv(outerTmpl);
-    divRendersTo(test, div, '<div>A</div>');
-    test.equal(buf, 'CaRa');
-
-    R.set([{_id: 'B'}]);
-    divRendersTo(test, div, '<div>B</div>');
-    test.equal(buf, 'CaRaDaCbRb');
-
-    R.set([{_id: 'C'}]);
-    divRendersTo(test, div, '<div>C</div>');
-    test.equal(buf, 'CaRaDaCbRbDbCcRc');
-
-    $(div).remove();
-    test.equal(buf, 'CaRaDaCbRbDbCcRcDc');
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - UI.render/UI.remove",
-  function (test) {
-    var div = document.createElement("DIV");
-    document.body.appendChild(div);
-
-    var created = false, rendered = false, destroyed = false;
-    var R = ReactiveVar('aaa');
-
-    var tmpl = Template.old_spacebars_test_ui_render;
-    tmpl.greeting = function () { return this.greeting || 'Hello'; };
-    tmpl.r = function () { return R.get(); };
-    tmpl.created = function () { created = true; };
-    tmpl.rendered = function () { rendered = true; };
-    tmpl.destroyed = function () { destroyed = true; };
-
-    test.equal([created, rendered, destroyed], [false, false, false]);
-
-    var renderedTmpl = UI.render(tmpl, div);
-    test.equal([created, rendered, destroyed], [true, false, false]);
-
-    // Flush now. We fire the rendered callback in an afterFlush block,
-    // to ensure that the DOM is completely updated.
-    Tracker.flush();
-    test.equal([created, rendered, destroyed], [true, true, false]);
-
-    var otherDiv = document.createElement("DIV");
-    // can run a second time without throwing
-    var x = UI.render(tmpl, otherDiv);
-    // note: we'll have clean up `x` below
-
-    var renderedTmpl2 = UI.renderWithData(
-      tmpl, {greeting: 'Bye'}, div);
-    test.equal(canonicalizeHtml(div.innerHTML),
-               "<span>Hello aaa</span><span>Bye aaa</span>");
-    R.set('bbb');
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML),
-               "<span>Hello bbb</span><span>Bye bbb</span>");
-    test.equal([created, rendered, destroyed], [true, true, false]);
-    test.equal(R._numListeners(), 3);
-    UI.remove(renderedTmpl);
-    UI.remove(renderedTmpl); // test that double-remove doesn't throw
-    UI.remove(renderedTmpl2);
-    UI.remove(x);
-    test.equal([created, rendered, destroyed], [true, true, true]);
-    test.equal(R._numListeners(), 0);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - UI.render fails on jQuery objects",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_ui_render;
-    test.throws(function () {
-      UI.render(tmpl, $('body'));
-    }, /'parentElement' must be a DOM node/);
-    test.throws(function () {
-      UI.render(tmpl, document.body, $('body'));
-    }, /'nextNode' must be a DOM node/);
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - UI.getElementData",
-  function (test) {
-    var div = document.createElement("DIV");
-    var tmpl = Template.old_spacebars_test_ui_getElementData;
-    UI.renderWithData(tmpl, {foo: "bar"}, div);
-
-    var span = div.querySelector('SPAN');
-    test.isTrue(span);
-    test.equal(UI.getElementData(span), {foo: "bar"});
-    test.equal(Blaze.getData(span), {foo: "bar"});
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - autorun cleanup",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_parent_removal;
-
-    var Acalls = '';
-    var A = ReactiveVar('hi');
-    tmpl.A = function (chr) {
-      Acalls += chr;
-      return A.get();
-    };
-    var Bcalls = 0;
-    var B = ReactiveVar(['one', 'two']);
-    tmpl.B = function () {
-      Bcalls++;
-      return B.get();
-    };
-
-    // Assert how many times A and B were accessed (since last time)
-    // and how many autoruns are listening to them.
-    var assertCallsAndListeners =
-          function (a_calls, b_calls, a_listeners, b_listeners) {
-            test.equal('A calls: ' + Acalls.length,
-                       'A calls: ' + a_calls,
-                       Acalls);
-            test.equal('B calls: ' + Bcalls,
-                       'B calls: ' + b_calls);
-            test.equal('A listeners: ' + A._numListeners(),
-                       'A listeners: ' + a_listeners);
-            test.equal('B listeners: ' + B._numListeners(),
-                       'B listeners: ' + b_listeners);
-            Acalls = '';
-            Bcalls = 0;
-          };
-
-    var div = renderToDiv(tmpl);
-    assertCallsAndListeners(10, 1, 10, 1);
-    A.set('');
-    Tracker.flush();
-    // Confirm that #4, #5, #6, and #9 are not re-run.
-    // #a is newly run, for a total of 10 - 4 + 1 = 7,
-    assertCallsAndListeners(7, 0, 7, 1);
-    A.set('hi');
-    Tracker.flush();
-    assertCallsAndListeners(10, 0, 10, 1);
-
-    // Now see that removing the DOM with jQuery, below
-    // the level of the entire template, stops everything.
-    $(div.querySelector('.toremove')).remove();
-    assertCallsAndListeners(0, 0, 0, 0);
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - focus/blur with clean-up",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_focus_blur_outer;
-    var cond = ReactiveVar(true);
-    tmpl.cond = function () {
-      return cond.get();
-    };
-    var buf = [];
-    Template.old_spacebars_test_focus_blur_inner.events({
-      'focus input': function () {
-        buf.push('FOCUS');
-      },
-      'blur input': function () {
-        buf.push('BLUR');
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-
-    // check basic focus and blur to make sure
-    // everything is sane
-    test.equal(div.querySelectorAll('input').length, 1);
-    var input;
-    focusElement(input = div.querySelector('input'));
-    // We don't get focus events when the Chrome Dev Tools are focused,
-    // unfortunately, as of Chrome 35.  I think this is a regression in
-    // Chrome 34.  So, the goal is to work whether or not focus is
-    // "borken," where "working" means always failing if DOMBackend isn't
-    // correctly unbinding the old event handlers when we switch the IF,
-    // and always passing if it is.  To cause the problem in DOMBackend,
-    // delete the '**' argument to jQuery#off in
-    // DOMBackend.Events.undelegateEvents.  The only compromise we are
-    // making here is that if some unrelated bug in Blaze makes
-    // focus/blur not work, the failure might be masked while the Dev
-    // Tools are open.
-    var borken = false;
-    if (buf.length === 0 && document.activeElement === input) {
-      test.ok({note:"You might need to defocus the Chrome Dev Tools to get a more accurate run of this test!"});
-      borken = true;
-      $(input).trigger('focus');
-    }
-    test.equal(buf.join(), 'FOCUS');
-    blurElement(div.querySelector('input'));
-    if (buf.length === 1)
-      $(input).trigger('blur');
-    test.equal(buf.join(), 'FOCUS,BLUR');
-
-    // now switch the IF and check again.  The failure mode
-    // we observed was that DOMBackend would not correctly
-    // unbind the old event listener at the jQuery level,
-    // so the old event listener would fire and cause an
-    // exception inside Blaze ("Must be attached" in
-    // DOMRange#containsElement), which would show up in
-    // the console and cause our handler not to fire.
-    cond.set(false);
-    buf.length = 0;
-    Tracker.flush();
-    test.equal(div.querySelectorAll('input').length, 1);
-    focusElement(input = div.querySelector('input'));
-    if (borken)
-      $(input).trigger('focus');
-    test.equal(buf.join(), 'FOCUS');
-    blurElement(div.querySelector('input'));
-    if (! borken)
-      test.equal(buf.join(), 'FOCUS,BLUR');
-
-    document.body.removeChild(div);
-  });
-
-// We used to remove event handlers on DOMRange detached, but when
-// tearing down a view, we don't "detach" all the DOMRanges recursively.
-// Mainly, we destroy the View.  Destroying a View should remove its
-// event listeners.  (In practice, however, it's hard to think of
-// consequences to not removing event handlers on removed DOM nodes,
-// which will probably be GCed anyway.)
-Tinytest.add(
-  "spacebars-tests - old - template_tests - event cleanup on destroyed",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_event_cleanup_on_destroyed_outer;
-    var cond = ReactiveVar(true);
-    tmpl.cond = function () {
-      return cond.get();
-    };
-
-    Template.old_spacebars_test_event_cleanup_on_destroyed_inner.events({
-      'click span': function () {}});
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-
-    var eventDiv = div.querySelector('div');
-    test.equal(eventDiv.$blaze_events.click.handlers.length, 1);
-
-    cond.set(false);
-    Tracker.flush();
-    test.equal(eventDiv.$blaze_events.click.handlers.length, 0);
-
-    document.body.removeChild(div);
-  });
-
-_.each([1, 2, 3], function (n) {
-  Tinytest.add(
-    "spacebars-tests - old - template_tests - lookup is isolated " + n,
-    function (test) {
-      var buf = "";
-      var inclusion = Template.old_spacebars_test_isolated_lookup_inclusion;
-      inclusion.created = function () { buf += 'C'; };
-      inclusion.destroyed = function () { buf += 'D'; };
-
-      var tmpl = Template['old_spacebars_test_isolated_lookup' + n];
-      var R = ReactiveVar(Template.old_spacebars_template_test_aaa);
-
-      tmpl.bar = function () {
-        return R.get();
-      };
-
-      var div = renderToDiv(
-        tmpl,
-        function () {
-          return { foo: R.get() };
-        });
-
-      test.equal(canonicalizeHtml(div.innerHTML), 'aaa--x');
-      test.equal(buf, 'C');
-      R.set(Template.old_spacebars_template_test_bbb);
-      Tracker.flush();
-      test.equal(canonicalizeHtml(div.innerHTML), 'bbb--x');
-      test.equal(buf, 'C');
-    }
-  );
-});
-
-Tinytest.add('spacebars-tests - old - template_tests - current view in event handler', function (test) {
-  var tmpl = Template.old_spacebars_test_current_view_in_event;
-
-  var currentView;
-  var currentData;
-
-  tmpl.events({
-    'click span': function () {
-      currentView = Blaze.getView();
-      currentData = Blaze.getData();
-    }
-  });
-
-  var div = renderToDiv(tmpl, 'blah');
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>blah</span>');
-  document.body.appendChild(div);
-  clickElement(div.querySelector('span'));
-  $(div).remove();
-
-  test.isTrue(currentView);
-  test.equal(currentData, 'blah');
-});
-
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - textarea attrs", function (test) {
-    var tmplNoContents = {
-      tmpl: Template.old_spacebars_test_textarea_attrs,
-      hasTextAreaContents: false
-    };
-    var tmplWithContents = {
-      tmpl: Template.old_spacebars_test_textarea_attrs_contents,
-      hasTextAreaContents: true
-    };
-    var tmplWithContentsAndMoreAttrs = {
-      tmpl: Template.old_spacebars_test_textarea_attrs_array_contents,
-      hasTextAreaContents: true
-    };
-
-    _.each(
-      [tmplNoContents, tmplWithContents,
-       tmplWithContentsAndMoreAttrs],
-      function (tmplInfo) {
-
-        var id = new ReactiveVar("textarea-" + Random.id());
-        var name = new ReactiveVar("one");
-        var attrs = new ReactiveVar({
-          id: "textarea-" + Random.id()
-        });
-
-        var div = renderToDiv(tmplInfo.tmpl, {
-          attrs: function () {
-            return attrs.get();
-          },
-          name: function () {
-            return name.get();
-          }
-        });
-
-        // Check that the id and value attribute are as we expect.
-        // We can't check div.innerHTML because Chrome at least doesn't
-        // appear to put textarea value attributes in innerHTML.
-        var textarea = div.querySelector("textarea");
-        test.equal(textarea.id, attrs.get().id);
-        test.equal(
-          textarea.value, tmplInfo.hasTextAreaContents ? "Hello one" : "");
-        // One of the templates has a separate attribute in addition to
-        // an attributes dictionary.
-        if (tmplInfo === tmplWithContentsAndMoreAttrs) {
-          test.equal($(textarea).attr("class"), "bar");
-        }
-
-        // Change the id, check that the attribute updates reactively.
-        attrs.set({ id: "textarea-" + Random.id() });
-        Tracker.flush();
-        test.equal(textarea.id, attrs.get().id);
-
-        // Change the name variable, check that the textarea value
-        // updates reactively.
-        name.set("two");
-        Tracker.flush();
-        test.equal(
-          textarea.value, tmplInfo.hasTextAreaContents ? "Hello two" : "");
-
-        if (tmplInfo === tmplWithContentsAndMoreAttrs) {
-          test.equal($(textarea).attr("class"), "bar");
-        }
-
-      });
-
-  });
-
-Tinytest.add(
-  "spacebars-tests - old - template_tests - this.autorun",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_autorun;
-    var tmplInner = Template.old_spacebars_test_autorun_inner;
-
-    // Keep track of the value of `Template.instance()` inside the
-    // autorun each time it runs.
-    var autorunTemplateInstances = [];
-    var actualTemplateInstance;
-    var returnedComputation;
-    var computationArg;
-
-    var show = new ReactiveVar(true);
-    var rv = new ReactiveVar("foo");
-
-    tmplInner.created = function () {
-      actualTemplateInstance = this;
-      returnedComputation = this.autorun(function (c) {
-        computationArg = c;
-        rv.get();
-        autorunTemplateInstances.push(Template.instance());
-      });
-    };
-
-    tmpl.helpers({
-      show: function () {
-        return show.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(autorunTemplateInstances.length, 1);
-    test.equal(autorunTemplateInstances[0], actualTemplateInstance);
-
-    // Test that the autorun returned a computation and received a
-    // computation as an argument.
-    test.isTrue(returnedComputation instanceof Tracker.Computation);
-    test.equal(returnedComputation, computationArg);
-
-    // Make sure the autorun re-runs when `rv` changes, and that it has
-    // the correct current view.
-    rv.set("bar");
-    Tracker.flush();
-    test.equal(autorunTemplateInstances.length, 2);
-    test.equal(autorunTemplateInstances[1], actualTemplateInstance);
-
-    // If the inner template is destroyed, the autorun should be stopped.
-    show.set(false);
-    Tracker.flush();
-    rv.set("baz");
-    Tracker.flush();
-
-    test.equal(autorunTemplateInstances.length, 2);
-    test.equal(rv._numListeners(), 0);
-  }
-);
-
-// Test that argument in {{> UI.contentBlock arg}} is evaluated in
-// the proper data context.
-Tinytest.add(
-  "spacebars-tests - old - template_tests - contentBlock argument",
-  function (test) {
-    var tmpl = Template.old_spacebars_test_contentBlock_arg;
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), 'AAA BBB');
-  });
-
-// Test that when Blaze sets an input field to the same value,
-// we don't lose the insertion point position.
-Tinytest.add(
-  "spacebars-tests - old - template_tests - input field to same value",
-  function (test) {
-    var tmpl = Template.old_spacebars_template_test_input_field_to_same_value;
-    var R = ReactiveVar("BLAH");
-    tmpl.foo = function () { return R.get(); };
-    var div = renderToDiv(tmpl);
-
-    document.body.appendChild(div);
-
-    var input = div.querySelector('input');
-    test.equal(input.value, "BLAH");
-
-    var setSelection = function (startEnd) {
-      startEnd = startEnd.split(' ');
-      if (typeof input.selectionStart === 'number') {
-        // all but IE < 9
-        input.selectionStart = startEnd[0];
-        input.selectionEnd = startEnd[1];
-      } else {
-        // IE 8
-        input.focus();
-        var r = input.createTextRange();
-        // move the start and end of the range to the beginning
-        // of the input field
-        r.moveStart('textedit', -1);
-        r.moveEnd('textedit', -1);
-        // move the start and end a certain number of characters
-        // (relative to their current position)
-        r.moveEnd('character', startEnd[1]);
-        r.moveStart('character', startEnd[0]);
-        r.select();
-      }
-    };
-    var getSelection = function () {
-      if (typeof input.selectionStart === 'number') {
-        // all but IE < 9
-        return input.selectionStart + " " + input.selectionEnd;
-      } else {
-        // IE 8
-        input.focus();
-        var r = document.selection.createRange();
-        var fullText = input.value;
-        var start, end;
-        if (r.text) {
-          // one or more characters are selected.
-          // this is kind of hacky!  Relies on fullText
-          // not having duplicate letters, for example.
-          start = fullText.indexOf(r.text);
-          end = start + r.text.length;
-        } else {
-          r.moveStart('textedit', -1);
-          start = end = r.text.length;
-        }
-        return start + " " + end;
-      }
-    };
-
-    setSelection("2 3");
-    test.equal(getSelection(), "2 3");
-    // At this point, we COULD confirm that setting input.value to
-    // the same thing as before ("BLAH") loses the insertion
-    // point (per browser behavior).  However, it doesn't on Firefox.
-    // So we set it to something different, which verifies that our
-    // test machinery is correct.
-    input.value = "BLAN";
-    // test that insertion point is lost
-    var selectionAfterSet = getSelection();
-    if (selectionAfterSet !== "0 0") // IE 8
-      test.equal(getSelection(), "4 4");
-
-    // now make the input say "BLAH" but the AttributeHandler
-    // says "OTHER" (so we can make it do the no-op update)
-    R.set("OTHER");
-    Tracker.flush();
-    test.equal(input.value, "OTHER");
-    input.value = "BLAH";
-    setSelection("2 2");
-
-    R.set("BLAH");
-    Tracker.flush();
-    test.equal(input.value, "BLAH");
-    // test that didn't lose insertion point!
-    test.equal(getSelection(), "2 2");
-
-    // clean up after ourselves
-    document.body.removeChild(div);
-  }
-);
diff --git a/packages/spacebars-tests/package.js b/packages/spacebars-tests/package.js
deleted file mode 100644
index 52ec9a4399..0000000000
--- a/packages/spacebars-tests/package.js
+++ /dev/null
@@ -1,46 +0,0 @@
-Package.describe({
-  summary: "Additional tests for Spacebars",
-  version: '1.0.8'
-});
-
-// These tests are in a separate package to avoid a circular dependency
-// between the `spacebars` and `templating` packages.
-Package.onTest(function (api) {
-  api.use([
-    'es5-shim',
-    'underscore',
-    'spacebars',
-    'tinytest',
-    'jquery',
-    'test-helpers',
-    'reactive-var',
-    'showdown',
-    'minimongo',
-    'tracker',
-    'mongo',
-    'random',
-    'blaze',
-    'session'
-  ]);
-
-  api.use('templating', 'client');
-  api.addFiles([
-    'template_tests.html',
-    'template_tests.js',
-    'templating_tests.html',
-    'templating_tests.js',
-
-    'old_templates.js', // backcompat for packages built with old Blaze APIs.
-    'old_templates_tests.js'
-  ], 'client');
-
-  api.addFiles('template_tests_server.js', 'server');
-
-  api.addAssets([
-    'assets/markdown_basic.html',
-    'assets/markdown_if1.html',
-    'assets/markdown_if2.html',
-    'assets/markdown_each1.html',
-    'assets/markdown_each2.html'
-  ], 'server');
-});
diff --git a/packages/spacebars-tests/template_tests.html b/packages/spacebars-tests/template_tests.html
deleted file mode 100644
index e69dfbca4b..0000000000
--- a/packages/spacebars-tests/template_tests.html
+++ /dev/null
@@ -1,1160 +0,0 @@
-
-<!-- convenient templates to use in different tests -->
-<template name="spacebars_template_test_aaa">
-  aaa
-</template>
-
-<template name="spacebars_template_test_bbb">
-  bbb
-</template>
-
-<template name="spacebars_template_test_bracketed_this">
-  [{{this}}]
-</template>
-
-<template name="spacebars_template_test_span_this">
-  <span>{{this}}</span>
-</template>
-
-<template name="spacebars_template_test_content">
-  {{> Template.contentBlock}}
-</template>
-
-<template name="spacebars_template_test_elsecontent">
-  {{> Template.elseBlock}}
-</template>
-
-<template name="spacebars_template_test_iftemplate">
-  {{#if condition}}
-    {{> Template.contentBlock}}
-  {{else}}
-    {{> Template.elseBlock}}
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_bracketed_foo">
-  [{{foo}}]
-</template>
-
-<!-- -->
-
-
-
-<template name="spacebars_template_test_simple_helper">
-  {{foo bar}}
-</template>
-
-<template name="spacebars_template_test_member_helper">
-  {{user.prefixName 'Mr.'}}
-</template>
-
-<template name="spacebars_template_test_dynamic_template">
-  {{> foo}}
-</template>
-
-<template name="spacebars_template_test_interpolate_attribute">
-  <div class="aaa{{foo bar}}zzz"></div>
-</template>
-
-<template name="spacebars_template_test_dynamic_attrs">
-  <span {{attrsObj}} {{singleAttr}} {{nonexistent}}>hi</span>
-</template>
-
-<template name="spacebars_template_test_triple">
-  {{{html}}}
-</template>
-
-<template name="spacebars_template_test_triple2">
-  x{{{html}}}{{{html2}}}{{{html3}}}y
-</template>
-
-<template name="spacebars_template_test_inclusion_args">
-  {{> foo bar}}
-</template>
-
-<template name="spacebars_template_test_inclusion_args2">
-  {{> foo bar q=baz}}
-</template>
-
-<template name="spacebars_template_test_inclusion_dotted_args">
-  {{> foo bar.baz}}
-</template>
-
-<template name="spacebars_template_test_inclusion_slashed_args">
-  {{> foo bar/baz}}
-</template>
-
-<template name="spacebars_template_test_block_helper">
-  {{#foo}}
-    bar
-  {{else}}
-    baz
-  {{/foo}}
-</template>
-
-<template name="spacebars_template_test_block_helper_function_one_string_arg">
-  {{#foo "bar"}}
-    content
-  {{/foo}}
-</template>
-
-<template name="spacebars_template_test_block_helper_function_one_helper_arg">
-  {{#foo bar}}
-    content
-  {{/foo}}
-</template>
-
-<template name="spacebars_template_test_block_helper_component_one_helper_arg">
-  {{#if bar}}
-    content
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_block_helper_component_three_helper_args">
-  {{#if equals bar_or_baz "bar"}}
-    content
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_block_helper_dotted_arg">
-  {{#foo bar.baz qux}}{{/foo}}
-</template>
-
-<template name="spacebars_template_test_nested_content">
-  {{#spacebars_template_test_iftemplate condition=flag}}
-    hello
-  {{else}}
-    world
-  {{/spacebars_template_test_iftemplate}}
-</template>
-
-<template name="spacebars_template_test_iftemplate2">
-  {{#spacebars_template_test_iftemplate condition=flag}}
-    {{> Template.contentBlock}}
-  {{else}}
-    {{> Template.elseBlock}}
-  {{/spacebars_template_test_iftemplate}}
-</template>
-
-<template name="spacebars_template_test_nested_content2">
-  {{#spacebars_template_test_iftemplate2 flag=x}}
-    hello
-  {{else}}
-    world
-  {{/spacebars_template_test_iftemplate2}}
-</template>
-
-<template name="spacebars_template_test_if">
-  {{#if foo}}
-    {{bar}}
-  {{else}}
-    {{baz}}
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_if_in_with">
-  {{#with foo}}
-    {{bar}}
-    {{#if true}}
-      {{bar}}
-    {{/if}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_each">
-  {{#each items}}
-    {{text}}
-  {{else}}
-    else-clause
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_dots">
-  {{#with foo}}
-    A
-    {{#with bar}}
-      B
-      {{! #if shouldn't add a data context }}
-      {{#if true}}
-        C
-        {{#each items}}
-          D
-          {{! inclusion should only add a data context if passed explicitly }}
-          {{> spacebars_template_test_dots_subtemplate}}
-          {{> spacebars_template_test_dots_subtemplate ..}}
-        {{/each}}
-      {{/if}}
-    {{/with}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_dots_subtemplate">
-  TITLE
-  1{{title}}
-  2{{./title}}
-  3{{../title}}
-  4{{../../title}}
-
-  GETTITLE
-  5{{getTitle .}}
-  6{{getTitle ..}}
-  7{{getTitle ../..}}
-</template>
-
-<template name="spacebars_template_test_select_tag">
-  <select>
-    {{#each optgroups}}
-      <optgroup label={{label}}>
-        {{#each options}}
-          <option value={{value}} {{selectedAttr}}>{{label}}</option>
-        {{/each}}
-      </optgroup>
-    {{/each}}
-  </select>
-</template>
-
-<!-- Test for issue #770 - falsy value for with. -->
-<template name="test_template_issue770">
-  {{# with value1}}
-    {{this}}
-  {{else}}
-    xxx
-  {{/with}}
-
-  {{# with value2}}
-    {{this}}
-  {{else}}
-    xxx
-  {{/with}}
-
-  {{# with value1}}
-    {{this}}
-  {{/with}}
-
-  {{# with value2}}
-    {{this}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_tricky_attrs">
-  <input type={{theType}}><input type=checkbox class={{theClass}}>
-</template>
-
-<template name="spacebars_template_test_no_data">
-  {{this.foo}}{{#unless this.bar}}asdf{{/unless}}
-</template>
-
-<template name="spacebars_template_test_textarea">
-  <textarea>{{foo}}</textarea>
-</template>
-
-<template name="spacebars_template_test_textarea2">
-  <textarea>{{#if foo}}</not a tag>{{else}}<also not a tag>{{/if}}</textarea>
-</template>
-
-<template name="spacebars_template_test_textarea3">
-  <textarea id="myTextarea">{{foo}}</textarea>
-</template>
-
-<template name="spacebars_template_test_textarea_each">
-  <textarea>{{#each foo}}<not a tag {{.}} {{else}}<>{{/each}}</textarea>
-</template>
-
-<template name="spacebars_template_test_defer_in_rendered">
-  {{#each items}}
-    {{> spacebars_template_test_defer_in_rendered_subtemplate}}
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_defer_in_rendered_subtemplate">
-  {{! see rendered callback }}
-</template>
-
-<template name="spacebars_template_test_with_someData">
-  {{#with someData}}
-    {{foo}} {{bar}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_each_stops">
-  {{#each items}}
-    x
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_block_helpers_in_attribute">
-  <div class="{{#each classes}}{{#if startsLowerCase name}}{{name}} {{/if}}{{else}}none{{/each}}">Smurf</div>
-</template>
-
-<template name="spacebars_template_test_block_helpers_in_attribute_2">
-  <input value="{{#if foo}}"{{else}}&&lt;></x>{{/if}}">
-</template>
-
-<template name="spacebars_template_test_constant_each_argument">
-  {{#with someData}}
-    {{#each anArray}}
-      {{justReturn this}}
-    {{/each}}
-    {{this}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_markdown_basic">
-  {{#with obj}}
-    {{#markdown}}
-{{hi}}
-/each}}
-
-<b>{{hi}}</b>
-<b>/each}}</b>
-
-* {{hi}}
-* /each}}
-
-* <b>{{hi}}</b>
-* <b>/each}}</b>
-
-some paragraph to fix showdown's four space parsing below.
-
-    {{hi}}
-    /each}}
-
-    <b>{{hi}}</b>
-    <b>/each}}</b>
-
-&gt
-
-* &gt
-
-`&gt`
-
-    &gt
-
-&gt;
-
-* &gt;
-
-`&gt;`
-
-    &gt;
-
-`{{hi}}`
-`/each}}`
-
-`<b>{{hi}}</b>`
-`<b>/each}}`
-
-    {{/markdown}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_markdown_if">
-  {{#markdown}}
-
-{{#if cond}}true{{else}}false{{/if}}
-
-<b>{{#if cond}}true{{else}}false{{/if}}</b>
-
-* {{#if cond}}true{{else}}false{{/if}}
-
-* <b>{{#if cond}}true{{else}}false{{/if}}</b>
-
-some paragraph to fix showdown's four space parsing below.
-
-    {{#if cond}}true{{else}}false{{/if}}
-
-    <b>{{#if cond}}true{{else}}false{{/if}}</b>
-
-`{{#if cond}}true{{else}}false{{/if}}`
-
-`<b>{{#if cond}}true{{else}}false{{/if}}</b>`
-
-  {{/markdown}}
-</template>
-
-<template name="spacebars_template_test_markdown_each">
-  {{#markdown}}
-
-{{#each seq}}{{.}}{{/each}}
-
-<b>{{#each seq}}{{.}}{{/each}}</b>
-
-* {{#each seq}}{{.}}{{/each}}
-
-* <b>{{#each seq}}{{.}}{{/each}}</b>
-
-some paragraph to fix showdown's four space parsing below.
-
-    {{#each seq}}{{.}}{{/each}}
-
-    <b>{{#each seq}}{{.}}{{/each}}</b>
-
-`{{#each seq}}{{.}}{{/each}}`
-
-`<b>{{#each seq}}{{.}}{{/each}}</b>`
-
-  {{/markdown}}
-</template>
-
-<template name="spacebars_template_test_markdown_inclusion">
-  {{#markdown}}
-{{> spacebars_template_test_markdown_inclusion_subtmpl}}
-  {{/markdown}}
-</template>
-
-<template name="spacebars_template_test_markdown_inclusion_subtmpl">
-  <span>{{#if foo}}Foo is {{foo}}.{{/if}}</span>
-</template>
-
-<template name="spacebars_template_test_markdown_block_helpers">
-  {{#markdown}}
-    {{#spacebars_template_test_just_content}}
-Hi there!
-    {{/spacebars_template_test_just_content}}
-  {{/markdown}}
-</template>
-
-<template name="spacebars_template_test_just_content">
-  {{> Template.contentBlock}}
-</template>
-
-<template name="spacebars_template_test_simple_helpers_are_isolated">
-  {{foo}}
-</template>
-
-<template name="spacebars_template_test_attr_helpers_are_isolated">
-  <p attr={{foo}}></p>
-</template>
-
-<template name="spacebars_template_test_attr_object_helpers_are_isolated">
-  <p {{attrs}}></p>
-</template>
-
-<template name="spacebars_template_test_inclusion_helpers_are_isolated">
-  {{> foo}}
-</template>
-
-<template name="spacebars_template_test_inclusion_helpers_are_isolated_subtemplate">
-</template>
-
-<template name="spacebars_template_test_nully_attributes0">
-  <input type="checkbox" checked="" stuff="">
-</template>
-
-<template name="spacebars_template_test_nully_attributes1">
-  <input type="checkbox" checked={{foo}} stuff={{foo}}>
-</template>
-
-<template name="spacebars_template_test_nully_attributes2">
-  <input type="checkbox" checked={{foo}}{{bar}} stuff={{foo}}{{bar}}>
-</template>
-
-<template name="spacebars_template_test_nully_attributes3">
-  <input type="checkbox" checked={{#if foo}}{{/if}} stuff={{#if foo}}{{/if}}>
-</template>
-
-<template name="spacebars_template_test_double">
-  {{foo}}
-</template>
-
-<template name="spacebars_template_test_inclusion_lookup">
-  {{> spacebars_template_test_inclusion_lookup_subtmpl}}
-  {{> dataContextSubtmpl}}
-</template>
-
-<template name="spacebars_template_test_inclusion_lookup_subtmpl">
-  This is the template.
-</template>
-
-<template name="spacebars_template_test_inclusion_lookup_subtmpl2">
-  This is generated by a helper with the same name.
-</template>
-
-<template name="spacebars_template_test_inclusion_lookup_subtmpl3">
-  This is a template passed in the data context.
-</template>
-
-<template name="spacebars_template_test_content_context">
-  {{#with foo}}
-    {{#with bar}}
-      {{#spacebars_template_test_iftemplate condition=cond}}
-        {{firstLetter}}{{../secondLetter}}
-      {{else}}
-        {{../firstLetter}}{{secondLetter}}
-      {{/spacebars_template_test_iftemplate}}
-    {{/with}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_control_input">
-  <input type={{type}} value={{value}}>
-</template>
-
-<template name="spacebars_test_control_textarea">
-  <textarea>{{value}}</textarea>
-</template>
-
-<template name="spacebars_test_control_select">
-  <select>
-    {{#each options}}
-      <option selected={{selected}}>{{.}}</option>
-    {{/each}}
-  </select>
-</template>
-
-<template name="spacebars_test_control_radio">
-  Band:
-
-  {{#each bands}}
-    <input name="bands" type="radio" value={{.}} checked={{isChecked}} />
-  {{/each}}
-
-  {{band}}
-</template>
-
-<template name="spacebars_test_control_checkbox">
-  {{#each labels}}
-    <input type="checkbox" value={{.}} checked={{isChecked}} />
-  {{/each}}
-</template>
-
-<template name="spacebars_test_nonexistent_template">
-  {{> this_template_lives_in_outer_space}}
-</template>
-
-<template name="spacebars_test_if_helper">
-  {{#if foo}}
-    true
-  {{else}}
-    false
-  {{/if}}
-</template>
-
-<template name="spacebars_test_block_helper_function">
-  {{#foo}}
-  {{/foo}}
-</template>
-
-<template name="spacebars_test_helpers_stop_onetwo">
-  {{#if showOne}}
-    {{> one}}
-  {{else}}
-    {{> two}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_helpers_stop_onetwo_attribute">
-  <br data-stuff=
-  {{#if showOne}}
-    {{> one}}
-  {{else}}
-    {{> two}}
-  {{/if}}>
-</template>
-
-<template name="spacebars_test_helpers_stop_with1">
-  {{#with options}}
-    one
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with2">
-  {{#with options}}
-    two
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_each1">
-  {{#each options}}
-    one
-  {{/each}}
-</template>
-
-<template name="spacebars_test_helpers_stop_each2">
-  {{#each options}}
-    two
-  {{/each}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with_each1">
-  {{#with options}}
-    {{> spacebars_test_helpers_stop_with_each3}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with_each2">
-  {{#with options}}
-    {{> spacebars_test_helpers_stop_with_each3}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with_each3">
-  {{#each this}}
-  {{/each}}
-</template>
-
-<template name="spacebars_test_helpers_stop_if1">
-  {{#if options}}
-    one
-  {{/if}}
-</template>
-
-<template name="spacebars_test_helpers_stop_if2">
-  {{#if options}}
-    two
-  {{/if}}
-</template>
-
-<template name="spacebars_test_helpers_stop_inclusion1">
-  {{> options}}
-</template>
-
-<template name="spacebars_test_helpers_stop_inclusion2">
-  {{> options}}
-</template>
-
-<template name="spacebars_test_helpers_stop_inclusion3">
-  blah
-</template>
-
-<template name="spacebars_test_helpers_stop_with_callbacks1">
-  {{#with options}}
-    {{> spacebars_test_helpers_stop_with_callbacks3}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with_callbacks2">
-  {{#with options}}
-    {{> spacebars_test_helpers_stop_with_callbacks3}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_stop_with_callbacks3">
-  blah
-</template>
-
-<template name="spacebars_test_helpers_stop_unless1">
-  {{#unless options}}
-    one
-  {{/unless}}
-</template>
-
-<template name="spacebars_test_helpers_stop_unless2">
-  {{#unless options}}
-    two
-  {{/unless}}
-</template>
-
-<template name="spacebars_test_no_data_context">
-  <button></button>
-  {{foo}}
-</template>
-
-<template name="spacebars_test_falsy_with">
-  {{#with obj}}
-    {{greekLetter}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_helpers_dont_leak">
-  {{> spacebars_test_helpers_dont_leak2 foo="correct"}}
-</template>
-
-<template name="spacebars_test_helpers_dont_leak2">
-  {{foo}}{{bar}} {{#spacebars_template_test_content}}{{bonus}}{{/spacebars_template_test_content}}
-</template>
-
-<template name="spacebars_test_event_returns_false">
-  <a href="#bad-url" id="spacebars_test_event_returns_false_link">click me</a>
-</template>
-
-<template name="spacebars_test_event_selectors1">
-  <div>{{> spacebars_test_event_selectors2}}</div>
-</template>
-
-<template name="spacebars_test_event_selectors2">
-  <p class="p1">Not it</p>
-  <div><p class="p2">It</p></div>
-</template>
-
-<template name="spacebars_test_event_selectors_capturing1">
-  <div>{{> spacebars_test_event_selectors_capturing2}}</div>
-</template>
-
-<template name="spacebars_test_event_selectors_capturing2">
-  <video class='video1'>
-    <source id='mp4'
-      src="http://media.w3.org/2010/05/sintel/trailer.mp4"
-      type='video/mp4'>
-  </video>
-  <div>
-    <video class='video2'>
-      <source id='mp4'
-        src="http://media.w3.org/2010/05/sintel/trailer.mp4"
-        type='video/mp4'>
-    </video>
-  </div>
-</template>
-
-<template name="spacebars_test_tables1">
-  <table><tr><td>Foo</td></tr></table>
-</template>
-
-<template name="spacebars_test_tables2">
-  <table><tr><td>{{foo}}</td></tr></table>
-</template>
-
-<template name="spacebars_test_jquery_events">
-  <button type="button">button</button>
-</template>
-
-<template name="spacebars_test_tohtml_basic">
-  {{foo}}
-</template>
-
-<template name="spacebars_test_tohtml_if">
-  {{#if true}}
-    {{foo}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_tohtml_with">
-  {{#with foo}}
-    {{.}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_tohtml_each">
-  {{#each foos}}
-    {{.}}
-  {{/each}}
-</template>
-
-<template name="spacebars_test_tohtml_include_with">
-  {{> spacebars_test_tohtml_with}}
-</template>
-
-<template name="spacebars_test_tohtml_include_each">
-  {{> spacebars_test_tohtml_each}}
-</template>
-
-<template name="spacebars_test_block_comment">
-  {{!-- foo --}}
-  {{!--
-    {{bar}}
-  --}}
-</template>
-
-<template name="spacebars_test_with_mutated_data_context">
-  {{#with foo}}
-    {{value}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_url_attribute">
-  <a href="{{foo}}"></a>
-  <a hReF="{{foo}}"></a>
-  <form action="{{foo}}"></form>
-  <img src="{{foo}}" />
-  <input value="{{foo}}" />
-</template>
-
-<template name="spacebars_test_event_handler_cleanup">
-  {{#if foo}}
-    {{>spacebars_test_event_handler_cleanup_sub}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_event_handler_cleanup_sub">
-  <div></div>
-</template>
-
-<template name="spacebars_test_data_context_for_event_handler_in_if">
-  {{#with foo="bar"}}
-    {{#if true}}
-      <span>Click me!</span>
-    {{/if}}
-  {{/with}}
-</template>
-
-
-<template name="spacebars_test_each_with_autorun_insert">
-  {{#each items}}
-    {{name}}
-  {{/each}}
-</template>
-
-<template name="spacebars_test_ui_hooks">
-  <div class="test-ui-hooks">
-    {{#each items}}
-      <div class="item">{{_id}}</div>
-    {{/each}}
-  </div>
-</template>
-
-<template name="spacebars_test_ui_hooks_nested">
-  {{#if foo}}
-    {{> spacebars_test_ui_hooks_nested_sub}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_ui_hooks_nested_sub">
-  <div>
-    {{#with true}}
-      <p>hello</p>
-    {{/with}}
-  </div>
-</template>
-
-<template name="spacebars_test_template_instance_helper">
-  {{#with true}}{{foo}}{{/with}}
-</template>
-
-<template name="spacebars_test_with_cleanup">
-  <div class="test-with-cleanup">
-    {{#with foo}}
-      {{this}}
-    {{/with}}
-  </div>
-</template>
-
-<template name="spacebars_test_template_parent_data_helper">
-  {{#with "parent"}}
-    {{> spacebars_test_template_parent_data_helper_child}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_template_parent_data_helper_child">
-  {{#each a}}
-    {{#with b}}
-      {{#if c}}
-        {{#with "d"}}
-          {{foo}}
-        {{/with}}
-      {{/if}}
-    {{/with}}
-  {{/each}}
-</template>
-
-<template name="spacebars_test_svg_anchor">
-  <svg>
-    <a xlink:href="http://www.example.com">Foo</a>
-  </svg>
-</template>
-
-<template name="spacebars_test_template_created_rendered_destroyed_each">
-  {{#each items}}
-    <div>{{> spacebars_test_template_created_rendered_destroyed_each_sub _id}}</div>
-  {{/each}}
-</template>
-
-<template name="spacebars_test_template_created_rendered_destroyed_each_sub">
-  {{.}}
-</template>
-
-<template name="spacebars_test_ui_getElementData">
-  <span></span>
-</template>
-
-<template name="spacebars_test_ui_render">
-  <span>{{greeting}} {{r}}</span>
-</template>
-
-<template name="spacebars_test_parent_removal">
-  <div class="a">
-    <div class="b">
-      <div class="toremove">
-        <div class="c">
-          {{A 1}}
-          {{{A 2}}}
-          {{#with A 3}}
-            {{A 4}}
-            {{#with A 5}}
-              {{A 6}}
-            {{/with}}
-          {{/with}}
-          {{#each B}}
-            {{A 7}}
-          {{/each}}
-          {{#if A 8}}
-            {{A 9}}
-          {{else}}
-            {{A 'a'}}
-          {{/if}}
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<template name="spacebars_test_focus_blur_outer">
-  {{#if cond}}
-    a {{> spacebars_test_focus_blur_inner}}
-  {{else}}
-    b {{> spacebars_test_focus_blur_inner}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_focus_blur_inner">
-  <input type="text">
-</template>
-
-<template name="spacebars_test_event_cleanup_on_destroyed_outer">
-  {{#if cond}}
-    <div>a {{> spacebars_test_event_cleanup_on_destroyed_inner}}</div>
-  {{else}}
-    <div>b {{> spacebars_test_event_cleanup_on_destroyed_inner}}</div>
-  {{/if}}
-</template>
-
-<template name="spacebars_test_event_cleanup_on_destroyed_inner">
-  <span>foo</span>
-</template>
-
-<template name="spacebars_test_isolated_lookup_inclusion">
-  x
-</template>
-
-<template name="spacebars_test_isolated_lookup1">
-  {{> foo}}--{{> spacebars_test_isolated_lookup_inclusion}}
-</template>
-
-<template name="spacebars_test_isolated_lookup2">
-  {{#with foo}}
-    {{#with z=1}}
-      {{> ..}}--{{> spacebars_test_isolated_lookup_inclusion}}
-    {{/with}}
-  {{/with}}
-</template>
-
-<template name="spacebars_test_isolated_lookup3">
-  {{> bar}}--{{> spacebars_test_isolated_lookup_inclusion}}
-</template>
-
-<template name="spacebars_test_current_view_in_event">
-  <span>{{.}}</span>
-</template>
-
-<template name="spacebars_test_textarea_attrs">
-  <textarea {{attrs}}></textarea>
-</template>
-
-<template name="spacebars_test_textarea_attrs_contents">
-  <textarea {{attrs}}>Hello {{name}}</textarea>
-</template>
-
-<template name="spacebars_test_textarea_attrs_array_contents">
-  <textarea {{attrs}} class="bar">Hello {{name}}</textarea>
-</template>
-
-<template name="spacebars_test_autorun">
-  {{#if show}}
-    {{>spacebars_test_autorun_inner}}
-  {{/if}}
-</template>
-
-<template name="spacebars_test_autorun_inner">
-  Hello
-</template>
-
-<template name="spacebars_test_contentBlock_arg">
-  {{#spacebars_test_contentBlock_arg_inner}}
-    {{this.bar}}
-  {{/spacebars_test_contentBlock_arg_inner}}
-</template>
-
-<template name="spacebars_test_contentBlock_arg_inner">
-  {{#with foo="AAA" bar="BBB"}}
-    {{this.foo}} {{> Template.contentBlock this}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_input_field_to_same_value">
-  <input type="text" value={{foo}}>
-</template>
-
-<template name="spacebars_template_test_content_backcompat">
-  {{#spacebars_template_test_iftemplate_backcompat condition=flag}}
-    hello
-  {{else}}
-    world
-  {{/spacebars_template_test_iftemplate_backcompat}}
-</template>
-
-<template name="spacebars_template_test_iftemplate_backcompat">
-  {{#if condition}}
-    {{> UI.contentBlock}}
-  {{else}}
-    {{> UI.elseBlock}}
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_content_context_backcompat">
-  {{#with foo}}
-    {{#with bar}}
-      {{#spacebars_template_test_iftemplate_backcompat condition=cond}}
-        {{firstLetter}}{{../secondLetter}}
-      {{else}}
-        {{../firstLetter}}{{secondLetter}}
-      {{/spacebars_template_test_iftemplate_backcompat}}
-    {{/with}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_falsy_helper">
-  foo:{{foo}} GLOBAL_ZERO:{{GLOBAL_ZERO}}
-</template>
-
-<template name="spacebars_template_test_oldstyle_helpers">
-  {{foo}}
-</template>
-
-<!-- issue meteor/meteor #3130 -->
-<template name="spacebars_template_test_with_data_remove">
-  <b>some data - {{foo}}</b>
-</template>
-
-<template name="spacebars_template_test_inclusion_with_data_remove">
-  <span>
-    {{> spacebars_template_test_inclusion_with_data_remove_inner "stuff"}}
-  </span>
-</template>
-
-<template name="spacebars_template_test_inclusion_with_data_remove_inner">
-  <b>{{.}}</b>
-</template>
-
-<!-- issue meteor/meteor #3540 -->
-<template name="spacebars_template_test_template_instance_wrapper_outer">
-  {{#spacebars_template_test_template_instance_wrapper_wrapper}}
-    {{thisShouldOutputHello}}
-  {{/spacebars_template_test_template_instance_wrapper_wrapper}}
-  {{thisShouldOutputHello}}
-</template>
-
-<template name="spacebars_template_test_template_instance_wrapper_wrapper">
-  {{> Template.contentBlock}}
-</template>
-
-<template name="spacebars_template_test_template_level_subscriptions">
-  {{#if Template.subscriptionsReady}}
-    ready!
-  {{/if}}
-  {{Template.subscriptionsReady}}
-</template>
-
-<template name="spacebars_template_test_template_level_subs_resubscribe">
-  {{#if ifArg}}
-    {{subscribingHelper1}}
-  {{else}}
-    {{subscribingHelper2}}
-  {{/if}}
-</template>
-
-<template name="spacebars_template_test_old_each_data_context">
-  {{#each items}}
-    <div>{{text}}</div>
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_new_each_data_context">
-  {{#with dataContext}}
-    {{#each item in items}}
-      <div>{{item.text}} -- {{toplevel}}</div>
-    {{/each}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_new_each_data_context_subexpr">
-  {{#with dataContext}}
-    {{#each item in (items)}}
-      <div>{{item.text}} -- {{toplevel}}</div>
-    {{/each}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_new_each_lookup_top_level">
-  {{#with dataContext}}
-    {{#each item in letter_a}}
-      {{#spacebars_template_test_new_each_lookup_block_helper}}
-        <div>
-          {{item}}
-        </div>
-      {{/spacebars_template_test_new_each_lookup_block_helper}}
-    {{/each}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_new_each_lookup_block_helper">
-  {{#with subcontext}}
-    {{#each item in letter_b}}
-      {{> Template.contentBlock}}
-    {{/each}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_let_bindings">
-  {{#with dataContext}}
-    {{#let alias=helper anotherVarFromContext="override"}}
-      <div>{{alias}} -- {{helper}} -- {{varFromContext}} -- {{anotherVarFromContext}}</div>
-    {{/let}}
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_each_index">
-  {{#each things}}
-    <span>{{@index}} - {{num}}</span>
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_nested_exprs">
-  {{add (add 1 2) 3}}
-</template>
-
-<template name="spacebars_template_test_nested_subexprs">
-  {{capitalize (firstWord generateSentence)}}
-</template>
-
-<template name="spacebars_template_test_exprs_keyword_callable">
-  {{stuff}} {{another}}
-</template>
-
-<template name="spacebars_template_test_exprs_keyword">
-  {{> spacebars_template_test_exprs_keyword_callable stuff=(capitalize name) another=(capitalize "mello")}}
-</template>
-
-<template name="spacebars_template_test_with_rerender">
-  <input type="text" class="foo">
-  {{#with y=x}}
-    <span class="bar">{{y}}</span>
-  {{/with}}
-</template>
-
-<template name="spacebars_template_test_let_rerender">
-  <input type="text" class="foo">
-  {{#let y=x}}
-    <span class="bar">{{y}}</span>
-  {{/let}}
-</template>
-
-<template name="spacebars_template_test_each_multiarg">
-  {{#each helper arg}}
-    <div>{{this}}</div>
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_lexical_leakage">
-  {{#each list}}
-    <div><span>{{@index}}</span>{{> spacebars_template_test_get_index}}</div>
-  {{/each}}
-</template>
-
-<template name="spacebars_template_test_get_index">
-  <span>{{@index}}</span>
-</template>
-
-<template name="spacebars_template_test_each_in_multi_args">
-  {{#each item in helper list}}
-    <div>{{item}}</div>
-  {{/each}}
-</template>
diff --git a/packages/spacebars-tests/template_tests.js b/packages/spacebars-tests/template_tests.js
deleted file mode 100644
index e961f274bb..0000000000
--- a/packages/spacebars-tests/template_tests.js
+++ /dev/null
@@ -1,3512 +0,0 @@
-var divRendersTo = function (test, div, html) {
-  Tracker.flush({_throwFirstError: true});
-  var actual = canonicalizeHtml(div.innerHTML);
-  test.equal(actual, html);
-};
-
-var nodesToArray = function (array) {
-  // Starting in underscore 1.4, _.toArray does not work right on a node
-  // list in IE8. This is a workaround to support IE8.
-  return _.map(array, _.identity);
-};
-
-// maybe use created callback on the template instead of this?
-var extendTemplateWithInit = function (template, initFunc) {
-  var tmpl = new Template(template.viewName+'-extended', template.renderFunction);
-  tmpl.constructView = function (/*args*/) {
-    var view = Template.prototype.constructView.apply(this, arguments);
-    initFunc(view);
-    return view;
-  };
-  return tmpl;
-};
-
-// Make a "clone" of origTemplate (but not its helpers)
-var copyTemplate = function (origTemplate) {
-  return new Template(origTemplate.viewName, origTemplate.renderFunction);
-};
-
-Tinytest.add("spacebars-tests - template_tests - simple helper", function (test) {
-  var baseTmpl = Template.spacebars_template_test_simple_helper;
-  var tmpl1 = copyTemplate(baseTmpl);
-  var R = ReactiveVar(1);
-  tmpl1.helpers({
-    foo: function (x) {
-      return x + R.get();
-    },
-    bar: function () {
-      return 123;
-    }
-  });
-  var div = renderToDiv(tmpl1);
-
-  test.equal(canonicalizeHtml(div.innerHTML), "124");
-  R.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "125");
-
-  // Test that `{{foo bar}}` throws if `foo` is missing or not a function.
-  var tmpl2 = copyTemplate(baseTmpl);
-  tmpl2.helpers({foo: 3});
-  test.throws(function () {
-    renderToDiv(tmpl2);
-  }, /Can't call non-function/);
-
-  var tmpl3 = copyTemplate(baseTmpl);
-  test.throws(function () {
-    renderToDiv(tmpl3);
-  }, /No such function/);
-
-  var tmpl4 = copyTemplate(baseTmpl);
-  tmpl4.helpers({foo: function () {}});
-  // doesn't throw
-  div = renderToDiv(tmpl4);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-
-  // now make "foo" is a function in the data context
-  var tmpl5 = copyTemplate(baseTmpl);
-  tmpl5.helpers({
-    bar: function () {
-      return 123;
-    }
-  });
-
-  R = ReactiveVar(1);
-  div = renderToDiv(tmpl5, { foo: function (x) {
-    return x + R.get();
-  } });
-  test.equal(canonicalizeHtml(div.innerHTML), "124");
-  R.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "125");
-
-  test.throws(function () {
-    renderToDiv(tmpl5, {foo: 3});
-  }, /Can't call non-function/);
-
-  test.throws(function () {
-    renderToDiv(tmpl5, {foo: null});
-  }, /No such function/);
-
-  test.throws(function () {
-    renderToDiv(tmpl5, {});
-  }, /No such function/);
-});
-
-Tinytest.add("spacebars-tests - template_tests - member helper", function (test) {
-  var baseTmpl = Template.spacebars_template_test_member_helper;
-
-  // Test that returning function member of a data object can be used as a
-  // a helper within a template, in this case, {{user.prefixName 'Mr.'}}
-  var tmpl1 = copyTemplate(baseTmpl);
-  var name = ReactiveVar('foo');
-  tmpl1.helpers({
-    user: function() {
-      return {
-        prefixName: function(prefix) {
-          return prefix + ' ' + name.get();
-        },
-      };
-    },
-  });
-  var div = renderToDiv(tmpl1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'Mr. foo');
-  name.set('bar');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'Mr. bar');
-
-  // Test that `{{user.prefixName 'Mr.'}}` returns nothing if `user` is not
-  // not a function or is completely missing from helpers.
-  var tmpl2 = copyTemplate(baseTmpl);
-  tmpl2.helpers({user: 3});
-  div = renderToDiv(tmpl2);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-
-  var tmpl3 = copyTemplate(baseTmpl);
-  div = renderToDiv(tmpl3);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-
-  // Test that `{{user.prefixName 'Mr.'}}` returns nothing if the `user`
-  // returns null. Before fixing Meteor issue #5441, this test would throw.
-  var tmpl4 = copyTemplate(baseTmpl);
-  tmpl4.helpers({user: function () {}});
-  div = renderToDiv(tmpl4);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-
-  // One more test, similar to the above, but where `user` is not null but
-  // `user.prefixName` is. This test was also broken prior to the fix.
-  var tmpl4 = copyTemplate(baseTmpl);
-  tmpl4.helpers({user: function () { return {prefixName: null}; }});
-  div = renderToDiv(tmpl4);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-});
-
-Tinytest.add("spacebars-tests - template_tests - dynamic template", function (test) {
-  var tmpl = Template.spacebars_template_test_dynamic_template;
-  var aaa = Template.spacebars_template_test_aaa;
-  var bbb = Template.spacebars_template_test_bbb;
-  var R = ReactiveVar("aaa");
-  tmpl.helpers({foo: function () {
-    return R.get() === 'aaa' ? aaa : bbb;
-  }});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "aaa");
-
-  R.set('bbb');
-  Tracker.flush();
-
-  test.equal(canonicalizeHtml(div.innerHTML), "bbb");
-});
-
-Tinytest.add("spacebars-tests - template_tests - interpolate attribute", function (test) {
-  var tmpl = Template.spacebars_template_test_interpolate_attribute;
-  tmpl.helpers({
-    foo: function (x) {
-      return x+1;
-    },
-    bar: function () {
-      return 123;
-    }
-  });
-  var div = renderToDiv(tmpl);
-
-  test.equal($(div).find('div')[0].className, "aaa124zzz");
-});
-
-Tinytest.add("spacebars-tests - template_tests - dynamic attrs", function (test) {
-  var tmpl = Template.spacebars_template_test_dynamic_attrs;
-
-  var R2 = ReactiveVar({x: "X"});
-  var R3 = ReactiveVar('selected');
-  tmpl.helpers({
-    attrsObj: function () { return R2.get(); },
-    singleAttr: function () { return R3.get(); }
-  });
-
-  var div = renderToDiv(tmpl);
-  var span = $(div).find('span')[0];
-  test.equal(span.innerHTML, 'hi');
-  test.isTrue(span.hasAttribute('selected'));
-  test.equal(span.getAttribute('x'), 'X');
-
-  R2.set({y: "Y", z: "Z"});
-  R3.set('');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(span.innerHTML), 'hi');
-  test.isFalse(span.hasAttribute('selected'));
-  test.isFalse(span.hasAttribute('x'));
-  test.equal(span.getAttribute('y'), 'Y');
-  test.equal(span.getAttribute('z'), 'Z');
-});
-
-Tinytest.add("spacebars-tests - template_tests - triple", function (test) {
-  var tmpl = Template.spacebars_template_test_triple;
-
-  var R = ReactiveVar('<span class="hi">blah</span>');
-  tmpl.helpers({
-    html: function () { return R.get(); }
-  });
-
-  var div = renderToDiv(tmpl);
-  var elems = $(div).find("> *");
-  test.equal(elems.length, 1);
-  test.equal(elems[0].nodeName, 'SPAN');
-  var span = elems[0];
-  test.equal(span.className, 'hi');
-  test.equal(span.innerHTML, 'blah');
-
-  R.set('asdf');
-  Tracker.flush();
-  elems = $(div).find("> *");
-  test.equal(elems.length, 0);
-  test.equal(canonicalizeHtml(div.innerHTML), 'asdf');
-
-  R.set('<span class="hi">blah</span>');
-  Tracker.flush();
-  elems = $(div).find("> *");
-  test.equal(elems.length, 1);
-  test.equal(elems[0].nodeName, 'SPAN');
-  span = elems[0];
-  test.equal(span.className, 'hi');
-  test.equal(canonicalizeHtml(span.innerHTML), 'blah');
-
-  var tmpl = Template.spacebars_template_test_triple2;
-  tmpl.helpers({
-    html: function () {},
-    html2: function () { return null; }
-  });
-  // no tmpl.html3
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'xy');
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion args", function (test) {
-  var tmpl = Template.spacebars_template_test_inclusion_args;
-
-  var R = ReactiveVar(Template.spacebars_template_test_aaa);
-  tmpl.helpers({foo: function () { return R.get(); }});
-
-  var div = renderToDiv(tmpl);
-  // `{{> foo bar}}`, with `foo` resolving to Template.aaa,
-  // which consists of "aaa"
-  test.equal(canonicalizeHtml(div.innerHTML), 'aaa');
-  R.set(Template.spacebars_template_test_bbb);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'bbb');
-
-  ////// Ok, now `foo` *is* Template.aaa
-  tmpl.helpers({foo: Template.spacebars_template_test_aaa});
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'aaa');
-
-  ////// Ok, now `foo` is a template that takes an argument; bar is a string.
-  tmpl.helpers({
-    foo: Template.spacebars_template_test_bracketed_this,
-    bar: 'david'
-  });
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '[david]');
-
-  ////// Now `foo` is a template that takes an arg; bar is a function.
-  tmpl.helpers({foo: Template.spacebars_template_test_span_this});
-  R = ReactiveVar('david');
-  tmpl.helpers({bar: function () { return R.get(); }});
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>david</span>');
-  var span1 = div.querySelector('span');
-  R.set('avi');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>avi</span>');
-  var span2 = div.querySelector('span');
-  test.isTrue(span1 === span2);
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion args 2", function (test) {
-  // `{{> foo bar q=baz}}`
-  var tmpl = Template.spacebars_template_test_inclusion_args2;
-
-  tmpl.helpers({
-    foo: Template.spacebars_template_test_span_this,
-    bar: function (options) {
-      return options.hash.q;
-    }
-  });
-
-  var R = ReactiveVar('david!');
-  tmpl.helpers({ baz: function () { return R.get().slice(0,5); } });
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>david</span>');
-  var span1 = div.querySelector('span');
-  R.set('brillo');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>brill</span>');
-  var span2 = div.querySelector('span');
-  test.isTrue(span1 === span2);
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion dotted args", function (test) {
-  // `{{> foo bar.baz}}`
-  var tmpl = Template.spacebars_template_test_inclusion_dotted_args;
-
-  var initCount = 0;
-  tmpl.helpers({
-    foo: extendTemplateWithInit(
-      Template.spacebars_template_test_bracketed_this,
-      function () { initCount++; })
-  });
-
-  var R = ReactiveVar('david');
-  tmpl.helpers({
-    bar: function () {
-      // make sure `this` is bound correctly
-      return { baz: this.symbol + R.get() };
-    }
-  });
-
-  var div = renderToDiv(tmpl, {symbol:'%'});
-  test.equal(initCount, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), '[%david]');
-
-  R.set('avi');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '[%avi]');
-  // check that invalidating the argument to `foo` doesn't require
-  // creating a new `foo`.
-  test.equal(initCount, 1);
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion slashed args", function (test) {
-  // `{{> foo bar/baz}}`
-  var tmpl = Template.spacebars_template_test_inclusion_dotted_args;
-
-  var initCount = 0;
-  tmpl.helpers({foo: extendTemplateWithInit(
-    Template.spacebars_template_test_bracketed_this,
-    function () { initCount++; }) });
-  var R = ReactiveVar('david');
-  tmpl.helpers({bar: function () {
-    // make sure `this` is bound correctly
-    return { baz: this.symbol + R.get() };
-  }});
-
-  var div = renderToDiv(tmpl, {symbol:'%'});
-  test.equal(initCount, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), '[%david]');
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper", function (test) {
-  // test the case where `foo` is a calculated template that changes
-  // reactively.
-  // `{{#foo}}bar{{else}}baz{{/foo}}`
-  var tmpl = Template.spacebars_template_test_block_helper;
-  var R = ReactiveVar(Template.spacebars_template_test_content);
-  tmpl.helpers({foo: function () {
-    return R.get();
-  }});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "bar");
-
-  R.set(Template.spacebars_template_test_elsecontent);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "baz");
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper function with one string arg", function (test) {
-  // `{{#foo "bar"}}content{{/foo}}`
-  var tmpl = Template.spacebars_template_test_block_helper_function_one_string_arg;
-  tmpl.helpers({foo: function () {
-    if (String(this) === "bar")
-      return Template.spacebars_template_test_content;
-    else
-      return null;
-  }});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper function with one helper arg", function (test) {
-  var tmpl = Template.spacebars_template_test_block_helper_function_one_helper_arg;
-  var R = ReactiveVar("bar");
-  tmpl.helpers({
-    bar: function () { return R.get(); },
-    foo: function () {
-      if (String(this) === "bar")
-        return Template.spacebars_template_test_content;
-      else
-        return null;
-    }
-  });
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set("baz");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper component with one helper arg", function (test) {
-  var tmpl = Template.spacebars_template_test_block_helper_component_one_helper_arg;
-  var R = ReactiveVar(true);
-  tmpl.helpers({bar: function () { return R.get(); }});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper component with three helper args", function (test) {
-  var tmpl = Template.spacebars_template_test_block_helper_component_three_helper_args;
-  var R = ReactiveVar("bar");
-  tmpl.helpers({
-    bar_or_baz: function () {
-      return R.get();
-    },
-    equals: function (x, y) {
-      return x === y;
-    }
-  });
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "content");
-
-  R.set("baz");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "");
-});
-
-Tinytest.add("spacebars-tests - template_tests - block helper with dotted arg", function (test) {
-  var tmpl = Template.spacebars_template_test_block_helper_dotted_arg;
-  var R1 = ReactiveVar(1);
-  var R2 = ReactiveVar(10);
-  var R3 = ReactiveVar(100);
-
-  var initCount = 0;
-  tmpl.helpers({
-    foo: extendTemplateWithInit(
-      Template.spacebars_template_test_bracketed_this,
-      function () { initCount++; }),
-
-    bar: function () {
-      return {
-        r1: R1.get(),
-        baz: function (r3) {
-          return this.r1 + R2.get() + r3;
-        }
-      };
-    },
-    qux: function () { return R3.get(); }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "[111]");
-  test.equal(initCount, 1);
-
-  R1.set(2);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[112]");
-  test.equal(initCount, 1);
-
-  R2.set(20);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[122]");
-  test.equal(initCount, 1);
-
-  R3.set(200);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[222]");
-  test.equal(initCount, 1);
-
-  R2.set(30);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[232]");
-  test.equal(initCount, 1);
-
-  R1.set(3);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[233]");
-  test.equal(initCount, 1);
-
-  R3.set(300);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "[333]");
-  test.equal(initCount, 1);
-});
-
-Tinytest.add("spacebars-tests - template_tests - nested content", function (test) {
-  // Test that `{{> Template.contentBlock}}` in an `{{#if}}` works.
-
-  // ```
-  // <template name="spacebars_template_test_iftemplate">
-  //   {{#if condition}}
-  //     {{> Template.contentBlock}}
-  //   {{else}}
-  //     {{> Template.elseBlock}}
-  //   {{/if}}
-  // </template>
-  // ```
-
-  // ```
-  //  {{#spacebars_template_test_iftemplate flag}}
-  //    hello
-  //  {{else}}
-  //    world
-  //  {{/spacebars_template_test_iftemplate}}
-  // ```
-
-  var tmpl = Template.spacebars_template_test_nested_content;
-  var R = ReactiveVar(true);
-  tmpl.helpers({
-    flag: function () {
-      return R.get();
-    }
-  });
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-  R.set(true);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-
-  // Also test that `{{> Template.contentBlock}}` in a custom block helper works.
-  tmpl = Template.spacebars_template_test_nested_content2;
-  R = ReactiveVar(true);
-  tmpl.helpers({
-    x: function () {
-      return R.get();
-    }
-  });
-  div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-  R.set(true);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-});
-
-Tinytest.add("spacebars-tests - template_tests - if", function (test) {
-  var tmpl = Template.spacebars_template_test_if;
-  var R = ReactiveVar(true);
-  tmpl.helpers({
-    foo: function () {
-      return R.get();
-    },
-    bar: 1,
-    baz: 2
-  });
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("1");
-  R.set(false);
-  rendersTo("2");
-});
-
-Tinytest.add("spacebars-tests - template_tests - if in with", function (test) {
-  var tmpl = Template.spacebars_template_test_if_in_with;
-  tmpl.helpers({foo: {bar: "bar"}});
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "bar bar");
-});
-
-Tinytest.add("spacebars-tests - template_tests - each on cursor", function (test) {
-  var tmpl = Template.spacebars_template_test_each;
-  var coll = new Mongo.Collection(null);
-  tmpl.helpers({
-    items: function () {
-      return coll.find({}, {sort: {pos: 1}});
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("else-clause");
-  coll.insert({text: "one", pos: 1});
-  rendersTo("one");
-  coll.insert({text: "two", pos: 2});
-  rendersTo("one two");
-  coll.update({text: "two"}, {$set: {text: "three"}});
-  rendersTo("one three");
-  coll.update({text: "three"}, {$set: {pos: 0}});
-  rendersTo("three one");
-  coll.remove({});
-  rendersTo("else-clause");
-});
-
-Tinytest.add("spacebars-tests - template_tests - each on array", function (test) {
-  var tmpl = Template.spacebars_template_test_each;
-  var R = new ReactiveVar([]);
-  tmpl.helpers({
-    items: function () {
-      return R.get();
-    },
-    text: function () {
-      return this;
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  var rendersTo = function (html) { divRendersTo(test, div, html); };
-
-  rendersTo("else-clause");
-  R.set([""]);
-  rendersTo("");
-  R.set(["x", "", "toString"]);
-  rendersTo("x toString");
-  R.set(["toString"]);
-  rendersTo("toString");
-  R.set([]);
-  rendersTo("else-clause");
-  R.set([0, 1, 2]);
-  rendersTo("0 1 2");
-  R.set([]);
-  rendersTo("else-clause");
-});
-
-Tinytest.add("spacebars-tests - template_tests - ..", function (test) {
-  var tmpl = Template.spacebars_template_test_dots;
-
-  Template.spacebars_template_test_dots_subtemplate.helpers({
-    getTitle: function (from) {
-      return from.title;
-    }
-  });
-
-  tmpl.helpers({
-    foo: {
-      title: "foo",
-      bar: {title: "bar",
-            items: [{title: "item"}]}
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-
-  test.equal(canonicalizeHtml(div.innerHTML), [
-    "A", "B", "C", "D",
-    // {{> spacebars_template_test_dots_subtemplate}}
-    "TITLE", "1item", "2item", "3bar", "4foo", "GETTITLE", "5item", "6bar", "7foo",
-    // {{> spacebars_template_test_dots_subtemplate ..}}
-    "TITLE", "1bar", "2bar", "3item", "4bar", "GETTITLE", "5bar", "6item", "7bar"].join(" "));
-});
-
-Tinytest.add("spacebars-tests - template_tests - select tags", function (test) {
-  var tmpl = Template.spacebars_template_test_select_tag;
-
-  // {label: (string)}
-  var optgroups = new Mongo.Collection(null);
-
-  // {optgroup: (id), value: (string), selected: (boolean), label: (string)}
-  var options = new Mongo.Collection(null);
-
-  tmpl.helpers({
-    optgroups: function () { return optgroups.find(); },
-    options: function () { return options.find({optgroup: this._id}); },
-    selectedAttr: function () { return this.selected ? {selected: true} : {}; }
-  });
-
-  var div = renderToDiv(tmpl);
-  var selectEl = $(div).find('select')[0];
-
-  // returns canonicalized contents of `div` in the form eg
-  // ["<select>", "</select>"]. strip out selected attributes -- we
-  // verify correctness by observing the `selected` property
-  var divContent = function () {
-    return canonicalizeHtml(
-      div.innerHTML.replace(/selected="[^"]*"/g, '').replace(/selected/g, ''))
-          .replace(/\>\s*\</g, '>\n<')
-          .split('\n');
-  };
-
-  test.equal(divContent(), ["<select>", "</select>"]);
-
-  var optgroup1 = optgroups.insert({label: "one"});
-  var optgroup2 = optgroups.insert({label: "two"});
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-
-  options.insert({optgroup: optgroup1, value: "value1", selected: false, label: "label1"});
-  options.insert({optgroup: optgroup1, value: "value2", selected: true, label: "label2"});
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1">label1</option>',
-    '<option value="value2">label2</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value2");
-  test.equal($(selectEl).find('option')[0].selected, false);
-  test.equal($(selectEl).find('option')[1].selected, true);
-
-  // swap selection
-  options.update({value: "value1"}, {$set: {selected: true}});
-  options.update({value: "value2"}, {$set: {selected: false}});
-  Tracker.flush();
-
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1">label1</option>',
-    '<option value="value2">label2</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value1");
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, false);
-
-  // change value and label
-  options.update({value: "value1"}, {$set: {value: "value1.0"}});
-  options.update({value: "value2"}, {$set: {label: "label2.0"}});
-  Tracker.flush();
-
-  test.equal(divContent(), [
-    '<select>',
-    '<optgroup label="one">',
-    '<option value="value1.0">label1</option>',
-    '<option value="value2">label2.0</option>',
-    '</optgroup>',
-    '<optgroup label="two">',
-    '</optgroup>',
-    '</select>'
-  ]);
-  test.equal(selectEl.value, "value1.0");
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, false);
-
-  // unselect and then select both options. normally, the second is
-  // selected (since it got selected later). then switch to <select
-  // multiple="">. both should be selected.
-  options.update({}, {$set: {selected: false}}, {multi: true});
-  Tracker.flush();
-  options.update({}, {$set: {selected: true}}, {multi: true});
-  Tracker.flush();
-  test.equal($(selectEl).find('option')[0].selected, false);
-  test.equal($(selectEl).find('option')[1].selected, true);
-
-  selectEl.multiple = true; // allow multiple selection
-  options.update({}, {$set: {selected: false}}, {multi: true});
-  Tracker.flush();
-  options.update({}, {$set: {selected: true}}, {multi: true});
-  Tracker.flush();
-  test.equal($(selectEl).find('option')[0].selected, true);
-  test.equal($(selectEl).find('option')[1].selected, true);
-});
-
-Tinytest.add('spacebars-tests - template_tests - {{#with}} falsy; issue #770', function (test) {
-  Template.test_template_issue770.helpers({
-    value1: function () { return "abc"; },
-    value2: function () { return false; }
-  });
-  var div = renderToDiv(Template.test_template_issue770);
-  test.equal(canonicalizeHtml(div.innerHTML),
-             "abc xxx abc");
-});
-
-Tinytest.add("spacebars-tests - template_tests - tricky attrs", function (test) {
-  var tmpl = Template.spacebars_template_test_tricky_attrs;
-  var R = ReactiveVar('foo');
-  tmpl.helpers({
-    theType: function () { return 'text'; },
-    theClass: function () { return R.get(); }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML).slice(0, 30),
-             '<input type="text"><input class="foo" type="checkbox">'.slice(0, 30));
-
-  R.set('bar');
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML),
-             '<input type="text"><input class="bar" type="checkbox">');
-
-});
-
-Tinytest.add('spacebars-tests - template_tests - no data context', function (test) {
-  var tmpl = Template.spacebars_template_test_no_data;
-
-  // failure is if an exception is thrown here
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'asdf');
-});
-
-Tinytest.add('spacebars-tests - template_tests - textarea', function (test) {
-  var tmpl = Template.spacebars_template_test_textarea;
-
-  var R = ReactiveVar('hello');
-
-  tmpl.helpers({foo: function () {
-    return R.get();
-  }});
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, 'hello');
-
-  R.set('world');
-  Tracker.flush();
-  test.equal(textarea.value, 'world');
-
-});
-
-Tinytest.add('spacebars-tests - template_tests - textarea 2', function (test) {
-  var tmpl = Template.spacebars_template_test_textarea2;
-
-  var R = ReactiveVar(true);
-
-  tmpl.helpers({foo: function () {
-    return R.get();
-  }});
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, '</not a tag>');
-
-  R.set(false);
-  Tracker.flush();
-  test.equal(textarea.value, '<also not a tag>');
-
-  R.set(true);
-  Tracker.flush();
-  test.equal(textarea.value, '</not a tag>');
-});
-
-Tinytest.add('spacebars-tests - template_tests - textarea 3', function (test) {
-  var tmpl = Template.spacebars_template_test_textarea3;
-
-  var R = ReactiveVar('hello');
-
-  tmpl.helpers({foo: function () {
-    return R.get();
-  }});
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.id, 'myTextarea');
-  test.equal(textarea.value, 'hello');
-
-  R.set('world');
-  Tracker.flush();
-  test.equal(textarea.value, 'world');
-
-});
-
-Tinytest.add('spacebars-tests - template_tests - textarea each', function (test) {
-  var tmpl = Template.spacebars_template_test_textarea_each;
-
-  var R = ReactiveVar(['APPLE', 'BANANA']);
-
-  tmpl.helpers({foo: function () {
-    return R.get();
-  }});
-
-  var div = renderToDiv(tmpl);
-  var textarea = div.querySelector('textarea');
-  test.equal(textarea.value, '<not a tag APPLE <not a tag BANANA ');
-
-  R.set([]);
-  Tracker.flush();
-  test.equal(textarea.value, '<>');
-
-  R.set(['CUCUMBER']);
-  Tracker.flush();
-  test.equal(textarea.value, '<not a tag CUCUMBER ');
-
-});
-
-// Ensure that one can call `Meteor.defer` within a rendered callback
-// triggered by a document insertion that happend in a method stub.
-//
-// Why do we have this test? Because you generally can't call
-// `Meteor.defer` inside a method stub (see
-// packages/meteor/timers.js).  This test verifies that rendered
-// callbacks don't fire synchronously as part of a method stub.
-testAsyncMulti('spacebars-tests - template_tests - defer in rendered callbacks', [function (test, expect) {
-  var tmpl = Template.spacebars_template_test_defer_in_rendered;
-  var coll = new Mongo.Collection(null);
-
-  Meteor.methods({
-    spacebarsTestInsertEmptyObject: function () {
-      // cause a new instance of `subtmpl` to be placed in the
-      // DOM. verify that it's not fired directly within a method
-      // stub, in which `Meteor.defer` is not allowed.
-      coll.insert({});
-    }
-  });
-
-  tmpl.helpers({
-    items: function () {
-      return coll.find();
-    }
-  });
-
-  var subtmpl = Template.spacebars_template_test_defer_in_rendered_subtemplate;
-
-  subtmpl.rendered = expect(function () {
-    // will throw if called in a method stub
-    Meteor.defer(function () {});
-  });
-
-  var div = renderToDiv(tmpl);
-
-  // not defined on the server, but it's fine since the stub does
-  // the relevant work
-  Meteor._suppress_log(1);
-  Meteor.call("spacebarsTestInsertEmptyObject");
-}]);
-
-testAsyncMulti('spacebars-tests - template_tests - rendered template is DOM in rendered callbacks', [
-  function (test, expect) {
-    var tmpl = Template.spacebars_template_test_aaa;
-    tmpl.rendered = expect(function () {
-      test.equal(canonicalizeHtml(div.innerHTML), "aaa");
-    });
-    var div = renderToDiv(tmpl);
-    Tracker.flush();
-  }
-]);
-
-// Test that in:
-//
-// ```
-// {{#with someData}}
-//   {{foo}} {{bar}}
-// {{/with}}
-// ```
-//
-// ... we run `someData` once even if `foo` re-renders.
-Tinytest.add('spacebars-tests - template_tests - with someData', function (test) {
-  var tmpl = Template.spacebars_template_test_with_someData;
-
-  var foo = ReactiveVar('AAA');
-  var someDataRuns = 0;
-
-  tmpl.helpers({
-    someData: function () {
-      someDataRuns++;
-      return {};
-    },
-    foo: function () {
-      return foo.get();
-    },
-    bar: function () {
-      return 'YO';
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'AAA YO');
-
-  foo.set('BBB');
-  Tracker.flush();
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'BBB YO');
-
-  foo.set('CCC');
-  Tracker.flush();
-  test.equal(someDataRuns, 1);
-  test.equal(canonicalizeHtml(div.innerHTML), 'CCC YO');
-});
-
-Tinytest.add('spacebars-tests - template_tests - #each stops when rendered element is removed', function (test) {
-  var tmpl = Template.spacebars_template_test_each_stops;
-  var coll = new Mongo.Collection(null);
-  coll.insert({});
-  tmpl.helpers({items: function () { return coll.find(); }});
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, 'x');
-
-  // trigger #each component destroyed
-  $(div).remove();
-
-  // insert another document. cursor should no longer be observed so
-  // should have no effect.
-  coll.insert({});
-  divRendersTo(test, div, 'x');
-});
-
-Tinytest.add('spacebars-tests - template_tests - block helpers in attribute', function (test) {
-  var tmpl = Template.spacebars_template_test_block_helpers_in_attribute;
-
-  var coll = new Mongo.Collection(null);
-  tmpl.helpers({
-    classes: function () {
-    return coll.find({}, {sort: {name: 1}});
-    },
-    startsLowerCase: function (name) {
-      return /^[a-z]/.test(name);
-    }
-  });
-  coll.insert({name: 'David'});
-  coll.insert({name: 'noodle'});
-  coll.insert({name: 'donut'});
-  coll.insert({name: 'frankfurter'});
-  coll.insert({name: 'Steve'});
-
-  var containerDiv = renderToDiv(tmpl);
-  var div = containerDiv.querySelector('div');
-
-  var shouldBe = function (className) {
-    Tracker.flush();
-    test.equal(div.innerHTML, "Smurf");
-    test.equal(div.className, className);
-    var result = canonicalizeHtml(containerDiv.innerHTML);
-    if (result === '<div>Smurf</div>')
-      result = '<div class="">Smurf</div>'; // e.g. IE 9 and 10
-    test.equal(result, '<div class="' + className + '">Smurf</div>');
-  };
-
-  shouldBe('donut frankfurter noodle');
-  coll.remove({name: 'frankfurter'}); // (it was kind of a mouthful)
-  shouldBe('donut noodle');
-  coll.remove({name: 'donut'});
-  shouldBe('noodle');
-  coll.remove({name: 'noodle'});
-  shouldBe(''); // 'David' and 'Steve' appear in the #each but fail the #if
-  coll.remove({});
-  shouldBe('none'); // now the `{{else}}` case kicks in
-  coll.insert({name: 'bubblegum'});
-  shouldBe('bubblegum');
-});
-
-Tinytest.add('spacebars-tests - template_tests - block helpers in attribute 2', function (test) {
-  var tmpl = Template.spacebars_template_test_block_helpers_in_attribute_2;
-
-  var R = ReactiveVar(true);
-
-  tmpl.helpers({foo: function () { return R.get(); }});
-
-  var div = renderToDiv(tmpl);
-  var input = div.querySelector('input');
-
-  test.equal(input.value, '"');
-  R.set(false);
-  Tracker.flush();
-  test.equal(input.value, '&<></x>');
-});
-
-
-// Test that if the argument to #each is a constant, it doesn't establish a
-// dependency on the data context, so when the context changes, items of
-// the #each are not "changed" and helpers do not rerun.
-Tinytest.add('spacebars-tests - template_tests - constant #each argument', function (test) {
-  var tmpl = Template.spacebars_template_test_constant_each_argument;
-
-  var justReturnRuns = 0; // how many times `justReturn` is called
-  var R = ReactiveVar(1);
-
-  tmpl.helpers({
-    someData: function () {
-      return R.get();
-    },
-    anArray: ['foo', 'bar'],
-    justReturn: function (x) {
-      justReturnRuns++;
-      return String(x);
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-
-  test.equal(justReturnRuns, 2);
-  test.equal(canonicalizeHtml(div.innerHTML).replace(/\s+/g, ' '),
-             'foo bar 1');
-
-  R.set(2);
-  Tracker.flush();
-
-  test.equal(justReturnRuns, 2); // still 2, no new runs!
-  test.equal(canonicalizeHtml(div.innerHTML).replace(/\s+/g, ' '),
-             'foo bar 2');
-});
-
-Tinytest.addAsync('spacebars-tests - template_tests - #markdown - basic', function (test, onComplete) {
-  var tmpl = Template.spacebars_template_test_markdown_basic;
-  tmpl.helpers({
-    obj: {snippet: "<i>hi</i>"},
-    hi: function () {
-      return this.snippet;
-    }
-  });
-  var div = renderToDiv(tmpl);
-
-  Meteor.call("getAsset", "markdown_basic.html", function (err, html) {
-    test.isFalse(err);
-    test.equal(canonicalizeHtml(div.innerHTML),
-               canonicalizeHtml(html));
-    onComplete();
-  });
-});
-
-testAsyncMulti('spacebars-tests - template_tests - #markdown - if', [
-  function (test, expect) {
-    var self = this;
-    Meteor.call("getAsset", "markdown_if1.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html1 = html;
-    }));
-    Meteor.call("getAsset", "markdown_if2.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html2 = html;
-    }));
-  },
-
-  function (test, expect) {
-    var self = this;
-    var tmpl = Template.spacebars_template_test_markdown_if;
-    var R = new ReactiveVar(false);
-    tmpl.helpers({cond: function () { return R.get(); }});
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html1));
-    R.set(true);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html2));
-  }
-]);
-
-testAsyncMulti('spacebars-tests - template_tests - #markdown - each', [
-  function (test, expect) {
-    var self = this;
-    Meteor.call("getAsset", "markdown_each1.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html1 = html;
-    }));
-    Meteor.call("getAsset", "markdown_each2.html", expect(function (err, html) {
-      test.isFalse(err);
-      self.html2 = html;
-    }));
-  },
-
-  function (test, expect) {
-    var self = this;
-    var tmpl = Template.spacebars_template_test_markdown_each;
-    var R = new ReactiveVar([]);
-    tmpl.helpers({seq: function () { return R.get(); }});
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html1));
-
-    R.set(["item"]);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), canonicalizeHtml(self.html2));
-  }
-]);
-
-Tinytest.add('spacebars-tests - template_tests - #markdown - inclusion', function (test) {
-  var tmpl = Template.spacebars_template_test_markdown_inclusion;
-  var subtmpl = Template.spacebars_template_test_markdown_inclusion_subtmpl;
-  subtmpl.helpers({foo: "bar"});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<p><span>Foo is bar.</span></p>");
-});
-
-Tinytest.add('spacebars-tests - template_tests - #markdown - block helpers', function (test) {
-  var tmpl = Template.spacebars_template_test_markdown_block_helpers;
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<p>Hi there!</p>");
-});
-
-// Test that when a simple helper re-runs due to a dependency changing
-// but the return value is the same, the DOM text node is not
-// re-rendered.
-Tinytest.add('spacebars-tests - template_tests - simple helpers are isolated', function (test) {
-  var runs = [{
-    helper: function () { return "foo"; },
-    nodeValue: "foo"
-  }, {
-    helper: function () { return new Spacebars.SafeString("bar"); },
-    nodeValue: "bar"
-  }];
-
-  _.each(runs, function (run) {
-    var tmpl = Template.spacebars_template_test_simple_helpers_are_isolated;
-    var dep = new Tracker.Dependency;
-    tmpl.helpers({foo: function () {
-      dep.depend();
-      return run.helper();
-    }});
-    var div = renderToDiv(tmpl);
-    var fooTextNode = _.find(div.childNodes, function (node) {
-      return node.nodeValue === run.nodeValue;
-    });
-
-    test.isTrue(fooTextNode);
-
-    dep.changed();
-    Tracker.flush();
-    var newFooTextNode = _.find(div.childNodes, function (node) {
-      return node.nodeValue === run.nodeValue;
-    });
-
-    test.equal(fooTextNode, newFooTextNode);
-  });
-});
-
-// Test that when a helper in an element attribute re-runs due to a
-// dependency changing but the return value is the same, the attribute
-// value is not set.
-Tinytest.add('spacebars-tests - template_tests - attribute helpers are isolated', function (test) {
-  var tmpl = Template.spacebars_template_test_attr_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  tmpl.helpers({foo: function () {
-    dep.depend();
-    return "foo";
-  }});
-  var div = renderToDiv(tmpl);
-  var pElement = div.querySelector('p');
-
-  test.equal(pElement.getAttribute('attr'), 'foo');
-
-  // set the attribute to something else, afterwards check that it
-  // hasn't been updated back to the correct value.
-  pElement.setAttribute('attr', 'not-foo');
-  dep.changed();
-  Tracker.flush();
-  test.equal(pElement.getAttribute('attr'), 'not-foo');
-});
-
-// A helper can return an object with a set of element attributes via
-// `<p {{attrs}}>`. When it re-runs due to a dependency changing the
-// value for a given attribute might stay the same. Test that the
-// attribute is not set on the DOM element.
-Tinytest.add('spacebars-tests - template_tests - attribute object helpers are isolated', function (test) {
-  var tmpl = Template.spacebars_template_test_attr_object_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  tmpl.helpers({attrs: function () {
-    dep.depend();
-    return {foo: "bar"};
-  }});
-  var div = renderToDiv(tmpl);
-  var pElement = div.querySelector('p');
-
-  test.equal(pElement.getAttribute('foo'), 'bar');
-
-  // set the attribute to something else, afterwards check that it
-  // hasn't been updated back to the correct value.
-  pElement.setAttribute('foo', 'not-bar');
-  dep.changed();
-  Tracker.flush();
-  test.equal(pElement.getAttribute('foo'), 'not-bar');
-});
-
-// Test that when a helper in an inclusion directive (`{{> foo }}`)
-// re-runs due to a dependency changing but the return value is the
-// same, the template is not re-rendered.
-//
-// Also, verify that an error is thrown if the return value from such
-// a helper is not a component.
-Tinytest.add('spacebars-tests - template_tests - inclusion helpers are isolated', function (test) {
-  var tmpl = Template.spacebars_template_test_inclusion_helpers_are_isolated;
-  var dep = new Tracker.Dependency;
-  var subtmpl = Template.spacebars_template_test_inclusion_helpers_are_isolated_subtemplate;
-  // make a copy so we can set "rendered" without mutating the original
-  var subtmplCopy = copyTemplate(subtmpl);
-
-  var R = new ReactiveVar(subtmplCopy);
-  tmpl.helpers({foo: function () {
-    dep.depend();
-    return R.get();
-  }});
-
-  var div = renderToDiv(tmpl);
-  subtmplCopy.rendered = function () {
-    test.fail("shouldn't re-render when same value returned from helper");
-  };
-  subtmplCopy.onRendered(function () {
-    test.fail("shouldn't re-render when same value returned from helper");
-  });
-
-  dep.changed();
-  Tracker.flush({_throwFirstError: true}); // `subtmplCopy.rendered` not called
-
-  R.set(null);
-  Tracker.flush({_throwFirstError: true}); // no error thrown
-
-  R.set("neither a component nor null");
-
-  test.throws(function () {
-    Tracker.flush({_throwFirstError: true});
-  }, /Expected template or null/);
-});
-
-Tinytest.add('spacebars-tests - template_tests - nully attributes', function (test) {
-  var tmpls = {
-    0: Template.spacebars_template_test_nully_attributes0,
-    1: Template.spacebars_template_test_nully_attributes1,
-    2: Template.spacebars_template_test_nully_attributes2,
-    3: Template.spacebars_template_test_nully_attributes3,
-    4: Template.spacebars_template_test_nully_attributes4,
-    5: Template.spacebars_template_test_nully_attributes5,
-    6: Template.spacebars_template_test_nully_attributes6
-  };
-
-  var run = function (whichTemplate, data, expectTrue) {
-    var div = renderToDiv(tmpls[whichTemplate], data);
-    var input = div.querySelector('input');
-    var descr = JSON.stringify([whichTemplate, data, expectTrue]);
-    if (expectTrue) {
-      test.isTrue(input.checked, descr);
-      test.equal(typeof input.getAttribute('stuff'), 'string', descr);
-    } else {
-      test.isFalse(input.checked);
-      test.equal(JSON.stringify(input.getAttribute('stuff')), 'null', descr);
-    }
-
-    var html = Blaze.toHTML(Blaze.With(data, function () {
-      return tmpls[whichTemplate];
-    }));
-
-    test.equal(/ checked="[^"]*"/.test(html), !! expectTrue);
-    test.equal(/ stuff="[^"]*"/.test(html), !! expectTrue);
-  };
-
-  run(0, {}, true);
-
-  var truthies = [true, ''];
-  var falsies = [false, null, undefined];
-
-  _.each(truthies, function (x) {
-    run(1, {foo: x}, true);
-  });
-  _.each(falsies, function (x) {
-    run(1, {foo: x}, false);
-  });
-
-  _.each(truthies, function (x) {
-    _.each(truthies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-    _.each(falsies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-  });
-  _.each(falsies, function (x) {
-    _.each(truthies, function (y) {
-      run(2, {foo: x, bar: y}, true);
-    });
-    _.each(falsies, function (y) {
-      run(2, {foo: x, bar: y}, false);
-    });
-  });
-
-  run(3, {foo: true}, false);
-  run(3, {foo: false}, false);
-});
-
-Tinytest.add("spacebars-tests - template_tests - double", function (test) {
-  var tmpl = Template.spacebars_template_test_double;
-
-  var run = function (foo, expectedResult) {
-    tmpl.helpers({foo: foo});
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), expectedResult);
-  };
-
-  run('asdf', 'asdf');
-  run(1.23, '1.23');
-  run(0, '0');
-  run(true, 'true');
-  run(false, '');
-  run(null, '');
-  run(undefined, '');
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion lookup order", function (test) {
-  // test that {{> foo}} looks for a helper named 'foo', then a
-  // template named 'foo', then a 'foo' field in the data context.
-  var tmpl = Template.spacebars_template_test_inclusion_lookup;
-  var tmplData = function () {
-    return {
-      // shouldn't have an effect since we define a helper with the
-      // same name.
-      spacebars_template_test_inclusion_lookup_subtmpl: Template.
-        spacebars_template_test_inclusion_lookup_subtmpl3,
-      dataContextSubtmpl: Template.
-        spacebars_template_test_inclusion_lookup_subtmpl3};
-  };
-
-  tmpl.helpers({
-    spacebars_template_test_inclusion_lookup_subtmpl:
-    Template.spacebars_template_test_inclusion_lookup_subtmpl2
-  });
-
-  test.equal(canonicalizeHtml(renderToDiv(tmpl, tmplData).innerHTML),
-    ["This is generated by a helper with the same name.",
-     "This is a template passed in the data context."].join(' '));
-});
-
-Tinytest.add("spacebars-tests - template_tests - content context", function (test) {
-  var tmpl = Template.spacebars_template_test_content_context;
-  var R = ReactiveVar(true);
-  tmpl.helpers({foo: {
-    firstLetter: 'F',
-    secondLetter: 'O',
-    bar: {
-      cond: function () { return R.get(); },
-      firstLetter: 'B',
-      secondLetter: 'A'
-    }
-  }});
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'BO');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'FA');
-});
-
-_.each(['textarea', 'text', 'password', 'submit', 'button',
-        'reset', 'select', 'hidden'], function (type) {
-  Tinytest.add("spacebars-tests - template_tests - controls - " + type, function(test) {
-    var R = ReactiveVar({x:"test"});
-    var R2 = ReactiveVar("");
-    var tmpl;
-
-    if (type === 'select') {
-      tmpl = Template.spacebars_test_control_select;
-      tmpl.helpers({
-        options: ['This is a test', 'This is a fridge',
-                  'This is a frog', 'This is a new frog', 'foobar',
-                  'This is a photograph', 'This is a monkey',
-                  'This is a donkey'],
-        selected: function () {
-          R2.get();  // Re-render when R2 is changed, even though it
-          // doesn't affect HTML.
-          return ('This is a ' + R.get().x) === this.toString();
-        }
-      });
-    } else if (type === 'textarea') {
-      tmpl = Template.spacebars_test_control_textarea;
-      tmpl.helpers({
-        value: function () {
-          R2.get();  // Re-render when R2 is changed, even though it
-          // doesn't affect HTML.
-          return 'This is a ' + R.get().x;
-        }
-      });
-    } else {
-      tmpl = Template.spacebars_test_control_input;
-      tmpl.helpers({
-        value: function () {
-          R2.get();  // Re-render when R2 is changed, even though it
-          // doesn't affect HTML.
-          return 'This is a ' + R.get().x;
-        },
-        type: type
-      });
-    }
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    var canFocus = (type !== 'hidden');
-
-    // find first element child, ignoring any marker nodes
-    var input = div.firstChild;
-    while (input.nodeType !== 1)
-      input = input.nextSibling;
-
-    if (type === 'textarea' || type === 'select') {
-      test.equal(input.nodeName, type.toUpperCase());
-    } else {
-      test.equal(input.nodeName, 'INPUT');
-      test.equal(input.type, type);
-    }
-    test.equal(DomUtils.getElementValue(input), "This is a test");
-
-    // value updates reactively
-    R.set({x:"fridge"});
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "This is a fridge");
-
-    if (canFocus) {
-      // ...if focused, it still updates but focus isn't lost.
-      focusElement(input);
-      DomUtils.setElementValue(input, "something else");
-      R.set({x:"frog"});
-
-      Tracker.flush();
-      test.equal(DomUtils.getElementValue(input), "This is a frog");
-      test.equal(document.activeElement, input);
-    }
-
-    // Setting a value (similar to user typing) should prevent value from being
-    // reverted if the div is re-rendered but the rendered value (ie, R) does
-    // not change.
-    DomUtils.setElementValue(input, "foobar");
-    R2.set("change");
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "foobar");
-
-    // ... but if the actual rendered value changes, that should take effect.
-    R.set({x:"photograph"});
-    Tracker.flush();
-    test.equal(DomUtils.getElementValue(input), "This is a photograph");
-
-    document.body.removeChild(div);
-  });
-});
-
-Tinytest.add("spacebars-tests - template_tests - radio", function(test) {
-  var R = ReactiveVar("");
-  var R2 = ReactiveVar("");
-  var change_buf = [];
-  var tmpl = Template.spacebars_test_control_radio;
-  tmpl.helpers({
-    bands: ["AM", "FM", "XM"],
-    isChecked: function () {
-      return R.get() === this.toString();
-    },
-    band: function () {
-      return R.get();
-    }
-  });
-  tmpl.events({
-    'change input': function (event) {
-      var btn = event.target;
-      var band = btn.value;
-      change_buf.push(band);
-      R.set(band);
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-
-  // get the three buttons; they should not change identities!
-  var btns = nodesToArray(div.getElementsByTagName("INPUT"));
-  var text = function () {
-    var text = div.innerText || div.textContent;
-    return text.replace(/[ \n\r]+/g, " ");
-  };
-
-  test.equal(_.pluck(btns, 'checked'), [false, false, false]);
-  test.equal(text(), "Band: ");
-
-  clickIt(btns[0]);
-  test.equal(change_buf, ['AM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
-  test.equal(text(), "Band: AM");
-
-  R2.set("change");
-  Tracker.flush();
-  test.length(change_buf, 0);
-  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
-  test.equal(text(), "Band: AM");
-
-  clickIt(btns[1]);
-  test.equal(change_buf, ['FM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, true, false]);
-  test.equal(text(), "Band: FM");
-
-  clickIt(btns[2]);
-  test.equal(change_buf, ['XM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, false, true]);
-  test.equal(text(), "Band: XM");
-
-  clickIt(btns[1]);
-  test.equal(change_buf, ['FM']);
-  change_buf.length = 0;
-  Tracker.flush();
-  test.equal(_.pluck(btns, 'checked'), [false, true, false]);
-  test.equal(text(), "Band: FM");
-
-  document.body.removeChild(div);
-});
-
-Tinytest.add("spacebars-tests - template_tests - checkbox", function(test) {
-  var tmpl = Template.spacebars_test_control_checkbox;
-  var labels = ["Foo", "Bar", "Baz"];
-  var Rs = {};
-  _.each(labels, function (label) {
-    Rs[label] = ReactiveVar(false);
-  });
-  tmpl.helpers({
-    labels: labels,
-    isChecked: function () {
-      return Rs[this.toString()].get();
-    }
-  });
-  var changeBuf = [];
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-
-  var boxes = nodesToArray(div.getElementsByTagName("INPUT"));
-
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // Re-render with first one checked.
-  Rs.Foo.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
-
-  // Re-render with first one unchecked again.
-  Rs.Foo.set(false);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // User clicks the second one.
-  clickElement(boxes[1]);
-  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
-
-  // Re-render with third one checked. Second one should stay checked because
-  // it's a user update!
-  Rs.Baz.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, true, true]);
-
-  // User turns second and third off.
-  clickElement(boxes[1]);
-  clickElement(boxes[2]);
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  // Re-render with first one checked. Third should stay off because it's a user
-  // update!
-  Rs.Foo.set(true);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
-
-  // Re-render with first one unchecked. Third should still stay off.
-  Rs.Foo.set(false);
-  Tracker.flush();
-  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
-
-  document.body.removeChild(div);
-});
-
-Tinytest.add('spacebars-tests - template_tests - unfound template', function (test) {
-  test.throws(function () {
-    renderToDiv(Template.spacebars_test_nonexistent_template);
-  }, /No such template/);
-});
-
-Tinytest.add('spacebars-tests - template_tests - helper passed to #if called exactly once when invalidated', function (test) {
-  var tmpl = Template.spacebars_test_if_helper;
-
-  var foo;
-  var count = 0;
-  var d = new Tracker.Dependency;
-  tmpl.helpers({foo: function () {
-    d.depend();
-    count++;
-    return foo;
-  }});
-
-  foo = false;
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "false");
-  test.equal(count, 1);
-
-  foo = true;
-  d.changed();
-  divRendersTo(test, div, "true");
-  test.equal(count, 2);
-});
-
-Tinytest.add('spacebars-tests - template_tests - custom block helper functions called exactly once when invalidated', function (test) {
-  var tmpl = Template.spacebars_test_block_helper_function;
-
-  var foo;
-  var count = 0;
-  var d = new Tracker.Dependency;
-  tmpl.helpers({foo: function () {
-    d.depend();
-    count++;
-    return Template.spacebars_template_test_aaa;
-  }});
-
-  foo = false;
-  renderToDiv(tmpl);
-  Tracker.flush();
-  test.equal(count, 1);
-
-  foo = true;
-  d.changed();
-  Tracker.flush();
-  test.equal(count, 2);
-});
-
-var runOneTwoTest = function (test, subTemplateName, optionsData) {
-  _.each([Template.spacebars_test_helpers_stop_onetwo,
-          Template.spacebars_test_helpers_stop_onetwo_attribute],
-         function (tmpl) {
-
-           var sub1 = Template[subTemplateName + '1'];
-           var sub2 = Template[subTemplateName + '2'];
-
-           tmpl.helpers({
-             one: sub1,
-             two: sub2
-           });
-
-           var buf = '';
-
-           var showOne = ReactiveVar(true);
-           var dummy = ReactiveVar(0);
-
-           tmpl.helpers({showOne: function () { return showOne.get(); }});
-           sub1.helpers({options: function () {
-             var x = dummy.get();
-             buf += '1';
-             if (optionsData)
-               return optionsData[x];
-             else
-               return ['something'];
-           }});
-           sub2.helpers({options: function () {
-             var x = dummy.get();
-             buf += '2';
-             if (optionsData)
-               return optionsData[x];
-             else
-               return ['something'];
-           }});
-
-           var div = renderToDiv(tmpl);
-           Tracker.flush();
-           test.equal(buf, '1');
-
-           showOne.set(false);
-           dummy.set(1);
-           Tracker.flush();
-           test.equal(buf, '12');
-
-           showOne.set(true);
-           dummy.set(2);
-           Tracker.flush();
-           test.equal(buf, '121');
-
-           // clean up the div
-           $(div).remove();
-           test.equal(showOne._numListeners(), 0);
-           test.equal(dummy._numListeners(), 0);
-         });
-};
-
-Tinytest.add('spacebars-tests - template_tests - with stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_with');
-});
-
-Tinytest.add('spacebars-tests - template_tests - each stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_each');
-});
-
-Tinytest.add('spacebars-tests - template_tests - each inside with stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_with_each');
-});
-
-Tinytest.add('spacebars-tests - template_tests - if stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_if', ['a', 'b', 'a']);
-});
-
-Tinytest.add('spacebars-tests - template_tests - unless stops without re-running helper', function (test) {
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_unless', ['a', 'b', 'a']);
-});
-
-Tinytest.add('spacebars-tests - template_tests - inclusion stops without re-running function', function (test) {
-  var t = Template.spacebars_test_helpers_stop_inclusion3;
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_inclusion', [t, t, t]);
-});
-
-Tinytest.add('spacebars-tests - template_tests - template with callbacks inside with stops without recalculating data', function (test) {
-  var tmpl = Template.spacebars_test_helpers_stop_with_callbacks3;
-  tmpl.created = function () {};
-  tmpl.rendered = function () {};
-  tmpl.destroyed = function () {};
-  runOneTwoTest(test, 'spacebars_test_helpers_stop_with_callbacks');
-});
-
-Tinytest.add('spacebars-tests - template_tests - no data context is seen as an empty object', function (test) {
-  var tmpl = Template.spacebars_test_no_data_context;
-
-  var dataInHelper = 'UNSET';
-  var dataInRendered = 'UNSET';
-  var dataInCreated = 'UNSET';
-  var dataInDestroyed = 'UNSET';
-  var dataInEvent = 'UNSET';
-
-  tmpl.helpers({foo: function () {
-    dataInHelper = this;
-  }});
-  tmpl.created = function () {
-    dataInCreated = this.data;
-  };
-  tmpl.rendered = function () {
-    dataInRendered = this.data;
-  };
-  tmpl.destroyed = function () {
-    dataInDestroyed = this.data;
-  };
-  tmpl.events({
-    'click': function () {
-      dataInEvent = this;
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  document.body.appendChild(div);
-  clickElement(div.querySelector('button'));
-  Tracker.flush(); // rendered gets called afterFlush
-  $(div).remove();
-
-  test.isFalse(dataInHelper === window);
-  test.equal(dataInHelper, {});
-  test.equal(dataInCreated, null);
-  test.equal(dataInRendered, null);
-  test.equal(dataInDestroyed, null);
-  test.isFalse(dataInEvent === window);
-  test.equal(dataInEvent, {});
-});
-
-Tinytest.add('spacebars-tests - template_tests - falsy with', function (test) {
-  var tmpl = Template.spacebars_test_falsy_with;
-  var R = ReactiveVar(null);
-  tmpl.helpers({obj: function () { return R.get(); }});
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "");
-
-  R.set({greekLetter: 'alpha'});
-  divRendersTo(test, div, "alpha");
-
-  R.set(null);
-  divRendersTo(test, div, "");
-
-  R.set({greekLetter: 'alpha'});
-  divRendersTo(test, div, "alpha");
-});
-
-Tinytest.add("spacebars-tests - template_tests - helpers don't leak", function (test) {
-  var tmpl = Template.spacebars_test_helpers_dont_leak;
-  tmpl.foo = "wrong";
-  tmpl.bar = function () { return "WRONG"; };
-
-  // Also test that custom block helpers (implemented as templates) do NOT
-  // interfere with helper lookup in the current template
-  Template.spacebars_test_helpers_dont_leak2.helpers({
-    bonus: function () { return 'BONUS'; }});
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, "correct BONUS");
-});
-
-Tinytest.add("spacebars-tests - template_tests - event handler returns false",
-  function (test) {
-    var tmpl = Template.spacebars_test_event_returns_false;
-    var elemId = "spacebars_test_event_returns_false_link";
-    tmpl.events({
-      'click a': function (evt) { return false; }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    clickIt(document.getElementById(elemId));
-    // NOTE: This failure can stick across test runs!  Try
-    // removing '#bad-url' from the location bar and run
-    // the tests again. :)
-    test.isFalse(/#bad-url/.test(window.location.hash));
-    document.body.removeChild(div);
-  }
-);
-
-// Make sure that if you bind an event on "div p", for example,
-// both the div and the p need to be in the template.  jQuery's
-// `$(elem).find(...)` works this way, but the browser's
-// querySelector doesn't.
-Tinytest.add(
-  "spacebars-tests - template_tests - event map selector scope",
-  function (test) {
-    var tmpl = Template.spacebars_test_event_selectors1;
-    var tmpl2 = Template.spacebars_test_event_selectors2;
-    var buf = [];
-    tmpl2.events({
-      'click div p': function (evt) { buf.push(evt.currentTarget.className); }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    test.equal(buf.join(), '');
-    clickIt(div.querySelector('.p1'));
-    test.equal(buf.join(), '');
-    clickIt(div.querySelector('.p2'));
-    test.equal(buf.join(), 'p2');
-    document.body.removeChild(div);
-  }
-);
-
-if (document.addEventListener) {
-  // see note about non-bubbling events in the "capuring events"
-  // templating test for why we use the VIDEO tag.  (It would be
-  // nice to get rid of the network dependency, though.)
-  // We skip this test in IE 8.
-  Tinytest.add(
-    "spacebars-tests - template_tests - event map selector scope (capturing)",
-    function (test) {
-      var tmpl = Template.spacebars_test_event_selectors_capturing1;
-      var tmpl2 = Template.spacebars_test_event_selectors_capturing2;
-      var buf = [];
-      tmpl2.events({
-        'play div video': function (evt) { buf.push(evt.currentTarget.className); }
-      });
-
-      var div = renderToDiv(tmpl);
-      document.body.appendChild(div);
-      test.equal(buf.join(), '');
-      simulateEvent(div.querySelector(".video1"),
-                    "play", {}, {bubbles: false});
-      test.equal(buf.join(), '');
-      simulateEvent(div.querySelector(".video2"),
-                    "play", {}, {bubbles: false});
-      test.equal(buf.join(), 'video2');
-      document.body.removeChild(div);
-    }
-  );
-}
-
-Tinytest.add("spacebars-tests - template_tests - tables", function (test) {
-  var tmpl1 = Template.spacebars_test_tables1;
-
-  var div = renderToDiv(tmpl1);
-  test.equal(_.pluck(div.querySelectorAll('*'), 'tagName'),
-             ['TABLE', 'TR', 'TD']);
-  divRendersTo(test, div, '<table><tr><td>Foo</td></tr></table>');
-
-  var tmpl2 = Template.spacebars_test_tables2;
-  tmpl2.helpers({foo: 'Foo'});
-  div = renderToDiv(tmpl2);
-  test.equal(_.pluck(div.querySelectorAll('*'), 'tagName'),
-             ['TABLE', 'TR', 'TD']);
-  divRendersTo(test, div, '<table><tr><td>Foo</td></tr></table>');
-});
-
-Tinytest.add("spacebars-tests - template_tests - jQuery.trigger extraParameters are passed to the event callback",
-  function (test) {
-    var tmpl = Template.spacebars_test_jquery_events;
-    var captured = false;
-    var args = ["param1", "param2", {option: 1}, 1, 2, 3];
-
-    tmpl.events({
-      'someCustomEvent': function (event, template) {
-        var i;
-        for (i=0; i<args.length; i++) {
-          // expect the arguments to be just after template
-          test.equal(arguments[i+2], args[i]);
-        }
-        captured = true;
-      }
-    });
-
-    tmpl.rendered = function () {
-      $(this.find('button')).trigger('someCustomEvent', args);
-    };
-
-    renderToDiv(tmpl);
-    Tracker.flush();
-    test.equal(captured, true);
-  }
-);
-
-Tinytest.add("spacebars-tests - template_tests - toHTML", function (test) {
-  // run once, verifying that autoruns are stopped
-  var once = function (tmplToRender, tmplForHelper, helper, val) {
-    var count = 0;
-    var R = new ReactiveVar;
-    var getR = function () {
-      count++;
-      return R.get();
-    };
-
-    R.set(val);
-    var helpers = {};
-    helpers[helper] = getR;
-    tmplForHelper.helpers(helpers);
-    test.equal(canonicalizeHtml(Blaze.toHTML(tmplToRender)), "bar");
-    test.equal(count, 1);
-    R.set("");
-    Tracker.flush();
-    test.equal(count, 1); // all autoruns stopped
-  };
-
-  once(Template.spacebars_test_tohtml_basic,
-       Template.spacebars_test_tohtml_basic, "foo", "bar");
-  once(Template.spacebars_test_tohtml_if,
-       Template.spacebars_test_tohtml_if, "foo", "bar");
-  once(Template.spacebars_test_tohtml_with,
-       Template.spacebars_test_tohtml_with, "foo", "bar");
-  once(Template.spacebars_test_tohtml_each,
-       Template.spacebars_test_tohtml_each, "foos", ["bar"]);
-
-  once(Template.spacebars_test_tohtml_include_with,
-       Template.spacebars_test_tohtml_with, "foo", "bar");
-  once(Template.spacebars_test_tohtml_include_each,
-       Template.spacebars_test_tohtml_each, "foos", ["bar"]);
-});
-
-Tinytest.add("spacebars-tests - template_tests - block comments should not be displayed",
-  function (test) {
-    var tmpl = Template.spacebars_test_block_comment;
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), '');
-  }
-);
-
-// Originally reported at https://github.com/meteor/meteor/issues/2046
-Tinytest.add("spacebars-tests - template_tests - {{#with}} with mutated data context",
-  function (test) {
-    var tmpl = Template.spacebars_test_with_mutated_data_context;
-    var foo = {value: 0};
-    var dep = new Tracker.Dependency;
-    tmpl.helpers({foo: function () {
-      dep.depend();
-      return foo;
-    }});
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), '0');
-
-    foo.value = 1;
-    dep.changed();
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), '1');
-  });
-
-Tinytest.add("spacebars-tests - template_tests - javascript scheme urls",
-  function (test) {
-    var tmpl = Template.spacebars_test_url_attribute;
-    var sessionKey = "foo-" + Random.id();
-    tmpl.helpers({foo: function () {
-      return Session.get(sessionKey);
-    }});
-
-    var numUrlAttrs = 4;
-    var div = renderToDiv(tmpl);
-
-    // [tag name, attr name, is a url attribute]
-    var attrsList = [["A", "href", true], ["FORM", "action", true],
-                     ["IMG", "src", true], ["INPUT", "value", false]];
-
-    var checkAttrs = function (url, isJavascriptProtocol) {
-      if (isJavascriptProtocol) {
-        Meteor._suppress_log(numUrlAttrs);
-      }
-      Session.set(sessionKey, url);
-      Tracker.flush();
-      _.each(
-        attrsList,
-        function (attrInfo) {
-          var normalizedUrl;
-          var elem = document.createElement(attrInfo[0]);
-          try {
-            elem[attrInfo[1]] = url;
-          } catch (err) {
-            // IE throws an exception if you set an img src to a
-            // javascript: URL. Blaze can't override this behavior;
-            // whether you've called Blaze._javascriptUrlsAllowed() or not,
-            // you won't be able to set a javascript: URL in an img
-            // src. So we only test img tags in other browsers.
-            if (attrInfo[0] === "IMG") {
-              return;
-            }
-            throw err;
-          }
-          document.body.appendChild(elem);
-          normalizedUrl = elem[attrInfo[1]];
-          document.body.removeChild(elem);
-
-          _.each(
-            div.getElementsByTagName(attrInfo[0]),
-            function (elem) {
-              test.equal(
-                elem[attrInfo[1]],
-                isJavascriptProtocol && attrInfo[2] ? "" : normalizedUrl
-              );
-            }
-          );
-        }
-      );
-    };
-
-    test.equal(Blaze._javascriptUrlsAllowed(), false);
-    checkAttrs("http://www.meteor.com", false);
-    checkAttrs("javascript:alert(1)", true);
-    checkAttrs("jAvAsCrIpT:alert(1)", true);
-    checkAttrs("    javascript:alert(1)", true);
-    Blaze._allowJavascriptUrls();
-    test.equal(Blaze._javascriptUrlsAllowed(), true);
-    checkAttrs("http://www.meteor.com", false);
-    checkAttrs("javascript:alert(1)", false);
-    checkAttrs("jAvAsCrIpT:alert(1)", false);
-    checkAttrs("    javascript:alert(1)", false);
-  }
-);
-
-Tinytest.add("spacebars-tests - template_tests - event handlers get cleaned up when template is removed",
-  function (test) {
-    var tmpl = Template.spacebars_test_event_handler_cleanup;
-    var subtmpl = Template.spacebars_test_event_handler_cleanup_sub;
-
-    var rv = new ReactiveVar(true);
-    tmpl.helpers({foo: function () {
-      return rv.get();
-    }});
-
-    subtmpl.events({
-      "click/mouseover": function () { }
-    });
-
-    var div = renderToDiv(tmpl);
-
-    test.equal(div.$blaze_events["click"].handlers.length, 1);
-    test.equal(div.$blaze_events["mouseover"].handlers.length, 1);
-
-    rv.set(false);
-    Tracker.flush();
-
-    test.equal(div.$blaze_events["click"].handlers.length, 0);
-    test.equal(div.$blaze_events["mouseover"].handlers.length, 0);
-  }
-);
-
-// This test makes sure that Blaze correctly finds the controller
-// heirarchy surrounding an element that itself doesn't have a
-// controller.
-Tinytest.add(
-  "spacebars-tests - template_tests - data context in event handlers on elements inside {{#if}}",
-  function (test) {
-    var tmpl = Template.spacebars_test_data_context_for_event_handler_in_if;
-    var data = null;
-    tmpl.events({
-      'click span': function () {
-        data = this;
-      }
-    });
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    clickIt(div.querySelector('span'));
-    test.equal(data, {foo: "bar"});
-    document.body.removeChild(div);
-  });
-
-// https://github.com/meteor/meteor/issues/2156
-Tinytest.add(
-  "spacebars-tests - template_tests - each with inserts inside autorun",
-  function (test) {
-    var tmpl = Template.spacebars_test_each_with_autorun_insert;
-    var coll = new Mongo.Collection(null);
-    var rv = new ReactiveVar;
-
-    tmpl.helpers({items: function () {
-      return coll.find();
-    }});
-
-    var div = renderToDiv(tmpl);
-
-    Tracker.autorun(function () {
-      if (rv.get()) {
-        coll.insert({ name: rv.get() });
-      }
-    });
-
-    rv.set("foo1");
-    Tracker.flush();
-    var firstId = coll.findOne()._id;
-
-    rv.set("foo2");
-    Tracker.flush();
-
-    test.equal(canonicalizeHtml(div.innerHTML), "foo1 foo2");
-
-    coll.update(firstId, { $set: { name: "foo3" } });
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "foo3 foo2");
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - ui hooks",
-  function (test) {
-    var tmpl = Template.spacebars_test_ui_hooks;
-    var rv = new ReactiveVar([]);
-    tmpl.helpers({items: function () {
-      return rv.get();
-    }});
-
-    var div = renderToDiv(tmpl);
-
-    var hooks = [];
-    var container = div.querySelector(".test-ui-hooks");
-
-    // Before we attach the ui hooks, put two items in the DOM.
-    var origVal = [{ _id: 'foo1' }, { _id: 'foo2' }];
-    rv.set(origVal);
-    Tracker.flush();
-
-    container._uihooks = {
-      insertElement: function (n, next) {
-        hooks.push("insert");
-
-        // check that the element hasn't actually been added yet
-        test.isTrue((! n.parentNode) ||
-                    n.parentNode.nodeType === 11 /*DOCUMENT_FRAGMENT_NODE*/);
-      },
-      removeElement: function (n) {
-        hooks.push("remove");
-        // check that the element hasn't actually been removed yet
-        test.isTrue(n.parentNode === container);
-      },
-      moveElement: function (n, next) {
-        hooks.push("move");
-        // check that the element hasn't actually been moved yet
-        test.isFalse(n.nextNode === next);
-      }
-    };
-
-    var testDomUnchanged = function () {
-      var items = div.querySelectorAll(".item");
-      test.equal(items.length, 2);
-      test.equal(canonicalizeHtml(items[0].innerHTML), "foo1");
-      test.equal(canonicalizeHtml(items[1].innerHTML), "foo2");
-    };
-
-    var newVal = _.clone(origVal);
-    newVal.push({ _id: 'foo3' });
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert']);
-    testDomUnchanged();
-
-    newVal.reverse();
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert', 'move']);
-    testDomUnchanged();
-
-    newVal = [origVal[0]];
-    rv.set(newVal);
-    Tracker.flush();
-    test.equal(hooks, ['insert', 'move', 'remove']);
-    testDomUnchanged();
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - ui hooks - nested domranges",
-  function (test) {
-    var tmpl = Template.spacebars_test_ui_hooks_nested;
-    var rv = new ReactiveVar(true);
-
-    tmpl.helpers({foo: function () {
-      return rv.get();
-    }});
-
-    var subtmpl = Template.spacebars_test_ui_hooks_nested_sub;
-    var uiHookCalled = false;
-    subtmpl.rendered = function () {
-      this.firstNode.parentNode._uihooks = {
-        removeElement: function (node) {
-          uiHookCalled = true;
-        }
-      };
-    };
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-    Tracker.flush();
-
-    var htmlBeforeRemove = canonicalizeHtml(div.innerHTML);
-    rv.set(false);
-    Tracker.flush();
-    test.isTrue(uiHookCalled);
-    var htmlAfterRemove = canonicalizeHtml(div.innerHTML);
-    test.equal(htmlBeforeRemove, htmlAfterRemove);
-    document.body.removeChild(div);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - Template.instance from helper",
-  function (test) {
-    // Set a property on the template instance; check that it's still
-    // there from a helper.
-
-    var tmpl = Template.spacebars_test_template_instance_helper;
-    var value = Random.id();
-    var instanceFromHelper;
-
-    tmpl.created = function () {
-      this.value = value;
-    };
-    tmpl.helpers({foo: function () {
-      instanceFromHelper = Template.instance();
-    }});
-
-    var div = renderToDiv(tmpl);
-    test.equal(instanceFromHelper.value, value);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - Template.instance from helper, " +
-    "template instance is kept up-to-date",
-  function (test) {
-    var tmpl = Template.spacebars_test_template_instance_helper;
-    var rv = new ReactiveVar("");
-    var instanceFromHelper;
-
-    tmpl.helpers({foo: function () {
-      return Template.instance().data;
-    }});
-
-    var div = renderToDiv(tmpl, function () { return rv.get(); });
-    rv.set("first");
-    divRendersTo(test, div, "first");
-
-    rv.set("second");
-    Tracker.flush();
-    divRendersTo(test, div, "second");
-
-    // Template.instance() returns null when no template instance
-    test.isTrue(Template.instance() === null);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - {{#with}} autorun is cleaned up",
-  function (test) {
-    var tmpl = Template.spacebars_test_with_cleanup;
-    var rv = new ReactiveVar("");
-    var helperCalled = false;
-    tmpl.helpers({foo: function () {
-      helperCalled = true;
-      return rv.get();
-    }});
-
-    var div = renderToDiv(tmpl);
-    rv.set("first");
-    Tracker.flush();
-    test.equal(helperCalled, true);
-
-    helperCalled = false;
-    $(div).find(".test-with-cleanup").remove();
-
-    rv.set("second");
-    Tracker.flush();
-    test.equal(helperCalled, false);
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - Template.parentData from helpers",
-  function (test) {
-    var childTmpl = Template.spacebars_test_template_parent_data_helper_child;
-    var parentTmpl = Template.spacebars_test_template_parent_data_helper;
-
-    var height = new ReactiveVar(0);
-    var bar = new ReactiveVar("bar");
-
-    childTmpl.helpers({
-      a: ["a"],
-      b: function () { return bar.get(); },
-      c: ["c"],
-      foo: function () {
-        var a = Template.parentData(height.get());
-        var b = UI._parentData(height.get()); // back-compat
-        test.equal(a, b);
-        return a;
-      }
-    });
-
-    var div = renderToDiv(parentTmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "d");
-
-    height.set(1);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "bar");
-
-    // Test Template.parentData() reactivity
-
-    bar.set("baz");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "baz");
-
-    height.set(2);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "a");
-
-    height.set(3);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "parent");
-
-    // Test that calling Template.parentData() without any arguments is the same as Template.parentData(1)
-
-    height.set(null);
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "baz");
-  }
-);
-
-Tinytest.add(
-  "spacebars - SVG <a> elements",
-  function (test) {
-    if (! document.createElementNS) {
-      // IE 8
-      return;
-    }
-
-    var tmpl = Template.spacebars_test_svg_anchor;
-    var div = renderToDiv(tmpl);
-
-    var anchNamespace = $(div).find("a").get(0).namespaceURI;
-    test.equal(anchNamespace, "http://www.w3.org/2000/svg");
-  }
-);
-
-Tinytest.add(
-  "spacebars-tests - template_tests - created/rendered/destroyed by each",
-  function (test) {
-    var outerTmpl =
-          Template.spacebars_test_template_created_rendered_destroyed_each;
-    var innerTmpl =
-          Template.spacebars_test_template_created_rendered_destroyed_each_sub;
-
-    var buf = '';
-
-    innerTmpl.created = function () { buf += 'C' + String(this.data).toLowerCase(); };
-    innerTmpl.rendered = function () { buf += 'R' + String(this.data).toLowerCase(); };
-    innerTmpl.destroyed = function () { buf += 'D' + String(this.data).toLowerCase(); };
-
-    var R = ReactiveVar([{_id: 'A'}]);
-
-    outerTmpl.helpers({items: function () {
-      return R.get();
-    }});
-
-    var div = renderToDiv(outerTmpl);
-    divRendersTo(test, div, '<div>A</div>');
-    test.equal(buf, 'CaRa');
-
-    R.set([{_id: 'B'}]);
-    divRendersTo(test, div, '<div>B</div>');
-    test.equal(buf, 'CaRaDaCbRb');
-
-    R.set([{_id: 'C'}]);
-    divRendersTo(test, div, '<div>C</div>');
-    test.equal(buf, 'CaRaDaCbRbDbCcRc');
-
-    $(div).remove();
-    test.equal(buf, 'CaRaDaCbRbDbCcRcDc');
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - Blaze.render/Blaze.remove",
-  function (test) {
-    var div = document.createElement("DIV");
-    document.body.appendChild(div);
-
-    var created = false, rendered = false, destroyed = false;
-    var R = ReactiveVar('aaa');
-
-    var tmpl = Template.spacebars_test_ui_render;
-    tmpl.helpers({
-      greeting: function () { return this.greeting || 'Hello'; },
-      r: function () { return R.get(); }
-    });
-    tmpl.created = function () { created = true; };
-    tmpl.rendered = function () { rendered = true; };
-    tmpl.destroyed = function () { destroyed = true; };
-
-    test.equal([created, rendered, destroyed], [false, false, false]);
-
-    var renderedTmpl = Blaze.render(tmpl, div);
-    test.equal([created, rendered, destroyed], [true, false, false]);
-
-    // Flush now. We fire the rendered callback in an afterFlush block,
-    // to ensure that the DOM is completely updated.
-    Tracker.flush();
-    test.equal([created, rendered, destroyed], [true, true, false]);
-
-    var otherDiv = document.createElement("DIV");
-    // can run a second time without throwing
-    var x = Blaze.render(tmpl, otherDiv);
-    // note: we'll have clean up `x` below
-
-    var renderedTmpl2 = Blaze.renderWithData(
-      tmpl, {greeting: 'Bye'}, div);
-    test.equal(canonicalizeHtml(div.innerHTML),
-               "<span>Hello aaa</span><span>Bye aaa</span>");
-    R.set('bbb');
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML),
-               "<span>Hello bbb</span><span>Bye bbb</span>");
-    test.equal([created, rendered, destroyed], [true, true, false]);
-    test.equal(R._numListeners(), 3);
-    Blaze.remove(renderedTmpl);
-    Blaze.remove(renderedTmpl); // test that double-remove doesn't throw
-    Blaze.remove(renderedTmpl2);
-    Blaze.remove(x);
-    test.equal([created, rendered, destroyed], [true, true, true]);
-    test.equal(R._numListeners(), 0);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - Blaze.render fails on jQuery objects",
-  function (test) {
-    var tmpl = Template.spacebars_test_ui_render;
-    test.throws(function () {
-      Blaze.render(tmpl, $('body'));
-    }, /'parentElement' must be a DOM node/);
-    test.throws(function () {
-      Blaze.render(tmpl, document.body, $('body'));
-    }, /'nextNode' must be a DOM node/);
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - UI.getElementData",
-  function (test) {
-    var div = document.createElement("DIV");
-    var tmpl = Template.spacebars_test_ui_getElementData;
-    Blaze.renderWithData(tmpl, {foo: "bar"}, div);
-
-    var span = div.querySelector('SPAN');
-    test.isTrue(span);
-    test.equal(UI.getElementData(span), {foo: "bar"});
-    test.equal(Blaze.getData(span), {foo: "bar"});
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - autorun cleanup",
-  function (test) {
-    var tmpl = Template.spacebars_test_parent_removal;
-
-    var Acalls = '';
-    var A = ReactiveVar('hi');
-    tmpl.helpers({A: function (chr) {
-      Acalls += chr;
-      return A.get();
-    }});
-    var Bcalls = 0;
-    var B = ReactiveVar(['one', 'two']);
-    tmpl.helpers({B: function () {
-      Bcalls++;
-      return B.get();
-    }});
-
-    // Assert how many times A and B were accessed (since last time)
-    // and how many autoruns are listening to them.
-    var assertCallsAndListeners =
-          function (a_calls, b_calls, a_listeners, b_listeners) {
-            test.equal('A calls: ' + Acalls.length,
-                       'A calls: ' + a_calls,
-                       Acalls);
-            test.equal('B calls: ' + Bcalls,
-                       'B calls: ' + b_calls);
-            test.equal('A listeners: ' + A._numListeners(),
-                       'A listeners: ' + a_listeners);
-            test.equal('B listeners: ' + B._numListeners(),
-                       'B listeners: ' + b_listeners);
-            Acalls = '';
-            Bcalls = 0;
-          };
-
-    var div = renderToDiv(tmpl);
-    assertCallsAndListeners(10, 1, 10, 1);
-    A.set('');
-    Tracker.flush();
-    // Confirm that #4, #5, #6, and #9 are not re-run.
-    // #a is newly run, for a total of 10 - 4 + 1 = 7,
-    assertCallsAndListeners(7, 0, 7, 1);
-    A.set('hi');
-    Tracker.flush();
-    assertCallsAndListeners(10, 0, 10, 1);
-
-    // Now see that removing the DOM with jQuery, below
-    // the level of the entire template, stops everything.
-    $(div.querySelector('.toremove')).remove();
-    assertCallsAndListeners(0, 0, 0, 0);
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - focus/blur with clean-up",
-  function (test) {
-    var tmpl = Template.spacebars_test_focus_blur_outer;
-    var cond = ReactiveVar(true);
-    tmpl.helpers({cond: function () {
-      return cond.get();
-    }});
-    var buf = [];
-    Template.spacebars_test_focus_blur_inner.events({
-      'focus input': function () {
-        buf.push('FOCUS');
-      },
-      'blur input': function () {
-        buf.push('BLUR');
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-
-    // check basic focus and blur to make sure
-    // everything is sane
-    test.equal(div.querySelectorAll('input').length, 1);
-    var input;
-    focusElement(input = div.querySelector('input'));
-    // We don't get focus events when the Chrome Dev Tools are focused,
-    // unfortunately, as of Chrome 35.  I think this is a regression in
-    // Chrome 34.  So, the goal is to work whether or not focus is
-    // "borken," where "working" means always failing if DOMBackend isn't
-    // correctly unbinding the old event handlers when we switch the IF,
-    // and always passing if it is.  To cause the problem in DOMBackend,
-    // delete the '**' argument to jQuery#off in
-    // DOMBackend.Events.undelegateEvents.  The only compromise we are
-    // making here is that if some unrelated bug in Blaze makes
-    // focus/blur not work, the failure might be masked while the Dev
-    // Tools are open.
-    var borken = false;
-    if (buf.length === 0 && document.activeElement === input) {
-      test.ok({note:"You might need to defocus the Chrome Dev Tools to get a more accurate run of this test!"});
-      borken = true;
-      $(input).trigger('focus');
-    }
-    test.equal(buf.join(), 'FOCUS');
-    blurElement(div.querySelector('input'));
-    if (buf.length === 1)
-      $(input).trigger('blur');
-    test.equal(buf.join(), 'FOCUS,BLUR');
-
-    // now switch the IF and check again.  The failure mode
-    // we observed was that DOMBackend would not correctly
-    // unbind the old event listener at the jQuery level,
-    // so the old event listener would fire and cause an
-    // exception inside Blaze ("Must be attached" in
-    // DOMRange#containsElement), which would show up in
-    // the console and cause our handler not to fire.
-    cond.set(false);
-    buf.length = 0;
-    Tracker.flush();
-    test.equal(div.querySelectorAll('input').length, 1);
-    focusElement(input = div.querySelector('input'));
-    if (borken)
-      $(input).trigger('focus');
-    test.equal(buf.join(), 'FOCUS');
-    blurElement(div.querySelector('input'));
-    if (! borken)
-      test.equal(buf.join(), 'FOCUS,BLUR');
-
-    document.body.removeChild(div);
-  });
-
-// We used to remove event handlers on DOMRange detached, but when
-// tearing down a view, we don't "detach" all the DOMRanges recursively.
-// Mainly, we destroy the View.  Destroying a View should remove its
-// event listeners.  (In practice, however, it's hard to think of
-// consequences to not removing event handlers on removed DOM nodes,
-// which will probably be GCed anyway.)
-Tinytest.add(
-  "spacebars-tests - template_tests - event cleanup on destroyed",
-  function (test) {
-    var tmpl = Template.spacebars_test_event_cleanup_on_destroyed_outer;
-    var cond = ReactiveVar(true);
-    tmpl.helpers({cond: function () {
-      return cond.get();
-    }});
-
-    Template.spacebars_test_event_cleanup_on_destroyed_inner.events({
-      'click span': function () {}});
-
-    var div = renderToDiv(tmpl);
-    document.body.appendChild(div);
-
-    var eventDiv = div.querySelector('div');
-    test.equal(eventDiv.$blaze_events.click.handlers.length, 1);
-
-    cond.set(false);
-    Tracker.flush();
-    test.equal(eventDiv.$blaze_events.click.handlers.length, 0);
-
-    document.body.removeChild(div);
-  });
-
-_.each([1, 2, 3], function (n) {
-  Tinytest.add(
-    "spacebars-tests - template_tests - lookup is isolated " + n,
-    function (test) {
-      var buf = "";
-      var inclusion = Template.spacebars_test_isolated_lookup_inclusion;
-      inclusion.created = function () { buf += 'C'; };
-      inclusion.destroyed = function () { buf += 'D'; };
-
-      var tmpl = Template['spacebars_test_isolated_lookup' + n];
-      var R = ReactiveVar(Template.spacebars_template_test_aaa);
-
-      tmpl.helpers({bar: function () {
-        return R.get();
-      }});
-
-      var div = renderToDiv(
-        tmpl,
-        function () {
-          return { foo: R.get() };
-        });
-
-      test.equal(canonicalizeHtml(div.innerHTML), 'aaa--x');
-      test.equal(buf, 'C');
-      R.set(Template.spacebars_template_test_bbb);
-      Tracker.flush();
-      test.equal(canonicalizeHtml(div.innerHTML), 'bbb--x');
-      test.equal(buf, 'C');
-    }
-  );
-});
-
-Tinytest.add('spacebars-tests - template_tests - current view in event handler', function (test) {
-  var tmpl = Template.spacebars_test_current_view_in_event;
-
-  var currentView;
-  var currentData;
-
-  tmpl.events({
-    'click span': function () {
-      currentView = Blaze.getView();
-      currentData = Blaze.getData();
-    }
-  });
-
-  var div = renderToDiv(tmpl, 'blah');
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>blah</span>');
-  document.body.appendChild(div);
-  clickElement(div.querySelector('span'));
-  $(div).remove();
-
-  test.isTrue(currentView);
-  test.equal(currentData, 'blah');
-});
-
-
-Tinytest.add('spacebars-tests - template_tests - helper invalidates self', function (test) {
-  var tmpl = Template.spacebars_template_test_bracketed_foo;
-
-  var count = new ReactiveVar(0);
-
-  tmpl.helpers({
-    // It's unusual for a helper to have side effects, but it's possible
-    // and people do it.  Regression test for #4097.
-    foo: function () {
-      // Make count odd and return it.
-      var c = count.get();
-      if ((c % 2) === 0) {
-        count.set(c+1);
-      }
-      return c;
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  divRendersTo(test, div, '[1]');
-  count.set(2);
-  divRendersTo(test, div, '[3]');
-});
-
-Tinytest.add(
-  "spacebars-tests - template_tests - textarea attrs", function (test) {
-    var tmplNoContents = {
-      tmpl: Template.spacebars_test_textarea_attrs,
-      hasTextAreaContents: false
-    };
-    var tmplWithContents = {
-      tmpl: Template.spacebars_test_textarea_attrs_contents,
-      hasTextAreaContents: true
-    };
-    var tmplWithContentsAndMoreAttrs = {
-      tmpl: Template.spacebars_test_textarea_attrs_array_contents,
-      hasTextAreaContents: true
-    };
-
-    _.each(
-      [tmplNoContents, tmplWithContents,
-       tmplWithContentsAndMoreAttrs],
-      function (tmplInfo) {
-
-        var id = new ReactiveVar("textarea-" + Random.id());
-        var name = new ReactiveVar("one");
-        var attrs = new ReactiveVar({
-          id: "textarea-" + Random.id()
-        });
-
-        var div = renderToDiv(tmplInfo.tmpl, {
-          attrs: function () {
-            return attrs.get();
-          },
-          name: function () {
-            return name.get();
-          }
-        });
-
-        // Check that the id and value attribute are as we expect.
-        // We can't check div.innerHTML because Chrome at least doesn't
-        // appear to put textarea value attributes in innerHTML.
-        var textarea = div.querySelector("textarea");
-        test.equal(textarea.id, attrs.get().id);
-        test.equal(
-          textarea.value, tmplInfo.hasTextAreaContents ? "Hello one" : "");
-        // One of the templates has a separate attribute in addition to
-        // an attributes dictionary.
-        if (tmplInfo === tmplWithContentsAndMoreAttrs) {
-          test.equal($(textarea).attr("class"), "bar");
-        }
-
-        // Change the id, check that the attribute updates reactively.
-        attrs.set({ id: "textarea-" + Random.id() });
-        Tracker.flush();
-        test.equal(textarea.id, attrs.get().id);
-
-        // Change the name variable, check that the textarea value
-        // updates reactively.
-        name.set("two");
-        Tracker.flush();
-        test.equal(
-          textarea.value, tmplInfo.hasTextAreaContents ? "Hello two" : "");
-
-        if (tmplInfo === tmplWithContentsAndMoreAttrs) {
-          test.equal($(textarea).attr("class"), "bar");
-        }
-
-      });
-
-  });
-
-Tinytest.add(
-  "spacebars-tests - template_tests - this.autorun",
-  function (test) {
-    var tmpl = Template.spacebars_test_autorun;
-    var tmplInner = Template.spacebars_test_autorun_inner;
-
-    // Keep track of the value of `Template.instance()` inside the
-    // autorun each time it runs.
-    var autorunTemplateInstances = [];
-    var actualTemplateInstance;
-    var returnedComputation;
-    var computationArg;
-
-    var show = new ReactiveVar(true);
-    var rv = new ReactiveVar("foo");
-
-    tmplInner.created = function () {
-      actualTemplateInstance = this;
-      returnedComputation = this.autorun(function (c) {
-        computationArg = c;
-        rv.get();
-        autorunTemplateInstances.push(Template.instance());
-      });
-    };
-
-    tmpl.helpers({
-      show: function () {
-        return show.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(autorunTemplateInstances.length, 1);
-    test.equal(autorunTemplateInstances[0], actualTemplateInstance);
-
-    // Test that the autorun returned a computation and received a
-    // computation as an argument.
-    test.isTrue(returnedComputation instanceof Tracker.Computation);
-    test.equal(returnedComputation, computationArg);
-
-    // Make sure the autorun re-runs when `rv` changes, and that it has
-    // the correct current view.
-    rv.set("bar");
-    Tracker.flush();
-    test.equal(autorunTemplateInstances.length, 2);
-    test.equal(autorunTemplateInstances[1], actualTemplateInstance);
-
-    // If the inner template is destroyed, the autorun should be stopped.
-    show.set(false);
-    Tracker.flush();
-    rv.set("baz");
-    Tracker.flush();
-
-    test.equal(autorunTemplateInstances.length, 2);
-    test.equal(rv._numListeners(), 0);
-  }
-);
-
-// Test that argument in {{> Template.contentBlock arg}} is evaluated in
-// the proper data context.
-Tinytest.add(
-  "spacebars-tests - template_tests - contentBlock argument",
-  function (test) {
-    var tmpl = Template.spacebars_test_contentBlock_arg;
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), 'AAA BBB');
-  });
-
-// Test that when Blaze sets an input field to the same value,
-// we don't lose the insertion point position.
-Tinytest.add(
-  "spacebars-tests - template_tests - input field to same value",
-  function (test) {
-    var tmpl = Template.spacebars_template_test_input_field_to_same_value;
-    var R = ReactiveVar("BLAH");
-    tmpl.helpers({foo: function () { return R.get(); }});
-    var div = renderToDiv(tmpl);
-
-    document.body.appendChild(div);
-
-    var input = div.querySelector('input');
-    test.equal(input.value, "BLAH");
-
-    var setSelection = function (startEnd) {
-      startEnd = startEnd.split(' ');
-      if (typeof input.selectionStart === 'number') {
-        // all but IE < 9
-        input.selectionStart = startEnd[0];
-        input.selectionEnd = startEnd[1];
-      } else {
-        // IE 8
-        input.focus();
-        var r = input.createTextRange();
-        // move the start and end of the range to the beginning
-        // of the input field
-        r.moveStart('textedit', -1);
-        r.moveEnd('textedit', -1);
-        // move the start and end a certain number of characters
-        // (relative to their current position)
-        r.moveEnd('character', startEnd[1]);
-        r.moveStart('character', startEnd[0]);
-        r.select();
-      }
-    };
-    var getSelection = function () {
-      if (typeof input.selectionStart === 'number') {
-        // all but IE < 9
-        return input.selectionStart + " " + input.selectionEnd;
-      } else {
-        // IE 8
-        input.focus();
-        var r = document.selection.createRange();
-        var fullText = input.value;
-        var start, end;
-        if (r.text) {
-          // one or more characters are selected.
-          // this is kind of hacky!  Relies on fullText
-          // not having duplicate letters, for example.
-          start = fullText.indexOf(r.text);
-          end = start + r.text.length;
-        } else {
-          r.moveStart('textedit', -1);
-          start = end = r.text.length;
-        }
-        return start + " " + end;
-      }
-    };
-
-    setSelection("2 3");
-    test.equal(getSelection(), "2 3");
-    // At this point, we COULD confirm that setting input.value to
-    // the same thing as before ("BLAH") loses the insertion
-    // point (per browser behavior).  However, it doesn't on Firefox.
-    // So we set it to something different, which verifies that our
-    // test machinery is correct.
-    input.value = "BLAN";
-    // test that insertion point is lost
-    var selectionAfterSet = getSelection();
-    if (selectionAfterSet !== "0 0") // IE 8
-      test.equal(getSelection(), "4 4");
-
-    // now make the input say "BLAH" but the AttributeHandler
-    // says "OTHER" (so we can make it do the no-op update)
-    R.set("OTHER");
-    Tracker.flush();
-    test.equal(input.value, "OTHER");
-    input.value = "BLAH";
-    setSelection("2 2");
-
-    R.set("BLAH");
-    Tracker.flush();
-    test.equal(input.value, "BLAH");
-    // test that didn't lose insertion point!
-    test.equal(getSelection(), "2 2");
-
-    // clean up after ourselves
-    document.body.removeChild(div);
-  }
-);
-
-Tinytest.add("spacebars-tests - template_tests - contentBlock back-compat", function (test) {
-  // adapted from another test, but this time make sure `UI.contentBlock`
-  // and `UI.elseBlock` correctly behave as `Template.contentBlock`
-  // and `Template.elseBlock`.
-
-  var tmpl = Template.spacebars_template_test_content_backcompat;
-  var R = ReactiveVar(true);
-  tmpl.helpers({flag: function () {
-    return R.get();
-  }});
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-  R.set(true);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-});
-
-// For completeness (of coverage), make sure the code that calls
-// `Template.contentBlock` in the correct scope also causes
-// the old `UI.contentBlock` to be called in the correct scope.
-Tinytest.add("spacebars-tests - template_tests - content context back-compat", function (test) {
-  var tmpl = Template.spacebars_template_test_content_context_backcompat;
-  var R = ReactiveVar(true);
-  tmpl.helpers({foo: {
-    firstLetter: 'F',
-    secondLetter: 'O',
-    bar: {
-      cond: function () { return R.get(); },
-      firstLetter: 'B',
-      secondLetter: 'A'
-    }
-  }});
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'BO');
-  R.set(false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), 'FA');
-});
-
-Tinytest.add("spacebars-tests - template_tests - falsy helper", function (test) {
-  var tmpl = Template.spacebars_template_test_falsy_helper;
-  tmpl.helpers({foo: 0});
-  Template.registerHelper('GLOBAL_ZERO', 0);
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'foo:0 GLOBAL_ZERO:0');
-});
-
-Tinytest.add("spacebars-tests - template_tests - old-style helpers", function (test) {
-  var tmpl = Template.spacebars_template_test_oldstyle_helpers;
-  tmpl._NOWARN_OLDSTYLE_HELPERS = true;
-
-  // Test old-style helper
-  tmpl.foo = 'hello';
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'hello');
-
-  // Test that replacing a helper still works (i.e. we don't cache them).
-  // We can change this behavior if we need to, but it is more breaking
-  // to do so.  It breaks some unit tests, for example.
-  tmpl.foo = 'world';
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), 'world');
-
-  // Test that you can delete an old-style helper with `delete`.
-  // As with the previous case, we can break this functionality, but
-  // we should do it intentionally.
-  delete tmpl.foo;
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '');
-});
-
-Tinytest.add("spacebars-tests - template_tests - with data remove (#3130)", function (test) {
-  var tmpl = Template.spacebars_template_test_with_data_remove;
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.renderWithData(tmpl, { foo: 3130 }, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<b>some data - 3130</b>');
-  var view = Blaze.getView(div.querySelector('b'));
-  test.isFalse(theWith.isDestroyed);
-  Blaze.remove(view);
-  test.isTrue(theWith.isDestroyed);
-  test.equal(div.innerHTML, "");
-});
-
-Tinytest.add("spacebars-tests - template_tests - inclusion with data remove (#3130)", function (test) {
-  var tmpl = Template.spacebars_template_test_inclusion_with_data_remove;
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span><b>stuff</b></span>');
-  var view = Blaze.getView(div.querySelector('b'));
-  var parentView = view.parentView;
-  test.isTrue(parentView.__isTemplateWith);
-  test.isFalse(parentView.isDestroyed);
-  Blaze.remove(view);
-  test.isTrue(parentView.isDestroyed);
-  test.equal(canonicalizeHtml(div.innerHTML), "<span></span>");
-});
-
-Tinytest.add("spacebars-tests - template_tests - custom block helper doesn't break Template.instance() (#3540)", function (test) {
-  var tmpl = Template.spacebars_template_test_template_instance_wrapper_outer;
-
-  tmpl.helpers({
-    thisShouldOutputHello: function () {
-      return Template.instance().customProp;
-    }
-  });
-
-  tmpl.created = function () {
-    this.customProp = "hello";
-  };
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "hello hello");
-});
-
-testAsyncMulti("spacebars-tests - template_tests - template-level subscriptions", [
-  function (test, expect) {
-    var tmpl = Template.spacebars_template_test_template_level_subscriptions;
-    var tmplInstance;
-    var div;
-
-    // Make sure the subscriptions stop when the template is destroyed
-    var stopCallback = expect();
-    var stopCallback2 = expect();
-
-    var futureId = Random.id();
-
-    // Make sure the HTML is what we expect when one subscription is ready
-    var checkOneReady = expect(function () {
-      test.equal(canonicalizeHtml(div.innerHTML), "");
-      Meteor.call('makeTemplateSubReady', futureId);
-    });
-
-    // Make sure the HTML is what we expect when both subscriptions are ready
-    var checkBothReady = expect(function () {
-      test.equal(canonicalizeHtml(div.innerHTML), "ready! true");
-
-      // This will call the template's destroyed callback
-      Blaze.remove(tmplInstance.view);
-    });
-
-    var subscriptionsFinished = 0;
-
-    // Manually use the subscribe ready callback to make sure the template is
-    // doing the right thing
-    var subscribeCallback = expect(function () {
-      subscriptionsFinished++;
-
-      if (subscriptionsFinished === 1) {
-        // We need to use Tracker.afterFlush here and Tracker.flush doesn't work
-        // because we need to wait for the other callback to fire (the one that
-        // makes ready return true) _and_ we need the UI to rerender
-        Tracker.afterFlush(checkOneReady);
-      }
-
-      if (subscriptionsFinished === 2) {
-        Tracker.afterFlush(checkBothReady);
-      }
-    });
-
-    tmpl.onCreated(function () {
-      var subHandle = this.subscribe("templateSub", subscribeCallback);
-      var subHandle2 = this.subscribe("templateSub", futureId, {
-        onReady: subscribeCallback,
-        connection: Meteor.connection
-      });
-
-      subHandle.stop = stopCallback;
-      subHandle2.stop = stopCallback2;
-
-      tmplInstance = this;
-    });
-
-    // Insertion point
-    div = renderToDiv(tmpl);
-
-    // To start, there is no content because the template isn't ready
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-  }
-]);
-
-testAsyncMulti("spacebars-tests - template_tests - template-level subscriptions don't resubscribe unnecessarily", [
-  function (test, expect) {
-    var tmpl = Template.spacebars_template_test_template_level_subs_resubscribe;
-    var subHandle;
-    var trueThenFalse = new ReactiveVar(true);
-
-    tmpl.helpers({
-      ifArg: function () {
-        return trueThenFalse.get();
-      },
-      subscribingHelper1: expect(function () {
-        subHandle = Template.instance().subscribe("templateSub");
-      }),
-      subscribingHelper2: expect(function () {
-        var subHandle2 = Template.instance().subscribe("templateSub");
-        test.isTrue(subHandle.subscriptionId === subHandle2.subscriptionId);
-
-        // Make sure we didn't add two subscription handles to our internal list
-        test.equal(_.keys(Template.instance()._subscriptionHandles).length, 1);
-      })
-    });
-
-    renderToDiv(tmpl);
-    Tracker.flush();
-    trueThenFalse.set(false);
-  }
-]);
-
-Tinytest.add("spacebars-tests - template_tests - old #each sets data context", function (test) {
-  var tmpl = Template.spacebars_template_test_old_each_data_context;
-  tmpl.helpers({
-    items: [{text:"a"}, {text:"b"}]
-  });
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>a</div><div>b</div>');
-  var view = Blaze.getView(div.querySelector('div'));
-  Blaze.remove(view);
-});
-
-Tinytest.add("spacebars-tests - template_tests - new #each extends data context", function (test) {
-  var tmpl = Template.spacebars_template_test_new_each_data_context;
-  tmpl.helpers({
-    dataContext: function () {
-      return {
-        items: [{text:"a"}, {text:"b"}],
-        toplevel: "XYZ"
-      };
-    }
-  });
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>a -- XYZ</div><div>b -- XYZ</div>');
-  var view = Blaze.getView(div.querySelector('div'));
-  Blaze.remove(view);
-});
-
-// Same as above, but now the argument to each in has a subexpression
-Tinytest.add("spacebars-tests - template_tests - new #each with subexpression (#5137)", function (test) {
-  var tmpl = Template.spacebars_template_test_new_each_data_context_subexpr;
-  tmpl.helpers({
-    dataContext: function () {
-      return {
-        items: [{text:"a"}, {text:"b"}],
-        toplevel: "XYZ"
-      };
-    }
-  });
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>a -- XYZ</div><div>b -- XYZ</div>');
-  var view = Blaze.getView(div.querySelector('div'));
-  Blaze.remove(view);
-});
-
-Tinytest.add("spacebars-tests - template_tests - new #each binding lookup is scoped to the template", function (test) {
-  var tmpl = Template.spacebars_template_test_new_each_lookup_top_level;
-  tmpl.helpers({
-    dataContext: function () {
-      return {
-        letter_a: ["a"],
-        subcontext: {
-          letter_b: ["b"]
-        }
-      };
-    }
-  });
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>a</div>');
-  var view = Blaze.getView(div.querySelector('div'));
-  Blaze.remove(view);
-});
-
-Tinytest.add("spacebars-tests - template_tests - let bindings", function (test) {
-  var tmpl = Template.spacebars_template_test_let_bindings;
-
-  var v = new ReactiveVar("var");
-  tmpl.helpers({
-    dataContext: function () {
-      return {
-        varFromContext: "from context",
-        anotherVarFromContext: "another var from context"
-      };
-    },
-    helper: function () {
-      return v.get();
-    }
-  });
-
-  var div = document.createElement("DIV");
-  var theWith = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>var -- var -- from context -- override</div>');
-
-  v.set("new var");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<div>new var -- new var -- from context -- override</div>');
-
-  var view = Blaze.getView(div.querySelector('div'));
-  Blaze.remove(view);
-});
-
-Tinytest.add("spacebars-tests - template_tests - #each @index", function (test) {
-  var tmpl = Template.spacebars_template_test_each_index;
-
-  var c = new Mongo.Collection();
-  c.insert({ num: 2 });
-  c.insert({ num: 4 });
-  tmpl.helpers({
-    things: function () {
-      return c.find({}, {sort:{num: 1}});
-    }
-  });
-
-  var div = document.createElement("DIV");
-  var theEach = Blaze.render(tmpl, div);
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>0 - 2</span><span>1 - 4</span>');
-
-  c.insert({ num: 1 });
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>0 - 1</span><span>1 - 2</span><span>2 - 4</span>');
-
-  var three = c.insert({ num: 3 });
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>0 - 1</span><span>1 - 2</span><span>2 - 3</span><span>3 - 4</span>');
-
-  c.update(three, { num: 0 });
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>0 - 0</span><span>1 - 1</span><span>2 - 2</span><span>3 - 4</span>');
-
-  c.remove(three);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), '<span>0 - 1</span><span>1 - 2</span><span>2 - 4</span>');
-
-  var view = Blaze.getView(div.querySelector('span'));
-  Blaze.remove(view);
-});
-
-Tinytest.add("spacebars-tests - template_tests - nested expressions", function (test) {
-  var tmpl = Template.spacebars_template_test_nested_exprs;
-
-  tmpl.helpers({
-    add: function (a, b) {
-      return a + b;
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "6");
-});
-
-Tinytest.add("spacebars-tests - template_tests - nested sub-expressions", function (test) {
-  var tmpl = Template.spacebars_template_test_nested_subexprs;
-
-  var sentence = new ReactiveVar("can't even imagine a world without Light");
-  tmpl.helpers({
-    capitalize: function (str) {
-      return str.charAt(0).toUpperCase() + str.substring(1);
-    },
-    firstWord: function (sentence) {
-      return sentence.split(' ')[0];
-    },
-    generateSentence: function () {
-      return sentence.get();
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "Can't");
-
-  sentence.set("that would be quite dark");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "That");
-});
-
-Tinytest.add("spacebars-tests - template_tests - expressions as keyword args", function (test) {
-  var tmpl = Template.spacebars_template_test_exprs_keyword;
-
-  var name = new ReactiveVar("light");
-  tmpl.helpers({
-    capitalize: function (str) {
-      return str.charAt(0).toUpperCase() + str.substring(1);
-    },
-    name: function () {
-      return name.get();
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "Light Mello");
-
-  name.set("misa");
-  Tracker.flush();
-  test.equal(canonicalizeHtml(div.innerHTML), "Misa Mello");
-});
-
-var testDoesntRerender = function (test, which) {
-  var tmpl = ({
-    "WITH": Template.spacebars_template_test_with_rerender,
-    "LET": Template.spacebars_template_test_let_rerender
-  })[which];
-
-  var x = new ReactiveVar("aaa");
-  tmpl.helpers({
-    x: function () {
-      return x.get();
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  var input = div.querySelector('input.foo');
-  var span = div.querySelector('span.bar');
-  test.isTrue(input && input.className === 'foo');
-  test.isTrue(span && span.className === 'bar');
-  test.equal(canonicalizeHtml(span.innerHTML), 'aaa');
-
-  x.set('bbb');
-  Tracker.flush();
-  // make sure the input and span are still the same, but the new
-  // value of x is reflected
-  var input2 = div.querySelector('input.foo');
-  var span2 = div.querySelector('span.bar');
-  test.isTrue(input2 === input, 'input');
-  test.isTrue(span2 === span, 'span');
-  test.equal(canonicalizeHtml(span2.innerHTML), 'bbb');
-};
-
-
-Tinytest.add("spacebars-tests - template_tests - #with doesn't re-render template", function (test) {
-  testDoesntRerender(test, "WITH");
-});
-
-Tinytest.add("spacebars-tests - template_tests - #let doesn't re-render template", function (test) {
-  testDoesntRerender(test, "LET");
-});
-
-Tinytest.add("spacebars-tests - template_tests - #each takes multiple arguments", function (test) {
-  var tmpl = Template.spacebars_template_test_each_multiarg;
-  tmpl.helpers({
-    arg: ['a', 'b', 'c'],
-    helper: function (x) { return x; }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<div>a</div><div>b</div><div>c</div>");
-});
-
-Tinytest.add("spacebars-tests - template_tests - lexical scope doesn't leak", function (test) {
-  // make sure '@index' doesn't leak into subtemplates
-  var tmpl = Template.spacebars_template_test_lexical_leakage;
-  tmpl.helpers({
-    list: ['a', 'b', 'c']
-  });
-
-  test.throws(function () {
-    var div = renderToDiv(tmpl);
-  }, /Unsupported directive/);
-});
-
-// PR #5138
-Tinytest.add("spacebars-tests - template_tests - multiple arguments in each-in", function (test) {
-  var tmpl = Template.spacebars_template_test_each_in_multi_args;
-  tmpl.helpers({
-    list: ['a', 'b', 'c'],
-    helper: function (list) {
-      return list.reverse();
-    }
-  });
-
-  var div = renderToDiv(tmpl);
-  test.equal(canonicalizeHtml(div.innerHTML), "<div>c</div><div>b</div><div>a</div>");
-});
diff --git a/packages/spacebars-tests/template_tests_server.js b/packages/spacebars-tests/template_tests_server.js
deleted file mode 100644
index d995f6deac..0000000000
--- a/packages/spacebars-tests/template_tests_server.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var path = Npm.require("path");
-var Future = Npm.require('fibers/future');
-
-Meteor.methods({
-  getAsset: function (filename) {
-    return Assets.getText(path.join("assets", filename));
-  }
-});
-
-var templateSubFutures = {};
-Meteor.publish("templateSub", function (futureId) {
-  var self = this;
-  Meteor.defer(function () {  // because subs are blocking
-    if (futureId) {
-      var f = new Future();
-      templateSubFutures[futureId] = f;
-      f.wait();
-      delete templateSubFutures[futureId];
-    }
-
-    self.ready();
-  });
-});
-Meteor.methods({
-  makeTemplateSubReady: function (futureId) {
-    templateSubFutures[futureId].return();
-  }
-});
diff --git a/packages/spacebars-tests/templating_tests.html b/packages/spacebars-tests/templating_tests.html
deleted file mode 100644
index a96f5f75bf..0000000000
--- a/packages/spacebars-tests/templating_tests.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<template name="test_assembly_a0">
-  {{> test_assembly_a1}}
-</template>
-
-<template name="test_assembly_a1">
-  {{> test_assembly_a2}}
-</template>
-
-<template name="test_assembly_a2">
-  {{> test_assembly_a3}}
-</template>
-
-<template name="test_assembly_a3">
-  Hi
-</template>
-
-
-
-<template name="test_assembly_b0">
-  {{> test_assembly_b1}}
-</template>
-
-<template name="test_assembly_b1">
-  x{{#if stuff}}y{{/if}}{{> test_assembly_b2}}
-</template>
-
-<template name="test_assembly_b2">
-  hi
-</template>
-
-
-
-<template name="test_table_b0">
-  <table>
-    <tbody>
-      {{> test_table_b1}}
-      {{> test_table_b1}}
-      {{> test_table_b1}}
-    </tbody>
-  </table>
-</template>
-
-<template name="test_table_b1">
-  <tr>
-    {{> test_table_b2}}
-  </tr>
-</template>
-
-<template name="test_table_b2">
-  <td>
-    {{> test_table_b3}}
-  </td>
-</template>
-
-<template name="test_table_b3">
-  Foo.
-</template>
-
-
-<template name="test_table_each">
-  <table>
-    <tbody>
-      {{#each foo}}
-        <tr><td>{{bar}}</td></tr>
-      {{/each}}
-    </tbody>
-  </table>
-</template>
-
-<template name="test_event_data_with">
-<div>
-  xxx
-  {{#with TWO}}
-    <div>
-      xxx
-      {{#with THREE}}
-        <div>
-          xxx
-        </div>
-      {{/with}}
-    </div>
-  {{/with}}
-</div>
-</template>
-
-<template name="test_capture_events">
-  <video class='video1'>
-    <source id='mp4'
-      src=""
-      type='video/mp4'>
-  </video>
-  <video class='video2'>
-    <source id='mp4'
-      src=""
-      type='video/mp4'>
-  </video>
-  <video class='video2'>
-    <source id='mp4'
-      src=""
-      type='video/mp4'>
-  </video>
-</template>
-
-<template name="test_safestring_a">
-  {{foo}} {{{foo}}} {{bar}} {{{bar}}}
-  {{fooprop}} {{{fooprop}}} {{barprop}} {{{barprop}}}
-</template>
-
-<template name="test_helpers_a">
-  platypus={{platypus}}
-  watermelon={{watermelon}}
-  daisy={{daisy}}
-  tree={{tree}}
-  warthog={{warthog}}
-</template>
-
-<template name="test_helpers_b">
-  unknown={{unknown}}
-  zero={{zero}}
-</template>
-
-<template name="test_helpers_c">
-  platypus.X={{platypus.X}}
-  watermelon.X={{watermelon.X}}
-  daisy.X={{daisy.X}}
-  tree.X={{tree.X}}
-  warthog.X={{warthog.X}}
-  getNull.X={{getNull.X}}
-  getUndefined.X={{getUndefined.X}}
-  getUndefined.X.Y={{getUndefined.X.Y}}
-</template>
-
-<template name="test_helpers_d">
-  daisygetter={{daisygetter}}
-  thisTest={{thisTest}}
-  {{#with fancy}}
-    ../thisTest={{../thisTest}}
-  {{/with}}
-  {{#with "foo"}}
-    ../fancy.currentFruit={{../fancy.currentFruit}}
-  {{/with}}
-</template>
-
-<template name="test_helpers_e">
-  fancy.foo={{fancy.foo}}
-  fancy.apple.banana={{fancy.apple.banana}}
-  fancy.currentFruit={{fancy.currentFruit}}
-  fancy.currentCountry.name={{fancy.currentCountry.name}}
-  fancy.currentCountry.population={{fancy.currentCountry.population}}
-  fancy.currentCountry.unicorns={{fancy.currentCountry.unicorns}}
-</template>
-
-<template name="test_helpers_f">
-  fancyhelper.foo={{fancyhelper.foo}}
-  fancyhelper.apple.banana={{fancyhelper.apple.banana}}
-  fancyhelper.currentFruit={{fancyhelper.currentFruit}}
-  fancyhelper.currentCountry.name={{fancyhelper.currentCountry.name}}
-  fancyhelper.currentCountry.population={{fancyhelper.currentCountry.population}}
-  fancyhelper.currentCountry.unicorns={{fancyhelper.currentCountry.unicorns}}
-</template>
-
-<template name="test_helpers_g">
-  platypus={{platypus}}
-  this.platypus={{this.platypus}}
-</template>
-
-<template name="test_helpers_h">
-  (methodListFour 6 7 8 9={{methodListFour 6 7 8 9}})
-  (methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns={{methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns}})
-  (methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns={{methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns}})
-  (helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns={{helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns}})
-  (helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns={{helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns}})
-</template>
-
-<template name="test_render_a">
-  {{foo}}<br><hr>
-</template>
-
-<template name="test_render_b">
-  {{#with 200}}{{foo}}<br><hr>{{/with}}
-</template>
-
-<template name="test_render_c">
-  <br><hr>
-</template>
-
-<template name="test_template_arg_a">
-  <b>Foo</b> <i>Bar</i> <u>Baz</u>
-</template>
-
-<template name="test_template_helpers_a">
-  {{foo}}{{bar}}{{baz}}
-</template>
-
-<template name="test_template_helpers_b">
-  {{name}}{{arity}}{{toString}}{{length}}{{var}}
-</template>
-
-<template name="test_template_helpers_c">
-  {{name}}{{arity}}{{length}}{{var}}x
-</template>
-
-<template name="test_template_events_a">
-  <b>foo</b><u>bar</u><i>baz</i>
-</template>
-
-<template name="test_template_events_b">
-  <b>foo</b><u>bar</u><i>baz</i>
-</template>
-
-<template name="test_template_events_c">
-  <b>foo</b><u>bar</u><i>baz</i>
-</template>
-
-<!-- Test for Issue 617 - Type casting for helpers -->
-<template name="test_type_casting">
-{{testTypeCasting 'true' 'false' true false 0 1 -1 10 -10}}
-</template>
-
-<!-- Test for issue #801 - Each handling of falsy values eg. [1, 2, null, undefined] -->
-<template name="test_template_issue801">
-{{#each values}}{{this}}{{/each}}
-</template>
-
diff --git a/packages/spacebars-tests/templating_tests.js b/packages/spacebars-tests/templating_tests.js
deleted file mode 100644
index a8baddd477..0000000000
--- a/packages/spacebars-tests/templating_tests.js
+++ /dev/null
@@ -1,619 +0,0 @@
-
-// for events to bubble an element needs to be in the DOM.
-// @return {Function} call this for cleanup
-var addToBody = function (el) {
-  el.style.display = "none";
-  document.body.appendChild(el);
-  return function () {
-    document.body.removeChild(el);
-  };
-};
-
-
-Tinytest.add("spacebars-tests - templating_tests - assembly", function (test) {
-
-  // Test for a bug that made it to production -- after a replacement,
-  // we need to also check the newly replaced node for replacements
-  var div = renderToDiv(Template.test_assembly_a0);
-  test.equal(canonicalizeHtml(div.innerHTML),
-               "Hi");
-
-  // Another production bug -- we must use LiveRange to replace the
-  // placeholder, or risk breaking other LiveRanges
-  Session.set("stuff", true); // XXX bad form to use Session in a test?
-  Template.test_assembly_b1.helpers({
-    stuff: function () {
-      return Session.get("stuff");
-    }
-  });
-  var onscreen = renderToDiv(Template.test_assembly_b0);
-  test.equal(canonicalizeHtml(onscreen.innerHTML), "xyhi");
-  Session.set("stuff", false);
-  Tracker.flush();
-  test.equal(canonicalizeHtml(onscreen.innerHTML), "xhi");
-  Tracker.flush();
-});
-
-// Test that if a template throws an error, then pending_partials is
-// cleaned up properly (that template rendering doesn't break..)
-
-
-
-
-
-
-Tinytest.add("spacebars-tests - templating_tests - table assembly", function(test) {
-  var childWithTag = function(node, tag) {
-    return _.find(node.childNodes, function(n) {
-      return n.nodeName === tag;
-    });
-  };
-
-  // The table.rows test would fail when TR/TD tags are stripped due
-  // to improper html-to-fragment
-  var table = childWithTag(renderToDiv(Template.test_table_b0), "TABLE");
-  test.equal(table.rows.length, 3);
-
-  var c = new LocalCollection();
-  c.insert({bar:'a'});
-  c.insert({bar:'b'});
-  c.insert({bar:'c'});
-  var onscreen = renderToDiv(Template.test_table_each, {foo: c.find()});
-  table = childWithTag(onscreen, "TABLE");
-
-  test.equal(table.rows.length, 3, table.parentNode.innerHTML);
-  var tds = onscreen.getElementsByTagName("TD");
-  test.equal(tds.length, 3);
-  test.equal(canonicalizeHtml(tds[0].innerHTML), "a");
-  test.equal(canonicalizeHtml(tds[1].innerHTML), "b");
-  test.equal(canonicalizeHtml(tds[2].innerHTML), "c");
-
-  Tracker.flush();
-});
-
-Tinytest.add("spacebars-tests - templating_tests - event handler this", function(test) {
-
-  Template.test_event_data_with.helpers({
-    ONE: {str: "one"},
-    TWO: {str: "two"},
-    THREE: {str: "three"}
-  });
-
-  Template.test_event_data_with.events({
-    'click': function(event, template) {
-      test.isTrue(this.str);
-      test.equal(template.data.str, "one");
-      event_buf.push(this.str);
-    }
-  });
-
-  var event_buf = [];
-  var containerDiv = renderToDiv(Template.test_event_data_with, {str: "one"});
-  var cleanupDiv = addToBody(containerDiv);
-
-  var divs = containerDiv.getElementsByTagName("div");
-  test.equal(3, divs.length);
-
-  clickElement(divs[0]);
-  test.equal(event_buf, ['one']);
-  event_buf.length = 0;
-
-  clickElement(divs[1]);
-  test.equal(event_buf, ['two']);
-  event_buf.length = 0;
-
-  clickElement(divs[2]);
-  test.equal(event_buf, ['three']);
-  event_buf.length = 0;
-
-  cleanupDiv();
-  Tracker.flush();
-});
-
-
-if (document.addEventListener) {
-  // Only run this test on browsers with support for event
-  // capturing. A more detailed analysis can be found at
-  // https://www.meteor.com/blog/2013/09/06/browser-events-bubbling-capturing-and-delegation
-
-  // This is related to issue at https://gist.github.com/mquandalle/8157017
-  // Tests two situations related to events that can only be captured, not bubbled:
-  // 1. Event should only fire the handler that matches the selector given
-  // 2. Event should work on every element in the selector and not just the first element
-  // This test isn't written against mouseenter because it is synthesized by jQuery,
-  // the bug also happened with the play event
-  Tinytest.add("spacebars-tests - templating_tests - capturing events", function (test) {
-    var video1Played = 0,
-        video2Played = 0;
-
-    Template.test_capture_events.events({
-      'play .video1': function () {
-        video1Played++;
-      },
-      'play .video2': function () {
-        video2Played++;
-      }
-    });
-
-    // add to body or else events don't actually fire
-    var containerDiv = renderToDiv(Template.test_capture_events);
-    var cleanupDiv = addToBody(containerDiv);
-
-    var checkAndResetEvents = function(video1, video2) {
-      test.equal(video1Played, video1);
-      test.equal(video2Played, video2);
-
-      video1Played = 0;
-      video2Played = 0;
-    };
-
-    simulateEvent($(containerDiv).find(".video1").get(0),
-                  "play", {}, {bubbles: false});
-    checkAndResetEvents(1, 0);
-
-    simulateEvent($(containerDiv).find(".video2").get(0),
-                  "play", {}, {bubbles: false});
-    checkAndResetEvents(0, 1);
-
-    simulateEvent($(containerDiv).find(".video2").get(1),
-                  "play", {}, {bubbles: false});
-    checkAndResetEvents(0, 1);
-
-    // clean up DOM
-    cleanupDiv();
-    Tracker.flush();
-  });
-}
-
-Tinytest.add("spacebars-tests - templating_tests - safestring", function(test) {
-
-  Template.test_safestring_a.helpers({
-    foo: function() {
-      return "<br>";
-    },
-    bar: function() {
-      return new Spacebars.SafeString("<hr>");
-    }
-  });
-
-  var obj = {fooprop: "<br>",
-             barprop: new Spacebars.SafeString("<hr>")};
-  var html = canonicalizeHtml(
-    renderToDiv(Template.test_safestring_a, obj).innerHTML);
-
-  test.equal(html,
-             "&lt;br&gt;<br><hr><hr>"+
-             "&lt;br&gt;<br><hr><hr>");
-
-});
-
-Tinytest.add("spacebars-tests - templating_tests - helpers and dots", function(test) {
-  Template.registerHelper("platypus", function() {
-    return "eggs";
-  });
-  Template.registerHelper("watermelon", function() {
-    return "seeds";
-  });
-
-  Template.registerHelper("daisygetter", function() {
-    return this.daisy;
-  });
-
-  // XXX for debugging
-  Template.registerHelper("debugger", function() {
-    debugger;
-  });
-
-  var getFancyObject = function() {
-    return {
-      foo: 'bar',
-      apple: {banana: 'smoothie'},
-      currentFruit: function() {
-        return 'guava';
-      },
-      currentCountry: function() {
-        return {name: 'Iceland',
-                _pop: 321007,
-                population: function() {
-                  return this._pop;
-                },
-                unicorns: 0, // falsy value
-                daisyGetter: function() {
-                  return this.daisy;
-                }
-               };
-      }
-    };
-  };
-
-  Template.registerHelper("fancyhelper", getFancyObject);
-
-  Template.test_helpers_a.helpers({
-    platypus: 'bill',
-    warthog: function() {
-      return 'snout';
-    }
-  });
-
-  var listFour = function(a, b, c, d, options) {
-    test.isTrue(options instanceof Spacebars.kw);
-    var keywordArgs = _.map(_.keys(options.hash), function(k) {
-      var val = options.hash[k];
-      return k+':'+val;
-    });
-    return [a, b, c, d].concat(keywordArgs).join(' ');
-  };
-
-  var dataObj = {
-    zero: 0,
-    platypus: 'weird',
-    watermelon: 'rind',
-    daisy: 'petal',
-    tree: function() { return 'leaf'; },
-    thisTest: function() { return this.tree(); },
-    getNull: function() { return null; },
-    getUndefined: function () { return; },
-    fancy: getFancyObject(),
-    methodListFour: listFour
-  };
-
-  var html;
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_a, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    'platypus=bill', // helpers on Template object take first priority
-    'watermelon=seeds', // global helpers take second priority
-    'daisy=petal', // unshadowed object property
-    'tree=leaf', // function object property
-    'warthog=snout' // function Template property
-  ]);
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_b, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    // unknown properties silently fail
-    'unknown=',
-    // falsy property comes through
-    'zero=0'
-  ]);
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_c, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    // property gets are supposed to silently fail
-    'platypus.X=',
-    'watermelon.X=',
-    'daisy.X=',
-    'tree.X=',
-    'warthog.X=',
-    'getNull.X=',
-    'getUndefined.X=',
-    'getUndefined.X.Y='
-  ]);
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_d, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    // helpers should get current data context in `this`
-    'daisygetter=petal',
-    // object methods should get object in `this`
-    'thisTest=leaf',
-    // nesting inside {{#with fancy}} shouldn't affect
-    // method
-    '../thisTest=leaf',
-    // combine .. and .
-    '../fancy.currentFruit=guava'
-  ]);
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_e, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    'fancy.foo=bar',
-    'fancy.apple.banana=smoothie',
-    'fancy.currentFruit=guava',
-    'fancy.currentCountry.name=Iceland',
-    'fancy.currentCountry.population=321007',
-    'fancy.currentCountry.unicorns=0'
-  ]);
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_f, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    'fancyhelper.foo=bar',
-    'fancyhelper.apple.banana=smoothie',
-    'fancyhelper.currentFruit=guava',
-    'fancyhelper.currentCountry.name=Iceland',
-    'fancyhelper.currentCountry.population=321007',
-    'fancyhelper.currentCountry.unicorns=0'
-  ]);
-
-  // test significance of 'this', which prevents helper from
-  // shadowing property
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_g, dataObj).innerHTML);
-  test.equal(html.match(/\S+/g), [
-    'platypus=eggs',
-    'this.platypus=weird'
-  ]);
-
-  // test interpretation of arguments
-
-  Template.test_helpers_h.helpers({helperListFour: listFour});
-
-  html = canonicalizeHtml(
-    renderToDiv(Template.test_helpers_h, dataObj).innerHTML);
-  var trials =
-        html.match(/\(.*?\)/g);
-  test.equal(trials[0],
-             '(methodListFour 6 7 8 9=6 7 8 9)');
-  test.equal(trials[1],
-             '(methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns=eggs leaf guava 0)');
-  test.equal(trials[2],
-             '(methodListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns=eggs leaf guava 0 a:eggs b:leaf c:guava d:0)');
-  test.equal(trials[3],
-             '(helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns=eggs leaf guava 0)');
-  test.equal(trials[4],
-             '(helperListFour platypus thisTest fancyhelper.currentFruit fancyhelper.currentCountry.unicorns a=platypus b=thisTest c=fancyhelper.currentFruit d=fancyhelper.currentCountry.unicorns=eggs leaf guava 0 a:eggs b:leaf c:guava d:0)');
-  test.equal(trials.length, 5);
-
-});
-
-
-Tinytest.add("spacebars-tests - templating_tests - rendered template", function(test) {
-  var R = ReactiveVar('foo');
-  Template.test_render_a.helpers({
-    foo: function() {
-      R.get();
-      return this.x + 1;
-    }
-  });
-
-  var div = renderToDiv(Template.test_render_a, {x: 123});
-  test.equal($(div).text().match(/\S+/)[0], "124");
-
-  var br1 = div.getElementsByTagName('br')[0];
-  var hr1 = div.getElementsByTagName('hr')[0];
-  test.isTrue(br1);
-  test.isTrue(hr1);
-
-  R.set('bar');
-  Tracker.flush();
-  var br2 = div.getElementsByTagName('br')[0];
-  var hr2 = div.getElementsByTagName('hr')[0];
-  test.isTrue(br2);
-  test.isTrue(br1 === br2);
-  test.isTrue(hr2);
-  test.isTrue(hr1 === hr2);
-
-  Tracker.flush();
-
-  /////
-
-  R = ReactiveVar('foo');
-
-  Template.test_render_b.helpers({foo: function() {
-    R.get();
-    return (+this) + 1;
-  }});
-
-  div = renderToDiv(Template.test_render_b, {x: 123});
-  test.equal($(div).text().match(/\S+/)[0], "201");
-
-  var br1 = div.getElementsByTagName('br')[0];
-  var hr1 = div.getElementsByTagName('hr')[0];
-  test.isTrue(br1);
-  test.isTrue(hr1);
-
-  R.set('bar');
-  Tracker.flush();
-  var br2 = div.getElementsByTagName('br')[0];
-  var hr2 = div.getElementsByTagName('hr')[0];
-  test.isTrue(br2);
-  test.isTrue(br1 === br2);
-  test.isTrue(hr2);
-  test.isTrue(hr1 === hr2);
-
-  Tracker.flush();
-
-});
-
-Tinytest.add("spacebars-tests - templating_tests - template arg", function (test) {
-  Template.test_template_arg_a.events({
-    click: function (event, template) {
-      template.firstNode.innerHTML = 'Hello';
-      template.lastNode.innerHTML = 'World';
-      template.find('i').innerHTML =
-        (template.findAll('*').length)+"-element";
-      template.lastNode.innerHTML += ' (the secret is '+
-        template.secret+')';
-    }
-  });
-
-  Template.test_template_arg_a.created = function() {
-    var self = this;
-    test.isFalse(self.firstNode);
-    test.isFalse(self.lastNode);
-    test.throws(function () { return self.find("*"); });
-    test.throws(function () { return self.findAll("*"); });
-  };
-
-  Template.test_template_arg_a.rendered = function () {
-    var template = this;
-    template.firstNode.innerHTML = 'Greetings';
-    template.lastNode.innerHTML = 'Line';
-    template.find('i').innerHTML =
-      (template.findAll('b').length)+"-bold";
-    template.secret = "strawberry "+template.data.food;
-  };
-
-  Template.test_template_arg_a.destroyed = function() {
-    var self = this;
-    test.isFalse(self.firstNode);
-    test.isFalse(self.lastNode);
-    test.throws(function () { return self.find("*"); });
-    test.throws(function () { return self.findAll("*"); });
-  };
-
-  var div = renderToDiv(Template.test_template_arg_a, {food: "pie"});
-  var cleanupDiv = addToBody(div);
-  Tracker.flush(); // cause `rendered` to be called
-  test.equal($(div).text(), "Greetings 1-bold Line");
-  clickElement(div.querySelector('i'));
-  test.equal($(div).text(), "Hello 3-element World (the secret is strawberry pie)");
-
-  cleanupDiv();
-  Tracker.flush();
-});
-
-Tinytest.add("spacebars-tests - templating_tests - helpers", function (test) {
-  var tmpl = Template.test_template_helpers_a;
-
-  tmpl._NOWARN_OLDSTYLE_HELPERS = true;
-  tmpl.foo = 'z';
-  tmpl.helpers({bar: 'b'});
-  // helpers(...) takes precendence of assigned helper
-  tmpl.helpers({foo: 'a', baz: function() { return 'c'; }});
-
-  var div = renderToDiv(tmpl);
-  test.equal($(div).text().match(/\S+/)[0], 'abc');
-  Tracker.flush();
-
-  tmpl = Template.test_template_helpers_b;
-
-  tmpl.helpers({
-    'name': 'A',
-    'arity': 'B',
-    'toString': 'C',
-    'length': 4,
-    'var': 'D'
-  });
-
-  div = renderToDiv(tmpl);
-  var txt = $(div).text();
-  txt = txt.replace('[object Object]', 'X'); // IE 8
-  txt = txt.match(/\S+/)[0];
-  test.isTrue(txt.match(/^AB[CX]4D$/));
-  // We don't make helpers with names like toString work in IE 8.
-  test.expect_fail();
-  test.equal(txt, 'ABC4D');
-  Tracker.flush();
-
-  // test that helpers don't "leak"
-  tmpl = Template.test_template_helpers_c;
-  div = renderToDiv(tmpl);
-  test.equal($(div).text(), 'x');
-  Tracker.flush();
-});
-
-Tinytest.add("spacebars-tests - templating_tests - events", function (test) {
-  var tmpl = Template.test_template_events_a;
-
-  var buf = [];
-
-  // old style
-  tmpl.events = {
-    'click b': function () { buf.push('b'); }
-  };
-
-  var div = renderToDiv(tmpl);
-  var cleanupDiv = addToBody(div);
-  clickElement($(div).find('b')[0]);
-  test.equal(buf, ['b']);
-  cleanupDiv();
-  Tracker.flush();
-
-  ///
-
-  tmpl = Template.test_template_events_b;
-  buf = [];
-  // new style
-  tmpl.events({
-    'click u': function () { buf.push('u'); }
-  });
-  tmpl.events({
-    'click i': function () { buf.push('i'); }
-  });
-
-  div = renderToDiv(tmpl);
-  cleanupDiv = addToBody(div);
-  clickElement($(div).find('u')[0]);
-  clickElement($(div).find('i')[0]);
-  test.equal(buf, ['u', 'i']);
-  cleanupDiv();
-  Tracker.flush();
-
-  //Test for identical callbacks for issue #650
-  tmpl = Template.test_template_events_c;
-  buf = [];
-  tmpl.events({
-    'click u': function () { buf.push('a'); }
-  });
-  tmpl.events({
-    'click u': function () { buf.push('b'); }
-  });
-
-  div = renderToDiv(tmpl);
-  cleanupDiv = addToBody(div);
-  clickElement($(div).find('u')[0]);
-  test.equal(buf.length, 2);
-  test.isTrue(_.contains(buf, 'a'));
-  test.isTrue(_.contains(buf, 'b'));
-  cleanupDiv();
-  Tracker.flush();
-});
-
-
-Tinytest.add('spacebars-tests - templating_tests - helper typecast Issue #617', function (test) {
-
-  Template.registerHelper('testTypeCasting', function (/*arguments*/) {
-    // Return a string representing the arguments passed to this
-    // function, including types. eg:
-    // (1, true) -> "[number,1][boolean,true]"
-    return _.reduce(_.toArray(arguments), function (memo, arg) {
-      if (typeof arg === 'object')
-        return memo + "[object]";
-      return memo + "[" + typeof arg + "," + arg + "]";
-    }, "");
-    return x;
-  });
-
-  var div = renderToDiv(Template.test_type_casting);
-  var result = canonicalizeHtml(div.innerHTML);
-  test.equal(
-    result,
-    // This corresponds to entries in templating_tests.html.
-    // true/faslse
-    "[string,true][string,false][boolean,true][boolean,false]" +
-      // numbers
-      "[number,0][number,1][number,-1][number,10][number,-10]" +
-      // handlebars 'options' argument. appended to args of all helpers.
-      "[object]");
-});
-
-Tinytest.add('spacebars-tests - templating_tests - each falsy Issue #801', function (test) {
-  //Minor test for issue #801 (#each over array containing nulls)
-  Template.test_template_issue801.helpers({
-    values: function() { return [0,1,2,null,undefined,false]; }});
-  var div = renderToDiv(Template.test_template_issue801);
-  test.equal(canonicalizeHtml(div.innerHTML), "012");
-});
-
-Tinytest.add('spacebars-tests - templating_tests - duplicate template error', function (test) {
-  Template.__checkName("test_duplicate_template");
-  Template.test_duplicate_template = new Template(
-    "dup", function () { return null; });
-
-  test.throws(function () {
-    Template.__checkName("test_duplicate_template");
-  });
-});
-
-Tinytest.add('spacebars-tests - templating_tests - reserved template name error', function (test) {
-
-  _.each('length __proto__ prototype name body currentData instance'.split(' '),
-         function (name) {
-           test.throws(function () {
-             Template.__checkName(name);
-           }, /This template name is reserved: /);
-         });
-});
diff --git a/packages/spacebars/.gitignore b/packages/spacebars/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/spacebars/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/spacebars/README.md b/packages/spacebars/README.md
deleted file mode 100644
index b54a81c652..0000000000
--- a/packages/spacebars/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Spacebars
-
-Spacebars is a Meteor template language inspired by
-[Handlebars](http://handlebarsjs.com/).  It shares some of the spirit and syntax
-of Handlebars, but it has been tailored to produce reactive Meteor templates
-when compiled.
-
-
-Read more at http://docs.meteor.com/packages/spacebars.html
diff --git a/packages/spacebars/package.js b/packages/spacebars/package.js
deleted file mode 100644
index 30badda23f..0000000000
--- a/packages/spacebars/package.js
+++ /dev/null
@@ -1,23 +0,0 @@
-Package.describe({
-  summary: "Handlebars-like template language for Meteor",
-  version: '1.0.12'
-});
-
-// For more, see package `spacebars-compiler`, which is used by
-// the build plugin and not shipped to the client unless you
-// ask for it by name.
-//
-// The Spacebars build plugin is in package `templating`.
-//
-// Additional tests are in `spacebars-tests`.
-
-Package.onUse(function (api) {
-  api.export('Spacebars');
-
-  api.use('htmljs');
-  api.use('tracker');
-  api.use('blaze');
-  api.use('observe-sequence');
-  api.use('underscore');
-  api.addFiles(['spacebars-runtime.js']);
-});
diff --git a/packages/spacebars/spacebars-runtime.js b/packages/spacebars/spacebars-runtime.js
deleted file mode 100644
index a7cebb77d0..0000000000
--- a/packages/spacebars/spacebars-runtime.js
+++ /dev/null
@@ -1,283 +0,0 @@
-Spacebars = {};
-
-var tripleEquals = function (a, b) { return a === b; };
-
-Spacebars.include = function (templateOrFunction, contentFunc, elseFunc) {
-  if (! templateOrFunction)
-    return null;
-
-  if (typeof templateOrFunction !== 'function') {
-    var template = templateOrFunction;
-    if (! Blaze.isTemplate(template))
-      throw new Error("Expected template or null, found: " + template);
-    var view = templateOrFunction.constructView(contentFunc, elseFunc);
-    view.__startsNewLexicalScope = true;
-    return view;
-  }
-
-  var templateVar = Blaze.ReactiveVar(null, tripleEquals);
-  var view = Blaze.View('Spacebars.include', function () {
-    var template = templateVar.get();
-    if (template === null)
-      return null;
-
-    if (! Blaze.isTemplate(template))
-      throw new Error("Expected template or null, found: " + template);
-
-    return template.constructView(contentFunc, elseFunc);
-  });
-  view.__templateVar = templateVar;
-  view.onViewCreated(function () {
-    this.autorun(function () {
-      templateVar.set(templateOrFunction());
-    });
-  });
-  view.__startsNewLexicalScope = true;
-
-  return view;
-};
-
-// Executes `{{foo bar baz}}` when called on `(foo, bar, baz)`.
-// If `bar` and `baz` are functions, they are called before
-// `foo` is called on them.
-//
-// This is the shared part of Spacebars.mustache and
-// Spacebars.attrMustache, which differ in how they post-process the
-// result.
-Spacebars.mustacheImpl = function (value/*, args*/) {
-  var args = arguments;
-  // if we have any arguments (pos or kw), add an options argument
-  // if there isn't one.
-  if (args.length > 1) {
-    var kw = args[args.length - 1];
-    if (! (kw instanceof Spacebars.kw)) {
-      kw = Spacebars.kw();
-      // clone arguments into an actual array, then push
-      // the empty kw object.
-      args = Array.prototype.slice.call(arguments);
-      args.push(kw);
-    } else {
-      // For each keyword arg, call it if it's a function
-      var newHash = {};
-      for (var k in kw.hash) {
-        var v = kw.hash[k];
-        newHash[k] = (typeof v === 'function' ? v() : v);
-      }
-      args[args.length - 1] = Spacebars.kw(newHash);
-    }
-  }
-
-  return Spacebars.call.apply(null, args);
-};
-
-Spacebars.mustache = function (value/*, args*/) {
-  var result = Spacebars.mustacheImpl.apply(null, arguments);
-
-  if (result instanceof Spacebars.SafeString)
-    return HTML.Raw(result.toString());
-  else
-    // map `null`, `undefined`, and `false` to null, which is important
-    // so that attributes with nully values are considered absent.
-    // stringify anything else (e.g. strings, booleans, numbers including 0).
-    return (result == null || result === false) ? null : String(result);
-};
-
-Spacebars.attrMustache = function (value/*, args*/) {
-  var result = Spacebars.mustacheImpl.apply(null, arguments);
-
-  if (result == null || result === '') {
-    return null;
-  } else if (typeof result === 'object') {
-    return result;
-  } else if (typeof result === 'string' && HTML.isValidAttributeName(result)) {
-    var obj = {};
-    obj[result] = '';
-    return obj;
-  } else {
-    throw new Error("Expected valid attribute name, '', null, or object");
-  }
-};
-
-Spacebars.dataMustache = function (value/*, args*/) {
-  var result = Spacebars.mustacheImpl.apply(null, arguments);
-
-  return result;
-};
-
-// Idempotently wrap in `HTML.Raw`.
-//
-// Called on the return value from `Spacebars.mustache` in case the
-// template uses triple-stache (`{{{foo bar baz}}}`).
-Spacebars.makeRaw = function (value) {
-  if (value == null) // null or undefined
-    return null;
-  else if (value instanceof HTML.Raw)
-    return value;
-  else
-    return HTML.Raw(value);
-};
-
-// If `value` is a function, evaluate its `args` (by calling them, if they
-// are functions), and then call it on them. Otherwise, return `value`.
-//
-// If `value` is not a function and is not null, then this method will assert
-// that there are no args. We check for null before asserting because a user
-// may write a template like {{user.fullNameWithPrefix 'Mr.'}}, where the
-// function will be null until data is ready.
-Spacebars.call = function (value/*, args*/) {
-  if (typeof value === 'function') {
-    // Evaluate arguments by calling them if they are functions.
-    var newArgs = [];
-    for (var i = 1; i < arguments.length; i++) {
-      var arg = arguments[i];
-      newArgs[i-1] = (typeof arg === 'function' ? arg() : arg);
-    }
-
-    return value.apply(null, newArgs);
-  } else {
-    if (value != null && arguments.length > 1) {
-      throw new Error("Can't call non-function: " + value);
-    }
-    return value;
-  }
-};
-
-// Call this as `Spacebars.kw({ ... })`.  The return value
-// is `instanceof Spacebars.kw`.
-Spacebars.kw = function (hash) {
-  if (! (this instanceof Spacebars.kw))
-    // called without new; call with new
-    return new Spacebars.kw(hash);
-
-  this.hash = hash || {};
-};
-
-// Call this as `Spacebars.SafeString("some HTML")`.  The return value
-// is `instanceof Spacebars.SafeString` (and `instanceof Handlebars.SafeString).
-Spacebars.SafeString = function (html) {
-  if (! (this instanceof Spacebars.SafeString))
-    // called without new; call with new
-    return new Spacebars.SafeString(html);
-
-  return new Handlebars.SafeString(html);
-};
-Spacebars.SafeString.prototype = Handlebars.SafeString.prototype;
-
-// `Spacebars.dot(foo, "bar", "baz")` performs a special kind
-// of `foo.bar.baz` that allows safe indexing of `null` and
-// indexing of functions (which calls the function).  If the
-// result is a function, it is always a bound function (e.g.
-// a wrapped version of `baz` that always uses `foo.bar` as
-// `this`).
-//
-// In `Spacebars.dot(foo, "bar")`, `foo` is assumed to be either
-// a non-function value or a "fully-bound" function wrapping a value,
-// where fully-bound means it takes no arguments and ignores `this`.
-//
-// `Spacebars.dot(foo, "bar")` performs the following steps:
-//
-// * If `foo` is falsy, return `foo`.
-//
-// * If `foo` is a function, call it (set `foo` to `foo()`).
-//
-// * If `foo` is falsy now, return `foo`.
-//
-// * Return `foo.bar`, binding it to `foo` if it's a function.
-Spacebars.dot = function (value, id1/*, id2, ...*/) {
-  if (arguments.length > 2) {
-    // Note: doing this recursively is probably less efficient than
-    // doing it in an iterative loop.
-    var argsForRecurse = [];
-    argsForRecurse.push(Spacebars.dot(value, id1));
-    argsForRecurse.push.apply(argsForRecurse,
-                              Array.prototype.slice.call(arguments, 2));
-    return Spacebars.dot.apply(null, argsForRecurse);
-  }
-
-  if (typeof value === 'function')
-    value = value();
-
-  if (! value)
-    return value; // falsy, don't index, pass through
-
-  var result = value[id1];
-  if (typeof result !== 'function')
-    return result;
-  // `value[id1]` (or `value()[id1]`) is a function.
-  // Bind it so that when called, `value` will be placed in `this`.
-  return function (/*arguments*/) {
-    return result.apply(value, arguments);
-  };
-};
-
-// Spacebars.With implements the conditional logic of rendering
-// the `{{else}}` block if the argument is falsy.  It combines
-// a Blaze.If with a Blaze.With (the latter only in the truthy
-// case, since the else block is evaluated without entering
-// a new data context).
-Spacebars.With = function (argFunc, contentFunc, elseFunc) {
-  var argVar = new Blaze.ReactiveVar;
-  var view = Blaze.View('Spacebars_with', function () {
-    return Blaze.If(function () { return argVar.get(); },
-                    function () { return Blaze.With(function () {
-                      return argVar.get(); }, contentFunc); },
-                    elseFunc);
-  });
-  view.onViewCreated(function () {
-    this.autorun(function () {
-      argVar.set(argFunc());
-
-      // This is a hack so that autoruns inside the body
-      // of the #with get stopped sooner.  It reaches inside
-      // our ReactiveVar to access its dep.
-
-      Tracker.onInvalidate(function () {
-        argVar.dep.changed();
-      });
-
-      // Take the case of `{{#with A}}{{B}}{{/with}}`.  The goal
-      // is to not re-render `B` if `A` changes to become falsy
-      // and `B` is simultaneously invalidated.
-      //
-      // A series of autoruns are involved:
-      //
-      // 1. This autorun (argument to Spacebars.With)
-      // 2. Argument to Blaze.If
-      // 3. Blaze.If view re-render
-      // 4. Argument to Blaze.With
-      // 5. The template tag `{{B}}`
-      //
-      // When (3) is invalidated, it immediately stops (4) and (5)
-      // because of a Tracker.onInvalidate built into materializeView.
-      // (When a View's render method is invalidated, it immediately
-      // tears down all the subviews, via a Tracker.onInvalidate much
-      // like this one.
-      //
-      // Suppose `A` changes to become falsy, and `B` changes at the
-      // same time (i.e. without an intervening flush).
-      // Without the code above, this happens:
-      //
-      // - (1) and (5) are invalidated.
-      // - (1) runs, invalidating (2) and (4).
-      // - (5) runs.
-      // - (2) runs, invalidating (3), stopping (4) and (5).
-      //
-      // With the code above:
-      //
-      // - (1) and (5) are invalidated, invalidating (2) and (4).
-      // - (1) runs.
-      // - (2) runs, invalidating (3), stopping (4) and (5).
-      //
-      // If the re-run of (5) is originally enqueued before (1), all
-      // bets are off, but typically that doesn't seem to be the
-      // case.  Anyway, doing this is always better than not doing it,
-      // because it might save a bunch of DOM from being updated
-      // needlessly.
-    });
-  });
-
-  return view;
-};
-
-// XXX COMPAT WITH 0.9.0
-Spacebars.TemplateWith = Blaze._TemplateWith;
diff --git a/packages/static-html/README.md b/packages/static-html/README.md
deleted file mode 100644
index 5368404ea9..0000000000
--- a/packages/static-html/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# static-html
-
-Essentially, an alternative to the `templating` package that doesn't compile Blaze templates. Mostly useful if you want to use Angular or React as your view layer and just want to get some static HTML content on your page as a render target for your view framework.
-
-This build plugin parses all of the `.html` files in your app and looks for top-level tags:
-
-- `<head>` - appended to the `head` section of your HTML
-- `<body>` - appended to the `body` section of your HTML
-
-Attributes are supported on the `<body>` tag, but not on `<head>`.
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
deleted file mode 100644
index 4efeb39971..0000000000
--- a/packages/static-html/package.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Package.describe({
-  version: '1.1.12',
-  // Brief, one-line summary of the package.
-  summary: 'Define static page content in .html files',
-  git: 'https://github.com/meteor/meteor',
-  // By default, Meteor will default to using README.md for documentation.
-  // To avoid submitting documentation, set this field to null.
-  documentation: 'README.md'
-});
-
-Package.registerBuildPlugin({
-  name: "compileStaticHtmlBatch",
-  use: [
-    'caching-html-compiler',
-    'ecmascript',
-    'templating-tools',
-    'underscore'
-  ],
-  sources: [
-    'static-html.js'
-  ]
-});
-
-Package.onUse(function(api) {
-  api.use('isobuild:compiler-plugin@1.0.0');
-
-  // Body attributes are compiled to code that uses Meteor.startup
-  api.imply('meteor', 'client');
-});
diff --git a/packages/static-html/static-html.js b/packages/static-html/static-html.js
deleted file mode 100644
index 2d223a65aa..0000000000
--- a/packages/static-html/static-html.js
+++ /dev/null
@@ -1,90 +0,0 @@
-Plugin.registerCompiler({
-  extensions: ['html'],
-  archMatching: 'web',
-  isTemplate: true
-}, () => new CachingHtmlCompiler("static-html", TemplatingTools.scanHtmlForTags, compileTagsToStaticHtml));
-
-// Same API as TutorialTools.compileTagsWithSpacebars, but instead of compiling
-// with Spacebars, it just returns static HTML
-function compileTagsToStaticHtml(tags) {
-  var handler = new StaticHtmlTagHandler();
-
-  tags.forEach((tag) => {
-    handler.addTagToResults(tag);
-  });
-
-  return handler.getResults();
-};
-
-class StaticHtmlTagHandler {
-  constructor() {
-    this.results = {
-      head: '',
-      body: '',
-      js: '',
-      bodyAttrs: {}
-    };
-  }
-
-  getResults() {
-    return this.results;
-  }
-
-  addTagToResults(tag) {
-    this.tag = tag;
-
-    // do we have 1 or more attributes?
-    const hasAttribs = ! _.isEmpty(this.tag.attribs);
-
-    if (this.tag.tagName === "head") {
-      if (hasAttribs) {
-        this.throwCompileError("Attributes on <head> not supported");
-      }
-
-      this.results.head += this.tag.contents;
-      return;
-    }
-
-
-    // <body> or <template>
-
-    try {
-      if (this.tag.tagName === "body") {
-        this.addBodyAttrs(this.tag.attribs);
-
-        // We may be one of many `<body>` tags.
-        this.results.body += this.tag.contents;
-      } else {
-        this.throwCompileError("Expected <head> or <body> tag", this.tag.tagStartIndex);
-      }
-    } catch (e) {
-      if (e.scanner) {
-        // The error came from Spacebars
-        this.throwCompileError(e.message, this.tag.contentsStartIndex + e.offset);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  addBodyAttrs(attrs) {
-    Object.keys(attrs).forEach((attr) => {
-      const val = attrs[attr];
-
-      // This check is for conflicting body attributes in the same file;
-      // we check across multiple files in caching-html-compiler using the
-      // attributes on results.bodyAttrs
-      if (this.results.bodyAttrs.hasOwnProperty(attr) && this.results.bodyAttrs[attr] !== val) {
-        this.throwCompileError(
-          `<body> declarations have conflicting values for the '${attr}' attribute.`);
-      }
-
-      this.results.bodyAttrs[attr] = val;
-    });
-  }
-
-  throwCompileError(message, overrideIndex) {
-    TemplatingTools.throwCompileError(this.tag, message, overrideIndex);
-  }
-}
-
diff --git a/packages/templating-tools/README.md b/packages/templating-tools/README.md
deleted file mode 100644
index a8c2e016e5..0000000000
--- a/packages/templating-tools/README.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# templating-tools
-
-Has some conveniently abstracted functions that are used together with the `caching-html-compiler` package to implement different template compilers:
-
-1. `templating`
-2. `static-html`
-
-These functions contain some code shared between the above build plugins, and if you are building your own build plugin they can be useful too. But they aren't guaranteed to be helpful for every use case, so you should carefully decide if they are appropriate for your package.
-
----------
-
-### TemplatingTools.scanHtmlForTags(options)
-
-Scan an HTML file for top-level tags as specified by `options.tagNames`, and return an array of `Tag` objects. See more about `Tag` objects below.
-
-#### Options
-
-1. `sourceName` the name of the input file, used when throwing errors.
-2. `contents` the contents of the input file, these are parsed to find the top-level tags
-3. `tagNames` the top-level tags to look for in the HTML.
-
-#### Example
-
-```js
-const tags = scanHtmlForTags({
-  sourceName: inputPath,
-  contents: contents,
-  tagNames: ["body", "head", "template"]
-});
-```
-
-### TemplatingTools.compileTagsWithSpacebars(tags)
-
-Transform an array of tags into a result object of the following form:
-
-```js
-{
-  js: String,
-  body: "",
-  head: String,
-  bodyAttrs: {
-    [attrName]: String
-  }
-}
-```
-
-1. The contents of every `<template>` and `<body>` tag will be compiled into JavaScript with `spacebars-compiler`, and the code appended to the `js` field of the result.
-2. The contents of every `<head>` tag will be concatenated into the `head` field of the result.
-3. Any attributes found on `<body>` tags will be added to the `bodyAtts` field of the result.
-4. Every `<template>` tag is required to have a `name` attribute, and no other attributes.
-5. The `<head>` tag is not allowed to have any attributes.
-
-### TemplatingTools.CompileError
-
-This error is thrown when a compilation error happens. If you catch it, look for the following fields, which are set by `TemplatingTools.throwCompileError`:
-
-1. `message` The error message to show to the user.
-2. `file` The filename where the error occured.
-3. `line` The line number where the error occured.
-
-### TemplatingTools.throwCompileError(tag, message, [overrideIndex])
-
-Throw a `TemplatingTools.CompileError` with the right properties. Handles generating the line number of the error for you.
-
-#### Arguments
-
-1. `tag` the Tag object in which this compile error occured. The fields on this object are used to populate fields on the resulting error.
-2. `message` the error message, will be displayed to the user.
-3. `overrideIndex` optional - if provided will be used to determine the line number of the error; otherwise the index of the start of the tag will be used.
-
-### Tag object
-
-The `scanHtml` and `compileTagsWithSpacebars` functions communicate via an array of Tag objects, which have the following form:
-
-```js
-{
-  // Name of the tag - "body", "head", "template", etc
-  tagName: String,
-  
-  // Attributes on the tag
-  attribs: { [attrName]: String },
-  
-  // Contents of the tag
-  contents: String,
-  
-  // Starting index of the opening tag in the source file
-  // (used to throw informative errors)
-  tagStartIndex: Number,
-  
-  // Starting index of the contents of the tag in the source file
-  // (used to throw informative errors)
-  contentsStartIndex: Number,
-  
-  // The contents of the entire source file, should be used only to
-  // throw informative errors (for example, this can be used to
-  // determine the line number for an error)
-  fileContents: String,
-  
-  // The file name of the initial source file, used to throw errors
-  sourceName: String
-};
-```
diff --git a/packages/templating-tools/code-generation.js b/packages/templating-tools/code-generation.js
deleted file mode 100644
index 6a7f8695b7..0000000000
--- a/packages/templating-tools/code-generation.js
+++ /dev/null
@@ -1,18 +0,0 @@
-TemplatingTools.generateTemplateJS =
-function generateTemplateJS(name, renderFuncCode) {
-  const nameLiteral = JSON.stringify(name);
-  const templateDotNameLiteral = JSON.stringify(`Template.${name}`);
-
-  return `
-Template.__checkName(${nameLiteral});
-Template[${nameLiteral}] = new Template(${templateDotNameLiteral}, ${renderFuncCode});
-`;
-}
-
-TemplatingTools.generateBodyJS =
-function generateBodyJS(renderFuncCode) {
-  return `
-Template.body.addContent(${renderFuncCode});
-Meteor.startup(Template.body.renderToDocument);
-`;
-}
diff --git a/packages/templating-tools/compile-tags-with-spacebars.js b/packages/templating-tools/compile-tags-with-spacebars.js
deleted file mode 100644
index 7c3e2d67c2..0000000000
--- a/packages/templating-tools/compile-tags-with-spacebars.js
+++ /dev/null
@@ -1,104 +0,0 @@
-TemplatingTools.compileTagsWithSpacebars = function compileTagsWithSpacebars(tags) {
-  var handler = new SpacebarsTagCompiler();
-
-  tags.forEach((tag) => {
-    handler.addTagToResults(tag);
-  });
-
-  return handler.getResults();
-};
-
-class SpacebarsTagCompiler {
-  constructor() {
-    this.results = {
-      head: '',
-      body: '',
-      js: '',
-      bodyAttrs: {}
-    };
-  }
-
-  getResults() {
-    return this.results;
-  }
-
-  addTagToResults(tag) {
-    this.tag = tag;
-
-    // do we have 1 or more attributes?
-    const hasAttribs = ! _.isEmpty(this.tag.attribs);
-
-    if (this.tag.tagName === "head") {
-      if (hasAttribs) {
-        this.throwCompileError("Attributes on <head> not supported");
-      }
-
-      this.results.head += this.tag.contents;
-      return;
-    }
-
-
-    // <body> or <template>
-
-    try {
-      if (this.tag.tagName === "template") {
-        const name = this.tag.attribs.name;
-
-        if (! name) {
-          this.throwCompileError("Template has no 'name' attribute");
-        }
-
-        if (SpacebarsCompiler.isReservedName(name)) {
-          this.throwCompileError(`Template can't be named "${name}"`);
-        }
-
-        const renderFuncCode = SpacebarsCompiler.compile(this.tag.contents, {
-          isTemplate: true,
-          sourceName: `Template "${name}"`
-        });
-
-        this.results.js += TemplatingTools.generateTemplateJS(
-          name, renderFuncCode);
-      } else if (this.tag.tagName === "body") {
-        this.addBodyAttrs(this.tag.attribs);
-
-        const renderFuncCode = SpacebarsCompiler.compile(this.tag.contents, {
-          isBody: true,
-          sourceName: "<body>"
-        });
-
-        // We may be one of many `<body>` tags.
-        this.results.js += TemplatingTools.generateBodyJS(renderFuncCode);
-      } else {
-        this.throwCompileError("Expected <template>, <head>, or <body> tag in template file", tagStartIndex);
-      }
-    } catch (e) {
-      if (e.scanner) {
-        // The error came from Spacebars
-        this.throwCompileError(e.message, this.tag.contentsStartIndex + e.offset);
-      } else {
-        throw e;
-      }
-    }
-  }
-
-  addBodyAttrs(attrs) {
-    Object.keys(attrs).forEach((attr) => {
-      const val = attrs[attr];
-
-      // This check is for conflicting body attributes in the same file;
-      // we check across multiple files in caching-html-compiler using the
-      // attributes on results.bodyAttrs
-      if (this.results.bodyAttrs.hasOwnProperty(attr) && this.results.bodyAttrs[attr] !== val) {
-        this.throwCompileError(
-          `<body> declarations have conflicting values for the '${attr}' attribute.`);
-      }
-
-      this.results.bodyAttrs[attr] = val;
-    });
-  }
-
-  throwCompileError(message, overrideIndex) {
-    TemplatingTools.throwCompileError(this.tag, message, overrideIndex);
-  }
-}
diff --git a/packages/templating-tools/html-scanner-tests.js b/packages/templating-tools/html-scanner-tests.js
deleted file mode 100644
index 51066e81de..0000000000
--- a/packages/templating-tools/html-scanner-tests.js
+++ /dev/null
@@ -1,189 +0,0 @@
-Tinytest.add("templating-tools - html scanner", function (test) {
-  var testInString = function(actualStr, wantedContents) {
-    if (actualStr.indexOf(wantedContents) >= 0)
-      test.ok();
-    else
-      test.fail("Expected "+JSON.stringify(wantedContents)+
-                " in "+JSON.stringify(actualStr));
-  };
-
-  var checkError = function(f, msgText, lineNum) {
-    try {
-      f();
-    } catch (e) {
-      if (! e instanceof TemplatingTools.CompileError) {
-        throw e;
-      }
-
-      if (e.line === lineNum)
-        test.ok();
-      else
-        test.fail("Error should have been on line " + lineNum + ", not " +
-                  e.line);
-      testInString(e.message, msgText);
-      return;
-    }
-    test.fail("Parse error didn't throw exception");
-  };
-
-  // returns the appropriate code to put content in the body,
-  // where content is something simple like the string "Hello"
-  // (passed in as a source string including the quotes).
-  var simpleBody = function (content) {
-    return "\nTemplate.body.addContent((function() {\n  var view = this;\n  return " + content + ";\n}));\nMeteor.startup(Template.body.renderToDocument);\n";
-  };
-
-  // arguments are quoted strings like '"hello"'
-  var simpleTemplate = function (templateName, content) {
-    // '"hello"' into '"Template.hello"'
-    var viewName = templateName.slice(0, 1) + 'Template.' + templateName.slice(1);
-
-    return '\nTemplate.__checkName(' + templateName + ');\nTemplate[' + templateName +
-      '] = new Template(' + viewName +
-      ', (function() {\n  var view = this;\n  return ' + content + ';\n}));\n';
-  };
-
-  var checkResults = function(results, expectJs, expectHead, expectBodyAttrs) {
-    test.equal(results.body, '');
-    test.equal(results.js, expectJs || '');
-    test.equal(results.head, expectHead || '');
-    test.equal(results.bodyAttrs, expectBodyAttrs || {});
-  };
-
-  function scanForTest(contents) {
-    const tags = TemplatingTools.scanHtmlForTags({
-      sourceName: "",
-      contents: contents,
-      tagNames: ["body", "head", "template"]
-    });
-
-    return TemplatingTools.compileTagsWithSpacebars(tags);
-  }
-
-  checkError(function() {
-    return scanForTest("asdf");
-  }, "Expected one of: <body>, <head>, <template>", 1);
-
-  // body all on one line
-  checkResults(
-    scanForTest("<body>Hello</body>"),
-    simpleBody('"Hello"'));
-
-  // multi-line body, contents trimmed
-  checkResults(
-    scanForTest("\n\n\n<body>\n\nHello\n\n</body>\n\n\n"),
-    simpleBody('"Hello"'));
-
-  // same as previous, but with various HTML comments
-  checkResults(
-    scanForTest("\n<!--\n\nfoo\n-->\n<!-- -->\n"+
-                      "<body>\n\nHello\n\n</body>\n\n<!----\n>\n\n"),
-    simpleBody('"Hello"'));
-
-  // head and body
-  checkResults(
-    scanForTest("<head>\n<title>Hello</title>\n</head>\n\n<body>World</body>\n\n"),
-    simpleBody('"World"'),
-    "<title>Hello</title>");
-
-  // head and body with tag whitespace
-  checkResults(
-    scanForTest("<head\n>\n<title>Hello</title>\n</head  >\n\n<body>World</body\n\n>\n\n"),
-    simpleBody('"World"'),
-    "<title>Hello</title>");
-
-  // head, body, and template
-  checkResults(
-    scanForTest("<head>\n<title>Hello</title>\n</head>\n\n<body>World</body>\n\n"+
-                      '<template name="favoritefood">\n  pizza\n</template>\n'),
-    simpleBody('"World"') + simpleTemplate('"favoritefood"', '"pizza"'),
-    "<title>Hello</title>");
-
-  // one-line template
-  checkResults(
-    scanForTest('<template name="favoritefood">pizza</template>'),
-    simpleTemplate('"favoritefood"', '"pizza"'));
-
-  // template with other attributes
-  checkResults(
-    scanForTest('<template foo="bar" name="favoritefood" baz="qux">'+
-                      'pizza</template>'),
-    simpleTemplate('"favoritefood"', '"pizza"'));
-
-  // whitespace around '=' in attributes and at end of tag
-  checkResults(
-    scanForTest('<template foo = "bar" name  ="favoritefood" baz= "qux"  >'+
-                      'pizza</template\n\n>'),
-    simpleTemplate('"favoritefood"', '"pizza"'));
-
-  // whitespace around template name
-  checkResults(
-    scanForTest('<template name=" favoritefood  ">pizza</template>'),
-    simpleTemplate('"favoritefood"', '"pizza"'));
-
-  // single quotes around template name
-  checkResults(
-    scanForTest('<template name=\'the "cool" template\'>'+
-                      'pizza</template>'),
-    simpleTemplate('"the \\"cool\\" template"', '"pizza"'));
-
-  checkResults(scanForTest('<body foo="bar">\n  Hello\n</body>'), simpleBody('"Hello"'), "", {foo: "bar"});
-
-  // error cases; exact line numbers are not critical, these just reflect
-  // the current implementation
-
-  // unclosed body (error mentions body)
-  checkError(function() {
-    return scanForTest("\n\n<body>\n  Hello\n</body");
-  }, "body", 3);
-
-  // bad open tag
-  checkError(function() {
-    return scanForTest("\n\n\n<bodyd>\n  Hello\n</body>");
-  }, "Expected one of: <body>, <head>, <template>", 4);
-  checkError(function() {
-    return scanForTest("\n\n\n\n<body foo=>\n  Hello\n</body>");
-  }, "error in tag", 5);
-
-  // unclosed tag
-  checkError(function() {
-    return scanForTest("\n<body>Hello");
-  }, "nclosed", 2);
-
-  // unnamed template
-  checkError(function() {
-    return scanForTest(
-      "\n\n<template>Hi</template>\n\n<template>Hi</template>");
-  }, "name", 3);
-
-  // helpful doctype message
-  checkError(function() {
-    return scanForTest(
-      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '+
-        '"http://www.w3.org/TR/html4/strict.dtd">'+
-        '\n\n<head>\n</head>');
-  }, "DOCTYPE", 1);
-
-  // lowercase basic doctype
-  checkError(function() {
-    return scanForTest(
-      '<!doctype html>');
-  }, "DOCTYPE", 1);
-
-  // attributes on head not supported
-  checkError(function() {
-    return scanForTest('<head foo="bar">\n  Hello\n</head>');
-  }, "<head>", 1);
-
-  // can't mismatch quotes
-  checkError(function() {
-    return scanForTest('<template name="foo\'>'+
-                             'pizza</template>');
-  }, "error in tag", 1);
-
-  // unexpected <html> at top level
-  checkError(function() {
-    return scanForTest('\n<html>\n</html>');
-  }, "Expected one of: <body>, <head>, <template>", 2);
-
-});
diff --git a/packages/templating-tools/html-scanner.js b/packages/templating-tools/html-scanner.js
deleted file mode 100644
index dc39da7b3c..0000000000
--- a/packages/templating-tools/html-scanner.js
+++ /dev/null
@@ -1,172 +0,0 @@
-TemplatingTools.scanHtmlForTags = function scanHtmlForTags(options) {
-  const scan = new HtmlScan(options);
-  return scan.getTags();
-};
-
-/**
- * Scan an HTML file for top-level tags and extract their contents. Pass them to
- * a tag handler (an object with a handleTag method)
- *
- * This is a primitive, regex-based scanner.  It scans 
- * top-level tags, which are allowed to have attributes,
- * and ignores top-level HTML comments.
- */
-class HtmlScan {
-  /**
-   * Initialize and run a scan of a single file
-   * @param  {String} sourceName The filename, used in errors only
-   * @param  {String} contents   The contents of the file
-   * @param  {String[]} tagNames An array of tag names that are accepted at the
-   * top level. If any other tag is encountered, an error is thrown.
-   */
-  constructor({
-        sourceName,
-        contents,
-        tagNames
-      }) {
-    this.sourceName = sourceName;
-    this.contents = contents;
-    this.tagNames = tagNames;
-
-    this.rest = contents;
-    this.index = 0;
-
-    this.tags = [];
-
-    tagNameRegex = this.tagNames.join("|");
-    const openTagRegex = new RegExp(`^((<(${tagNameRegex})\\b)|(<!--)|(<!DOCTYPE|{{!)|$)`, "i");
-
-    while (this.rest) {
-      // skip whitespace first (for better line numbers)
-      this.advance(this.rest.match(/^\s*/)[0].length);
-
-      const match = openTagRegex.exec(this.rest);
-
-      if (! match) {
-        this.throwCompileError(`Expected one of: <${this.tagNames.join('>, <')}>`);
-      }
-
-      const matchToken = match[1];
-      const matchTokenTagName =  match[3];
-      const matchTokenComment = match[4];
-      const matchTokenUnsupported = match[5];
-
-      const tagStartIndex = this.index;
-      this.advance(match.index + match[0].length);
-
-      if (! matchToken) {
-        break; // matched $ (end of file)
-      }
-
-      if (matchTokenComment === '<!--') {
-        // top-level HTML comment
-        const commentEnd = /--\s*>/.exec(this.rest);
-        if (! commentEnd)
-          this.throwCompileError("unclosed HTML comment in template file");
-        this.advance(commentEnd.index + commentEnd[0].length);
-        continue;
-      }
-
-      if (matchTokenUnsupported) {
-        switch (matchTokenUnsupported.toLowerCase()) {
-        case '<!doctype':
-          this.throwCompileError(
-            "Can't set DOCTYPE here.  (Meteor sets <!DOCTYPE html> for you)");
-        case '{{!':
-          this.throwCompileError(
-            "Can't use '{{! }}' outside a template.  Use '<!-- -->'.");
-        }
-
-        this.throwCompileError();
-      }
-
-      // otherwise, a <tag>
-      const tagName = matchTokenTagName.toLowerCase();
-      const tagAttribs = {}; // bare name -> value dict
-      const tagPartRegex = /^\s*((([a-zA-Z0-9:_-]+)\s*=\s*(["'])(.*?)\4)|(>))/;
-
-      // read attributes
-      let attr;
-      while ((attr = tagPartRegex.exec(this.rest))) {
-        const attrToken = attr[1];
-        const attrKey = attr[3];
-        let attrValue = attr[5];
-        this.advance(attr.index + attr[0].length);
-
-        if (attrToken === '>') {
-          break;
-        }
-
-        // XXX we don't HTML unescape the attribute value
-        // (e.g. to allow "abcd&quot;efg") or protect against
-        // collisions with methods of tagAttribs (e.g. for
-        // a property named toString)
-        attrValue = attrValue.match(/^\s*([\s\S]*?)\s*$/)[1]; // trim
-        tagAttribs[attrKey] = attrValue;
-      }
-
-      if (! attr) { // didn't end on '>'
-        this.throwCompileError("Parse error in tag");
-      }
-
-      // find </tag>
-      const end = (new RegExp('</'+tagName+'\\s*>', 'i')).exec(this.rest);
-      if (! end) {
-        this.throwCompileError("unclosed <"+tagName+">");
-      }
-
-      const tagContents = this.rest.slice(0, end.index);
-      const contentsStartIndex = this.index;
-
-      // trim the tag contents.
-      // this is a courtesy and is also relied on by some unit tests.
-      var m = tagContents.match(/^([ \t\r\n]*)([\s\S]*?)[ \t\r\n]*$/);
-      const trimmedContentsStartIndex = contentsStartIndex + m[1].length;
-      const trimmedTagContents = m[2];
-
-      const tag = {
-        tagName: tagName,
-        attribs: tagAttribs,
-        contents: trimmedTagContents,
-        contentsStartIndex: trimmedContentsStartIndex,
-        tagStartIndex: tagStartIndex,
-        fileContents: this.contents,
-        sourceName: this.sourceName
-      };
-
-      // save the tag
-      this.tags.push(tag);
-
-      // advance afterwards, so that line numbers in errors are correct
-      this.advance(end.index + end[0].length);
-    }
-  }
-
-  /**
-   * Advance the parser
-   * @param  {Number} amount The amount of characters to advance
-   */
-  advance(amount) {
-    this.rest = this.rest.substring(amount);
-    this.index += amount;
-  }
-
-  throwCompileError(msg, overrideIndex) {
-    const finalIndex = (typeof overrideIndex === 'number' ? overrideIndex : this.index);
-
-    const err = new TemplatingTools.CompileError();
-    err.message = msg || "bad formatting in template file";
-    err.file = this.sourceName;
-    err.line = this.contents.substring(0, finalIndex).split('\n').length;
-
-    throw err;
-  }
-
-  throwBodyAttrsError(msg) {
-    this.parseError(msg);
-  }
-
-  getTags() {
-    return this.tags;
-  }
-}
diff --git a/packages/templating-tools/package.js b/packages/templating-tools/package.js
deleted file mode 100644
index 3fd03d243f..0000000000
--- a/packages/templating-tools/package.js
+++ /dev/null
@@ -1,47 +0,0 @@
-Package.describe({
-  name: 'templating-tools',
-  version: '1.0.4',
-  // Brief, one-line summary of the package.
-  summary: 'Tools to scan HTML and compile tags when building a templating package',
-  // URL to the Git repository containing the source code for this package.
-  git: 'https://github.com/meteor/meteor',
-  // By default, Meteor will default to using README.md for documentation.
-  // To avoid submitting documentation, set this field to null.
-  documentation: 'README.md'
-});
-
-Package.onUse(function(api) {
-  api.use([
-    'underscore',
-    'ecmascript',
-    'spacebars-compiler',
-
-    // minifier-js is a weak dependency of spacebars-compiler; adding it here
-    // ensures that the output is minified.  (Having it as a weak dependency means
-    // that we don't ship uglify etc with built apps just because
-    // boilerplate-generator uses spacebars-compiler.)
-    // XXX maybe uglify should be applied by this plugin instead of via magic
-    // weak dependency.
-    'minifier-js'
-  ]);
-
-  api.addFiles([
-    'templating-tools.js',
-    'html-scanner.js',
-    'compile-tags-with-spacebars.js',
-    'throw-compile-error.js',
-    'code-generation.js'
-  ]);
-
-  api.export('TemplatingTools');
-});
-
-Package.onTest(function(api) {
-  api.use([
-    'tinytest',
-    'templating-tools',
-    'ecmascript'
-  ]);
-
-  api.addFiles('html-scanner-tests.js', 'server');
-});
diff --git a/packages/templating-tools/templating-tools.js b/packages/templating-tools/templating-tools.js
deleted file mode 100644
index 8d6c3db6bf..0000000000
--- a/packages/templating-tools/templating-tools.js
+++ /dev/null
@@ -1,4 +0,0 @@
-TemplatingTools = {
-  // This type of error should be thrown during compilation
-  CompileError: class CompileError {}
-};
diff --git a/packages/templating-tools/throw-compile-error.js b/packages/templating-tools/throw-compile-error.js
deleted file mode 100644
index 8bf9833251..0000000000
--- a/packages/templating-tools/throw-compile-error.js
+++ /dev/null
@@ -1,11 +0,0 @@
-TemplatingTools.throwCompileError =
-function throwCompileError(tag, message, overrideIndex) {
-  const finalIndex = (typeof overrideIndex === 'number' ?
-    overrideIndex : tag.tagStartIndex);
-
-  const err = new TemplatingTools.CompileError();
-  err.message = message || "bad formatting in template file";
-  err.file = tag.sourceName;
-  err.line = tag.fileContents.substring(0, finalIndex).split('\n').length;
-  throw err;
-}
diff --git a/packages/templating/.gitignore b/packages/templating/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/templating/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/templating/README.md b/packages/templating/README.md
deleted file mode 100644
index 6f607564d4..0000000000
--- a/packages/templating/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# templating
-
-Compiles Blaze templates defined in `.html` files. Also automatically includes Blaze on the client.
-
-This build plugin parses all of the HTML files in your app and looks for three top-level tags:
-
-- `<head>` - appended to the `head` section of your HTML
-- `<body>` - appended to the `body` section of your HTML
-- `<template name="templateName">` - compiled into a Blaze template, which can be included with `{{> templateName}} or referenced in JS code with `Template.templateName`.
-
-For more details, see the [Meteor docs about
-templating](http://docs.meteor.com/#/full/livehtmltemplates) and the Blaze
-[project page](https://www.meteor.com/blaze).
diff --git a/packages/templating/dynamic.html b/packages/templating/dynamic.html
deleted file mode 100644
index d449fd9463..0000000000
--- a/packages/templating/dynamic.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Expects the data context to have a `template` property (the name of
-the template to render) and an optional `data` property. If the `data`
-property is not specified, then the parent data context will be used
-instead. Uses the __dynamicWithDataContext template below to actually
-render the template. -->
-<template name="__dynamic">
-  {{checkContext}}
-  {{#if dataContextPresent}}
-    {{# __dynamicWithDataContext}}{{> Template.contentBlock}}{{/__dynamicWithDataContext}}
-  {{else}}
-    {{! if there was no explicit 'data' argument, use the parent context}}
-    {{# __dynamicWithDataContext template=template data=..}}{{> Template.contentBlock}}{{/__dynamicWithDataContext}}
-  {{/if}}
-</template>
-
-<!-- Expects the data context to have a `template` property (the name of
-the template to render) and a `data` property, which can be falsey. -->
-<template name="__dynamicWithDataContext">
-  {{#with chooseTemplate template}}
-    {{!-- The .. is evaluated inside {{#with ../data}} --}}
-    {{# .. ../data}}{{> Template.contentBlock}}{{/ ..}}
-  {{/with}}
-</template>
diff --git a/packages/templating/dynamic.js b/packages/templating/dynamic.js
deleted file mode 100644
index 3351254ecc..0000000000
--- a/packages/templating/dynamic.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var Template = Blaze.Template;
-
-/**
- * @isTemplate true
- * @memberOf Template
- * @function dynamic
- * @summary Choose a template to include dynamically, by name.
- * @locus Templates
- * @param {String} template The name of the template to include.
- * @param {Object} [data] Optional. The data context in which to include the
- * template.
- */
-
-Template.__dynamicWithDataContext.helpers({
-  chooseTemplate: function (name) {
-    return Blaze._getTemplate(name, function () {
-      return Template.instance();
-    });
-  }
-});
-
-Template.__dynamic.helpers({
-  dataContextPresent: function () {
-    return _.has(this, "data");
-  },
-  checkContext: function () {
-    if (! _.has(this, "template")) {
-      throw new Error("Must specify name in the 'template' argument " +
-                      "to {{> Template.dynamic}}.");
-    }
-
-    _.each(this, function (v, k) {
-      if (k !== "template" && k !== "data") {
-        throw new Error("Invalid argument to {{> Template.dynamic}}: " +
-                        k);
-      }
-    });
-  }
-});
diff --git a/packages/templating/dynamic_tests.html b/packages/templating/dynamic_tests.html
deleted file mode 100644
index d827eecc25..0000000000
--- a/packages/templating/dynamic_tests.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<template name="ui_dynamic_test">
-  {{> Template.dynamic template=templateName data=templateData}}
-</template>
-
-<template name="ui_dynamic_test_no_data">
-  {{> Template.dynamic template=templateName}}
-</template>
-
-<template name="ui_dynamic_test_inherited_data">
-  {{#with context}}
-    {{> Template.dynamic template=templateName}}
-  {{else}}
-    {{> Template.dynamic template=templateName}}
-  {{/with}}
-</template>
-
-<template name="ui_dynamic_test_sub">
-  test{{foo}}
-</template>
-
-<template name="ui_dynamic_test_contentblock">
-  {{#Template.dynamic template=templateName data=templateData}}contentBlock{{/Template.dynamic}}
-</template>
-
-<template name="ui_dynamic_test_contentblock_no_data">
-  {{# Template.dynamic template=templateName}}contentBlock{{/Template.dynamic}}
-</template>
-
-<template name="ui_dynamic_test_sub_contentblock">
-  test{{foo}}{{>Template.contentBlock}}
-</template>
-
-<template name="ui_dynamic_test_falsey_inner_context">
-  {{#with foo="bar"}}
-    {{> Template.dynamic template=templateName data=context}}
-  {{/with}}
-</template>
-
-<template name="ui_dynamic_test_bad_args0">
-  {{> Template.dynamic}}
-</template>
-
-<template name="ui_dynamic_test_bad_args1">
-  {{> Template.dynamic foo="bar"}}
-</template>
-
-<template name="ui_dynamic_test_bad_args2">
-  {{> Template.dynamic template="ui_dynamic_test_sub" foo="bar"}}
-</template>
-
-<template name="ui_dynamic_test_falsey_context">
-  {{> Template.dynamic template="ui_dynamic_test_falsey_context_sub"}}
-</template>
-
-<template name="ui_dynamic_test_falsey_context_sub">
-  {{foo}}
-</template>
-
-<template name="ui_dynamic_backcompat">
-  {{> UI.dynamic template=templateName data=templateData}}
-</template>
diff --git a/packages/templating/dynamic_tests.js b/packages/templating/dynamic_tests.js
deleted file mode 100644
index 16c25a7bab..0000000000
--- a/packages/templating/dynamic_tests.js
+++ /dev/null
@@ -1,239 +0,0 @@
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template dynamically", function (test, expect) {
-    var tmpl = Template.ui_dynamic_test;
-
-    var nameVar = new ReactiveVar;
-    var dataVar = new ReactiveVar;
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      },
-      templateData: function () {
-        return dataVar.get();
-      }
-    });
-
-    // No template chosen
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    // Choose the "ui-dynamic-test-sub" template, with no data context
-    // passed in.
-    nameVar.set("ui_dynamic_test_sub");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "test");
-
-    // Set a data context.
-    dataVar.set({ foo: "bar" });
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "testbar");
-  });
-
-// Same test as above, but the {{> Template.dynamic}} inclusion has no
-// `dataContext` argument.
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template dynamically, no data context",
-  function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_no_data;
-
-    var nameVar = new ReactiveVar;
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    nameVar.set("ui_dynamic_test_sub");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "test");
-  });
-
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template " +
-    "dynamically, data context gets inherited",
-  function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_inherited_data;
-
-    var nameVar = new ReactiveVar();
-    var dataVar = new ReactiveVar();
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      },
-      context: function () {
-        return dataVar.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    nameVar.set("ui_dynamic_test_sub");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "test");
-
-    // Set the top-level template's data context; this should be
-    // inherited by the dynamically-chosen template, since the {{>
-    // Template.dynamic}} inclusion didn't include a data argument.
-    dataVar.set({ foo: "bar" });
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "testbar");
-  }
-);
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template dynamically with contentBlock", function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_contentblock;
-
-    var nameVar = new ReactiveVar;
-    var dataVar = new ReactiveVar;
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      },
-      templateData: function () {
-        return dataVar.get();
-      }
-    });
-
-    // No template chosen
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    // Choose the "ui-dynamic-test-sub" template, with no data context
-    // passed in.
-    nameVar.set("ui_dynamic_test_sub_contentblock");
-    Tracker.flush({_throwFirstError: true});
-    test.equal(canonicalizeHtml(div.innerHTML), "testcontentBlock");
-
-    // Set a data context.
-    dataVar.set({ foo: "bar" });
-    Tracker.flush({_throwFirstError: true});
-    test.equal(canonicalizeHtml(div.innerHTML), "testbarcontentBlock");
-  });
-
-// Same test as above, but the {{> Template.dynamic}} inclusion has no
-// `dataContext` argument.
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template dynamically with contentBlock, no data context",
-  function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_contentblock_no_data;
-
-    var nameVar = new ReactiveVar;
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    nameVar.set("ui_dynamic_test_sub_contentblock");
-    Tracker.flush({_throwFirstError: true});
-    test.equal(canonicalizeHtml(div.innerHTML), "testcontentBlock");
-  });
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template " +
-    "dynamically, data context does not get inherited if " +
-    "falsey context is passed in",
-  function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_falsey_inner_context;
-
-    var nameVar = new ReactiveVar();
-    var dataVar = new ReactiveVar();
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      },
-      context: function () {
-        return dataVar.get();
-      }
-    });
-
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    nameVar.set("ui_dynamic_test_sub");
-    Tracker.flush();
-    // Even though the data context is falsey, we DON'T expect the
-    // subtemplate to inherit the data context from the parent template.
-    test.equal(canonicalizeHtml(div.innerHTML), "test");
-  }
-);
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template " +
-    "dynamically, bad arguments",
-  function (test, expect) {
-    var tmplPrefix = "ui_dynamic_test_bad_args";
-    var errors = [
-      "Must specify 'template' as an argument",
-      "Must specify 'template' as an argument",
-      "Invalid argument to {{> Template.dynamic}}"
-    ];
-
-    for (var i = 0; i < 3; i++) {
-      var tmpl = Template[tmplPrefix + i];
-      test.throws(function () {
-        Blaze._throwNextException = true;
-        var div = renderToDiv(tmpl);
-      });
-    }
-  }
-);
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - render template " +
-    "dynamically, falsey context",
-  function (test, expect) {
-    var tmpl = Template.ui_dynamic_test_falsey_context;
-    var subtmpl = Template.ui_dynamic_test_falsey_context_sub;
-
-    var subtmplContext;
-    subtmpl.helpers({foo: function () {
-      subtmplContext = this;
-    }});
-    var div = renderToDiv(tmpl);
-
-    // Because `this` can only be an object, Blaze normalizes falsey
-    // data contexts to {}.
-    test.equal(subtmplContext, {});
-  }
-);
-
-Tinytest.add(
-  "spacebars - ui-dynamic-template - back-compat", function (test, expect) {
-    var tmpl = Template.ui_dynamic_backcompat;
-
-    var nameVar = new ReactiveVar;
-    var dataVar = new ReactiveVar;
-    tmpl.helpers({
-      templateName: function () {
-        return nameVar.get();
-      },
-      templateData: function () {
-        return dataVar.get();
-      }
-    });
-
-    // No template chosen
-    var div = renderToDiv(tmpl);
-    test.equal(canonicalizeHtml(div.innerHTML), "");
-
-    // Choose the "ui-dynamic-test-sub" template, with no data context
-    // passed in.
-    nameVar.set("ui_dynamic_test_sub");
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "test");
-
-    // Set a data context.
-    dataVar.set({ foo: "bar" });
-    Tracker.flush();
-    test.equal(canonicalizeHtml(div.innerHTML), "testbar");
-  });
diff --git a/packages/templating/package.js b/packages/templating/package.js
deleted file mode 100644
index 2e23bd1c2a..0000000000
--- a/packages/templating/package.js
+++ /dev/null
@@ -1,48 +0,0 @@
-Package.describe({
-  summary: "Allows templates to be defined in .html files",
-  version: '1.2.14'
-});
-
-// Today, this package is closely intertwined with Handlebars, meaning
-// that other templating systems will need to duplicate this logic. In
-// the future, perhaps we should have the concept of a template system
-// registry and a default templating system, ideally per-package.
-
-Package.registerBuildPlugin({
-  name: "compileTemplatesBatch",
-  // minifier-js is a weak dependency of spacebars-compiler; adding it here
-  // ensures that the output is minified.  (Having it as a weak dependency means
-  // that we don't ship uglify etc with built apps just because
-  // boilerplate-generator uses spacebars-compiler.)
-  // XXX maybe uglify should be applied by this plugin instead of via magic
-  // weak dependency.
-  use: [
-    'caching-html-compiler',
-    'ecmascript',
-    'templating-tools'
-  ],
-  sources: [
-    'plugin/compile-templates.js'
-  ]
-});
-
-// This onUse describes the *runtime* implications of using this package.
-Package.onUse(function (api) {
-  // XXX would like to do the following only when the first html file
-  // is encountered
-
-  api.addFiles('templating.js', 'client');
-  api.export('Template', 'client');
-
-  api.use('underscore'); // only the subset in packages/blaze/microscore.js
-
-  api.use('isobuild:compiler-plugin@1.0.0');
-
-  // html_scanner.js emits client code that calls Meteor.startup and
-  // Blaze, so anybody using templating (eg apps) need to implicitly use
-  // 'meteor' and 'blaze'.
-  api.use(['blaze', 'spacebars']);
-  api.imply(['meteor', 'blaze', 'spacebars'], 'client');
-
-  api.addFiles(['dynamic.html', 'dynamic.js'], 'client');
-});
diff --git a/packages/templating/plugin/compile-templates.js b/packages/templating/plugin/compile-templates.js
deleted file mode 100644
index c5e992c036..0000000000
--- a/packages/templating/plugin/compile-templates.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Plugin.registerCompiler({
-  extensions: ['html'],
-  archMatching: 'web',
-  isTemplate: true
-}, () => new CachingHtmlCompiler(
-  "templating",
-  TemplatingTools.scanHtmlForTags,
-  TemplatingTools.compileTagsWithSpacebars
-));
diff --git a/packages/templating/templating.js b/packages/templating/templating.js
deleted file mode 100644
index ea835b6311..0000000000
--- a/packages/templating/templating.js
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// Packages and apps add templates on to this object.
-
-/**
- * @summary The class for defining templates
- * @class
- * @instanceName Template.myTemplate
- */
-Template = Blaze.Template;
-
-var RESERVED_TEMPLATE_NAMES = "__proto__ name".split(" ");
-
-// Check for duplicate template names and illegal names that won't work.
-Template.__checkName = function (name) {
-  // Some names can't be used for Templates. These include:
-  //  - Properties Blaze sets on the Template object.
-  //  - Properties that some browsers don't let the code to set.
-  //    These are specified in RESERVED_TEMPLATE_NAMES.
-  if (name in Template || _.contains(RESERVED_TEMPLATE_NAMES, name)) {
-    if ((Template[name] instanceof Template) && name !== "body")
-      throw new Error("There are multiple templates named '" + name + "'. Each template needs a unique name.");
-    throw new Error("This template name is reserved: " + name);
-  }
-};
-
-// XXX COMPAT WITH 0.8.3
-Template.__define__ = function (name, renderFunc) {
-  Template.__checkName(name);
-  Template[name] = new Template("Template." + name, renderFunc);
-  // Exempt packages built pre-0.9.0 from warnings about using old
-  // helper syntax, because we can.  It's not very useful to get a
-  // warning about someone else's code (like a package on Atmosphere),
-  // and this should at least put a bit of a dent in number of warnings
-  // that come from packages that haven't been updated lately.
-  Template[name]._NOWARN_OLDSTYLE_HELPERS = true;
-};
-
-// Define a template `Template.body` that renders its
-// `contentRenderFuncs`.  `<body>` tags (of which there may be
-// multiple) will have their contents added to it.
-
-/**
- * @summary The [template object](#templates_api) representing your `<body>`
- * tag.
- * @locus Client
- */
-Template.body = new Template('body', function () {
-  var view = this;
-  return _.map(Template.body.contentRenderFuncs, function (func) {
-    return func.apply(view);
-  });
-});
-Template.body.contentRenderFuncs = []; // array of Blaze.Views
-Template.body.view = null;
-
-Template.body.addContent = function (renderFunc) {
-  Template.body.contentRenderFuncs.push(renderFunc);
-};
-
-// This function does not use `this` and so it may be called
-// as `Meteor.startup(Template.body.renderIntoDocument)`.
-Template.body.renderToDocument = function () {
-  // Only do it once.
-  if (Template.body.view)
-    return;
-
-  var view = Blaze.render(Template.body, document.body);
-  Template.body.view = view;
-};
-
-// XXX COMPAT WITH 0.9.0
-UI.body = Template.body;
-
-// XXX COMPAT WITH 0.9.0
-// (<body> tags in packages built with 0.9.0)
-Template.__body__ = Template.body;
-Template.__body__.__contentParts = Template.body.contentViews;
-Template.__body__.__instantiate = Template.body.renderToDocument;

From 232f6d04b9a588d24ec1af7a8e31be5d9985cd82 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 9 Aug 2016 15:02:55 +1000
Subject: [PATCH 144/688] Add version constraints to `test-in-browser` blaze
 packages

Otherwise version gravity ends up putting us on super old versions.

I'm not sure what the "correct" constraint is here. This may be overly
restrictive, but I suspect choosing the versions from the last release
before making this change will end up being the sensible choice.
---
 packages/test-in-browser/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index c8ad392660..a62e160ed7 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -15,7 +15,7 @@ Package.onUse(function (api) {
   api.use('reload');
   api.use('jquery');
 
-  api.use(['webapp', 'blaze', 'templating', 'spacebars',
+  api.use(['webapp', 'blaze@2.1.8', 'templating@1.2.13', 'spacebars@1.0.12',
            'ddp', 'tracker'], 'client');
 
   api.addFiles('diff_match_patch_uncompressed.js', 'client');

From 1b48f1dcd778a5b12b76977705d25379e4e3a4bf Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Tue, 9 Aug 2016 15:13:44 +1000
Subject: [PATCH 145/688] Add constraints to blaze dependencies in core
 packages

---
 packages/accounts-ui-unstyled/package.js | 2 +-
 packages/facebook/package.js             | 2 +-
 packages/facts/package.js                | 2 +-
 packages/github/package.js               | 2 +-
 packages/google/package.js               | 2 +-
 packages/meetup/package.js               | 2 +-
 packages/meteor-developer/package.js     | 2 +-
 packages/spiderable/package.js           | 4 ++--
 packages/twitter/package.js              | 2 +-
 packages/weibo/package.js                | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 6ee319ea71..c3717d39e7 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -5,7 +5,7 @@ Package.describe({
 
 Package.onUse(function (api) {
   api.use(['tracker', 'service-configuration', 'accounts-base',
-           'underscore', 'templating', 'session', 'jquery'], 'client');
+           'underscore', 'templating@1.2.13', 'session', 'jquery'], 'client');
   // Export Accounts (etc) to packages using this one.
   api.imply('accounts-base', ['client', 'server']);
 
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index f7883bb59e..6201d0d559 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -7,7 +7,7 @@ Package.onUse(function(api) {
   api.use('oauth2', ['client', 'server']);
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
-  api.use('templating', 'client');
+  api.use('templating@1.2.13', 'client');
   api.use('underscore', 'server');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 721cbe8af4..c5321745a6 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -5,7 +5,7 @@ Package.describe({
 
 Package.onUse(function (api) {
   api.use(['underscore'], ['client', 'server']);
-  api.use(['templating', 'mongo', 'ddp'], ['client']);
+  api.use(['templating@1.2.13', 'mongo', 'ddp'], ['client']);
 
   // Detect whether autopublish is used.
   api.use('autopublish', 'server', {weak: true});
diff --git a/packages/github/package.js b/packages/github/package.js
index ed9b6240fe..bfca6a7083 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -8,7 +8,7 @@ Package.onUse(function(api) {
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
   api.use('underscore', 'client');
-  api.use('templating', 'client');
+  api.use('templating@1.2.13', 'client');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
 
diff --git a/packages/google/package.js b/packages/google/package.js
index 9ecc80a3c4..79218ef129 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -8,7 +8,7 @@ Package.onUse(function(api) {
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
   api.use(['underscore', 'service-configuration'], ['client', 'server']);
-  api.use(['random', 'templating'], 'client');
+  api.use(['random', 'templating@1.2.13'], 'client');
 
   api.export('Google');
 
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 196c110035..4c3058c8c4 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -7,7 +7,7 @@ Package.onUse(function(api) {
   api.use('oauth2', ['client', 'server']);
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
-  api.use('templating', 'client');
+  api.use('templating@1.2.13', 'client');
   api.use('underscore', 'client');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 50498cc9ad..1283d699f7 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -8,7 +8,7 @@ Package.onUse(function (api) {
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
   api.use(['underscore', 'service-configuration'], ['client', 'server']);
-  api.use(['random', 'templating'], 'client');
+  api.use(['random', 'templating@1.2.13'], 'client');
 
   api.export('MeteorDeveloperAccounts');
 
diff --git a/packages/spiderable/package.js b/packages/spiderable/package.js
index 7c481552d6..9bec266898 100644
--- a/packages/spiderable/package.js
+++ b/packages/spiderable/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   summary: "Makes the application crawlable to web spiders",
-  version: "1.0.13"
+  version: "1.0.14-release-testing.0"
 });
 
 Package.onUse(function (api) {
   api.use('webapp', 'server');
   api.use(['ddp', 'tracker'], 'client');
   api.use(['callback-hook'], 'client');
-  api.use(['templating'], 'client');
+  api.use(['templating@1.2.13'], 'client');
   api.use(['underscore'], ['client', 'server']);
 
   api.export('Spiderable');
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 4acf8c0b2e..27fc45b59f 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -5,7 +5,7 @@ Package.describe({
 
 Package.onUse(function(api) {
   api.use('http', ['client', 'server']);
-  api.use('templating', 'client');
+  api.use('templating@1.2.13', 'client');
   api.use('oauth1', ['client', 'server']);
   api.use('oauth', ['client', 'server']);
   api.use('random', 'client');
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 82e7673096..058fa77d84 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -7,7 +7,7 @@ Package.onUse(function(api) {
   api.use('oauth2', ['client', 'server']);
   api.use('oauth', ['client', 'server']);
   api.use('http', ['server']);
-  api.use('templating', 'client');
+  api.use('templating@1.2.13', 'client');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
 

From f69f6c091af1c093ab289d3f70d89294f87e2d40 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 10 Aug 2016 14:41:14 +1000
Subject: [PATCH 146/688] Added a minimum version for blaze to the skel

---
 tools/static-assets/skel/.meteor/packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel/.meteor/packages b/tools/static-assets/skel/.meteor/packages
index 1615051104..d527eb8ebb 100644
--- a/tools/static-assets/skel/.meteor/packages
+++ b/tools/static-assets/skel/.meteor/packages
@@ -7,7 +7,7 @@
 meteor-base             # Packages every Meteor app needs to have
 mobile-experience       # Packages for a great mobile UX
 mongo                   # The database Meteor supports right now
-blaze-html-templates    # Compile .html files into Meteor Blaze views
+blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
 reactive-var            # Reactive variable for tracker
 jquery                  # Helpful client-side library
 tracker                 # Meteor's client-side reactive programming library

From f01653e69050743f4c4c8e9575259242eff14c38 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 11 Aug 2016 12:58:51 +1000
Subject: [PATCH 147/688] Use submodules for isopacket loading

---
 .gitmodules                   | 3 +++
 packages-for-isopackets/blaze | 1 +
 tools/tool-env/isopackets.js  | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 packages-for-isopackets/blaze

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..185d643929
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages-for-isopackets/blaze"]
+	path = packages-for-isopackets/blaze
+	url = https://github.com/meteor/blaze.git
diff --git a/packages-for-isopackets/blaze b/packages-for-isopackets/blaze
new file mode 160000
index 0000000000..3ddcbd2e6b
--- /dev/null
+++ b/packages-for-isopackets/blaze
@@ -0,0 +1 @@
+Subproject commit 3ddcbd2e6b13e619e3596535c841d38a03d4398b
diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index 6bdb129ff4..b4c2f72484 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -227,8 +227,10 @@ var newIsopacketBuildingCatalog = function () {
       // expect them to all build, and we're fine with dying if they don't
       // (there's no worries about needing to springboard).
       isopacketCatalog.initialize({
-        localPackageSearchDirs: [files.pathJoin(
-          files.getCurrentToolsDir(), 'packages')],
+        localPackageSearchDirs: [
+          files.pathJoin(files.getCurrentToolsDir(), 'packages'),
+          files.pathJoin(files.getCurrentToolsDir(), 'packages-for-isopackets', 'blaze', 'packages')
+        ],
         buildingIsopackets: true
       });
     });

From d695087c92d75ba0211a4b0fad021c257c9e9d11 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 12 Aug 2016 12:47:47 +1000
Subject: [PATCH 148/688] We'll need to clone submodules too now

---
 README.md                                    | 2 +-
 circle.yml                                   | 4 ++++
 scripts/admin/publish-meteor-tool-on-arch.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a34d26f161..a80c0c0ec9 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ If you want to run on the bleeding edge, or help develop Meteor, you
 can run Meteor directly from a git checkout.
 
 ```bash
-git clone git://github.com/meteor/meteor.git
+git clone --recursive git://github.com/meteor/meteor.git
 cd meteor
 ```
 
diff --git a/circle.yml b/circle.yml
index f8fd56b333..ba6ee70039 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,7 @@
+checkout:
+  post:
+    - git submodule update --init
+
 dependencies:
   pre:
     # https://github.com/meteor/docs/blob/version-NEXT/long-form/file-change-watcher-efficiency.md
diff --git a/scripts/admin/publish-meteor-tool-on-arch.sh b/scripts/admin/publish-meteor-tool-on-arch.sh
index 6b39baa1d8..8fc77609e6 100755
--- a/scripts/admin/publish-meteor-tool-on-arch.sh
+++ b/scripts/admin/publish-meteor-tool-on-arch.sh
@@ -52,7 +52,7 @@ set -u
 if [ -d meteor ]; then
   rm -rf meteor
 fi
-git clone https://github.com/meteor/meteor.git
+git clone --recursive https://github.com/meteor/meteor.git
 cd meteor
 git fetch --tags
 END

From edf40c430b5fa0e286ab3901e3d21ab102d11a71 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 25 Aug 2016 13:24:40 +1000
Subject: [PATCH 149/688] Use isopacket packages for self-test also

---
 tools/tool-env/isopackets.js   | 3 ++-
 tools/tool-testing/selftest.js | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index b4c2f72484..74a2fd400a 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -229,7 +229,8 @@ var newIsopacketBuildingCatalog = function () {
       isopacketCatalog.initialize({
         localPackageSearchDirs: [
           files.pathJoin(files.getCurrentToolsDir(), 'packages'),
-          files.pathJoin(files.getCurrentToolsDir(), 'packages-for-isopackets', 'blaze', 'packages')
+          files.pathJoin(files.getCurrentToolsDir(),
+            'packages-for-isopackets', 'blaze', 'packages')
         ],
         buildingIsopackets: true
       });
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index f8a0b732d0..2bf5915565 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -215,8 +215,11 @@ var newSelfTestCatalog = function () {
       // build, and we're fine with dying if they don't (there's no worries
       // about needing to springboard).
       selfTestCatalog.initialize({
-        localPackageSearchDirs: [files.pathJoin(
-          files.getCurrentToolsDir(), 'packages')]
+        localPackageSearchDirs: [
+          files.pathJoin(files.getCurrentToolsDir(), 'packages'),
+          files.pathJoin(files.getCurrentToolsDir(),
+            'packages-for-isopackets', 'blaze', 'packages')
+        ],
       });
     });
   if (messages.hasMessages()) {

From 2778305f3d963a6abfd7b536ed5be849c9efedcc Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 25 Aug 2016 14:12:17 +1000
Subject: [PATCH 150/688] Add constraints to boilerplate-generator

I guess it didn't need it earlier for some reason to do with
isopackets, but it does cause self-test tests to fail.
Let's see how we go now
---
 packages/boilerplate-generator/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 9b4e1e08f1..a3b6310242 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -4,8 +4,8 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
-  api.use(['underscore',  'spacebars-compiler',
-           'spacebars', 'htmljs', 'ui'], 'server');
+  api.use(['underscore',  'spacebars-compiler@1.0.12',
+           'spacebars@1.0.12', 'htmljs@1.0.10', 'ui'], 'server');
   api.addFiles(['boilerplate-generator.js'], 'server');
   api.export(['Boilerplate'], 'server');
   // These are spacebars templates, but we process them manually with the

From 025e8dd4a693834ca4a4d0385f650b2c9273a3d3 Mon Sep 17 00:00:00 2001
From: Matthijs Brobbel <mbrobbel@users.noreply.github.com>
Date: Thu, 25 Aug 2016 07:59:31 +0200
Subject: [PATCH 151/688] Fix URL to issue in History.md

---
 History.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 16781eba18..8e3efaaf71 100644
--- a/History.md
+++ b/History.md
@@ -4,7 +4,7 @@
 
 * Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in
   reconnection logic, leading to some `update` and `remove` commands being
-  treated as `insert`s. [#7594](https://github.com/meteor/meteor/issue/7594)
+  treated as `insert`s. [#7594](https://github.com/meteor/meteor/issues/7594)
 
 ## v1.4.1
 

From 4dce9cf5bb1e9e6f25647d3da344c6451a23806c Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 25 Aug 2016 16:20:16 +1000
Subject: [PATCH 152/688] Use blaze w/ consistent versions

---
 packages-for-isopackets/blaze | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages-for-isopackets/blaze b/packages-for-isopackets/blaze
index 3ddcbd2e6b..7477ce0ecf 160000
--- a/packages-for-isopackets/blaze
+++ b/packages-for-isopackets/blaze
@@ -1 +1 @@
-Subproject commit 3ddcbd2e6b13e619e3596535c841d38a03d4398b
+Subproject commit 7477ce0ecf182c1e0f386e51d0829a92cecf86ac

From e2debe8df8feffb1895bcfc561540efe83014e11 Mon Sep 17 00:00:00 2001
From: Dirk Stolle <striezel-dev@web.de>
Date: Fri, 26 Aug 2016 16:51:37 +0200
Subject: [PATCH 153/688] fix version number of Node MongoDB driver in
 History.md

It is actually version 2.2.8, not 2.2.7, which is used in
Meteor 1.4.1.1.
---
 History.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 16781eba18..7a3123efa4 100644
--- a/History.md
+++ b/History.md
@@ -2,7 +2,7 @@
 
 ## v1.4.1.1
 
-* Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in
+* Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in
   reconnection logic, leading to some `update` and `remove` commands being
   treated as `insert`s. [#7594](https://github.com/meteor/meteor/issue/7594)
 

From ddf7970e81d1770ff30526df69d4741ed12ef521 Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Sat, 27 Aug 2016 19:10:18 +0800
Subject: [PATCH 154/688] Oh, wrong place for the changelog entry!

---
 History.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 16781eba18..4b3f86553e 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v.NEXT
 
+* Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
+
 ## v1.4.1.1
 
 * Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in
@@ -396,7 +398,6 @@
 * Insert a `Date` header into emails by default: https://github.com/meteor/meteor/pull/6916/files
 
 * `meteor test` now supports setting the bind address using `--port IP:PORT` the same as `meteor run` [PR #6964](https://github.com/meteor/meteor/pull/6964) [Issue #6961](https://github.com/meteor/meteor/issues/6961)
-* Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
 
 * `Meteor.apply` now takes a `noRetry` option to opt-out of automatically retrying non-idempotent methods on connection blips: [PR #6180](https://github.com/meteor/meteor/pull/6180)
 

From 74cf7b3b6e6329d2d3b37dd12d50cf11bb93ec5d Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Mon, 29 Aug 2016 11:38:21 +1000
Subject: [PATCH 155/688] Not sure why these weird version numbers were in
 there

Previously didn't cause a problem because `static-html` was a core pkg
---
 .../apps/compiler-plugin-static-html-error/.meteor/versions     | 2 +-
 tools/tests/apps/compiler-plugin-static-html/.meteor/versions   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions
index 991f343178..8e4831fde0 100644
--- a/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions
+++ b/tools/tests/apps/compiler-plugin-static-html-error/.meteor/versions
@@ -42,7 +42,7 @@ retry@1.0.4-plugins.0
 routepolicy@1.0.6-plugins.0
 spacebars@1.0.7-plugins.0
 spacebars-compiler@1.0.7-plugins.1
-static-html@0.0.1
+static-html@1.0.12
 templating@1.1.2-plugins.1
 templating-tools@0.0.1
 tracker@1.0.8-plugins.0
diff --git a/tools/tests/apps/compiler-plugin-static-html/.meteor/versions b/tools/tests/apps/compiler-plugin-static-html/.meteor/versions
index 991f343178..8e4831fde0 100644
--- a/tools/tests/apps/compiler-plugin-static-html/.meteor/versions
+++ b/tools/tests/apps/compiler-plugin-static-html/.meteor/versions
@@ -42,7 +42,7 @@ retry@1.0.4-plugins.0
 routepolicy@1.0.6-plugins.0
 spacebars@1.0.7-plugins.0
 spacebars-compiler@1.0.7-plugins.1
-static-html@0.0.1
+static-html@1.0.12
 templating@1.1.2-plugins.1
 templating-tools@0.0.1
 tracker@1.0.8-plugins.0

From 149f0f7eb1e6666ace12b63965d904cef03a1605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pradel=20Le=CC=81o?= <pradel.leo@gmail.com>
Date: Wed, 10 Aug 2016 13:43:17 +0200
Subject: [PATCH 156/688] normalise

---
 packages/caching-compiler/README.md   | 3 ++-
 packages/ecmascript-runtime/README.md | 3 ++-
 packages/ecmascript/README.md         | 2 +-
 packages/modules/README.md            | 5 +++--
 packages/promise/README.md            | 4 +++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/caching-compiler/README.md b/packages/caching-compiler/README.md
index 222c8c2d99..64fac0945d 100644
--- a/packages/caching-compiler/README.md
+++ b/packages/caching-compiler/README.md
@@ -1,5 +1,6 @@
-# caching-compiler: caching superclasses for Plugin.registerCompiler
+# caching-compiler
 
+Caching superclasses for Plugin.registerCompiler.
 CachingCompiler and MultiFileCachingCompiler are classes designed to be used
 with Plugin.registerCompiler. They implement in-memory and on-disk caches for
 the files that they process.
diff --git a/packages/ecmascript-runtime/README.md b/packages/ecmascript-runtime/README.md
index 3a44495c24..430df97268 100644
--- a/packages/ecmascript-runtime/README.md
+++ b/packages/ecmascript-runtime/README.md
@@ -1,3 +1,4 @@
-# ecmascript-runtime [![Build Status](https://travis-ci.org/meteor/ecmascript-runtime.svg?branch=master)](https://travis-ci.org/meteor/ecmascript-runtime)
+# ecmascript-runtime
 
+[![Build Status](https://travis-ci.org/meteor/ecmascript-runtime.svg?branch=master)](https://travis-ci.org/meteor/ecmascript-runtime)
 Polyfills for new ECMAScript 2015 APIs like Map and Set
diff --git a/packages/ecmascript/README.md b/packages/ecmascript/README.md
index 38f3903b4b..de72899325 100644
--- a/packages/ecmascript/README.md
+++ b/packages/ecmascript/README.md
@@ -1,4 +1,4 @@
-# [ecmascript](https://github.com/meteor/meteor/tree/devel/packages/ecmascript)
+# ecmascript
 
 This package lets you use new JavaScript language features that are part
 of the [ECMAScript 2015
diff --git a/packages/modules/README.md b/packages/modules/README.md
index 38574b50a8..f5f8633155 100644
--- a/packages/modules/README.md
+++ b/packages/modules/README.md
@@ -1,5 +1,6 @@
-# Using JavaScript modules in Meteor
+# modules
 
+Using JavaScript modules in Meteor
 ES2015 module support for Meteor
 
-Read more at http://docs.meteor.com/#/full/modules
\ No newline at end of file
+Read more at http://docs.meteor.com/#/full/modules
diff --git a/packages/promise/README.md b/packages/promise/README.md
index 8e5f62904d..1cb967a272 100644
--- a/packages/promise/README.md
+++ b/packages/promise/README.md
@@ -1,4 +1,6 @@
-# promise [![Build Status](https://travis-ci.org/meteor/promise.svg)](https://travis-ci.org/meteor/promise)
+# promise
+
+[![Build Status](https://travis-ci.org/meteor/promise.svg)](https://travis-ci.org/meteor/promise)
 ECMAScript 2015 Promise polyfill with Fiber support
 
 The static methods `Promise.async` and `Promise.await` implement the

From 95dca1676ea20e7950fa549285521a9d569e5b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pradel=20Le=CC=81o?= <pradel.leo@gmail.com>
Date: Wed, 10 Aug 2016 13:44:31 +0200
Subject: [PATCH 157/688] Add released and development links

---
 packages/accounts-base/README.md                     | 2 ++
 packages/accounts-facebook/README.md                 | 2 ++
 packages/accounts-github/README.md                   | 2 ++
 packages/accounts-google/README.md                   | 2 ++
 packages/accounts-meetup/README.md                   | 2 ++
 packages/accounts-meteor-developer/README.md         | 2 ++
 packages/accounts-oauth/README.md                    | 2 ++
 packages/accounts-password/README.md                 | 2 ++
 packages/accounts-twitter/README.md                  | 2 ++
 packages/accounts-ui-unstyled/README.md              | 2 ++
 packages/accounts-ui/README.md                       | 2 ++
 packages/accounts-weibo/README.md                    | 2 ++
 packages/allow-deny/README.md                        | 4 ++++
 packages/appcache/README.md                          | 2 ++
 packages/audit-argument-checks/README.md             | 2 ++
 packages/autopublish/README.md                       | 2 ++
 packages/autoupdate/README.md                        | 2 ++
 packages/babel-compiler/README.md                    | 4 ++++
 packages/babel-runtime/README.md                     | 2 ++
 packages/base64/README.md                            | 4 ++++
 packages/binary-heap/README.md                       | 4 ++++
 packages/boilerplate-generator/README.md             | 4 ++++
 packages/browser-policy-common/README.md             | 2 ++
 packages/browser-policy-content/README.md            | 2 ++
 packages/browser-policy-framing/README.md            | 2 ++
 packages/browser-policy/README.md                    | 2 ++
 packages/caching-compiler/README.md                  | 2 ++
 packages/callback-hook/README.md                     | 4 ++++
 packages/check/README.md                             | 2 ++
 packages/code-prettify/README.md                     | 4 ++++
 packages/coffeescript-test-helper/README.md          | 4 ++++
 packages/coffeescript/README.md                      | 2 ++
 packages/constraint-solver/README.md                 | 2 ++
 packages/crosswalk/README.md                         | 4 ++++
 packages/ddp-client/README.md                        | 4 ++++
 packages/ddp-common/README.md                        | 4 ++++
 packages/ddp-rate-limiter/README.md                  | 4 ++++
 packages/ddp-server/README.md                        | 4 ++++
 packages/ddp/README.md                               | 2 ++
 packages/deps/README.md                              | 4 ++++
 packages/diff-sequence/README.md                     | 4 ++++
 packages/disable-oplog/README.md                     | 4 ++++
 packages/ecmascript-runtime/README.md                | 2 ++
 packages/ecmascript/README.md                        | 2 ++
 packages/ejson/README.md                             | 2 ++
 packages/email/README.md                             | 2 ++
 packages/es5-shim/README.md                          | 2 ++
 packages/facebook/README.md                          | 2 ++
 packages/facts/README.md                             | 4 ++++
 packages/fastclick/README.md                         | 2 ++
 packages/force-ssl/README.md                         | 2 ++
 packages/geojson-utils/README.md                     | 4 ++++
 packages/github/README.md                            | 2 ++
 packages/google/README.md                            | 2 ++
 packages/handlebars/README.md                        | 4 ++++
 packages/hot-code-push/README.md                     | 2 ++
 packages/http/README.md                              | 2 ++
 packages/id-map/README.md                            | 4 ++++
 packages/insecure/README.md                          | 2 ++
 packages/jquery-waypoints/README.md                  | 2 ++
 packages/jquery/README.md                            | 2 ++
 packages/jshint/README.md                            | 4 ++++
 packages/jsparse/README.md                           | 4 ++++
 packages/launch-screen/README.md                     | 2 ++
 packages/less/README.md                              | 2 ++
 packages/livedata/README.md                          | 4 ++++
 packages/localstorage/README.md                      | 4 ++++
 packages/logging/README.md                           | 4 ++++
 packages/logic-solver/README.md                      | 2 ++
 packages/markdown/README.md                          | 4 ++++
 packages/meetup/README.md                            | 2 ++
 packages/meteor-base/README.md                       | 2 ++
 packages/meteor-developer/README.md                  | 2 ++
 packages/meteor-platform/README.md                   | 2 ++
 packages/meteor-tool/README.md                       | 2 ++
 packages/meteor/README.md                            | 4 ++++
 packages/meyerweb-reset/README.md                    | 4 ++++
 packages/minifier-css/README.md                      | 4 ++++
 packages/minifier-js/README.md                       | 4 ++++
 packages/minimongo/README.md                         | 2 ++
 packages/mobile-experience/README.md                 | 2 ++
 packages/mobile-status-bar/README.md                 | 2 ++
 packages/modules-runtime/README.md                   | 2 ++
 packages/mongo-id/README.md                          | 4 ++++
 packages/mongo-livedata/README.md                    | 4 ++++
 packages/mongo/README.md                             | 2 ++
 packages/npm-bcrypt/README.md                        | 4 ++++
 packages/npm-mongo/README.md                         | 4 ++++
 packages/oauth-encryption/README.md                  | 2 ++
 packages/oauth/README.md                             | 2 ++
 packages/oauth1/README.md                            | 2 ++
 packages/oauth2/README.md                            | 2 ++
 packages/observe-sequence/README.md                  | 4 ++++
 packages/ordered-dict/README.md                      | 4 ++++
 packages/package-stats-opt-out/README.md             | 2 ++
 packages/package-version-parser/README.md            | 4 ++++
 packages/preserve-inputs/README.md                   | 4 ++++
 packages/promise/README.md                           | 2 ++
 packages/random/README.md                            | 2 ++
 packages/rate-limit/README.md                        | 2 ++
 packages/reactive-dict/README.md                     | 2 ++
 packages/reactive-var/README.md                      | 2 ++
 packages/reload-safetybelt/README.md                 | 4 ++++
 packages/reload/README.md                            | 2 ++
 packages/retry/README.md                             | 4 ++++
 packages/routepolicy/README.md                       | 2 ++
 packages/service-configuration/README.md             | 2 ++
 packages/session/README.md                           | 2 ++
 packages/sha/README.md                               | 4 ++++
 packages/showdown/README.md                          | 4 ++++
 packages/spiderable/README.md                        | 2 ++
 packages/srp/README.md                               | 4 ++++
 packages/standard-app-packages/README.md             | 4 ++++
 packages/standard-minifier-css/README.md             | 4 ++++
 packages/standard-minifier-js/README.md              | 4 ++++
 packages/standard-minifiers/README.md                | 4 ++++
 packages/startup/README.md                           | 4 ++++
 packages/stylus/README.md                            | 2 ++
 packages/test-helpers/README.md                      | 4 ++++
 packages/test-in-browser/README.md                   | 4 ++++
 packages/test-in-console/README.md                   | 4 ++++
 packages/test-server-tests-in-console-once/README.md | 4 ++++
 packages/tinytest-harness/README.md                  | 4 ++++
 packages/tinytest/README.md                          | 2 ++
 packages/tracker/README.md                           | 2 ++
 packages/twitter/README.md                           | 2 ++
 packages/ui/README.md                                | 4 ++++
 packages/underscore-tests/README.md                  | 4 ++++
 packages/underscore/README.md                        | 2 ++
 packages/url/README.md                               | 4 ++++
 packages/webapp-hashing/README.md                    | 2 ++
 packages/webapp/README.md                            | 2 ++
 packages/weibo/README.md                             | 2 ++
 packages/xmlbuilder/README.md                        | 4 ++++
 134 files changed, 382 insertions(+)
 create mode 100644 packages/crosswalk/README.md
 create mode 100644 packages/ddp-client/README.md
 create mode 100644 packages/ddp-common/README.md
 create mode 100644 packages/ddp-server/README.md
 create mode 100644 packages/diff-sequence/README.md
 create mode 100644 packages/mongo-id/README.md
 create mode 100644 packages/npm-bcrypt/README.md
 create mode 100644 packages/npm-mongo/README.md
 create mode 100644 packages/ordered-dict/README.md
 create mode 100644 packages/test-in-browser/README.md

diff --git a/packages/accounts-base/README.md b/packages/accounts-base/README.md
index c3cfa43e25..1a94a410ef 100644
--- a/packages/accounts-base/README.md
+++ b/packages/accounts-base/README.md
@@ -1,4 +1,6 @@
 # accounts-base
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-base) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-base)
+***
 
 Meteor's user account system. This package implements the basic functions necessary for user accounts and lets other packages register login services. Some of these services are in the following packages:
 
diff --git a/packages/accounts-facebook/README.md b/packages/accounts-facebook/README.md
index 67c49e430c..b4b54902a2 100644
--- a/packages/accounts-facebook/README.md
+++ b/packages/accounts-facebook/README.md
@@ -1,3 +1,5 @@
 # accounts-facebook
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-facebook)
+***
 
 A login service for Facebook. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/accounts-github/README.md b/packages/accounts-github/README.md
index fb1e200ab9..1e8d550aa1 100644
--- a/packages/accounts-github/README.md
+++ b/packages/accounts-github/README.md
@@ -1,3 +1,5 @@
 # accounts-github
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-github) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-github)
+***
 
 A login service for GitHub. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/accounts-google/README.md b/packages/accounts-google/README.md
index 8976bfcc2d..a7821adbe2 100644
--- a/packages/accounts-google/README.md
+++ b/packages/accounts-google/README.md
@@ -1,3 +1,5 @@
 # accounts-google
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-google) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-google)
+***
 
 A login service for Google. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/accounts-meetup/README.md b/packages/accounts-meetup/README.md
index 8b4928d31c..4a8c87f201 100644
--- a/packages/accounts-meetup/README.md
+++ b/packages/accounts-meetup/README.md
@@ -1,3 +1,5 @@
 # accounts-meetup
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-meetup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-meetup)
+***
 
 A login service for Meetup. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/accounts-meteor-developer/README.md b/packages/accounts-meteor-developer/README.md
index 1f01e02e97..a49afa5eb6 100644
--- a/packages/accounts-meteor-developer/README.md
+++ b/packages/accounts-meteor-developer/README.md
@@ -1,4 +1,6 @@
 # accounts-meteor-developer
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-meteor-developer) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-meteor-developer)
+***
 
 A login service for Meteor developer accounts. See the project page on
 [Meteor Accounts](https://www.meteor.com/accounts) and Meteor [Developer
diff --git a/packages/accounts-oauth/README.md b/packages/accounts-oauth/README.md
index 7c90af10b9..6cc54cb069 100644
--- a/packages/accounts-oauth/README.md
+++ b/packages/accounts-oauth/README.md
@@ -1,3 +1,5 @@
 # accounts-oauth
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-oauth) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-oauth)
+***
 
 Common functionality for OAuth-based login services. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/accounts-password/README.md b/packages/accounts-password/README.md
index dd0af41f38..9c1d88e4a0 100644
--- a/packages/accounts-password/README.md
+++ b/packages/accounts-password/README.md
@@ -1,3 +1,5 @@
 # accounts-password
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-password) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-password)
+***
 
 A login service that enables secure password-based login. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
diff --git a/packages/accounts-twitter/README.md b/packages/accounts-twitter/README.md
index cd8c70e11c..3f8ac0cdc5 100644
--- a/packages/accounts-twitter/README.md
+++ b/packages/accounts-twitter/README.md
@@ -1,3 +1,5 @@
 # accounts-twitter
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-twitter) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-twitter)
+***
 
 A login service for Twitter. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
diff --git a/packages/accounts-ui-unstyled/README.md b/packages/accounts-ui-unstyled/README.md
index afefda9352..e5f2dec21d 100644
--- a/packages/accounts-ui-unstyled/README.md
+++ b/packages/accounts-ui-unstyled/README.md
@@ -1,4 +1,6 @@
 # accounts-ui-unstyled
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-ui-unstyled) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-ui-unstyled)
+***
 
 A version of `accounts-ui` without the CSS, so that you can add your
 own styling. See the [`accounts-ui`
diff --git a/packages/accounts-ui/README.md b/packages/accounts-ui/README.md
index fd90096d81..95bf5d63c8 100644
--- a/packages/accounts-ui/README.md
+++ b/packages/accounts-ui/README.md
@@ -1,4 +1,6 @@
 # accounts-ui
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-ui) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-ui)
+***
 
 A turn-key user interface for Meteor Accounts.
 
diff --git a/packages/accounts-weibo/README.md b/packages/accounts-weibo/README.md
index 217e5ce76a..8ff27cd47f 100644
--- a/packages/accounts-weibo/README.md
+++ b/packages/accounts-weibo/README.md
@@ -1,3 +1,5 @@
 # accounts-weibo
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/accounts-weibo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/accounts-weibo)
+***
 
 A login service for Weibo. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details.
\ No newline at end of file
diff --git a/packages/allow-deny/README.md b/packages/allow-deny/README.md
index e69de29bb2..6783b449d6 100644
--- a/packages/allow-deny/README.md
+++ b/packages/allow-deny/README.md
@@ -0,0 +1,4 @@
+# allow-deny
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/allow-deny) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/allow-deny)
+***
+
diff --git a/packages/appcache/README.md b/packages/appcache/README.md
index 342db9ef40..e74d791bff 100644
--- a/packages/appcache/README.md
+++ b/packages/appcache/README.md
@@ -1,4 +1,6 @@
 # appcache
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/appcache) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/appcache)
+***
 
 The `appcache` package, part of
 [Webapp](https://www.meteor.com/webapp), stores the static parts of a
diff --git a/packages/audit-argument-checks/README.md b/packages/audit-argument-checks/README.md
index e26fc2ada7..b5b9fefb0c 100644
--- a/packages/audit-argument-checks/README.md
+++ b/packages/audit-argument-checks/README.md
@@ -1,3 +1,5 @@
 # Audit-Argument-Checks
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/audit-argument-checks) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/audit-argument-checks)
+***
 
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/autopublish/README.md b/packages/autopublish/README.md
index 0dc6c7afa4..d26a14f8e1 100644
--- a/packages/autopublish/README.md
+++ b/packages/autopublish/README.md
@@ -1,4 +1,6 @@
 # autopublish
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/autopublish) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/autopublish)
+***
 
 Publish all server collections to the client. This package is useful for prototyping an app without worrying about which clients have access to certain data, but should be removed as soon as the app needs to restrict which data is seen by the client.
 
diff --git a/packages/autoupdate/README.md b/packages/autoupdate/README.md
index 87e4354676..26b7c0c2a4 100644
--- a/packages/autoupdate/README.md
+++ b/packages/autoupdate/README.md
@@ -1,4 +1,6 @@
 # autoupdate
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/autoupdate) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/autoupdate)
+***
 
 This package is the heart of Meteor's Hot Code Push functionality. It has a
 client component and a server component component. The client component uses a
diff --git a/packages/babel-compiler/README.md b/packages/babel-compiler/README.md
index 84a248dd60..cf7031e241 100644
--- a/packages/babel-compiler/README.md
+++ b/packages/babel-compiler/README.md
@@ -1,3 +1,7 @@
+# babel-compiler
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/babel-compiler) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/babel-compiler)
+***
+
 [Babel](http://babeljs.io/) is a parser and transpiler for ECMAScript 2015
 syntax and beyond, which enables some upcoming JavaScript syntax features
 to be used in today's browsers and runtimes.
diff --git a/packages/babel-runtime/README.md b/packages/babel-runtime/README.md
index fea7b52648..26fab8e202 100644
--- a/packages/babel-runtime/README.md
+++ b/packages/babel-runtime/README.md
@@ -1,4 +1,6 @@
 # babel-runtime
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/babel-runtime) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/babel-runtime)
+***
 
 Meteor maintains a version of the runtime helpers needed by Babel-transpiled code.
 In most cases, the code is copied from Babel's helper implementations, though we
diff --git a/packages/base64/README.md b/packages/base64/README.md
index ec37b267c6..38fe8224ad 100644
--- a/packages/base64/README.md
+++ b/packages/base64/README.md
@@ -1 +1,5 @@
+# base64
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/base64) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/base64)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/binary-heap/README.md b/packages/binary-heap/README.md
index ec37b267c6..cc4d8be6a4 100644
--- a/packages/binary-heap/README.md
+++ b/packages/binary-heap/README.md
@@ -1 +1,5 @@
+# binary-heap
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/binary-heap) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/binary-heap)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/boilerplate-generator/README.md b/packages/boilerplate-generator/README.md
index ec37b267c6..8521a83c87 100644
--- a/packages/boilerplate-generator/README.md
+++ b/packages/boilerplate-generator/README.md
@@ -1 +1,5 @@
+# boilerplate-generator
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/boilerplate-generator) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/boilerplate-generator)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/browser-policy-common/README.md b/packages/browser-policy-common/README.md
index 37f8a88562..79dee7dd8c 100644
--- a/packages/browser-policy-common/README.md
+++ b/packages/browser-policy-common/README.md
@@ -1,4 +1,6 @@
 # browser-policy-common
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/browser-policy-common) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/browser-policy-common)
+***
 
 This is one of a family of packages that can be used to easily
 configure an app's browser-side security policies. The documentation
diff --git a/packages/browser-policy-content/README.md b/packages/browser-policy-content/README.md
index 864b2f283f..29a35c7ea6 100644
--- a/packages/browser-policy-content/README.md
+++ b/packages/browser-policy-content/README.md
@@ -1,4 +1,6 @@
 # browser-policy-content
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/browser-policy-content) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/browser-policy-content)
+***
 
 This is one of a family of packages that can be used to easily
 configure an app's browser-side security policies. The documentation
diff --git a/packages/browser-policy-framing/README.md b/packages/browser-policy-framing/README.md
index bdf41b0189..0e1bae14ba 100644
--- a/packages/browser-policy-framing/README.md
+++ b/packages/browser-policy-framing/README.md
@@ -1,4 +1,6 @@
 # browser-policy-framing
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/browser-policy-framing) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/browser-policy-framing)
+***
 
 This is one of a family of packages that can be used to easily
 configure an app's browser-side security policies. The documentation
diff --git a/packages/browser-policy/README.md b/packages/browser-policy/README.md
index 9525170ef1..45c59c9654 100644
--- a/packages/browser-policy/README.md
+++ b/packages/browser-policy/README.md
@@ -1,4 +1,6 @@
 # browser-policy
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/browser-policy) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/browser-policy)
+***
 
 The `browser-policy` family of packages, part of
 [Webapp](https://www.meteor.com/webapp), lets you set security-related
diff --git a/packages/caching-compiler/README.md b/packages/caching-compiler/README.md
index 64fac0945d..a4afcf3af8 100644
--- a/packages/caching-compiler/README.md
+++ b/packages/caching-compiler/README.md
@@ -1,4 +1,6 @@
 # caching-compiler
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/caching-compiler) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/caching-compiler)
+***
 
 Caching superclasses for Plugin.registerCompiler.
 CachingCompiler and MultiFileCachingCompiler are classes designed to be used
diff --git a/packages/callback-hook/README.md b/packages/callback-hook/README.md
index ec37b267c6..73601a3161 100644
--- a/packages/callback-hook/README.md
+++ b/packages/callback-hook/README.md
@@ -1 +1,5 @@
+# callback-hook
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/callback-hook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/callback-hook)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/check/README.md b/packages/check/README.md
index 19b5927d56..1c5d1c10a8 100644
--- a/packages/check/README.md
+++ b/packages/check/README.md
@@ -1,4 +1,6 @@
 # check
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/check) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/check)
+***
 
 `check` is a lightweight package for argument checking and general pattern matching. Use it like this:
 
diff --git a/packages/code-prettify/README.md b/packages/code-prettify/README.md
index ec37b267c6..cd76627a5f 100644
--- a/packages/code-prettify/README.md
+++ b/packages/code-prettify/README.md
@@ -1 +1,5 @@
+# code-prettify
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/code-prettify) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/code-prettify)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/coffeescript-test-helper/README.md b/packages/coffeescript-test-helper/README.md
index ec37b267c6..61bdd71e5c 100644
--- a/packages/coffeescript-test-helper/README.md
+++ b/packages/coffeescript-test-helper/README.md
@@ -1 +1,5 @@
+# coffeescript-test-helper
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/coffeescript-test-helper) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/coffeescript-test-helper)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/coffeescript/README.md b/packages/coffeescript/README.md
index 6d57948b34..711ff02abd 100644
--- a/packages/coffeescript/README.md
+++ b/packages/coffeescript/README.md
@@ -1,4 +1,6 @@
 # coffeescript
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/coffeescript) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/coffeescript)
+***
 
 [CoffeeScript](http://coffeescript.org/) is a little language that
 compiles into JavaScript. It provides a simple syntax without lots of
diff --git a/packages/constraint-solver/README.md b/packages/constraint-solver/README.md
index 0fbb94c27b..9e8976f273 100644
--- a/packages/constraint-solver/README.md
+++ b/packages/constraint-solver/README.md
@@ -1,4 +1,6 @@
 # constraint-solver
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/constraint-solver) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/constraint-solver)
+***
 
 Meteor Version Solver is an optimizing constraint solver for package
 dependencies. It is used by the Meteor build tool (Isobuild) for apps,
diff --git a/packages/crosswalk/README.md b/packages/crosswalk/README.md
new file mode 100644
index 0000000000..bbd54bd0b3
--- /dev/null
+++ b/packages/crosswalk/README.md
@@ -0,0 +1,4 @@
+# crosswalk
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/crosswalk) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/crosswalk)
+***
+
diff --git a/packages/ddp-client/README.md b/packages/ddp-client/README.md
new file mode 100644
index 0000000000..9daa0a6277
--- /dev/null
+++ b/packages/ddp-client/README.md
@@ -0,0 +1,4 @@
+# ddp-client
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ddp-client) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ddp-client)
+***
+
diff --git a/packages/ddp-common/README.md b/packages/ddp-common/README.md
new file mode 100644
index 0000000000..d3bc884e06
--- /dev/null
+++ b/packages/ddp-common/README.md
@@ -0,0 +1,4 @@
+# ddp-common
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ddp-common) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ddp-common)
+***
+
diff --git a/packages/ddp-rate-limiter/README.md b/packages/ddp-rate-limiter/README.md
index dc784441be..a54043d630 100644
--- a/packages/ddp-rate-limiter/README.md
+++ b/packages/ddp-rate-limiter/README.md
@@ -1,3 +1,7 @@
+# ddp-rate-limiter
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ddp-rate-limiter) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ddp-rate-limiter)
+***
+
 DDP Rate Limiter package
 ===
 
diff --git a/packages/ddp-server/README.md b/packages/ddp-server/README.md
new file mode 100644
index 0000000000..21d2ac4c84
--- /dev/null
+++ b/packages/ddp-server/README.md
@@ -0,0 +1,4 @@
+# ddp-server
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ddp-server) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ddp-server)
+***
+
diff --git a/packages/ddp/README.md b/packages/ddp/README.md
index b3785a95b5..f56c6cf13c 100644
--- a/packages/ddp/README.md
+++ b/packages/ddp/README.md
@@ -1,4 +1,6 @@
 # ddp
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ddp) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ddp)
+***
 
 DDP (Distributed Data Protocol) is the stateful websocket protocol
 that Meteor uses to communicate between the client and the server. For
diff --git a/packages/deps/README.md b/packages/deps/README.md
index ec37b267c6..ee8dff27cf 100644
--- a/packages/deps/README.md
+++ b/packages/deps/README.md
@@ -1 +1,5 @@
+# deps
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deps) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deps)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/diff-sequence/README.md b/packages/diff-sequence/README.md
new file mode 100644
index 0000000000..708e14303c
--- /dev/null
+++ b/packages/diff-sequence/README.md
@@ -0,0 +1,4 @@
+# diff-sequence
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/diff-sequence) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/diff-sequence)
+***
+
diff --git a/packages/disable-oplog/README.md b/packages/disable-oplog/README.md
index ec37b267c6..ce382c61a0 100644
--- a/packages/disable-oplog/README.md
+++ b/packages/disable-oplog/README.md
@@ -1 +1,5 @@
+# disable-oplog
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/disable-oplog) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/disable-oplog)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/ecmascript-runtime/README.md b/packages/ecmascript-runtime/README.md
index 430df97268..2fd1bfe192 100644
--- a/packages/ecmascript-runtime/README.md
+++ b/packages/ecmascript-runtime/README.md
@@ -1,4 +1,6 @@
 # ecmascript-runtime
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ecmascript-runtime) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime)
+***
 
 [![Build Status](https://travis-ci.org/meteor/ecmascript-runtime.svg?branch=master)](https://travis-ci.org/meteor/ecmascript-runtime)
 Polyfills for new ECMAScript 2015 APIs like Map and Set
diff --git a/packages/ecmascript/README.md b/packages/ecmascript/README.md
index de72899325..e624886590 100644
--- a/packages/ecmascript/README.md
+++ b/packages/ecmascript/README.md
@@ -1,4 +1,6 @@
 # ecmascript
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ecmascript) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ecmascript)
+***
 
 This package lets you use new JavaScript language features that are part
 of the [ECMAScript 2015
diff --git a/packages/ejson/README.md b/packages/ejson/README.md
index 3da8c169b2..ac017deebc 100644
--- a/packages/ejson/README.md
+++ b/packages/ejson/README.md
@@ -1,4 +1,6 @@
 # ejson
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ejson) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ejson)
+***
 
 EJSON is an extension of JSON to support more types. It supports all JSON-safe
 types, as well as:
diff --git a/packages/email/README.md b/packages/email/README.md
index 8b49e4d9d2..6f6e0363cb 100644
--- a/packages/email/README.md
+++ b/packages/email/README.md
@@ -1,4 +1,6 @@
 # email
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/email) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/email)
+***
 
 The `email` package allows sending email from a Meteor app.
 
diff --git a/packages/es5-shim/README.md b/packages/es5-shim/README.md
index 8aac900c5e..db2c865add 100644
--- a/packages/es5-shim/README.md
+++ b/packages/es5-shim/README.md
@@ -1,4 +1,6 @@
 # es5-shim
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/es5-shim) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/es5-shim)
+***
 
 This package improves ECMAScript 5 compliance in all browers, particularly older browsers, and especially Internet Explorer 8 (and earlier).
 
diff --git a/packages/facebook/README.md b/packages/facebook/README.md
index f4c9f1c5fc..33316ea3b4 100644
--- a/packages/facebook/README.md
+++ b/packages/facebook/README.md
@@ -1,3 +1,5 @@
 # facebook
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facebook)
+***
 
 An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
\ No newline at end of file
diff --git a/packages/facts/README.md b/packages/facts/README.md
index ec37b267c6..15358322c6 100644
--- a/packages/facts/README.md
+++ b/packages/facts/README.md
@@ -1 +1,5 @@
+# facts
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facts) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facts)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/fastclick/README.md b/packages/fastclick/README.md
index 6d2f3d0c3a..5d1f8e4ffa 100644
--- a/packages/fastclick/README.md
+++ b/packages/fastclick/README.md
@@ -1,4 +1,6 @@
 # fastclick
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/fastclick) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/fastclick)
+***
 
 FastClick is a simple, easy-to-use library for eliminating the 300ms delay
 between a physical tap and the firing of a `click` event on mobile browsers. The
diff --git a/packages/force-ssl/README.md b/packages/force-ssl/README.md
index 889c86886d..ddfe0bb9ea 100644
--- a/packages/force-ssl/README.md
+++ b/packages/force-ssl/README.md
@@ -1,4 +1,6 @@
 # force-ssl
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/force-ssl) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/force-ssl)
+***
 
 This package, part of [Webapp](https://www.meteor.com/webapp), causes
 Meteor to redirect insecure connections (HTTP) to a secure URL
diff --git a/packages/geojson-utils/README.md b/packages/geojson-utils/README.md
index ec37b267c6..63f52701b4 100644
--- a/packages/geojson-utils/README.md
+++ b/packages/geojson-utils/README.md
@@ -1 +1,5 @@
+# geojson-utils
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/geojson-utils) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/geojson-utils)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/github/README.md b/packages/github/README.md
index 27a5e87808..bca8563ddb 100644
--- a/packages/github/README.md
+++ b/packages/github/README.md
@@ -1,3 +1,5 @@
 # github
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/github) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/github)
+***
 
 An implementation of the GitHub OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
\ No newline at end of file
diff --git a/packages/google/README.md b/packages/google/README.md
index f232edd358..2271763f41 100644
--- a/packages/google/README.md
+++ b/packages/google/README.md
@@ -1,3 +1,5 @@
 # google
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/google) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/google)
+***
 
 An implementation of the Google OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
\ No newline at end of file
diff --git a/packages/handlebars/README.md b/packages/handlebars/README.md
index ec37b267c6..b5883dc56f 100644
--- a/packages/handlebars/README.md
+++ b/packages/handlebars/README.md
@@ -1 +1,5 @@
+# handlebars
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/handlebars) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/handlebars)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/hot-code-push/README.md b/packages/hot-code-push/README.md
index 0f5cee0bd8..9d81f04a29 100644
--- a/packages/hot-code-push/README.md
+++ b/packages/hot-code-push/README.md
@@ -1,4 +1,6 @@
 # hot-code-push
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/hot-code-push) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/hot-code-push)
+***
 
 Enables Meteor's hot code push functionality in development and production by
 including the `autoupdate` and `reload` packages in your app.
diff --git a/packages/http/README.md b/packages/http/README.md
index 030b951c9d..01164d04de 100644
--- a/packages/http/README.md
+++ b/packages/http/README.md
@@ -1,4 +1,6 @@
 # http
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/http) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/http)
+***
 
 `HTTP` provides an HTTP request API on the client and server.  To use
 these functions, add the HTTP package to your project with `$ meteor add http`.
diff --git a/packages/id-map/README.md b/packages/id-map/README.md
index ec37b267c6..84cb801546 100644
--- a/packages/id-map/README.md
+++ b/packages/id-map/README.md
@@ -1 +1,5 @@
+# id-map
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/id-map) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/id-map)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/insecure/README.md b/packages/insecure/README.md
index 1d8168b098..e1b992a249 100644
--- a/packages/insecure/README.md
+++ b/packages/insecure/README.md
@@ -1,4 +1,6 @@
 # insecure
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/insecure) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/insecure)
+***
 
 Allow almost all collection methods, such as `insert`, `update`, and `remove`, to be called from the client. This package is useful for prototyping an app without worrying about database permissions, but should be removed as soon as the app needs to restrict database access.
 
diff --git a/packages/jquery-waypoints/README.md b/packages/jquery-waypoints/README.md
index df46727f30..c850cf0394 100644
--- a/packages/jquery-waypoints/README.md
+++ b/packages/jquery-waypoints/README.md
@@ -1,4 +1,6 @@
 # jquery-waypoints
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jquery-waypoints) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jquery-waypoints)
+***
 
 This is a wrapper package for the JQuery Waypoints library. You can use it to add callbacks that fire when the user scrolls to certain elements on a page, for example to implement table of contents highlighting.
 
diff --git a/packages/jquery/README.md b/packages/jquery/README.md
index bf02bd488c..45e50ce962 100644
--- a/packages/jquery/README.md
+++ b/packages/jquery/README.md
@@ -1,4 +1,6 @@
 # jquery
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jquery) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jquery)
+***
 
 [jQuery](http://jquery.com/) is a fast and concise JavaScript
 Library that simplifies HTML document traversing, event handling,
diff --git a/packages/jshint/README.md b/packages/jshint/README.md
index fb939b8a1d..ea0757e1fc 100644
--- a/packages/jshint/README.md
+++ b/packages/jshint/README.md
@@ -1,3 +1,7 @@
+# jshint
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jshint) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jshint)
+***
+
 JSHint for Meteor
 ===
 
diff --git a/packages/jsparse/README.md b/packages/jsparse/README.md
index ec37b267c6..ba75c9e81e 100644
--- a/packages/jsparse/README.md
+++ b/packages/jsparse/README.md
@@ -1 +1,5 @@
+# jsparse
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jsparse) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jsparse)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/launch-screen/README.md b/packages/launch-screen/README.md
index 14dde4afb2..3cf5b1f31d 100644
--- a/packages/launch-screen/README.md
+++ b/packages/launch-screen/README.md
@@ -21,6 +21,8 @@ elements to be loaded before releasing the launch screen and showing
 the user the actual app.
 
 ### Additional waiting before releasing the launch screen
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/launch-screen) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/launch-screen)
+***
 
 To wait on more events before releasing the launch screen, call `var handle =
 LaunchScreen.hold()` in the top-level of the client code of your app, and when
diff --git a/packages/less/README.md b/packages/less/README.md
index 067fe7908f..6762ed7b80 100644
--- a/packages/less/README.md
+++ b/packages/less/README.md
@@ -1,4 +1,6 @@
 # Less
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/less) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/less)
+***
 
 The Less package provides a compiler build plugin for the Meteor build tool. It
 handles the compilation of `*.less` files to CSS.
diff --git a/packages/livedata/README.md b/packages/livedata/README.md
index ec37b267c6..c5e4fd6b2d 100644
--- a/packages/livedata/README.md
+++ b/packages/livedata/README.md
@@ -1 +1,5 @@
+# livedata
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/livedata) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/livedata)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/localstorage/README.md b/packages/localstorage/README.md
index ec37b267c6..d2453cb5d8 100644
--- a/packages/localstorage/README.md
+++ b/packages/localstorage/README.md
@@ -1 +1,5 @@
+# localstorage
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/localstorage) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/localstorage)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/logging/README.md b/packages/logging/README.md
index ec37b267c6..72b2204077 100644
--- a/packages/logging/README.md
+++ b/packages/logging/README.md
@@ -1 +1,5 @@
+# logging
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/logging) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/logging)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/logic-solver/README.md b/packages/logic-solver/README.md
index e7654116f0..696d3f37b7 100644
--- a/packages/logic-solver/README.md
+++ b/packages/logic-solver/README.md
@@ -1,4 +1,6 @@
 # Logic Solver
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/logic-solver) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/logic-solver)
+***
 
 ## Introduction
 
diff --git a/packages/markdown/README.md b/packages/markdown/README.md
index ec37b267c6..9353449870 100644
--- a/packages/markdown/README.md
+++ b/packages/markdown/README.md
@@ -1 +1,5 @@
+# markdown
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/markdown) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/markdown)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/meetup/README.md b/packages/meetup/README.md
index 1491bd3b72..0f075439bb 100644
--- a/packages/meetup/README.md
+++ b/packages/meetup/README.md
@@ -1,4 +1,6 @@
 # meetup
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meetup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meetup)
+***
 
 An implementation of the Meetup OAuth flow. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/meteor-base/README.md b/packages/meteor-base/README.md
index 13e2e37b6e..30d609e452 100644
--- a/packages/meteor-base/README.md
+++ b/packages/meteor-base/README.md
@@ -1,4 +1,6 @@
 # meteor-base
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-base) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-base)
+***
 
 A default set of packages that almost every app will have. You should only remove this package if you really, really know what you are doing.
 
diff --git a/packages/meteor-developer/README.md b/packages/meteor-developer/README.md
index ad2edf10a4..df097bba7d 100644
--- a/packages/meteor-developer/README.md
+++ b/packages/meteor-developer/README.md
@@ -1,4 +1,6 @@
 # meteor-developer
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-developer) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-developer)
+***
 
 An implementation of the Meteor Developer Account OAuth flow. See the
 [project page](https://www.meteor.com/accounts) on Meteor Accounts for
diff --git a/packages/meteor-platform/README.md b/packages/meteor-platform/README.md
index 6888d2ad5d..b1832af856 100644
--- a/packages/meteor-platform/README.md
+++ b/packages/meteor-platform/README.md
@@ -1,4 +1,6 @@
 # meteor-platform
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-platform) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-platform)
+***
 
 This package used to be added to every app by `meteor create`, but is now deprecated in favor of `meteor-base` and a carefully chosen set of other packages.
 
diff --git a/packages/meteor-tool/README.md b/packages/meteor-tool/README.md
index 42f3266c17..79e97a6ffc 100644
--- a/packages/meteor-tool/README.md
+++ b/packages/meteor-tool/README.md
@@ -1,4 +1,6 @@
 # meteor-tool
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-tool) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-tool)
+***
 
 This is the Meteor command-line tool. Most of the code for it is in the [tools directory](https://github.com/meteor/meteor/tree/master/tools) of the Meteor repository.
 
diff --git a/packages/meteor/README.md b/packages/meteor/README.md
index ec37b267c6..ff831a512a 100644
--- a/packages/meteor/README.md
+++ b/packages/meteor/README.md
@@ -1 +1,5 @@
+# meteor
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/meyerweb-reset/README.md b/packages/meyerweb-reset/README.md
index ec37b267c6..a9bb580e4e 100644
--- a/packages/meyerweb-reset/README.md
+++ b/packages/meyerweb-reset/README.md
@@ -1 +1,5 @@
+# meyerweb-reset
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meyerweb-reset) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meyerweb-reset)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/minifier-css/README.md b/packages/minifier-css/README.md
index ec37b267c6..2505991e70 100644
--- a/packages/minifier-css/README.md
+++ b/packages/minifier-css/README.md
@@ -1 +1,5 @@
+# minifier-css
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/minifier-css) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/minifier-css)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/minifier-js/README.md b/packages/minifier-js/README.md
index ec37b267c6..6195404f92 100644
--- a/packages/minifier-js/README.md
+++ b/packages/minifier-js/README.md
@@ -1 +1,5 @@
+# minifier-js
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/minifier-js) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/minifier-js)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/minimongo/README.md b/packages/minimongo/README.md
index c128f28f72..3258ac74c1 100644
--- a/packages/minimongo/README.md
+++ b/packages/minimongo/README.md
@@ -1,4 +1,6 @@
 # Minimongo
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/minimongo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/minimongo)
+***
 
 `minimongo` is reimplementation of (almost) the entire MongoDB API, against an
 in-memory JavaScript database. It is like a MongoDB emulator that runs inside
diff --git a/packages/mobile-experience/README.md b/packages/mobile-experience/README.md
index 4c0d0a980d..fa52ad557c 100644
--- a/packages/mobile-experience/README.md
+++ b/packages/mobile-experience/README.md
@@ -1,4 +1,6 @@
 # mobile-experience
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mobile-experience) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mobile-experience)
+***
 
 A set of Cordova/PhoneGap-specific packages that set some good defaults when building for mobile. These packages only activate when you are building a native Android or iOS app.
 
diff --git a/packages/mobile-status-bar/README.md b/packages/mobile-status-bar/README.md
index 6e885f0d93..d68f68fd9a 100644
--- a/packages/mobile-status-bar/README.md
+++ b/packages/mobile-status-bar/README.md
@@ -1,4 +1,6 @@
 # mobile-status-bar
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mobile-status-bar) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mobile-status-bar)
+***
 
 This package allows you to customize the status bar on Meteor
 Phonegap/Cordova apps.
diff --git a/packages/modules-runtime/README.md b/packages/modules-runtime/README.md
index c8aa803a03..6f6d0bc761 100644
--- a/packages/modules-runtime/README.md
+++ b/packages/modules-runtime/README.md
@@ -1,4 +1,6 @@
 ## modules-runtime
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/modules-runtime) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/modules-runtime)
+***
 
 This package implements the `meteorInstall` function that is used and
 re-exported by the `modules` package. Do not depend directly on this
diff --git a/packages/mongo-id/README.md b/packages/mongo-id/README.md
new file mode 100644
index 0000000000..159326ff77
--- /dev/null
+++ b/packages/mongo-id/README.md
@@ -0,0 +1,4 @@
+# mongo-id
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mongo-id) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mongo-id)
+***
+
diff --git a/packages/mongo-livedata/README.md b/packages/mongo-livedata/README.md
index ec37b267c6..4fe9c93805 100644
--- a/packages/mongo-livedata/README.md
+++ b/packages/mongo-livedata/README.md
@@ -1 +1,5 @@
+# mongo-livedata
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mongo-livedata) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mongo-livedata)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/mongo/README.md b/packages/mongo/README.md
index 19c9f8e4af..701883a0a1 100644
--- a/packages/mongo/README.md
+++ b/packages/mongo/README.md
@@ -1,4 +1,6 @@
 # mongo
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/mongo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/mongo)
+***
 
 The `mongo` package is a [full stack database
 driver](https://www.meteor.com/full-stack-db-drivers) that provides
diff --git a/packages/npm-bcrypt/README.md b/packages/npm-bcrypt/README.md
new file mode 100644
index 0000000000..3f4ac59fff
--- /dev/null
+++ b/packages/npm-bcrypt/README.md
@@ -0,0 +1,4 @@
+# npm-bcrypt
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/npm-bcrypt) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/npm-bcrypt)
+***
+
diff --git a/packages/npm-mongo/README.md b/packages/npm-mongo/README.md
new file mode 100644
index 0000000000..4776f34fbc
--- /dev/null
+++ b/packages/npm-mongo/README.md
@@ -0,0 +1,4 @@
+# npm-mongo
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/npm-mongo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/npm-mongo)
+***
+
diff --git a/packages/oauth-encryption/README.md b/packages/oauth-encryption/README.md
index f989cf0cfd..ca15455569 100644
--- a/packages/oauth-encryption/README.md
+++ b/packages/oauth-encryption/README.md
@@ -1,4 +1,6 @@
 # oauth-encryption
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/oauth-encryption) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/oauth-encryption)
+***
 
 Encrypts sensitive login secrets stored in the database such as a
 login service's application secret key and users' access tokens.
diff --git a/packages/oauth/README.md b/packages/oauth/README.md
index 42f3bf7ae6..8292a90a69 100644
--- a/packages/oauth/README.md
+++ b/packages/oauth/README.md
@@ -1,4 +1,6 @@
 # oauth
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/oauth) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/oauth)
+***
 
 Common functionality for OAuth clients. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/oauth1/README.md b/packages/oauth1/README.md
index 2dceba7eff..3b3205f286 100644
--- a/packages/oauth1/README.md
+++ b/packages/oauth1/README.md
@@ -1,4 +1,6 @@
 # oauth1
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/oauth1) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/oauth1)
+***
 
 Common functionality for OAuth 1 clients. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/oauth2/README.md b/packages/oauth2/README.md
index 5933c66051..294139e15d 100644
--- a/packages/oauth2/README.md
+++ b/packages/oauth2/README.md
@@ -1,4 +1,6 @@
 # oauth2
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/oauth2) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/oauth2)
+***
 
 Common functionality for OAuth 2 clients. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/observe-sequence/README.md b/packages/observe-sequence/README.md
index ec37b267c6..96c830cb40 100644
--- a/packages/observe-sequence/README.md
+++ b/packages/observe-sequence/README.md
@@ -1 +1,5 @@
+# observe-sequence
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/observe-sequence) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/observe-sequence)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/ordered-dict/README.md b/packages/ordered-dict/README.md
new file mode 100644
index 0000000000..b1b82b4966
--- /dev/null
+++ b/packages/ordered-dict/README.md
@@ -0,0 +1,4 @@
+# ordered-dict
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ordered-dict) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ordered-dict)
+***
+
diff --git a/packages/package-stats-opt-out/README.md b/packages/package-stats-opt-out/README.md
index 592026d96c..dd14ffd0ce 100644
--- a/packages/package-stats-opt-out/README.md
+++ b/packages/package-stats-opt-out/README.md
@@ -1,4 +1,6 @@
 # package-stats-opt-out
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/package-stats-opt-out) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/package-stats-opt-out)
+***
 
 Opt out of sending statistics about which packages your app is using.
 
diff --git a/packages/package-version-parser/README.md b/packages/package-version-parser/README.md
index 74aba151c1..3dcad42c75 100644
--- a/packages/package-version-parser/README.md
+++ b/packages/package-version-parser/README.md
@@ -1 +1,5 @@
+# package-version-parser
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/package-version-parser) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/package-version-parser)
+***
+
 This is an internal Meteor package.
diff --git a/packages/preserve-inputs/README.md b/packages/preserve-inputs/README.md
index ec37b267c6..b9f29d421f 100644
--- a/packages/preserve-inputs/README.md
+++ b/packages/preserve-inputs/README.md
@@ -1 +1,5 @@
+# preserve-inputs
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/preserve-inputs) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/preserve-inputs)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/promise/README.md b/packages/promise/README.md
index 1cb967a272..5821e116de 100644
--- a/packages/promise/README.md
+++ b/packages/promise/README.md
@@ -1,4 +1,6 @@
 # promise
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/promise) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/promise)
+***
 
 [![Build Status](https://travis-ci.org/meteor/promise.svg)](https://travis-ci.org/meteor/promise)
 ECMAScript 2015 Promise polyfill with Fiber support
diff --git a/packages/random/README.md b/packages/random/README.md
index 380b91834e..0b0b77ebc3 100644
--- a/packages/random/README.md
+++ b/packages/random/README.md
@@ -1,4 +1,6 @@
 # random
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/random) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/random)
+***
 
 The `random` package provides several functions for generating random
 numbers. It uses a cryptographically strong pseudorandom number generator when
diff --git a/packages/rate-limit/README.md b/packages/rate-limit/README.md
index 5a46421e59..1cddca4aaf 100644
--- a/packages/rate-limit/README.md
+++ b/packages/rate-limit/README.md
@@ -1,4 +1,6 @@
 # Rate Limit
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/rate-limit) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/rate-limit)
+***
 ===
 A Rate Limiter is a general rate limiting object that stores rules and
 determines whether inputs are allowed based on the rules. There is also a
diff --git a/packages/reactive-dict/README.md b/packages/reactive-dict/README.md
index 0f5af9b8e9..72633610cf 100644
--- a/packages/reactive-dict/README.md
+++ b/packages/reactive-dict/README.md
@@ -1,4 +1,6 @@
 # reactive-dict
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/reactive-dict) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/reactive-dict)
+***
 
 This package provide `ReactiveDict`, a general-purpose reactive
 datatype for use with
diff --git a/packages/reactive-var/README.md b/packages/reactive-var/README.md
index 9dff989b35..16696efb9e 100644
--- a/packages/reactive-var/README.md
+++ b/packages/reactive-var/README.md
@@ -1,4 +1,6 @@
 # reactive-var
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/reactive-var) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/reactive-var)
+***
 
 This package provide `ReactiveVar`, a general-purpose reactive
 datatype for use with
diff --git a/packages/reload-safetybelt/README.md b/packages/reload-safetybelt/README.md
index ec37b267c6..a73157e371 100644
--- a/packages/reload-safetybelt/README.md
+++ b/packages/reload-safetybelt/README.md
@@ -1 +1,5 @@
+# reload-safetybelt
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/reload-safetybelt) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/reload-safetybelt)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/reload/README.md b/packages/reload/README.md
index c8d6e6f4f6..ca025fbae0 100644
--- a/packages/reload/README.md
+++ b/packages/reload/README.md
@@ -1,4 +1,6 @@
 # reload
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/reload) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/reload)
+***
 
 The `reload` package handles the process of *migrating* an app:
 serializing the app's state, then shutting down and restarting the app
diff --git a/packages/retry/README.md b/packages/retry/README.md
index ec37b267c6..950132099e 100644
--- a/packages/retry/README.md
+++ b/packages/retry/README.md
@@ -1 +1,5 @@
+# retry
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/retry) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/retry)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/routepolicy/README.md b/packages/routepolicy/README.md
index 6941d9126a..c825fda7f8 100644
--- a/packages/routepolicy/README.md
+++ b/packages/routepolicy/README.md
@@ -1,4 +1,6 @@
 # RoutePolicy
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/routepolicy) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/routepolicy)
+***
 
 RoutePolicy, part of [Webapp](https://www.meteor.com/webapp), is a
 low-level API for declaring the offline access semantics that apply to
diff --git a/packages/service-configuration/README.md b/packages/service-configuration/README.md
index 56210e142b..59dfe29667 100644
--- a/packages/service-configuration/README.md
+++ b/packages/service-configuration/README.md
@@ -1,4 +1,6 @@
 # service-configuration
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/service-configuration) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/service-configuration)
+***
 
 Configure login services. Example:
 
diff --git a/packages/session/README.md b/packages/session/README.md
index f7c1911e9d..a78f771fc9 100644
--- a/packages/session/README.md
+++ b/packages/session/README.md
@@ -1,4 +1,6 @@
 # session
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/session) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/session)
+***
 
 This package provide `Session`. `Session` is a special
 [ReactiveDict](https://atmospherejs.com/meteor/reactive-dict) whose
diff --git a/packages/sha/README.md b/packages/sha/README.md
index 74afdcc59c..35890c407f 100644
--- a/packages/sha/README.md
+++ b/packages/sha/README.md
@@ -1,3 +1,7 @@
+# sha
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/sha) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/sha)
+***
+
 An implementation of the [SHA256](https://en.wikipedia.org/wiki/SHA-2) secure hash function, available in all environments.
 
 ## Usage
diff --git a/packages/showdown/README.md b/packages/showdown/README.md
index ec37b267c6..e2d39d3b2f 100644
--- a/packages/showdown/README.md
+++ b/packages/showdown/README.md
@@ -1 +1,5 @@
+# showdown
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/showdown) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/showdown)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/spiderable/README.md b/packages/spiderable/README.md
index ecc0d1804f..9f9b65c32d 100644
--- a/packages/spiderable/README.md
+++ b/packages/spiderable/README.md
@@ -1,4 +1,6 @@
 # spiderable
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/spiderable) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/spiderable)
+***
 
 `spiderable` is part of [Webapp](https://www.meteor.com/webapp). It's one possible way to allow web search engines to index a Meteor application. It uses the [AJAX Crawling specification](https://developers.google.com/webmasters/ajax-crawling/) published by Google to serve HTML to compatible spiders (Google, Bing, Yandex, and more).
 
diff --git a/packages/srp/README.md b/packages/srp/README.md
index ec37b267c6..10570e3063 100644
--- a/packages/srp/README.md
+++ b/packages/srp/README.md
@@ -1 +1,5 @@
+# srp
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/srp) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/srp)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/standard-app-packages/README.md b/packages/standard-app-packages/README.md
index ec37b267c6..4a584a3324 100644
--- a/packages/standard-app-packages/README.md
+++ b/packages/standard-app-packages/README.md
@@ -1 +1,5 @@
+# standard-app-packages
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/standard-app-packages) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/standard-app-packages)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/standard-minifier-css/README.md b/packages/standard-minifier-css/README.md
index 0bc7e76b92..bf0d0f58db 100644
--- a/packages/standard-minifier-css/README.md
+++ b/packages/standard-minifier-css/README.md
@@ -1,3 +1,7 @@
+# standard-minifier-css
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/standard-minifier-css) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/standard-minifier-css)
+***
+
 Standard Minifier for CSS
 ===
 
diff --git a/packages/standard-minifier-js/README.md b/packages/standard-minifier-js/README.md
index 0990186a14..c8e326cf55 100644
--- a/packages/standard-minifier-js/README.md
+++ b/packages/standard-minifier-js/README.md
@@ -1,3 +1,7 @@
+# standard-minifier-js
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/standard-minifier-js) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/standard-minifier-js)
+***
+
 Standard Minifier for JS
 ===
 
diff --git a/packages/standard-minifiers/README.md b/packages/standard-minifiers/README.md
index a358e6b160..9b9bb669d9 100644
--- a/packages/standard-minifiers/README.md
+++ b/packages/standard-minifiers/README.md
@@ -1,3 +1,7 @@
+# standard-minifiers
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/standard-minifiers) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/standard-minifiers)
+***
+
 Standard Minifiers
 ===
 
diff --git a/packages/startup/README.md b/packages/startup/README.md
index ec37b267c6..838fc22489 100644
--- a/packages/startup/README.md
+++ b/packages/startup/README.md
@@ -1 +1,5 @@
+# startup
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/startup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/startup)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/stylus/README.md b/packages/stylus/README.md
index 689b97caa8..8ee851e391 100644
--- a/packages/stylus/README.md
+++ b/packages/stylus/README.md
@@ -1,4 +1,6 @@
 # stylus
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/stylus) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/stylus)
+***
 
 [Stylus](http://learnboost.github.com/stylus/) is a CSS pre-processor with a
 simple syntax and expressive dynamic behavior. It allows for more compact
diff --git a/packages/test-helpers/README.md b/packages/test-helpers/README.md
index ec37b267c6..f8dec91d14 100644
--- a/packages/test-helpers/README.md
+++ b/packages/test-helpers/README.md
@@ -1 +1,5 @@
+# test-helpers
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/test-helpers) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/test-helpers)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/test-in-browser/README.md b/packages/test-in-browser/README.md
new file mode 100644
index 0000000000..0a1112d9f8
--- /dev/null
+++ b/packages/test-in-browser/README.md
@@ -0,0 +1,4 @@
+# test-in-browser
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/test-in-browser) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/test-in-browser)
+***
+
diff --git a/packages/test-in-console/README.md b/packages/test-in-console/README.md
index ec37b267c6..fb3adef81e 100644
--- a/packages/test-in-console/README.md
+++ b/packages/test-in-console/README.md
@@ -1 +1,5 @@
+# test-in-console
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/test-in-console) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/test-in-console)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/test-server-tests-in-console-once/README.md b/packages/test-server-tests-in-console-once/README.md
index ec37b267c6..6babff2d13 100644
--- a/packages/test-server-tests-in-console-once/README.md
+++ b/packages/test-server-tests-in-console-once/README.md
@@ -1 +1,5 @@
+# test-server-tests-in-console-once
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/test-server-tests-in-console-once) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/test-server-tests-in-console-once)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/tinytest-harness/README.md b/packages/tinytest-harness/README.md
index e69de29bb2..5c8e9ee160 100644
--- a/packages/tinytest-harness/README.md
+++ b/packages/tinytest-harness/README.md
@@ -0,0 +1,4 @@
+# tinytest-harness
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/tinytest-harness) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/tinytest-harness)
+***
+
diff --git a/packages/tinytest/README.md b/packages/tinytest/README.md
index 9d7daf093e..b02d391603 100644
--- a/packages/tinytest/README.md
+++ b/packages/tinytest/README.md
@@ -1,4 +1,6 @@
 # TinyTest
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/tinytest) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/tinytest)
+***
 
 After reading this, you'll know:
 
diff --git a/packages/tracker/README.md b/packages/tracker/README.md
index b20d1acef4..f4f8fc50cd 100644
--- a/packages/tracker/README.md
+++ b/packages/tracker/README.md
@@ -1,4 +1,6 @@
 # Meteor Tracker
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/tracker) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/tracker)
+***
 
 Meteor Tracker is an incredibly tiny (~1k) but incredibly powerful
 library for **transparent reactive programming** in JavaScript. (It
diff --git a/packages/twitter/README.md b/packages/twitter/README.md
index 3cb4e41f60..862c4253f5 100644
--- a/packages/twitter/README.md
+++ b/packages/twitter/README.md
@@ -1,4 +1,6 @@
 # twitter
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/twitter) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/twitter)
+***
 
 An implementation of the Twitter OAuth flow. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/ui/README.md b/packages/ui/README.md
index ec37b267c6..33120c7c56 100644
--- a/packages/ui/README.md
+++ b/packages/ui/README.md
@@ -1 +1,5 @@
+# ui
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ui) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ui)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/underscore-tests/README.md b/packages/underscore-tests/README.md
index ec37b267c6..f569d7cd55 100644
--- a/packages/underscore-tests/README.md
+++ b/packages/underscore-tests/README.md
@@ -1 +1,5 @@
+# underscore-tests
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/underscore-tests) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/underscore-tests)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/underscore/README.md b/packages/underscore/README.md
index 56a0e9db0b..0d77f2e402 100644
--- a/packages/underscore/README.md
+++ b/packages/underscore/README.md
@@ -1,4 +1,6 @@
 # underscore
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/underscore) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/underscore)
+***
 
 Underscore.js is a popular library that provides various utility functions to
 simplify processing arrays, objects and functions.
diff --git a/packages/url/README.md b/packages/url/README.md
index ec37b267c6..bcaf182cda 100644
--- a/packages/url/README.md
+++ b/packages/url/README.md
@@ -1 +1,5 @@
+# url
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/url) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/url)
+***
+
 This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/webapp-hashing/README.md b/packages/webapp-hashing/README.md
index 377be035c2..970eb1067c 100644
--- a/packages/webapp-hashing/README.md
+++ b/packages/webapp-hashing/README.md
@@ -1,4 +1,6 @@
 # webapp-hashing
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/webapp-hashing) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/webapp-hashing)
+***
 
 This package knows how to hash together all of the elements in a
 client resource manifest to produce a build ID that can be used to
diff --git a/packages/webapp/README.md b/packages/webapp/README.md
index 8d946200b0..f0af8c30a1 100644
--- a/packages/webapp/README.md
+++ b/packages/webapp/README.md
@@ -1,4 +1,6 @@
 # webapp
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/webapp) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/webapp)
+***
 
 The `webapp` package contains the core functionality that makes a
 Meteor project into a web application. It is a "value added HTTP
diff --git a/packages/weibo/README.md b/packages/weibo/README.md
index 6b81ed0001..38d7180f08 100644
--- a/packages/weibo/README.md
+++ b/packages/weibo/README.md
@@ -1,4 +1,6 @@
 # weibo
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/weibo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/weibo)
+***
 
 An implementation of the Weibo OAuth flow. See the [project
 page](https://www.meteor.com/accounts) on Meteor Accounts for more
diff --git a/packages/xmlbuilder/README.md b/packages/xmlbuilder/README.md
index ec37b267c6..4d9480114a 100644
--- a/packages/xmlbuilder/README.md
+++ b/packages/xmlbuilder/README.md
@@ -1 +1,5 @@
+# xmlbuilder
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/xmlbuilder) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/xmlbuilder)
+***
+
 This is an internal Meteor package.
\ No newline at end of file

From 48f62d9a6460b80cc8c92e83b730dd214e7efd69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pradel=20Le=CC=81o?= <pradel.leo@gmail.com>
Date: Thu, 18 Aug 2016 16:31:41 +0200
Subject: [PATCH 158/688] Put travis badge back

---
 packages/promise/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/promise/README.md b/packages/promise/README.md
index 5821e116de..50423bb186 100644
--- a/packages/promise/README.md
+++ b/packages/promise/README.md
@@ -1,8 +1,7 @@
-# promise
+# promise [![Build Status](https://travis-ci.org/meteor/promise.svg)](https://travis-ci.org/meteor/promise)
 [Source code of released version](https://github.com/meteor/meteor/tree/master/packages/promise) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/promise)
 ***
 
-[![Build Status](https://travis-ci.org/meteor/promise.svg)](https://travis-ci.org/meteor/promise)
 ECMAScript 2015 Promise polyfill with Fiber support
 
 The static methods `Promise.async` and `Promise.await` implement the

From e0c0817ca50d4b8e9829e1105b2ae2c1349f0a8e Mon Sep 17 00:00:00 2001
From: Mitar <mitar.github@tnode.com>
Date: Tue, 30 Aug 2016 15:57:10 -0700
Subject: [PATCH 159/688] Updating stylus dependency.

---
 packages/stylus/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 8285d3017f..e5a5d85a20 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -10,8 +10,8 @@ Package.registerBuildPlugin({
     'plugin/compile-stylus.js'
   ],
   npmDependencies: {
-    stylus: "https://github.com/meteor/stylus/tarball/d4352c9cb4056faf238e6bd9f9f2172472b67c5b", // fork of 0.51.1
-    nib: "1.1.0"
+    stylus: "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449", // fork of 0.54.5
+    nib: "1.1.2"
   }
 });
 

From d70e2f7bdafd08ce8c3c645538863ccd7326ad21 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 1 Sep 2016 11:04:50 +1000
Subject: [PATCH 160/688] Bumped version of npm-mongo for 2.2.9 driver release

---
 packages/npm-mongo/.npm/package/npm-shrinkwrap.json | 12 ++++++------
 packages/npm-mongo/package.js                       |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 50563e4ea7..0cb409a5c8 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -31,14 +31,14 @@
       "from": "isarray@>=1.0.0 <1.1.0"
     },
     "mongodb": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.8.tgz",
-      "from": "mongodb@2.2.8"
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.9.tgz",
+      "from": "mongodb@2.2.9"
     },
     "mongodb-core": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.10.tgz",
-      "from": "mongodb-core@2.0.10"
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.11.tgz",
+      "from": "mongodb-core@2.0.11"
     },
     "process-nextick-args": {
       "version": "1.0.7",
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 86dab645cb..3c6acdee55 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.48',
+  version: '1.5.49',
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.8"
+  mongodb: "2.2.9"
 });
 
 Package.onUse(function (api) {

From 959eb7cc3855664eb6c6c7e70bed6d0ba909f3d6 Mon Sep 17 00:00:00 2001
From: Andy Edwards <jedwards@fastmail.com>
Date: Tue, 6 Sep 2016 09:14:13 -0500
Subject: [PATCH 161/688] use connect.compress() after rawConnectHandlers

---
 packages/webapp/webapp_server.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 3718a4bea3..eed2969d90 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -588,14 +588,14 @@ var runWebAppServer = function () {
   // webserver
   var app = connect();
 
-  // Auto-compress any json, javascript, or text.
-  app.use(connect.compress());
-
   // Packages and apps can add handlers that run before any other Meteor
   // handlers via WebApp.rawConnectHandlers.
   var rawConnectHandlers = connect();
   app.use(rawConnectHandlers);
 
+  // Auto-compress any json, javascript, or text.
+  app.use(connect.compress());
+
   // We're not a proxy; reject (without crashing) attempts to treat us like
   // one. (See #1212.)
   app.use(function(req, res, next) {

From 52657f6c1f60dfb74795a44b451049201af35997 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 10:35:02 -0400
Subject: [PATCH 162/688] Add more explanation of submodules to README.md.

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index a80c0c0ec9..b70cd38fa3 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,18 @@ git clone --recursive git://github.com/meteor/meteor.git
 cd meteor
 ```
 
+The `--recursive` flag ensures that submodules will be initialized and
+updated as part of the cloning process. If you cloned the `meteor`
+repository without the `--recursive` flag, you can equivalently run
+
+```bash
+git submodule update --init --recursive
+```
+
+in the root of the `meteor` repository. The typical symptom of not
+updating submodules will be `Error: Depending on unknown package ...`
+when you run most Meteor commands.
+
 If you're the sort of person who likes to build everything from scratch,
 you can build all the Meteor dependencies (node.js, npm, mongodb, etc)
 with the provided script. This requires git, a C and C++ compiler,

From bf1de24720481d9e959e167ca6b3600834e938a0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 10:58:02 -0400
Subject: [PATCH 163/688] Mention Blaze submodules in History.md.

---
 History.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 195f1e9ff3..39100a6e04 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,16 @@
-## v.NEXT
+## v1.4.2
+
+* Blaze-related packages have been extracted to
+  [`meteor/blaze`](https://github.com/meteor/blaze), and the main
+  [`meteor/meteor`](https://github.com/meteor/meteor) repository now
+  refers to them via git submodules (see
+  [#7633](https://github.com/meteor/meteor/pull/7633)).
+  When running `meteor` from a checkout, you must now update these
+  submodules by running
+  ```sh
+  git submodule update --init --recursive
+  ```
+  in the root directory of your `meteor` checkout.
 
 * Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
 

From 6bb54e8a3dab2ac0836f76a8cf42abc1a404911e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 10:49:36 -0400
Subject: [PATCH 164/688] Update blaze submodule to latest.

---
 packages-for-isopackets/blaze | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages-for-isopackets/blaze b/packages-for-isopackets/blaze
index 7477ce0ecf..dd65753c32 160000
--- a/packages-for-isopackets/blaze
+++ b/packages-for-isopackets/blaze
@@ -1 +1 @@
-Subproject commit 7477ce0ecf182c1e0f386e51d0829a92cecf86ac
+Subproject commit dd65753c32b5535e33772ceb7ca16e998aaf6f24

From 9001b75f443399cd510f993b9a70b3871362e7f7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 11:17:15 -0400
Subject: [PATCH 165/688] Move packages-for-isopackets/blaze to
 packages/non-core/blaze.

---
 .gitmodules                                          | 6 +++---
 {packages-for-isopackets => packages/non-core}/blaze | 0
 tools/tool-env/isopackets.js                         | 2 +-
 tools/tool-testing/selftest.js                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {packages-for-isopackets => packages/non-core}/blaze (100%)

diff --git a/.gitmodules b/.gitmodules
index 185d643929..a0767ce460 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "packages-for-isopackets/blaze"]
-	path = packages-for-isopackets/blaze
-	url = https://github.com/meteor/blaze.git
+[submodule "packages/non-core/blaze"]
+    path = packages/non-core/blaze
+    url = https://github.com/meteor/blaze.git
diff --git a/packages-for-isopackets/blaze b/packages/non-core/blaze
similarity index 100%
rename from packages-for-isopackets/blaze
rename to packages/non-core/blaze
diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index 74a2fd400a..32701e4ddd 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -230,7 +230,7 @@ var newIsopacketBuildingCatalog = function () {
         localPackageSearchDirs: [
           files.pathJoin(files.getCurrentToolsDir(), 'packages'),
           files.pathJoin(files.getCurrentToolsDir(),
-            'packages-for-isopackets', 'blaze', 'packages')
+            'packages', 'non-core', 'blaze', 'packages')
         ],
         buildingIsopackets: true
       });
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 2bf5915565..4b45534370 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -218,7 +218,7 @@ var newSelfTestCatalog = function () {
         localPackageSearchDirs: [
           files.pathJoin(files.getCurrentToolsDir(), 'packages'),
           files.pathJoin(files.getCurrentToolsDir(),
-            'packages-for-isopackets', 'blaze', 'packages')
+            'packages', 'non-core', 'blaze', 'packages')
         ],
       });
     });

From d411113e7f876b7266d8a45343f3541e10ab8234 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 11:20:25 -0400
Subject: [PATCH 166/688] Update the `npm` npm package to v3.10.7.

---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 39100a6e04..41dbf33dd7 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v1.4.2
 
+* The `npm` npm package has been updated to 3.10.7.
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 5e2e858e55..fdc31fe8db 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -7,7 +7,7 @@ UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
 NODE_VERSION=4.5.0
-NPM_VERSION=3.10.6
+NPM_VERSION=3.10.7
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 7daff12cda..20fcdcd2e7 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.6",
+    npm: "3.10.7",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.29",
     "meteor-babel": "0.12.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 61953f70d4..7a7099688e 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -3,7 +3,7 @@
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.5.0"
-$NPM_VERSION = "3.10.6"
+$NPM_VERSION = "3.10.7"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists

From 0d1834368bb0263b220e510cba67c38fc5612c8b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 11:22:33 -0400
Subject: [PATCH 167/688] Update the `node-pre-gyp` npm package to v0.6.30.

---
 History.md                         | 2 ++
 scripts/dev-bundle-tool-package.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 41dbf33dd7..6ce6ddb639 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,8 @@
 
 * The `npm` npm package has been updated to 3.10.7.
 
+* The `node-pre-gyp` npm package has been updated to 0.6.30.
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 20fcdcd2e7..b59aa5ed45 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -13,7 +13,7 @@ var packageJson = {
     // and we want to make sure there are no dependencies on a higher version
     npm: "3.10.7",
     "node-gyp": "3.4.0",
-    "node-pre-gyp": "0.6.29",
+    "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.12.0",
     "meteor-promise": "0.7.2",
     fibers: "1.0.13",

From 32d02beead15495e04c1d2fab8a1bf5e56337bfe Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 11:23:10 -0400
Subject: [PATCH 168/688] Update the `fibers` npm package to v1.0.14.

---
 History.md                           | 2 ++
 scripts/dev-bundle-server-package.js | 2 +-
 scripts/dev-bundle-tool-package.js   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 6ce6ddb639..5d873e6210 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,8 @@
 
 * The `node-pre-gyp` npm package has been updated to 0.6.30.
 
+* The `fibers` npm package has been updated to 1.0.14.
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 6c03d52c98..8f9213308a 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   version: "0.0.0",
   dependencies: {
     "meteor-promise": "0.7.2",
-    fibers: "1.0.13",
+    fibers: "1.0.14",
     promise: "7.1.1",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
     // in the package too) because we should consider using lodash instead
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index b59aa5ed45..437f1bd202 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -16,7 +16,7 @@ var packageJson = {
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.12.0",
     "meteor-promise": "0.7.2",
-    fibers: "1.0.13",
+    fibers: "1.0.14",
     promise: "7.1.1",
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.
     "babel-runtime": "6.9.2",

From a550c5317e316b6629f46f3fdfd523aa0bb55e07 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 11:29:39 -0400
Subject: [PATCH 169/688] Bump $BUNDLE_VERSION to 4.2.10 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 03d4169b23..69cc882afd 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.9
+BUNDLE_VERSION=4.2.10
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From c6a54546c22da918b001d42164370d021a857eed Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 12:12:35 -0400
Subject: [PATCH 170/688] Avoid hard-coding packages/non-core/blaze in tools
 code.

Now that the blaze submodule is mounted inside the packages/non-core/
directory, it appears that we no longer have to mention it explicitly in
the localPackageSearchDirs array.
---
 tools/tool-env/isopackets.js   | 2 --
 tools/tool-testing/selftest.js | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index 32701e4ddd..f2e7ff2bd1 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -229,8 +229,6 @@ var newIsopacketBuildingCatalog = function () {
       isopacketCatalog.initialize({
         localPackageSearchDirs: [
           files.pathJoin(files.getCurrentToolsDir(), 'packages'),
-          files.pathJoin(files.getCurrentToolsDir(),
-            'packages', 'non-core', 'blaze', 'packages')
         ],
         buildingIsopackets: true
       });
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 4b45534370..7807d0f675 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -217,8 +217,6 @@ var newSelfTestCatalog = function () {
       selfTestCatalog.initialize({
         localPackageSearchDirs: [
           files.pathJoin(files.getCurrentToolsDir(), 'packages'),
-          files.pathJoin(files.getCurrentToolsDir(),
-            'packages', 'non-core', 'blaze', 'packages')
         ],
       });
     });

From 497270eabeb0ce8cb4ebd57e8488cc12a8582d8c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 13:27:13 -0400
Subject: [PATCH 171/688] Add glob package to dev_bundle/lib/node_modules.

---
 scripts/dev-bundle-tool-package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 437f1bd202..bb5d8378ae 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -41,6 +41,7 @@ var packageJson = {
     "wordwrap": "0.0.2",
     "moment": "2.8.4",
     "rimraf": "2.4.3",
+    "glob": "7.0.6",
     // XXX: When we update this, see if it fixes this Github issue:
     // https://github.com/jgm/CommonMark/issues/276 . If it does, remove the
     // workaround from the tool.

From 0e4217a2593c1ce6199777746de566dd1c967372 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 13:27:44 -0400
Subject: [PATCH 172/688] Bump $BUNDLE_VERSION to 4.2.11 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 69cc882afd..1464e4977a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.10
+BUNDLE_VERSION=4.2.11
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 3fce5e6f9320eb648493faf4da7af7901a43e9c0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 13:23:26 -0400
Subject: [PATCH 173/688] Accept glob patterns for local package search
 directories.

---
 tools/packaging/catalog/catalog-local.js | 34 +++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index 0734dbd8b5..353b9358bd 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -4,6 +4,7 @@ var files = require('../../fs/files.js');
 var watch = require('../../fs/watch.js');
 var PackageSource = require('../../isobuild/package-source.js');
 import { KNOWN_ISOBUILD_FEATURE_PACKAGES } from '../../isobuild/compiler.js';
+import { sync as glob } from "glob";
 
 // LocalCatalog represents packages located in the application's
 // package directory, other package directories specified via an
@@ -48,8 +49,8 @@ var LocalCatalog = function (options) {
 _.extend(LocalCatalog.prototype, {
   toString: function () {
     var self = this;
-    return "LocalCatalog [localPackageSearchDirs="
-      + self.localPackageSearchDirs + "]";
+    return "LocalCatalog [localPackageSearchDirs=" +
+      JSON.stringify(self.localPackageSearchDirs) + "]";
   },
 
   // Initialize the Catalog. This must be called before any other
@@ -73,14 +74,29 @@ _.extend(LocalCatalog.prototype, {
 
     options = options || {};
 
-    self.localPackageSearchDirs = _.map(
-      options.localPackageSearchDirs, function (p) {
-        return files.pathResolve(p);
-      });
-    self.explicitlyAddedLocalPackageDirs = _.map(
-      options.explicitlyAddedLocalPackageDirs, function (p) {
-        return files.pathResolve(p);
+    function addPatternsToList(patterns, list) {
+      if (! patterns) {
+        return;
+      }
+
+      patterns.forEach(pattern => {
+        // Note: glob expects POSIX-style paths, even on Windows.
+        // https://github.com/isaacs/node-glob/blob/master/README.md#windows
+        glob(pattern).forEach(
+          p => list.push(files.pathResolve(p))
+        );
       });
+    }
+
+    addPatternsToList(
+      options.localPackageSearchDirs,
+      self.localPackageSearchDirs = [],
+    );
+
+    addPatternsToList(
+      options.explicitlyAddedLocalPackageDirs,
+      self.explicitlyAddedLocalPackageDirs = [],
+    );
 
     self._computeEffectiveLocalPackages();
     self._loadLocalPackages(options.buildingIsopackets);

From 17f79c66ce76bf5dd132dcaff3fd9688549db2ff Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 13:24:39 -0400
Subject: [PATCH 174/688] Search packages/non-core/*/packages for local
 packages.

Currently this finds only Blaze-related packages, but it does so without
hard-coding "blaze" in tools code.
---
 tools/project-context.js     | 8 +++++++-
 tools/tool-env/isopackets.js | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/project-context.js b/tools/project-context.js
index 9dfde085d6..ee954a0a31 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -607,7 +607,13 @@ _.extend(ProjectContext.prototype, {
     if (! self._ignoreCheckoutPackages && files.inCheckout()) {
       // Running from a checkout, so use the Meteor core packages from the
       // checkout.
-      searchDirs.push(files.pathJoin(files.getCurrentToolsDir(), 'packages'));
+      const packagesDir =
+        files.pathJoin(files.getCurrentToolsDir(), 'packages');
+
+      searchDirs.push(
+        packagesDir,
+        files.pathJoin(packagesDir, "non-core", "*", "packages"),
+      );
     }
     return searchDirs;
   },
diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index f2e7ff2bd1..2e491a999d 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -221,6 +221,9 @@ var newIsopacketBuildingCatalog = function () {
   var messages = buildmessage.capture(
     { title: "scanning local core packages" },
     function () {
+      const packagesDir =
+        files.pathJoin(files.getCurrentToolsDir(), 'packages');
+
       // When running from a checkout, isopacket building does use local
       // packages, but *ONLY THOSE FROM THE CHECKOUT*: not app packages or
       // $PACKAGE_DIRS packages.  One side effect of this: we really really
@@ -228,7 +231,8 @@ var newIsopacketBuildingCatalog = function () {
       // (there's no worries about needing to springboard).
       isopacketCatalog.initialize({
         localPackageSearchDirs: [
-          files.pathJoin(files.getCurrentToolsDir(), 'packages'),
+          packagesDir,
+          files.pathJoin(packagesDir, "non-core", "*", "packages"),
         ],
         buildingIsopackets: true
       });

From 26d082b62ef6f6d92e80f69f18b6bede65bd7e98 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 13:55:24 -0400
Subject: [PATCH 175/688] Update `meteor-promise` npm package to v0.7.4.

Fixes a bug where .then callbacks could be wrapped multiple times:
https://github.com/meteor/promise/pull/11
---
 .../promise/.npm/package/npm-shrinkwrap.json  | 20 +++++++++----------
 packages/promise/package.js                   |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
index b65eb73c37..ba12554e09 100644
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ b/packages/promise/.npm/package/npm-shrinkwrap.json
@@ -1,21 +1,19 @@
 {
   "dependencies": {
+    "asap": {
+      "version": "2.0.4",
+      "resolved": "file:node_shrinkwrap/asap-2.0.4.tgz",
+      "from": "asap@>=2.0.3 <2.1.0"
+    },
     "meteor-promise": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.7.2.tgz",
-      "from": "meteor-promise@0.7.2"
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.7.4.tgz",
+      "from": "meteor-promise@0.7.4"
     },
     "promise": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
-      "from": "promise@7.1.1",
-      "dependencies": {
-        "asap": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz",
-          "from": "asap@>=2.0.3 <2.1.0"
-        }
-      }
+      "from": "promise@7.1.1"
     }
   }
 }
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 9e4589b23f..dfb0a1b155 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,18 +1,18 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4",
+  version: "0.8.5",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "meteor-promise": "0.7.2",
+  "meteor-promise": "0.7.4",
   "promise": "7.1.1"
 });
 
 Package.onUse(function(api) {
-  api.use("modules");
+  api.use("modules@0.7.6");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
   api.export("Promise");

From e999db717f1a7a8e1301312a77defcf48a7410ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 14:34:31 -0400
Subject: [PATCH 176/688] Bump promise package version to 0.8.6.

---
 packages/promise/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/promise/package.js b/packages/promise/package.js
index dfb0a1b155..251f9fb726 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.5",
+  version: "0.8.6",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"

From ad61a935146c34e701b16ebc4262590143e8c702 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 16:41:44 -0400
Subject: [PATCH 177/688] Fix bizarre faulty shrinkwrapping of asap package.

---
 packages/promise/.npm/package/npm-shrinkwrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
index ba12554e09..a55c02a3fa 100644
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ b/packages/promise/.npm/package/npm-shrinkwrap.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "asap": {
       "version": "2.0.4",
-      "resolved": "file:node_shrinkwrap/asap-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz",
       "from": "asap@>=2.0.3 <2.1.0"
     },
     "meteor-promise": {

From 391c3b4c260b76baf2a69411fe54bde6e67ae9c0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 16:57:30 -0400
Subject: [PATCH 178/688] Bump promise package version to 0.8.7.

---
 packages/promise/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/promise/package.js b/packages/promise/package.js
index 251f9fb726..781ee1fe05 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.6",
+  version: "0.8.7",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"

From ef023203160851936716e12a24ea64e944e857f9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 17:16:24 -0400
Subject: [PATCH 179/688] Initialize and update submodules in scripts/ci.sh.

---
 scripts/ci.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 3004d2a75d..521bb37395 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -9,6 +9,10 @@ export EMACS=t
 # (#6905), but self-test still needs it, install it now.
 ./meteor npm install -g phantomjs-prebuilt browserstack-webdriver
 
+# Make sure we have initialized and updated submodules such as
+# packages/non-core/blaze.
+git submodule update --init --recursive
+
 # run different jobs based on CicleCI parallel container index
 case $CIRCLE_NODE_INDEX in
 0)

From 1d6fb36547408dea4a4ad46fc426a87990a0ad05 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 9 Sep 2016 17:30:54 -0400
Subject: [PATCH 180/688] Include packages/non-core/*/packages/ in self-test
 search.

---
 tools/tool-testing/selftest.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 7807d0f675..790d65aeb0 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -209,6 +209,9 @@ var newSelfTestCatalog = function () {
   var messages = buildmessage.capture(
     { title: "scanning local core packages" },
     function () {
+      const packagesDir =
+        files.pathJoin(files.getCurrentToolsDir(), 'packages');
+
       // When building a fake warehouse from a checkout, we use local packages,
       // but *ONLY THOSE FROM THE CHECKOUT*: not app packages or $PACKAGE_DIRS
       // packages.  One side effect of this: we really really expect them to all
@@ -216,7 +219,8 @@ var newSelfTestCatalog = function () {
       // about needing to springboard).
       selfTestCatalog.initialize({
         localPackageSearchDirs: [
-          files.pathJoin(files.getCurrentToolsDir(), 'packages'),
+          packagesDir,
+          files.pathJoin(packagesDir, "non-core", "*", "packages"),
         ],
       });
     });

From 4abaa5eb20d8f3e7db6eb8a44238602dc6a458c7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 13:03:48 -0400
Subject: [PATCH 181/688] Exclude non-core packages from
 localCatalog.getAllNonTestPackageNames.

This should prevent `meteor admin publish-release` from unnecessarily
checking the consistency of non-core packages.
---
 tools/packaging/catalog/catalog-local.js | 30 +++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index 353b9358bd..3612af7f82 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -122,14 +122,38 @@ _.extend(LocalCatalog.prototype, {
 
   // Return an array with the names of all of the non-test packages that we know
   // about, in no particular order.
-  getAllNonTestPackageNames: function (options) {
+  getAllNonTestPackageNames: function ({
+    // Iff options.includeNonCore is truthy, packages in
+    // meteor/packages/non-core/*/packages will be returned.
+    includeNonCore = false,
+  } = {}) {
     var self = this;
     self._requireInitialized();
 
     var ret = [];
-    _.each(self.packages, function (record, name) {
-      record.versionRecord.isTest || ret.push(name);
+
+    const nonCoreDir = files.pathJoin(
+      files.getCurrentToolsDir(),
+      "packages",
+      "non-core"
+    ) + files.pathSep;
+
+    _.each(self.packages, function ({
+      packageSource: { sourceRoot },
+      versionRecord: { isTest },
+    }, name) {
+      if (isTest) {
+        return;
+      }
+
+      if (! includeNonCore &&
+          sourceRoot.startsWith(nonCoreDir)) {
+        return;
+      }
+
+      ret.push(name);
     });
+
     return ret;
   },
 

From c1f01cc860a80e5b658bf4b61a5d4eca22d7b19a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 11:08:57 -0400
Subject: [PATCH 182/688] Bump package versions for 1.4.2-beta.1 release.

---
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 80e0c52044..ecf97cd65f 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 761e4921ba..a3c795329b 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 474b051f8a..5a13b56e67 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 5162c639ea..d37672113a 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 63662662f7..143fa6bedf 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 6e1e8e9dcb..6f499fb79f 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.0"
+  version: "1.3.1-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 63bb4aa397..a4425158ec 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.11"
+  version: "1.1.12-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index c3717d39e7..02bfe6331e 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.12"
+  version: "1.1.13-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 7ece3606fc..eeeb3ad76b 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.10"
+  version: "1.0.11-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index a3b6310242..37a60044c7 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.9'
+  version: '1.0.10-beta.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 3feb3ff339..840be4a4c4 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4_1"
+  version: "1.2.5-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 7643da24c9..fe3c55d070 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8',
+  version: '0.5.9-beta.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 6201d0d559..9e954183fd 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.9"
+  version: "1.2.10-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index c5321745a6..079daa1be9 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.8'
+  version: '1.0.9-beta.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index bfca6a7083..be2ffbb4c9 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.8"
+  version: "1.1.9-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 79218ef129..9aaa5148b7 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.14"
+  version: "1.1.15-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index ac0a88c577..11b9de082d 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5',
+  version: '2.7.6-beta.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 4c3058c8c4..041c6ebd67 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.4"
+  version: "1.6.5-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 1283d699f7..c93505de06 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.9"
+  version: "1.1.10-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 4bd08c3606..804282e292 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.0'
+  version: '1.4.2-beta.1'
 });
 
 Package.includeTool();
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 3c6acdee55..c5e9800069 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.49',
+  version: '1.5.50-beta.1',
   documentation: null
 });
 
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 8285d3017f..7eb79a59c0 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5"
+  version: "2.513.6-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index a62e160ed7..f95e4293f6 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.12',
+  version: '1.0.13-beta.1',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 27fc45b59f..aae0aaa2ab 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.12'
+  version: '1.1.13-beta.1'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 6fcf9a54b8..174c5340eb 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11'
+  version: '1.3.12-beta.1'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 058fa77d84..9cf7380da5 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.8'
+  version: '1.1.9-beta.1'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 7f2569d003..38b4d5bc58 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.0",
+ "version": "1.4.2-beta.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From c7edab4e62ec6ad4cb74a45b89e7705dc0802fd8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 13:58:12 -0400
Subject: [PATCH 183/688] Initialize and update submodules when publishing
 meteor-tool.

---
 scripts/admin/publish-meteor-tool-on-arch.sh | 1 +
 scripts/admin/publish-meteor-tool.bat        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/admin/publish-meteor-tool-on-arch.sh b/scripts/admin/publish-meteor-tool-on-arch.sh
index 8fc77609e6..444fd32f65 100755
--- a/scripts/admin/publish-meteor-tool-on-arch.sh
+++ b/scripts/admin/publish-meteor-tool-on-arch.sh
@@ -54,6 +54,7 @@ if [ -d meteor ]; then
 fi
 git clone --recursive https://github.com/meteor/meteor.git
 cd meteor
+git submodule update --init --recursive
 git fetch --tags
 END
 
diff --git a/scripts/admin/publish-meteor-tool.bat b/scripts/admin/publish-meteor-tool.bat
index 4f0c233441..390287fb19 100644
--- a/scripts/admin/publish-meteor-tool.bat
+++ b/scripts/admin/publish-meteor-tool.bat
@@ -11,8 +11,10 @@ md C:\tmp
 cd C:\tmp
 
 REM get the meteor/meteor repo
-C:\git\bin\git.exe clone https://github.com/meteor/meteor.git
+C:\git\bin\git.exe clone --recursive https://github.com/meteor/meteor.git
 cd meteor
+REM make extra sure to initialize and update submodules
+C:\git\bin\git.exe submodule update --init --recursive
 REM force git to use original end-line characters (unixy '\n')
 C:\git\bin\git.exe config --replace-all core.autocrlf input
 C:\git\bin\git.exe rm --cached -r . ^> nul

From a6b42cc418b259aa505a716fe60e07b90323e33b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 13:58:43 -0400
Subject: [PATCH 184/688] Make includeNonCore true by default in
 getAllNonTestPackageNames.

---
 tools/cli/commands-packages.js           | 4 +++-
 tools/packaging/catalog/catalog-local.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 36e0bff234..4f3a74316c 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -863,7 +863,9 @@ main.registerCommand({
     // Ensure that all packages and their tests are built. (We need to build
     // tests so that we can include their sources in source tarballs.)
     var allPackagesWithTests = projectContext.localCatalog.getAllPackageNames();
-    var allPackages = projectContext.localCatalog.getAllNonTestPackageNames();
+    var allPackages = projectContext.localCatalog.getAllNonTestPackageNames({
+      includeNonCore: false,
+    });
     projectContext.projectConstraintsFile.addConstraints(
       _.map(allPackagesWithTests, function (p) {
         return utils.parsePackageConstraint(p);
diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index 3612af7f82..52bbb0ccb4 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -125,7 +125,7 @@ _.extend(LocalCatalog.prototype, {
   getAllNonTestPackageNames: function ({
     // Iff options.includeNonCore is truthy, packages in
     // meteor/packages/non-core/*/packages will be returned.
-    includeNonCore = false,
+    includeNonCore = true,
   } = {}) {
     var self = this;
     self._requireInitialized();

From 772d6a914a8b41ccb952b07272429967516842f0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 14:00:49 -0400
Subject: [PATCH 185/688] Bump package versions for 1.4.2-beta.2 release.

Note that no binaries were successfully published for beta.1, so please
don't try updating to that version!
---
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index ecf97cd65f..cd840a7eeb 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index a3c795329b..9effe8729a 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 5a13b56e67..f193824f87 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index d37672113a..9911f52873 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 143fa6bedf..4be3862462 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 6f499fb79f..19b9457b84 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.1"
+  version: "1.3.1-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index a4425158ec..7ec73ebadf 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.1"
+  version: "1.1.12-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 02bfe6331e..aae8ff75bd 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.1"
+  version: "1.1.13-beta.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index eeeb3ad76b..50ef4df5a5 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.1"
+  version: "1.0.11-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 37a60044c7..4061a21fa2 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.10-beta.1'
+  version: '1.0.10-beta.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 840be4a4c4..f3abacf011 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.1"
+  version: "1.2.5-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index fe3c55d070..bd73a8f95a 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.1',
+  version: '0.5.9-beta.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 9e954183fd..76c2970ffd 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.1"
+  version: "1.2.10-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 079daa1be9..c123f6e440 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.1'
+  version: '1.0.9-beta.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index be2ffbb4c9..fa4df8fb9c 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.1"
+  version: "1.1.9-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 9aaa5148b7..99f846bfd9 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.1"
+  version: "1.1.15-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 11b9de082d..a96040281e 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.1',
+  version: '2.7.6-beta.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 041c6ebd67..0a0af85148 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.1"
+  version: "1.6.5-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index c93505de06..9e59d8a4ff 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.1"
+  version: "1.1.10-beta.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 804282e292..3ad128589d 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.1'
+  version: '1.4.2-beta.2'
 });
 
 Package.includeTool();
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index c5e9800069..1738862a15 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.50-beta.1',
+  version: '1.5.50-beta.2',
   documentation: null
 });
 
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 7eb79a59c0..712cb6cce5 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.1"
+  version: "2.513.6-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index f95e4293f6..5b109563b6 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.1',
+  version: '1.0.13-beta.2',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index aae0aaa2ab..fee8573486 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.1'
+  version: '1.1.13-beta.2'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 174c5340eb..2cbcb0bf9e 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.1'
+  version: '1.3.12-beta.2'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 9cf7380da5..6127721feb 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.1'
+  version: '1.1.9-beta.2'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 38b4d5bc58..365288034a 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.1",
+ "version": "1.4.2-beta.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 3557d313477e8ae8b27bec6633515430499d5c48 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 15:22:35 -0400
Subject: [PATCH 186/688] Give POSIX paths without drive letters to glob on
 Windows.

---
 tools/packaging/catalog/catalog-local.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index 52bbb0ccb4..5a613c3e5a 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -80,6 +80,18 @@ _.extend(LocalCatalog.prototype, {
       }
 
       patterns.forEach(pattern => {
+        if (process.platform === "win32") {
+          pattern = files.convertToOSPath(pattern);
+
+          if (pattern.charAt(1) === ":") {
+            // Get rid of drive prefix, e.g. C:
+            pattern = pattern.slice(2);
+          }
+
+          // Convert to /forward/slash/path without /C
+          pattern = files.convertToPosixPath(pattern, true);
+        }
+
         // Note: glob expects POSIX-style paths, even on Windows.
         // https://github.com/isaacs/node-glob/blob/master/README.md#windows
         glob(pattern).forEach(

From a90ff721ba6d16e8ecf86761d593f507f982f5a4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 15:24:07 -0400
Subject: [PATCH 187/688] Update submodules *after* checking out appropriate
 revision.

---
 scripts/admin/publish-meteor-tool-on-arch.sh | 3 +--
 scripts/admin/publish-meteor-tool.bat        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/admin/publish-meteor-tool-on-arch.sh b/scripts/admin/publish-meteor-tool-on-arch.sh
index 444fd32f65..9041ac4035 100755
--- a/scripts/admin/publish-meteor-tool-on-arch.sh
+++ b/scripts/admin/publish-meteor-tool-on-arch.sh
@@ -54,12 +54,11 @@ if [ -d meteor ]; then
 fi
 git clone --recursive https://github.com/meteor/meteor.git
 cd meteor
-git submodule update --init --recursive
 git fetch --tags
 END
 
     # checkout the SHA1 we want to publish
-    echo "cd meteor; git checkout $GITSHA" | METEOR_SESSION_FILE="$SESSION_FILE" "$METEOR" admin get-machine "$PLATFORM"
+    echo "cd meteor; git checkout $GITSHA; git submodule update --init --recursive" | METEOR_SESSION_FILE="$SESSION_FILE" "$METEOR" admin get-machine "$PLATFORM"
     # publish the release
     echo "cd meteor/packages/meteor-tool && env METEOR_SESSION_FILE=~/session ../../meteor publish --existing-version" | METEOR_SESSION_FILE=$SESSION_FILE $METEOR admin get-machine $PLATFORM
 
diff --git a/scripts/admin/publish-meteor-tool.bat b/scripts/admin/publish-meteor-tool.bat
index 390287fb19..70f5b5138d 100644
--- a/scripts/admin/publish-meteor-tool.bat
+++ b/scripts/admin/publish-meteor-tool.bat
@@ -13,8 +13,6 @@ cd C:\tmp
 REM get the meteor/meteor repo
 C:\git\bin\git.exe clone --recursive https://github.com/meteor/meteor.git
 cd meteor
-REM make extra sure to initialize and update submodules
-C:\git\bin\git.exe submodule update --init --recursive
 REM force git to use original end-line characters (unixy '\n')
 C:\git\bin\git.exe config --replace-all core.autocrlf input
 C:\git\bin\git.exe rm --cached -r . ^> nul
@@ -22,6 +20,8 @@ C:\git\bin\git.exe reset --hard
 C:\git\bin\git.exe fetch --tags
 REM GITSHA is replaced by the script transferring this file
 C:\git\bin\git.exe checkout $GITSHA
+REM make extra sure to initialize and update submodules
+C:\git\bin\git.exe submodule update --init --recursive
 
 REM install 7-zip, required for running meteor from checkout
 C:\git\bin\curl -L http://www.7-zip.org/a/7z1602.msi ^> C:\7z.msi

From 583bd366e42aa7c4a0df84ff401d7b5f11a2ec80 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 13 Sep 2016 15:25:23 -0400
Subject: [PATCH 188/688] Bump package versions for 1.4.2-beta.3 release.

Note that no binaries were successfully published for beta.2, so please
don't try updating to that version!
---
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index cd840a7eeb..c99ec43f00 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 9effe8729a..8b146ad865 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index f193824f87..021d22119c 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 9911f52873..00b213b6ff 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 4be3862462..a589c4d817 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 19b9457b84..1b0c30437c 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.2"
+  version: "1.3.1-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 7ec73ebadf..4242e6e527 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.2"
+  version: "1.1.12-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index aae8ff75bd..8af073a65c 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.2"
+  version: "1.1.13-beta.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 50ef4df5a5..d728bd9cc3 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.2"
+  version: "1.0.11-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 4061a21fa2..577e8a5f8f 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.10-beta.2'
+  version: '1.0.10-beta.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index f3abacf011..807e8b2b4e 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.2"
+  version: "1.2.5-beta.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index bd73a8f95a..aa7f676dfa 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.2',
+  version: '0.5.9-beta.3',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 76c2970ffd..b7f500838d 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.2"
+  version: "1.2.10-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index c123f6e440..329d129cc5 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.2'
+  version: '1.0.9-beta.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index fa4df8fb9c..6503e1524c 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.2"
+  version: "1.1.9-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 99f846bfd9..0684313561 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.2"
+  version: "1.1.15-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index a96040281e..8d544ed0c1 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.2',
+  version: '2.7.6-beta.3',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 0a0af85148..1067edad4f 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.2"
+  version: "1.6.5-beta.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 9e59d8a4ff..93c999b013 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.2"
+  version: "1.1.10-beta.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3ad128589d..b25242e6ad 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.2'
+  version: '1.4.2-beta.3'
 });
 
 Package.includeTool();
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 1738862a15..017723730e 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.50-beta.2',
+  version: '1.5.50-beta.3',
   documentation: null
 });
 
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 712cb6cce5..da4404feb6 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.2"
+  version: "2.513.6-beta.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 5b109563b6..8aa0581733 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.2',
+  version: '1.0.13-beta.3',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index fee8573486..c479ae37c4 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.2'
+  version: '1.1.13-beta.3'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 2cbcb0bf9e..9fb1bfe11b 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.2'
+  version: '1.3.12-beta.3'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 6127721feb..c2112074cb 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.2'
+  version: '1.1.9-beta.3'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 365288034a..8d7f4ff6f5 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.2",
+ "version": "1.4.2-beta.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From ffa7de25591f7d6b9dcba5868fe35b26cfb6ba20 Mon Sep 17 00:00:00 2001
From: Michael Mason <mjmasn@users.noreply.github.com>
Date: Thu, 15 Sep 2016 15:00:28 +0100
Subject: [PATCH 189/688] Pass object with error to onLoginFailure hooks
 (#7699)

* Pass object with error to onLoginFailure hooks

* Use es6 property shorthand
---
 packages/accounts-base/accounts_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index a7e83902f5..b4c1debf29 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -191,7 +191,7 @@ Ap.callLoginMethod = function (options) {
       });
     } else {
       self._onLoginFailureHook.each(function (callback) {
-        callback();
+        callback({ error });
         return true;
       });
     }

From 1850105f9065cd12fab6739d2e08f853c8835a13 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 15 Sep 2016 16:15:04 -0400
Subject: [PATCH 190/688] Refactor production node_modules filtering.

---
 tools/isobuild/bundler.js | 122 ++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 51 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index b3686c7b80..0b5f253fda 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -416,6 +416,72 @@ export class NodeModulesDirectory {
 
     return nodeModulesDirectories;
   }
+
+  // Returns a predicate function that determines if a given directory is
+  // contained by a production package directory in this.sourcePath.
+  getProdPackagePredicate() {
+    if (this._prodPackagePredicate) {
+      return this._prodPackagePredicate;
+    }
+
+    const sourcePath = this.sourcePath;
+    const prodPackageNames = meteorNpm.getProdPackageNames(sourcePath);
+    if (! prodPackageNames) {
+      // Indicates that no directories should be excluded from the set of
+      // production packages. Equivalent to returning dir => true.
+      return null;
+    }
+
+    const prodPackageTree = Object.create(null);
+    const complete = Symbol();
+    let maxPartCount = 0;
+
+    Object.keys(prodPackageNames).forEach(name => {
+      const parts = name.split("/");
+      let tree = prodPackageTree;
+
+      parts.forEach(part => {
+        tree = tree[part] || (tree[part] = Object.create(null));
+      });
+
+      tree[complete] = true;
+      maxPartCount = Math.max(parts.length, maxPartCount);
+    });
+
+    return this._prodPackagePredicate = function isWithinProdPackage(dir) {
+      const parts = files.pathRelative(sourcePath, dir)
+        .split(files.pathSep);
+
+      let start = parts.lastIndexOf("node_modules") + 1;
+
+      if (parts.length - start > maxPartCount) {
+        // We're deep enough inside node_modules that it's safe to
+        // say we should have returned false earlier.
+        return true;
+      }
+
+      let tree = prodPackageTree;
+
+      for (let pos = start; pos < parts.length; ++pos) {
+        const part = parts[pos];
+        const branch = tree[part];
+
+        if (! branch) {
+          // This dir is not prefixed by a production package name.
+          return false;
+        }
+
+        if (branch[complete]) {
+          // This dir is prefixed by a complete production package name.
+          break;
+        }
+
+        tree = branch;
+      }
+
+      return true;
+    };
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1888,25 +1954,11 @@ class JsImage {
           symlink: (options.includeNodeModules === 'symlink')
         };
 
-        if (nmd.local) {
-          const prodPackageTree = Object.create(null);
-          const complete = Symbol();
-          let maxPartCount = 0;
-
-          Object.keys(
-            meteorNpm.getProdPackageNames(nmd.sourcePath)
-          ).forEach(name => {
-            const parts = name.split("/");
-            let tree = prodPackageTree;
-
-            parts.forEach(part => {
-              tree = tree[part] || (tree[part] = Object.create(null));
-            });
-
-            tree[complete] = true;
-            maxPartCount = Math.max(parts.length, maxPartCount);
-          });
+        const prodPackagePredicate =
+          nmd.local && // Only filter local node_modules directories.
+          nmd.getProdPackagePredicate();
 
+        if (prodPackagePredicate) {
           // When copying a local node_modules directory, ignore any npm
           // package directories not in the list of production package
           // names, as determined by meteorNpm.getProdPackageNames. Note
@@ -1917,39 +1969,7 @@ class JsImage {
           // package's "dependencies", then every copy of that package
           // will be copied to the destination directory. A little bit of
           // overcopying vastly simplifies the job of directoryFilter.
-          copyOptions.directoryFilter = function isWithinProdPackage(dir) {
-            const parts = files.pathRelative(nmd.sourcePath, dir)
-              .split(files.pathSep);
-
-            let start = parts.lastIndexOf("node_modules") + 1;
-
-            if (parts.length - start > maxPartCount) {
-              // We're deep enough inside node_modules that it's safe to
-              // say we should have returned false earlier.
-              return true;
-            }
-
-            let tree = prodPackageTree;
-
-            for (let pos = start; pos < parts.length; ++pos) {
-              const part = parts[pos];
-              const branch = tree[part];
-
-              if (! branch) {
-                // This dir is not prefixed by a production package name.
-                return false;
-              }
-
-              if (branch[complete]) {
-                // This dir is prefixed by a complete production package name.
-                break;
-              }
-
-              tree = branch;
-            }
-
-            return true;
-          };
+          copyOptions.directoryFilter = prodPackagePredicate;
         }
 
         builder.copyDirectory(copyOptions);

From d618cc61a304e004fb13e4c9a469960c971021b9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 15 Sep 2016 16:15:26 -0400
Subject: [PATCH 191/688] Optimize meteorNpm.getProdPackageNames by not calling
 runNpmCommand.

For the galaxy-server application, this reduces the time taken to
determine production node_modules from 1400ms to 120ms.

As another optimization, we could record the hashes of all the
package.json files encountered in this scan, and return the same set of
production package names if those hashes have not changed, though the
benefits may not be worth the additional complexity.
---
 tools/isobuild/meteor-npm.js | 89 ++++++++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 23 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 5416617b34..a6d0c77f26 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -123,41 +123,84 @@ meteorNpm.updateDependencies = function (packageName,
   return true;
 };
 
-// Returns a flattened list of npm package names used in production.
-meteorNpm.getProdPackageNames = function (nodeModulesDir) {
-  var names = Object.create(null);
-  var lsCmdArgs = ["ls", "--json"];
+// Returns a flattened dictionary of npm package names used in production,
+// or false if there is no package.json file in the parent directory.
+export function getProdPackageNames(nodeModulesDir) {
+  const names = Object.create(null);
+  const dirs = Object.create(null);
+  const nodeModulesDirStack = [];
 
-  const packageJsonPath = files.pathJoin(
-    files.pathDirname(nodeModulesDir),
-    "package.json"
-  );
+  // Returns true iff dir is a package directory.
+  function walk(dir) {
+    const packageJsonPath = files.pathJoin(dir, "package.json");
+    const packageJsonStat = files.statOrNull(packageJsonPath);
 
-  const packageJsonStat = files.statOrNull(packageJsonPath);
-  if (packageJsonStat &&
-      packageJsonStat.isFile()) {
-    // If there is no package.json file, adding --production will cause
-    // the names object to be empty, which is not what we want.
-    lsCmdArgs.push("--production");
+    if (packageJsonStat &&
+        packageJsonStat.isFile()) {
+      const pkg = JSON.parse(files.readFile(packageJsonPath));
+      const nodeModulesDir = files.pathJoin(dir, "node_modules");
+      nodeModulesDirStack.push(nodeModulesDir);
+
+      // Scan all dependencies except pkg.devDependencies.
+      scanDeps(pkg.dependencies);
+      scanDeps(pkg.peerDependencies);
+      scanDeps(pkg.optionalDependencies);
+      scanDeps(pkg.bundledDependencies);
+      // This typo is also honored.
+      scanDeps(pkg.bundleDependencies);
+
+      assert.strictEqual(
+        nodeModulesDirStack.pop(),
+        nodeModulesDir
+      );
+
+      return true;
+    }
+
+    return false;
   }
 
-  var lsResult = runNpmCommand(lsCmdArgs, nodeModulesDir);
-
-  function walk(deps) {
+  function scanDeps(deps) {
     if (! deps) {
       return;
     }
 
-    Object.keys(deps).forEach(function (name) {
-      names[name] = true;
-      walk(deps[name].dependencies);
+    Object.keys(deps).forEach(name => {
+      const resDir = resolve(name);
+      if (! resDir || _.has(dirs, resDir)) {
+        return;
+      }
+
+      // Record that we've seen this directory so that we don't try to
+      // walk it again.
+      dirs[resDir] = name;
+
+      if (walk(resDir)) {
+        // If resDir is indeed a package directory, record the package
+        // name in the set of production names.
+        names[name] = true;
+      }
     });
   }
 
-  walk(JSON.parse(lsResult.stdout).dependencies);
+  function resolve(name) {
+    for (let i = nodeModulesDirStack.length - 1; i >= 0; --i) {
+      const nodeModulesDir = nodeModulesDirStack[i];
+      const candidate = files.pathJoin(nodeModulesDir, name);
+      const stat = files.statOrNull(candidate);
+      if (stat && stat.isDirectory()) {
+        return candidate;
+      }
+    }
+  }
 
-  return names;
-};
+  // If the top-level nodeModulesDir is not contained by a package
+  // directory with a package.json file, then we return false to indicate
+  // that we don't know or care which packages are production-specific.
+  // Concretely, this means your app needs to have a package.json file if
+  // you want any npm packages to be excluded in production.
+  return walk(files.pathDirname(nodeModulesDir)) && names;
+}
 
 const lastRebuildJSONFilename = ".meteor-last-rebuild-version.json";
 

From 219b18168d9e8b8aba82762900bad76783028333 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 15 Sep 2016 18:12:46 -0400
Subject: [PATCH 192/688] Establish a global source of truth for file watching
 events.

This should not only reduce the total resource usage of the file watching
system, but pave the way for a faster implementation of watch.isUpToDate.
---
 tools/fs/safe-pathwatcher.js | 116 +++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 39 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 38213c3d2d..b9ba094b2c 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -17,24 +17,87 @@ var NO_PATHWATCHER_POLLING_INTERVAL =
 
 var suggestedRaisingWatchLimit = false;
 
-exports.watch = function watch(absPath, callback) {
-  var lastPathwatcherEventTime = 0;
+const watchers = Object.create(null);
+
+function acquireWatcher(absPath, callback) {
+  const entry = watchers[absPath] || (
+    watchers[absPath] = startNewWatcher(absPath));
+
+  // The size of the entry.callbacks Set also serves as a reference count
+  // for this watcher.
+  entry.callbacks.add(callback);
+
+  return entry;
+}
+
+function startNewWatcher(absPath) {
+  let lastPathwatcherEventTime = 0;
+  const callbacks = new Set;
+
+  function pathwatcherWrapper(...args) {
+    const self = this;
+    lastPathwatcherEventTime = +new Date;
+    callbacks.forEach(cb => cb.apply(self, args));
 
-  function pathwatcherWrapper() {
     // It's tempting to call files.unwatchFile(absPath, watchFileWrapper)
     // here, but previous pathwatcher success is no guarantee of future
     // pathwatcher reliability. For example, pathwatcher works just fine
     // when file changes originate from within a Vagrant VM, but changes
     // to shared files made outside the VM are invisible to pathwatcher,
     // so our only hope of catching them is to continue polling.
-    lastPathwatcherEventTime = +new Date;
-    callback.apply(this, arguments);
   }
 
-  var watcher = null;
+  const watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
+
+  const pollingInterval = watcher
+    ? DEFAULT_POLLING_INTERVAL
+    : NO_PATHWATCHER_POLLING_INTERVAL;
+
+  function watchFileWrapper(...args) {
+    const self = this;
+    // If a pathwatcher event fired in the last polling interval, ignore
+    // this event.
+    if (new Date - lastPathwatcherEventTime > pollingInterval) {
+      callbacks.forEach(cb => cb.apply(self, args));
+    }
+  }
+
+  // We use files.watchFile in addition to pathwatcher.watch as a
+  // fail-safe to detect file changes even on network file systems.
+  // However (unless the user disabled pathwatcher or this pathwatcher
+  // call failed), we use a relatively long default polling interval of
+  // 5000ms to save CPU cycles.
+  files.watchFile(absPath, {
+    persistent: false,
+    interval: pollingInterval
+  }, watchFileWrapper);
+
+  return {
+    callbacks,
+    release(callback) {
+      if (! watchers[absPath]) {
+        return;
+      }
+
+      callbacks.delete(callback);
+      if (callbacks.size > 0) {
+        return;
+      }
+
+      // Once there are no more callbacks in the Set, close both watchers
+      // and nullify the shared data.
+      watcher.close();
+      files.unwatchFile(absPath, watchFileWrapper);
+      watchers[absPath] = null;
+    }
+  };
+}
+
+
+function pathwatcherWatch(absPath, callback) {
   if (PATHWATCHER_ENABLED) {
     try {
-      watcher = files.pathwatcherWatch(absPath, pathwatcherWrapper);
+      return files.pathwatcherWatch(absPath, callback);
     } catch (e) {
       // If it isn't an actual pathwatcher failure, rethrow.
       if (e.message !== 'Unable to watch path') {
@@ -65,41 +128,16 @@ exports.watch = function watch(absPath, callback) {
       // ... ignore the error.  We'll still have watchFile, which is good
       // enough.
     }
-  };
-
-  var pollingInterval = watcher
-        ? DEFAULT_POLLING_INTERVAL : NO_PATHWATCHER_POLLING_INTERVAL;
-
-  function watchFileWrapper() {
-    // If a pathwatcher event fired in the last polling interval, ignore
-    // this event.
-    if (new Date - lastPathwatcherEventTime > pollingInterval) {
-      callback.apply(this, arguments);
-    }
   }
 
-  // We use files.watchFile in addition to pathwatcher.watch as a fail-safe to
-  // detect file changes even on network file systems.  However (unless the user
-  // disabled pathwatcher or this pathwatcher call failed), we use a relatively
-  // long default polling interval of 5000ms to save CPU cycles.
-  files.watchFile(absPath, {
-    persistent: false,
-    interval: pollingInterval
-  }, watchFileWrapper);
-
-  var polling = true;
+  return null;
+}
 
+export function watch(absPath, callback) {
+  const entry = acquireWatcher(absPath, callback);
   return {
-    close: function close() {
-      if (watcher) {
-        watcher.close();
-        watcher = null;
-      }
-
-      if (polling) {
-        polling = false;
-        files.unwatchFile(absPath, watchFileWrapper);
-      }
+    close() {
+      entry.release(callback);
     }
   };
-};
+}

From d5f239e4555209ba49546d1adee55c65c616a481 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 15 Sep 2016 19:01:12 -0400
Subject: [PATCH 193/688] Use global file watching oracle to compute file
 hashes cheaply.

For the galaxy-server application, this reduces the time spent in
watch.isUpToDate from six seconds to a little over second. Of course we
should also try to call it less often, but making it cheaper helps!
---
 tools/fs/safe-pathwatcher.js | 48 +++++++++++++++++++++++++++++++++---
 tools/fs/watch.js            |  9 +++----
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index b9ba094b2c..b6aa1b9ef6 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -1,4 +1,5 @@
 var files = require('./files.js');
+import { readFile, sha1 } from "./watch.js";
 
 // Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
 // force the use of files.watchFile instead of pathwatcher.watch.
@@ -15,6 +16,11 @@ var DEFAULT_POLLING_INTERVAL =
 var NO_PATHWATCHER_POLLING_INTERVAL =
       ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500;
 
+// When a file changes, we wait for this long before actually recomputing
+// its hash, though of course we compute it immediately if anyone asks for
+// it in the meantime.
+const REHASH_DELAY_MS = 500;
+
 var suggestedRaisingWatchLimit = false;
 
 const watchers = Object.create(null);
@@ -33,11 +39,32 @@ function acquireWatcher(absPath, callback) {
 function startNewWatcher(absPath) {
   let lastPathwatcherEventTime = 0;
   const callbacks = new Set;
+  let latestHash = hashOrNull(absPath);
+  let requestRehashTimer = null;
+
+  function fire(self, args) {
+    requestRehash();
+    callbacks.forEach(cb => cb.apply(self, args));
+  }
+
+  function requestRehash() {
+    if (requestRehashTimer === null) {
+      requestRehashTimer = setTimeout(ensureLatestHash, REHASH_DELAY_MS);
+    }
+  }
+
+  function ensureLatestHash() {
+    if (requestRehashTimer !== null) {
+      clearTimeout(requestRehashTimer);
+      requestRehashTimer = null;
+      latestHash = hashOrNull(absPath);
+    }
+    return latestHash;
+  }
 
   function pathwatcherWrapper(...args) {
-    const self = this;
     lastPathwatcherEventTime = +new Date;
-    callbacks.forEach(cb => cb.apply(self, args));
+    fire(this, args);
 
     // It's tempting to call files.unwatchFile(absPath, watchFileWrapper)
     // here, but previous pathwatcher success is no guarantee of future
@@ -58,7 +85,7 @@ function startNewWatcher(absPath) {
     // If a pathwatcher event fired in the last polling interval, ignore
     // this event.
     if (new Date - lastPathwatcherEventTime > pollingInterval) {
-      callbacks.forEach(cb => cb.apply(self, args));
+      fire(this, args);
     }
   }
 
@@ -74,6 +101,9 @@ function startNewWatcher(absPath) {
 
   return {
     callbacks,
+
+    cheapHashOrNull: ensureLatestHash,
+
     release(callback) {
       if (! watchers[absPath]) {
         return;
@@ -133,6 +163,11 @@ function pathwatcherWatch(absPath, callback) {
   return null;
 }
 
+function hashOrNull(absPath) {
+  const contents = readFile(absPath);
+  return contents && sha1(contents) || null;
+}
+
 export function watch(absPath, callback) {
   const entry = acquireWatcher(absPath, callback);
   return {
@@ -141,3 +176,10 @@ export function watch(absPath, callback) {
     }
   };
 }
+
+export function cheapHashOrNull(absPath) {
+  const entry = watchers[absPath];
+  return entry
+    ? entry.cheapHashOrNull()
+    : hashOrNull(absPath);
+}
diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index 037562df2a..18b8743327 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -4,6 +4,7 @@ import pathwatcher from './safe-pathwatcher.js';
 import {createHash} from "crypto";
 import {coalesce} from '../utils/func-utils.js';
 import {Profile} from '../tool-env/profile.js';
+import { cheapHashOrNull } from "./safe-pathwatcher.js";
 
 // Watch for changes to a set of files, and the first time that any of
 // the files change, call a user-provided callback. (If you want a
@@ -238,7 +239,7 @@ export class WatchSet {
   }
 }
 
-var readFile = function (absPath) {
+export function readFile(absPath) {
   try {
     return files.readFile(absPath);
   } catch (e) {
@@ -369,9 +370,9 @@ export class Watcher {
       throw new Error("Checking unknown file " + absPath);
     }
 
-    var contents = readFile(absPath);
+    var newHash = cheapHashOrNull(absPath);
 
-    if (contents === null) {
+    if (newHash === null) {
       // File does not exist (or is a directory).
       // Is this what we expected?
       if (oldHash === null) {
@@ -388,8 +389,6 @@ export class Watcher {
       return true;
     }
 
-    var newHash = sha1(contents);
-
     // Unchanged?
     if (newHash === oldHash) {
       return false;

From 1b25050aa8c2b4d87e09c23335e26880e72576ae Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 15 Sep 2016 19:28:14 -0400
Subject: [PATCH 194/688] Delay disposing of file watchers, in case
 acquireWatcher called again.

Typically all outstanding watchers will be closed when the development
server restarts, but we can save a lot of effort if they survive the
restart, for the small cost of keeping them open for an extra 30sec.
---
 tools/fs/safe-pathwatcher.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index b6aa1b9ef6..3588e3160b 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -21,6 +21,10 @@ var NO_PATHWATCHER_POLLING_INTERVAL =
 // it in the meantime.
 const REHASH_DELAY_MS = 500;
 
+// This may seems like a long time to wait before actually closing the
+// file watchers, but it's to our advantage if they survive restarts.
+const WATCHER_CLEANUP_DELAY_MS = 30000;
+
 var suggestedRaisingWatchLimit = false;
 
 const watchers = Object.create(null);
@@ -41,6 +45,7 @@ function startNewWatcher(absPath) {
   const callbacks = new Set;
   let latestHash = hashOrNull(absPath);
   let requestRehashTimer = null;
+  let watcherCleanupTimer = null;
 
   function fire(self, args) {
     requestRehash();
@@ -116,9 +121,18 @@ function startNewWatcher(absPath) {
 
       // Once there are no more callbacks in the Set, close both watchers
       // and nullify the shared data.
-      watcher.close();
-      files.unwatchFile(absPath, watchFileWrapper);
-      watchers[absPath] = null;
+      clearTimeout(watcherCleanupTimer);
+      watcherCleanupTimer = setTimeout(() => {
+        if (callbacks.size > 0) {
+          // If another callback was added while the timer was pending, we
+          // can avoid tearing anything down.
+          return;
+        }
+
+        watcher.close();
+        files.unwatchFile(absPath, watchFileWrapper);
+        watchers[absPath] = null;
+      }, WATCHER_CLEANUP_DELAY_MS);
     }
   };
 }

From f475e379ab9beb6db73a8091389309bdafc16c47 Mon Sep 17 00:00:00 2001
From: gsaynac <gildas@nelio.io>
Date: Fri, 16 Sep 2016 15:01:44 +0200
Subject: [PATCH 195/688] Add ws: and wss: sources to default CSP for Cordova
 (#7774)

CircleCI tests are still timing out, but I believe this change is safe to merge.
---
 packages/boilerplate-generator/boilerplate_web.cordova.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/boilerplate-generator/boilerplate_web.cordova.html b/packages/boilerplate-generator/boilerplate_web.cordova.html
index c2776afafe..9c4f7fac4c 100644
--- a/packages/boilerplate-generator/boilerplate_web.cordova.html
+++ b/packages/boilerplate-generator/boilerplate_web.cordova.html
@@ -4,7 +4,7 @@
   <meta name="format-detection" content="telephone=no">
   <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height">
   <meta name="msapplication-tap-highlight" content="no">
-  <meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';">
+  <meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval' ws: wss:;">
 
 {{! We are explicitly not using bundledJsCssUrlRewriteHook: in cordova we serve assets up directly from disk, so rewriting the URL does not make sense }}
 

From 6823ea0bca4a8d5db5bea6a75cb8ae8212f508e5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 16 Sep 2016 09:05:18 -0400
Subject: [PATCH 196/688] Bump boilerplate-generator package version and add
 version constraints.

This will allow publishing `boilerplate-generator` independently from
Meteor, so that Meteor 1.4 developers can update immediately by running
`meteor update boilerplate-generator`.
---
 History.md                                |  4 ++++
 packages/boilerplate-generator/package.js | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 195f1e9ff3..eb96d7fa69 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,10 @@
 
 * Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
 
+* The default content security policy (CSP) for Cordova now includes `ws:`
+  and `wss:` WebSocket protocols.
+  [#7774](https://github.com/meteor/meteor/pull/7774)
+
 ## v1.4.1.1
 
 * Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index a3b6310242..b9db37ca68 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,11 +1,16 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.9'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
-  api.use(['underscore',  'spacebars-compiler@1.0.12',
-           'spacebars@1.0.12', 'htmljs@1.0.10', 'ui'], 'server');
+  api.use([
+    'underscore@1.0.9',
+    'spacebars-compiler@1.0.12',
+    'spacebars@1.0.12',
+    'htmljs@1.0.10',
+    'ui@1.0.11',
+  ], 'server');
   api.addFiles(['boilerplate-generator.js'], 'server');
   api.export(['Boilerplate'], 'server');
   // These are spacebars templates, but we process them manually with the

From d881a29de4b9a9e5237c6fc5016c9fda7395955c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 16 Sep 2016 09:02:05 -0400
Subject: [PATCH 197/688] Bump package versions for 1.4.2-beta.4 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index e162820f3e..a0153b604e 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11"
+  version: "1.2.12-beta.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index c99ec43f00..efbdd0f215 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 8b146ad865..aaf788b731 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 021d22119c..0b5012170c 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 00b213b6ff..ed740ff2d9 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index a589c4d817..e950442034 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 1b0c30437c..b5ea191ae2 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.3"
+  version: "1.3.1-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 4242e6e527..21b243ac54 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.3"
+  version: "1.1.12-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 8af073a65c..5311f8af04 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.3"
+  version: "1.1.13-beta.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index d728bd9cc3..8052ce7746 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.3"
+  version: "1.0.11-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 807e8b2b4e..8eeed77d67 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.3"
+  version: "1.2.5-beta.4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index aa7f676dfa..9d5c2ee564 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.3',
+  version: '0.5.9-beta.4',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index b7f500838d..2cfae352d7 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.3"
+  version: "1.2.10-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 329d129cc5..79870fba5f 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.3'
+  version: '1.0.9-beta.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 6503e1524c..1d7228278d 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.3"
+  version: "1.1.9-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 0684313561..864a132ba5 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.3"
+  version: "1.1.15-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 8d544ed0c1..8874362e1a 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.3',
+  version: '2.7.6-beta.4',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 1067edad4f..8bc19f4d16 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.3"
+  version: "1.6.5-beta.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 93c999b013..88dc11836f 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.3"
+  version: "1.1.10-beta.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index b25242e6ad..e6b770be45 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.3'
+  version: '1.4.2-beta.4'
 });
 
 Package.includeTool();
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 017723730e..e26f6277d6 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.50-beta.3',
+  version: '1.5.50-beta.4',
   documentation: null
 });
 
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index da4404feb6..bc326ae407 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.3"
+  version: "2.513.6-beta.4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 8aa0581733..0fd6d82924 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.3',
+  version: '1.0.13-beta.4',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index c479ae37c4..e7feea61b0 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.3'
+  version: '1.1.13-beta.4'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 9fb1bfe11b..c492b8ad05 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.3'
+  version: '1.3.12-beta.4'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index c2112074cb..5c7bdac0f3 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.3'
+  version: '1.1.9-beta.4'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8d7f4ff6f5..c8ee4eeb25 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.3",
+ "version": "1.4.2-beta.4",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From a3419f8ccf8c82eb2e955c8602678581cf841be5 Mon Sep 17 00:00:00 2001
From: Brian Lukoff <brian.lukoff@gmail.com>
Date: Tue, 20 Sep 2016 17:31:55 -0500
Subject: [PATCH 198/688] Update node-mongodb driver to 2.2.10 (#7780)

This release of the node-mongodb driver finally fixed performance issues we were having on our Compose MongoDB 3.2 deployment.
---
 packages/npm-mongo/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 3c6acdee55..abe2e1180d 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,12 +3,12 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.49',
+  version: '1.5.50',
   documentation: null
 });
 
 Npm.depends({
-  mongodb: "2.2.9"
+  mongodb: "2.2.10"
 });
 
 Package.onUse(function (api) {

From 7097f78926f331fb9e70a06300ce1711adae2850 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 21 Sep 2016 14:11:00 +0300
Subject: [PATCH 199/688] Add support for `--no-release-check` to `meteor test`
 command

This functionality for the `test` command was overlooked when meteor/meteor#7445 was implemented.

Closes meteor/meteor#7026
---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 6f75da283d..fa0c5be802 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1796,6 +1796,7 @@ var runTestAppForPackages = function (projectContext, options) {
       oplogUrl: process.env.MONGO_OPLOG_URL,
       mobileServerUrl: options.mobileServerUrl,
       once: options.once,
+      noReleaseCheck: options['no-release-check'] || process.env.METEOR_NO_RELEASE_CHECK,
       recordPackageUsage: false,
       selenium: options.selenium,
       seleniumBrowser: options['selenium-browser'],

From ae006ca0b54781850142fc4f69282c114bae6238 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 21 Sep 2016 17:20:21 +0300
Subject: [PATCH 200/688] Clarify documentation for pollingIntervalMs and
 pollingThrottleMs options

This change changes units to be consistent and more clearly indicates when these parameters come into play.

Fixes meteor/meteor#7538
---
 packages/mongo/collection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js
index 68192fefc5..d28cf4bc05 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection.js
@@ -302,8 +302,8 @@ _.extend(Mongo.Collection.prototype, {
    * @param {Boolean} options.reactive (Client only) Default `true`; pass `false` to disable reactivity
    * @param {Function} options.transform Overrides `transform` on the  [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation.
    * @param {Boolean} options.disableOplog (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to `observe` on this query. Disabling the oplog can be useful when working with data that updates in large batches.
-   * @param {Number} options.pollingIntervalMs (Server only) How often to poll this query when observing on the server. In milliseconds. Defaults to 10 seconds.
-   * @param {Number} options.pollingThrottleMs (Server only) Minimum time to allow between re-polling. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. In milliseconds. Defaults to 50 milliseconds.
+   * @param {Number} options.pollingIntervalMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds).
+   * @param {Number} options.pollingThrottleMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms.
    * @returns {Mongo.Cursor}
    */
   find: function (/* selector, options */) {

From 3313180a6ff33ee63602f7592a9506012029e919 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 21 Sep 2016 18:41:46 -0400
Subject: [PATCH 201/688] Always use dev_bundle/.npm as the cache for `meteor
 npm ...` commands.

I believe a strange interaction with the global cache (~/.npm on Unix
systems) may have been the root cause of the problem fixed by this commit:
https://github.com/meteor/meteor/pull/7668/commits/ad61a935146c34e7
---
 tools/cli/dev-bundle-bin-helpers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 873fa30e60..23aa66955a 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -24,6 +24,11 @@ exports.getEnv = function (options) {
 
     var env = Object.create(process.env);
 
+    // Make sure we don't try to use the global ~/.npm cache accidentally.
+    if (! env.NPM_CONFIG_CACHE) {
+      env.NPM_CONFIG_CACHE = path.join(devBundleDir, ".npm");
+    }
+
     // This allows node-gyp to find Node headers and libraries in
     // dev_bundle/.node-gyp.
     env.USERPROFILE = devBundleDir;

From 25c03ce9ab938121ebc7667be1d16556f401b391 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 22 Sep 2016 11:19:39 +1000
Subject: [PATCH 202/688] Add a timeout to the get ready step

---
 circle.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index ba6ee70039..0d1d8219eb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,9 @@ dependencies:
     - ".meteor"
     - ".babel-cache"
   override:
-    - ./meteor --get-ready
+    - ./meteor --get-ready:
+      # shouldn't take longer than 10 minutes
+      timeout: 600
 
 test:
   override:

From b8d3fb03caa7a581e5e59f1b219159a5b75643d7 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 22 Sep 2016 11:24:13 +1000
Subject: [PATCH 203/688] This is better

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 0d1d8219eb..c4cd5553a8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,9 +11,9 @@ dependencies:
     - ".meteor"
     - ".babel-cache"
   override:
+    # shouldn't take longer than 10 minutes
     - ./meteor --get-ready:
-      # shouldn't take longer than 10 minutes
-      timeout: 600
+        timeout: 600
 
 test:
   override:

From f5bc7ae0ce9f24d30102fca5400ed3c56301ba03 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 22 Sep 2016 11:24:48 +1000
Subject: [PATCH 204/688] Shrinkwraps and .versions files for npm-mongo and
 stylus

---
 .../.npm/package/npm-shrinkwrap.json          |  22 +-
 packages/npm-mongo/.versions                  |   3 +
 .../compileStylusBatch/npm-shrinkwrap.json    | 261 +++++++-----------
 packages/stylus/.versions                     |  35 +++
 4 files changed, 150 insertions(+), 171 deletions(-)
 create mode 100644 packages/npm-mongo/.versions
 create mode 100644 packages/stylus/.versions

diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 0cb409a5c8..af4b35bbb6 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "bson": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.4.tgz",
-      "from": "bson@>=0.5.4 <0.6.0"
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz",
+      "from": "bson@>=0.5.5 <0.6.0"
     },
     "buffer-shims": {
       "version": "1.0.0",
@@ -21,8 +21,8 @@
       "from": "es6-promise@3.2.1"
     },
     "inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "from": "inherits@>=2.0.1 <2.1.0"
     },
     "isarray": {
@@ -31,14 +31,14 @@
       "from": "isarray@>=1.0.0 <1.1.0"
     },
     "mongodb": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.9.tgz",
-      "from": "mongodb@2.2.9"
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz",
+      "from": "mongodb@2.2.10"
     },
     "mongodb-core": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.11.tgz",
-      "from": "mongodb-core@2.0.11"
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz",
+      "from": "mongodb-core@2.0.12"
     },
     "process-nextick-args": {
       "version": "1.0.7",
diff --git a/packages/npm-mongo/.versions b/packages/npm-mongo/.versions
new file mode 100644
index 0000000000..0c932803b4
--- /dev/null
+++ b/packages/npm-mongo/.versions
@@ -0,0 +1,3 @@
+meteor@1.0.3
+npm-mongo@1.5.49
+underscore@1.0.0
diff --git a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
index 7f000a6014..8cfd9d1005 100644
--- a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
@@ -1,168 +1,109 @@
 {
   "dependencies": {
+    "amdefine": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+      "from": "amdefine@>=0.0.4"
+    },
+    "balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "from": "balanced-match@>=0.4.1 <0.5.0"
+    },
+    "brace-expansion": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+      "from": "brace-expansion@>=1.0.0 <2.0.0"
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "from": "concat-map@0.0.1"
+    },
+    "css-parse": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
+      "from": "css-parse@>=1.7.0 <1.8.0"
+    },
+    "debug": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "from": "debug@*"
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "from": "fs.realpath@>=1.0.0 <2.0.0"
+    },
+    "glob": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+      "from": "glob@>=7.0.0 <7.1.0"
+    },
+    "inflight": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz",
+      "from": "inflight@>=1.0.4 <2.0.0"
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "from": "inherits@>=2.0.0 <3.0.0"
+    },
+    "minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+      "from": "minimatch@>=3.0.2 <4.0.0"
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "from": "minimist@0.0.8"
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "from": "mkdirp@>=0.5.0 <0.6.0"
+    },
+    "ms": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+      "from": "ms@0.7.1"
+    },
     "nib": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/nib/-/nib-1.1.0.tgz",
-      "from": "https://registry.npmjs.org/nib/-/nib-1.1.0.tgz",
-      "dependencies": {
-        "stylus": {
-          "version": "0.49.3",
-          "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz",
-          "from": "https://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz",
-          "dependencies": {
-            "css-parse": {
-              "version": "1.7.0",
-              "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-              "from": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"
-            },
-            "debug": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-              "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-              "dependencies": {
-                "ms": {
-                  "version": "0.7.1",
-                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-                  "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-                }
-              }
-            },
-            "glob": {
-              "version": "3.2.11",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-              "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-              "dependencies": {
-                "inherits": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                },
-                "minimatch": {
-                  "version": "0.3.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                  "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-                  "dependencies": {
-                    "lru-cache": {
-                      "version": "2.6.5",
-                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-                      "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
-                    },
-                    "sigmund": {
-                      "version": "1.0.1",
-                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-                      "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.3.5",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-            },
-            "sax": {
-              "version": "0.5.8",
-              "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-              "from": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"
-            },
-            "source-map": {
-              "version": "0.1.43",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-              "dependencies": {
-                "amdefine": {
-                  "version": "0.1.1",
-                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz",
-                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz"
-                }
-              }
-            }
-          }
-        }
-      }
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/nib/-/nib-1.1.2.tgz",
+      "from": "nib@1.1.2"
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "from": "once@>=1.3.0 <2.0.0"
+    },
+    "path-is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+      "from": "path-is-absolute@>=1.0.0 <2.0.0"
+    },
+    "sax": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+      "from": "sax@>=0.5.0 <0.6.0"
+    },
+    "source-map": {
+      "version": "0.1.43",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+      "from": "source-map@>=0.1.0 <0.2.0"
     },
     "stylus": {
-      "version": "0.51.1",
-      "resolved": "https://github.com/meteor/stylus/tarball/d4352c9cb4056faf238e6bd9f9f2172472b67c5b",
-      "from": "https://github.com/meteor/stylus/tarball/d4352c9cb4056faf238e6bd9f9f2172472b67c5b",
-      "dependencies": {
-        "css-parse": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-          "from": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"
-        },
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "dependencies": {
-            "ms": {
-              "version": "0.7.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-              "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
-            }
-          }
-        },
-        "glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-            },
-            "minimatch": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "2.6.5",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz",
-                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"
-                },
-                "sigmund": {
-                  "version": "1.0.1",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
-                }
-              }
-            }
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-            }
-          }
-        },
-        "sax": {
-          "version": "0.5.8",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-          "from": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "dependencies": {
-            "amdefine": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
-              "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
-            }
-          }
-        }
-      }
+      "version": "0.54.5",
+      "resolved": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449",
+      "from": "stylus@https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449"
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "from": "wrappy@>=1.0.0 <2.0.0"
     }
   }
 }
diff --git a/packages/stylus/.versions b/packages/stylus/.versions
new file mode 100644
index 0000000000..14f3908784
--- /dev/null
+++ b/packages/stylus/.versions
@@ -0,0 +1,35 @@
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.9
+binary-heap@1.0.9
+blaze@1.0.3
+caching-compiler@1.0.0
+callback-hook@1.0.9
+check@1.0.6
+ddp@1.1.0
+deps@1.0.12
+ecmascript@0.1.4
+ecmascript-collections@0.1.6
+ejson@1.0.12
+geojson-utils@1.0.4
+htmljs@1.0.11
+id-map@1.0.8
+jquery@1.0.2
+json@1.0.3
+local-test:stylus@2.513.5
+logging@1.0.12
+meteor@1.1.16
+minimongo@1.0.8
+mongo@1.1.0
+observe-sequence@1.0.6
+ordered-dict@1.0.8
+promise@0.4.8
+random@1.0.4
+retry@1.0.4
+stylus@2.513.5
+templating@1.0.4
+test-helpers@1.0.3
+tinytest@1.0.5
+tracker@1.0.15
+ui@1.0.0
+underscore@1.0.9

From 5f81996cdbcca0ed278740f6ea6835567ce49b0b Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 22 Sep 2016 11:50:44 +1000
Subject: [PATCH 205/688] Don't show a spinner while getting ready

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index c4cd5553a8..393d52c371 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,7 +12,7 @@ dependencies:
     - ".babel-cache"
   override:
     # shouldn't take longer than 10 minutes
-    - ./meteor --get-ready:
+    - METEOR_PRETTY_OUTPUT=0 ./meteor --get-ready:
         timeout: 600
 
 test:

From 7401bad8e3201579d9674155305463c63a77d2ce Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 21 Sep 2016 19:35:13 -0400
Subject: [PATCH 206/688] Tolerate multiple node_modules directories per
 package.

Revert "Write node_modules metadata as single strings."
This reverts commit f74975d0df1ea210877461e2de802309d99dd935.

Packages published with multiple node_modules directories won't be
loadable by versions of Meteor before 1.3, because older versions of
Meteor don't understand object-valued isopack "node_modules" fields, but
the vast majority of Meteor developers are now using either 1.3 or 1.4.
---
 tools/isobuild/bundler.js | 29 ++++++++---------------------
 tools/isobuild/isopack.js | 34 +++++++++++-----------------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 0b5f253fda..bf9543e44a 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1834,8 +1834,6 @@ class JsImage {
         node_modules: {}
       };
 
-      const nodeModulesPaths = [];
-
       _.each(item.nodeModulesDirectories, nmd => {
         // We need to make sure to use the directory name we got from
         // builder.generateFilename here.
@@ -1848,30 +1846,19 @@ class JsImage {
             "string"
           );
 
-          // Eventually we would prefer to write these node_modules
-          // properties with object values instead of string values, like
-          // we're doing here, but older versions of meteor-tool won't be
-          // able to load images like that, so we have to wait until
-          // everyone is using a version of the tool that knows how to
-          // read object-valued node_modules properties.
           loadItem.node_modules[generatedNMD.preferredBundlePath] =
             generatedNMD.toJSON();
-
-          if (nmd.local) {
-            nodeModulesPaths.push(generatedNMD.preferredBundlePath);
-          } else {
-            // Give .npm/package/node_modules directories preference in
-            // the selection of a single bundle path below.
-            nodeModulesPaths.unshift(generatedNMD.preferredBundlePath);
-          }
         }
       });
 
-      if (nodeModulesPaths.length > 0) {
-        // For backwards compatibility, we unfortunately can only write
-        // node_modules as a single string.
-        loadItem.node_modules = nodeModulesPaths[0];
-      } else {
+      const preferredPaths = Object.keys(loadItem.node_modules);
+      if (preferredPaths.length === 1) {
+        // For backwards compatibility, if there's only one node_modules
+        // directory, store it as a single string.
+        loadItem.node_modules = preferredPaths[0];
+      } else if (preferredPaths.length === 0) {
+        // If there are no node_modules directories, don't confuse older
+        // versions of Meteor by storing an empty object.
         delete loadItem.node_modules;
       }
 
diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js
index ce98fba763..034aaced80 100644
--- a/tools/isobuild/isopack.js
+++ b/tools/isobuild/isopack.js
@@ -1292,7 +1292,6 @@ _.extend(Isopack.prototype, {
 
         // Figure out where the npm dependencies go.
         let node_modules = {};
-        const nodeModulesPaths = [];
         _.each(unibuild.nodeModulesDirectories, nmd => {
           const bundlePath = _.has(npmDirsToCopy, nmd.sourcePath)
             // We already have this npm directory from another unibuild.
@@ -1301,30 +1300,14 @@ _.extend(Isopack.prototype, {
               nmd.getPreferredBundlePath("isopack"),
               { directory: true }
             );
-
-          // Eventually we would prefer to write these node_modules
-          // properties with object values instead of string values, like
-          // we're doing here, but older versions of meteor-tool won't be
-          // able to load unibuilds like that, so we have to wait until
-          // everyone is using a version of the tool that knows how to
-          // read object-valued node_modules properties.
           node_modules[bundlePath] = nmd.toJSON();
-
-          if (nmd.local) {
-            nodeModulesPaths.push(bundlePath);
-          } else {
-            // Give .npm/package/node_modules directories preference in
-            // the selection of a single bundle path below.
-            nodeModulesPaths.unshift(bundlePath);
-          }
         });
 
-        if (nodeModulesPaths.length > 0) {
-          // For backwards compatibility, we unfortunately can only write
-          // node_modules as a single string.
-          node_modules = nodeModulesPaths[0];
-        } else {
-          node_modules = undefined;
+        const preferredPaths = Object.keys(node_modules);
+        if (preferredPaths.length === 1) {
+          // For backwards compatibility, if there's only one node_modules
+          // directory, store it as a single string.
+          node_modules = preferredPaths[0];
         }
 
         // Construct unibuild metadata
@@ -1342,10 +1325,15 @@ _.extend(Isopack.prototype, {
             };
           }),
           implies: (_.isEmpty(unibuild.implies) ? undefined : unibuild.implies),
-          node_modules,
           resources: []
         };
 
+        if (preferredPaths.length > 0) {
+          // If there are no node_modules directories, don't confuse older
+          // versions of Meteor by storing an empty object.
+          unibuildJson.node_modules = node_modules;
+        }
+
         const usesModules = ! isopackCache ||
           isopackCache.uses(self, "modules", unibuild.arch);
 

From bbac2725302cf820eddbfea8e3c550a42bdfcf89 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 22 Sep 2016 11:49:26 -0400
Subject: [PATCH 207/688] Prefer node_modules directories from non-test
 packages.

---
 tools/isobuild/bundler.js | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index bf9543e44a..cd82a9bd26 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -248,6 +248,13 @@ export class NodeModulesDirectory {
     // accessible from other modules in the app or package.
     this.local = !! local;
 
+    // A test package often shares its .sourcePath with the non-test
+    // package, so it's important to be able to tell them apart,
+    // especially when we'd like to treat .sourcePath as a unique key.
+    this.isTestPackage =
+      typeof packageName === "string" &&
+      /^local-test[:_]/.test(packageName);
+
     // Optionally, files to discard.
     this.npmDiscards = npmDiscards;
   }
@@ -274,8 +281,9 @@ export class NodeModulesDirectory {
 
     const isApp = ! this.packageName;
     if (! isApp) {
-      const name = colonConverter.convert(this.packageName);
       const relParts = relPath.split(files.pathSep);
+      const name = colonConverter.convert(
+        this.packageName.replace(/^local-test[:_]/, ""));
 
       if (relParts[0] === ".npm") {
         // Normalize .npm/package/node_modules/... paths so that they get
@@ -1086,8 +1094,8 @@ class Target {
             }
 
             _.each(unibuild.nodeModulesDirectories, nmd => {
-              this.nodeModulesDirectories[nmd.sourcePath] = nmd;
-              f.nodeModulesDirectories[nmd.sourcePath] = nmd;
+              addNodeModulesDirToObject(nmd, this.nodeModulesDirectories);
+              addNodeModulesDirToObject(nmd, f.nodeModulesDirectories);
             });
           }
 
@@ -1283,6 +1291,26 @@ class Target {
   Target.prototype[method] = Profile(`Target#${method}`, Target.prototype[method]);
 });
 
+// Sets `obj[nmd.sourcePath] = nmd` unless the key already exists and the
+// old nmd object is for a non-test package. Since nmd.sourcePath can be
+// shared by test and non-test packages, this logic prefers the non-test
+// nmd object when possible. Returns true iff the given nmd was added.
+function addNodeModulesDirToObject(nmd, obj) {
+  if (_.has(obj, nmd.sourcePath)) {
+    const old = obj[nmd.sourcePath];
+    // If the old NodeModulesDirectory object is not a test package, or
+    // the new one is a test package, keep the old one.
+    if (! old.isTestPackage ||
+        nmd.isTestPackage) {
+      return false;
+    }
+  }
+
+  obj[nmd.sourcePath] = nmd;
+
+  return true;
+}
+
 //////////////////// ClientTarget ////////////////////
 
 class ClientTarget extends Target {
@@ -1816,7 +1844,7 @@ class JsImage {
 
       nmd = nmd.copy();
       nmd.preferredBundlePath = modulesPhysicalLocation;
-      nodeModulesDirectories[nmd.sourcePath] = nmd;
+      addNodeModulesDirToObject(nmd, nodeModulesDirectories);
     });
 
     // If multiple load files share the same asset, only write one copy of

From 726074689ec8dc243d01436f76cd1d2256cb285e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 22 Sep 2016 12:23:24 -0400
Subject: [PATCH 208/688] Don't prepend node_modules/meteor/<package>/ for
 npm/... directories.

---
 tools/static-assets/server/npm-require.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/static-assets/server/npm-require.js b/tools/static-assets/server/npm-require.js
index b354667269..a508254124 100644
--- a/tools/static-assets/server/npm-require.js
+++ b/tools/static-assets/server/npm-require.js
@@ -76,9 +76,15 @@ function registerNodeModules(name, node_modules) {
       parts.forEach(function (part, i) {
         if (part === "npm") {
           addByParts(parts.slice(i + 1), node_modules);
+
         } else if (part === ".npm") {
+          if (name) {
+            parts.unshift("node_modules", "meteor", name);
+          }
+
           if (parts[i + 1] === "package") {
             addByParts(parts.slice(i + 2), node_modules);
+
           } else if (parts[i + 1] === "plugin") {
             assert.strictEqual(parts[i + 2], name);
             addByParts(parts.slice(i + 3), node_modules);
@@ -100,12 +106,10 @@ function registerNodeModules(name, node_modules) {
     assert.notEqual(parts[0], "");
     assert.notEqual(parts[0], "..");
 
-    if (name) {
-      parts.unshift("node_modules", "meteor", name);
-    }
-
     // Ensure a leading / character.
-    parts.unshift("");
+    if (parts[0].length > 0) {
+      parts.unshift("");
+    }
 
     nodeModulesRegistry[parts.join("/")] = absPath;
   }

From 03c5346873849151cecc3e00606c6e5aa13b3bbc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 28 Jun 2016 10:58:30 -0400
Subject: [PATCH 209/688] Stop building meteorInstall bundle for server
 node_modules.

This saves a potentially large amount of work by the ImportScanner and the
Resolver during makeServerTarget, because it means we no longer have to
scan and resolve modules to build a server bundle as a backup for native
Node evaluation.

I've attempted this optimization before, but it wasn't really safe until
I fixed some obscure bugs that caused module.useNode() to fail during
`meteor test-packages` (see recent local-test:-related commits).
---
 tools/isobuild/import-scanner.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index e0e40c55f7..8f5c34d041 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -536,6 +536,14 @@ export default class ImportScanner {
       // Append this file to the output array and record its index.
       this._addFile(absImportedPath, depFile);
 
+      if (archMatches(this.bundleArch, "os") &&
+          depFile.installPath.startsWith("node_modules/")) {
+        // On the server, modules in node_modules directories will be
+        // handled natively by Node, so we don't need to build a
+        // meteorInstall-style bundle beyond the entry-point module.
+        return;
+      }
+
       this._scanFile(depFile);
     });
   }

From 9810562403f077a4420df516ff2f393cdf3ecadb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 22 Sep 2016 14:34:32 -0400
Subject: [PATCH 210/688] Test that one package can have both node_modules and
 Npm.depends.

---
 .../packages/modules-test-package/common.js   |    3 +
 .../node_modules/.bin/acorn                   |    1 +
 .../node_modules/acorn/.editorconfig          |    7 +
 .../node_modules/acorn/.gitattributes         |    1 +
 .../node_modules/acorn/.npmignore             |    3 +
 .../node_modules/acorn/.tern-project          |    6 +
 .../node_modules/acorn/.travis.yml            |    7 +
 .../node_modules/acorn/AUTHORS                |   58 +
 .../node_modules/acorn/CHANGELOG.md           |  213 ++
 .../node_modules/acorn/LICENSE                |   19 +
 .../node_modules/acorn/README.md              |  408 ++
 .../node_modules/acorn/bin/acorn              |   67 +
 .../acorn/bin/generate-identifier-regex.js    |   55 +
 .../node_modules/acorn/bin/update_authors.sh  |    6 +
 .../node_modules/acorn/dist/.keep             |    0
 .../node_modules/acorn/dist/acorn.es.js       | 3332 ++++++++++++++++
 .../node_modules/acorn/dist/acorn.js          | 3363 +++++++++++++++++
 .../node_modules/acorn/dist/acorn_loose.es.js | 1329 +++++++
 .../node_modules/acorn/dist/acorn_loose.js    | 1339 +++++++
 .../node_modules/acorn/dist/walk.es.js        |  342 ++
 .../node_modules/acorn/dist/walk.js           |  360 ++
 .../node_modules/acorn/package.json           |  277 ++
 .../node_modules/acorn/rollup/config.bin.js   |   15 +
 .../node_modules/acorn/rollup/config.loose.js |   22 +
 .../node_modules/acorn/rollup/config.main.js  |   11 +
 .../node_modules/acorn/rollup/config.walk.js  |   11 +
 .../node_modules/acorn/src/bin/acorn.js       |   60 +
 .../node_modules/acorn/src/expression.js      |  798 ++++
 .../node_modules/acorn/src/identifier.js      |   81 +
 .../node_modules/acorn/src/index.js           |   77 +
 .../node_modules/acorn/src/location.js        |   26 +
 .../node_modules/acorn/src/locutil.js         |   42 +
 .../acorn/src/loose/expression.js             |  562 +++
 .../node_modules/acorn/src/loose/index.js     |   48 +
 .../node_modules/acorn/src/loose/parseutil.js |    1 +
 .../node_modules/acorn/src/loose/state.js     |  161 +
 .../node_modules/acorn/src/loose/statement.js |  446 +++
 .../node_modules/acorn/src/loose/tokenize.js  |  108 +
 .../node_modules/acorn/src/lval.js            |  219 ++
 .../node_modules/acorn/src/node.js            |   50 +
 .../node_modules/acorn/src/options.js         |  128 +
 .../node_modules/acorn/src/parseutil.js       |  117 +
 .../node_modules/acorn/src/state.js           |  110 +
 .../node_modules/acorn/src/statement.js       |  740 ++++
 .../node_modules/acorn/src/tokencontext.js    |  110 +
 .../node_modules/acorn/src/tokenize.js        |  697 ++++
 .../node_modules/acorn/src/tokentype.js       |  147 +
 .../node_modules/acorn/src/util.js            |    9 +
 .../node_modules/acorn/src/walk/index.js      |  342 ++
 .../node_modules/acorn/src/whitespace.js      |   13 +
 50 files changed, 16347 insertions(+)
 create mode 120000 tools/tests/apps/modules/packages/modules-test-package/node_modules/.bin/acorn
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.editorconfig
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.gitattributes
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.npmignore
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.tern-project
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.travis.yml
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/AUTHORS
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/CHANGELOG.md
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/LICENSE
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/README.md
 create mode 100755 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/acorn
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/generate-identifier-regex.js
 create mode 100755 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/update_authors.sh
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/.keep
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.es.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.es.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.es.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/package.json
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.bin.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.loose.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.main.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.walk.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/bin/acorn.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/expression.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/identifier.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/index.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/location.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/locutil.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/expression.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/index.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/parseutil.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/state.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/statement.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/tokenize.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/lval.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/node.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/options.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/parseutil.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/state.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/statement.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokencontext.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokenize.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokentype.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/util.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/walk/index.js
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/whitespace.js

diff --git a/tools/tests/apps/modules/packages/modules-test-package/common.js b/tools/tests/apps/modules/packages/modules-test-package/common.js
index 13f5234766..a64688f120 100644
--- a/tools/tests/apps/modules/packages/modules-test-package/common.js
+++ b/tools/tests/apps/modules/packages/modules-test-package/common.js
@@ -2,6 +2,9 @@ import assert from "assert";
 import "regenerator-runtime/runtime";
 export const ModulesTestPackage = "loaded";
 
+import { parse } from "acorn";
+assert.strictEqual(typeof parse, "function");
+
 export function checkPackageVars() {
   if (Meteor.isClient) {
     assert.strictEqual(ClientPackageVar, "client");
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/.bin/acorn b/tools/tests/apps/modules/packages/modules-test-package/node_modules/.bin/acorn
new file mode 120000
index 0000000000..cf76760386
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/.bin/acorn
@@ -0,0 +1 @@
+../acorn/bin/acorn
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.editorconfig b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.editorconfig
new file mode 100644
index 0000000000..c14d5c67b4
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.gitattributes b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.gitattributes
new file mode 100644
index 0000000000..fcadb2cf97
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.npmignore b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.npmignore
new file mode 100644
index 0000000000..ecba2911d2
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.npmignore
@@ -0,0 +1,3 @@
+/.tern-port
+/test
+/local
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.tern-project b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.tern-project
new file mode 100644
index 0000000000..6718ce07e1
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.tern-project
@@ -0,0 +1,6 @@
+{
+  "plugins": {
+    "node": true,
+    "es_modules": true
+  }
+}
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.travis.yml b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.travis.yml
new file mode 100644
index 0000000000..d9ee88ba53
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/.travis.yml
@@ -0,0 +1,7 @@
+language: node_js
+sudo: false
+node_js:
+  - '0.12'
+  - '4'
+  - '5'
+  - '6'
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/AUTHORS b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/AUTHORS
new file mode 100644
index 0000000000..314d7086cf
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/AUTHORS
@@ -0,0 +1,58 @@
+List of Acorn contributors. Updated before every release.
+
+Adrian Rakovsky
+Alistair Braidwood
+Amila Welihinda
+Andres Suarez
+Angelo
+Aparajita Fishman
+Arian Stolwijk
+Artem Govorov
+Brandon Mills
+Charles Hughes
+Conrad Irwin
+Daniel Tschinder
+David Bonnet
+Domenico Matteo
+Forbes Lindesay
+Gilad Peleg
+impinball
+Ingvar Stepanyan
+Jackson Ray Hamilton
+Jesse McCarthy
+Jiaxing Wang
+Joel Kemp
+Johannes Herr
+Jordan Klassen
+Jürg Lehni
+keeyipchan
+Keheliya Gallaba
+Kevin Irish
+Kevin Kwok
+krator
+Marijn Haverbeke
+Martin Carlberg
+Mathias Bynens
+Mathieu 'p01' Henri
+Matthew Bastien
+Max Schaefer
+Max Zerzouri
+Mihai Bazon
+Mike Rennie
+Nicholas C. Zakas
+Nick Fitzgerald
+Olivier Thomann
+Oskar Schöldström
+Paul Harper
+Peter Rust
+PlNG
+Prayag Verma
+ReadmeCritic
+r-e-d
+Richard Gibson
+Rich Harris
+Sebastian McKenzie
+Simen Bekkhus
+Timothy Gu
+Toru Nagashima
+zsjforcn
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/CHANGELOG.md b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/CHANGELOG.md
new file mode 100644
index 0000000000..07bfafff5b
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/CHANGELOG.md
@@ -0,0 +1,213 @@
+## 4.0.3 (2016-08-16)
+
+### Bug fixes
+
+Allow regular function declarations inside single-statement `if`
+branches in loose mode. Forbid them entirely in strict mode.
+
+Properly parse properties named `async` in ES2017 mode.
+
+Fix bug where reserved words were broken in ES2017 mode.
+
+## 4.0.2 (2016-08-11)
+
+### Bug fixes
+
+Don't ignore period or 'e' characters after octal numbers.
+
+Fix broken parsing for call expressions in default parameter values
+of arrow functions.
+
+## 4.0.1 (2016-08-08)
+
+### Bug fixes
+
+Fix false positives in duplicated export name errors.
+
+## 4.0.0 (2016-08-07)
+
+### Breaking changes
+
+The default `ecmaVersion` option value is now 7.
+
+A number of internal method signatures changed, so plugins might need
+to be updated.
+
+### Bug fixes
+
+The parser now raises errors on duplicated export names.
+
+`arguments` and `eval` can now be used in shorthand properties.
+
+Duplicate parameter names in non-simple argument lists now always
+produce an error.
+
+### New features
+
+The `ecmaVersion` option now also accepts year-style version numbers
+(2015, etc).
+
+Support for `async`/`await` syntax when `ecmaVersion` is >= 8.
+
+Support for trailing commas in call expressions when `ecmaVersion`
+is >= 8.
+
+## 3.3.0 (2016-07-25)
+
+### Bug fixes
+
+Fix bug in tokenizing of regexp operator after a function declaration.
+
+Fix parser crash when parsing an array pattern with a hole.
+
+### New features
+
+Implement check against complex argument lists in functions that
+enable strict mode in ES7.
+
+## 3.2.0 (2016-06-07)
+
+### Bug fixes
+
+Improve handling of lack of unicode regexp support in host
+environment.
+
+Properly reject shorthand properties whose name is a keyword.
+
+Don't crash when the loose parser is called without options object.
+
+### New features
+
+Visitors created with `visit.make` now have their base as _prototype_,
+rather than copying properties into a fresh object.
+
+Make it possible to use `visit.ancestor` with a walk state.
+
+## 3.1.0 (2016-04-18)
+
+### Bug fixes
+
+Fix issue where the loose parser created invalid TemplateElement nodes
+for unclosed template literals.
+
+Properly tokenize the division operator directly after a function
+expression.
+
+Allow trailing comma in destructuring arrays.
+
+### New features
+
+The walker now allows defining handlers for `CatchClause` nodes.
+
+## 3.0.4 (2016-02-25)
+
+### Fixes
+
+Allow update expressions as left-hand-side of the ES7 exponential
+operator.
+
+## 3.0.2 (2016-02-10)
+
+### Fixes
+
+Fix bug that accidentally made `undefined` a reserved word when
+parsing ES7.
+
+## 3.0.0 (2016-02-10)
+
+### Breaking changes
+
+The default value of the `ecmaVersion` option is now 6 (used to be 5).
+
+Support for comprehension syntax (which was dropped from the draft
+spec) has been removed.
+
+### Fixes
+
+`let` and `yield` are now “contextual keywords”, meaning you can
+mostly use them as identifiers in ES5 non-strict code.
+
+A parenthesized class or function expression after `export default` is
+now parsed correctly.
+
+### New features
+
+When `ecmaVersion` is set to 7, Acorn will parse the exponentiation
+operator (`**`).
+
+The identifier character ranges are now based on Unicode 8.0.0.
+
+Plugins can now override the `raiseRecoverable` method to override the
+way non-critical errors are handled.
+
+## 2.7.0 (2016-01-04)
+
+### Fixes
+
+Stop allowing rest parameters in setters.
+
+Make sure the loose parser always attaches a `local` property to
+`ImportNamespaceSpecifier` nodes.
+
+Disallow `y` rexexp flag in ES5.
+
+Disallow `\00` and `\000` escapes in strict mode.
+
+Raise an error when an import name is a reserved word.
+
+## 2.6.4 (2015-11-12)
+
+### Fixes
+
+Fix crash in loose parser when parsing invalid object pattern.
+
+### New features
+
+Support plugins in the loose parser.
+
+## 2.6.2 (2015-11-10)
+
+### Fixes
+
+Don't crash when no options object is passed.
+
+## 2.6.0 (2015-11-09)
+
+### Fixes
+
+Add `await` as a reserved word in module sources.
+
+Disallow `yield` in a parameter default value for a generator.
+
+Forbid using a comma after a rest pattern in an array destructuring.
+
+### New features
+
+Support parsing stdin in command-line tool.
+
+## 2.5.2 (2015-10-27)
+
+### Fixes
+
+Fix bug where the walker walked an exported `let` statement as an
+expression.
+
+## 2.5.0 (2015-10-27)
+
+### Fixes
+
+Fix tokenizer support in the command-line tool.
+
+In the loose parser, don't allow non-string-literals as import
+sources.
+
+Stop allowing `new.target` outside of functions.
+
+Remove legacy `guard` and `guardedHandler` properties from try nodes.
+
+Stop allowing multiple `__proto__` properties on an object literal in
+strict mode.
+
+Don't allow rest parameters to be non-identifier patterns.
+
+Check for duplicate paramter names in arrow functions.
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/LICENSE b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/LICENSE
new file mode 100644
index 0000000000..a35ebf44fd
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2012-2016 by various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/README.md b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/README.md
new file mode 100644
index 0000000000..82dc28717a
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/README.md
@@ -0,0 +1,408 @@
+# Acorn
+
+[![Build Status](https://travis-ci.org/ternjs/acorn.svg?branch=master)](https://travis-ci.org/ternjs/acorn)
+[![NPM version](https://img.shields.io/npm/v/acorn.svg)](https://www.npmjs.com/package/acorn)  
+[Author funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?force)](https://marijnhaverbeke.nl/fund/)
+
+A tiny, fast JavaScript parser, written completely in JavaScript.
+
+## Community
+
+Acorn is open source software released under an
+[MIT license](https://github.com/ternjs/acorn/blob/master/LICENSE).
+
+You are welcome to
+[report bugs](https://github.com/ternjs/acorn/issues) or create pull
+requests on [github](https://github.com/ternjs/acorn). For questions
+and discussion, please use the
+[Tern discussion forum](https://discuss.ternjs.net).
+
+## Installation
+
+The easiest way to install acorn is with [`npm`][npm].
+
+[npm]: https://www.npmjs.com/
+
+```sh
+npm install acorn
+```
+
+Alternately, download the source.
+
+```sh
+git clone https://github.com/ternjs/acorn.git
+```
+
+## Components
+
+When run in a CommonJS (node.js) or AMD environment, exported values
+appear in the interfaces exposed by the individual files, as usual.
+When loaded in the browser (Acorn works in any JS-enabled browser more
+recent than IE5) without any kind of module management, a single
+global object `acorn` will be defined, and all the exported properties
+will be added to that.
+
+### Main parser
+
+This is implemented in `dist/acorn.js`, and is what you get when you
+`require("acorn")` in node.js.
+
+**parse**`(input, options)` is used to parse a JavaScript program.
+The `input` parameter is a string, `options` can be undefined or an
+object setting some of the options listed below. The return value will
+be an abstract syntax tree object as specified by the
+[ESTree spec][estree].
+
+When  encountering   a  syntax   error,  the   parser  will   raise  a
+`SyntaxError` object with a meaningful  message. The error object will
+have a `pos` property that indicates the character offset at which the
+error occurred,  and a `loc`  object that contains a  `{line, column}`
+object referring to that same position.
+
+[estree]: https://github.com/estree/estree
+
+- **ecmaVersion**: Indicates the ECMAScript version to parse. Must be
+  either 3, 5, 6 (2015), 7 (2016), or 8 (2017). This influences support for strict
+  mode, the set of reserved words, and support for new syntax features.
+  Default is 7.
+
+  **NOTE**: Only 'stage 4' (finalized) ECMAScript features are being
+  implemented by Acorn.
+
+- **sourceType**: Indicate the mode the code should be parsed in. Can be
+  either `"script"` or `"module"`. This influences global strict mode
+  and parsing of `import` and `export` declarations.
+
+- **onInsertedSemicolon**: If given a callback, that callback will be
+  called whenever a missing semicolon is inserted by the parser. The
+  callback will be given the character offset of the point where the
+  semicolon is inserted as argument, and if `locations` is on, also a
+  `{line, column}` object representing this position.
+
+- **onTrailingComma**: Like `onInsertedSemicolon`, but for trailing
+  commas.
+
+- **allowReserved**: If `false`, using a reserved word will generate
+  an error. Defaults to `true` for `ecmaVersion` 3, `false` for higher
+  versions. When given the value `"never"`, reserved words and
+  keywords can also not be used as property names (as in Internet
+  Explorer's old parser).
+
+- **allowReturnOutsideFunction**: By default, a return statement at
+  the top level raises an error. Set this to `true` to accept such
+  code.
+
+- **allowImportExportEverywhere**: By default, `import` and `export`
+  declarations can only appear at a program's top level. Setting this
+  option to `true` allows them anywhere where a statement is allowed.
+
+- **allowHashBang**: When this is enabled (off by default), if the
+  code starts with the characters `#!` (as in a shellscript), the
+  first line will be treated as a comment.
+
+- **locations**: When `true`, each node has a `loc` object attached
+  with `start` and `end` subobjects, each of which contains the
+  one-based line and zero-based column numbers in `{line, column}`
+  form. Default is `false`.
+
+- **onToken**: If a function is passed for this option, each found
+  token will be passed in same format as tokens returned from
+  `tokenizer().getToken()`.
+
+  If array is passed, each found token is pushed to it.
+
+  Note that you are not allowed to call the parser from the
+  callback—that will corrupt its internal state.
+
+- **onComment**: If a function is passed for this option, whenever a
+  comment is encountered the function will be called with the
+  following parameters:
+
+  - `block`: `true` if the comment is a block comment, false if it
+    is a line comment.
+  - `text`: The content of the comment.
+  - `start`: Character offset of the start of the comment.
+  - `end`: Character offset of the end of the comment.
+
+  When the `locations` options is on, the `{line, column}` locations
+  of the comment’s start and end are passed as two additional
+  parameters.
+
+  If array is passed for this option, each found comment is pushed
+  to it as object in Esprima format:
+
+  ```javascript
+  {
+    "type": "Line" | "Block",
+    "value": "comment text",
+    "start": Number,
+    "end": Number,
+    // If `locations` option is on:
+    "loc": {
+      "start": {line: Number, column: Number}
+      "end": {line: Number, column: Number}
+    },
+    // If `ranges` option is on:
+    "range": [Number, Number]
+  }
+  ```
+
+  Note that you are not allowed to call the parser from the
+  callback—that will corrupt its internal state.
+
+- **ranges**: Nodes have their start and end characters offsets
+  recorded in `start` and `end` properties (directly on the node,
+  rather than the `loc` object, which holds line/column data. To also
+  add a [semi-standardized][range] `range` property holding a
+  `[start, end]` array with the same numbers, set the `ranges` option
+  to `true`.
+
+- **program**: It is possible to parse multiple files into a single
+  AST by passing the tree produced by parsing the first file as the
+  `program` option in subsequent parses. This will add the toplevel
+  forms of the parsed file to the "Program" (top) node of an existing
+  parse tree.
+
+- **sourceFile**: When the `locations` option is `true`, you can pass
+  this option to add a `source` attribute in every node’s `loc`
+  object. Note that the contents of this option are not examined or
+  processed in any way; you are free to use whatever format you
+  choose.
+
+- **directSourceFile**: Like `sourceFile`, but a `sourceFile` property
+  will be added (regardless of the `location` option) directly to the
+  nodes, rather than the `loc` object.
+
+- **preserveParens**: If this option is `true`, parenthesized expressions
+  are represented by (non-standard) `ParenthesizedExpression` nodes
+  that have a single `expression` property containing the expression
+  inside parentheses.
+
+[range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+
+**parseExpressionAt**`(input, offset, options)` will parse a single
+expression in a string, and return its AST. It will not complain if
+there is more of the string left after the expression.
+
+**getLineInfo**`(input, offset)` can be used to get a `{line,
+column}` object for a given program string and character offset.
+
+**tokenizer**`(input, options)` returns an object with a `getToken`
+method that can be called repeatedly to get the next token, a `{start,
+end, type, value}` object (with added `loc` property when the
+`locations` option is enabled and `range` property when the `ranges`
+option is enabled). When the token's type is `tokTypes.eof`, you
+should stop calling the method, since it will keep returning that same
+token forever.
+
+In ES6 environment, returned result can be used as any other
+protocol-compliant iterable:
+
+```javascript
+for (let token of acorn.tokenizer(str)) {
+  // iterate over the tokens
+}
+
+// transform code to array of tokens:
+var tokens = [...acorn.tokenizer(str)];
+```
+
+**tokTypes** holds an object mapping names to the token type objects
+that end up in the `type` properties of tokens.
+
+#### Note on using with [Escodegen][escodegen]
+
+Escodegen supports generating comments from AST, attached in
+Esprima-specific format. In order to simulate same format in
+Acorn, consider following example:
+
+```javascript
+var comments = [], tokens = [];
+
+var ast = acorn.parse('var x = 42; // answer', {
+	// collect ranges for each node
+	ranges: true,
+	// collect comments in Esprima's format
+	onComment: comments,
+	// collect token ranges
+	onToken: tokens
+});
+
+// attach comments using collected information
+escodegen.attachComments(ast, comments, tokens);
+
+// generate code
+console.log(escodegen.generate(ast, {comment: true}));
+// > 'var x = 42;    // answer'
+```
+
+[escodegen]: https://github.com/estools/escodegen
+
+### dist/acorn_loose.js ###
+
+This file implements an error-tolerant parser. It exposes a single
+function. The loose parser is accessible in node.js via `require("acorn/dist/acorn_loose")`.
+
+**parse_dammit**`(input, options)` takes the same arguments and
+returns the same syntax tree as the `parse` function in `acorn.js`,
+but never raises an error, and will do its best to parse syntactically
+invalid code in as meaningful a way as it can. It'll insert identifier
+nodes with name `"✖"` as placeholders in places where it can't make
+sense of the input. Depends on `acorn.js`, because it uses the same
+tokenizer.
+
+### dist/walk.js ###
+
+Implements an abstract syntax tree walker. Will store its interface in
+`acorn.walk` when loaded without a module system.
+
+**simple**`(node, visitors, base, state)` does a 'simple' walk over
+a tree. `node` should be the AST node to walk, and `visitors` an
+object with properties whose names correspond to node types in the
+[ESTree spec][estree]. The properties should contain functions
+that will be called with the node object and, if applicable the state
+at that point. The last two arguments are optional. `base` is a walker
+algorithm, and `state` is a start state. The default walker will
+simply visit all statements and expressions and not produce a
+meaningful state. (An example of a use of state is to track scope at
+each point in the tree.)
+
+**ancestor**`(node, visitors, base, state)` does a 'simple' walk over
+a tree, building up an array of ancestor nodes (including the current node)
+and passing the array to the callbacks as a third parameter.
+
+**recursive**`(node, state, functions, base)` does a 'recursive'
+walk, where the walker functions are responsible for continuing the
+walk on the child nodes of their target node. `state` is the start
+state, and `functions` should contain an object that maps node types
+to walker functions. Such functions are called with `(node, state, c)`
+arguments, and can cause the walk to continue on a sub-node by calling
+the `c` argument on it with `(node, state)` arguments. The optional
+`base` argument provides the fallback walker functions for node types
+that aren't handled in the `functions` object. If not given, the
+default walkers will be used.
+
+**make**`(functions, base)` builds a new walker object by using the
+walker functions in `functions` and filling in the missing ones by
+taking defaults from `base`.
+
+**findNodeAt**`(node, start, end, test, base, state)` tries to
+locate a node in a tree at the given start and/or end offsets, which
+satisfies the predicate `test`. `start` and `end` can be either `null`
+(as wildcard) or a number. `test` may be a string (indicating a node
+type) or a function that takes `(nodeType, node)` arguments and
+returns a boolean indicating whether this node is interesting. `base`
+and `state` are optional, and can be used to specify a custom walker.
+Nodes are tested from inner to outer, so if two nodes match the
+boundaries, the inner one will be preferred.
+
+**findNodeAround**`(node, pos, test, base, state)` is a lot like
+`findNodeAt`, but will match any node that exists 'around' (spanning)
+the given position.
+
+**findNodeAfter**`(node, pos, test, base, state)` is similar to
+`findNodeAround`, but will match all nodes *after* the given position
+(testing outer nodes before inner nodes).
+
+## Command line interface
+
+The `bin/acorn` utility can be used to parse a file from the command
+line. It accepts as arguments its input file and the following
+options:
+
+- `--ecma3|--ecma5|--ecma6|--ecma7`: Sets the ECMAScript version to parse. Default is
+  version 5.
+
+- `--module`: Sets the parsing mode to `"module"`. Is set to `"script"` otherwise.
+
+- `--locations`: Attaches a "loc" object to each node with "start" and
+  "end" subobjects, each of which contains the one-based line and
+  zero-based column numbers in `{line, column}` form.
+
+- `--allow-hash-bang`: If the code starts with the characters #! (as in a shellscript), the first line will be treated as a comment.
+
+- `--compact`: No whitespace is used in the AST output.
+
+- `--silent`: Do not output the AST, just return the exit status.
+
+- `--help`: Print the usage information and quit.
+
+The utility spits out the syntax tree as JSON data.
+
+## Build system
+
+Acorn is written in ECMAScript 6, as a set of small modules, in the
+project's `src` directory, and compiled down to bigger ECMAScript 3
+files in `dist` using [Browserify](http://browserify.org) and
+[Babel](http://babeljs.io/). If you are already using Babel, you can
+consider including the modules directly.
+
+The command-line test runner (`npm test`) uses the ES6 modules. The
+browser-based test page (`test/index.html`) uses the compiled modules.
+The `bin/build-acorn.js` script builds the latter from the former.
+
+If you are working on Acorn, you'll probably want to try the code out
+directly, without an intermediate build step. In your scripts, you can
+register the Babel require shim like this:
+
+    require("babel-core/register")
+
+That will allow you to directly `require` the ES6 modules.
+
+## Plugins
+
+Acorn is designed support allow plugins which, within reasonable
+bounds, redefine the way the parser works. Plugins can add new token
+types and new tokenizer contexts (if necessary), and extend methods in
+the parser object. This is not a clean, elegant API—using it requires
+an understanding of Acorn's internals, and plugins are likely to break
+whenever those internals are significantly changed. But still, it is
+_possible_, in this way, to create parsers for JavaScript dialects
+without forking all of Acorn. And in principle it is even possible to
+combine such plugins, so that if you have, for example, a plugin for
+parsing types and a plugin for parsing JSX-style XML literals, you
+could load them both and parse code with both JSX tags and types.
+
+A plugin should register itself by adding a property to
+`acorn.plugins`, which holds a function. Calling `acorn.parse`, a
+`plugins` option can be passed, holding an object mapping plugin names
+to configuration values (or just `true` for plugins that don't take
+options). After the parser object has been created, the initialization
+functions for the chosen plugins are called with `(parser,
+configValue)` arguments. They are expected to use the `parser.extend`
+method to extend parser methods. For example, the `readToken` method
+could be extended like this:
+
+```javascript
+parser.extend("readToken", function(nextMethod) {
+  return function(code) {
+    console.log("Reading a token!")
+    return nextMethod.call(this, code)
+  }
+})
+```
+
+The `nextMethod` argument passed to `extend`'s second argument is the
+previous value of this method, and should usually be called through to
+whenever the extended method does not handle the call itself.
+
+Similarly, the loose parser allows plugins to register themselves via
+`acorn.pluginsLoose`.  The extension mechanism is the same as for the
+normal parser:
+
+```javascript
+looseParser.extend("readToken", function(nextMethod) {
+  return function() {
+    console.log("Reading a token in the loose parser!")
+    return nextMethod.call(this)
+  }
+})
+```
+
+### Existing plugins
+
+ - [`acorn-jsx`](https://github.com/RReverser/acorn-jsx): Parse [Facebook JSX syntax extensions](https://github.com/facebook/jsx)
+ - [`acorn-es7-plugin`](https://github.com/MatAtBread/acorn-es7-plugin/): Parse [async/await syntax proposal](https://github.com/tc39/ecmascript-asyncawait)
+ - [`acorn-object-spread`](https://github.com/UXtemple/acorn-object-spread): Parse [object spread syntax proposal](https://github.com/sebmarkbage/ecmascript-rest-spread)
+ - [`acorn-es7`](https://www.npmjs.com/package/acorn-es7): Parse [decorator syntax proposal](https://github.com/wycats/javascript-decorators)
+ - [`acorn-objj`](https://www.npmjs.com/package/acorn-objj): [Objective-J](http://www.cappuccino-project.org/learn/objective-j.html) language parser built as Acorn plugin
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/acorn b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/acorn
new file mode 100755
index 0000000000..78ebd4f0ea
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/acorn
@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+'use strict';
+
+var path = require('path');
+var fs = require('fs');
+var acorn = require('../dist/acorn.js');
+
+var infile;
+var forceFile;
+var silent = false;
+var compact = false;
+var tokenize = false;
+var options = {}
+
+function help(status) {
+  var print = (status == 0) ? console.log : console.error
+  print("usage: " + path.basename(process.argv[1]) + " [--ecma3|--ecma5|--ecma6|--ecma7|...|--ecma2015|--ecma2016|...]")
+  print("        [--tokenize] [--locations] [---allow-hash-bang] [--compact] [--silent] [--module] [--help] [--] [infile]")
+  process.exit(status)
+}
+
+for (var i = 2; i < process.argv.length; ++i) {
+  var arg = process.argv[i]
+  if ((arg == "-" || arg[0] != "-") && !infile) infile = arg
+  else if (arg == "--" && !infile && i + 2 == process.argv.length) forceFile = infile = process.argv[++i]
+  else if (arg == "--locations") options.locations = true
+  else if (arg == "--allow-hash-bang") options.allowHashBang = true
+  else if (arg == "--silent") silent = true
+  else if (arg == "--compact") compact = true
+  else if (arg == "--help") help(0)
+  else if (arg == "--tokenize") tokenize = true
+  else if (arg == "--module") options.sourceType = 'module'
+  else {
+    var match = arg.match(/^--ecma(\d+)$/)
+    if (match)
+      options.ecmaVersion = +match[1]
+    else
+      help(1)
+  }
+}
+
+function run(code) {
+  var result
+  if (!tokenize) {
+    try { result = acorn.parse(code, options) }
+    catch(e) { console.error(e.message); process.exit(1) }
+  } else {
+    result = []
+    var tokenizer = acorn.tokenizer(code, options), token
+    while (true) {
+      try { token = tokenizer.getToken() }
+      catch(e) { console.error(e.message); process.exit(1) }
+      result.push(token)
+      if (token.type == acorn.tokTypes.eof) break
+    }
+  }
+  if (!silent) console.log(JSON.stringify(result, null, compact ? null : 2))
+}
+
+if (forceFile || infile && infile != "-") {
+  run(fs.readFileSync(infile, "utf8"))
+} else {
+  var code = ""
+  process.stdin.resume()
+  process.stdin.on("data", function (chunk) { return code += chunk; })
+  process.stdin.on("end", function () { return run(code); })
+}
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/generate-identifier-regex.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/generate-identifier-regex.js
new file mode 100644
index 0000000000..100e8cf280
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/generate-identifier-regex.js
@@ -0,0 +1,55 @@
+'use strict';
+
+// Which Unicode version should be used?
+var version = '9.0.0';
+
+var start = require('unicode-' + version + '/Binary_Property/ID_Start/code-points.js')
+    .filter(function(ch) { return ch > 0x7f; });
+var last = -1;
+var cont = [0x200c, 0x200d].concat(require('unicode-' + version + '/Binary_Property/ID_Continue/code-points.js')
+    .filter(function(ch) { return ch > 0x7f && search(start, ch, last + 1) == -1; }));
+
+function search(arr, ch, starting) {
+  for (var i = starting; arr[i] <= ch && i < arr.length; last = i++)
+    if (arr[i] === ch)
+      return i;
+  return -1;
+}
+
+function pad(str, width) {
+  while (str.length < width) str = "0" + str;
+  return str;
+}
+
+function esc(code) {
+  var hex = code.toString(16);
+  if (hex.length <= 2) return "\\x" + pad(hex, 2);
+  else return "\\u" + pad(hex, 4);
+}
+
+function generate(chars) {
+  var astral = [], re = "";
+  for (var i = 0, at = 0x10000; i < chars.length; i++) {
+    var from = chars[i], to = from;
+    while (i < chars.length - 1 && chars[i + 1] == to + 1) {
+      i++;
+      to++;
+    }
+    if (to <= 0xffff) {
+      if (from == to) re += esc(from);
+      else if (from + 1 == to) re += esc(from) + esc(to);
+      else re += esc(from) + "-" + esc(to);
+    } else {
+      astral.push(from - at, to - from);
+      at = to;
+    }
+  }
+  return {nonASCII: re, astral: astral};
+}
+
+var startData = generate(start), contData = generate(cont);
+
+console.log("let nonASCIIidentifierStartChars = \"" + startData.nonASCII + "\"");
+console.log("let nonASCIIidentifierChars = \"" + contData.nonASCII + "\"");
+console.log("const astralIdentifierStartCodes = " + JSON.stringify(startData.astral));
+console.log("const astralIdentifierCodes = " + JSON.stringify(contData.astral));
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/update_authors.sh b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/update_authors.sh
new file mode 100755
index 0000000000..e08f57273c
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/bin/update_authors.sh
@@ -0,0 +1,6 @@
+# Combine existing list of authors with everyone known in git, sort, add header.
+tail --lines=+3 AUTHORS > AUTHORS.tmp
+git log --format='%aN' | grep -v abraidwood | grep -v Rich-Harris | grep -v ForbesLindesay >> AUTHORS.tmp
+echo -e "List of Acorn contributors. Updated before every release.\n" > AUTHORS
+sort -u AUTHORS.tmp >> AUTHORS
+rm -f AUTHORS.tmp
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/.keep b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.es.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.es.js
new file mode 100644
index 0000000000..adb3dd30f3
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.es.js
@@ -0,0 +1,3332 @@
+// Reserved word lists for various dialects of the language
+
+var reservedWords = {
+  3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile",
+  5: "class enum extends super const export import",
+  6: "enum",
+  strict: "implements interface let package private protected public static yield",
+  strictBind: "eval arguments"
+}
+
+// And the keywords
+
+var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"
+
+var keywords = {
+  5: ecma5AndLessKeywords,
+  6: ecma5AndLessKeywords + " const class extends export import super"
+}
+
+// ## Character categories
+
+// Big ugly regular expressions that match characters in the
+// whitespace, identifier, and identifier-start categories. These
+// are only applied when a character is found to actually have a
+// code point above 128.
+// Generated by `bin/generate-identifier-regex.js`.
+
+var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fd5\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ae\ua7b0-\ua7b7\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab65\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"
+var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d4-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d01-\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf8\u1cf9\u1dc0-\u1df5\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"
+
+var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]")
+var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]")
+
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null
+
+// These are a run-length and offset encoded representation of the
+// >0xffff code points that are a valid part of identifiers. The
+// offset starts at 0x10000, and each pair of numbers represents an
+// offset to the next range, and then a size of the range. They were
+// generated by bin/generate-identifier-regex.js
+var astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,17,26,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,26,45,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,785,52,76,44,33,24,27,35,42,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,54,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,86,25,391,63,32,0,449,56,264,8,2,36,18,0,50,29,881,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,881,68,12,0,67,12,65,0,32,6124,20,754,9486,1,3071,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,4149,196,60,67,1213,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,10591,541]
+var astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,1306,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,52,0,13,2,49,13,10,2,4,9,83,11,7,0,161,11,6,9,7,3,57,0,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,87,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,423,9,838,7,2,7,17,9,57,21,2,13,19882,9,135,4,60,6,26,9,1016,45,17,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,2214,6,110,6,6,9,792487,239]
+
+// This has a complexity linear to the value of the code. The
+// assumption is that looking up astral identifier characters is
+// rare.
+function isInAstralSet(code, set) {
+  var pos = 0x10000
+  for (var i = 0; i < set.length; i += 2) {
+    pos += set[i]
+    if (pos > code) return false
+    pos += set[i + 1]
+    if (pos >= code) return true
+  }
+}
+
+// Test whether a given character code starts an identifier.
+
+function isIdentifierStart(code, astral) {
+  if (code < 65) return code === 36
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes)
+}
+
+// Test whether a given character is part of an identifier.
+
+function isIdentifierChar(code, astral) {
+  if (code < 48) return code === 36
+  if (code < 58) return true
+  if (code < 65) return false
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes)
+}
+
+// ## Token types
+
+// The assignment of fine-grained, information-carrying type objects
+// allows the tokenizer to store the information it has about a
+// token in a way that is very cheap for the parser to look up.
+
+// All token type variables start with an underscore, to make them
+// easy to recognize.
+
+// The `beforeExpr` property is used to disambiguate between regular
+// expressions and divisions. It is set on all token types that can
+// be followed by an expression (thus, a slash after them would be a
+// regular expression).
+//
+// The `startsExpr` property is used to check if the token ends a
+// `yield` expression. It is set on all token types that either can
+// directly start an expression (like a quotation mark) or can
+// continue an expression (like the body of a string).
+//
+// `isLoop` marks a keyword as starting a loop, which is important
+// to know when parsing a label, in order to allow or disallow
+// continue jumps to that label.
+
+var TokenType = function TokenType(label, conf) {
+  if ( conf === void 0 ) conf = {};
+
+  this.label = label
+  this.keyword = conf.keyword
+  this.beforeExpr = !!conf.beforeExpr
+  this.startsExpr = !!conf.startsExpr
+  this.isLoop = !!conf.isLoop
+  this.isAssign = !!conf.isAssign
+  this.prefix = !!conf.prefix
+  this.postfix = !!conf.postfix
+  this.binop = conf.binop || null
+  this.updateContext = null
+};
+
+function binop(name, prec) {
+  return new TokenType(name, {beforeExpr: true, binop: prec})
+}
+var beforeExpr = {beforeExpr: true};
+var startsExpr = {startsExpr: true};
+// Map keyword names to token types.
+
+var keywordTypes = {}
+
+// Succinct definitions of keyword token types
+function kw(name, options) {
+  if ( options === void 0 ) options = {};
+
+  options.keyword = name
+  return keywordTypes[name] = new TokenType(name, options)
+}
+
+var tt = {
+  num: new TokenType("num", startsExpr),
+  regexp: new TokenType("regexp", startsExpr),
+  string: new TokenType("string", startsExpr),
+  name: new TokenType("name", startsExpr),
+  eof: new TokenType("eof"),
+
+  // Punctuation token types.
+  bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}),
+  bracketR: new TokenType("]"),
+  braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}),
+  braceR: new TokenType("}"),
+  parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}),
+  parenR: new TokenType(")"),
+  comma: new TokenType(",", beforeExpr),
+  semi: new TokenType(";", beforeExpr),
+  colon: new TokenType(":", beforeExpr),
+  dot: new TokenType("."),
+  question: new TokenType("?", beforeExpr),
+  arrow: new TokenType("=>", beforeExpr),
+  template: new TokenType("template"),
+  ellipsis: new TokenType("...", beforeExpr),
+  backQuote: new TokenType("`", startsExpr),
+  dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}),
+
+  // Operators. These carry several kinds of properties to help the
+  // parser use them properly (the presence of these properties is
+  // what categorizes them as operators).
+  //
+  // `binop`, when present, specifies that this operator is a binary
+  // operator, and will refer to its precedence.
+  //
+  // `prefix` and `postfix` mark the operator as a prefix or postfix
+  // unary operator.
+  //
+  // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+  // binary operators with a very low precedence, that should result
+  // in AssignmentExpression nodes.
+
+  eq: new TokenType("=", {beforeExpr: true, isAssign: true}),
+  assign: new TokenType("_=", {beforeExpr: true, isAssign: true}),
+  incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}),
+  prefix: new TokenType("prefix", {beforeExpr: true, prefix: true, startsExpr: true}),
+  logicalOR: binop("||", 1),
+  logicalAND: binop("&&", 2),
+  bitwiseOR: binop("|", 3),
+  bitwiseXOR: binop("^", 4),
+  bitwiseAND: binop("&", 5),
+  equality: binop("==/!=", 6),
+  relational: binop("</>", 7),
+  bitShift: binop("<</>>", 8),
+  plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}),
+  modulo: binop("%", 10),
+  star: binop("*", 10),
+  slash: binop("/", 10),
+  starstar: new TokenType("**", {beforeExpr: true}),
+
+  // Keyword token types.
+  _break: kw("break"),
+  _case: kw("case", beforeExpr),
+  _catch: kw("catch"),
+  _continue: kw("continue"),
+  _debugger: kw("debugger"),
+  _default: kw("default", beforeExpr),
+  _do: kw("do", {isLoop: true, beforeExpr: true}),
+  _else: kw("else", beforeExpr),
+  _finally: kw("finally"),
+  _for: kw("for", {isLoop: true}),
+  _function: kw("function", startsExpr),
+  _if: kw("if"),
+  _return: kw("return", beforeExpr),
+  _switch: kw("switch"),
+  _throw: kw("throw", beforeExpr),
+  _try: kw("try"),
+  _var: kw("var"),
+  _const: kw("const"),
+  _while: kw("while", {isLoop: true}),
+  _with: kw("with"),
+  _new: kw("new", {beforeExpr: true, startsExpr: true}),
+  _this: kw("this", startsExpr),
+  _super: kw("super", startsExpr),
+  _class: kw("class"),
+  _extends: kw("extends", beforeExpr),
+  _export: kw("export"),
+  _import: kw("import"),
+  _null: kw("null", startsExpr),
+  _true: kw("true", startsExpr),
+  _false: kw("false", startsExpr),
+  _in: kw("in", {beforeExpr: true, binop: 7}),
+  _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}),
+  _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true})
+}
+
+// Matches a whole line break (where CRLF is considered a single
+// line break). Used to count lines.
+
+var lineBreak = /\r\n?|\n|\u2028|\u2029/
+var lineBreakG = new RegExp(lineBreak.source, "g")
+
+function isNewLine(code) {
+  return code === 10 || code === 13 || code === 0x2028 || code === 0x2029
+}
+
+var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/
+
+var skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g
+
+function isArray(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]"
+}
+
+// Checks if an object has a property.
+
+function has(obj, propName) {
+  return Object.prototype.hasOwnProperty.call(obj, propName)
+}
+
+// These are used when `options.locations` is on, for the
+// `startLoc` and `endLoc` properties.
+
+var Position = function Position(line, col) {
+  this.line = line
+  this.column = col
+};
+
+Position.prototype.offset = function offset (n) {
+  return new Position(this.line, this.column + n)
+};
+
+var SourceLocation = function SourceLocation(p, start, end) {
+  this.start = start
+  this.end = end
+  if (p.sourceFile !== null) this.source = p.sourceFile
+};
+
+// The `getLineInfo` function is mostly useful when the
+// `locations` option is off (for performance reasons) and you
+// want to find the line/column position for a given character
+// offset. `input` should be the code string that the offset refers
+// into.
+
+function getLineInfo(input, offset) {
+  for (var line = 1, cur = 0;;) {
+    lineBreakG.lastIndex = cur
+    var match = lineBreakG.exec(input)
+    if (match && match.index < offset) {
+      ++line
+      cur = match.index + match[0].length
+    } else {
+      return new Position(line, offset - cur)
+    }
+  }
+}
+
+// A second optional argument can be given to further configure
+// the parser process. These options are recognized:
+
+var defaultOptions = {
+  // `ecmaVersion` indicates the ECMAScript version to parse. Must
+  // be either 3, 5, 6 (2015), 7 (2016), or 8 (2017). This influences support
+  // for strict mode, the set of reserved words, and support for
+  // new syntax features. The default is 7.
+  ecmaVersion: 7,
+  // `sourceType` indicates the mode the code should be parsed in.
+  // Can be either `"script"` or `"module"`. This influences global
+  // strict mode and parsing of `import` and `export` declarations.
+  sourceType: "script",
+  // `onInsertedSemicolon` can be a callback that will be called
+  // when a semicolon is automatically inserted. It will be passed
+  // th position of the comma as an offset, and if `locations` is
+  // enabled, it is given the location as a `{line, column}` object
+  // as second argument.
+  onInsertedSemicolon: null,
+  // `onTrailingComma` is similar to `onInsertedSemicolon`, but for
+  // trailing commas.
+  onTrailingComma: null,
+  // By default, reserved words are only enforced if ecmaVersion >= 5.
+  // Set `allowReserved` to a boolean value to explicitly turn this on
+  // an off. When this option has the value "never", reserved words
+  // and keywords can also not be used as property names.
+  allowReserved: null,
+  // When enabled, a return at the top level is not considered an
+  // error.
+  allowReturnOutsideFunction: false,
+  // When enabled, import/export statements are not constrained to
+  // appearing at the top of the program.
+  allowImportExportEverywhere: false,
+  // When enabled, hashbang directive in the beginning of file
+  // is allowed and treated as a line comment.
+  allowHashBang: false,
+  // When `locations` is on, `loc` properties holding objects with
+  // `start` and `end` properties in `{line, column}` form (with
+  // line being 1-based and column 0-based) will be attached to the
+  // nodes.
+  locations: false,
+  // A function can be passed as `onToken` option, which will
+  // cause Acorn to call that function with object in the same
+  // format as tokens returned from `tokenizer().getToken()`. Note
+  // that you are not allowed to call the parser from the
+  // callback—that will corrupt its internal state.
+  onToken: null,
+  // A function can be passed as `onComment` option, which will
+  // cause Acorn to call that function with `(block, text, start,
+  // end)` parameters whenever a comment is skipped. `block` is a
+  // boolean indicating whether this is a block (`/* */`) comment,
+  // `text` is the content of the comment, and `start` and `end` are
+  // character offsets that denote the start and end of the comment.
+  // When the `locations` option is on, two more parameters are
+  // passed, the full `{line, column}` locations of the start and
+  // end of the comments. Note that you are not allowed to call the
+  // parser from the callback—that will corrupt its internal state.
+  onComment: null,
+  // Nodes have their start and end characters offsets recorded in
+  // `start` and `end` properties (directly on the node, rather than
+  // the `loc` object, which holds line/column data. To also add a
+  // [semi-standardized][range] `range` property holding a `[start,
+  // end]` array with the same numbers, set the `ranges` option to
+  // `true`.
+  //
+  // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+  ranges: false,
+  // It is possible to parse multiple files into a single AST by
+  // passing the tree produced by parsing the first file as
+  // `program` option in subsequent parses. This will add the
+  // toplevel forms of the parsed file to the `Program` (top) node
+  // of an existing parse tree.
+  program: null,
+  // When `locations` is on, you can pass this to record the source
+  // file in every node's `loc` object.
+  sourceFile: null,
+  // This value, if given, is stored in every node, whether
+  // `locations` is on or off.
+  directSourceFile: null,
+  // When enabled, parenthesized expressions are represented by
+  // (non-standard) ParenthesizedExpression nodes
+  preserveParens: false,
+  plugins: {}
+}
+
+// Interpret and default an options object
+
+function getOptions(opts) {
+  var options = {}
+
+  for (var opt in defaultOptions)
+    options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt]
+
+  if (options.ecmaVersion >= 2015)
+    options.ecmaVersion -= 2009
+
+  if (options.allowReserved == null)
+    options.allowReserved = options.ecmaVersion < 5
+
+  if (isArray(options.onToken)) {
+    var tokens = options.onToken
+    options.onToken = function (token) { return tokens.push(token); }
+  }
+  if (isArray(options.onComment))
+    options.onComment = pushComment(options, options.onComment)
+
+  return options
+}
+
+function pushComment(options, array) {
+  return function (block, text, start, end, startLoc, endLoc) {
+    var comment = {
+      type: block ? 'Block' : 'Line',
+      value: text,
+      start: start,
+      end: end
+    }
+    if (options.locations)
+      comment.loc = new SourceLocation(this, startLoc, endLoc)
+    if (options.ranges)
+      comment.range = [start, end]
+    array.push(comment)
+  }
+}
+
+// Registered plugins
+var plugins = {}
+
+function keywordRegexp(words) {
+  return new RegExp("^(" + words.replace(/ /g, "|") + ")$")
+}
+
+var Parser = function Parser(options, input, startPos) {
+  this.options = options = getOptions(options)
+  this.sourceFile = options.sourceFile
+  this.keywords = keywordRegexp(keywords[options.ecmaVersion >= 6 ? 6 : 5])
+  var reserved = ""
+  if (!options.allowReserved) {
+    for (var v = options.ecmaVersion;; v--)
+      if (reserved = reservedWords[v]) break
+    if (options.sourceType == "module") reserved += " await"
+  }
+  this.reservedWords = keywordRegexp(reserved)
+  var reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict
+  this.reservedWordsStrict = keywordRegexp(reservedStrict)
+  this.reservedWordsStrictBind = keywordRegexp(reservedStrict + " " + reservedWords.strictBind)
+  this.input = String(input)
+
+  // Used to signal to callers of `readWord1` whether the word
+  // contained any escape sequences. This is needed because words with
+  // escape sequences must not be interpreted as keywords.
+  this.containsEsc = false
+
+  // Load plugins
+  this.loadPlugins(options.plugins)
+
+  // Set up token state
+
+  // The current position of the tokenizer in the input.
+  if (startPos) {
+    this.pos = startPos
+    this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1
+    this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length
+  } else {
+    this.pos = this.lineStart = 0
+    this.curLine = 1
+  }
+
+  // Properties of the current token:
+  // Its type
+  this.type = tt.eof
+  // For tokens that include more information than their type, the value
+  this.value = null
+  // Its start and end offset
+  this.start = this.end = this.pos
+  // And, if locations are used, the {line, column} object
+  // corresponding to those offsets
+  this.startLoc = this.endLoc = this.curPosition()
+
+  // Position information for the previous token
+  this.lastTokEndLoc = this.lastTokStartLoc = null
+  this.lastTokStart = this.lastTokEnd = this.pos
+
+  // The context stack is used to superficially track syntactic
+  // context to predict whether a regular expression is allowed in a
+  // given position.
+  this.context = this.initialContext()
+  this.exprAllowed = true
+
+  // Figure out if it's a module code.
+  this.strict = this.inModule = options.sourceType === "module"
+
+  // Used to signify the start of a potential arrow function
+  this.potentialArrowAt = -1
+
+  // Flags to track whether we are in a function, a generator, an async function.
+  this.inFunction = this.inGenerator = this.inAsync = false
+  // Positions to delayed-check that yield/await does not exist in default parameters.
+  this.yieldPos = this.awaitPos = 0
+  // Labels in scope.
+  this.labels = []
+
+  // If enabled, skip leading hashbang line.
+  if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === '#!')
+    this.skipLineComment(2)
+};
+
+// DEPRECATED Kept for backwards compatibility until 3.0 in case a plugin uses them
+Parser.prototype.isKeyword = function isKeyword (word) { return this.keywords.test(word) };
+Parser.prototype.isReservedWord = function isReservedWord (word) { return this.reservedWords.test(word) };
+
+Parser.prototype.extend = function extend (name, f) {
+  this[name] = f(this[name])
+};
+
+Parser.prototype.loadPlugins = function loadPlugins (pluginConfigs) {
+    var this$1 = this;
+
+  for (var name in pluginConfigs) {
+    var plugin = plugins[name]
+    if (!plugin) throw new Error("Plugin '" + name + "' not found")
+    plugin(this$1, pluginConfigs[name])
+  }
+};
+
+Parser.prototype.parse = function parse () {
+  var node = this.options.program || this.startNode()
+  this.nextToken()
+  return this.parseTopLevel(node)
+};
+
+var pp = Parser.prototype
+
+// ## Parser utilities
+
+// Test whether a statement node is the string literal `"use strict"`.
+
+pp.isUseStrict = function(stmt) {
+  return this.options.ecmaVersion >= 5 && stmt.type === "ExpressionStatement" &&
+    stmt.expression.type === "Literal" &&
+    stmt.expression.raw.slice(1, -1) === "use strict"
+}
+
+// Predicate that tests whether the next token is of the given
+// type, and if yes, consumes it as a side effect.
+
+pp.eat = function(type) {
+  if (this.type === type) {
+    this.next()
+    return true
+  } else {
+    return false
+  }
+}
+
+// Tests whether parsed token is a contextual keyword.
+
+pp.isContextual = function(name) {
+  return this.type === tt.name && this.value === name
+}
+
+// Consumes contextual keyword if possible.
+
+pp.eatContextual = function(name) {
+  return this.value === name && this.eat(tt.name)
+}
+
+// Asserts that following token is given contextual keyword.
+
+pp.expectContextual = function(name) {
+  if (!this.eatContextual(name)) this.unexpected()
+}
+
+// Test whether a semicolon can be inserted at the current position.
+
+pp.canInsertSemicolon = function() {
+  return this.type === tt.eof ||
+    this.type === tt.braceR ||
+    lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+}
+
+pp.insertSemicolon = function() {
+  if (this.canInsertSemicolon()) {
+    if (this.options.onInsertedSemicolon)
+      this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc)
+    return true
+  }
+}
+
+// Consume a semicolon, or, failing that, see if we are allowed to
+// pretend that there is a semicolon at this position.
+
+pp.semicolon = function() {
+  if (!this.eat(tt.semi) && !this.insertSemicolon()) this.unexpected()
+}
+
+pp.afterTrailingComma = function(tokType, notNext) {
+  if (this.type == tokType) {
+    if (this.options.onTrailingComma)
+      this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc)
+    if (!notNext)
+      this.next()
+    return true
+  }
+}
+
+// Expect a token of a given type. If found, consume it, otherwise,
+// raise an unexpected token error.
+
+pp.expect = function(type) {
+  this.eat(type) || this.unexpected()
+}
+
+// Raise an unexpected token error.
+
+pp.unexpected = function(pos) {
+  this.raise(pos != null ? pos : this.start, "Unexpected token")
+}
+
+var DestructuringErrors = function DestructuringErrors() {
+  this.shorthandAssign = 0
+  this.trailingComma = 0
+};
+
+pp.checkPatternErrors = function(refDestructuringErrors, andThrow) {
+  var trailing = refDestructuringErrors && refDestructuringErrors.trailingComma
+  if (!andThrow) return !!trailing
+  if (trailing) this.raise(trailing, "Comma is not permitted after the rest element")
+}
+
+pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) {
+  var pos = refDestructuringErrors && refDestructuringErrors.shorthandAssign
+  if (!andThrow) return !!pos
+  if (pos) this.raise(pos, "Shorthand property assignments are valid only in destructuring patterns")
+}
+
+pp.checkYieldAwaitInDefaultParams = function() {
+  if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos))
+    this.raise(this.yieldPos, "Yield expression cannot be a default value")
+  if (this.awaitPos)
+    this.raise(this.awaitPos, "Await expression cannot be a default value")
+}
+
+var pp$1 = Parser.prototype
+
+// ### Statement parsing
+
+// Parse a program. Initializes the parser, reads any number of
+// statements, and wraps them in a Program node.  Optionally takes a
+// `program` argument.  If present, the statements will be appended
+// to its body instead of creating a new node.
+
+pp$1.parseTopLevel = function(node) {
+  var this$1 = this;
+
+  var first = true, exports = {}
+  if (!node.body) node.body = []
+  while (this.type !== tt.eof) {
+    var stmt = this$1.parseStatement(true, true, exports)
+    node.body.push(stmt)
+    if (first) {
+      if (this$1.isUseStrict(stmt)) this$1.setStrict(true)
+      first = false
+    }
+  }
+  this.next()
+  if (this.options.ecmaVersion >= 6) {
+    node.sourceType = this.options.sourceType
+  }
+  return this.finishNode(node, "Program")
+}
+
+var loopLabel = {kind: "loop"};
+var switchLabel = {kind: "switch"};
+pp$1.isLet = function() {
+  if (this.type !== tt.name || this.options.ecmaVersion < 6 || this.value != "let") return false
+  skipWhiteSpace.lastIndex = this.pos
+  var skip = skipWhiteSpace.exec(this.input)
+  var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next)
+  if (nextCh === 91 || nextCh == 123) return true // '{' and '['
+  if (isIdentifierStart(nextCh, true)) {
+    for (var pos = next + 1; isIdentifierChar(this.input.charCodeAt(pos), true); ++pos) {}
+    var ident = this.input.slice(next, pos)
+    if (!this.isKeyword(ident)) return true
+  }
+  return false
+}
+
+// check 'async [no LineTerminator here] function'
+// - 'async /*foo*/ function' is OK.
+// - 'async /*\n*/ function' is invalid.
+pp$1.isAsyncFunction = function() {
+  if (this.type !== tt.name || this.options.ecmaVersion < 8 || this.value != "async")
+    return false
+
+  skipWhiteSpace.lastIndex = this.pos
+  var skip = skipWhiteSpace.exec(this.input)
+  var next = this.pos + skip[0].length
+  return !lineBreak.test(this.input.slice(this.pos, next)) &&
+    this.input.slice(next, next + 8) === "function" &&
+    (next + 8 == this.input.length || !isIdentifierChar(this.input.charAt(next + 8)))
+}
+
+// Parse a single statement.
+//
+// If expecting a statement and finding a slash operator, parse a
+// regular expression literal. This is to handle cases like
+// `if (foo) /blah/.exec(foo)`, where looking at the previous token
+// does not help.
+
+pp$1.parseStatement = function(declaration, topLevel, exports) {
+  var starttype = this.type, node = this.startNode(), kind
+
+  if (this.isLet()) {
+    starttype = tt._var
+    kind = "let"
+  }
+
+  // Most types of statements are recognized by the keyword they
+  // start with. Many are trivial to parse, some require a bit of
+  // complexity.
+
+  switch (starttype) {
+  case tt._break: case tt._continue: return this.parseBreakContinueStatement(node, starttype.keyword)
+  case tt._debugger: return this.parseDebuggerStatement(node)
+  case tt._do: return this.parseDoStatement(node)
+  case tt._for: return this.parseForStatement(node)
+  case tt._function:
+    if (!declaration && this.options.ecmaVersion >= 6) this.unexpected()
+    return this.parseFunctionStatement(node, false)
+  case tt._class:
+    if (!declaration) this.unexpected()
+    return this.parseClass(node, true)
+  case tt._if: return this.parseIfStatement(node)
+  case tt._return: return this.parseReturnStatement(node)
+  case tt._switch: return this.parseSwitchStatement(node)
+  case tt._throw: return this.parseThrowStatement(node)
+  case tt._try: return this.parseTryStatement(node)
+  case tt._const: case tt._var:
+    kind = kind || this.value
+    if (!declaration && kind != "var") this.unexpected()
+    return this.parseVarStatement(node, kind)
+  case tt._while: return this.parseWhileStatement(node)
+  case tt._with: return this.parseWithStatement(node)
+  case tt.braceL: return this.parseBlock()
+  case tt.semi: return this.parseEmptyStatement(node)
+  case tt._export:
+  case tt._import:
+    if (!this.options.allowImportExportEverywhere) {
+      if (!topLevel)
+        this.raise(this.start, "'import' and 'export' may only appear at the top level")
+      if (!this.inModule)
+        this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'")
+    }
+    return starttype === tt._import ? this.parseImport(node) : this.parseExport(node, exports)
+
+    // If the statement does not start with a statement keyword or a
+    // brace, it's an ExpressionStatement or LabeledStatement. We
+    // simply start parsing an expression, and afterwards, if the
+    // next token is a colon and the expression was a simple
+    // Identifier node, we switch to interpreting it as a label.
+  default:
+    if (this.isAsyncFunction() && declaration) {
+      this.next()
+      return this.parseFunctionStatement(node, true)
+    }
+
+    var maybeName = this.value, expr = this.parseExpression()
+    if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon))
+      return this.parseLabeledStatement(node, maybeName, expr)
+    else return this.parseExpressionStatement(node, expr)
+  }
+}
+
+pp$1.parseBreakContinueStatement = function(node, keyword) {
+  var this$1 = this;
+
+  var isBreak = keyword == "break"
+  this.next()
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.label = null
+  else if (this.type !== tt.name) this.unexpected()
+  else {
+    node.label = this.parseIdent()
+    this.semicolon()
+  }
+
+  // Verify that there is an actual destination to break or
+  // continue to.
+  for (var i = 0; i < this.labels.length; ++i) {
+    var lab = this$1.labels[i]
+    if (node.label == null || lab.name === node.label.name) {
+      if (lab.kind != null && (isBreak || lab.kind === "loop")) break
+      if (node.label && isBreak) break
+    }
+  }
+  if (i === this.labels.length) this.raise(node.start, "Unsyntactic " + keyword)
+  return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+}
+
+pp$1.parseDebuggerStatement = function(node) {
+  this.next()
+  this.semicolon()
+  return this.finishNode(node, "DebuggerStatement")
+}
+
+pp$1.parseDoStatement = function(node) {
+  this.next()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  this.expect(tt._while)
+  node.test = this.parseParenExpression()
+  if (this.options.ecmaVersion >= 6)
+    this.eat(tt.semi)
+  else
+    this.semicolon()
+  return this.finishNode(node, "DoWhileStatement")
+}
+
+// Disambiguating between a `for` and a `for`/`in` or `for`/`of`
+// loop is non-trivial. Basically, we have to parse the init `var`
+// statement or expression, disallowing the `in` operator (see
+// the second parameter to `parseExpression`), and then check
+// whether the next token is `in` or `of`. When there is no init
+// part (semicolon immediately after the opening parenthesis), it
+// is a regular `for` loop.
+
+pp$1.parseForStatement = function(node) {
+  this.next()
+  this.labels.push(loopLabel)
+  this.expect(tt.parenL)
+  if (this.type === tt.semi) return this.parseFor(node, null)
+  var isLet = this.isLet()
+  if (this.type === tt._var || this.type === tt._const || isLet) {
+    var init$1 = this.startNode(), kind = isLet ? "let" : this.value
+    this.next()
+    this.parseVar(init$1, true, kind)
+    this.finishNode(init$1, "VariableDeclaration")
+    if ((this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init$1.declarations.length === 1 &&
+        !(kind !== "var" && init$1.declarations[0].init))
+      return this.parseForIn(node, init$1)
+    return this.parseFor(node, init$1)
+  }
+  var refDestructuringErrors = new DestructuringErrors
+  var init = this.parseExpression(true, refDestructuringErrors)
+  if (this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) {
+    this.checkPatternErrors(refDestructuringErrors, true)
+    this.toAssignable(init)
+    this.checkLVal(init)
+    return this.parseForIn(node, init)
+  } else {
+    this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  return this.parseFor(node, init)
+}
+
+pp$1.parseFunctionStatement = function(node, isAsync) {
+  this.next()
+  return this.parseFunction(node, true, false, isAsync)
+}
+
+pp$1.isFunction = function() {
+  return this.type === tt._function || this.isAsyncFunction()
+}
+
+pp$1.parseIfStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  // allow function declarations in branches, but only in non-strict mode
+  node.consequent = this.parseStatement(!this.strict && this.isFunction())
+  node.alternate = this.eat(tt._else) ? this.parseStatement(!this.strict && this.isFunction()) : null
+  return this.finishNode(node, "IfStatement")
+}
+
+pp$1.parseReturnStatement = function(node) {
+  if (!this.inFunction && !this.options.allowReturnOutsideFunction)
+    this.raise(this.start, "'return' outside of function")
+  this.next()
+
+  // In `return` (and `break`/`continue`), the keywords with
+  // optional arguments, we eagerly look for a semicolon or the
+  // possibility to insert one.
+
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.argument = null
+  else { node.argument = this.parseExpression(); this.semicolon() }
+  return this.finishNode(node, "ReturnStatement")
+}
+
+pp$1.parseSwitchStatement = function(node) {
+  var this$1 = this;
+
+  this.next()
+  node.discriminant = this.parseParenExpression()
+  node.cases = []
+  this.expect(tt.braceL)
+  this.labels.push(switchLabel)
+
+  // Statements under must be grouped (by label) in SwitchCase
+  // nodes. `cur` is used to keep the node that we are currently
+  // adding statements to.
+
+  for (var cur, sawDefault = false; this.type != tt.braceR;) {
+    if (this$1.type === tt._case || this$1.type === tt._default) {
+      var isCase = this$1.type === tt._case
+      if (cur) this$1.finishNode(cur, "SwitchCase")
+      node.cases.push(cur = this$1.startNode())
+      cur.consequent = []
+      this$1.next()
+      if (isCase) {
+        cur.test = this$1.parseExpression()
+      } else {
+        if (sawDefault) this$1.raiseRecoverable(this$1.lastTokStart, "Multiple default clauses")
+        sawDefault = true
+        cur.test = null
+      }
+      this$1.expect(tt.colon)
+    } else {
+      if (!cur) this$1.unexpected()
+      cur.consequent.push(this$1.parseStatement(true))
+    }
+  }
+  if (cur) this.finishNode(cur, "SwitchCase")
+  this.next() // Closing brace
+  this.labels.pop()
+  return this.finishNode(node, "SwitchStatement")
+}
+
+pp$1.parseThrowStatement = function(node) {
+  this.next()
+  if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start)))
+    this.raise(this.lastTokEnd, "Illegal newline after throw")
+  node.argument = this.parseExpression()
+  this.semicolon()
+  return this.finishNode(node, "ThrowStatement")
+}
+
+// Reused empty array added for node fields that are always empty.
+
+var empty = []
+
+pp$1.parseTryStatement = function(node) {
+  this.next()
+  node.block = this.parseBlock()
+  node.handler = null
+  if (this.type === tt._catch) {
+    var clause = this.startNode()
+    this.next()
+    this.expect(tt.parenL)
+    clause.param = this.parseBindingAtom()
+    this.checkLVal(clause.param, true)
+    this.expect(tt.parenR)
+    clause.body = this.parseBlock()
+    node.handler = this.finishNode(clause, "CatchClause")
+  }
+  node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null
+  if (!node.handler && !node.finalizer)
+    this.raise(node.start, "Missing catch or finally clause")
+  return this.finishNode(node, "TryStatement")
+}
+
+pp$1.parseVarStatement = function(node, kind) {
+  this.next()
+  this.parseVar(node, false, kind)
+  this.semicolon()
+  return this.finishNode(node, "VariableDeclaration")
+}
+
+pp$1.parseWhileStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, "WhileStatement")
+}
+
+pp$1.parseWithStatement = function(node) {
+  if (this.strict) this.raise(this.start, "'with' in strict mode")
+  this.next()
+  node.object = this.parseParenExpression()
+  node.body = this.parseStatement(false)
+  return this.finishNode(node, "WithStatement")
+}
+
+pp$1.parseEmptyStatement = function(node) {
+  this.next()
+  return this.finishNode(node, "EmptyStatement")
+}
+
+pp$1.parseLabeledStatement = function(node, maybeName, expr) {
+  var this$1 = this;
+
+  for (var i = 0; i < this.labels.length; ++i)
+    if (this$1.labels[i].name === maybeName) this$1.raise(expr.start, "Label '" + maybeName + "' is already declared")
+  var kind = this.type.isLoop ? "loop" : this.type === tt._switch ? "switch" : null
+  for (var i$1 = this.labels.length - 1; i$1 >= 0; i$1--) {
+    var label = this$1.labels[i$1]
+    if (label.statementStart == node.start) {
+      label.statementStart = this$1.start
+      label.kind = kind
+    } else break
+  }
+  this.labels.push({name: maybeName, kind: kind, statementStart: this.start})
+  node.body = this.parseStatement(true)
+  this.labels.pop()
+  node.label = expr
+  return this.finishNode(node, "LabeledStatement")
+}
+
+pp$1.parseExpressionStatement = function(node, expr) {
+  node.expression = expr
+  this.semicolon()
+  return this.finishNode(node, "ExpressionStatement")
+}
+
+// Parse a semicolon-enclosed block of statements, handling `"use
+// strict"` declarations when `allowStrict` is true (used for
+// function bodies).
+
+pp$1.parseBlock = function(allowStrict) {
+  var this$1 = this;
+
+  var node = this.startNode(), first = true, oldStrict
+  node.body = []
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    var stmt = this$1.parseStatement(true)
+    node.body.push(stmt)
+    if (first && allowStrict && this$1.isUseStrict(stmt)) {
+      oldStrict = this$1.strict
+      this$1.setStrict(this$1.strict = true)
+    }
+    first = false
+  }
+  if (oldStrict === false) this.setStrict(false)
+  return this.finishNode(node, "BlockStatement")
+}
+
+// Parse a regular `for` loop. The disambiguation code in
+// `parseStatement` will already have parsed the init statement or
+// expression.
+
+pp$1.parseFor = function(node, init) {
+  node.init = init
+  this.expect(tt.semi)
+  node.test = this.type === tt.semi ? null : this.parseExpression()
+  this.expect(tt.semi)
+  node.update = this.type === tt.parenR ? null : this.parseExpression()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, "ForStatement")
+}
+
+// Parse a `for`/`in` and `for`/`of` loop, which are almost
+// same from parser's perspective.
+
+pp$1.parseForIn = function(node, init) {
+  var type = this.type === tt._in ? "ForInStatement" : "ForOfStatement"
+  this.next()
+  node.left = init
+  node.right = this.parseExpression()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, type)
+}
+
+// Parse a list of variable declarations.
+
+pp$1.parseVar = function(node, isFor, kind) {
+  var this$1 = this;
+
+  node.declarations = []
+  node.kind = kind
+  for (;;) {
+    var decl = this$1.startNode()
+    this$1.parseVarId(decl)
+    if (this$1.eat(tt.eq)) {
+      decl.init = this$1.parseMaybeAssign(isFor)
+    } else if (kind === "const" && !(this$1.type === tt._in || (this$1.options.ecmaVersion >= 6 && this$1.isContextual("of")))) {
+      this$1.unexpected()
+    } else if (decl.id.type != "Identifier" && !(isFor && (this$1.type === tt._in || this$1.isContextual("of")))) {
+      this$1.raise(this$1.lastTokEnd, "Complex binding patterns require an initialization value")
+    } else {
+      decl.init = null
+    }
+    node.declarations.push(this$1.finishNode(decl, "VariableDeclarator"))
+    if (!this$1.eat(tt.comma)) break
+  }
+  return node
+}
+
+pp$1.parseVarId = function(decl) {
+  decl.id = this.parseBindingAtom()
+  this.checkLVal(decl.id, true)
+}
+
+// Parse a function declaration or literal (depending on the
+// `isStatement` parameter).
+
+pp$1.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) {
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6 && !isAsync)
+    node.generator = this.eat(tt.star)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  if (isStatement)
+    node.id = this.parseIdent()
+
+  var oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+  this.inGenerator = node.generator
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  if (!isStatement && this.type === tt.name)
+    node.id = this.parseIdent()
+  this.parseFunctionParams(node)
+  this.parseFunctionBody(node, allowExpressionBody)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+}
+
+pp$1.parseFunctionParams = function(node) {
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8, true)
+  this.checkYieldAwaitInDefaultParams()
+}
+
+// Parse a class declaration or literal (depending on the
+// `isStatement` parameter).
+
+pp$1.parseClass = function(node, isStatement) {
+  var this$1 = this;
+
+  this.next()
+  this.parseClassId(node, isStatement)
+  this.parseClassSuper(node)
+  var classBody = this.startNode()
+  var hadConstructor = false
+  classBody.body = []
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (this$1.eat(tt.semi)) continue
+    var method = this$1.startNode()
+    var isGenerator = this$1.eat(tt.star)
+    var isAsync = false
+    var isMaybeStatic = this$1.type === tt.name && this$1.value === "static"
+    this$1.parsePropertyName(method)
+    method.static = isMaybeStatic && this$1.type !== tt.parenL
+    if (method.static) {
+      if (isGenerator) this$1.unexpected()
+      isGenerator = this$1.eat(tt.star)
+      this$1.parsePropertyName(method)
+    }
+    if (this$1.options.ecmaVersion >= 8 && !isGenerator && !method.computed &&
+        method.key.type === "Identifier" && method.key.name === "async" && this$1.type !== tt.parenL &&
+        !this$1.canInsertSemicolon()) {
+      isAsync = true
+      this$1.parsePropertyName(method)
+    }
+    method.kind = "method"
+    var isGetSet = false
+    if (!method.computed) {
+      var key = method.key;
+      if (!isGenerator && !isAsync && key.type === "Identifier" && this$1.type !== tt.parenL && (key.name === "get" || key.name === "set")) {
+        isGetSet = true
+        method.kind = key.name
+        key = this$1.parsePropertyName(method)
+      }
+      if (!method.static && (key.type === "Identifier" && key.name === "constructor" ||
+          key.type === "Literal" && key.value === "constructor")) {
+        if (hadConstructor) this$1.raise(key.start, "Duplicate constructor in the same class")
+        if (isGetSet) this$1.raise(key.start, "Constructor can't have get/set modifier")
+        if (isGenerator) this$1.raise(key.start, "Constructor can't be a generator")
+        if (isAsync) this$1.raise(key.start, "Constructor can't be an async method")
+        method.kind = "constructor"
+        hadConstructor = true
+      }
+    }
+    this$1.parseClassMethod(classBody, method, isGenerator, isAsync)
+    if (isGetSet) {
+      var paramCount = method.kind === "get" ? 0 : 1
+      if (method.value.params.length !== paramCount) {
+        var start = method.value.start
+        if (method.kind === "get")
+          this$1.raiseRecoverable(start, "getter should have no params")
+        else
+          this$1.raiseRecoverable(start, "setter should have exactly one param")
+      } else {
+        if (method.kind === "set" && method.value.params[0].type === "RestElement")
+          this$1.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params")
+      }
+    }
+  }
+  node.body = this.finishNode(classBody, "ClassBody")
+  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+}
+
+pp$1.parseClassMethod = function(classBody, method, isGenerator, isAsync) {
+  method.value = this.parseMethod(isGenerator, isAsync)
+  classBody.body.push(this.finishNode(method, "MethodDefinition"))
+}
+
+pp$1.parseClassId = function(node, isStatement) {
+  node.id = this.type === tt.name ? this.parseIdent() : isStatement ? this.unexpected() : null
+}
+
+pp$1.parseClassSuper = function(node) {
+  node.superClass = this.eat(tt._extends) ? this.parseExprSubscripts() : null
+}
+
+// Parses module export declaration.
+
+pp$1.parseExport = function(node, exports) {
+  var this$1 = this;
+
+  this.next()
+  // export * from '...'
+  if (this.eat(tt.star)) {
+    this.expectContextual("from")
+    node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+    this.semicolon()
+    return this.finishNode(node, "ExportAllDeclaration")
+  }
+  if (this.eat(tt._default)) { // export default ...
+    this.checkExport(exports, "default", this.lastTokStart)
+    var parens = this.type == tt.parenL
+    var expr = this.parseMaybeAssign()
+    var needsSemi = true
+    if (!parens && (expr.type == "FunctionExpression" ||
+                    expr.type == "ClassExpression")) {
+      needsSemi = false
+      if (expr.id) {
+        expr.type = expr.type == "FunctionExpression"
+          ? "FunctionDeclaration"
+          : "ClassDeclaration"
+      }
+    }
+    node.declaration = expr
+    if (needsSemi) this.semicolon()
+    return this.finishNode(node, "ExportDefaultDeclaration")
+  }
+  // export var|const|let|function|class ...
+  if (this.shouldParseExportStatement()) {
+    node.declaration = this.parseStatement(true)
+    if (node.declaration.type === "VariableDeclaration")
+      this.checkVariableExport(exports, node.declaration.declarations)
+    else
+      this.checkExport(exports, node.declaration.id.name, node.declaration.id.start)
+    node.specifiers = []
+    node.source = null
+  } else { // export { x, y as z } [from '...']
+    node.declaration = null
+    node.specifiers = this.parseExportSpecifiers(exports)
+    if (this.eatContextual("from")) {
+      node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+    } else {
+      // check for keywords used as local names
+      for (var i = 0; i < node.specifiers.length; i++) {
+        if (this$1.keywords.test(node.specifiers[i].local.name) || this$1.reservedWords.test(node.specifiers[i].local.name)) {
+          this$1.unexpected(node.specifiers[i].local.start)
+        }
+      }
+
+      node.source = null
+    }
+    this.semicolon()
+  }
+  return this.finishNode(node, "ExportNamedDeclaration")
+}
+
+pp$1.checkExport = function(exports, name, pos) {
+  if (!exports) return
+  if (Object.prototype.hasOwnProperty.call(exports, name))
+    this.raiseRecoverable(pos, "Duplicate export '" + name + "'")
+  exports[name] = true
+}
+
+pp$1.checkPatternExport = function(exports, pat) {
+  var this$1 = this;
+
+  var type = pat.type
+  if (type == "Identifier")
+    this.checkExport(exports, pat.name, pat.start)
+  else if (type == "ObjectPattern")
+    for (var i = 0; i < pat.properties.length; ++i)
+      this$1.checkPatternExport(exports, pat.properties[i].value)
+  else if (type == "ArrayPattern")
+    for (var i$1 = 0; i$1 < pat.elements.length; ++i$1) {
+      var elt = pat.elements[i$1]
+      if (elt) this$1.checkPatternExport(exports, elt)
+    }
+  else if (type == "AssignmentPattern")
+    this.checkPatternExport(exports, pat.left)
+  else if (type == "ParenthesizedExpression")
+    this.checkPatternExport(exports, pat.expression)
+}
+
+pp$1.checkVariableExport = function(exports, decls) {
+  var this$1 = this;
+
+  if (!exports) return
+  for (var i = 0; i < decls.length; i++)
+    this$1.checkPatternExport(exports, decls[i].id)
+}
+
+pp$1.shouldParseExportStatement = function() {
+  return this.type.keyword || this.isLet() || this.isAsyncFunction()
+}
+
+// Parses a comma-separated list of module exports.
+
+pp$1.parseExportSpecifiers = function(exports) {
+  var this$1 = this;
+
+  var nodes = [], first = true
+  // export { x, y as z } [from '...']
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this$1.expect(tt.comma)
+      if (this$1.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    var node = this$1.startNode()
+    node.local = this$1.parseIdent(this$1.type === tt._default)
+    node.exported = this$1.eatContextual("as") ? this$1.parseIdent(true) : node.local
+    this$1.checkExport(exports, node.exported.name, node.exported.start)
+    nodes.push(this$1.finishNode(node, "ExportSpecifier"))
+  }
+  return nodes
+}
+
+// Parses import declaration.
+
+pp$1.parseImport = function(node) {
+  this.next()
+  // import '...'
+  if (this.type === tt.string) {
+    node.specifiers = empty
+    node.source = this.parseExprAtom()
+  } else {
+    node.specifiers = this.parseImportSpecifiers()
+    this.expectContextual("from")
+    node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+  }
+  this.semicolon()
+  return this.finishNode(node, "ImportDeclaration")
+}
+
+// Parses a comma-separated list of module imports.
+
+pp$1.parseImportSpecifiers = function() {
+  var this$1 = this;
+
+  var nodes = [], first = true
+  if (this.type === tt.name) {
+    // import defaultObj, { x, y as z } from '...'
+    var node = this.startNode()
+    node.local = this.parseIdent()
+    this.checkLVal(node.local, true)
+    nodes.push(this.finishNode(node, "ImportDefaultSpecifier"))
+    if (!this.eat(tt.comma)) return nodes
+  }
+  if (this.type === tt.star) {
+    var node$1 = this.startNode()
+    this.next()
+    this.expectContextual("as")
+    node$1.local = this.parseIdent()
+    this.checkLVal(node$1.local, true)
+    nodes.push(this.finishNode(node$1, "ImportNamespaceSpecifier"))
+    return nodes
+  }
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this$1.expect(tt.comma)
+      if (this$1.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    var node$2 = this$1.startNode()
+    node$2.imported = this$1.parseIdent(true)
+    if (this$1.eatContextual("as")) {
+      node$2.local = this$1.parseIdent()
+    } else {
+      node$2.local = node$2.imported
+      if (this$1.isKeyword(node$2.local.name)) this$1.unexpected(node$2.local.start)
+      if (this$1.reservedWordsStrict.test(node$2.local.name)) this$1.raiseRecoverable(node$2.local.start, "The keyword '" + node$2.local.name + "' is reserved")
+    }
+    this$1.checkLVal(node$2.local, true)
+    nodes.push(this$1.finishNode(node$2, "ImportSpecifier"))
+  }
+  return nodes
+}
+
+var pp$2 = Parser.prototype
+
+// Convert existing expression atom to assignable pattern
+// if possible.
+
+pp$2.toAssignable = function(node, isBinding) {
+  var this$1 = this;
+
+  if (this.options.ecmaVersion >= 6 && node) {
+    switch (node.type) {
+      case "Identifier":
+      if (this.inAsync && node.name === "await")
+        this.raise(node.start, "Can not use 'await' as identifier inside an async function")
+      break
+
+    case "ObjectPattern":
+    case "ArrayPattern":
+      break
+
+    case "ObjectExpression":
+      node.type = "ObjectPattern"
+      for (var i = 0; i < node.properties.length; i++) {
+        var prop = node.properties[i]
+        if (prop.kind !== "init") this$1.raise(prop.key.start, "Object pattern can't contain getter or setter")
+        this$1.toAssignable(prop.value, isBinding)
+      }
+      break
+
+    case "ArrayExpression":
+      node.type = "ArrayPattern"
+      this.toAssignableList(node.elements, isBinding)
+      break
+
+    case "AssignmentExpression":
+      if (node.operator === "=") {
+        node.type = "AssignmentPattern"
+        delete node.operator
+        this.toAssignable(node.left, isBinding)
+        // falls through to AssignmentPattern
+      } else {
+        this.raise(node.left.end, "Only '=' operator can be used for specifying default value.")
+        break
+      }
+
+    case "AssignmentPattern":
+      break
+
+    case "ParenthesizedExpression":
+      node.expression = this.toAssignable(node.expression, isBinding)
+      break
+
+    case "MemberExpression":
+      if (!isBinding) break
+
+    default:
+      this.raise(node.start, "Assigning to rvalue")
+    }
+  }
+  return node
+}
+
+// Convert list of expression atoms to binding list.
+
+pp$2.toAssignableList = function(exprList, isBinding) {
+  var this$1 = this;
+
+  var end = exprList.length
+  if (end) {
+    var last = exprList[end - 1]
+    if (last && last.type == "RestElement") {
+      --end
+    } else if (last && last.type == "SpreadElement") {
+      last.type = "RestElement"
+      var arg = last.argument
+      this.toAssignable(arg, isBinding)
+      if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern")
+        this.unexpected(arg.start)
+      --end
+    }
+
+    if (isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
+      this.unexpected(last.argument.start)
+  }
+  for (var i = 0; i < end; i++) {
+    var elt = exprList[i]
+    if (elt) this$1.toAssignable(elt, isBinding)
+  }
+  return exprList
+}
+
+// Parses spread element.
+
+pp$2.parseSpread = function(refDestructuringErrors) {
+  var node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeAssign(false, refDestructuringErrors)
+  return this.finishNode(node, "SpreadElement")
+}
+
+pp$2.parseRest = function(allowNonIdent) {
+  var node = this.startNode()
+  this.next()
+
+  // RestElement inside of a function parameter must be an identifier
+  if (allowNonIdent) node.argument = this.type === tt.name ? this.parseIdent() : this.unexpected()
+  else node.argument = this.type === tt.name || this.type === tt.bracketL ? this.parseBindingAtom() : this.unexpected()
+
+  return this.finishNode(node, "RestElement")
+}
+
+// Parses lvalue (assignable) atom.
+
+pp$2.parseBindingAtom = function() {
+  if (this.options.ecmaVersion < 6) return this.parseIdent()
+  switch (this.type) {
+  case tt.name:
+    return this.parseIdent()
+
+  case tt.bracketL:
+    var node = this.startNode()
+    this.next()
+    node.elements = this.parseBindingList(tt.bracketR, true, true)
+    return this.finishNode(node, "ArrayPattern")
+
+  case tt.braceL:
+    return this.parseObj(true)
+
+  default:
+    this.unexpected()
+  }
+}
+
+pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNonIdent) {
+  var this$1 = this;
+
+  var elts = [], first = true
+  while (!this.eat(close)) {
+    if (first) first = false
+    else this$1.expect(tt.comma)
+    if (allowEmpty && this$1.type === tt.comma) {
+      elts.push(null)
+    } else if (allowTrailingComma && this$1.afterTrailingComma(close)) {
+      break
+    } else if (this$1.type === tt.ellipsis) {
+      var rest = this$1.parseRest(allowNonIdent)
+      this$1.parseBindingListItem(rest)
+      elts.push(rest)
+      if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element")
+      this$1.expect(close)
+      break
+    } else {
+      var elem = this$1.parseMaybeDefault(this$1.start, this$1.startLoc)
+      this$1.parseBindingListItem(elem)
+      elts.push(elem)
+    }
+  }
+  return elts
+}
+
+pp$2.parseBindingListItem = function(param) {
+  return param
+}
+
+// Parses assignment pattern around given atom if possible.
+
+pp$2.parseMaybeDefault = function(startPos, startLoc, left) {
+  left = left || this.parseBindingAtom()
+  if (this.options.ecmaVersion < 6 || !this.eat(tt.eq)) return left
+  var node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.right = this.parseMaybeAssign()
+  return this.finishNode(node, "AssignmentPattern")
+}
+
+// Verify that a node is an lval — something that can be assigned
+// to.
+
+pp$2.checkLVal = function(expr, isBinding, checkClashes) {
+  var this$1 = this;
+
+  switch (expr.type) {
+  case "Identifier":
+    if (this.strict && this.reservedWordsStrictBind.test(expr.name))
+      this.raiseRecoverable(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode")
+    if (checkClashes) {
+      if (has(checkClashes, expr.name))
+        this.raiseRecoverable(expr.start, "Argument name clash")
+      checkClashes[expr.name] = true
+    }
+    break
+
+  case "MemberExpression":
+    if (isBinding) this.raiseRecoverable(expr.start, (isBinding ? "Binding" : "Assigning to") + " member expression")
+    break
+
+  case "ObjectPattern":
+    for (var i = 0; i < expr.properties.length; i++)
+      this$1.checkLVal(expr.properties[i].value, isBinding, checkClashes)
+    break
+
+  case "ArrayPattern":
+    for (var i$1 = 0; i$1 < expr.elements.length; i$1++) {
+      var elem = expr.elements[i$1]
+      if (elem) this$1.checkLVal(elem, isBinding, checkClashes)
+    }
+    break
+
+  case "AssignmentPattern":
+    this.checkLVal(expr.left, isBinding, checkClashes)
+    break
+
+  case "RestElement":
+    this.checkLVal(expr.argument, isBinding, checkClashes)
+    break
+
+  case "ParenthesizedExpression":
+    this.checkLVal(expr.expression, isBinding, checkClashes)
+    break
+
+  default:
+    this.raise(expr.start, (isBinding ? "Binding" : "Assigning to") + " rvalue")
+  }
+}
+
+var pp$3 = Parser.prototype
+
+// Check if property name clashes with already added.
+// Object/class getters and setters are not allowed to clash —
+// either with each other or with an init property — and in
+// strict mode, init properties are also not allowed to be repeated.
+
+pp$3.checkPropClash = function(prop, propHash) {
+  if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand))
+    return
+  var key = prop.key;
+  var name
+  switch (key.type) {
+  case "Identifier": name = key.name; break
+  case "Literal": name = String(key.value); break
+  default: return
+  }
+  var kind = prop.kind;
+  if (this.options.ecmaVersion >= 6) {
+    if (name === "__proto__" && kind === "init") {
+      if (propHash.proto) this.raiseRecoverable(key.start, "Redefinition of __proto__ property")
+      propHash.proto = true
+    }
+    return
+  }
+  name = "$" + name
+  var other = propHash[name]
+  if (other) {
+    var isGetSet = kind !== "init"
+    if ((this.strict || isGetSet) && other[kind] || !(isGetSet ^ other.init))
+      this.raiseRecoverable(key.start, "Redefinition of property")
+  } else {
+    other = propHash[name] = {
+      init: false,
+      get: false,
+      set: false
+    }
+  }
+  other[kind] = true
+}
+
+// ### Expression parsing
+
+// These nest, from the most general expression type at the top to
+// 'atomic', nondivisible expression types at the bottom. Most of
+// the functions will simply let the function(s) below them parse,
+// and, *if* the syntactic construct they handle is present, wrap
+// the AST node that the inner parser gave them in another node.
+
+// Parse a full expression. The optional arguments are used to
+// forbid the `in` operator (in for loops initalization expressions)
+// and provide reference for storing '=' operator inside shorthand
+// property assignment in contexts where both object expression
+// and object pattern might appear (so it's possible to raise
+// delayed syntax error at correct position).
+
+pp$3.parseExpression = function(noIn, refDestructuringErrors) {
+  var this$1 = this;
+
+  var startPos = this.start, startLoc = this.startLoc
+  var expr = this.parseMaybeAssign(noIn, refDestructuringErrors)
+  if (this.type === tt.comma) {
+    var node = this.startNodeAt(startPos, startLoc)
+    node.expressions = [expr]
+    while (this.eat(tt.comma)) node.expressions.push(this$1.parseMaybeAssign(noIn, refDestructuringErrors))
+    return this.finishNode(node, "SequenceExpression")
+  }
+  return expr
+}
+
+// Parse an assignment expression. This includes applications of
+// operators like `+=`.
+
+pp$3.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) {
+  if (this.inGenerator && this.isContextual("yield")) return this.parseYield()
+
+  var ownDestructuringErrors = false
+  if (!refDestructuringErrors) {
+    refDestructuringErrors = new DestructuringErrors
+    ownDestructuringErrors = true
+  }
+  var startPos = this.start, startLoc = this.startLoc
+  if (this.type == tt.parenL || this.type == tt.name)
+    this.potentialArrowAt = this.start
+  var left = this.parseMaybeConditional(noIn, refDestructuringErrors)
+  if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc)
+  if (this.type.isAssign) {
+    this.checkPatternErrors(refDestructuringErrors, true)
+    if (!ownDestructuringErrors) DestructuringErrors.call(refDestructuringErrors)
+    var node = this.startNodeAt(startPos, startLoc)
+    node.operator = this.value
+    node.left = this.type === tt.eq ? this.toAssignable(left) : left
+    refDestructuringErrors.shorthandAssign = 0 // reset because shorthand default was used correctly
+    this.checkLVal(left)
+    this.next()
+    node.right = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "AssignmentExpression")
+  } else {
+    if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  return left
+}
+
+// Parse a ternary conditional (`?:`) operator.
+
+pp$3.parseMaybeConditional = function(noIn, refDestructuringErrors) {
+  var startPos = this.start, startLoc = this.startLoc
+  var expr = this.parseExprOps(noIn, refDestructuringErrors)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  if (this.eat(tt.question)) {
+    var node = this.startNodeAt(startPos, startLoc)
+    node.test = expr
+    node.consequent = this.parseMaybeAssign()
+    this.expect(tt.colon)
+    node.alternate = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "ConditionalExpression")
+  }
+  return expr
+}
+
+// Start the precedence parser.
+
+pp$3.parseExprOps = function(noIn, refDestructuringErrors) {
+  var startPos = this.start, startLoc = this.startLoc
+  var expr = this.parseMaybeUnary(refDestructuringErrors, false)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  return this.parseExprOp(expr, startPos, startLoc, -1, noIn)
+}
+
+// Parse binary operators with the operator precedence parsing
+// algorithm. `left` is the left-hand side of the operator.
+// `minPrec` provides context that allows the function to stop and
+// defer further parser to one of its callers when it encounters an
+// operator that has a lower precedence than the set it is parsing.
+
+pp$3.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {
+  var prec = this.type.binop
+  if (prec != null && (!noIn || this.type !== tt._in)) {
+    if (prec > minPrec) {
+      var logical = this.type === tt.logicalOR || this.type === tt.logicalAND
+      var op = this.value
+      this.next()
+      var startPos = this.start, startLoc = this.startLoc
+      var right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn)
+      var node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical)
+      return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn)
+    }
+  }
+  return left
+}
+
+pp$3.buildBinary = function(startPos, startLoc, left, right, op, logical) {
+  var node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.operator = op
+  node.right = right
+  return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression")
+}
+
+// Parse unary operators, both prefix and postfix.
+
+pp$3.parseMaybeUnary = function(refDestructuringErrors, sawUnary) {
+  var this$1 = this;
+
+  var startPos = this.start, startLoc = this.startLoc, expr
+  if (this.inAsync && this.isContextual("await")) {
+    expr = this.parseAwait(refDestructuringErrors)
+    sawUnary = true
+  } else if (this.type.prefix) {
+    var node = this.startNode(), update = this.type === tt.incDec
+    node.operator = this.value
+    node.prefix = true
+    this.next()
+    node.argument = this.parseMaybeUnary(null, true)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    if (update) this.checkLVal(node.argument)
+    else if (this.strict && node.operator === "delete" &&
+             node.argument.type === "Identifier")
+      this.raiseRecoverable(node.start, "Deleting local variable in strict mode")
+    else sawUnary = true
+    expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+  } else {
+    expr = this.parseExprSubscripts(refDestructuringErrors)
+    if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+    while (this.type.postfix && !this.canInsertSemicolon()) {
+      var node$1 = this$1.startNodeAt(startPos, startLoc)
+      node$1.operator = this$1.value
+      node$1.prefix = false
+      node$1.argument = expr
+      this$1.checkLVal(expr)
+      this$1.next()
+      expr = this$1.finishNode(node$1, "UpdateExpression")
+    }
+  }
+
+  if (!sawUnary && this.eat(tt.starstar))
+    return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false)
+  else
+    return expr
+}
+
+// Parse call, dot, and `[]`-subscript expressions.
+
+pp$3.parseExprSubscripts = function(refDestructuringErrors) {
+  var startPos = this.start, startLoc = this.startLoc
+  var expr = this.parseExprAtom(refDestructuringErrors)
+  var skipArrowSubscripts = expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")"
+  if (this.checkExpressionErrors(refDestructuringErrors) || skipArrowSubscripts) return expr
+  return this.parseSubscripts(expr, startPos, startLoc)
+}
+
+pp$3.parseSubscripts = function(base, startPos, startLoc, noCalls) {
+  var this$1 = this;
+
+  for (;;) {
+    var maybeAsyncArrow = this$1.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && !this$1.canInsertSemicolon()
+    if (this$1.eat(tt.dot)) {
+      var node = this$1.startNodeAt(startPos, startLoc)
+      node.object = base
+      node.property = this$1.parseIdent(true)
+      node.computed = false
+      base = this$1.finishNode(node, "MemberExpression")
+    } else if (this$1.eat(tt.bracketL)) {
+      var node$1 = this$1.startNodeAt(startPos, startLoc)
+      node$1.object = base
+      node$1.property = this$1.parseExpression()
+      node$1.computed = true
+      this$1.expect(tt.bracketR)
+      base = this$1.finishNode(node$1, "MemberExpression")
+    } else if (!noCalls && this$1.eat(tt.parenL)) {
+      var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this$1.yieldPos, oldAwaitPos = this$1.awaitPos
+      this$1.yieldPos = 0
+      this$1.awaitPos = 0
+      var exprList = this$1.parseExprList(tt.parenR, this$1.options.ecmaVersion >= 8, false, refDestructuringErrors)
+      if (maybeAsyncArrow && !this$1.canInsertSemicolon() && this$1.eat(tt.arrow)) {
+        this$1.checkPatternErrors(refDestructuringErrors, true)
+        this$1.checkYieldAwaitInDefaultParams()
+        this$1.yieldPos = oldYieldPos
+        this$1.awaitPos = oldAwaitPos
+        return this$1.parseArrowExpression(this$1.startNodeAt(startPos, startLoc), exprList, true)
+      }
+      this$1.checkExpressionErrors(refDestructuringErrors, true)
+      this$1.yieldPos = oldYieldPos || this$1.yieldPos
+      this$1.awaitPos = oldAwaitPos || this$1.awaitPos
+      var node$2 = this$1.startNodeAt(startPos, startLoc)
+      node$2.callee = base
+      node$2.arguments = exprList
+      base = this$1.finishNode(node$2, "CallExpression")
+    } else if (this$1.type === tt.backQuote) {
+      var node$3 = this$1.startNodeAt(startPos, startLoc)
+      node$3.tag = base
+      node$3.quasi = this$1.parseTemplate()
+      base = this$1.finishNode(node$3, "TaggedTemplateExpression")
+    } else {
+      return base
+    }
+  }
+}
+
+// Parse an atomic expression — either a single token that is an
+// expression, an expression started by a keyword like `function` or
+// `new`, or an expression wrapped in punctuation like `()`, `[]`,
+// or `{}`.
+
+pp$3.parseExprAtom = function(refDestructuringErrors) {
+  var node, canBeArrow = this.potentialArrowAt == this.start
+  switch (this.type) {
+  case tt._super:
+    if (!this.inFunction)
+      this.raise(this.start, "'super' outside of function or class")
+
+  case tt._this:
+    var type = this.type === tt._this ? "ThisExpression" : "Super"
+    node = this.startNode()
+    this.next()
+    return this.finishNode(node, type)
+
+  case tt.name:
+    var startPos = this.start, startLoc = this.startLoc
+    var id = this.parseIdent(this.type !== tt.name)
+    if (this.options.ecmaVersion >= 8 && id.name === "async" && !this.canInsertSemicolon() && this.eat(tt._function))
+      return this.parseFunction(this.startNodeAt(startPos, startLoc), false, false, true)
+    if (canBeArrow && !this.canInsertSemicolon()) {
+      if (this.eat(tt.arrow))
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false)
+      if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === tt.name) {
+        id = this.parseIdent()
+        if (this.canInsertSemicolon() || !this.eat(tt.arrow))
+          this.unexpected()
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true)
+      }
+    }
+    return id
+
+  case tt.regexp:
+    var value = this.value
+    node = this.parseLiteral(value.value)
+    node.regex = {pattern: value.pattern, flags: value.flags}
+    return node
+
+  case tt.num: case tt.string:
+    return this.parseLiteral(this.value)
+
+  case tt._null: case tt._true: case tt._false:
+    node = this.startNode()
+    node.value = this.type === tt._null ? null : this.type === tt._true
+    node.raw = this.type.keyword
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt.parenL:
+    return this.parseParenAndDistinguishExpression(canBeArrow)
+
+  case tt.bracketL:
+    node = this.startNode()
+    this.next()
+    node.elements = this.parseExprList(tt.bracketR, true, true, refDestructuringErrors)
+    return this.finishNode(node, "ArrayExpression")
+
+  case tt.braceL:
+    return this.parseObj(false, refDestructuringErrors)
+
+  case tt._function:
+    node = this.startNode()
+    this.next()
+    return this.parseFunction(node, false)
+
+  case tt._class:
+    return this.parseClass(this.startNode(), false)
+
+  case tt._new:
+    return this.parseNew()
+
+  case tt.backQuote:
+    return this.parseTemplate()
+
+  default:
+    this.unexpected()
+  }
+}
+
+pp$3.parseLiteral = function(value) {
+  var node = this.startNode()
+  node.value = value
+  node.raw = this.input.slice(this.start, this.end)
+  this.next()
+  return this.finishNode(node, "Literal")
+}
+
+pp$3.parseParenExpression = function() {
+  this.expect(tt.parenL)
+  var val = this.parseExpression()
+  this.expect(tt.parenR)
+  return val
+}
+
+pp$3.parseParenAndDistinguishExpression = function(canBeArrow) {
+  var this$1 = this;
+
+  var startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8
+  if (this.options.ecmaVersion >= 6) {
+    this.next()
+
+    var innerStartPos = this.start, innerStartLoc = this.startLoc
+    var exprList = [], first = true, lastIsComma = false
+    var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart, innerParenStart
+    this.yieldPos = 0
+    this.awaitPos = 0
+    while (this.type !== tt.parenR) {
+      first ? first = false : this$1.expect(tt.comma)
+      if (allowTrailingComma && this$1.afterTrailingComma(tt.parenR, true)) {
+        lastIsComma = true
+        break
+      } else if (this$1.type === tt.ellipsis) {
+        spreadStart = this$1.start
+        exprList.push(this$1.parseParenItem(this$1.parseRest()))
+        if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element")
+        break
+      } else {
+        if (this$1.type === tt.parenL && !innerParenStart) {
+          innerParenStart = this$1.start
+        }
+        exprList.push(this$1.parseMaybeAssign(false, refDestructuringErrors, this$1.parseParenItem))
+      }
+    }
+    var innerEndPos = this.start, innerEndLoc = this.startLoc
+    this.expect(tt.parenR)
+
+    if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+      this.checkPatternErrors(refDestructuringErrors, true)
+      this.checkYieldAwaitInDefaultParams()
+      if (innerParenStart) this.unexpected(innerParenStart)
+      this.yieldPos = oldYieldPos
+      this.awaitPos = oldAwaitPos
+      return this.parseParenArrowList(startPos, startLoc, exprList)
+    }
+
+    if (!exprList.length || lastIsComma) this.unexpected(this.lastTokStart)
+    if (spreadStart) this.unexpected(spreadStart)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    this.yieldPos = oldYieldPos || this.yieldPos
+    this.awaitPos = oldAwaitPos || this.awaitPos
+
+    if (exprList.length > 1) {
+      val = this.startNodeAt(innerStartPos, innerStartLoc)
+      val.expressions = exprList
+      this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc)
+    } else {
+      val = exprList[0]
+    }
+  } else {
+    val = this.parseParenExpression()
+  }
+
+  if (this.options.preserveParens) {
+    var par = this.startNodeAt(startPos, startLoc)
+    par.expression = val
+    return this.finishNode(par, "ParenthesizedExpression")
+  } else {
+    return val
+  }
+}
+
+pp$3.parseParenItem = function(item) {
+  return item
+}
+
+pp$3.parseParenArrowList = function(startPos, startLoc, exprList) {
+  return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList)
+}
+
+// New's precedence is slightly tricky. It must allow its argument to
+// be a `[]` or dot subscript expression, but not a call — at least,
+// not without wrapping it in parentheses. Thus, it uses the noCalls
+// argument to parseSubscripts to prevent it from consuming the
+// argument list.
+
+var empty$1 = []
+
+pp$3.parseNew = function() {
+  var node = this.startNode()
+  var meta = this.parseIdent(true)
+  if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) {
+    node.meta = meta
+    node.property = this.parseIdent(true)
+    if (node.property.name !== "target")
+      this.raiseRecoverable(node.property.start, "The only valid meta property for new is new.target")
+    if (!this.inFunction)
+      this.raiseRecoverable(node.start, "new.target can only be used in functions")
+    return this.finishNode(node, "MetaProperty")
+  }
+  var startPos = this.start, startLoc = this.startLoc
+  node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true)
+  if (this.eat(tt.parenL)) node.arguments = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false)
+  else node.arguments = empty$1
+  return this.finishNode(node, "NewExpression")
+}
+
+// Parse template expression.
+
+pp$3.parseTemplateElement = function() {
+  var elem = this.startNode()
+  elem.value = {
+    raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, '\n'),
+    cooked: this.value
+  }
+  this.next()
+  elem.tail = this.type === tt.backQuote
+  return this.finishNode(elem, "TemplateElement")
+}
+
+pp$3.parseTemplate = function() {
+  var this$1 = this;
+
+  var node = this.startNode()
+  this.next()
+  node.expressions = []
+  var curElt = this.parseTemplateElement()
+  node.quasis = [curElt]
+  while (!curElt.tail) {
+    this$1.expect(tt.dollarBraceL)
+    node.expressions.push(this$1.parseExpression())
+    this$1.expect(tt.braceR)
+    node.quasis.push(curElt = this$1.parseTemplateElement())
+  }
+  this.next()
+  return this.finishNode(node, "TemplateLiteral")
+}
+
+// Parse an object literal or binding pattern.
+
+pp$3.parseObj = function(isPattern, refDestructuringErrors) {
+  var this$1 = this;
+
+  var node = this.startNode(), first = true, propHash = {}
+  node.properties = []
+  this.next()
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this$1.expect(tt.comma)
+      if (this$1.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    var prop = this$1.startNode(), isGenerator, isAsync, startPos, startLoc
+    if (this$1.options.ecmaVersion >= 6) {
+      prop.method = false
+      prop.shorthand = false
+      if (isPattern || refDestructuringErrors) {
+        startPos = this$1.start
+        startLoc = this$1.startLoc
+      }
+      if (!isPattern)
+        isGenerator = this$1.eat(tt.star)
+    }
+    this$1.parsePropertyName(prop)
+    if (!isPattern && this$1.options.ecmaVersion >= 8 && !isGenerator && !prop.computed &&
+        prop.key.type === "Identifier" && prop.key.name === "async" && this$1.type !== tt.parenL &&
+        this$1.type !== tt.colon && !this$1.canInsertSemicolon()) {
+      isAsync = true
+      this$1.parsePropertyName(prop, refDestructuringErrors)
+    } else {
+      isAsync = false
+    }
+    this$1.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors)
+    this$1.checkPropClash(prop, propHash)
+    node.properties.push(this$1.finishNode(prop, "Property"))
+  }
+  return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression")
+}
+
+pp$3.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors) {
+  if ((isGenerator || isAsync) && this.type === tt.colon)
+    this.unexpected()
+
+  if (this.eat(tt.colon)) {
+    prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors)
+    prop.kind = "init"
+  } else if (this.options.ecmaVersion >= 6 && this.type === tt.parenL) {
+    if (isPattern) this.unexpected()
+    prop.kind = "init"
+    prop.method = true
+    prop.value = this.parseMethod(isGenerator, isAsync)
+  } else if (this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" &&
+             (prop.key.name === "get" || prop.key.name === "set") &&
+             (this.type != tt.comma && this.type != tt.braceR)) {
+    if (isGenerator || isAsync || isPattern) this.unexpected()
+    prop.kind = prop.key.name
+    this.parsePropertyName(prop)
+    prop.value = this.parseMethod(false)
+    var paramCount = prop.kind === "get" ? 0 : 1
+    if (prop.value.params.length !== paramCount) {
+      var start = prop.value.start
+      if (prop.kind === "get")
+        this.raiseRecoverable(start, "getter should have no params")
+      else
+        this.raiseRecoverable(start, "setter should have exactly one param")
+    } else {
+      if (prop.kind === "set" && prop.value.params[0].type === "RestElement")
+        this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params")
+    }
+  } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
+    if (this.keywords.test(prop.key.name) ||
+        (this.strict ? this.reservedWordsStrict : this.reservedWords).test(prop.key.name) ||
+        (this.inGenerator && prop.key.name == "yield") ||
+        (this.inAsync && prop.key.name == "await"))
+      this.raiseRecoverable(prop.key.start, "'" + prop.key.name + "' can not be used as shorthand property")
+    prop.kind = "init"
+    if (isPattern) {
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else if (this.type === tt.eq && refDestructuringErrors) {
+      if (!refDestructuringErrors.shorthandAssign)
+        refDestructuringErrors.shorthandAssign = this.start
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else {
+      prop.value = prop.key
+    }
+    prop.shorthand = true
+  } else this.unexpected()
+}
+
+pp$3.parsePropertyName = function(prop) {
+  if (this.options.ecmaVersion >= 6) {
+    if (this.eat(tt.bracketL)) {
+      prop.computed = true
+      prop.key = this.parseMaybeAssign()
+      this.expect(tt.bracketR)
+      return prop.key
+    } else {
+      prop.computed = false
+    }
+  }
+  return prop.key = this.type === tt.num || this.type === tt.string ? this.parseExprAtom() : this.parseIdent(true)
+}
+
+// Initialize empty function node.
+
+pp$3.initFunction = function(node) {
+  node.id = null
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = false
+    node.expression = false
+  }
+  if (this.options.ecmaVersion >= 8)
+    node.async = false
+}
+
+// Parse object or class method.
+
+pp$3.parseMethod = function(isGenerator, isAsync) {
+  var node = this.startNode(), oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6)
+    node.generator = isGenerator
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  this.inGenerator = node.generator
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8)
+  this.checkYieldAwaitInDefaultParams()
+  this.parseFunctionBody(node, false)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, "FunctionExpression")
+}
+
+// Parse arrow function expression with given parameters.
+
+pp$3.parseArrowExpression = function(node, params, isAsync) {
+  var oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  this.inGenerator = false
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  node.params = this.toAssignableList(params, true)
+  this.parseFunctionBody(node, true)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, "ArrowFunctionExpression")
+}
+
+// Parse function body and check parameters.
+
+pp$3.parseFunctionBody = function(node, isArrowFunction) {
+  var isExpression = isArrowFunction && this.type !== tt.braceL
+
+  if (isExpression) {
+    node.body = this.parseMaybeAssign()
+    node.expression = true
+  } else {
+    // Start a new scope with regard to labels and the `inFunction`
+    // flag (restore them to their old value afterwards).
+    var oldInFunc = this.inFunction, oldLabels = this.labels
+    this.inFunction = true; this.labels = []
+    node.body = this.parseBlock(true)
+    node.expression = false
+    this.inFunction = oldInFunc; this.labels = oldLabels
+  }
+
+  // If this is a strict mode function, verify that argument names
+  // are not repeated, and it does not try to bind the words `eval`
+  // or `arguments`.
+  var useStrict = (!isExpression && node.body.body.length && this.isUseStrict(node.body.body[0])) ? node.body.body[0] : null
+  if (useStrict && this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params))
+    this.raiseRecoverable(useStrict.start, "Illegal 'use strict' directive in function with non-simple parameter list")
+
+  if (this.strict || useStrict) {
+    var oldStrict = this.strict
+    this.strict = true
+    if (node.id)
+      this.checkLVal(node.id, true)
+    this.checkParams(node)
+    this.strict = oldStrict
+  } else if (isArrowFunction || !this.isSimpleParamList(node.params)) {
+    this.checkParams(node)
+  }
+}
+
+pp$3.isSimpleParamList = function(params) {
+  for (var i = 0; i < params.length; i++)
+    if (params[i].type !== "Identifier") return false
+  return true
+}
+
+// Checks function params for various disallowed patterns such as using "eval"
+// or "arguments" and duplicate parameters.
+
+pp$3.checkParams = function(node) {
+  var this$1 = this;
+
+  var nameHash = {}
+  for (var i = 0; i < node.params.length; i++) this$1.checkLVal(node.params[i], true, nameHash)
+}
+
+// Parses a comma-separated list of expressions, and returns them as
+// an array. `close` is the token type that ends the list, and
+// `allowEmpty` can be turned on to allow subsequent commas with
+// nothing in between them to be parsed as `null` (which is needed
+// for array literals).
+
+pp$3.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) {
+  var this$1 = this;
+
+  var elts = [], first = true
+  while (!this.eat(close)) {
+    if (!first) {
+      this$1.expect(tt.comma)
+      if (allowTrailingComma && this$1.afterTrailingComma(close)) break
+    } else first = false
+
+    var elt
+    if (allowEmpty && this$1.type === tt.comma)
+      elt = null
+    else if (this$1.type === tt.ellipsis) {
+      elt = this$1.parseSpread(refDestructuringErrors)
+      if (this$1.type === tt.comma && refDestructuringErrors && !refDestructuringErrors.trailingComma) {
+        refDestructuringErrors.trailingComma = this$1.start
+      }
+    } else
+      elt = this$1.parseMaybeAssign(false, refDestructuringErrors)
+    elts.push(elt)
+  }
+  return elts
+}
+
+// Parse the next token as an identifier. If `liberal` is true (used
+// when parsing properties), it will also convert keywords into
+// identifiers.
+
+pp$3.parseIdent = function(liberal) {
+  var node = this.startNode()
+  if (liberal && this.options.allowReserved == "never") liberal = false
+  if (this.type === tt.name) {
+    if (!liberal && (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) &&
+        (this.options.ecmaVersion >= 6 ||
+         this.input.slice(this.start, this.end).indexOf("\\") == -1))
+      this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved")
+    if (this.inGenerator && this.value === "yield")
+      this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator")
+    if (this.inAsync && this.value === "await")
+      this.raiseRecoverable(this.start, "Can not use 'await' as identifier inside an async function")
+    node.name = this.value
+  } else if (liberal && this.type.keyword) {
+    node.name = this.type.keyword
+  } else {
+    this.unexpected()
+  }
+  this.next()
+  return this.finishNode(node, "Identifier")
+}
+
+// Parses yield expression inside generator.
+
+pp$3.parseYield = function() {
+  if (!this.yieldPos) this.yieldPos = this.start
+
+  var node = this.startNode()
+  this.next()
+  if (this.type == tt.semi || this.canInsertSemicolon() || (this.type != tt.star && !this.type.startsExpr)) {
+    node.delegate = false
+    node.argument = null
+  } else {
+    node.delegate = this.eat(tt.star)
+    node.argument = this.parseMaybeAssign()
+  }
+  return this.finishNode(node, "YieldExpression")
+}
+
+pp$3.parseAwait = function() {
+  if (!this.awaitPos) this.awaitPos = this.start
+
+  var node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeUnary(null, true)
+  return this.finishNode(node, "AwaitExpression")
+}
+
+var pp$4 = Parser.prototype
+
+// This function is used to raise exceptions on parse errors. It
+// takes an offset integer (into the current `input`) to indicate
+// the location of the error, attaches the position to the end
+// of the error message, and then raises a `SyntaxError` with that
+// message.
+
+pp$4.raise = function(pos, message) {
+  var loc = getLineInfo(this.input, pos)
+  message += " (" + loc.line + ":" + loc.column + ")"
+  var err = new SyntaxError(message)
+  err.pos = pos; err.loc = loc; err.raisedAt = this.pos
+  throw err
+}
+
+pp$4.raiseRecoverable = pp$4.raise
+
+pp$4.curPosition = function() {
+  if (this.options.locations) {
+    return new Position(this.curLine, this.pos - this.lineStart)
+  }
+}
+
+var Node = function Node(parser, pos, loc) {
+  this.type = ""
+  this.start = pos
+  this.end = 0
+  if (parser.options.locations)
+    this.loc = new SourceLocation(parser, loc)
+  if (parser.options.directSourceFile)
+    this.sourceFile = parser.options.directSourceFile
+  if (parser.options.ranges)
+    this.range = [pos, 0]
+};
+
+// Start an AST node, attaching a start offset.
+
+var pp$5 = Parser.prototype
+
+pp$5.startNode = function() {
+  return new Node(this, this.start, this.startLoc)
+}
+
+pp$5.startNodeAt = function(pos, loc) {
+  return new Node(this, pos, loc)
+}
+
+// Finish an AST node, adding `type` and `end` properties.
+
+function finishNodeAt(node, type, pos, loc) {
+  node.type = type
+  node.end = pos
+  if (this.options.locations)
+    node.loc.end = loc
+  if (this.options.ranges)
+    node.range[1] = pos
+  return node
+}
+
+pp$5.finishNode = function(node, type) {
+  return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc)
+}
+
+// Finish node at given position
+
+pp$5.finishNodeAt = function(node, type, pos, loc) {
+  return finishNodeAt.call(this, node, type, pos, loc)
+}
+
+var TokContext = function TokContext(token, isExpr, preserveSpace, override) {
+  this.token = token
+  this.isExpr = !!isExpr
+  this.preserveSpace = !!preserveSpace
+  this.override = override
+};
+
+var types = {
+  b_stat: new TokContext("{", false),
+  b_expr: new TokContext("{", true),
+  b_tmpl: new TokContext("${", true),
+  p_stat: new TokContext("(", false),
+  p_expr: new TokContext("(", true),
+  q_tmpl: new TokContext("`", true, true, function (p) { return p.readTmplToken(); }),
+  f_expr: new TokContext("function", true)
+}
+
+var pp$6 = Parser.prototype
+
+pp$6.initialContext = function() {
+  return [types.b_stat]
+}
+
+pp$6.braceIsBlock = function(prevType) {
+  if (prevType === tt.colon) {
+    var parent = this.curContext()
+    if (parent === types.b_stat || parent === types.b_expr)
+      return !parent.isExpr
+  }
+  if (prevType === tt._return)
+    return lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+  if (prevType === tt._else || prevType === tt.semi || prevType === tt.eof || prevType === tt.parenR)
+    return true
+  if (prevType == tt.braceL)
+    return this.curContext() === types.b_stat
+  return !this.exprAllowed
+}
+
+pp$6.updateContext = function(prevType) {
+  var update, type = this.type
+  if (type.keyword && prevType == tt.dot)
+    this.exprAllowed = false
+  else if (update = type.updateContext)
+    update.call(this, prevType)
+  else
+    this.exprAllowed = type.beforeExpr
+}
+
+// Token-specific context update code
+
+tt.parenR.updateContext = tt.braceR.updateContext = function() {
+  if (this.context.length == 1) {
+    this.exprAllowed = true
+    return
+  }
+  var out = this.context.pop()
+  if (out === types.b_stat && this.curContext() === types.f_expr) {
+    this.context.pop()
+    this.exprAllowed = false
+  } else if (out === types.b_tmpl) {
+    this.exprAllowed = true
+  } else {
+    this.exprAllowed = !out.isExpr
+  }
+}
+
+tt.braceL.updateContext = function(prevType) {
+  this.context.push(this.braceIsBlock(prevType) ? types.b_stat : types.b_expr)
+  this.exprAllowed = true
+}
+
+tt.dollarBraceL.updateContext = function() {
+  this.context.push(types.b_tmpl)
+  this.exprAllowed = true
+}
+
+tt.parenL.updateContext = function(prevType) {
+  var statementParens = prevType === tt._if || prevType === tt._for || prevType === tt._with || prevType === tt._while
+  this.context.push(statementParens ? types.p_stat : types.p_expr)
+  this.exprAllowed = true
+}
+
+tt.incDec.updateContext = function() {
+  // tokExprAllowed stays unchanged
+}
+
+tt._function.updateContext = function(prevType) {
+  if (prevType.beforeExpr && prevType !== tt.semi && prevType !== tt._else &&
+      !((prevType === tt.colon || prevType === tt.braceL) && this.curContext() === types.b_stat))
+    this.context.push(types.f_expr)
+  this.exprAllowed = false
+}
+
+tt.backQuote.updateContext = function() {
+  if (this.curContext() === types.q_tmpl)
+    this.context.pop()
+  else
+    this.context.push(types.q_tmpl)
+  this.exprAllowed = false
+}
+
+// Object type used to represent tokens. Note that normally, tokens
+// simply exist as properties on the parser object. This is only
+// used for the onToken callback and the external tokenizer.
+
+var Token = function Token(p) {
+  this.type = p.type
+  this.value = p.value
+  this.start = p.start
+  this.end = p.end
+  if (p.options.locations)
+    this.loc = new SourceLocation(p, p.startLoc, p.endLoc)
+  if (p.options.ranges)
+    this.range = [p.start, p.end]
+};
+
+// ## Tokenizer
+
+var pp$7 = Parser.prototype
+
+// Are we running under Rhino?
+var isRhino = typeof Packages == "object" && Object.prototype.toString.call(Packages) == "[object JavaPackage]"
+
+// Move to the next token
+
+pp$7.next = function() {
+  if (this.options.onToken)
+    this.options.onToken(new Token(this))
+
+  this.lastTokEnd = this.end
+  this.lastTokStart = this.start
+  this.lastTokEndLoc = this.endLoc
+  this.lastTokStartLoc = this.startLoc
+  this.nextToken()
+}
+
+pp$7.getToken = function() {
+  this.next()
+  return new Token(this)
+}
+
+// If we're in an ES6 environment, make parsers iterable
+if (typeof Symbol !== "undefined")
+  pp$7[Symbol.iterator] = function () {
+    var self = this
+    return {next: function () {
+      var token = self.getToken()
+      return {
+        done: token.type === tt.eof,
+        value: token
+      }
+    }}
+  }
+
+// Toggle strict mode. Re-reads the next number or string to please
+// pedantic tests (`"use strict"; 010;` should fail).
+
+pp$7.setStrict = function(strict) {
+  var this$1 = this;
+
+  this.strict = strict
+  if (this.type !== tt.num && this.type !== tt.string) return
+  this.pos = this.start
+  if (this.options.locations) {
+    while (this.pos < this.lineStart) {
+      this$1.lineStart = this$1.input.lastIndexOf("\n", this$1.lineStart - 2) + 1
+      --this$1.curLine
+    }
+  }
+  this.nextToken()
+}
+
+pp$7.curContext = function() {
+  return this.context[this.context.length - 1]
+}
+
+// Read a single token, updating the parser object's token-related
+// properties.
+
+pp$7.nextToken = function() {
+  var curContext = this.curContext()
+  if (!curContext || !curContext.preserveSpace) this.skipSpace()
+
+  this.start = this.pos
+  if (this.options.locations) this.startLoc = this.curPosition()
+  if (this.pos >= this.input.length) return this.finishToken(tt.eof)
+
+  if (curContext.override) return curContext.override(this)
+  else this.readToken(this.fullCharCodeAtPos())
+}
+
+pp$7.readToken = function(code) {
+  // Identifier or keyword. '\uXXXX' sequences are allowed in
+  // identifiers, so '\' also dispatches to that.
+  if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */)
+    return this.readWord()
+
+  return this.getTokenFromCode(code)
+}
+
+pp$7.fullCharCodeAtPos = function() {
+  var code = this.input.charCodeAt(this.pos)
+  if (code <= 0xd7ff || code >= 0xe000) return code
+  var next = this.input.charCodeAt(this.pos + 1)
+  return (code << 10) + next - 0x35fdc00
+}
+
+pp$7.skipBlockComment = function() {
+  var this$1 = this;
+
+  var startLoc = this.options.onComment && this.curPosition()
+  var start = this.pos, end = this.input.indexOf("*/", this.pos += 2)
+  if (end === -1) this.raise(this.pos - 2, "Unterminated comment")
+  this.pos = end + 2
+  if (this.options.locations) {
+    lineBreakG.lastIndex = start
+    var match
+    while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
+      ++this$1.curLine
+      this$1.lineStart = match.index + match[0].length
+    }
+  }
+  if (this.options.onComment)
+    this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+pp$7.skipLineComment = function(startSkip) {
+  var this$1 = this;
+
+  var start = this.pos
+  var startLoc = this.options.onComment && this.curPosition()
+  var ch = this.input.charCodeAt(this.pos+=startSkip)
+  while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+    ++this$1.pos
+    ch = this$1.input.charCodeAt(this$1.pos)
+  }
+  if (this.options.onComment)
+    this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+// Called at the start of the parse and after every token. Skips
+// whitespace and comments, and.
+
+pp$7.skipSpace = function() {
+  var this$1 = this;
+
+  loop: while (this.pos < this.input.length) {
+    var ch = this$1.input.charCodeAt(this$1.pos)
+    switch (ch) {
+      case 32: case 160: // ' '
+        ++this$1.pos
+        break
+      case 13:
+        if (this$1.input.charCodeAt(this$1.pos + 1) === 10) {
+          ++this$1.pos
+        }
+      case 10: case 8232: case 8233:
+        ++this$1.pos
+        if (this$1.options.locations) {
+          ++this$1.curLine
+          this$1.lineStart = this$1.pos
+        }
+        break
+      case 47: // '/'
+        switch (this$1.input.charCodeAt(this$1.pos + 1)) {
+          case 42: // '*'
+            this$1.skipBlockComment()
+            break
+          case 47:
+            this$1.skipLineComment(2)
+            break
+          default:
+            break loop
+        }
+        break
+      default:
+        if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+          ++this$1.pos
+        } else {
+          break loop
+        }
+    }
+  }
+}
+
+// Called at the end of every token. Sets `end`, `val`, and
+// maintains `context` and `exprAllowed`, and skips the space after
+// the token, so that the next one's `start` will point at the
+// right position.
+
+pp$7.finishToken = function(type, val) {
+  this.end = this.pos
+  if (this.options.locations) this.endLoc = this.curPosition()
+  var prevType = this.type
+  this.type = type
+  this.value = val
+
+  this.updateContext(prevType)
+}
+
+// ### Token reading
+
+// This is the function that is called to fetch the next token. It
+// is somewhat obscure, because it works in character codes rather
+// than characters, and because operator parsing has been inlined
+// into it.
+//
+// All in the name of speed.
+//
+pp$7.readToken_dot = function() {
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (next >= 48 && next <= 57) return this.readNumber(true)
+  var next2 = this.input.charCodeAt(this.pos + 2)
+  if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.'
+    this.pos += 3
+    return this.finishToken(tt.ellipsis)
+  } else {
+    ++this.pos
+    return this.finishToken(tt.dot)
+  }
+}
+
+pp$7.readToken_slash = function() { // '/'
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (this.exprAllowed) {++this.pos; return this.readRegexp()}
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.slash, 1)
+}
+
+pp$7.readToken_mult_modulo_exp = function(code) { // '%*'
+  var next = this.input.charCodeAt(this.pos + 1)
+  var size = 1
+  var tokentype = code === 42 ? tt.star : tt.modulo
+
+  // exponentiation operator ** and **=
+  if (this.options.ecmaVersion >= 7 && next === 42) {
+    ++size
+    tokentype = tt.starstar
+    next = this.input.charCodeAt(this.pos + 2)
+  }
+
+  if (next === 61) return this.finishOp(tt.assign, size + 1)
+  return this.finishOp(tokentype, size)
+}
+
+pp$7.readToken_pipe_amp = function(code) { // '|&'
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1)
+}
+
+pp$7.readToken_caret = function() { // '^'
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.bitwiseXOR, 1)
+}
+
+pp$7.readToken_plus_min = function(code) { // '+-'
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) {
+    if (next == 45 && this.input.charCodeAt(this.pos + 2) == 62 &&
+        lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
+      // A `-->` line comment
+      this.skipLineComment(3)
+      this.skipSpace()
+      return this.nextToken()
+    }
+    return this.finishOp(tt.incDec, 2)
+  }
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.plusMin, 1)
+}
+
+pp$7.readToken_lt_gt = function(code) { // '<>'
+  var next = this.input.charCodeAt(this.pos + 1)
+  var size = 1
+  if (next === code) {
+    size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2
+    if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1)
+    return this.finishOp(tt.bitShift, size)
+  }
+  if (next == 33 && code == 60 && this.input.charCodeAt(this.pos + 2) == 45 &&
+      this.input.charCodeAt(this.pos + 3) == 45) {
+    if (this.inModule) this.unexpected()
+    // `<!--`, an XML-style comment that should be interpreted as a line comment
+    this.skipLineComment(4)
+    this.skipSpace()
+    return this.nextToken()
+  }
+  if (next === 61) size = 2
+  return this.finishOp(tt.relational, size)
+}
+
+pp$7.readToken_eq_excl = function(code) { // '=!'
+  var next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2)
+  if (code === 61 && next === 62 && this.options.ecmaVersion >= 6) { // '=>'
+    this.pos += 2
+    return this.finishToken(tt.arrow)
+  }
+  return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1)
+}
+
+pp$7.getTokenFromCode = function(code) {
+  switch (code) {
+    // The interpretation of a dot depends on whether it is followed
+    // by a digit or another two dots.
+  case 46: // '.'
+    return this.readToken_dot()
+
+    // Punctuation tokens.
+  case 40: ++this.pos; return this.finishToken(tt.parenL)
+  case 41: ++this.pos; return this.finishToken(tt.parenR)
+  case 59: ++this.pos; return this.finishToken(tt.semi)
+  case 44: ++this.pos; return this.finishToken(tt.comma)
+  case 91: ++this.pos; return this.finishToken(tt.bracketL)
+  case 93: ++this.pos; return this.finishToken(tt.bracketR)
+  case 123: ++this.pos; return this.finishToken(tt.braceL)
+  case 125: ++this.pos; return this.finishToken(tt.braceR)
+  case 58: ++this.pos; return this.finishToken(tt.colon)
+  case 63: ++this.pos; return this.finishToken(tt.question)
+
+  case 96: // '`'
+    if (this.options.ecmaVersion < 6) break
+    ++this.pos
+    return this.finishToken(tt.backQuote)
+
+  case 48: // '0'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next === 120 || next === 88) return this.readRadixNumber(16) // '0x', '0X' - hex number
+    if (this.options.ecmaVersion >= 6) {
+      if (next === 111 || next === 79) return this.readRadixNumber(8) // '0o', '0O' - octal number
+      if (next === 98 || next === 66) return this.readRadixNumber(2) // '0b', '0B' - binary number
+    }
+    // Anything else beginning with a digit is an integer, octal
+    // number, or float.
+  case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+    return this.readNumber(false)
+
+    // Quotes produce strings.
+  case 34: case 39: // '"', "'"
+    return this.readString(code)
+
+    // Operators are parsed inline in tiny state machines. '=' (61) is
+    // often referred to. `finishOp` simply skips the amount of
+    // characters it is given as second argument, and returns a token
+    // of the type given by its first argument.
+
+  case 47: // '/'
+    return this.readToken_slash()
+
+  case 37: case 42: // '%*'
+    return this.readToken_mult_modulo_exp(code)
+
+  case 124: case 38: // '|&'
+    return this.readToken_pipe_amp(code)
+
+  case 94: // '^'
+    return this.readToken_caret()
+
+  case 43: case 45: // '+-'
+    return this.readToken_plus_min(code)
+
+  case 60: case 62: // '<>'
+    return this.readToken_lt_gt(code)
+
+  case 61: case 33: // '=!'
+    return this.readToken_eq_excl(code)
+
+  case 126: // '~'
+    return this.finishOp(tt.prefix, 1)
+  }
+
+  this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'")
+}
+
+pp$7.finishOp = function(type, size) {
+  var str = this.input.slice(this.pos, this.pos + size)
+  this.pos += size
+  return this.finishToken(type, str)
+}
+
+// Parse a regular expression. Some context-awareness is necessary,
+// since a '/' inside a '[]' set does not end the expression.
+
+function tryCreateRegexp(src, flags, throwErrorAt, parser) {
+  try {
+    return new RegExp(src, flags)
+  } catch (e) {
+    if (throwErrorAt !== undefined) {
+      if (e instanceof SyntaxError) parser.raise(throwErrorAt, "Error parsing regular expression: " + e.message)
+      throw e
+    }
+  }
+}
+
+var regexpUnicodeSupport = !!tryCreateRegexp("\uffff", "u")
+
+pp$7.readRegexp = function() {
+  var this$1 = this;
+
+  var escaped, inClass, start = this.pos
+  for (;;) {
+    if (this$1.pos >= this$1.input.length) this$1.raise(start, "Unterminated regular expression")
+    var ch = this$1.input.charAt(this$1.pos)
+    if (lineBreak.test(ch)) this$1.raise(start, "Unterminated regular expression")
+    if (!escaped) {
+      if (ch === "[") inClass = true
+      else if (ch === "]" && inClass) inClass = false
+      else if (ch === "/" && !inClass) break
+      escaped = ch === "\\"
+    } else escaped = false
+    ++this$1.pos
+  }
+  var content = this.input.slice(start, this.pos)
+  ++this.pos
+  // Need to use `readWord1` because '\uXXXX' sequences are allowed
+  // here (don't ask).
+  var mods = this.readWord1()
+  var tmp = content, tmpFlags = ""
+  if (mods) {
+    var validFlags = /^[gim]*$/
+    if (this.options.ecmaVersion >= 6) validFlags = /^[gimuy]*$/
+    if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag")
+    if (mods.indexOf("u") >= 0) {
+      if (regexpUnicodeSupport) {
+        tmpFlags = "u"
+      } else {
+        // Replace each astral symbol and every Unicode escape sequence that
+        // possibly represents an astral symbol or a paired surrogate with a
+        // single ASCII symbol to avoid throwing on regular expressions that
+        // are only valid in combination with the `/u` flag.
+        // Note: replacing with the ASCII symbol `x` might cause false
+        // negatives in unlikely scenarios. For example, `[\u{61}-b]` is a
+        // perfectly valid pattern that is equivalent to `[a-b]`, but it would
+        // be replaced by `[x-b]` which throws an error.
+        tmp = tmp.replace(/\\u\{([0-9a-fA-F]+)\}/g, function (_match, code, offset) {
+          code = Number("0x" + code)
+          if (code > 0x10FFFF) this$1.raise(start + offset + 3, "Code point out of bounds")
+          return "x"
+        })
+        tmp = tmp.replace(/\\u([a-fA-F0-9]{4})|[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "x")
+        tmpFlags = tmpFlags.replace("u", "")
+      }
+    }
+  }
+  // Detect invalid regular expressions.
+  var value = null
+  // Rhino's regular expression parser is flaky and throws uncatchable exceptions,
+  // so don't do detection if we are running under Rhino
+  if (!isRhino) {
+    tryCreateRegexp(tmp, tmpFlags, start, this)
+    // Get a regular expression object for this pattern-flag pair, or `null` in
+    // case the current environment doesn't support the flags it uses.
+    value = tryCreateRegexp(content, mods)
+  }
+  return this.finishToken(tt.regexp, {pattern: content, flags: mods, value: value})
+}
+
+// Read an integer in the given radix. Return null if zero digits
+// were read, the integer value otherwise. When `len` is given, this
+// will return `null` unless the integer has exactly `len` digits.
+
+pp$7.readInt = function(radix, len) {
+  var this$1 = this;
+
+  var start = this.pos, total = 0
+  for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+    var code = this$1.input.charCodeAt(this$1.pos), val
+    if (code >= 97) val = code - 97 + 10 // a
+    else if (code >= 65) val = code - 65 + 10 // A
+    else if (code >= 48 && code <= 57) val = code - 48 // 0-9
+    else val = Infinity
+    if (val >= radix) break
+    ++this$1.pos
+    total = total * radix + val
+  }
+  if (this.pos === start || len != null && this.pos - start !== len) return null
+
+  return total
+}
+
+pp$7.readRadixNumber = function(radix) {
+  this.pos += 2 // 0x
+  var val = this.readInt(radix)
+  if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix)
+  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+  return this.finishToken(tt.num, val)
+}
+
+// Read an integer, octal integer, or floating-point number.
+
+pp$7.readNumber = function(startsWithDot) {
+  var start = this.pos, isFloat = false, octal = this.input.charCodeAt(this.pos) === 48
+  if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number")
+  if (octal && this.pos == start + 1) octal = false
+  var next = this.input.charCodeAt(this.pos)
+  if (next === 46 && !octal) { // '.'
+    ++this.pos
+    this.readInt(10)
+    isFloat = true
+    next = this.input.charCodeAt(this.pos)
+  }
+  if ((next === 69 || next === 101) && !octal) { // 'eE'
+    next = this.input.charCodeAt(++this.pos)
+    if (next === 43 || next === 45) ++this.pos // '+-'
+    if (this.readInt(10) === null) this.raise(start, "Invalid number")
+    isFloat = true
+  }
+  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+
+  var str = this.input.slice(start, this.pos), val
+  if (isFloat) val = parseFloat(str)
+  else if (!octal || str.length === 1) val = parseInt(str, 10)
+  else if (/[89]/.test(str) || this.strict) this.raise(start, "Invalid number")
+  else val = parseInt(str, 8)
+  return this.finishToken(tt.num, val)
+}
+
+// Read a string value, interpreting backslash-escapes.
+
+pp$7.readCodePoint = function() {
+  var ch = this.input.charCodeAt(this.pos), code
+
+  if (ch === 123) {
+    if (this.options.ecmaVersion < 6) this.unexpected()
+    var codePos = ++this.pos
+    code = this.readHexChar(this.input.indexOf('}', this.pos) - this.pos)
+    ++this.pos
+    if (code > 0x10FFFF) this.raise(codePos, "Code point out of bounds")
+  } else {
+    code = this.readHexChar(4)
+  }
+  return code
+}
+
+function codePointToString(code) {
+  // UTF-16 Decoding
+  if (code <= 0xFFFF) return String.fromCharCode(code)
+  code -= 0x10000
+  return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00)
+}
+
+pp$7.readString = function(quote) {
+  var this$1 = this;
+
+  var out = "", chunkStart = ++this.pos
+  for (;;) {
+    if (this$1.pos >= this$1.input.length) this$1.raise(this$1.start, "Unterminated string constant")
+    var ch = this$1.input.charCodeAt(this$1.pos)
+    if (ch === quote) break
+    if (ch === 92) { // '\'
+      out += this$1.input.slice(chunkStart, this$1.pos)
+      out += this$1.readEscapedChar(false)
+      chunkStart = this$1.pos
+    } else {
+      if (isNewLine(ch)) this$1.raise(this$1.start, "Unterminated string constant")
+      ++this$1.pos
+    }
+  }
+  out += this.input.slice(chunkStart, this.pos++)
+  return this.finishToken(tt.string, out)
+}
+
+// Reads template string tokens.
+
+pp$7.readTmplToken = function() {
+  var this$1 = this;
+
+  var out = "", chunkStart = this.pos
+  for (;;) {
+    if (this$1.pos >= this$1.input.length) this$1.raise(this$1.start, "Unterminated template")
+    var ch = this$1.input.charCodeAt(this$1.pos)
+    if (ch === 96 || ch === 36 && this$1.input.charCodeAt(this$1.pos + 1) === 123) { // '`', '${'
+      if (this$1.pos === this$1.start && this$1.type === tt.template) {
+        if (ch === 36) {
+          this$1.pos += 2
+          return this$1.finishToken(tt.dollarBraceL)
+        } else {
+          ++this$1.pos
+          return this$1.finishToken(tt.backQuote)
+        }
+      }
+      out += this$1.input.slice(chunkStart, this$1.pos)
+      return this$1.finishToken(tt.template, out)
+    }
+    if (ch === 92) { // '\'
+      out += this$1.input.slice(chunkStart, this$1.pos)
+      out += this$1.readEscapedChar(true)
+      chunkStart = this$1.pos
+    } else if (isNewLine(ch)) {
+      out += this$1.input.slice(chunkStart, this$1.pos)
+      ++this$1.pos
+      switch (ch) {
+        case 13:
+          if (this$1.input.charCodeAt(this$1.pos) === 10) ++this$1.pos
+        case 10:
+          out += "\n"
+          break
+        default:
+          out += String.fromCharCode(ch)
+          break
+      }
+      if (this$1.options.locations) {
+        ++this$1.curLine
+        this$1.lineStart = this$1.pos
+      }
+      chunkStart = this$1.pos
+    } else {
+      ++this$1.pos
+    }
+  }
+}
+
+// Used to read escaped characters
+
+pp$7.readEscapedChar = function(inTemplate) {
+  var ch = this.input.charCodeAt(++this.pos)
+  ++this.pos
+  switch (ch) {
+  case 110: return "\n" // 'n' -> '\n'
+  case 114: return "\r" // 'r' -> '\r'
+  case 120: return String.fromCharCode(this.readHexChar(2)) // 'x'
+  case 117: return codePointToString(this.readCodePoint()) // 'u'
+  case 116: return "\t" // 't' -> '\t'
+  case 98: return "\b" // 'b' -> '\b'
+  case 118: return "\u000b" // 'v' -> '\u000b'
+  case 102: return "\f" // 'f' -> '\f'
+  case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos // '\r\n'
+  case 10: // ' \n'
+    if (this.options.locations) { this.lineStart = this.pos; ++this.curLine }
+    return ""
+  default:
+    if (ch >= 48 && ch <= 55) {
+      var octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0]
+      var octal = parseInt(octalStr, 8)
+      if (octal > 255) {
+        octalStr = octalStr.slice(0, -1)
+        octal = parseInt(octalStr, 8)
+      }
+      if (octalStr !== "0" && (this.strict || inTemplate)) {
+        this.raise(this.pos - 2, "Octal literal in strict mode")
+      }
+      this.pos += octalStr.length - 1
+      return String.fromCharCode(octal)
+    }
+    return String.fromCharCode(ch)
+  }
+}
+
+// Used to read character escape sequences ('\x', '\u', '\U').
+
+pp$7.readHexChar = function(len) {
+  var codePos = this.pos
+  var n = this.readInt(16, len)
+  if (n === null) this.raise(codePos, "Bad character escape sequence")
+  return n
+}
+
+// Read an identifier, and return it as a string. Sets `this.containsEsc`
+// to whether the word contained a '\u' escape.
+//
+// Incrementally adds only escaped chars, adding other chunks as-is
+// as a micro-optimization.
+
+pp$7.readWord1 = function() {
+  var this$1 = this;
+
+  this.containsEsc = false
+  var word = "", first = true, chunkStart = this.pos
+  var astral = this.options.ecmaVersion >= 6
+  while (this.pos < this.input.length) {
+    var ch = this$1.fullCharCodeAtPos()
+    if (isIdentifierChar(ch, astral)) {
+      this$1.pos += ch <= 0xffff ? 1 : 2
+    } else if (ch === 92) { // "\"
+      this$1.containsEsc = true
+      word += this$1.input.slice(chunkStart, this$1.pos)
+      var escStart = this$1.pos
+      if (this$1.input.charCodeAt(++this$1.pos) != 117) // "u"
+        this$1.raise(this$1.pos, "Expecting Unicode escape sequence \\uXXXX")
+      ++this$1.pos
+      var esc = this$1.readCodePoint()
+      if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral))
+        this$1.raise(escStart, "Invalid Unicode escape")
+      word += codePointToString(esc)
+      chunkStart = this$1.pos
+    } else {
+      break
+    }
+    first = false
+  }
+  return word + this.input.slice(chunkStart, this.pos)
+}
+
+// Read an identifier or keyword token. Will check for reserved
+// words when necessary.
+
+pp$7.readWord = function() {
+  var word = this.readWord1()
+  var type = tt.name
+  if ((this.options.ecmaVersion >= 6 || !this.containsEsc) && this.keywords.test(word))
+    type = keywordTypes[word]
+  return this.finishToken(type, word)
+}
+
+var version = "4.0.3"
+
+// The main exported interface (under `self.acorn` when in the
+// browser) is a `parse` function that takes a code string and
+// returns an abstract syntax tree as specified by [Mozilla parser
+// API][api].
+//
+// [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+
+function parse(input, options) {
+  return new Parser(options, input).parse()
+}
+
+// This function tries to parse a single expression at a given
+// offset in a string. Useful for parsing mixed-language formats
+// that embed JavaScript expressions.
+
+function parseExpressionAt(input, pos, options) {
+  var p = new Parser(options, input, pos)
+  p.nextToken()
+  return p.parseExpression()
+}
+
+// Acorn is organized as a tokenizer and a recursive-descent parser.
+// The `tokenizer` export provides an interface to the tokenizer.
+
+function tokenizer(input, options) {
+  return new Parser(options, input)
+}
+
+// This is a terrible kludge to support the existing, pre-ES6
+// interface where the loose parser module retroactively adds exports
+// to this module.
+function addLooseExports(parse, Parser, plugins) {
+  parse_dammit = parse
+  LooseParser = Parser
+  pluginsLoose = plugins
+}
+
+export { version, parse, parseExpressionAt, tokenizer, parse_dammit, LooseParser, pluginsLoose, addLooseExports, Parser, plugins, defaultOptions, Position, SourceLocation, getLineInfo, Node, TokenType, tt as tokTypes, TokContext, types as tokContexts, isIdentifierChar, isIdentifierStart, Token, isNewLine, lineBreak, lineBreakG };
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.js
new file mode 100644
index 0000000000..0fc4086bb7
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn.js
@@ -0,0 +1,3363 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (factory((global.acorn = global.acorn || {})));
+}(this, function (exports) { 'use strict';
+
+  // Reserved word lists for various dialects of the language
+
+  var reservedWords = {
+    3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile",
+    5: "class enum extends super const export import",
+    6: "enum",
+    strict: "implements interface let package private protected public static yield",
+    strictBind: "eval arguments"
+  }
+
+  // And the keywords
+
+  var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"
+
+  var keywords = {
+    5: ecma5AndLessKeywords,
+    6: ecma5AndLessKeywords + " const class extends export import super"
+  }
+
+  // ## Character categories
+
+  // Big ugly regular expressions that match characters in the
+  // whitespace, identifier, and identifier-start categories. These
+  // are only applied when a character is found to actually have a
+  // code point above 128.
+  // Generated by `bin/generate-identifier-regex.js`.
+
+  var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fd5\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ae\ua7b0-\ua7b7\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab65\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"
+  var nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d4-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d01-\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf8\u1cf9\u1dc0-\u1df5\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"
+
+  var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]")
+  var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]")
+
+  nonASCIIidentifierStartChars = nonASCIIidentifierChars = null
+
+  // These are a run-length and offset encoded representation of the
+  // >0xffff code points that are a valid part of identifiers. The
+  // offset starts at 0x10000, and each pair of numbers represents an
+  // offset to the next range, and then a size of the range. They were
+  // generated by bin/generate-identifier-regex.js
+  var astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,17,26,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,26,45,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,785,52,76,44,33,24,27,35,42,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,54,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,86,25,391,63,32,0,449,56,264,8,2,36,18,0,50,29,881,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,881,68,12,0,67,12,65,0,32,6124,20,754,9486,1,3071,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,4149,196,60,67,1213,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,10591,541]
+  var astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,1306,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,52,0,13,2,49,13,10,2,4,9,83,11,7,0,161,11,6,9,7,3,57,0,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,87,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,423,9,838,7,2,7,17,9,57,21,2,13,19882,9,135,4,60,6,26,9,1016,45,17,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,2214,6,110,6,6,9,792487,239]
+
+  // This has a complexity linear to the value of the code. The
+  // assumption is that looking up astral identifier characters is
+  // rare.
+  function isInAstralSet(code, set) {
+    var pos = 0x10000
+    for (var i = 0; i < set.length; i += 2) {
+      pos += set[i]
+      if (pos > code) return false
+      pos += set[i + 1]
+      if (pos >= code) return true
+    }
+  }
+
+  // Test whether a given character code starts an identifier.
+
+  function isIdentifierStart(code, astral) {
+    if (code < 65) return code === 36
+    if (code < 91) return true
+    if (code < 97) return code === 95
+    if (code < 123) return true
+    if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code))
+    if (astral === false) return false
+    return isInAstralSet(code, astralIdentifierStartCodes)
+  }
+
+  // Test whether a given character is part of an identifier.
+
+  function isIdentifierChar(code, astral) {
+    if (code < 48) return code === 36
+    if (code < 58) return true
+    if (code < 65) return false
+    if (code < 91) return true
+    if (code < 97) return code === 95
+    if (code < 123) return true
+    if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code))
+    if (astral === false) return false
+    return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes)
+  }
+
+  // ## Token types
+
+  // The assignment of fine-grained, information-carrying type objects
+  // allows the tokenizer to store the information it has about a
+  // token in a way that is very cheap for the parser to look up.
+
+  // All token type variables start with an underscore, to make them
+  // easy to recognize.
+
+  // The `beforeExpr` property is used to disambiguate between regular
+  // expressions and divisions. It is set on all token types that can
+  // be followed by an expression (thus, a slash after them would be a
+  // regular expression).
+  //
+  // The `startsExpr` property is used to check if the token ends a
+  // `yield` expression. It is set on all token types that either can
+  // directly start an expression (like a quotation mark) or can
+  // continue an expression (like the body of a string).
+  //
+  // `isLoop` marks a keyword as starting a loop, which is important
+  // to know when parsing a label, in order to allow or disallow
+  // continue jumps to that label.
+
+  var TokenType = function TokenType(label, conf) {
+    if ( conf === void 0 ) conf = {};
+
+    this.label = label
+    this.keyword = conf.keyword
+    this.beforeExpr = !!conf.beforeExpr
+    this.startsExpr = !!conf.startsExpr
+    this.isLoop = !!conf.isLoop
+    this.isAssign = !!conf.isAssign
+    this.prefix = !!conf.prefix
+    this.postfix = !!conf.postfix
+    this.binop = conf.binop || null
+    this.updateContext = null
+  };
+
+  function binop(name, prec) {
+    return new TokenType(name, {beforeExpr: true, binop: prec})
+  }
+  var beforeExpr = {beforeExpr: true};
+  var startsExpr = {startsExpr: true};
+  // Map keyword names to token types.
+
+  var keywordTypes = {}
+
+  // Succinct definitions of keyword token types
+  function kw(name, options) {
+    if ( options === void 0 ) options = {};
+
+    options.keyword = name
+    return keywordTypes[name] = new TokenType(name, options)
+  }
+
+  var tt = {
+    num: new TokenType("num", startsExpr),
+    regexp: new TokenType("regexp", startsExpr),
+    string: new TokenType("string", startsExpr),
+    name: new TokenType("name", startsExpr),
+    eof: new TokenType("eof"),
+
+    // Punctuation token types.
+    bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}),
+    bracketR: new TokenType("]"),
+    braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}),
+    braceR: new TokenType("}"),
+    parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}),
+    parenR: new TokenType(")"),
+    comma: new TokenType(",", beforeExpr),
+    semi: new TokenType(";", beforeExpr),
+    colon: new TokenType(":", beforeExpr),
+    dot: new TokenType("."),
+    question: new TokenType("?", beforeExpr),
+    arrow: new TokenType("=>", beforeExpr),
+    template: new TokenType("template"),
+    ellipsis: new TokenType("...", beforeExpr),
+    backQuote: new TokenType("`", startsExpr),
+    dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}),
+
+    // Operators. These carry several kinds of properties to help the
+    // parser use them properly (the presence of these properties is
+    // what categorizes them as operators).
+    //
+    // `binop`, when present, specifies that this operator is a binary
+    // operator, and will refer to its precedence.
+    //
+    // `prefix` and `postfix` mark the operator as a prefix or postfix
+    // unary operator.
+    //
+    // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+    // binary operators with a very low precedence, that should result
+    // in AssignmentExpression nodes.
+
+    eq: new TokenType("=", {beforeExpr: true, isAssign: true}),
+    assign: new TokenType("_=", {beforeExpr: true, isAssign: true}),
+    incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}),
+    prefix: new TokenType("prefix", {beforeExpr: true, prefix: true, startsExpr: true}),
+    logicalOR: binop("||", 1),
+    logicalAND: binop("&&", 2),
+    bitwiseOR: binop("|", 3),
+    bitwiseXOR: binop("^", 4),
+    bitwiseAND: binop("&", 5),
+    equality: binop("==/!=", 6),
+    relational: binop("</>", 7),
+    bitShift: binop("<</>>", 8),
+    plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}),
+    modulo: binop("%", 10),
+    star: binop("*", 10),
+    slash: binop("/", 10),
+    starstar: new TokenType("**", {beforeExpr: true}),
+
+    // Keyword token types.
+    _break: kw("break"),
+    _case: kw("case", beforeExpr),
+    _catch: kw("catch"),
+    _continue: kw("continue"),
+    _debugger: kw("debugger"),
+    _default: kw("default", beforeExpr),
+    _do: kw("do", {isLoop: true, beforeExpr: true}),
+    _else: kw("else", beforeExpr),
+    _finally: kw("finally"),
+    _for: kw("for", {isLoop: true}),
+    _function: kw("function", startsExpr),
+    _if: kw("if"),
+    _return: kw("return", beforeExpr),
+    _switch: kw("switch"),
+    _throw: kw("throw", beforeExpr),
+    _try: kw("try"),
+    _var: kw("var"),
+    _const: kw("const"),
+    _while: kw("while", {isLoop: true}),
+    _with: kw("with"),
+    _new: kw("new", {beforeExpr: true, startsExpr: true}),
+    _this: kw("this", startsExpr),
+    _super: kw("super", startsExpr),
+    _class: kw("class"),
+    _extends: kw("extends", beforeExpr),
+    _export: kw("export"),
+    _import: kw("import"),
+    _null: kw("null", startsExpr),
+    _true: kw("true", startsExpr),
+    _false: kw("false", startsExpr),
+    _in: kw("in", {beforeExpr: true, binop: 7}),
+    _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}),
+    _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}),
+    _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}),
+    _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true})
+  }
+
+  // Matches a whole line break (where CRLF is considered a single
+  // line break). Used to count lines.
+
+  var lineBreak = /\r\n?|\n|\u2028|\u2029/
+  var lineBreakG = new RegExp(lineBreak.source, "g")
+
+  function isNewLine(code) {
+    return code === 10 || code === 13 || code === 0x2028 || code === 0x2029
+  }
+
+  var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/
+
+  var skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g
+
+  function isArray(obj) {
+    return Object.prototype.toString.call(obj) === "[object Array]"
+  }
+
+  // Checks if an object has a property.
+
+  function has(obj, propName) {
+    return Object.prototype.hasOwnProperty.call(obj, propName)
+  }
+
+  // These are used when `options.locations` is on, for the
+  // `startLoc` and `endLoc` properties.
+
+  var Position = function Position(line, col) {
+    this.line = line
+    this.column = col
+  };
+
+  Position.prototype.offset = function offset (n) {
+    return new Position(this.line, this.column + n)
+  };
+
+  var SourceLocation = function SourceLocation(p, start, end) {
+    this.start = start
+    this.end = end
+    if (p.sourceFile !== null) this.source = p.sourceFile
+  };
+
+  // The `getLineInfo` function is mostly useful when the
+  // `locations` option is off (for performance reasons) and you
+  // want to find the line/column position for a given character
+  // offset. `input` should be the code string that the offset refers
+  // into.
+
+  function getLineInfo(input, offset) {
+    for (var line = 1, cur = 0;;) {
+      lineBreakG.lastIndex = cur
+      var match = lineBreakG.exec(input)
+      if (match && match.index < offset) {
+        ++line
+        cur = match.index + match[0].length
+      } else {
+        return new Position(line, offset - cur)
+      }
+    }
+  }
+
+  // A second optional argument can be given to further configure
+  // the parser process. These options are recognized:
+
+  var defaultOptions = {
+    // `ecmaVersion` indicates the ECMAScript version to parse. Must
+    // be either 3, 5, 6 (2015), 7 (2016), or 8 (2017). This influences support
+    // for strict mode, the set of reserved words, and support for
+    // new syntax features. The default is 7.
+    ecmaVersion: 7,
+    // `sourceType` indicates the mode the code should be parsed in.
+    // Can be either `"script"` or `"module"`. This influences global
+    // strict mode and parsing of `import` and `export` declarations.
+    sourceType: "script",
+    // `onInsertedSemicolon` can be a callback that will be called
+    // when a semicolon is automatically inserted. It will be passed
+    // th position of the comma as an offset, and if `locations` is
+    // enabled, it is given the location as a `{line, column}` object
+    // as second argument.
+    onInsertedSemicolon: null,
+    // `onTrailingComma` is similar to `onInsertedSemicolon`, but for
+    // trailing commas.
+    onTrailingComma: null,
+    // By default, reserved words are only enforced if ecmaVersion >= 5.
+    // Set `allowReserved` to a boolean value to explicitly turn this on
+    // an off. When this option has the value "never", reserved words
+    // and keywords can also not be used as property names.
+    allowReserved: null,
+    // When enabled, a return at the top level is not considered an
+    // error.
+    allowReturnOutsideFunction: false,
+    // When enabled, import/export statements are not constrained to
+    // appearing at the top of the program.
+    allowImportExportEverywhere: false,
+    // When enabled, hashbang directive in the beginning of file
+    // is allowed and treated as a line comment.
+    allowHashBang: false,
+    // When `locations` is on, `loc` properties holding objects with
+    // `start` and `end` properties in `{line, column}` form (with
+    // line being 1-based and column 0-based) will be attached to the
+    // nodes.
+    locations: false,
+    // A function can be passed as `onToken` option, which will
+    // cause Acorn to call that function with object in the same
+    // format as tokens returned from `tokenizer().getToken()`. Note
+    // that you are not allowed to call the parser from the
+    // callback—that will corrupt its internal state.
+    onToken: null,
+    // A function can be passed as `onComment` option, which will
+    // cause Acorn to call that function with `(block, text, start,
+    // end)` parameters whenever a comment is skipped. `block` is a
+    // boolean indicating whether this is a block (`/* */`) comment,
+    // `text` is the content of the comment, and `start` and `end` are
+    // character offsets that denote the start and end of the comment.
+    // When the `locations` option is on, two more parameters are
+    // passed, the full `{line, column}` locations of the start and
+    // end of the comments. Note that you are not allowed to call the
+    // parser from the callback—that will corrupt its internal state.
+    onComment: null,
+    // Nodes have their start and end characters offsets recorded in
+    // `start` and `end` properties (directly on the node, rather than
+    // the `loc` object, which holds line/column data. To also add a
+    // [semi-standardized][range] `range` property holding a `[start,
+    // end]` array with the same numbers, set the `ranges` option to
+    // `true`.
+    //
+    // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+    ranges: false,
+    // It is possible to parse multiple files into a single AST by
+    // passing the tree produced by parsing the first file as
+    // `program` option in subsequent parses. This will add the
+    // toplevel forms of the parsed file to the `Program` (top) node
+    // of an existing parse tree.
+    program: null,
+    // When `locations` is on, you can pass this to record the source
+    // file in every node's `loc` object.
+    sourceFile: null,
+    // This value, if given, is stored in every node, whether
+    // `locations` is on or off.
+    directSourceFile: null,
+    // When enabled, parenthesized expressions are represented by
+    // (non-standard) ParenthesizedExpression nodes
+    preserveParens: false,
+    plugins: {}
+  }
+
+  // Interpret and default an options object
+
+  function getOptions(opts) {
+    var options = {}
+
+    for (var opt in defaultOptions)
+      options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt]
+
+    if (options.ecmaVersion >= 2015)
+      options.ecmaVersion -= 2009
+
+    if (options.allowReserved == null)
+      options.allowReserved = options.ecmaVersion < 5
+
+    if (isArray(options.onToken)) {
+      var tokens = options.onToken
+      options.onToken = function (token) { return tokens.push(token); }
+    }
+    if (isArray(options.onComment))
+      options.onComment = pushComment(options, options.onComment)
+
+    return options
+  }
+
+  function pushComment(options, array) {
+    return function (block, text, start, end, startLoc, endLoc) {
+      var comment = {
+        type: block ? 'Block' : 'Line',
+        value: text,
+        start: start,
+        end: end
+      }
+      if (options.locations)
+        comment.loc = new SourceLocation(this, startLoc, endLoc)
+      if (options.ranges)
+        comment.range = [start, end]
+      array.push(comment)
+    }
+  }
+
+  // Registered plugins
+  var plugins = {}
+
+  function keywordRegexp(words) {
+    return new RegExp("^(" + words.replace(/ /g, "|") + ")$")
+  }
+
+  var Parser = function Parser(options, input, startPos) {
+    this.options = options = getOptions(options)
+    this.sourceFile = options.sourceFile
+    this.keywords = keywordRegexp(keywords[options.ecmaVersion >= 6 ? 6 : 5])
+    var reserved = ""
+    if (!options.allowReserved) {
+      for (var v = options.ecmaVersion;; v--)
+        if (reserved = reservedWords[v]) break
+      if (options.sourceType == "module") reserved += " await"
+    }
+    this.reservedWords = keywordRegexp(reserved)
+    var reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict
+    this.reservedWordsStrict = keywordRegexp(reservedStrict)
+    this.reservedWordsStrictBind = keywordRegexp(reservedStrict + " " + reservedWords.strictBind)
+    this.input = String(input)
+
+    // Used to signal to callers of `readWord1` whether the word
+    // contained any escape sequences. This is needed because words with
+    // escape sequences must not be interpreted as keywords.
+    this.containsEsc = false
+
+    // Load plugins
+    this.loadPlugins(options.plugins)
+
+    // Set up token state
+
+    // The current position of the tokenizer in the input.
+    if (startPos) {
+      this.pos = startPos
+      this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1
+      this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length
+    } else {
+      this.pos = this.lineStart = 0
+      this.curLine = 1
+    }
+
+    // Properties of the current token:
+    // Its type
+    this.type = tt.eof
+    // For tokens that include more information than their type, the value
+    this.value = null
+    // Its start and end offset
+    this.start = this.end = this.pos
+    // And, if locations are used, the {line, column} object
+    // corresponding to those offsets
+    this.startLoc = this.endLoc = this.curPosition()
+
+    // Position information for the previous token
+    this.lastTokEndLoc = this.lastTokStartLoc = null
+    this.lastTokStart = this.lastTokEnd = this.pos
+
+    // The context stack is used to superficially track syntactic
+    // context to predict whether a regular expression is allowed in a
+    // given position.
+    this.context = this.initialContext()
+    this.exprAllowed = true
+
+    // Figure out if it's a module code.
+    this.strict = this.inModule = options.sourceType === "module"
+
+    // Used to signify the start of a potential arrow function
+    this.potentialArrowAt = -1
+
+    // Flags to track whether we are in a function, a generator, an async function.
+    this.inFunction = this.inGenerator = this.inAsync = false
+    // Positions to delayed-check that yield/await does not exist in default parameters.
+    this.yieldPos = this.awaitPos = 0
+    // Labels in scope.
+    this.labels = []
+
+    // If enabled, skip leading hashbang line.
+    if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === '#!')
+      this.skipLineComment(2)
+  };
+
+  // DEPRECATED Kept for backwards compatibility until 3.0 in case a plugin uses them
+  Parser.prototype.isKeyword = function isKeyword (word) { return this.keywords.test(word) };
+  Parser.prototype.isReservedWord = function isReservedWord (word) { return this.reservedWords.test(word) };
+
+  Parser.prototype.extend = function extend (name, f) {
+    this[name] = f(this[name])
+  };
+
+  Parser.prototype.loadPlugins = function loadPlugins (pluginConfigs) {
+      var this$1 = this;
+
+    for (var name in pluginConfigs) {
+      var plugin = plugins[name]
+      if (!plugin) throw new Error("Plugin '" + name + "' not found")
+      plugin(this$1, pluginConfigs[name])
+    }
+  };
+
+  Parser.prototype.parse = function parse () {
+    var node = this.options.program || this.startNode()
+    this.nextToken()
+    return this.parseTopLevel(node)
+  };
+
+  var pp = Parser.prototype
+
+  // ## Parser utilities
+
+  // Test whether a statement node is the string literal `"use strict"`.
+
+  pp.isUseStrict = function(stmt) {
+    return this.options.ecmaVersion >= 5 && stmt.type === "ExpressionStatement" &&
+      stmt.expression.type === "Literal" &&
+      stmt.expression.raw.slice(1, -1) === "use strict"
+  }
+
+  // Predicate that tests whether the next token is of the given
+  // type, and if yes, consumes it as a side effect.
+
+  pp.eat = function(type) {
+    if (this.type === type) {
+      this.next()
+      return true
+    } else {
+      return false
+    }
+  }
+
+  // Tests whether parsed token is a contextual keyword.
+
+  pp.isContextual = function(name) {
+    return this.type === tt.name && this.value === name
+  }
+
+  // Consumes contextual keyword if possible.
+
+  pp.eatContextual = function(name) {
+    return this.value === name && this.eat(tt.name)
+  }
+
+  // Asserts that following token is given contextual keyword.
+
+  pp.expectContextual = function(name) {
+    if (!this.eatContextual(name)) this.unexpected()
+  }
+
+  // Test whether a semicolon can be inserted at the current position.
+
+  pp.canInsertSemicolon = function() {
+    return this.type === tt.eof ||
+      this.type === tt.braceR ||
+      lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+  }
+
+  pp.insertSemicolon = function() {
+    if (this.canInsertSemicolon()) {
+      if (this.options.onInsertedSemicolon)
+        this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc)
+      return true
+    }
+  }
+
+  // Consume a semicolon, or, failing that, see if we are allowed to
+  // pretend that there is a semicolon at this position.
+
+  pp.semicolon = function() {
+    if (!this.eat(tt.semi) && !this.insertSemicolon()) this.unexpected()
+  }
+
+  pp.afterTrailingComma = function(tokType, notNext) {
+    if (this.type == tokType) {
+      if (this.options.onTrailingComma)
+        this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc)
+      if (!notNext)
+        this.next()
+      return true
+    }
+  }
+
+  // Expect a token of a given type. If found, consume it, otherwise,
+  // raise an unexpected token error.
+
+  pp.expect = function(type) {
+    this.eat(type) || this.unexpected()
+  }
+
+  // Raise an unexpected token error.
+
+  pp.unexpected = function(pos) {
+    this.raise(pos != null ? pos : this.start, "Unexpected token")
+  }
+
+  var DestructuringErrors = function DestructuringErrors() {
+    this.shorthandAssign = 0
+    this.trailingComma = 0
+  };
+
+  pp.checkPatternErrors = function(refDestructuringErrors, andThrow) {
+    var trailing = refDestructuringErrors && refDestructuringErrors.trailingComma
+    if (!andThrow) return !!trailing
+    if (trailing) this.raise(trailing, "Comma is not permitted after the rest element")
+  }
+
+  pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) {
+    var pos = refDestructuringErrors && refDestructuringErrors.shorthandAssign
+    if (!andThrow) return !!pos
+    if (pos) this.raise(pos, "Shorthand property assignments are valid only in destructuring patterns")
+  }
+
+  pp.checkYieldAwaitInDefaultParams = function() {
+    if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos))
+      this.raise(this.yieldPos, "Yield expression cannot be a default value")
+    if (this.awaitPos)
+      this.raise(this.awaitPos, "Await expression cannot be a default value")
+  }
+
+  var pp$1 = Parser.prototype
+
+  // ### Statement parsing
+
+  // Parse a program. Initializes the parser, reads any number of
+  // statements, and wraps them in a Program node.  Optionally takes a
+  // `program` argument.  If present, the statements will be appended
+  // to its body instead of creating a new node.
+
+  pp$1.parseTopLevel = function(node) {
+    var this$1 = this;
+
+    var first = true, exports = {}
+    if (!node.body) node.body = []
+    while (this.type !== tt.eof) {
+      var stmt = this$1.parseStatement(true, true, exports)
+      node.body.push(stmt)
+      if (first) {
+        if (this$1.isUseStrict(stmt)) this$1.setStrict(true)
+        first = false
+      }
+    }
+    this.next()
+    if (this.options.ecmaVersion >= 6) {
+      node.sourceType = this.options.sourceType
+    }
+    return this.finishNode(node, "Program")
+  }
+
+  var loopLabel = {kind: "loop"};
+  var switchLabel = {kind: "switch"};
+  pp$1.isLet = function() {
+    if (this.type !== tt.name || this.options.ecmaVersion < 6 || this.value != "let") return false
+    skipWhiteSpace.lastIndex = this.pos
+    var skip = skipWhiteSpace.exec(this.input)
+    var next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next)
+    if (nextCh === 91 || nextCh == 123) return true // '{' and '['
+    if (isIdentifierStart(nextCh, true)) {
+      for (var pos = next + 1; isIdentifierChar(this.input.charCodeAt(pos), true); ++pos) {}
+      var ident = this.input.slice(next, pos)
+      if (!this.isKeyword(ident)) return true
+    }
+    return false
+  }
+
+  // check 'async [no LineTerminator here] function'
+  // - 'async /*foo*/ function' is OK.
+  // - 'async /*\n*/ function' is invalid.
+  pp$1.isAsyncFunction = function() {
+    if (this.type !== tt.name || this.options.ecmaVersion < 8 || this.value != "async")
+      return false
+
+    skipWhiteSpace.lastIndex = this.pos
+    var skip = skipWhiteSpace.exec(this.input)
+    var next = this.pos + skip[0].length
+    return !lineBreak.test(this.input.slice(this.pos, next)) &&
+      this.input.slice(next, next + 8) === "function" &&
+      (next + 8 == this.input.length || !isIdentifierChar(this.input.charAt(next + 8)))
+  }
+
+  // Parse a single statement.
+  //
+  // If expecting a statement and finding a slash operator, parse a
+  // regular expression literal. This is to handle cases like
+  // `if (foo) /blah/.exec(foo)`, where looking at the previous token
+  // does not help.
+
+  pp$1.parseStatement = function(declaration, topLevel, exports) {
+    var starttype = this.type, node = this.startNode(), kind
+
+    if (this.isLet()) {
+      starttype = tt._var
+      kind = "let"
+    }
+
+    // Most types of statements are recognized by the keyword they
+    // start with. Many are trivial to parse, some require a bit of
+    // complexity.
+
+    switch (starttype) {
+    case tt._break: case tt._continue: return this.parseBreakContinueStatement(node, starttype.keyword)
+    case tt._debugger: return this.parseDebuggerStatement(node)
+    case tt._do: return this.parseDoStatement(node)
+    case tt._for: return this.parseForStatement(node)
+    case tt._function:
+      if (!declaration && this.options.ecmaVersion >= 6) this.unexpected()
+      return this.parseFunctionStatement(node, false)
+    case tt._class:
+      if (!declaration) this.unexpected()
+      return this.parseClass(node, true)
+    case tt._if: return this.parseIfStatement(node)
+    case tt._return: return this.parseReturnStatement(node)
+    case tt._switch: return this.parseSwitchStatement(node)
+    case tt._throw: return this.parseThrowStatement(node)
+    case tt._try: return this.parseTryStatement(node)
+    case tt._const: case tt._var:
+      kind = kind || this.value
+      if (!declaration && kind != "var") this.unexpected()
+      return this.parseVarStatement(node, kind)
+    case tt._while: return this.parseWhileStatement(node)
+    case tt._with: return this.parseWithStatement(node)
+    case tt.braceL: return this.parseBlock()
+    case tt.semi: return this.parseEmptyStatement(node)
+    case tt._export:
+    case tt._import:
+      if (!this.options.allowImportExportEverywhere) {
+        if (!topLevel)
+          this.raise(this.start, "'import' and 'export' may only appear at the top level")
+        if (!this.inModule)
+          this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'")
+      }
+      return starttype === tt._import ? this.parseImport(node) : this.parseExport(node, exports)
+
+      // If the statement does not start with a statement keyword or a
+      // brace, it's an ExpressionStatement or LabeledStatement. We
+      // simply start parsing an expression, and afterwards, if the
+      // next token is a colon and the expression was a simple
+      // Identifier node, we switch to interpreting it as a label.
+    default:
+      if (this.isAsyncFunction() && declaration) {
+        this.next()
+        return this.parseFunctionStatement(node, true)
+      }
+
+      var maybeName = this.value, expr = this.parseExpression()
+      if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon))
+        return this.parseLabeledStatement(node, maybeName, expr)
+      else return this.parseExpressionStatement(node, expr)
+    }
+  }
+
+  pp$1.parseBreakContinueStatement = function(node, keyword) {
+    var this$1 = this;
+
+    var isBreak = keyword == "break"
+    this.next()
+    if (this.eat(tt.semi) || this.insertSemicolon()) node.label = null
+    else if (this.type !== tt.name) this.unexpected()
+    else {
+      node.label = this.parseIdent()
+      this.semicolon()
+    }
+
+    // Verify that there is an actual destination to break or
+    // continue to.
+    for (var i = 0; i < this.labels.length; ++i) {
+      var lab = this$1.labels[i]
+      if (node.label == null || lab.name === node.label.name) {
+        if (lab.kind != null && (isBreak || lab.kind === "loop")) break
+        if (node.label && isBreak) break
+      }
+    }
+    if (i === this.labels.length) this.raise(node.start, "Unsyntactic " + keyword)
+    return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+  }
+
+  pp$1.parseDebuggerStatement = function(node) {
+    this.next()
+    this.semicolon()
+    return this.finishNode(node, "DebuggerStatement")
+  }
+
+  pp$1.parseDoStatement = function(node) {
+    this.next()
+    this.labels.push(loopLabel)
+    node.body = this.parseStatement(false)
+    this.labels.pop()
+    this.expect(tt._while)
+    node.test = this.parseParenExpression()
+    if (this.options.ecmaVersion >= 6)
+      this.eat(tt.semi)
+    else
+      this.semicolon()
+    return this.finishNode(node, "DoWhileStatement")
+  }
+
+  // Disambiguating between a `for` and a `for`/`in` or `for`/`of`
+  // loop is non-trivial. Basically, we have to parse the init `var`
+  // statement or expression, disallowing the `in` operator (see
+  // the second parameter to `parseExpression`), and then check
+  // whether the next token is `in` or `of`. When there is no init
+  // part (semicolon immediately after the opening parenthesis), it
+  // is a regular `for` loop.
+
+  pp$1.parseForStatement = function(node) {
+    this.next()
+    this.labels.push(loopLabel)
+    this.expect(tt.parenL)
+    if (this.type === tt.semi) return this.parseFor(node, null)
+    var isLet = this.isLet()
+    if (this.type === tt._var || this.type === tt._const || isLet) {
+      var init$1 = this.startNode(), kind = isLet ? "let" : this.value
+      this.next()
+      this.parseVar(init$1, true, kind)
+      this.finishNode(init$1, "VariableDeclaration")
+      if ((this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init$1.declarations.length === 1 &&
+          !(kind !== "var" && init$1.declarations[0].init))
+        return this.parseForIn(node, init$1)
+      return this.parseFor(node, init$1)
+    }
+    var refDestructuringErrors = new DestructuringErrors
+    var init = this.parseExpression(true, refDestructuringErrors)
+    if (this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) {
+      this.checkPatternErrors(refDestructuringErrors, true)
+      this.toAssignable(init)
+      this.checkLVal(init)
+      return this.parseForIn(node, init)
+    } else {
+      this.checkExpressionErrors(refDestructuringErrors, true)
+    }
+    return this.parseFor(node, init)
+  }
+
+  pp$1.parseFunctionStatement = function(node, isAsync) {
+    this.next()
+    return this.parseFunction(node, true, false, isAsync)
+  }
+
+  pp$1.isFunction = function() {
+    return this.type === tt._function || this.isAsyncFunction()
+  }
+
+  pp$1.parseIfStatement = function(node) {
+    this.next()
+    node.test = this.parseParenExpression()
+    // allow function declarations in branches, but only in non-strict mode
+    node.consequent = this.parseStatement(!this.strict && this.isFunction())
+    node.alternate = this.eat(tt._else) ? this.parseStatement(!this.strict && this.isFunction()) : null
+    return this.finishNode(node, "IfStatement")
+  }
+
+  pp$1.parseReturnStatement = function(node) {
+    if (!this.inFunction && !this.options.allowReturnOutsideFunction)
+      this.raise(this.start, "'return' outside of function")
+    this.next()
+
+    // In `return` (and `break`/`continue`), the keywords with
+    // optional arguments, we eagerly look for a semicolon or the
+    // possibility to insert one.
+
+    if (this.eat(tt.semi) || this.insertSemicolon()) node.argument = null
+    else { node.argument = this.parseExpression(); this.semicolon() }
+    return this.finishNode(node, "ReturnStatement")
+  }
+
+  pp$1.parseSwitchStatement = function(node) {
+    var this$1 = this;
+
+    this.next()
+    node.discriminant = this.parseParenExpression()
+    node.cases = []
+    this.expect(tt.braceL)
+    this.labels.push(switchLabel)
+
+    // Statements under must be grouped (by label) in SwitchCase
+    // nodes. `cur` is used to keep the node that we are currently
+    // adding statements to.
+
+    for (var cur, sawDefault = false; this.type != tt.braceR;) {
+      if (this$1.type === tt._case || this$1.type === tt._default) {
+        var isCase = this$1.type === tt._case
+        if (cur) this$1.finishNode(cur, "SwitchCase")
+        node.cases.push(cur = this$1.startNode())
+        cur.consequent = []
+        this$1.next()
+        if (isCase) {
+          cur.test = this$1.parseExpression()
+        } else {
+          if (sawDefault) this$1.raiseRecoverable(this$1.lastTokStart, "Multiple default clauses")
+          sawDefault = true
+          cur.test = null
+        }
+        this$1.expect(tt.colon)
+      } else {
+        if (!cur) this$1.unexpected()
+        cur.consequent.push(this$1.parseStatement(true))
+      }
+    }
+    if (cur) this.finishNode(cur, "SwitchCase")
+    this.next() // Closing brace
+    this.labels.pop()
+    return this.finishNode(node, "SwitchStatement")
+  }
+
+  pp$1.parseThrowStatement = function(node) {
+    this.next()
+    if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start)))
+      this.raise(this.lastTokEnd, "Illegal newline after throw")
+    node.argument = this.parseExpression()
+    this.semicolon()
+    return this.finishNode(node, "ThrowStatement")
+  }
+
+  // Reused empty array added for node fields that are always empty.
+
+  var empty = []
+
+  pp$1.parseTryStatement = function(node) {
+    this.next()
+    node.block = this.parseBlock()
+    node.handler = null
+    if (this.type === tt._catch) {
+      var clause = this.startNode()
+      this.next()
+      this.expect(tt.parenL)
+      clause.param = this.parseBindingAtom()
+      this.checkLVal(clause.param, true)
+      this.expect(tt.parenR)
+      clause.body = this.parseBlock()
+      node.handler = this.finishNode(clause, "CatchClause")
+    }
+    node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null
+    if (!node.handler && !node.finalizer)
+      this.raise(node.start, "Missing catch or finally clause")
+    return this.finishNode(node, "TryStatement")
+  }
+
+  pp$1.parseVarStatement = function(node, kind) {
+    this.next()
+    this.parseVar(node, false, kind)
+    this.semicolon()
+    return this.finishNode(node, "VariableDeclaration")
+  }
+
+  pp$1.parseWhileStatement = function(node) {
+    this.next()
+    node.test = this.parseParenExpression()
+    this.labels.push(loopLabel)
+    node.body = this.parseStatement(false)
+    this.labels.pop()
+    return this.finishNode(node, "WhileStatement")
+  }
+
+  pp$1.parseWithStatement = function(node) {
+    if (this.strict) this.raise(this.start, "'with' in strict mode")
+    this.next()
+    node.object = this.parseParenExpression()
+    node.body = this.parseStatement(false)
+    return this.finishNode(node, "WithStatement")
+  }
+
+  pp$1.parseEmptyStatement = function(node) {
+    this.next()
+    return this.finishNode(node, "EmptyStatement")
+  }
+
+  pp$1.parseLabeledStatement = function(node, maybeName, expr) {
+    var this$1 = this;
+
+    for (var i = 0; i < this.labels.length; ++i)
+      if (this$1.labels[i].name === maybeName) this$1.raise(expr.start, "Label '" + maybeName + "' is already declared")
+    var kind = this.type.isLoop ? "loop" : this.type === tt._switch ? "switch" : null
+    for (var i$1 = this.labels.length - 1; i$1 >= 0; i$1--) {
+      var label = this$1.labels[i$1]
+      if (label.statementStart == node.start) {
+        label.statementStart = this$1.start
+        label.kind = kind
+      } else break
+    }
+    this.labels.push({name: maybeName, kind: kind, statementStart: this.start})
+    node.body = this.parseStatement(true)
+    this.labels.pop()
+    node.label = expr
+    return this.finishNode(node, "LabeledStatement")
+  }
+
+  pp$1.parseExpressionStatement = function(node, expr) {
+    node.expression = expr
+    this.semicolon()
+    return this.finishNode(node, "ExpressionStatement")
+  }
+
+  // Parse a semicolon-enclosed block of statements, handling `"use
+  // strict"` declarations when `allowStrict` is true (used for
+  // function bodies).
+
+  pp$1.parseBlock = function(allowStrict) {
+    var this$1 = this;
+
+    var node = this.startNode(), first = true, oldStrict
+    node.body = []
+    this.expect(tt.braceL)
+    while (!this.eat(tt.braceR)) {
+      var stmt = this$1.parseStatement(true)
+      node.body.push(stmt)
+      if (first && allowStrict && this$1.isUseStrict(stmt)) {
+        oldStrict = this$1.strict
+        this$1.setStrict(this$1.strict = true)
+      }
+      first = false
+    }
+    if (oldStrict === false) this.setStrict(false)
+    return this.finishNode(node, "BlockStatement")
+  }
+
+  // Parse a regular `for` loop. The disambiguation code in
+  // `parseStatement` will already have parsed the init statement or
+  // expression.
+
+  pp$1.parseFor = function(node, init) {
+    node.init = init
+    this.expect(tt.semi)
+    node.test = this.type === tt.semi ? null : this.parseExpression()
+    this.expect(tt.semi)
+    node.update = this.type === tt.parenR ? null : this.parseExpression()
+    this.expect(tt.parenR)
+    node.body = this.parseStatement(false)
+    this.labels.pop()
+    return this.finishNode(node, "ForStatement")
+  }
+
+  // Parse a `for`/`in` and `for`/`of` loop, which are almost
+  // same from parser's perspective.
+
+  pp$1.parseForIn = function(node, init) {
+    var type = this.type === tt._in ? "ForInStatement" : "ForOfStatement"
+    this.next()
+    node.left = init
+    node.right = this.parseExpression()
+    this.expect(tt.parenR)
+    node.body = this.parseStatement(false)
+    this.labels.pop()
+    return this.finishNode(node, type)
+  }
+
+  // Parse a list of variable declarations.
+
+  pp$1.parseVar = function(node, isFor, kind) {
+    var this$1 = this;
+
+    node.declarations = []
+    node.kind = kind
+    for (;;) {
+      var decl = this$1.startNode()
+      this$1.parseVarId(decl)
+      if (this$1.eat(tt.eq)) {
+        decl.init = this$1.parseMaybeAssign(isFor)
+      } else if (kind === "const" && !(this$1.type === tt._in || (this$1.options.ecmaVersion >= 6 && this$1.isContextual("of")))) {
+        this$1.unexpected()
+      } else if (decl.id.type != "Identifier" && !(isFor && (this$1.type === tt._in || this$1.isContextual("of")))) {
+        this$1.raise(this$1.lastTokEnd, "Complex binding patterns require an initialization value")
+      } else {
+        decl.init = null
+      }
+      node.declarations.push(this$1.finishNode(decl, "VariableDeclarator"))
+      if (!this$1.eat(tt.comma)) break
+    }
+    return node
+  }
+
+  pp$1.parseVarId = function(decl) {
+    decl.id = this.parseBindingAtom()
+    this.checkLVal(decl.id, true)
+  }
+
+  // Parse a function declaration or literal (depending on the
+  // `isStatement` parameter).
+
+  pp$1.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) {
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 6 && !isAsync)
+      node.generator = this.eat(tt.star)
+    if (this.options.ecmaVersion >= 8)
+      node.async = !!isAsync
+
+    if (isStatement)
+      node.id = this.parseIdent()
+
+    var oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+    this.inGenerator = node.generator
+    this.inAsync = node.async
+    this.yieldPos = 0
+    this.awaitPos = 0
+
+    if (!isStatement && this.type === tt.name)
+      node.id = this.parseIdent()
+    this.parseFunctionParams(node)
+    this.parseFunctionBody(node, allowExpressionBody)
+
+    this.inGenerator = oldInGen
+    this.inAsync = oldInAsync
+    this.yieldPos = oldYieldPos
+    this.awaitPos = oldAwaitPos
+    return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+  }
+
+  pp$1.parseFunctionParams = function(node) {
+    this.expect(tt.parenL)
+    node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8, true)
+    this.checkYieldAwaitInDefaultParams()
+  }
+
+  // Parse a class declaration or literal (depending on the
+  // `isStatement` parameter).
+
+  pp$1.parseClass = function(node, isStatement) {
+    var this$1 = this;
+
+    this.next()
+    this.parseClassId(node, isStatement)
+    this.parseClassSuper(node)
+    var classBody = this.startNode()
+    var hadConstructor = false
+    classBody.body = []
+    this.expect(tt.braceL)
+    while (!this.eat(tt.braceR)) {
+      if (this$1.eat(tt.semi)) continue
+      var method = this$1.startNode()
+      var isGenerator = this$1.eat(tt.star)
+      var isAsync = false
+      var isMaybeStatic = this$1.type === tt.name && this$1.value === "static"
+      this$1.parsePropertyName(method)
+      method.static = isMaybeStatic && this$1.type !== tt.parenL
+      if (method.static) {
+        if (isGenerator) this$1.unexpected()
+        isGenerator = this$1.eat(tt.star)
+        this$1.parsePropertyName(method)
+      }
+      if (this$1.options.ecmaVersion >= 8 && !isGenerator && !method.computed &&
+          method.key.type === "Identifier" && method.key.name === "async" && this$1.type !== tt.parenL &&
+          !this$1.canInsertSemicolon()) {
+        isAsync = true
+        this$1.parsePropertyName(method)
+      }
+      method.kind = "method"
+      var isGetSet = false
+      if (!method.computed) {
+        var key = method.key;
+        if (!isGenerator && !isAsync && key.type === "Identifier" && this$1.type !== tt.parenL && (key.name === "get" || key.name === "set")) {
+          isGetSet = true
+          method.kind = key.name
+          key = this$1.parsePropertyName(method)
+        }
+        if (!method.static && (key.type === "Identifier" && key.name === "constructor" ||
+            key.type === "Literal" && key.value === "constructor")) {
+          if (hadConstructor) this$1.raise(key.start, "Duplicate constructor in the same class")
+          if (isGetSet) this$1.raise(key.start, "Constructor can't have get/set modifier")
+          if (isGenerator) this$1.raise(key.start, "Constructor can't be a generator")
+          if (isAsync) this$1.raise(key.start, "Constructor can't be an async method")
+          method.kind = "constructor"
+          hadConstructor = true
+        }
+      }
+      this$1.parseClassMethod(classBody, method, isGenerator, isAsync)
+      if (isGetSet) {
+        var paramCount = method.kind === "get" ? 0 : 1
+        if (method.value.params.length !== paramCount) {
+          var start = method.value.start
+          if (method.kind === "get")
+            this$1.raiseRecoverable(start, "getter should have no params")
+          else
+            this$1.raiseRecoverable(start, "setter should have exactly one param")
+        } else {
+          if (method.kind === "set" && method.value.params[0].type === "RestElement")
+            this$1.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params")
+        }
+      }
+    }
+    node.body = this.finishNode(classBody, "ClassBody")
+    return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+  }
+
+  pp$1.parseClassMethod = function(classBody, method, isGenerator, isAsync) {
+    method.value = this.parseMethod(isGenerator, isAsync)
+    classBody.body.push(this.finishNode(method, "MethodDefinition"))
+  }
+
+  pp$1.parseClassId = function(node, isStatement) {
+    node.id = this.type === tt.name ? this.parseIdent() : isStatement ? this.unexpected() : null
+  }
+
+  pp$1.parseClassSuper = function(node) {
+    node.superClass = this.eat(tt._extends) ? this.parseExprSubscripts() : null
+  }
+
+  // Parses module export declaration.
+
+  pp$1.parseExport = function(node, exports) {
+    var this$1 = this;
+
+    this.next()
+    // export * from '...'
+    if (this.eat(tt.star)) {
+      this.expectContextual("from")
+      node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+      this.semicolon()
+      return this.finishNode(node, "ExportAllDeclaration")
+    }
+    if (this.eat(tt._default)) { // export default ...
+      this.checkExport(exports, "default", this.lastTokStart)
+      var parens = this.type == tt.parenL
+      var expr = this.parseMaybeAssign()
+      var needsSemi = true
+      if (!parens && (expr.type == "FunctionExpression" ||
+                      expr.type == "ClassExpression")) {
+        needsSemi = false
+        if (expr.id) {
+          expr.type = expr.type == "FunctionExpression"
+            ? "FunctionDeclaration"
+            : "ClassDeclaration"
+        }
+      }
+      node.declaration = expr
+      if (needsSemi) this.semicolon()
+      return this.finishNode(node, "ExportDefaultDeclaration")
+    }
+    // export var|const|let|function|class ...
+    if (this.shouldParseExportStatement()) {
+      node.declaration = this.parseStatement(true)
+      if (node.declaration.type === "VariableDeclaration")
+        this.checkVariableExport(exports, node.declaration.declarations)
+      else
+        this.checkExport(exports, node.declaration.id.name, node.declaration.id.start)
+      node.specifiers = []
+      node.source = null
+    } else { // export { x, y as z } [from '...']
+      node.declaration = null
+      node.specifiers = this.parseExportSpecifiers(exports)
+      if (this.eatContextual("from")) {
+        node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+      } else {
+        // check for keywords used as local names
+        for (var i = 0; i < node.specifiers.length; i++) {
+          if (this$1.keywords.test(node.specifiers[i].local.name) || this$1.reservedWords.test(node.specifiers[i].local.name)) {
+            this$1.unexpected(node.specifiers[i].local.start)
+          }
+        }
+
+        node.source = null
+      }
+      this.semicolon()
+    }
+    return this.finishNode(node, "ExportNamedDeclaration")
+  }
+
+  pp$1.checkExport = function(exports, name, pos) {
+    if (!exports) return
+    if (Object.prototype.hasOwnProperty.call(exports, name))
+      this.raiseRecoverable(pos, "Duplicate export '" + name + "'")
+    exports[name] = true
+  }
+
+  pp$1.checkPatternExport = function(exports, pat) {
+    var this$1 = this;
+
+    var type = pat.type
+    if (type == "Identifier")
+      this.checkExport(exports, pat.name, pat.start)
+    else if (type == "ObjectPattern")
+      for (var i = 0; i < pat.properties.length; ++i)
+        this$1.checkPatternExport(exports, pat.properties[i].value)
+    else if (type == "ArrayPattern")
+      for (var i$1 = 0; i$1 < pat.elements.length; ++i$1) {
+        var elt = pat.elements[i$1]
+        if (elt) this$1.checkPatternExport(exports, elt)
+      }
+    else if (type == "AssignmentPattern")
+      this.checkPatternExport(exports, pat.left)
+    else if (type == "ParenthesizedExpression")
+      this.checkPatternExport(exports, pat.expression)
+  }
+
+  pp$1.checkVariableExport = function(exports, decls) {
+    var this$1 = this;
+
+    if (!exports) return
+    for (var i = 0; i < decls.length; i++)
+      this$1.checkPatternExport(exports, decls[i].id)
+  }
+
+  pp$1.shouldParseExportStatement = function() {
+    return this.type.keyword || this.isLet() || this.isAsyncFunction()
+  }
+
+  // Parses a comma-separated list of module exports.
+
+  pp$1.parseExportSpecifiers = function(exports) {
+    var this$1 = this;
+
+    var nodes = [], first = true
+    // export { x, y as z } [from '...']
+    this.expect(tt.braceL)
+    while (!this.eat(tt.braceR)) {
+      if (!first) {
+        this$1.expect(tt.comma)
+        if (this$1.afterTrailingComma(tt.braceR)) break
+      } else first = false
+
+      var node = this$1.startNode()
+      node.local = this$1.parseIdent(this$1.type === tt._default)
+      node.exported = this$1.eatContextual("as") ? this$1.parseIdent(true) : node.local
+      this$1.checkExport(exports, node.exported.name, node.exported.start)
+      nodes.push(this$1.finishNode(node, "ExportSpecifier"))
+    }
+    return nodes
+  }
+
+  // Parses import declaration.
+
+  pp$1.parseImport = function(node) {
+    this.next()
+    // import '...'
+    if (this.type === tt.string) {
+      node.specifiers = empty
+      node.source = this.parseExprAtom()
+    } else {
+      node.specifiers = this.parseImportSpecifiers()
+      this.expectContextual("from")
+      node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+    }
+    this.semicolon()
+    return this.finishNode(node, "ImportDeclaration")
+  }
+
+  // Parses a comma-separated list of module imports.
+
+  pp$1.parseImportSpecifiers = function() {
+    var this$1 = this;
+
+    var nodes = [], first = true
+    if (this.type === tt.name) {
+      // import defaultObj, { x, y as z } from '...'
+      var node = this.startNode()
+      node.local = this.parseIdent()
+      this.checkLVal(node.local, true)
+      nodes.push(this.finishNode(node, "ImportDefaultSpecifier"))
+      if (!this.eat(tt.comma)) return nodes
+    }
+    if (this.type === tt.star) {
+      var node$1 = this.startNode()
+      this.next()
+      this.expectContextual("as")
+      node$1.local = this.parseIdent()
+      this.checkLVal(node$1.local, true)
+      nodes.push(this.finishNode(node$1, "ImportNamespaceSpecifier"))
+      return nodes
+    }
+    this.expect(tt.braceL)
+    while (!this.eat(tt.braceR)) {
+      if (!first) {
+        this$1.expect(tt.comma)
+        if (this$1.afterTrailingComma(tt.braceR)) break
+      } else first = false
+
+      var node$2 = this$1.startNode()
+      node$2.imported = this$1.parseIdent(true)
+      if (this$1.eatContextual("as")) {
+        node$2.local = this$1.parseIdent()
+      } else {
+        node$2.local = node$2.imported
+        if (this$1.isKeyword(node$2.local.name)) this$1.unexpected(node$2.local.start)
+        if (this$1.reservedWordsStrict.test(node$2.local.name)) this$1.raiseRecoverable(node$2.local.start, "The keyword '" + node$2.local.name + "' is reserved")
+      }
+      this$1.checkLVal(node$2.local, true)
+      nodes.push(this$1.finishNode(node$2, "ImportSpecifier"))
+    }
+    return nodes
+  }
+
+  var pp$2 = Parser.prototype
+
+  // Convert existing expression atom to assignable pattern
+  // if possible.
+
+  pp$2.toAssignable = function(node, isBinding) {
+    var this$1 = this;
+
+    if (this.options.ecmaVersion >= 6 && node) {
+      switch (node.type) {
+        case "Identifier":
+        if (this.inAsync && node.name === "await")
+          this.raise(node.start, "Can not use 'await' as identifier inside an async function")
+        break
+
+      case "ObjectPattern":
+      case "ArrayPattern":
+        break
+
+      case "ObjectExpression":
+        node.type = "ObjectPattern"
+        for (var i = 0; i < node.properties.length; i++) {
+          var prop = node.properties[i]
+          if (prop.kind !== "init") this$1.raise(prop.key.start, "Object pattern can't contain getter or setter")
+          this$1.toAssignable(prop.value, isBinding)
+        }
+        break
+
+      case "ArrayExpression":
+        node.type = "ArrayPattern"
+        this.toAssignableList(node.elements, isBinding)
+        break
+
+      case "AssignmentExpression":
+        if (node.operator === "=") {
+          node.type = "AssignmentPattern"
+          delete node.operator
+          this.toAssignable(node.left, isBinding)
+          // falls through to AssignmentPattern
+        } else {
+          this.raise(node.left.end, "Only '=' operator can be used for specifying default value.")
+          break
+        }
+
+      case "AssignmentPattern":
+        break
+
+      case "ParenthesizedExpression":
+        node.expression = this.toAssignable(node.expression, isBinding)
+        break
+
+      case "MemberExpression":
+        if (!isBinding) break
+
+      default:
+        this.raise(node.start, "Assigning to rvalue")
+      }
+    }
+    return node
+  }
+
+  // Convert list of expression atoms to binding list.
+
+  pp$2.toAssignableList = function(exprList, isBinding) {
+    var this$1 = this;
+
+    var end = exprList.length
+    if (end) {
+      var last = exprList[end - 1]
+      if (last && last.type == "RestElement") {
+        --end
+      } else if (last && last.type == "SpreadElement") {
+        last.type = "RestElement"
+        var arg = last.argument
+        this.toAssignable(arg, isBinding)
+        if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern")
+          this.unexpected(arg.start)
+        --end
+      }
+
+      if (isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
+        this.unexpected(last.argument.start)
+    }
+    for (var i = 0; i < end; i++) {
+      var elt = exprList[i]
+      if (elt) this$1.toAssignable(elt, isBinding)
+    }
+    return exprList
+  }
+
+  // Parses spread element.
+
+  pp$2.parseSpread = function(refDestructuringErrors) {
+    var node = this.startNode()
+    this.next()
+    node.argument = this.parseMaybeAssign(false, refDestructuringErrors)
+    return this.finishNode(node, "SpreadElement")
+  }
+
+  pp$2.parseRest = function(allowNonIdent) {
+    var node = this.startNode()
+    this.next()
+
+    // RestElement inside of a function parameter must be an identifier
+    if (allowNonIdent) node.argument = this.type === tt.name ? this.parseIdent() : this.unexpected()
+    else node.argument = this.type === tt.name || this.type === tt.bracketL ? this.parseBindingAtom() : this.unexpected()
+
+    return this.finishNode(node, "RestElement")
+  }
+
+  // Parses lvalue (assignable) atom.
+
+  pp$2.parseBindingAtom = function() {
+    if (this.options.ecmaVersion < 6) return this.parseIdent()
+    switch (this.type) {
+    case tt.name:
+      return this.parseIdent()
+
+    case tt.bracketL:
+      var node = this.startNode()
+      this.next()
+      node.elements = this.parseBindingList(tt.bracketR, true, true)
+      return this.finishNode(node, "ArrayPattern")
+
+    case tt.braceL:
+      return this.parseObj(true)
+
+    default:
+      this.unexpected()
+    }
+  }
+
+  pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNonIdent) {
+    var this$1 = this;
+
+    var elts = [], first = true
+    while (!this.eat(close)) {
+      if (first) first = false
+      else this$1.expect(tt.comma)
+      if (allowEmpty && this$1.type === tt.comma) {
+        elts.push(null)
+      } else if (allowTrailingComma && this$1.afterTrailingComma(close)) {
+        break
+      } else if (this$1.type === tt.ellipsis) {
+        var rest = this$1.parseRest(allowNonIdent)
+        this$1.parseBindingListItem(rest)
+        elts.push(rest)
+        if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element")
+        this$1.expect(close)
+        break
+      } else {
+        var elem = this$1.parseMaybeDefault(this$1.start, this$1.startLoc)
+        this$1.parseBindingListItem(elem)
+        elts.push(elem)
+      }
+    }
+    return elts
+  }
+
+  pp$2.parseBindingListItem = function(param) {
+    return param
+  }
+
+  // Parses assignment pattern around given atom if possible.
+
+  pp$2.parseMaybeDefault = function(startPos, startLoc, left) {
+    left = left || this.parseBindingAtom()
+    if (this.options.ecmaVersion < 6 || !this.eat(tt.eq)) return left
+    var node = this.startNodeAt(startPos, startLoc)
+    node.left = left
+    node.right = this.parseMaybeAssign()
+    return this.finishNode(node, "AssignmentPattern")
+  }
+
+  // Verify that a node is an lval — something that can be assigned
+  // to.
+
+  pp$2.checkLVal = function(expr, isBinding, checkClashes) {
+    var this$1 = this;
+
+    switch (expr.type) {
+    case "Identifier":
+      if (this.strict && this.reservedWordsStrictBind.test(expr.name))
+        this.raiseRecoverable(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode")
+      if (checkClashes) {
+        if (has(checkClashes, expr.name))
+          this.raiseRecoverable(expr.start, "Argument name clash")
+        checkClashes[expr.name] = true
+      }
+      break
+
+    case "MemberExpression":
+      if (isBinding) this.raiseRecoverable(expr.start, (isBinding ? "Binding" : "Assigning to") + " member expression")
+      break
+
+    case "ObjectPattern":
+      for (var i = 0; i < expr.properties.length; i++)
+        this$1.checkLVal(expr.properties[i].value, isBinding, checkClashes)
+      break
+
+    case "ArrayPattern":
+      for (var i$1 = 0; i$1 < expr.elements.length; i$1++) {
+        var elem = expr.elements[i$1]
+        if (elem) this$1.checkLVal(elem, isBinding, checkClashes)
+      }
+      break
+
+    case "AssignmentPattern":
+      this.checkLVal(expr.left, isBinding, checkClashes)
+      break
+
+    case "RestElement":
+      this.checkLVal(expr.argument, isBinding, checkClashes)
+      break
+
+    case "ParenthesizedExpression":
+      this.checkLVal(expr.expression, isBinding, checkClashes)
+      break
+
+    default:
+      this.raise(expr.start, (isBinding ? "Binding" : "Assigning to") + " rvalue")
+    }
+  }
+
+  var pp$3 = Parser.prototype
+
+  // Check if property name clashes with already added.
+  // Object/class getters and setters are not allowed to clash —
+  // either with each other or with an init property — and in
+  // strict mode, init properties are also not allowed to be repeated.
+
+  pp$3.checkPropClash = function(prop, propHash) {
+    if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand))
+      return
+    var key = prop.key;
+    var name
+    switch (key.type) {
+    case "Identifier": name = key.name; break
+    case "Literal": name = String(key.value); break
+    default: return
+    }
+    var kind = prop.kind;
+    if (this.options.ecmaVersion >= 6) {
+      if (name === "__proto__" && kind === "init") {
+        if (propHash.proto) this.raiseRecoverable(key.start, "Redefinition of __proto__ property")
+        propHash.proto = true
+      }
+      return
+    }
+    name = "$" + name
+    var other = propHash[name]
+    if (other) {
+      var isGetSet = kind !== "init"
+      if ((this.strict || isGetSet) && other[kind] || !(isGetSet ^ other.init))
+        this.raiseRecoverable(key.start, "Redefinition of property")
+    } else {
+      other = propHash[name] = {
+        init: false,
+        get: false,
+        set: false
+      }
+    }
+    other[kind] = true
+  }
+
+  // ### Expression parsing
+
+  // These nest, from the most general expression type at the top to
+  // 'atomic', nondivisible expression types at the bottom. Most of
+  // the functions will simply let the function(s) below them parse,
+  // and, *if* the syntactic construct they handle is present, wrap
+  // the AST node that the inner parser gave them in another node.
+
+  // Parse a full expression. The optional arguments are used to
+  // forbid the `in` operator (in for loops initalization expressions)
+  // and provide reference for storing '=' operator inside shorthand
+  // property assignment in contexts where both object expression
+  // and object pattern might appear (so it's possible to raise
+  // delayed syntax error at correct position).
+
+  pp$3.parseExpression = function(noIn, refDestructuringErrors) {
+    var this$1 = this;
+
+    var startPos = this.start, startLoc = this.startLoc
+    var expr = this.parseMaybeAssign(noIn, refDestructuringErrors)
+    if (this.type === tt.comma) {
+      var node = this.startNodeAt(startPos, startLoc)
+      node.expressions = [expr]
+      while (this.eat(tt.comma)) node.expressions.push(this$1.parseMaybeAssign(noIn, refDestructuringErrors))
+      return this.finishNode(node, "SequenceExpression")
+    }
+    return expr
+  }
+
+  // Parse an assignment expression. This includes applications of
+  // operators like `+=`.
+
+  pp$3.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) {
+    if (this.inGenerator && this.isContextual("yield")) return this.parseYield()
+
+    var ownDestructuringErrors = false
+    if (!refDestructuringErrors) {
+      refDestructuringErrors = new DestructuringErrors
+      ownDestructuringErrors = true
+    }
+    var startPos = this.start, startLoc = this.startLoc
+    if (this.type == tt.parenL || this.type == tt.name)
+      this.potentialArrowAt = this.start
+    var left = this.parseMaybeConditional(noIn, refDestructuringErrors)
+    if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc)
+    if (this.type.isAssign) {
+      this.checkPatternErrors(refDestructuringErrors, true)
+      if (!ownDestructuringErrors) DestructuringErrors.call(refDestructuringErrors)
+      var node = this.startNodeAt(startPos, startLoc)
+      node.operator = this.value
+      node.left = this.type === tt.eq ? this.toAssignable(left) : left
+      refDestructuringErrors.shorthandAssign = 0 // reset because shorthand default was used correctly
+      this.checkLVal(left)
+      this.next()
+      node.right = this.parseMaybeAssign(noIn)
+      return this.finishNode(node, "AssignmentExpression")
+    } else {
+      if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true)
+    }
+    return left
+  }
+
+  // Parse a ternary conditional (`?:`) operator.
+
+  pp$3.parseMaybeConditional = function(noIn, refDestructuringErrors) {
+    var startPos = this.start, startLoc = this.startLoc
+    var expr = this.parseExprOps(noIn, refDestructuringErrors)
+    if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+    if (this.eat(tt.question)) {
+      var node = this.startNodeAt(startPos, startLoc)
+      node.test = expr
+      node.consequent = this.parseMaybeAssign()
+      this.expect(tt.colon)
+      node.alternate = this.parseMaybeAssign(noIn)
+      return this.finishNode(node, "ConditionalExpression")
+    }
+    return expr
+  }
+
+  // Start the precedence parser.
+
+  pp$3.parseExprOps = function(noIn, refDestructuringErrors) {
+    var startPos = this.start, startLoc = this.startLoc
+    var expr = this.parseMaybeUnary(refDestructuringErrors, false)
+    if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+    return this.parseExprOp(expr, startPos, startLoc, -1, noIn)
+  }
+
+  // Parse binary operators with the operator precedence parsing
+  // algorithm. `left` is the left-hand side of the operator.
+  // `minPrec` provides context that allows the function to stop and
+  // defer further parser to one of its callers when it encounters an
+  // operator that has a lower precedence than the set it is parsing.
+
+  pp$3.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {
+    var prec = this.type.binop
+    if (prec != null && (!noIn || this.type !== tt._in)) {
+      if (prec > minPrec) {
+        var logical = this.type === tt.logicalOR || this.type === tt.logicalAND
+        var op = this.value
+        this.next()
+        var startPos = this.start, startLoc = this.startLoc
+        var right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn)
+        var node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical)
+        return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn)
+      }
+    }
+    return left
+  }
+
+  pp$3.buildBinary = function(startPos, startLoc, left, right, op, logical) {
+    var node = this.startNodeAt(startPos, startLoc)
+    node.left = left
+    node.operator = op
+    node.right = right
+    return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression")
+  }
+
+  // Parse unary operators, both prefix and postfix.
+
+  pp$3.parseMaybeUnary = function(refDestructuringErrors, sawUnary) {
+    var this$1 = this;
+
+    var startPos = this.start, startLoc = this.startLoc, expr
+    if (this.inAsync && this.isContextual("await")) {
+      expr = this.parseAwait(refDestructuringErrors)
+      sawUnary = true
+    } else if (this.type.prefix) {
+      var node = this.startNode(), update = this.type === tt.incDec
+      node.operator = this.value
+      node.prefix = true
+      this.next()
+      node.argument = this.parseMaybeUnary(null, true)
+      this.checkExpressionErrors(refDestructuringErrors, true)
+      if (update) this.checkLVal(node.argument)
+      else if (this.strict && node.operator === "delete" &&
+               node.argument.type === "Identifier")
+        this.raiseRecoverable(node.start, "Deleting local variable in strict mode")
+      else sawUnary = true
+      expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+    } else {
+      expr = this.parseExprSubscripts(refDestructuringErrors)
+      if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+      while (this.type.postfix && !this.canInsertSemicolon()) {
+        var node$1 = this$1.startNodeAt(startPos, startLoc)
+        node$1.operator = this$1.value
+        node$1.prefix = false
+        node$1.argument = expr
+        this$1.checkLVal(expr)
+        this$1.next()
+        expr = this$1.finishNode(node$1, "UpdateExpression")
+      }
+    }
+
+    if (!sawUnary && this.eat(tt.starstar))
+      return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false)
+    else
+      return expr
+  }
+
+  // Parse call, dot, and `[]`-subscript expressions.
+
+  pp$3.parseExprSubscripts = function(refDestructuringErrors) {
+    var startPos = this.start, startLoc = this.startLoc
+    var expr = this.parseExprAtom(refDestructuringErrors)
+    var skipArrowSubscripts = expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")"
+    if (this.checkExpressionErrors(refDestructuringErrors) || skipArrowSubscripts) return expr
+    return this.parseSubscripts(expr, startPos, startLoc)
+  }
+
+  pp$3.parseSubscripts = function(base, startPos, startLoc, noCalls) {
+    var this$1 = this;
+
+    for (;;) {
+      var maybeAsyncArrow = this$1.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && !this$1.canInsertSemicolon()
+      if (this$1.eat(tt.dot)) {
+        var node = this$1.startNodeAt(startPos, startLoc)
+        node.object = base
+        node.property = this$1.parseIdent(true)
+        node.computed = false
+        base = this$1.finishNode(node, "MemberExpression")
+      } else if (this$1.eat(tt.bracketL)) {
+        var node$1 = this$1.startNodeAt(startPos, startLoc)
+        node$1.object = base
+        node$1.property = this$1.parseExpression()
+        node$1.computed = true
+        this$1.expect(tt.bracketR)
+        base = this$1.finishNode(node$1, "MemberExpression")
+      } else if (!noCalls && this$1.eat(tt.parenL)) {
+        var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this$1.yieldPos, oldAwaitPos = this$1.awaitPos
+        this$1.yieldPos = 0
+        this$1.awaitPos = 0
+        var exprList = this$1.parseExprList(tt.parenR, this$1.options.ecmaVersion >= 8, false, refDestructuringErrors)
+        if (maybeAsyncArrow && !this$1.canInsertSemicolon() && this$1.eat(tt.arrow)) {
+          this$1.checkPatternErrors(refDestructuringErrors, true)
+          this$1.checkYieldAwaitInDefaultParams()
+          this$1.yieldPos = oldYieldPos
+          this$1.awaitPos = oldAwaitPos
+          return this$1.parseArrowExpression(this$1.startNodeAt(startPos, startLoc), exprList, true)
+        }
+        this$1.checkExpressionErrors(refDestructuringErrors, true)
+        this$1.yieldPos = oldYieldPos || this$1.yieldPos
+        this$1.awaitPos = oldAwaitPos || this$1.awaitPos
+        var node$2 = this$1.startNodeAt(startPos, startLoc)
+        node$2.callee = base
+        node$2.arguments = exprList
+        base = this$1.finishNode(node$2, "CallExpression")
+      } else if (this$1.type === tt.backQuote) {
+        var node$3 = this$1.startNodeAt(startPos, startLoc)
+        node$3.tag = base
+        node$3.quasi = this$1.parseTemplate()
+        base = this$1.finishNode(node$3, "TaggedTemplateExpression")
+      } else {
+        return base
+      }
+    }
+  }
+
+  // Parse an atomic expression — either a single token that is an
+  // expression, an expression started by a keyword like `function` or
+  // `new`, or an expression wrapped in punctuation like `()`, `[]`,
+  // or `{}`.
+
+  pp$3.parseExprAtom = function(refDestructuringErrors) {
+    var node, canBeArrow = this.potentialArrowAt == this.start
+    switch (this.type) {
+    case tt._super:
+      if (!this.inFunction)
+        this.raise(this.start, "'super' outside of function or class")
+
+    case tt._this:
+      var type = this.type === tt._this ? "ThisExpression" : "Super"
+      node = this.startNode()
+      this.next()
+      return this.finishNode(node, type)
+
+    case tt.name:
+      var startPos = this.start, startLoc = this.startLoc
+      var id = this.parseIdent(this.type !== tt.name)
+      if (this.options.ecmaVersion >= 8 && id.name === "async" && !this.canInsertSemicolon() && this.eat(tt._function))
+        return this.parseFunction(this.startNodeAt(startPos, startLoc), false, false, true)
+      if (canBeArrow && !this.canInsertSemicolon()) {
+        if (this.eat(tt.arrow))
+          return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false)
+        if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === tt.name) {
+          id = this.parseIdent()
+          if (this.canInsertSemicolon() || !this.eat(tt.arrow))
+            this.unexpected()
+          return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true)
+        }
+      }
+      return id
+
+    case tt.regexp:
+      var value = this.value
+      node = this.parseLiteral(value.value)
+      node.regex = {pattern: value.pattern, flags: value.flags}
+      return node
+
+    case tt.num: case tt.string:
+      return this.parseLiteral(this.value)
+
+    case tt._null: case tt._true: case tt._false:
+      node = this.startNode()
+      node.value = this.type === tt._null ? null : this.type === tt._true
+      node.raw = this.type.keyword
+      this.next()
+      return this.finishNode(node, "Literal")
+
+    case tt.parenL:
+      return this.parseParenAndDistinguishExpression(canBeArrow)
+
+    case tt.bracketL:
+      node = this.startNode()
+      this.next()
+      node.elements = this.parseExprList(tt.bracketR, true, true, refDestructuringErrors)
+      return this.finishNode(node, "ArrayExpression")
+
+    case tt.braceL:
+      return this.parseObj(false, refDestructuringErrors)
+
+    case tt._function:
+      node = this.startNode()
+      this.next()
+      return this.parseFunction(node, false)
+
+    case tt._class:
+      return this.parseClass(this.startNode(), false)
+
+    case tt._new:
+      return this.parseNew()
+
+    case tt.backQuote:
+      return this.parseTemplate()
+
+    default:
+      this.unexpected()
+    }
+  }
+
+  pp$3.parseLiteral = function(value) {
+    var node = this.startNode()
+    node.value = value
+    node.raw = this.input.slice(this.start, this.end)
+    this.next()
+    return this.finishNode(node, "Literal")
+  }
+
+  pp$3.parseParenExpression = function() {
+    this.expect(tt.parenL)
+    var val = this.parseExpression()
+    this.expect(tt.parenR)
+    return val
+  }
+
+  pp$3.parseParenAndDistinguishExpression = function(canBeArrow) {
+    var this$1 = this;
+
+    var startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8
+    if (this.options.ecmaVersion >= 6) {
+      this.next()
+
+      var innerStartPos = this.start, innerStartLoc = this.startLoc
+      var exprList = [], first = true, lastIsComma = false
+      var refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart, innerParenStart
+      this.yieldPos = 0
+      this.awaitPos = 0
+      while (this.type !== tt.parenR) {
+        first ? first = false : this$1.expect(tt.comma)
+        if (allowTrailingComma && this$1.afterTrailingComma(tt.parenR, true)) {
+          lastIsComma = true
+          break
+        } else if (this$1.type === tt.ellipsis) {
+          spreadStart = this$1.start
+          exprList.push(this$1.parseParenItem(this$1.parseRest()))
+          if (this$1.type === tt.comma) this$1.raise(this$1.start, "Comma is not permitted after the rest element")
+          break
+        } else {
+          if (this$1.type === tt.parenL && !innerParenStart) {
+            innerParenStart = this$1.start
+          }
+          exprList.push(this$1.parseMaybeAssign(false, refDestructuringErrors, this$1.parseParenItem))
+        }
+      }
+      var innerEndPos = this.start, innerEndLoc = this.startLoc
+      this.expect(tt.parenR)
+
+      if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+        this.checkPatternErrors(refDestructuringErrors, true)
+        this.checkYieldAwaitInDefaultParams()
+        if (innerParenStart) this.unexpected(innerParenStart)
+        this.yieldPos = oldYieldPos
+        this.awaitPos = oldAwaitPos
+        return this.parseParenArrowList(startPos, startLoc, exprList)
+      }
+
+      if (!exprList.length || lastIsComma) this.unexpected(this.lastTokStart)
+      if (spreadStart) this.unexpected(spreadStart)
+      this.checkExpressionErrors(refDestructuringErrors, true)
+      this.yieldPos = oldYieldPos || this.yieldPos
+      this.awaitPos = oldAwaitPos || this.awaitPos
+
+      if (exprList.length > 1) {
+        val = this.startNodeAt(innerStartPos, innerStartLoc)
+        val.expressions = exprList
+        this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc)
+      } else {
+        val = exprList[0]
+      }
+    } else {
+      val = this.parseParenExpression()
+    }
+
+    if (this.options.preserveParens) {
+      var par = this.startNodeAt(startPos, startLoc)
+      par.expression = val
+      return this.finishNode(par, "ParenthesizedExpression")
+    } else {
+      return val
+    }
+  }
+
+  pp$3.parseParenItem = function(item) {
+    return item
+  }
+
+  pp$3.parseParenArrowList = function(startPos, startLoc, exprList) {
+    return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList)
+  }
+
+  // New's precedence is slightly tricky. It must allow its argument to
+  // be a `[]` or dot subscript expression, but not a call — at least,
+  // not without wrapping it in parentheses. Thus, it uses the noCalls
+  // argument to parseSubscripts to prevent it from consuming the
+  // argument list.
+
+  var empty$1 = []
+
+  pp$3.parseNew = function() {
+    var node = this.startNode()
+    var meta = this.parseIdent(true)
+    if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) {
+      node.meta = meta
+      node.property = this.parseIdent(true)
+      if (node.property.name !== "target")
+        this.raiseRecoverable(node.property.start, "The only valid meta property for new is new.target")
+      if (!this.inFunction)
+        this.raiseRecoverable(node.start, "new.target can only be used in functions")
+      return this.finishNode(node, "MetaProperty")
+    }
+    var startPos = this.start, startLoc = this.startLoc
+    node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true)
+    if (this.eat(tt.parenL)) node.arguments = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false)
+    else node.arguments = empty$1
+    return this.finishNode(node, "NewExpression")
+  }
+
+  // Parse template expression.
+
+  pp$3.parseTemplateElement = function() {
+    var elem = this.startNode()
+    elem.value = {
+      raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, '\n'),
+      cooked: this.value
+    }
+    this.next()
+    elem.tail = this.type === tt.backQuote
+    return this.finishNode(elem, "TemplateElement")
+  }
+
+  pp$3.parseTemplate = function() {
+    var this$1 = this;
+
+    var node = this.startNode()
+    this.next()
+    node.expressions = []
+    var curElt = this.parseTemplateElement()
+    node.quasis = [curElt]
+    while (!curElt.tail) {
+      this$1.expect(tt.dollarBraceL)
+      node.expressions.push(this$1.parseExpression())
+      this$1.expect(tt.braceR)
+      node.quasis.push(curElt = this$1.parseTemplateElement())
+    }
+    this.next()
+    return this.finishNode(node, "TemplateLiteral")
+  }
+
+  // Parse an object literal or binding pattern.
+
+  pp$3.parseObj = function(isPattern, refDestructuringErrors) {
+    var this$1 = this;
+
+    var node = this.startNode(), first = true, propHash = {}
+    node.properties = []
+    this.next()
+    while (!this.eat(tt.braceR)) {
+      if (!first) {
+        this$1.expect(tt.comma)
+        if (this$1.afterTrailingComma(tt.braceR)) break
+      } else first = false
+
+      var prop = this$1.startNode(), isGenerator, isAsync, startPos, startLoc
+      if (this$1.options.ecmaVersion >= 6) {
+        prop.method = false
+        prop.shorthand = false
+        if (isPattern || refDestructuringErrors) {
+          startPos = this$1.start
+          startLoc = this$1.startLoc
+        }
+        if (!isPattern)
+          isGenerator = this$1.eat(tt.star)
+      }
+      this$1.parsePropertyName(prop)
+      if (!isPattern && this$1.options.ecmaVersion >= 8 && !isGenerator && !prop.computed &&
+          prop.key.type === "Identifier" && prop.key.name === "async" && this$1.type !== tt.parenL &&
+          this$1.type !== tt.colon && !this$1.canInsertSemicolon()) {
+        isAsync = true
+        this$1.parsePropertyName(prop, refDestructuringErrors)
+      } else {
+        isAsync = false
+      }
+      this$1.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors)
+      this$1.checkPropClash(prop, propHash)
+      node.properties.push(this$1.finishNode(prop, "Property"))
+    }
+    return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression")
+  }
+
+  pp$3.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors) {
+    if ((isGenerator || isAsync) && this.type === tt.colon)
+      this.unexpected()
+
+    if (this.eat(tt.colon)) {
+      prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors)
+      prop.kind = "init"
+    } else if (this.options.ecmaVersion >= 6 && this.type === tt.parenL) {
+      if (isPattern) this.unexpected()
+      prop.kind = "init"
+      prop.method = true
+      prop.value = this.parseMethod(isGenerator, isAsync)
+    } else if (this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" &&
+               (prop.key.name === "get" || prop.key.name === "set") &&
+               (this.type != tt.comma && this.type != tt.braceR)) {
+      if (isGenerator || isAsync || isPattern) this.unexpected()
+      prop.kind = prop.key.name
+      this.parsePropertyName(prop)
+      prop.value = this.parseMethod(false)
+      var paramCount = prop.kind === "get" ? 0 : 1
+      if (prop.value.params.length !== paramCount) {
+        var start = prop.value.start
+        if (prop.kind === "get")
+          this.raiseRecoverable(start, "getter should have no params")
+        else
+          this.raiseRecoverable(start, "setter should have exactly one param")
+      } else {
+        if (prop.kind === "set" && prop.value.params[0].type === "RestElement")
+          this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params")
+      }
+    } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
+      if (this.keywords.test(prop.key.name) ||
+          (this.strict ? this.reservedWordsStrict : this.reservedWords).test(prop.key.name) ||
+          (this.inGenerator && prop.key.name == "yield") ||
+          (this.inAsync && prop.key.name == "await"))
+        this.raiseRecoverable(prop.key.start, "'" + prop.key.name + "' can not be used as shorthand property")
+      prop.kind = "init"
+      if (isPattern) {
+        prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+      } else if (this.type === tt.eq && refDestructuringErrors) {
+        if (!refDestructuringErrors.shorthandAssign)
+          refDestructuringErrors.shorthandAssign = this.start
+        prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+      } else {
+        prop.value = prop.key
+      }
+      prop.shorthand = true
+    } else this.unexpected()
+  }
+
+  pp$3.parsePropertyName = function(prop) {
+    if (this.options.ecmaVersion >= 6) {
+      if (this.eat(tt.bracketL)) {
+        prop.computed = true
+        prop.key = this.parseMaybeAssign()
+        this.expect(tt.bracketR)
+        return prop.key
+      } else {
+        prop.computed = false
+      }
+    }
+    return prop.key = this.type === tt.num || this.type === tt.string ? this.parseExprAtom() : this.parseIdent(true)
+  }
+
+  // Initialize empty function node.
+
+  pp$3.initFunction = function(node) {
+    node.id = null
+    if (this.options.ecmaVersion >= 6) {
+      node.generator = false
+      node.expression = false
+    }
+    if (this.options.ecmaVersion >= 8)
+      node.async = false
+  }
+
+  // Parse object or class method.
+
+  pp$3.parseMethod = function(isGenerator, isAsync) {
+    var node = this.startNode(), oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 6)
+      node.generator = isGenerator
+    if (this.options.ecmaVersion >= 8)
+      node.async = !!isAsync
+
+    this.inGenerator = node.generator
+    this.inAsync = node.async
+    this.yieldPos = 0
+    this.awaitPos = 0
+
+    this.expect(tt.parenL)
+    node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8)
+    this.checkYieldAwaitInDefaultParams()
+    this.parseFunctionBody(node, false)
+
+    this.inGenerator = oldInGen
+    this.inAsync = oldInAsync
+    this.yieldPos = oldYieldPos
+    this.awaitPos = oldAwaitPos
+    return this.finishNode(node, "FunctionExpression")
+  }
+
+  // Parse arrow function expression with given parameters.
+
+  pp$3.parseArrowExpression = function(node, params, isAsync) {
+    var oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 8)
+      node.async = !!isAsync
+
+    this.inGenerator = false
+    this.inAsync = node.async
+    this.yieldPos = 0
+    this.awaitPos = 0
+
+    node.params = this.toAssignableList(params, true)
+    this.parseFunctionBody(node, true)
+
+    this.inGenerator = oldInGen
+    this.inAsync = oldInAsync
+    this.yieldPos = oldYieldPos
+    this.awaitPos = oldAwaitPos
+    return this.finishNode(node, "ArrowFunctionExpression")
+  }
+
+  // Parse function body and check parameters.
+
+  pp$3.parseFunctionBody = function(node, isArrowFunction) {
+    var isExpression = isArrowFunction && this.type !== tt.braceL
+
+    if (isExpression) {
+      node.body = this.parseMaybeAssign()
+      node.expression = true
+    } else {
+      // Start a new scope with regard to labels and the `inFunction`
+      // flag (restore them to their old value afterwards).
+      var oldInFunc = this.inFunction, oldLabels = this.labels
+      this.inFunction = true; this.labels = []
+      node.body = this.parseBlock(true)
+      node.expression = false
+      this.inFunction = oldInFunc; this.labels = oldLabels
+    }
+
+    // If this is a strict mode function, verify that argument names
+    // are not repeated, and it does not try to bind the words `eval`
+    // or `arguments`.
+    var useStrict = (!isExpression && node.body.body.length && this.isUseStrict(node.body.body[0])) ? node.body.body[0] : null
+    if (useStrict && this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params))
+      this.raiseRecoverable(useStrict.start, "Illegal 'use strict' directive in function with non-simple parameter list")
+
+    if (this.strict || useStrict) {
+      var oldStrict = this.strict
+      this.strict = true
+      if (node.id)
+        this.checkLVal(node.id, true)
+      this.checkParams(node)
+      this.strict = oldStrict
+    } else if (isArrowFunction || !this.isSimpleParamList(node.params)) {
+      this.checkParams(node)
+    }
+  }
+
+  pp$3.isSimpleParamList = function(params) {
+    for (var i = 0; i < params.length; i++)
+      if (params[i].type !== "Identifier") return false
+    return true
+  }
+
+  // Checks function params for various disallowed patterns such as using "eval"
+  // or "arguments" and duplicate parameters.
+
+  pp$3.checkParams = function(node) {
+    var this$1 = this;
+
+    var nameHash = {}
+    for (var i = 0; i < node.params.length; i++) this$1.checkLVal(node.params[i], true, nameHash)
+  }
+
+  // Parses a comma-separated list of expressions, and returns them as
+  // an array. `close` is the token type that ends the list, and
+  // `allowEmpty` can be turned on to allow subsequent commas with
+  // nothing in between them to be parsed as `null` (which is needed
+  // for array literals).
+
+  pp$3.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) {
+    var this$1 = this;
+
+    var elts = [], first = true
+    while (!this.eat(close)) {
+      if (!first) {
+        this$1.expect(tt.comma)
+        if (allowTrailingComma && this$1.afterTrailingComma(close)) break
+      } else first = false
+
+      var elt
+      if (allowEmpty && this$1.type === tt.comma)
+        elt = null
+      else if (this$1.type === tt.ellipsis) {
+        elt = this$1.parseSpread(refDestructuringErrors)
+        if (this$1.type === tt.comma && refDestructuringErrors && !refDestructuringErrors.trailingComma) {
+          refDestructuringErrors.trailingComma = this$1.start
+        }
+      } else
+        elt = this$1.parseMaybeAssign(false, refDestructuringErrors)
+      elts.push(elt)
+    }
+    return elts
+  }
+
+  // Parse the next token as an identifier. If `liberal` is true (used
+  // when parsing properties), it will also convert keywords into
+  // identifiers.
+
+  pp$3.parseIdent = function(liberal) {
+    var node = this.startNode()
+    if (liberal && this.options.allowReserved == "never") liberal = false
+    if (this.type === tt.name) {
+      if (!liberal && (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) &&
+          (this.options.ecmaVersion >= 6 ||
+           this.input.slice(this.start, this.end).indexOf("\\") == -1))
+        this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved")
+      if (this.inGenerator && this.value === "yield")
+        this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator")
+      if (this.inAsync && this.value === "await")
+        this.raiseRecoverable(this.start, "Can not use 'await' as identifier inside an async function")
+      node.name = this.value
+    } else if (liberal && this.type.keyword) {
+      node.name = this.type.keyword
+    } else {
+      this.unexpected()
+    }
+    this.next()
+    return this.finishNode(node, "Identifier")
+  }
+
+  // Parses yield expression inside generator.
+
+  pp$3.parseYield = function() {
+    if (!this.yieldPos) this.yieldPos = this.start
+
+    var node = this.startNode()
+    this.next()
+    if (this.type == tt.semi || this.canInsertSemicolon() || (this.type != tt.star && !this.type.startsExpr)) {
+      node.delegate = false
+      node.argument = null
+    } else {
+      node.delegate = this.eat(tt.star)
+      node.argument = this.parseMaybeAssign()
+    }
+    return this.finishNode(node, "YieldExpression")
+  }
+
+  pp$3.parseAwait = function() {
+    if (!this.awaitPos) this.awaitPos = this.start
+
+    var node = this.startNode()
+    this.next()
+    node.argument = this.parseMaybeUnary(null, true)
+    return this.finishNode(node, "AwaitExpression")
+  }
+
+  var pp$4 = Parser.prototype
+
+  // This function is used to raise exceptions on parse errors. It
+  // takes an offset integer (into the current `input`) to indicate
+  // the location of the error, attaches the position to the end
+  // of the error message, and then raises a `SyntaxError` with that
+  // message.
+
+  pp$4.raise = function(pos, message) {
+    var loc = getLineInfo(this.input, pos)
+    message += " (" + loc.line + ":" + loc.column + ")"
+    var err = new SyntaxError(message)
+    err.pos = pos; err.loc = loc; err.raisedAt = this.pos
+    throw err
+  }
+
+  pp$4.raiseRecoverable = pp$4.raise
+
+  pp$4.curPosition = function() {
+    if (this.options.locations) {
+      return new Position(this.curLine, this.pos - this.lineStart)
+    }
+  }
+
+  var Node = function Node(parser, pos, loc) {
+    this.type = ""
+    this.start = pos
+    this.end = 0
+    if (parser.options.locations)
+      this.loc = new SourceLocation(parser, loc)
+    if (parser.options.directSourceFile)
+      this.sourceFile = parser.options.directSourceFile
+    if (parser.options.ranges)
+      this.range = [pos, 0]
+  };
+
+  // Start an AST node, attaching a start offset.
+
+  var pp$5 = Parser.prototype
+
+  pp$5.startNode = function() {
+    return new Node(this, this.start, this.startLoc)
+  }
+
+  pp$5.startNodeAt = function(pos, loc) {
+    return new Node(this, pos, loc)
+  }
+
+  // Finish an AST node, adding `type` and `end` properties.
+
+  function finishNodeAt(node, type, pos, loc) {
+    node.type = type
+    node.end = pos
+    if (this.options.locations)
+      node.loc.end = loc
+    if (this.options.ranges)
+      node.range[1] = pos
+    return node
+  }
+
+  pp$5.finishNode = function(node, type) {
+    return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc)
+  }
+
+  // Finish node at given position
+
+  pp$5.finishNodeAt = function(node, type, pos, loc) {
+    return finishNodeAt.call(this, node, type, pos, loc)
+  }
+
+  var TokContext = function TokContext(token, isExpr, preserveSpace, override) {
+    this.token = token
+    this.isExpr = !!isExpr
+    this.preserveSpace = !!preserveSpace
+    this.override = override
+  };
+
+  var types = {
+    b_stat: new TokContext("{", false),
+    b_expr: new TokContext("{", true),
+    b_tmpl: new TokContext("${", true),
+    p_stat: new TokContext("(", false),
+    p_expr: new TokContext("(", true),
+    q_tmpl: new TokContext("`", true, true, function (p) { return p.readTmplToken(); }),
+    f_expr: new TokContext("function", true)
+  }
+
+  var pp$6 = Parser.prototype
+
+  pp$6.initialContext = function() {
+    return [types.b_stat]
+  }
+
+  pp$6.braceIsBlock = function(prevType) {
+    if (prevType === tt.colon) {
+      var parent = this.curContext()
+      if (parent === types.b_stat || parent === types.b_expr)
+        return !parent.isExpr
+    }
+    if (prevType === tt._return)
+      return lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+    if (prevType === tt._else || prevType === tt.semi || prevType === tt.eof || prevType === tt.parenR)
+      return true
+    if (prevType == tt.braceL)
+      return this.curContext() === types.b_stat
+    return !this.exprAllowed
+  }
+
+  pp$6.updateContext = function(prevType) {
+    var update, type = this.type
+    if (type.keyword && prevType == tt.dot)
+      this.exprAllowed = false
+    else if (update = type.updateContext)
+      update.call(this, prevType)
+    else
+      this.exprAllowed = type.beforeExpr
+  }
+
+  // Token-specific context update code
+
+  tt.parenR.updateContext = tt.braceR.updateContext = function() {
+    if (this.context.length == 1) {
+      this.exprAllowed = true
+      return
+    }
+    var out = this.context.pop()
+    if (out === types.b_stat && this.curContext() === types.f_expr) {
+      this.context.pop()
+      this.exprAllowed = false
+    } else if (out === types.b_tmpl) {
+      this.exprAllowed = true
+    } else {
+      this.exprAllowed = !out.isExpr
+    }
+  }
+
+  tt.braceL.updateContext = function(prevType) {
+    this.context.push(this.braceIsBlock(prevType) ? types.b_stat : types.b_expr)
+    this.exprAllowed = true
+  }
+
+  tt.dollarBraceL.updateContext = function() {
+    this.context.push(types.b_tmpl)
+    this.exprAllowed = true
+  }
+
+  tt.parenL.updateContext = function(prevType) {
+    var statementParens = prevType === tt._if || prevType === tt._for || prevType === tt._with || prevType === tt._while
+    this.context.push(statementParens ? types.p_stat : types.p_expr)
+    this.exprAllowed = true
+  }
+
+  tt.incDec.updateContext = function() {
+    // tokExprAllowed stays unchanged
+  }
+
+  tt._function.updateContext = function(prevType) {
+    if (prevType.beforeExpr && prevType !== tt.semi && prevType !== tt._else &&
+        !((prevType === tt.colon || prevType === tt.braceL) && this.curContext() === types.b_stat))
+      this.context.push(types.f_expr)
+    this.exprAllowed = false
+  }
+
+  tt.backQuote.updateContext = function() {
+    if (this.curContext() === types.q_tmpl)
+      this.context.pop()
+    else
+      this.context.push(types.q_tmpl)
+    this.exprAllowed = false
+  }
+
+  // Object type used to represent tokens. Note that normally, tokens
+  // simply exist as properties on the parser object. This is only
+  // used for the onToken callback and the external tokenizer.
+
+  var Token = function Token(p) {
+    this.type = p.type
+    this.value = p.value
+    this.start = p.start
+    this.end = p.end
+    if (p.options.locations)
+      this.loc = new SourceLocation(p, p.startLoc, p.endLoc)
+    if (p.options.ranges)
+      this.range = [p.start, p.end]
+  };
+
+  // ## Tokenizer
+
+  var pp$7 = Parser.prototype
+
+  // Are we running under Rhino?
+  var isRhino = typeof Packages == "object" && Object.prototype.toString.call(Packages) == "[object JavaPackage]"
+
+  // Move to the next token
+
+  pp$7.next = function() {
+    if (this.options.onToken)
+      this.options.onToken(new Token(this))
+
+    this.lastTokEnd = this.end
+    this.lastTokStart = this.start
+    this.lastTokEndLoc = this.endLoc
+    this.lastTokStartLoc = this.startLoc
+    this.nextToken()
+  }
+
+  pp$7.getToken = function() {
+    this.next()
+    return new Token(this)
+  }
+
+  // If we're in an ES6 environment, make parsers iterable
+  if (typeof Symbol !== "undefined")
+    pp$7[Symbol.iterator] = function () {
+      var self = this
+      return {next: function () {
+        var token = self.getToken()
+        return {
+          done: token.type === tt.eof,
+          value: token
+        }
+      }}
+    }
+
+  // Toggle strict mode. Re-reads the next number or string to please
+  // pedantic tests (`"use strict"; 010;` should fail).
+
+  pp$7.setStrict = function(strict) {
+    var this$1 = this;
+
+    this.strict = strict
+    if (this.type !== tt.num && this.type !== tt.string) return
+    this.pos = this.start
+    if (this.options.locations) {
+      while (this.pos < this.lineStart) {
+        this$1.lineStart = this$1.input.lastIndexOf("\n", this$1.lineStart - 2) + 1
+        --this$1.curLine
+      }
+    }
+    this.nextToken()
+  }
+
+  pp$7.curContext = function() {
+    return this.context[this.context.length - 1]
+  }
+
+  // Read a single token, updating the parser object's token-related
+  // properties.
+
+  pp$7.nextToken = function() {
+    var curContext = this.curContext()
+    if (!curContext || !curContext.preserveSpace) this.skipSpace()
+
+    this.start = this.pos
+    if (this.options.locations) this.startLoc = this.curPosition()
+    if (this.pos >= this.input.length) return this.finishToken(tt.eof)
+
+    if (curContext.override) return curContext.override(this)
+    else this.readToken(this.fullCharCodeAtPos())
+  }
+
+  pp$7.readToken = function(code) {
+    // Identifier or keyword. '\uXXXX' sequences are allowed in
+    // identifiers, so '\' also dispatches to that.
+    if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */)
+      return this.readWord()
+
+    return this.getTokenFromCode(code)
+  }
+
+  pp$7.fullCharCodeAtPos = function() {
+    var code = this.input.charCodeAt(this.pos)
+    if (code <= 0xd7ff || code >= 0xe000) return code
+    var next = this.input.charCodeAt(this.pos + 1)
+    return (code << 10) + next - 0x35fdc00
+  }
+
+  pp$7.skipBlockComment = function() {
+    var this$1 = this;
+
+    var startLoc = this.options.onComment && this.curPosition()
+    var start = this.pos, end = this.input.indexOf("*/", this.pos += 2)
+    if (end === -1) this.raise(this.pos - 2, "Unterminated comment")
+    this.pos = end + 2
+    if (this.options.locations) {
+      lineBreakG.lastIndex = start
+      var match
+      while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
+        ++this$1.curLine
+        this$1.lineStart = match.index + match[0].length
+      }
+    }
+    if (this.options.onComment)
+      this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos,
+                             startLoc, this.curPosition())
+  }
+
+  pp$7.skipLineComment = function(startSkip) {
+    var this$1 = this;
+
+    var start = this.pos
+    var startLoc = this.options.onComment && this.curPosition()
+    var ch = this.input.charCodeAt(this.pos+=startSkip)
+    while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+      ++this$1.pos
+      ch = this$1.input.charCodeAt(this$1.pos)
+    }
+    if (this.options.onComment)
+      this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos,
+                             startLoc, this.curPosition())
+  }
+
+  // Called at the start of the parse and after every token. Skips
+  // whitespace and comments, and.
+
+  pp$7.skipSpace = function() {
+    var this$1 = this;
+
+    loop: while (this.pos < this.input.length) {
+      var ch = this$1.input.charCodeAt(this$1.pos)
+      switch (ch) {
+        case 32: case 160: // ' '
+          ++this$1.pos
+          break
+        case 13:
+          if (this$1.input.charCodeAt(this$1.pos + 1) === 10) {
+            ++this$1.pos
+          }
+        case 10: case 8232: case 8233:
+          ++this$1.pos
+          if (this$1.options.locations) {
+            ++this$1.curLine
+            this$1.lineStart = this$1.pos
+          }
+          break
+        case 47: // '/'
+          switch (this$1.input.charCodeAt(this$1.pos + 1)) {
+            case 42: // '*'
+              this$1.skipBlockComment()
+              break
+            case 47:
+              this$1.skipLineComment(2)
+              break
+            default:
+              break loop
+          }
+          break
+        default:
+          if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+            ++this$1.pos
+          } else {
+            break loop
+          }
+      }
+    }
+  }
+
+  // Called at the end of every token. Sets `end`, `val`, and
+  // maintains `context` and `exprAllowed`, and skips the space after
+  // the token, so that the next one's `start` will point at the
+  // right position.
+
+  pp$7.finishToken = function(type, val) {
+    this.end = this.pos
+    if (this.options.locations) this.endLoc = this.curPosition()
+    var prevType = this.type
+    this.type = type
+    this.value = val
+
+    this.updateContext(prevType)
+  }
+
+  // ### Token reading
+
+  // This is the function that is called to fetch the next token. It
+  // is somewhat obscure, because it works in character codes rather
+  // than characters, and because operator parsing has been inlined
+  // into it.
+  //
+  // All in the name of speed.
+  //
+  pp$7.readToken_dot = function() {
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next >= 48 && next <= 57) return this.readNumber(true)
+    var next2 = this.input.charCodeAt(this.pos + 2)
+    if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.'
+      this.pos += 3
+      return this.finishToken(tt.ellipsis)
+    } else {
+      ++this.pos
+      return this.finishToken(tt.dot)
+    }
+  }
+
+  pp$7.readToken_slash = function() { // '/'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (this.exprAllowed) {++this.pos; return this.readRegexp()}
+    if (next === 61) return this.finishOp(tt.assign, 2)
+    return this.finishOp(tt.slash, 1)
+  }
+
+  pp$7.readToken_mult_modulo_exp = function(code) { // '%*'
+    var next = this.input.charCodeAt(this.pos + 1)
+    var size = 1
+    var tokentype = code === 42 ? tt.star : tt.modulo
+
+    // exponentiation operator ** and **=
+    if (this.options.ecmaVersion >= 7 && next === 42) {
+      ++size
+      tokentype = tt.starstar
+      next = this.input.charCodeAt(this.pos + 2)
+    }
+
+    if (next === 61) return this.finishOp(tt.assign, size + 1)
+    return this.finishOp(tokentype, size)
+  }
+
+  pp$7.readToken_pipe_amp = function(code) { // '|&'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2)
+    if (next === 61) return this.finishOp(tt.assign, 2)
+    return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1)
+  }
+
+  pp$7.readToken_caret = function() { // '^'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next === 61) return this.finishOp(tt.assign, 2)
+    return this.finishOp(tt.bitwiseXOR, 1)
+  }
+
+  pp$7.readToken_plus_min = function(code) { // '+-'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next === code) {
+      if (next == 45 && this.input.charCodeAt(this.pos + 2) == 62 &&
+          lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
+        // A `-->` line comment
+        this.skipLineComment(3)
+        this.skipSpace()
+        return this.nextToken()
+      }
+      return this.finishOp(tt.incDec, 2)
+    }
+    if (next === 61) return this.finishOp(tt.assign, 2)
+    return this.finishOp(tt.plusMin, 1)
+  }
+
+  pp$7.readToken_lt_gt = function(code) { // '<>'
+    var next = this.input.charCodeAt(this.pos + 1)
+    var size = 1
+    if (next === code) {
+      size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2
+      if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1)
+      return this.finishOp(tt.bitShift, size)
+    }
+    if (next == 33 && code == 60 && this.input.charCodeAt(this.pos + 2) == 45 &&
+        this.input.charCodeAt(this.pos + 3) == 45) {
+      if (this.inModule) this.unexpected()
+      // `<!--`, an XML-style comment that should be interpreted as a line comment
+      this.skipLineComment(4)
+      this.skipSpace()
+      return this.nextToken()
+    }
+    if (next === 61) size = 2
+    return this.finishOp(tt.relational, size)
+  }
+
+  pp$7.readToken_eq_excl = function(code) { // '=!'
+    var next = this.input.charCodeAt(this.pos + 1)
+    if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2)
+    if (code === 61 && next === 62 && this.options.ecmaVersion >= 6) { // '=>'
+      this.pos += 2
+      return this.finishToken(tt.arrow)
+    }
+    return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1)
+  }
+
+  pp$7.getTokenFromCode = function(code) {
+    switch (code) {
+      // The interpretation of a dot depends on whether it is followed
+      // by a digit or another two dots.
+    case 46: // '.'
+      return this.readToken_dot()
+
+      // Punctuation tokens.
+    case 40: ++this.pos; return this.finishToken(tt.parenL)
+    case 41: ++this.pos; return this.finishToken(tt.parenR)
+    case 59: ++this.pos; return this.finishToken(tt.semi)
+    case 44: ++this.pos; return this.finishToken(tt.comma)
+    case 91: ++this.pos; return this.finishToken(tt.bracketL)
+    case 93: ++this.pos; return this.finishToken(tt.bracketR)
+    case 123: ++this.pos; return this.finishToken(tt.braceL)
+    case 125: ++this.pos; return this.finishToken(tt.braceR)
+    case 58: ++this.pos; return this.finishToken(tt.colon)
+    case 63: ++this.pos; return this.finishToken(tt.question)
+
+    case 96: // '`'
+      if (this.options.ecmaVersion < 6) break
+      ++this.pos
+      return this.finishToken(tt.backQuote)
+
+    case 48: // '0'
+      var next = this.input.charCodeAt(this.pos + 1)
+      if (next === 120 || next === 88) return this.readRadixNumber(16) // '0x', '0X' - hex number
+      if (this.options.ecmaVersion >= 6) {
+        if (next === 111 || next === 79) return this.readRadixNumber(8) // '0o', '0O' - octal number
+        if (next === 98 || next === 66) return this.readRadixNumber(2) // '0b', '0B' - binary number
+      }
+      // Anything else beginning with a digit is an integer, octal
+      // number, or float.
+    case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+      return this.readNumber(false)
+
+      // Quotes produce strings.
+    case 34: case 39: // '"', "'"
+      return this.readString(code)
+
+      // Operators are parsed inline in tiny state machines. '=' (61) is
+      // often referred to. `finishOp` simply skips the amount of
+      // characters it is given as second argument, and returns a token
+      // of the type given by its first argument.
+
+    case 47: // '/'
+      return this.readToken_slash()
+
+    case 37: case 42: // '%*'
+      return this.readToken_mult_modulo_exp(code)
+
+    case 124: case 38: // '|&'
+      return this.readToken_pipe_amp(code)
+
+    case 94: // '^'
+      return this.readToken_caret()
+
+    case 43: case 45: // '+-'
+      return this.readToken_plus_min(code)
+
+    case 60: case 62: // '<>'
+      return this.readToken_lt_gt(code)
+
+    case 61: case 33: // '=!'
+      return this.readToken_eq_excl(code)
+
+    case 126: // '~'
+      return this.finishOp(tt.prefix, 1)
+    }
+
+    this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'")
+  }
+
+  pp$7.finishOp = function(type, size) {
+    var str = this.input.slice(this.pos, this.pos + size)
+    this.pos += size
+    return this.finishToken(type, str)
+  }
+
+  // Parse a regular expression. Some context-awareness is necessary,
+  // since a '/' inside a '[]' set does not end the expression.
+
+  function tryCreateRegexp(src, flags, throwErrorAt, parser) {
+    try {
+      return new RegExp(src, flags)
+    } catch (e) {
+      if (throwErrorAt !== undefined) {
+        if (e instanceof SyntaxError) parser.raise(throwErrorAt, "Error parsing regular expression: " + e.message)
+        throw e
+      }
+    }
+  }
+
+  var regexpUnicodeSupport = !!tryCreateRegexp("\uffff", "u")
+
+  pp$7.readRegexp = function() {
+    var this$1 = this;
+
+    var escaped, inClass, start = this.pos
+    for (;;) {
+      if (this$1.pos >= this$1.input.length) this$1.raise(start, "Unterminated regular expression")
+      var ch = this$1.input.charAt(this$1.pos)
+      if (lineBreak.test(ch)) this$1.raise(start, "Unterminated regular expression")
+      if (!escaped) {
+        if (ch === "[") inClass = true
+        else if (ch === "]" && inClass) inClass = false
+        else if (ch === "/" && !inClass) break
+        escaped = ch === "\\"
+      } else escaped = false
+      ++this$1.pos
+    }
+    var content = this.input.slice(start, this.pos)
+    ++this.pos
+    // Need to use `readWord1` because '\uXXXX' sequences are allowed
+    // here (don't ask).
+    var mods = this.readWord1()
+    var tmp = content, tmpFlags = ""
+    if (mods) {
+      var validFlags = /^[gim]*$/
+      if (this.options.ecmaVersion >= 6) validFlags = /^[gimuy]*$/
+      if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag")
+      if (mods.indexOf("u") >= 0) {
+        if (regexpUnicodeSupport) {
+          tmpFlags = "u"
+        } else {
+          // Replace each astral symbol and every Unicode escape sequence that
+          // possibly represents an astral symbol or a paired surrogate with a
+          // single ASCII symbol to avoid throwing on regular expressions that
+          // are only valid in combination with the `/u` flag.
+          // Note: replacing with the ASCII symbol `x` might cause false
+          // negatives in unlikely scenarios. For example, `[\u{61}-b]` is a
+          // perfectly valid pattern that is equivalent to `[a-b]`, but it would
+          // be replaced by `[x-b]` which throws an error.
+          tmp = tmp.replace(/\\u\{([0-9a-fA-F]+)\}/g, function (_match, code, offset) {
+            code = Number("0x" + code)
+            if (code > 0x10FFFF) this$1.raise(start + offset + 3, "Code point out of bounds")
+            return "x"
+          })
+          tmp = tmp.replace(/\\u([a-fA-F0-9]{4})|[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "x")
+          tmpFlags = tmpFlags.replace("u", "")
+        }
+      }
+    }
+    // Detect invalid regular expressions.
+    var value = null
+    // Rhino's regular expression parser is flaky and throws uncatchable exceptions,
+    // so don't do detection if we are running under Rhino
+    if (!isRhino) {
+      tryCreateRegexp(tmp, tmpFlags, start, this)
+      // Get a regular expression object for this pattern-flag pair, or `null` in
+      // case the current environment doesn't support the flags it uses.
+      value = tryCreateRegexp(content, mods)
+    }
+    return this.finishToken(tt.regexp, {pattern: content, flags: mods, value: value})
+  }
+
+  // Read an integer in the given radix. Return null if zero digits
+  // were read, the integer value otherwise. When `len` is given, this
+  // will return `null` unless the integer has exactly `len` digits.
+
+  pp$7.readInt = function(radix, len) {
+    var this$1 = this;
+
+    var start = this.pos, total = 0
+    for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+      var code = this$1.input.charCodeAt(this$1.pos), val
+      if (code >= 97) val = code - 97 + 10 // a
+      else if (code >= 65) val = code - 65 + 10 // A
+      else if (code >= 48 && code <= 57) val = code - 48 // 0-9
+      else val = Infinity
+      if (val >= radix) break
+      ++this$1.pos
+      total = total * radix + val
+    }
+    if (this.pos === start || len != null && this.pos - start !== len) return null
+
+    return total
+  }
+
+  pp$7.readRadixNumber = function(radix) {
+    this.pos += 2 // 0x
+    var val = this.readInt(radix)
+    if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix)
+    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+    return this.finishToken(tt.num, val)
+  }
+
+  // Read an integer, octal integer, or floating-point number.
+
+  pp$7.readNumber = function(startsWithDot) {
+    var start = this.pos, isFloat = false, octal = this.input.charCodeAt(this.pos) === 48
+    if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number")
+    if (octal && this.pos == start + 1) octal = false
+    var next = this.input.charCodeAt(this.pos)
+    if (next === 46 && !octal) { // '.'
+      ++this.pos
+      this.readInt(10)
+      isFloat = true
+      next = this.input.charCodeAt(this.pos)
+    }
+    if ((next === 69 || next === 101) && !octal) { // 'eE'
+      next = this.input.charCodeAt(++this.pos)
+      if (next === 43 || next === 45) ++this.pos // '+-'
+      if (this.readInt(10) === null) this.raise(start, "Invalid number")
+      isFloat = true
+    }
+    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+
+    var str = this.input.slice(start, this.pos), val
+    if (isFloat) val = parseFloat(str)
+    else if (!octal || str.length === 1) val = parseInt(str, 10)
+    else if (/[89]/.test(str) || this.strict) this.raise(start, "Invalid number")
+    else val = parseInt(str, 8)
+    return this.finishToken(tt.num, val)
+  }
+
+  // Read a string value, interpreting backslash-escapes.
+
+  pp$7.readCodePoint = function() {
+    var ch = this.input.charCodeAt(this.pos), code
+
+    if (ch === 123) {
+      if (this.options.ecmaVersion < 6) this.unexpected()
+      var codePos = ++this.pos
+      code = this.readHexChar(this.input.indexOf('}', this.pos) - this.pos)
+      ++this.pos
+      if (code > 0x10FFFF) this.raise(codePos, "Code point out of bounds")
+    } else {
+      code = this.readHexChar(4)
+    }
+    return code
+  }
+
+  function codePointToString(code) {
+    // UTF-16 Decoding
+    if (code <= 0xFFFF) return String.fromCharCode(code)
+    code -= 0x10000
+    return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00)
+  }
+
+  pp$7.readString = function(quote) {
+    var this$1 = this;
+
+    var out = "", chunkStart = ++this.pos
+    for (;;) {
+      if (this$1.pos >= this$1.input.length) this$1.raise(this$1.start, "Unterminated string constant")
+      var ch = this$1.input.charCodeAt(this$1.pos)
+      if (ch === quote) break
+      if (ch === 92) { // '\'
+        out += this$1.input.slice(chunkStart, this$1.pos)
+        out += this$1.readEscapedChar(false)
+        chunkStart = this$1.pos
+      } else {
+        if (isNewLine(ch)) this$1.raise(this$1.start, "Unterminated string constant")
+        ++this$1.pos
+      }
+    }
+    out += this.input.slice(chunkStart, this.pos++)
+    return this.finishToken(tt.string, out)
+  }
+
+  // Reads template string tokens.
+
+  pp$7.readTmplToken = function() {
+    var this$1 = this;
+
+    var out = "", chunkStart = this.pos
+    for (;;) {
+      if (this$1.pos >= this$1.input.length) this$1.raise(this$1.start, "Unterminated template")
+      var ch = this$1.input.charCodeAt(this$1.pos)
+      if (ch === 96 || ch === 36 && this$1.input.charCodeAt(this$1.pos + 1) === 123) { // '`', '${'
+        if (this$1.pos === this$1.start && this$1.type === tt.template) {
+          if (ch === 36) {
+            this$1.pos += 2
+            return this$1.finishToken(tt.dollarBraceL)
+          } else {
+            ++this$1.pos
+            return this$1.finishToken(tt.backQuote)
+          }
+        }
+        out += this$1.input.slice(chunkStart, this$1.pos)
+        return this$1.finishToken(tt.template, out)
+      }
+      if (ch === 92) { // '\'
+        out += this$1.input.slice(chunkStart, this$1.pos)
+        out += this$1.readEscapedChar(true)
+        chunkStart = this$1.pos
+      } else if (isNewLine(ch)) {
+        out += this$1.input.slice(chunkStart, this$1.pos)
+        ++this$1.pos
+        switch (ch) {
+          case 13:
+            if (this$1.input.charCodeAt(this$1.pos) === 10) ++this$1.pos
+          case 10:
+            out += "\n"
+            break
+          default:
+            out += String.fromCharCode(ch)
+            break
+        }
+        if (this$1.options.locations) {
+          ++this$1.curLine
+          this$1.lineStart = this$1.pos
+        }
+        chunkStart = this$1.pos
+      } else {
+        ++this$1.pos
+      }
+    }
+  }
+
+  // Used to read escaped characters
+
+  pp$7.readEscapedChar = function(inTemplate) {
+    var ch = this.input.charCodeAt(++this.pos)
+    ++this.pos
+    switch (ch) {
+    case 110: return "\n" // 'n' -> '\n'
+    case 114: return "\r" // 'r' -> '\r'
+    case 120: return String.fromCharCode(this.readHexChar(2)) // 'x'
+    case 117: return codePointToString(this.readCodePoint()) // 'u'
+    case 116: return "\t" // 't' -> '\t'
+    case 98: return "\b" // 'b' -> '\b'
+    case 118: return "\u000b" // 'v' -> '\u000b'
+    case 102: return "\f" // 'f' -> '\f'
+    case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos // '\r\n'
+    case 10: // ' \n'
+      if (this.options.locations) { this.lineStart = this.pos; ++this.curLine }
+      return ""
+    default:
+      if (ch >= 48 && ch <= 55) {
+        var octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0]
+        var octal = parseInt(octalStr, 8)
+        if (octal > 255) {
+          octalStr = octalStr.slice(0, -1)
+          octal = parseInt(octalStr, 8)
+        }
+        if (octalStr !== "0" && (this.strict || inTemplate)) {
+          this.raise(this.pos - 2, "Octal literal in strict mode")
+        }
+        this.pos += octalStr.length - 1
+        return String.fromCharCode(octal)
+      }
+      return String.fromCharCode(ch)
+    }
+  }
+
+  // Used to read character escape sequences ('\x', '\u', '\U').
+
+  pp$7.readHexChar = function(len) {
+    var codePos = this.pos
+    var n = this.readInt(16, len)
+    if (n === null) this.raise(codePos, "Bad character escape sequence")
+    return n
+  }
+
+  // Read an identifier, and return it as a string. Sets `this.containsEsc`
+  // to whether the word contained a '\u' escape.
+  //
+  // Incrementally adds only escaped chars, adding other chunks as-is
+  // as a micro-optimization.
+
+  pp$7.readWord1 = function() {
+    var this$1 = this;
+
+    this.containsEsc = false
+    var word = "", first = true, chunkStart = this.pos
+    var astral = this.options.ecmaVersion >= 6
+    while (this.pos < this.input.length) {
+      var ch = this$1.fullCharCodeAtPos()
+      if (isIdentifierChar(ch, astral)) {
+        this$1.pos += ch <= 0xffff ? 1 : 2
+      } else if (ch === 92) { // "\"
+        this$1.containsEsc = true
+        word += this$1.input.slice(chunkStart, this$1.pos)
+        var escStart = this$1.pos
+        if (this$1.input.charCodeAt(++this$1.pos) != 117) // "u"
+          this$1.raise(this$1.pos, "Expecting Unicode escape sequence \\uXXXX")
+        ++this$1.pos
+        var esc = this$1.readCodePoint()
+        if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral))
+          this$1.raise(escStart, "Invalid Unicode escape")
+        word += codePointToString(esc)
+        chunkStart = this$1.pos
+      } else {
+        break
+      }
+      first = false
+    }
+    return word + this.input.slice(chunkStart, this.pos)
+  }
+
+  // Read an identifier or keyword token. Will check for reserved
+  // words when necessary.
+
+  pp$7.readWord = function() {
+    var word = this.readWord1()
+    var type = tt.name
+    if ((this.options.ecmaVersion >= 6 || !this.containsEsc) && this.keywords.test(word))
+      type = keywordTypes[word]
+    return this.finishToken(type, word)
+  }
+
+  var version = "4.0.3"
+
+  // The main exported interface (under `self.acorn` when in the
+  // browser) is a `parse` function that takes a code string and
+  // returns an abstract syntax tree as specified by [Mozilla parser
+  // API][api].
+  //
+  // [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+
+  function parse(input, options) {
+    return new Parser(options, input).parse()
+  }
+
+  // This function tries to parse a single expression at a given
+  // offset in a string. Useful for parsing mixed-language formats
+  // that embed JavaScript expressions.
+
+  function parseExpressionAt(input, pos, options) {
+    var p = new Parser(options, input, pos)
+    p.nextToken()
+    return p.parseExpression()
+  }
+
+  // Acorn is organized as a tokenizer and a recursive-descent parser.
+  // The `tokenizer` export provides an interface to the tokenizer.
+
+  function tokenizer(input, options) {
+    return new Parser(options, input)
+  }
+
+  // This is a terrible kludge to support the existing, pre-ES6
+  // interface where the loose parser module retroactively adds exports
+  // to this module.
+  function addLooseExports(parse, Parser, plugins) {
+    exports.parse_dammit = parse
+    exports.LooseParser = Parser
+    exports.pluginsLoose = plugins
+  }
+
+  exports.version = version;
+  exports.parse = parse;
+  exports.parseExpressionAt = parseExpressionAt;
+  exports.tokenizer = tokenizer;
+  exports.addLooseExports = addLooseExports;
+  exports.Parser = Parser;
+  exports.plugins = plugins;
+  exports.defaultOptions = defaultOptions;
+  exports.Position = Position;
+  exports.SourceLocation = SourceLocation;
+  exports.getLineInfo = getLineInfo;
+  exports.Node = Node;
+  exports.TokenType = TokenType;
+  exports.tokTypes = tt;
+  exports.TokContext = TokContext;
+  exports.tokContexts = types;
+  exports.isIdentifierChar = isIdentifierChar;
+  exports.isIdentifierStart = isIdentifierStart;
+  exports.Token = Token;
+  exports.isNewLine = isNewLine;
+  exports.lineBreak = lineBreak;
+  exports.lineBreakG = lineBreakG;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.es.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.es.js
new file mode 100644
index 0000000000..a6b4940309
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.es.js
@@ -0,0 +1,1329 @@
+import { defaultOptions, addLooseExports, SourceLocation, tokTypes, tokenizer, Node, lineBreak, isNewLine, getLineInfo, Token, lineBreakG } from './acorn.js';
+
+// Registered plugins
+var pluginsLoose = {}
+
+var LooseParser = function LooseParser(input, options) {
+  if ( options === void 0 ) options = {};
+
+  this.toks = tokenizer(input, options)
+  this.options = this.toks.options
+  this.input = this.toks.input
+  this.tok = this.last = {type: tokTypes.eof, start: 0, end: 0}
+  if (this.options.locations) {
+    var here = this.toks.curPosition()
+    this.tok.loc = new SourceLocation(this.toks, here, here)
+  }
+  this.ahead = [] // Tokens ahead
+  this.context = [] // Indentation contexted
+  this.curIndent = 0
+  this.curLineStart = 0
+  this.nextLineStart = this.lineEnd(this.curLineStart) + 1
+  this.inAsync = false
+  // Load plugins
+  this.options.pluginsLoose = options.pluginsLoose || {}
+  this.loadPlugins(this.options.pluginsLoose)
+};
+
+LooseParser.prototype.startNode = function startNode () {
+  return new Node(this.toks, this.tok.start, this.options.locations ? this.tok.loc.start : null)
+};
+
+LooseParser.prototype.storeCurrentPos = function storeCurrentPos () {
+  return this.options.locations ? [this.tok.start, this.tok.loc.start] : this.tok.start
+};
+
+LooseParser.prototype.startNodeAt = function startNodeAt (pos) {
+  if (this.options.locations) {
+    return new Node(this.toks, pos[0], pos[1])
+  } else {
+    return new Node(this.toks, pos)
+  }
+};
+
+LooseParser.prototype.finishNode = function finishNode (node, type) {
+  node.type = type
+  node.end = this.last.end
+  if (this.options.locations)
+    node.loc.end = this.last.loc.end
+  if (this.options.ranges)
+    node.range[1] = this.last.end
+  return node
+};
+
+LooseParser.prototype.dummyNode = function dummyNode (type) {
+  var dummy = this.startNode()
+  dummy.type = type
+  dummy.end = dummy.start
+  if (this.options.locations)
+    dummy.loc.end = dummy.loc.start
+  if (this.options.ranges)
+    dummy.range[1] = dummy.start
+  this.last = {type: tokTypes.name, start: dummy.start, end: dummy.start, loc: dummy.loc}
+  return dummy
+};
+
+LooseParser.prototype.dummyIdent = function dummyIdent () {
+  var dummy = this.dummyNode("Identifier")
+  dummy.name = "✖"
+  return dummy
+};
+
+LooseParser.prototype.dummyString = function dummyString () {
+  var dummy = this.dummyNode("Literal")
+  dummy.value = dummy.raw = "✖"
+  return dummy
+};
+
+LooseParser.prototype.eat = function eat (type) {
+  if (this.tok.type === type) {
+    this.next()
+    return true
+  } else {
+    return false
+  }
+};
+
+LooseParser.prototype.isContextual = function isContextual (name) {
+  return this.tok.type === tokTypes.name && this.tok.value === name
+};
+
+LooseParser.prototype.eatContextual = function eatContextual (name) {
+  return this.tok.value === name && this.eat(tokTypes.name)
+};
+
+LooseParser.prototype.canInsertSemicolon = function canInsertSemicolon () {
+  return this.tok.type === tokTypes.eof || this.tok.type === tokTypes.braceR ||
+    lineBreak.test(this.input.slice(this.last.end, this.tok.start))
+};
+
+LooseParser.prototype.semicolon = function semicolon () {
+  return this.eat(tokTypes.semi)
+};
+
+LooseParser.prototype.expect = function expect (type) {
+    var this$1 = this;
+
+  if (this.eat(type)) return true
+  for (var i = 1; i <= 2; i++) {
+    if (this$1.lookAhead(i).type == type) {
+      for (var j = 0; j < i; j++) this$1.next()
+      return true
+    }
+  }
+};
+
+LooseParser.prototype.pushCx = function pushCx () {
+  this.context.push(this.curIndent)
+};
+
+LooseParser.prototype.popCx = function popCx () {
+  this.curIndent = this.context.pop()
+};
+
+LooseParser.prototype.lineEnd = function lineEnd (pos) {
+  while (pos < this.input.length && !isNewLine(this.input.charCodeAt(pos))) ++pos
+  return pos
+};
+
+LooseParser.prototype.indentationAfter = function indentationAfter (pos) {
+    var this$1 = this;
+
+  for (var count = 0;; ++pos) {
+    var ch = this$1.input.charCodeAt(pos)
+    if (ch === 32) ++count
+    else if (ch === 9) count += this$1.options.tabSize
+    else return count
+  }
+};
+
+LooseParser.prototype.closes = function closes (closeTok, indent, line, blockHeuristic) {
+  if (this.tok.type === closeTok || this.tok.type === tokTypes.eof) return true
+  return line != this.curLineStart && this.curIndent < indent && this.tokenStartsLine() &&
+    (!blockHeuristic || this.nextLineStart >= this.input.length ||
+     this.indentationAfter(this.nextLineStart) < indent)
+};
+
+LooseParser.prototype.tokenStartsLine = function tokenStartsLine () {
+    var this$1 = this;
+
+  for (var p = this.tok.start - 1; p >= this.curLineStart; --p) {
+    var ch = this$1.input.charCodeAt(p)
+    if (ch !== 9 && ch !== 32) return false
+  }
+  return true
+};
+
+LooseParser.prototype.extend = function extend (name, f) {
+  this[name] = f(this[name])
+};
+
+LooseParser.prototype.loadPlugins = function loadPlugins (pluginConfigs) {
+    var this$1 = this;
+
+  for (var name in pluginConfigs) {
+    var plugin = pluginsLoose[name]
+    if (!plugin) throw new Error("Plugin '" + name + "' not found")
+    plugin(this$1, pluginConfigs[name])
+  }
+};
+
+var lp = LooseParser.prototype
+
+function isSpace(ch) {
+  return (ch < 14 && ch > 8) || ch === 32 || ch === 160 || isNewLine(ch)
+}
+
+lp.next = function() {
+  var this$1 = this;
+
+  this.last = this.tok
+  if (this.ahead.length)
+    this.tok = this.ahead.shift()
+  else
+    this.tok = this.readToken()
+
+  if (this.tok.start >= this.nextLineStart) {
+    while (this.tok.start >= this.nextLineStart) {
+      this$1.curLineStart = this$1.nextLineStart
+      this$1.nextLineStart = this$1.lineEnd(this$1.curLineStart) + 1
+    }
+    this.curIndent = this.indentationAfter(this.curLineStart)
+  }
+}
+
+lp.readToken = function() {
+  var this$1 = this;
+
+  for (;;) {
+    try {
+      this$1.toks.next()
+      if (this$1.toks.type === tokTypes.dot &&
+          this$1.input.substr(this$1.toks.end, 1) === "." &&
+          this$1.options.ecmaVersion >= 6) {
+        this$1.toks.end++
+        this$1.toks.type = tokTypes.ellipsis
+      }
+      return new Token(this$1.toks)
+    } catch(e) {
+      if (!(e instanceof SyntaxError)) throw e
+
+      // Try to skip some text, based on the error message, and then continue
+      var msg = e.message, pos = e.raisedAt, replace = true
+      if (/unterminated/i.test(msg)) {
+        pos = this$1.lineEnd(e.pos + 1)
+        if (/string/.test(msg)) {
+          replace = {start: e.pos, end: pos, type: tokTypes.string, value: this$1.input.slice(e.pos + 1, pos)}
+        } else if (/regular expr/i.test(msg)) {
+          var re = this$1.input.slice(e.pos, pos)
+          try { re = new RegExp(re) } catch(e) {}
+          replace = {start: e.pos, end: pos, type: tokTypes.regexp, value: re}
+        } else if (/template/.test(msg)) {
+          replace = {start: e.pos, end: pos,
+                     type: tokTypes.template,
+                     value: this$1.input.slice(e.pos, pos)}
+        } else {
+          replace = false
+        }
+      } else if (/invalid (unicode|regexp|number)|expecting unicode|octal literal|is reserved|directly after number|expected number in radix/i.test(msg)) {
+        while (pos < this.input.length && !isSpace(this.input.charCodeAt(pos))) ++pos
+      } else if (/character escape|expected hexadecimal/i.test(msg)) {
+        while (pos < this.input.length) {
+          var ch = this$1.input.charCodeAt(pos++)
+          if (ch === 34 || ch === 39 || isNewLine(ch)) break
+        }
+      } else if (/unexpected character/i.test(msg)) {
+        pos++
+        replace = false
+      } else if (/regular expression/i.test(msg)) {
+        replace = true
+      } else {
+        throw e
+      }
+      this$1.resetTo(pos)
+      if (replace === true) replace = {start: pos, end: pos, type: tokTypes.name, value: "✖"}
+      if (replace) {
+        if (this$1.options.locations)
+          replace.loc = new SourceLocation(
+            this$1.toks,
+            getLineInfo(this$1.input, replace.start),
+            getLineInfo(this$1.input, replace.end))
+        return replace
+      }
+    }
+  }
+}
+
+lp.resetTo = function(pos) {
+  var this$1 = this;
+
+  this.toks.pos = pos
+  var ch = this.input.charAt(pos - 1)
+  this.toks.exprAllowed = !ch || /[\[\{\(,;:?\/*=+\-~!|&%^<>]/.test(ch) ||
+    /[enwfd]/.test(ch) &&
+    /\b(keywords|case|else|return|throw|new|in|(instance|type)of|delete|void)$/.test(this.input.slice(pos - 10, pos))
+
+  if (this.options.locations) {
+    this.toks.curLine = 1
+    this.toks.lineStart = lineBreakG.lastIndex = 0
+    var match
+    while ((match = lineBreakG.exec(this.input)) && match.index < pos) {
+      ++this$1.toks.curLine
+      this$1.toks.lineStart = match.index + match[0].length
+    }
+  }
+}
+
+lp.lookAhead = function(n) {
+  var this$1 = this;
+
+  while (n > this.ahead.length)
+    this$1.ahead.push(this$1.readToken())
+  return this.ahead[n - 1]
+}
+
+function isDummy(node) { return node.name == "✖" }
+
+var lp$1 = LooseParser.prototype
+
+lp$1.parseTopLevel = function() {
+  var this$1 = this;
+
+  var node = this.startNodeAt(this.options.locations ? [0, getLineInfo(this.input, 0)] : 0)
+  node.body = []
+  while (this.tok.type !== tokTypes.eof) node.body.push(this$1.parseStatement())
+  this.last = this.tok
+  if (this.options.ecmaVersion >= 6) {
+    node.sourceType = this.options.sourceType
+  }
+  return this.finishNode(node, "Program")
+}
+
+lp$1.parseStatement = function() {
+  var this$1 = this;
+
+  var starttype = this.tok.type, node = this.startNode(), kind
+
+  if (this.toks.isLet()) {
+    starttype = tokTypes._var
+    kind = "let"
+  }
+
+  switch (starttype) {
+  case tokTypes._break: case tokTypes._continue:
+    this.next()
+    var isBreak = starttype === tokTypes._break
+    if (this.semicolon() || this.canInsertSemicolon()) {
+      node.label = null
+    } else {
+      node.label = this.tok.type === tokTypes.name ? this.parseIdent() : null
+      this.semicolon()
+    }
+    return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+
+  case tokTypes._debugger:
+    this.next()
+    this.semicolon()
+    return this.finishNode(node, "DebuggerStatement")
+
+  case tokTypes._do:
+    this.next()
+    node.body = this.parseStatement()
+    node.test = this.eat(tokTypes._while) ? this.parseParenExpression() : this.dummyIdent()
+    this.semicolon()
+    return this.finishNode(node, "DoWhileStatement")
+
+  case tokTypes._for:
+    this.next()
+    this.pushCx()
+    this.expect(tokTypes.parenL)
+    if (this.tok.type === tokTypes.semi) return this.parseFor(node, null)
+    var isLet = this.toks.isLet()
+    if (isLet || this.tok.type === tokTypes._var || this.tok.type === tokTypes._const) {
+      var init$1 = this.parseVar(true, isLet ? "let" : this.tok.value)
+      if (init$1.declarations.length === 1 && (this.tok.type === tokTypes._in || this.isContextual("of"))) {
+        return this.parseForIn(node, init$1)
+      }
+      return this.parseFor(node, init$1)
+    }
+    var init = this.parseExpression(true)
+    if (this.tok.type === tokTypes._in || this.isContextual("of"))
+      return this.parseForIn(node, this.toAssignable(init))
+    return this.parseFor(node, init)
+
+  case tokTypes._function:
+    this.next()
+    return this.parseFunction(node, true)
+
+  case tokTypes._if:
+    this.next()
+    node.test = this.parseParenExpression()
+    node.consequent = this.parseStatement()
+    node.alternate = this.eat(tokTypes._else) ? this.parseStatement() : null
+    return this.finishNode(node, "IfStatement")
+
+  case tokTypes._return:
+    this.next()
+    if (this.eat(tokTypes.semi) || this.canInsertSemicolon()) node.argument = null
+    else { node.argument = this.parseExpression(); this.semicolon() }
+    return this.finishNode(node, "ReturnStatement")
+
+  case tokTypes._switch:
+    var blockIndent = this.curIndent, line = this.curLineStart
+    this.next()
+    node.discriminant = this.parseParenExpression()
+    node.cases = []
+    this.pushCx()
+    this.expect(tokTypes.braceL)
+
+    var cur
+    while (!this.closes(tokTypes.braceR, blockIndent, line, true)) {
+      if (this$1.tok.type === tokTypes._case || this$1.tok.type === tokTypes._default) {
+        var isCase = this$1.tok.type === tokTypes._case
+        if (cur) this$1.finishNode(cur, "SwitchCase")
+        node.cases.push(cur = this$1.startNode())
+        cur.consequent = []
+        this$1.next()
+        if (isCase) cur.test = this$1.parseExpression()
+        else cur.test = null
+        this$1.expect(tokTypes.colon)
+      } else {
+        if (!cur) {
+          node.cases.push(cur = this$1.startNode())
+          cur.consequent = []
+          cur.test = null
+        }
+        cur.consequent.push(this$1.parseStatement())
+      }
+    }
+    if (cur) this.finishNode(cur, "SwitchCase")
+    this.popCx()
+    this.eat(tokTypes.braceR)
+    return this.finishNode(node, "SwitchStatement")
+
+  case tokTypes._throw:
+    this.next()
+    node.argument = this.parseExpression()
+    this.semicolon()
+    return this.finishNode(node, "ThrowStatement")
+
+  case tokTypes._try:
+    this.next()
+    node.block = this.parseBlock()
+    node.handler = null
+    if (this.tok.type === tokTypes._catch) {
+      var clause = this.startNode()
+      this.next()
+      this.expect(tokTypes.parenL)
+      clause.param = this.toAssignable(this.parseExprAtom(), true)
+      this.expect(tokTypes.parenR)
+      clause.body = this.parseBlock()
+      node.handler = this.finishNode(clause, "CatchClause")
+    }
+    node.finalizer = this.eat(tokTypes._finally) ? this.parseBlock() : null
+    if (!node.handler && !node.finalizer) return node.block
+    return this.finishNode(node, "TryStatement")
+
+  case tokTypes._var:
+  case tokTypes._const:
+    return this.parseVar(false, kind || this.tok.value)
+
+  case tokTypes._while:
+    this.next()
+    node.test = this.parseParenExpression()
+    node.body = this.parseStatement()
+    return this.finishNode(node, "WhileStatement")
+
+  case tokTypes._with:
+    this.next()
+    node.object = this.parseParenExpression()
+    node.body = this.parseStatement()
+    return this.finishNode(node, "WithStatement")
+
+  case tokTypes.braceL:
+    return this.parseBlock()
+
+  case tokTypes.semi:
+    this.next()
+    return this.finishNode(node, "EmptyStatement")
+
+  case tokTypes._class:
+    return this.parseClass(true)
+
+  case tokTypes._import:
+    return this.parseImport()
+
+  case tokTypes._export:
+    return this.parseExport()
+
+  default:
+    if (this.toks.isAsyncFunction()) {
+      this.next()
+      this.next()
+      return this.parseFunction(node, true, true)
+    }
+    var expr = this.parseExpression()
+    if (isDummy(expr)) {
+      this.next()
+      if (this.tok.type === tokTypes.eof) return this.finishNode(node, "EmptyStatement")
+      return this.parseStatement()
+    } else if (starttype === tokTypes.name && expr.type === "Identifier" && this.eat(tokTypes.colon)) {
+      node.body = this.parseStatement()
+      node.label = expr
+      return this.finishNode(node, "LabeledStatement")
+    } else {
+      node.expression = expr
+      this.semicolon()
+      return this.finishNode(node, "ExpressionStatement")
+    }
+  }
+}
+
+lp$1.parseBlock = function() {
+  var this$1 = this;
+
+  var node = this.startNode()
+  this.pushCx()
+  this.expect(tokTypes.braceL)
+  var blockIndent = this.curIndent, line = this.curLineStart
+  node.body = []
+  while (!this.closes(tokTypes.braceR, blockIndent, line, true))
+    node.body.push(this$1.parseStatement())
+  this.popCx()
+  this.eat(tokTypes.braceR)
+  return this.finishNode(node, "BlockStatement")
+}
+
+lp$1.parseFor = function(node, init) {
+  node.init = init
+  node.test = node.update = null
+  if (this.eat(tokTypes.semi) && this.tok.type !== tokTypes.semi) node.test = this.parseExpression()
+  if (this.eat(tokTypes.semi) && this.tok.type !== tokTypes.parenR) node.update = this.parseExpression()
+  this.popCx()
+  this.expect(tokTypes.parenR)
+  node.body = this.parseStatement()
+  return this.finishNode(node, "ForStatement")
+}
+
+lp$1.parseForIn = function(node, init) {
+  var type = this.tok.type === tokTypes._in ? "ForInStatement" : "ForOfStatement"
+  this.next()
+  node.left = init
+  node.right = this.parseExpression()
+  this.popCx()
+  this.expect(tokTypes.parenR)
+  node.body = this.parseStatement()
+  return this.finishNode(node, type)
+}
+
+lp$1.parseVar = function(noIn, kind) {
+  var this$1 = this;
+
+  var node = this.startNode()
+  node.kind = kind
+  this.next()
+  node.declarations = []
+  do {
+    var decl = this$1.startNode()
+    decl.id = this$1.options.ecmaVersion >= 6 ? this$1.toAssignable(this$1.parseExprAtom(), true) : this$1.parseIdent()
+    decl.init = this$1.eat(tokTypes.eq) ? this$1.parseMaybeAssign(noIn) : null
+    node.declarations.push(this$1.finishNode(decl, "VariableDeclarator"))
+  } while (this.eat(tokTypes.comma))
+  if (!node.declarations.length) {
+    var decl$1 = this.startNode()
+    decl$1.id = this.dummyIdent()
+    node.declarations.push(this.finishNode(decl$1, "VariableDeclarator"))
+  }
+  if (!noIn) this.semicolon()
+  return this.finishNode(node, "VariableDeclaration")
+}
+
+lp$1.parseClass = function(isStatement) {
+  var this$1 = this;
+
+  var node = this.startNode()
+  this.next()
+  if (this.tok.type === tokTypes.name) node.id = this.parseIdent()
+  else if (isStatement) node.id = this.dummyIdent()
+  else node.id = null
+  node.superClass = this.eat(tokTypes._extends) ? this.parseExpression() : null
+  node.body = this.startNode()
+  node.body.body = []
+  this.pushCx()
+  var indent = this.curIndent + 1, line = this.curLineStart
+  this.eat(tokTypes.braceL)
+  if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+  while (!this.closes(tokTypes.braceR, indent, line)) {
+    if (this$1.semicolon()) continue
+    var method = this$1.startNode(), isGenerator, isAsync
+    if (this$1.options.ecmaVersion >= 6) {
+      method.static = false
+      isGenerator = this$1.eat(tokTypes.star)
+    }
+    this$1.parsePropertyName(method)
+    if (isDummy(method.key)) { if (isDummy(this$1.parseMaybeAssign())) this$1.next(); this$1.eat(tokTypes.comma); continue }
+    if (method.key.type === "Identifier" && !method.computed && method.key.name === "static" &&
+        (this$1.tok.type != tokTypes.parenL && this$1.tok.type != tokTypes.braceL)) {
+      method.static = true
+      isGenerator = this$1.eat(tokTypes.star)
+      this$1.parsePropertyName(method)
+    } else {
+      method.static = false
+    }
+    if (!method.computed &&
+        method.key.type === "Identifier" && method.key.name === "async" && this$1.tok.type !== tokTypes.parenL &&
+        !this$1.canInsertSemicolon()) {
+      this$1.parsePropertyName(method)
+      isAsync = true
+    } else {
+      isAsync = false
+    }
+    if (this$1.options.ecmaVersion >= 5 && method.key.type === "Identifier" &&
+        !method.computed && (method.key.name === "get" || method.key.name === "set") &&
+        this$1.tok.type !== tokTypes.parenL && this$1.tok.type !== tokTypes.braceL) {
+      method.kind = method.key.name
+      this$1.parsePropertyName(method)
+      method.value = this$1.parseMethod(false)
+    } else {
+      if (!method.computed && !method.static && !isGenerator && !isAsync && (
+        method.key.type === "Identifier" && method.key.name === "constructor" ||
+          method.key.type === "Literal" && method.key.value === "constructor")) {
+        method.kind = "constructor"
+      } else {
+        method.kind =  "method"
+      }
+      method.value = this$1.parseMethod(isGenerator, isAsync)
+    }
+    node.body.body.push(this$1.finishNode(method, "MethodDefinition"))
+  }
+  this.popCx()
+  if (!this.eat(tokTypes.braceR)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  this.semicolon()
+  this.finishNode(node.body, "ClassBody")
+  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+}
+
+lp$1.parseFunction = function(node, isStatement, isAsync) {
+  var oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = this.eat(tokTypes.star)
+  }
+  if (this.options.ecmaVersion >= 8) {
+    node.async = !!isAsync
+  }
+  if (this.tok.type === tokTypes.name) node.id = this.parseIdent()
+  else if (isStatement) node.id = this.dummyIdent()
+  this.inAsync = node.async
+  node.params = this.parseFunctionParams()
+  node.body = this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+}
+
+lp$1.parseExport = function() {
+  var node = this.startNode()
+  this.next()
+  if (this.eat(tokTypes.star)) {
+    node.source = this.eatContextual("from") ? this.parseExprAtom() : this.dummyString()
+    return this.finishNode(node, "ExportAllDeclaration")
+  }
+  if (this.eat(tokTypes._default)) {
+    // export default (function foo() {}) // This is FunctionExpression.
+    var isParenL = this.tok.type === tokTypes.parenL
+    var expr = this.parseMaybeAssign()
+    if (!isParenL && expr.id) {
+      switch (expr.type) {
+      case "FunctionExpression": expr.type = "FunctionDeclaration"; break
+      case "ClassExpression": expr.type = "ClassDeclaration"; break
+      }
+    }
+    node.declaration = expr
+    this.semicolon()
+    return this.finishNode(node, "ExportDefaultDeclaration")
+  }
+  if (this.tok.type.keyword || this.toks.isLet() || this.toks.isAsyncFunction()) {
+    node.declaration = this.parseStatement()
+    node.specifiers = []
+    node.source = null
+  } else {
+    node.declaration = null
+    node.specifiers = this.parseExportSpecifierList()
+    node.source = this.eatContextual("from") ? this.parseExprAtom() : null
+    this.semicolon()
+  }
+  return this.finishNode(node, "ExportNamedDeclaration")
+}
+
+lp$1.parseImport = function() {
+  var node = this.startNode()
+  this.next()
+  if (this.tok.type === tokTypes.string) {
+    node.specifiers = []
+    node.source = this.parseExprAtom()
+    node.kind = ''
+  } else {
+    var elt
+    if (this.tok.type === tokTypes.name && this.tok.value !== "from") {
+      elt = this.startNode()
+      elt.local = this.parseIdent()
+      this.finishNode(elt, "ImportDefaultSpecifier")
+      this.eat(tokTypes.comma)
+    }
+    node.specifiers = this.parseImportSpecifierList()
+    node.source = this.eatContextual("from") && this.tok.type == tokTypes.string ? this.parseExprAtom() : this.dummyString()
+    if (elt) node.specifiers.unshift(elt)
+  }
+  this.semicolon()
+  return this.finishNode(node, "ImportDeclaration")
+}
+
+lp$1.parseImportSpecifierList = function() {
+  var this$1 = this;
+
+  var elts = []
+  if (this.tok.type === tokTypes.star) {
+    var elt = this.startNode()
+    this.next()
+    elt.local = this.eatContextual("as") ? this.parseIdent() : this.dummyIdent()
+    elts.push(this.finishNode(elt, "ImportNamespaceSpecifier"))
+  } else {
+    var indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+    this.pushCx()
+    this.eat(tokTypes.braceL)
+    if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+    while (!this.closes(tokTypes.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+      var elt$1 = this$1.startNode()
+      if (this$1.eat(tokTypes.star)) {
+        elt$1.local = this$1.eatContextual("as") ? this$1.parseIdent() : this$1.dummyIdent()
+        this$1.finishNode(elt$1, "ImportNamespaceSpecifier")
+      } else {
+        if (this$1.isContextual("from")) break
+        elt$1.imported = this$1.parseIdent()
+        if (isDummy(elt$1.imported)) break
+        elt$1.local = this$1.eatContextual("as") ? this$1.parseIdent() : elt$1.imported
+        this$1.finishNode(elt$1, "ImportSpecifier")
+      }
+      elts.push(elt$1)
+      this$1.eat(tokTypes.comma)
+    }
+    this.eat(tokTypes.braceR)
+    this.popCx()
+  }
+  return elts
+}
+
+lp$1.parseExportSpecifierList = function() {
+  var this$1 = this;
+
+  var elts = []
+  var indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+  this.pushCx()
+  this.eat(tokTypes.braceL)
+  if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+  while (!this.closes(tokTypes.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+    if (this$1.isContextual("from")) break
+    var elt = this$1.startNode()
+    elt.local = this$1.parseIdent()
+    if (isDummy(elt.local)) break
+    elt.exported = this$1.eatContextual("as") ? this$1.parseIdent() : elt.local
+    this$1.finishNode(elt, "ExportSpecifier")
+    elts.push(elt)
+    this$1.eat(tokTypes.comma)
+  }
+  this.eat(tokTypes.braceR)
+  this.popCx()
+  return elts
+}
+
+var lp$2 = LooseParser.prototype
+
+lp$2.checkLVal = function(expr) {
+  if (!expr) return expr
+  switch (expr.type) {
+  case "Identifier":
+  case "MemberExpression":
+    return expr
+
+  case "ParenthesizedExpression":
+    expr.expression = this.checkLVal(expr.expression)
+    return expr
+
+  default:
+    return this.dummyIdent()
+  }
+}
+
+lp$2.parseExpression = function(noIn) {
+  var this$1 = this;
+
+  var start = this.storeCurrentPos()
+  var expr = this.parseMaybeAssign(noIn)
+  if (this.tok.type === tokTypes.comma) {
+    var node = this.startNodeAt(start)
+    node.expressions = [expr]
+    while (this.eat(tokTypes.comma)) node.expressions.push(this$1.parseMaybeAssign(noIn))
+    return this.finishNode(node, "SequenceExpression")
+  }
+  return expr
+}
+
+lp$2.parseParenExpression = function() {
+  this.pushCx()
+  this.expect(tokTypes.parenL)
+  var val = this.parseExpression()
+  this.popCx()
+  this.expect(tokTypes.parenR)
+  return val
+}
+
+lp$2.parseMaybeAssign = function(noIn) {
+  if (this.toks.isContextual("yield")) {
+    var node = this.startNode()
+    this.next()
+    if (this.semicolon() || this.canInsertSemicolon() || (this.tok.type != tokTypes.star && !this.tok.type.startsExpr)) {
+      node.delegate = false
+      node.argument = null
+    } else {
+      node.delegate = this.eat(tokTypes.star)
+      node.argument = this.parseMaybeAssign()
+    }
+    return this.finishNode(node, "YieldExpression")
+  }
+
+  var start = this.storeCurrentPos()
+  var left = this.parseMaybeConditional(noIn)
+  if (this.tok.type.isAssign) {
+    var node$1 = this.startNodeAt(start)
+    node$1.operator = this.tok.value
+    node$1.left = this.tok.type === tokTypes.eq ? this.toAssignable(left) : this.checkLVal(left)
+    this.next()
+    node$1.right = this.parseMaybeAssign(noIn)
+    return this.finishNode(node$1, "AssignmentExpression")
+  }
+  return left
+}
+
+lp$2.parseMaybeConditional = function(noIn) {
+  var start = this.storeCurrentPos()
+  var expr = this.parseExprOps(noIn)
+  if (this.eat(tokTypes.question)) {
+    var node = this.startNodeAt(start)
+    node.test = expr
+    node.consequent = this.parseMaybeAssign()
+    node.alternate = this.expect(tokTypes.colon) ? this.parseMaybeAssign(noIn) : this.dummyIdent()
+    return this.finishNode(node, "ConditionalExpression")
+  }
+  return expr
+}
+
+lp$2.parseExprOps = function(noIn) {
+  var start = this.storeCurrentPos()
+  var indent = this.curIndent, line = this.curLineStart
+  return this.parseExprOp(this.parseMaybeUnary(false), start, -1, noIn, indent, line)
+}
+
+lp$2.parseExprOp = function(left, start, minPrec, noIn, indent, line) {
+  if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) return left
+  var prec = this.tok.type.binop
+  if (prec != null && (!noIn || this.tok.type !== tokTypes._in)) {
+    if (prec > minPrec) {
+      var node = this.startNodeAt(start)
+      node.left = left
+      node.operator = this.tok.value
+      this.next()
+      if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) {
+        node.right = this.dummyIdent()
+      } else {
+        var rightStart = this.storeCurrentPos()
+        node.right = this.parseExprOp(this.parseMaybeUnary(false), rightStart, prec, noIn, indent, line)
+      }
+      this.finishNode(node, /&&|\|\|/.test(node.operator) ? "LogicalExpression" : "BinaryExpression")
+      return this.parseExprOp(node, start, minPrec, noIn, indent, line)
+    }
+  }
+  return left
+}
+
+lp$2.parseMaybeUnary = function(sawUnary) {
+  var this$1 = this;
+
+  var start = this.storeCurrentPos(), expr
+  if (this.options.ecmaVersion >= 8 && this.inAsync && this.toks.isContextual("await")) {
+    expr = this.parseAwait()
+    sawUnary = true
+  } else if (this.tok.type.prefix) {
+    var node = this.startNode(), update = this.tok.type === tokTypes.incDec
+    if (!update) sawUnary = true
+    node.operator = this.tok.value
+    node.prefix = true
+    this.next()
+    node.argument = this.parseMaybeUnary(true)
+    if (update) node.argument = this.checkLVal(node.argument)
+    expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+  } else if (this.tok.type === tokTypes.ellipsis) {
+    var node$1 = this.startNode()
+    this.next()
+    node$1.argument = this.parseMaybeUnary(sawUnary)
+    expr = this.finishNode(node$1, "SpreadElement")
+  } else {
+    expr = this.parseExprSubscripts()
+    while (this.tok.type.postfix && !this.canInsertSemicolon()) {
+      var node$2 = this$1.startNodeAt(start)
+      node$2.operator = this$1.tok.value
+      node$2.prefix = false
+      node$2.argument = this$1.checkLVal(expr)
+      this$1.next()
+      expr = this$1.finishNode(node$2, "UpdateExpression")
+    }
+  }
+
+  if (!sawUnary && this.eat(tokTypes.starstar)) {
+    var node$3 = this.startNodeAt(start)
+    node$3.operator = "**"
+    node$3.left = expr
+    node$3.right = this.parseMaybeUnary(false)
+    return this.finishNode(node$3, "BinaryExpression")
+  }
+
+  return expr
+}
+
+lp$2.parseExprSubscripts = function() {
+  var start = this.storeCurrentPos()
+  return this.parseSubscripts(this.parseExprAtom(), start, false, this.curIndent, this.curLineStart)
+}
+
+lp$2.parseSubscripts = function(base, start, noCalls, startIndent, line) {
+  var this$1 = this;
+
+  for (;;) {
+    if (this$1.curLineStart != line && this$1.curIndent <= startIndent && this$1.tokenStartsLine()) {
+      if (this$1.tok.type == tokTypes.dot && this$1.curIndent == startIndent)
+        --startIndent
+      else
+        return base
+    }
+
+    var maybeAsyncArrow = base.type === "Identifier" && base.name === "async" && !this$1.canInsertSemicolon()
+
+    if (this$1.eat(tokTypes.dot)) {
+      var node = this$1.startNodeAt(start)
+      node.object = base
+      if (this$1.curLineStart != line && this$1.curIndent <= startIndent && this$1.tokenStartsLine())
+        node.property = this$1.dummyIdent()
+      else
+        node.property = this$1.parsePropertyAccessor() || this$1.dummyIdent()
+      node.computed = false
+      base = this$1.finishNode(node, "MemberExpression")
+    } else if (this$1.tok.type == tokTypes.bracketL) {
+      this$1.pushCx()
+      this$1.next()
+      var node$1 = this$1.startNodeAt(start)
+      node$1.object = base
+      node$1.property = this$1.parseExpression()
+      node$1.computed = true
+      this$1.popCx()
+      this$1.expect(tokTypes.bracketR)
+      base = this$1.finishNode(node$1, "MemberExpression")
+    } else if (!noCalls && this$1.tok.type == tokTypes.parenL) {
+      var exprList = this$1.parseExprList(tokTypes.parenR)
+      if (maybeAsyncArrow && this$1.eat(tokTypes.arrow))
+        return this$1.parseArrowExpression(this$1.startNodeAt(start), exprList, true)
+      var node$2 = this$1.startNodeAt(start)
+      node$2.callee = base
+      node$2.arguments = exprList
+      base = this$1.finishNode(node$2, "CallExpression")
+    } else if (this$1.tok.type == tokTypes.backQuote) {
+      var node$3 = this$1.startNodeAt(start)
+      node$3.tag = base
+      node$3.quasi = this$1.parseTemplate()
+      base = this$1.finishNode(node$3, "TaggedTemplateExpression")
+    } else {
+      return base
+    }
+  }
+}
+
+lp$2.parseExprAtom = function() {
+  var node
+  switch (this.tok.type) {
+  case tokTypes._this:
+  case tokTypes._super:
+    var type = this.tok.type === tokTypes._this ? "ThisExpression" : "Super"
+    node = this.startNode()
+    this.next()
+    return this.finishNode(node, type)
+
+  case tokTypes.name:
+    var start = this.storeCurrentPos()
+    var id = this.parseIdent()
+    var isAsync = false
+    if (id.name === "async" && !this.canInsertSemicolon()) {
+      if (this.eat(tokTypes._function))
+        return this.parseFunction(this.startNodeAt(start), false, true)
+      if (this.tok.type === tokTypes.name) {
+        id = this.parseIdent()
+        isAsync = true
+      }
+    }
+    return this.eat(tokTypes.arrow) ? this.parseArrowExpression(this.startNodeAt(start), [id], isAsync) : id
+
+  case tokTypes.regexp:
+    node = this.startNode()
+    var val = this.tok.value
+    node.regex = {pattern: val.pattern, flags: val.flags}
+    node.value = val.value
+    node.raw = this.input.slice(this.tok.start, this.tok.end)
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tokTypes.num: case tokTypes.string:
+    node = this.startNode()
+    node.value = this.tok.value
+    node.raw = this.input.slice(this.tok.start, this.tok.end)
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tokTypes._null: case tokTypes._true: case tokTypes._false:
+    node = this.startNode()
+    node.value = this.tok.type === tokTypes._null ? null : this.tok.type === tokTypes._true
+    node.raw = this.tok.type.keyword
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tokTypes.parenL:
+    var parenStart = this.storeCurrentPos()
+    this.next()
+    var inner = this.parseExpression()
+    this.expect(tokTypes.parenR)
+    if (this.eat(tokTypes.arrow)) {
+      // (a,)=>a // SequenceExpression makes dummy in the last hole. Drop the dummy.
+      var params = inner.expressions || [inner]
+      if (params.length && isDummy(params[params.length - 1]))
+        params.pop()
+      return this.parseArrowExpression(this.startNodeAt(parenStart), params)
+    }
+    if (this.options.preserveParens) {
+      var par = this.startNodeAt(parenStart)
+      par.expression = inner
+      inner = this.finishNode(par, "ParenthesizedExpression")
+    }
+    return inner
+
+  case tokTypes.bracketL:
+    node = this.startNode()
+    node.elements = this.parseExprList(tokTypes.bracketR, true)
+    return this.finishNode(node, "ArrayExpression")
+
+  case tokTypes.braceL:
+    return this.parseObj()
+
+  case tokTypes._class:
+    return this.parseClass()
+
+  case tokTypes._function:
+    node = this.startNode()
+    this.next()
+    return this.parseFunction(node, false)
+
+  case tokTypes._new:
+    return this.parseNew()
+
+  case tokTypes.backQuote:
+    return this.parseTemplate()
+
+  default:
+    return this.dummyIdent()
+  }
+}
+
+lp$2.parseNew = function() {
+  var node = this.startNode(), startIndent = this.curIndent, line = this.curLineStart
+  var meta = this.parseIdent(true)
+  if (this.options.ecmaVersion >= 6 && this.eat(tokTypes.dot)) {
+    node.meta = meta
+    node.property = this.parseIdent(true)
+    return this.finishNode(node, "MetaProperty")
+  }
+  var start = this.storeCurrentPos()
+  node.callee = this.parseSubscripts(this.parseExprAtom(), start, true, startIndent, line)
+  if (this.tok.type == tokTypes.parenL) {
+    node.arguments = this.parseExprList(tokTypes.parenR)
+  } else {
+    node.arguments = []
+  }
+  return this.finishNode(node, "NewExpression")
+}
+
+lp$2.parseTemplateElement = function() {
+  var elem = this.startNode()
+  elem.value = {
+    raw: this.input.slice(this.tok.start, this.tok.end).replace(/\r\n?/g, '\n'),
+    cooked: this.tok.value
+  }
+  this.next()
+  elem.tail = this.tok.type === tokTypes.backQuote
+  return this.finishNode(elem, "TemplateElement")
+}
+
+lp$2.parseTemplate = function() {
+  var this$1 = this;
+
+  var node = this.startNode()
+  this.next()
+  node.expressions = []
+  var curElt = this.parseTemplateElement()
+  node.quasis = [curElt]
+  while (!curElt.tail) {
+    this$1.next()
+    node.expressions.push(this$1.parseExpression())
+    if (this$1.expect(tokTypes.braceR)) {
+      curElt = this$1.parseTemplateElement()
+    } else {
+      curElt = this$1.startNode()
+      curElt.value = {cooked: '', raw: ''}
+      curElt.tail = true
+      this$1.finishNode(curElt, "TemplateElement")
+    }
+    node.quasis.push(curElt)
+  }
+  this.expect(tokTypes.backQuote)
+  return this.finishNode(node, "TemplateLiteral")
+}
+
+lp$2.parseObj = function() {
+  var this$1 = this;
+
+  var node = this.startNode()
+  node.properties = []
+  this.pushCx()
+  var indent = this.curIndent + 1, line = this.curLineStart
+  this.eat(tokTypes.braceL)
+  if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+  while (!this.closes(tokTypes.braceR, indent, line)) {
+    var prop = this$1.startNode(), isGenerator, isAsync, start
+    if (this$1.options.ecmaVersion >= 6) {
+      start = this$1.storeCurrentPos()
+      prop.method = false
+      prop.shorthand = false
+      isGenerator = this$1.eat(tokTypes.star)
+    }
+    this$1.parsePropertyName(prop)
+    if (!prop.computed &&
+        prop.key.type === "Identifier" && prop.key.name === "async" && this$1.tok.type !== tokTypes.parenL &&
+        this$1.tok.type !== tokTypes.colon && !this$1.canInsertSemicolon()) {
+      this$1.parsePropertyName(prop)
+      isAsync = true
+    } else {
+      isAsync = false
+    }
+    if (isDummy(prop.key)) { if (isDummy(this$1.parseMaybeAssign())) this$1.next(); this$1.eat(tokTypes.comma); continue }
+    if (this$1.eat(tokTypes.colon)) {
+      prop.kind = "init"
+      prop.value = this$1.parseMaybeAssign()
+    } else if (this$1.options.ecmaVersion >= 6 && (this$1.tok.type === tokTypes.parenL || this$1.tok.type === tokTypes.braceL)) {
+      prop.kind = "init"
+      prop.method = true
+      prop.value = this$1.parseMethod(isGenerator, isAsync)
+    } else if (this$1.options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
+               !prop.computed && (prop.key.name === "get" || prop.key.name === "set") &&
+               (this$1.tok.type != tokTypes.comma && this$1.tok.type != tokTypes.braceR)) {
+      prop.kind = prop.key.name
+      this$1.parsePropertyName(prop)
+      prop.value = this$1.parseMethod(false)
+    } else {
+      prop.kind = "init"
+      if (this$1.options.ecmaVersion >= 6) {
+        if (this$1.eat(tokTypes.eq)) {
+          var assign = this$1.startNodeAt(start)
+          assign.operator = "="
+          assign.left = prop.key
+          assign.right = this$1.parseMaybeAssign()
+          prop.value = this$1.finishNode(assign, "AssignmentExpression")
+        } else {
+          prop.value = prop.key
+        }
+      } else {
+        prop.value = this$1.dummyIdent()
+      }
+      prop.shorthand = true
+    }
+    node.properties.push(this$1.finishNode(prop, "Property"))
+    this$1.eat(tokTypes.comma)
+  }
+  this.popCx()
+  if (!this.eat(tokTypes.braceR)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  return this.finishNode(node, "ObjectExpression")
+}
+
+lp$2.parsePropertyName = function(prop) {
+  if (this.options.ecmaVersion >= 6) {
+    if (this.eat(tokTypes.bracketL)) {
+      prop.computed = true
+      prop.key = this.parseExpression()
+      this.expect(tokTypes.bracketR)
+      return
+    } else {
+      prop.computed = false
+    }
+  }
+  var key = (this.tok.type === tokTypes.num || this.tok.type === tokTypes.string) ? this.parseExprAtom() : this.parseIdent()
+  prop.key = key || this.dummyIdent()
+}
+
+lp$2.parsePropertyAccessor = function() {
+  if (this.tok.type === tokTypes.name || this.tok.type.keyword) return this.parseIdent()
+}
+
+lp$2.parseIdent = function() {
+  var name = this.tok.type === tokTypes.name ? this.tok.value : this.tok.type.keyword
+  if (!name) return this.dummyIdent()
+  var node = this.startNode()
+  this.next()
+  node.name = name
+  return this.finishNode(node, "Identifier")
+}
+
+lp$2.initFunction = function(node) {
+  node.id = null
+  node.params = []
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = false
+    node.expression = false
+  }
+  if (this.options.ecmaVersion >= 8)
+    node.async = false
+}
+
+// Convert existing expression atom to assignable pattern
+// if possible.
+
+lp$2.toAssignable = function(node, binding) {
+  var this$1 = this;
+
+  if (!node || node.type == "Identifier" || (node.type == "MemberExpression" && !binding)) {
+    // Okay
+  } else if (node.type == "ParenthesizedExpression") {
+    node.expression = this.toAssignable(node.expression, binding)
+  } else if (this.options.ecmaVersion < 6) {
+    return this.dummyIdent()
+  } else if (node.type == "ObjectExpression") {
+    node.type = "ObjectPattern"
+    var props = node.properties
+    for (var i = 0; i < props.length; i++)
+      props[i].value = this$1.toAssignable(props[i].value, binding)
+  } else if (node.type == "ArrayExpression") {
+    node.type = "ArrayPattern"
+    this.toAssignableList(node.elements, binding)
+  } else if (node.type == "SpreadElement") {
+    node.type = "RestElement"
+    node.argument = this.toAssignable(node.argument, binding)
+  } else if (node.type == "AssignmentExpression") {
+    node.type = "AssignmentPattern"
+    delete node.operator
+  } else {
+    return this.dummyIdent()
+  }
+  return node
+}
+
+lp$2.toAssignableList = function(exprList, binding) {
+  var this$1 = this;
+
+  for (var i = 0; i < exprList.length; i++)
+    exprList[i] = this$1.toAssignable(exprList[i], binding)
+  return exprList
+}
+
+lp$2.parseFunctionParams = function(params) {
+  params = this.parseExprList(tokTypes.parenR)
+  return this.toAssignableList(params, true)
+}
+
+lp$2.parseMethod = function(isGenerator, isAsync) {
+  var node = this.startNode(), oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6)
+    node.generator = !!isGenerator
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+  this.inAsync = node.async
+  node.params = this.parseFunctionParams()
+  node.expression = this.options.ecmaVersion >= 6 && this.tok.type !== tokTypes.braceL
+  node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, "FunctionExpression")
+}
+
+lp$2.parseArrowExpression = function(node, params, isAsync) {
+  var oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+  this.inAsync = node.async
+  node.params = this.toAssignableList(params, true)
+  node.expression = this.tok.type !== tokTypes.braceL
+  node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, "ArrowFunctionExpression")
+}
+
+lp$2.parseExprList = function(close, allowEmpty) {
+  var this$1 = this;
+
+  this.pushCx()
+  var indent = this.curIndent, line = this.curLineStart, elts = []
+  this.next() // Opening bracket
+  while (!this.closes(close, indent + 1, line)) {
+    if (this$1.eat(tokTypes.comma)) {
+      elts.push(allowEmpty ? null : this$1.dummyIdent())
+      continue
+    }
+    var elt = this$1.parseMaybeAssign()
+    if (isDummy(elt)) {
+      if (this$1.closes(close, indent, line)) break
+      this$1.next()
+    } else {
+      elts.push(elt)
+    }
+    this$1.eat(tokTypes.comma)
+  }
+  this.popCx()
+  if (!this.eat(close)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  return elts
+}
+
+lp$2.parseAwait = function() {
+  var node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeUnary()
+  return this.finishNode(node, "AwaitExpression")
+}
+
+defaultOptions.tabSize = 4
+
+function parse_dammit(input, options) {
+  var p = new LooseParser(input, options)
+  p.next()
+  return p.parseTopLevel()
+}
+
+addLooseExports(parse_dammit, LooseParser, pluginsLoose)
+
+export { parse_dammit, LooseParser, pluginsLoose };
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.js
new file mode 100644
index 0000000000..4137048cc2
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/acorn_loose.js
@@ -0,0 +1,1339 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('./acorn.js')) :
+  typeof define === 'function' && define.amd ? define(['exports', './acorn.js'], factory) :
+  (factory((global.acorn = global.acorn || {}, global.acorn.loose = global.acorn.loose || {}),global.acorn));
+}(this, function (exports,__acorn_js) { 'use strict';
+
+  // Registered plugins
+  var pluginsLoose = {}
+
+  var LooseParser = function LooseParser(input, options) {
+    if ( options === void 0 ) options = {};
+
+    this.toks = __acorn_js.tokenizer(input, options)
+    this.options = this.toks.options
+    this.input = this.toks.input
+    this.tok = this.last = {type: __acorn_js.tokTypes.eof, start: 0, end: 0}
+    if (this.options.locations) {
+      var here = this.toks.curPosition()
+      this.tok.loc = new __acorn_js.SourceLocation(this.toks, here, here)
+    }
+    this.ahead = [] // Tokens ahead
+    this.context = [] // Indentation contexted
+    this.curIndent = 0
+    this.curLineStart = 0
+    this.nextLineStart = this.lineEnd(this.curLineStart) + 1
+    this.inAsync = false
+    // Load plugins
+    this.options.pluginsLoose = options.pluginsLoose || {}
+    this.loadPlugins(this.options.pluginsLoose)
+  };
+
+  LooseParser.prototype.startNode = function startNode () {
+    return new __acorn_js.Node(this.toks, this.tok.start, this.options.locations ? this.tok.loc.start : null)
+  };
+
+  LooseParser.prototype.storeCurrentPos = function storeCurrentPos () {
+    return this.options.locations ? [this.tok.start, this.tok.loc.start] : this.tok.start
+  };
+
+  LooseParser.prototype.startNodeAt = function startNodeAt (pos) {
+    if (this.options.locations) {
+      return new __acorn_js.Node(this.toks, pos[0], pos[1])
+    } else {
+      return new __acorn_js.Node(this.toks, pos)
+    }
+  };
+
+  LooseParser.prototype.finishNode = function finishNode (node, type) {
+    node.type = type
+    node.end = this.last.end
+    if (this.options.locations)
+      node.loc.end = this.last.loc.end
+    if (this.options.ranges)
+      node.range[1] = this.last.end
+    return node
+  };
+
+  LooseParser.prototype.dummyNode = function dummyNode (type) {
+    var dummy = this.startNode()
+    dummy.type = type
+    dummy.end = dummy.start
+    if (this.options.locations)
+      dummy.loc.end = dummy.loc.start
+    if (this.options.ranges)
+      dummy.range[1] = dummy.start
+    this.last = {type: __acorn_js.tokTypes.name, start: dummy.start, end: dummy.start, loc: dummy.loc}
+    return dummy
+  };
+
+  LooseParser.prototype.dummyIdent = function dummyIdent () {
+    var dummy = this.dummyNode("Identifier")
+    dummy.name = "✖"
+    return dummy
+  };
+
+  LooseParser.prototype.dummyString = function dummyString () {
+    var dummy = this.dummyNode("Literal")
+    dummy.value = dummy.raw = "✖"
+    return dummy
+  };
+
+  LooseParser.prototype.eat = function eat (type) {
+    if (this.tok.type === type) {
+      this.next()
+      return true
+    } else {
+      return false
+    }
+  };
+
+  LooseParser.prototype.isContextual = function isContextual (name) {
+    return this.tok.type === __acorn_js.tokTypes.name && this.tok.value === name
+  };
+
+  LooseParser.prototype.eatContextual = function eatContextual (name) {
+    return this.tok.value === name && this.eat(__acorn_js.tokTypes.name)
+  };
+
+  LooseParser.prototype.canInsertSemicolon = function canInsertSemicolon () {
+    return this.tok.type === __acorn_js.tokTypes.eof || this.tok.type === __acorn_js.tokTypes.braceR ||
+      __acorn_js.lineBreak.test(this.input.slice(this.last.end, this.tok.start))
+  };
+
+  LooseParser.prototype.semicolon = function semicolon () {
+    return this.eat(__acorn_js.tokTypes.semi)
+  };
+
+  LooseParser.prototype.expect = function expect (type) {
+      var this$1 = this;
+
+    if (this.eat(type)) return true
+    for (var i = 1; i <= 2; i++) {
+      if (this$1.lookAhead(i).type == type) {
+        for (var j = 0; j < i; j++) this$1.next()
+        return true
+      }
+    }
+  };
+
+  LooseParser.prototype.pushCx = function pushCx () {
+    this.context.push(this.curIndent)
+  };
+
+  LooseParser.prototype.popCx = function popCx () {
+    this.curIndent = this.context.pop()
+  };
+
+  LooseParser.prototype.lineEnd = function lineEnd (pos) {
+    while (pos < this.input.length && !__acorn_js.isNewLine(this.input.charCodeAt(pos))) ++pos
+    return pos
+  };
+
+  LooseParser.prototype.indentationAfter = function indentationAfter (pos) {
+      var this$1 = this;
+
+    for (var count = 0;; ++pos) {
+      var ch = this$1.input.charCodeAt(pos)
+      if (ch === 32) ++count
+      else if (ch === 9) count += this$1.options.tabSize
+      else return count
+    }
+  };
+
+  LooseParser.prototype.closes = function closes (closeTok, indent, line, blockHeuristic) {
+    if (this.tok.type === closeTok || this.tok.type === __acorn_js.tokTypes.eof) return true
+    return line != this.curLineStart && this.curIndent < indent && this.tokenStartsLine() &&
+      (!blockHeuristic || this.nextLineStart >= this.input.length ||
+       this.indentationAfter(this.nextLineStart) < indent)
+  };
+
+  LooseParser.prototype.tokenStartsLine = function tokenStartsLine () {
+      var this$1 = this;
+
+    for (var p = this.tok.start - 1; p >= this.curLineStart; --p) {
+      var ch = this$1.input.charCodeAt(p)
+      if (ch !== 9 && ch !== 32) return false
+    }
+    return true
+  };
+
+  LooseParser.prototype.extend = function extend (name, f) {
+    this[name] = f(this[name])
+  };
+
+  LooseParser.prototype.loadPlugins = function loadPlugins (pluginConfigs) {
+      var this$1 = this;
+
+    for (var name in pluginConfigs) {
+      var plugin = pluginsLoose[name]
+      if (!plugin) throw new Error("Plugin '" + name + "' not found")
+      plugin(this$1, pluginConfigs[name])
+    }
+  };
+
+  var lp = LooseParser.prototype
+
+  function isSpace(ch) {
+    return (ch < 14 && ch > 8) || ch === 32 || ch === 160 || __acorn_js.isNewLine(ch)
+  }
+
+  lp.next = function() {
+    var this$1 = this;
+
+    this.last = this.tok
+    if (this.ahead.length)
+      this.tok = this.ahead.shift()
+    else
+      this.tok = this.readToken()
+
+    if (this.tok.start >= this.nextLineStart) {
+      while (this.tok.start >= this.nextLineStart) {
+        this$1.curLineStart = this$1.nextLineStart
+        this$1.nextLineStart = this$1.lineEnd(this$1.curLineStart) + 1
+      }
+      this.curIndent = this.indentationAfter(this.curLineStart)
+    }
+  }
+
+  lp.readToken = function() {
+    var this$1 = this;
+
+    for (;;) {
+      try {
+        this$1.toks.next()
+        if (this$1.toks.type === __acorn_js.tokTypes.dot &&
+            this$1.input.substr(this$1.toks.end, 1) === "." &&
+            this$1.options.ecmaVersion >= 6) {
+          this$1.toks.end++
+          this$1.toks.type = __acorn_js.tokTypes.ellipsis
+        }
+        return new __acorn_js.Token(this$1.toks)
+      } catch(e) {
+        if (!(e instanceof SyntaxError)) throw e
+
+        // Try to skip some text, based on the error message, and then continue
+        var msg = e.message, pos = e.raisedAt, replace = true
+        if (/unterminated/i.test(msg)) {
+          pos = this$1.lineEnd(e.pos + 1)
+          if (/string/.test(msg)) {
+            replace = {start: e.pos, end: pos, type: __acorn_js.tokTypes.string, value: this$1.input.slice(e.pos + 1, pos)}
+          } else if (/regular expr/i.test(msg)) {
+            var re = this$1.input.slice(e.pos, pos)
+            try { re = new RegExp(re) } catch(e) {}
+            replace = {start: e.pos, end: pos, type: __acorn_js.tokTypes.regexp, value: re}
+          } else if (/template/.test(msg)) {
+            replace = {start: e.pos, end: pos,
+                       type: __acorn_js.tokTypes.template,
+                       value: this$1.input.slice(e.pos, pos)}
+          } else {
+            replace = false
+          }
+        } else if (/invalid (unicode|regexp|number)|expecting unicode|octal literal|is reserved|directly after number|expected number in radix/i.test(msg)) {
+          while (pos < this.input.length && !isSpace(this.input.charCodeAt(pos))) ++pos
+        } else if (/character escape|expected hexadecimal/i.test(msg)) {
+          while (pos < this.input.length) {
+            var ch = this$1.input.charCodeAt(pos++)
+            if (ch === 34 || ch === 39 || __acorn_js.isNewLine(ch)) break
+          }
+        } else if (/unexpected character/i.test(msg)) {
+          pos++
+          replace = false
+        } else if (/regular expression/i.test(msg)) {
+          replace = true
+        } else {
+          throw e
+        }
+        this$1.resetTo(pos)
+        if (replace === true) replace = {start: pos, end: pos, type: __acorn_js.tokTypes.name, value: "✖"}
+        if (replace) {
+          if (this$1.options.locations)
+            replace.loc = new __acorn_js.SourceLocation(
+              this$1.toks,
+              __acorn_js.getLineInfo(this$1.input, replace.start),
+              __acorn_js.getLineInfo(this$1.input, replace.end))
+          return replace
+        }
+      }
+    }
+  }
+
+  lp.resetTo = function(pos) {
+    var this$1 = this;
+
+    this.toks.pos = pos
+    var ch = this.input.charAt(pos - 1)
+    this.toks.exprAllowed = !ch || /[\[\{\(,;:?\/*=+\-~!|&%^<>]/.test(ch) ||
+      /[enwfd]/.test(ch) &&
+      /\b(keywords|case|else|return|throw|new|in|(instance|type)of|delete|void)$/.test(this.input.slice(pos - 10, pos))
+
+    if (this.options.locations) {
+      this.toks.curLine = 1
+      this.toks.lineStart = __acorn_js.lineBreakG.lastIndex = 0
+      var match
+      while ((match = __acorn_js.lineBreakG.exec(this.input)) && match.index < pos) {
+        ++this$1.toks.curLine
+        this$1.toks.lineStart = match.index + match[0].length
+      }
+    }
+  }
+
+  lp.lookAhead = function(n) {
+    var this$1 = this;
+
+    while (n > this.ahead.length)
+      this$1.ahead.push(this$1.readToken())
+    return this.ahead[n - 1]
+  }
+
+  function isDummy(node) { return node.name == "✖" }
+
+  var lp$1 = LooseParser.prototype
+
+  lp$1.parseTopLevel = function() {
+    var this$1 = this;
+
+    var node = this.startNodeAt(this.options.locations ? [0, __acorn_js.getLineInfo(this.input, 0)] : 0)
+    node.body = []
+    while (this.tok.type !== __acorn_js.tokTypes.eof) node.body.push(this$1.parseStatement())
+    this.last = this.tok
+    if (this.options.ecmaVersion >= 6) {
+      node.sourceType = this.options.sourceType
+    }
+    return this.finishNode(node, "Program")
+  }
+
+  lp$1.parseStatement = function() {
+    var this$1 = this;
+
+    var starttype = this.tok.type, node = this.startNode(), kind
+
+    if (this.toks.isLet()) {
+      starttype = __acorn_js.tokTypes._var
+      kind = "let"
+    }
+
+    switch (starttype) {
+    case __acorn_js.tokTypes._break: case __acorn_js.tokTypes._continue:
+      this.next()
+      var isBreak = starttype === __acorn_js.tokTypes._break
+      if (this.semicolon() || this.canInsertSemicolon()) {
+        node.label = null
+      } else {
+        node.label = this.tok.type === __acorn_js.tokTypes.name ? this.parseIdent() : null
+        this.semicolon()
+      }
+      return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+
+    case __acorn_js.tokTypes._debugger:
+      this.next()
+      this.semicolon()
+      return this.finishNode(node, "DebuggerStatement")
+
+    case __acorn_js.tokTypes._do:
+      this.next()
+      node.body = this.parseStatement()
+      node.test = this.eat(__acorn_js.tokTypes._while) ? this.parseParenExpression() : this.dummyIdent()
+      this.semicolon()
+      return this.finishNode(node, "DoWhileStatement")
+
+    case __acorn_js.tokTypes._for:
+      this.next()
+      this.pushCx()
+      this.expect(__acorn_js.tokTypes.parenL)
+      if (this.tok.type === __acorn_js.tokTypes.semi) return this.parseFor(node, null)
+      var isLet = this.toks.isLet()
+      if (isLet || this.tok.type === __acorn_js.tokTypes._var || this.tok.type === __acorn_js.tokTypes._const) {
+        var init$1 = this.parseVar(true, isLet ? "let" : this.tok.value)
+        if (init$1.declarations.length === 1 && (this.tok.type === __acorn_js.tokTypes._in || this.isContextual("of"))) {
+          return this.parseForIn(node, init$1)
+        }
+        return this.parseFor(node, init$1)
+      }
+      var init = this.parseExpression(true)
+      if (this.tok.type === __acorn_js.tokTypes._in || this.isContextual("of"))
+        return this.parseForIn(node, this.toAssignable(init))
+      return this.parseFor(node, init)
+
+    case __acorn_js.tokTypes._function:
+      this.next()
+      return this.parseFunction(node, true)
+
+    case __acorn_js.tokTypes._if:
+      this.next()
+      node.test = this.parseParenExpression()
+      node.consequent = this.parseStatement()
+      node.alternate = this.eat(__acorn_js.tokTypes._else) ? this.parseStatement() : null
+      return this.finishNode(node, "IfStatement")
+
+    case __acorn_js.tokTypes._return:
+      this.next()
+      if (this.eat(__acorn_js.tokTypes.semi) || this.canInsertSemicolon()) node.argument = null
+      else { node.argument = this.parseExpression(); this.semicolon() }
+      return this.finishNode(node, "ReturnStatement")
+
+    case __acorn_js.tokTypes._switch:
+      var blockIndent = this.curIndent, line = this.curLineStart
+      this.next()
+      node.discriminant = this.parseParenExpression()
+      node.cases = []
+      this.pushCx()
+      this.expect(__acorn_js.tokTypes.braceL)
+
+      var cur
+      while (!this.closes(__acorn_js.tokTypes.braceR, blockIndent, line, true)) {
+        if (this$1.tok.type === __acorn_js.tokTypes._case || this$1.tok.type === __acorn_js.tokTypes._default) {
+          var isCase = this$1.tok.type === __acorn_js.tokTypes._case
+          if (cur) this$1.finishNode(cur, "SwitchCase")
+          node.cases.push(cur = this$1.startNode())
+          cur.consequent = []
+          this$1.next()
+          if (isCase) cur.test = this$1.parseExpression()
+          else cur.test = null
+          this$1.expect(__acorn_js.tokTypes.colon)
+        } else {
+          if (!cur) {
+            node.cases.push(cur = this$1.startNode())
+            cur.consequent = []
+            cur.test = null
+          }
+          cur.consequent.push(this$1.parseStatement())
+        }
+      }
+      if (cur) this.finishNode(cur, "SwitchCase")
+      this.popCx()
+      this.eat(__acorn_js.tokTypes.braceR)
+      return this.finishNode(node, "SwitchStatement")
+
+    case __acorn_js.tokTypes._throw:
+      this.next()
+      node.argument = this.parseExpression()
+      this.semicolon()
+      return this.finishNode(node, "ThrowStatement")
+
+    case __acorn_js.tokTypes._try:
+      this.next()
+      node.block = this.parseBlock()
+      node.handler = null
+      if (this.tok.type === __acorn_js.tokTypes._catch) {
+        var clause = this.startNode()
+        this.next()
+        this.expect(__acorn_js.tokTypes.parenL)
+        clause.param = this.toAssignable(this.parseExprAtom(), true)
+        this.expect(__acorn_js.tokTypes.parenR)
+        clause.body = this.parseBlock()
+        node.handler = this.finishNode(clause, "CatchClause")
+      }
+      node.finalizer = this.eat(__acorn_js.tokTypes._finally) ? this.parseBlock() : null
+      if (!node.handler && !node.finalizer) return node.block
+      return this.finishNode(node, "TryStatement")
+
+    case __acorn_js.tokTypes._var:
+    case __acorn_js.tokTypes._const:
+      return this.parseVar(false, kind || this.tok.value)
+
+    case __acorn_js.tokTypes._while:
+      this.next()
+      node.test = this.parseParenExpression()
+      node.body = this.parseStatement()
+      return this.finishNode(node, "WhileStatement")
+
+    case __acorn_js.tokTypes._with:
+      this.next()
+      node.object = this.parseParenExpression()
+      node.body = this.parseStatement()
+      return this.finishNode(node, "WithStatement")
+
+    case __acorn_js.tokTypes.braceL:
+      return this.parseBlock()
+
+    case __acorn_js.tokTypes.semi:
+      this.next()
+      return this.finishNode(node, "EmptyStatement")
+
+    case __acorn_js.tokTypes._class:
+      return this.parseClass(true)
+
+    case __acorn_js.tokTypes._import:
+      return this.parseImport()
+
+    case __acorn_js.tokTypes._export:
+      return this.parseExport()
+
+    default:
+      if (this.toks.isAsyncFunction()) {
+        this.next()
+        this.next()
+        return this.parseFunction(node, true, true)
+      }
+      var expr = this.parseExpression()
+      if (isDummy(expr)) {
+        this.next()
+        if (this.tok.type === __acorn_js.tokTypes.eof) return this.finishNode(node, "EmptyStatement")
+        return this.parseStatement()
+      } else if (starttype === __acorn_js.tokTypes.name && expr.type === "Identifier" && this.eat(__acorn_js.tokTypes.colon)) {
+        node.body = this.parseStatement()
+        node.label = expr
+        return this.finishNode(node, "LabeledStatement")
+      } else {
+        node.expression = expr
+        this.semicolon()
+        return this.finishNode(node, "ExpressionStatement")
+      }
+    }
+  }
+
+  lp$1.parseBlock = function() {
+    var this$1 = this;
+
+    var node = this.startNode()
+    this.pushCx()
+    this.expect(__acorn_js.tokTypes.braceL)
+    var blockIndent = this.curIndent, line = this.curLineStart
+    node.body = []
+    while (!this.closes(__acorn_js.tokTypes.braceR, blockIndent, line, true))
+      node.body.push(this$1.parseStatement())
+    this.popCx()
+    this.eat(__acorn_js.tokTypes.braceR)
+    return this.finishNode(node, "BlockStatement")
+  }
+
+  lp$1.parseFor = function(node, init) {
+    node.init = init
+    node.test = node.update = null
+    if (this.eat(__acorn_js.tokTypes.semi) && this.tok.type !== __acorn_js.tokTypes.semi) node.test = this.parseExpression()
+    if (this.eat(__acorn_js.tokTypes.semi) && this.tok.type !== __acorn_js.tokTypes.parenR) node.update = this.parseExpression()
+    this.popCx()
+    this.expect(__acorn_js.tokTypes.parenR)
+    node.body = this.parseStatement()
+    return this.finishNode(node, "ForStatement")
+  }
+
+  lp$1.parseForIn = function(node, init) {
+    var type = this.tok.type === __acorn_js.tokTypes._in ? "ForInStatement" : "ForOfStatement"
+    this.next()
+    node.left = init
+    node.right = this.parseExpression()
+    this.popCx()
+    this.expect(__acorn_js.tokTypes.parenR)
+    node.body = this.parseStatement()
+    return this.finishNode(node, type)
+  }
+
+  lp$1.parseVar = function(noIn, kind) {
+    var this$1 = this;
+
+    var node = this.startNode()
+    node.kind = kind
+    this.next()
+    node.declarations = []
+    do {
+      var decl = this$1.startNode()
+      decl.id = this$1.options.ecmaVersion >= 6 ? this$1.toAssignable(this$1.parseExprAtom(), true) : this$1.parseIdent()
+      decl.init = this$1.eat(__acorn_js.tokTypes.eq) ? this$1.parseMaybeAssign(noIn) : null
+      node.declarations.push(this$1.finishNode(decl, "VariableDeclarator"))
+    } while (this.eat(__acorn_js.tokTypes.comma))
+    if (!node.declarations.length) {
+      var decl$1 = this.startNode()
+      decl$1.id = this.dummyIdent()
+      node.declarations.push(this.finishNode(decl$1, "VariableDeclarator"))
+    }
+    if (!noIn) this.semicolon()
+    return this.finishNode(node, "VariableDeclaration")
+  }
+
+  lp$1.parseClass = function(isStatement) {
+    var this$1 = this;
+
+    var node = this.startNode()
+    this.next()
+    if (this.tok.type === __acorn_js.tokTypes.name) node.id = this.parseIdent()
+    else if (isStatement) node.id = this.dummyIdent()
+    else node.id = null
+    node.superClass = this.eat(__acorn_js.tokTypes._extends) ? this.parseExpression() : null
+    node.body = this.startNode()
+    node.body.body = []
+    this.pushCx()
+    var indent = this.curIndent + 1, line = this.curLineStart
+    this.eat(__acorn_js.tokTypes.braceL)
+    if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+    while (!this.closes(__acorn_js.tokTypes.braceR, indent, line)) {
+      if (this$1.semicolon()) continue
+      var method = this$1.startNode(), isGenerator, isAsync
+      if (this$1.options.ecmaVersion >= 6) {
+        method.static = false
+        isGenerator = this$1.eat(__acorn_js.tokTypes.star)
+      }
+      this$1.parsePropertyName(method)
+      if (isDummy(method.key)) { if (isDummy(this$1.parseMaybeAssign())) this$1.next(); this$1.eat(__acorn_js.tokTypes.comma); continue }
+      if (method.key.type === "Identifier" && !method.computed && method.key.name === "static" &&
+          (this$1.tok.type != __acorn_js.tokTypes.parenL && this$1.tok.type != __acorn_js.tokTypes.braceL)) {
+        method.static = true
+        isGenerator = this$1.eat(__acorn_js.tokTypes.star)
+        this$1.parsePropertyName(method)
+      } else {
+        method.static = false
+      }
+      if (!method.computed &&
+          method.key.type === "Identifier" && method.key.name === "async" && this$1.tok.type !== __acorn_js.tokTypes.parenL &&
+          !this$1.canInsertSemicolon()) {
+        this$1.parsePropertyName(method)
+        isAsync = true
+      } else {
+        isAsync = false
+      }
+      if (this$1.options.ecmaVersion >= 5 && method.key.type === "Identifier" &&
+          !method.computed && (method.key.name === "get" || method.key.name === "set") &&
+          this$1.tok.type !== __acorn_js.tokTypes.parenL && this$1.tok.type !== __acorn_js.tokTypes.braceL) {
+        method.kind = method.key.name
+        this$1.parsePropertyName(method)
+        method.value = this$1.parseMethod(false)
+      } else {
+        if (!method.computed && !method.static && !isGenerator && !isAsync && (
+          method.key.type === "Identifier" && method.key.name === "constructor" ||
+            method.key.type === "Literal" && method.key.value === "constructor")) {
+          method.kind = "constructor"
+        } else {
+          method.kind =  "method"
+        }
+        method.value = this$1.parseMethod(isGenerator, isAsync)
+      }
+      node.body.body.push(this$1.finishNode(method, "MethodDefinition"))
+    }
+    this.popCx()
+    if (!this.eat(__acorn_js.tokTypes.braceR)) {
+      // If there is no closing brace, make the node span to the start
+      // of the next token (this is useful for Tern)
+      this.last.end = this.tok.start
+      if (this.options.locations) this.last.loc.end = this.tok.loc.start
+    }
+    this.semicolon()
+    this.finishNode(node.body, "ClassBody")
+    return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+  }
+
+  lp$1.parseFunction = function(node, isStatement, isAsync) {
+    var oldInAsync = this.inAsync
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 6) {
+      node.generator = this.eat(__acorn_js.tokTypes.star)
+    }
+    if (this.options.ecmaVersion >= 8) {
+      node.async = !!isAsync
+    }
+    if (this.tok.type === __acorn_js.tokTypes.name) node.id = this.parseIdent()
+    else if (isStatement) node.id = this.dummyIdent()
+    this.inAsync = node.async
+    node.params = this.parseFunctionParams()
+    node.body = this.parseBlock()
+    this.inAsync = oldInAsync
+    return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+  }
+
+  lp$1.parseExport = function() {
+    var node = this.startNode()
+    this.next()
+    if (this.eat(__acorn_js.tokTypes.star)) {
+      node.source = this.eatContextual("from") ? this.parseExprAtom() : this.dummyString()
+      return this.finishNode(node, "ExportAllDeclaration")
+    }
+    if (this.eat(__acorn_js.tokTypes._default)) {
+      // export default (function foo() {}) // This is FunctionExpression.
+      var isParenL = this.tok.type === __acorn_js.tokTypes.parenL
+      var expr = this.parseMaybeAssign()
+      if (!isParenL && expr.id) {
+        switch (expr.type) {
+        case "FunctionExpression": expr.type = "FunctionDeclaration"; break
+        case "ClassExpression": expr.type = "ClassDeclaration"; break
+        }
+      }
+      node.declaration = expr
+      this.semicolon()
+      return this.finishNode(node, "ExportDefaultDeclaration")
+    }
+    if (this.tok.type.keyword || this.toks.isLet() || this.toks.isAsyncFunction()) {
+      node.declaration = this.parseStatement()
+      node.specifiers = []
+      node.source = null
+    } else {
+      node.declaration = null
+      node.specifiers = this.parseExportSpecifierList()
+      node.source = this.eatContextual("from") ? this.parseExprAtom() : null
+      this.semicolon()
+    }
+    return this.finishNode(node, "ExportNamedDeclaration")
+  }
+
+  lp$1.parseImport = function() {
+    var node = this.startNode()
+    this.next()
+    if (this.tok.type === __acorn_js.tokTypes.string) {
+      node.specifiers = []
+      node.source = this.parseExprAtom()
+      node.kind = ''
+    } else {
+      var elt
+      if (this.tok.type === __acorn_js.tokTypes.name && this.tok.value !== "from") {
+        elt = this.startNode()
+        elt.local = this.parseIdent()
+        this.finishNode(elt, "ImportDefaultSpecifier")
+        this.eat(__acorn_js.tokTypes.comma)
+      }
+      node.specifiers = this.parseImportSpecifierList()
+      node.source = this.eatContextual("from") && this.tok.type == __acorn_js.tokTypes.string ? this.parseExprAtom() : this.dummyString()
+      if (elt) node.specifiers.unshift(elt)
+    }
+    this.semicolon()
+    return this.finishNode(node, "ImportDeclaration")
+  }
+
+  lp$1.parseImportSpecifierList = function() {
+    var this$1 = this;
+
+    var elts = []
+    if (this.tok.type === __acorn_js.tokTypes.star) {
+      var elt = this.startNode()
+      this.next()
+      elt.local = this.eatContextual("as") ? this.parseIdent() : this.dummyIdent()
+      elts.push(this.finishNode(elt, "ImportNamespaceSpecifier"))
+    } else {
+      var indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+      this.pushCx()
+      this.eat(__acorn_js.tokTypes.braceL)
+      if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+      while (!this.closes(__acorn_js.tokTypes.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+        var elt$1 = this$1.startNode()
+        if (this$1.eat(__acorn_js.tokTypes.star)) {
+          elt$1.local = this$1.eatContextual("as") ? this$1.parseIdent() : this$1.dummyIdent()
+          this$1.finishNode(elt$1, "ImportNamespaceSpecifier")
+        } else {
+          if (this$1.isContextual("from")) break
+          elt$1.imported = this$1.parseIdent()
+          if (isDummy(elt$1.imported)) break
+          elt$1.local = this$1.eatContextual("as") ? this$1.parseIdent() : elt$1.imported
+          this$1.finishNode(elt$1, "ImportSpecifier")
+        }
+        elts.push(elt$1)
+        this$1.eat(__acorn_js.tokTypes.comma)
+      }
+      this.eat(__acorn_js.tokTypes.braceR)
+      this.popCx()
+    }
+    return elts
+  }
+
+  lp$1.parseExportSpecifierList = function() {
+    var this$1 = this;
+
+    var elts = []
+    var indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+    this.pushCx()
+    this.eat(__acorn_js.tokTypes.braceL)
+    if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+    while (!this.closes(__acorn_js.tokTypes.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+      if (this$1.isContextual("from")) break
+      var elt = this$1.startNode()
+      elt.local = this$1.parseIdent()
+      if (isDummy(elt.local)) break
+      elt.exported = this$1.eatContextual("as") ? this$1.parseIdent() : elt.local
+      this$1.finishNode(elt, "ExportSpecifier")
+      elts.push(elt)
+      this$1.eat(__acorn_js.tokTypes.comma)
+    }
+    this.eat(__acorn_js.tokTypes.braceR)
+    this.popCx()
+    return elts
+  }
+
+  var lp$2 = LooseParser.prototype
+
+  lp$2.checkLVal = function(expr) {
+    if (!expr) return expr
+    switch (expr.type) {
+    case "Identifier":
+    case "MemberExpression":
+      return expr
+
+    case "ParenthesizedExpression":
+      expr.expression = this.checkLVal(expr.expression)
+      return expr
+
+    default:
+      return this.dummyIdent()
+    }
+  }
+
+  lp$2.parseExpression = function(noIn) {
+    var this$1 = this;
+
+    var start = this.storeCurrentPos()
+    var expr = this.parseMaybeAssign(noIn)
+    if (this.tok.type === __acorn_js.tokTypes.comma) {
+      var node = this.startNodeAt(start)
+      node.expressions = [expr]
+      while (this.eat(__acorn_js.tokTypes.comma)) node.expressions.push(this$1.parseMaybeAssign(noIn))
+      return this.finishNode(node, "SequenceExpression")
+    }
+    return expr
+  }
+
+  lp$2.parseParenExpression = function() {
+    this.pushCx()
+    this.expect(__acorn_js.tokTypes.parenL)
+    var val = this.parseExpression()
+    this.popCx()
+    this.expect(__acorn_js.tokTypes.parenR)
+    return val
+  }
+
+  lp$2.parseMaybeAssign = function(noIn) {
+    if (this.toks.isContextual("yield")) {
+      var node = this.startNode()
+      this.next()
+      if (this.semicolon() || this.canInsertSemicolon() || (this.tok.type != __acorn_js.tokTypes.star && !this.tok.type.startsExpr)) {
+        node.delegate = false
+        node.argument = null
+      } else {
+        node.delegate = this.eat(__acorn_js.tokTypes.star)
+        node.argument = this.parseMaybeAssign()
+      }
+      return this.finishNode(node, "YieldExpression")
+    }
+
+    var start = this.storeCurrentPos()
+    var left = this.parseMaybeConditional(noIn)
+    if (this.tok.type.isAssign) {
+      var node$1 = this.startNodeAt(start)
+      node$1.operator = this.tok.value
+      node$1.left = this.tok.type === __acorn_js.tokTypes.eq ? this.toAssignable(left) : this.checkLVal(left)
+      this.next()
+      node$1.right = this.parseMaybeAssign(noIn)
+      return this.finishNode(node$1, "AssignmentExpression")
+    }
+    return left
+  }
+
+  lp$2.parseMaybeConditional = function(noIn) {
+    var start = this.storeCurrentPos()
+    var expr = this.parseExprOps(noIn)
+    if (this.eat(__acorn_js.tokTypes.question)) {
+      var node = this.startNodeAt(start)
+      node.test = expr
+      node.consequent = this.parseMaybeAssign()
+      node.alternate = this.expect(__acorn_js.tokTypes.colon) ? this.parseMaybeAssign(noIn) : this.dummyIdent()
+      return this.finishNode(node, "ConditionalExpression")
+    }
+    return expr
+  }
+
+  lp$2.parseExprOps = function(noIn) {
+    var start = this.storeCurrentPos()
+    var indent = this.curIndent, line = this.curLineStart
+    return this.parseExprOp(this.parseMaybeUnary(false), start, -1, noIn, indent, line)
+  }
+
+  lp$2.parseExprOp = function(left, start, minPrec, noIn, indent, line) {
+    if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) return left
+    var prec = this.tok.type.binop
+    if (prec != null && (!noIn || this.tok.type !== __acorn_js.tokTypes._in)) {
+      if (prec > minPrec) {
+        var node = this.startNodeAt(start)
+        node.left = left
+        node.operator = this.tok.value
+        this.next()
+        if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) {
+          node.right = this.dummyIdent()
+        } else {
+          var rightStart = this.storeCurrentPos()
+          node.right = this.parseExprOp(this.parseMaybeUnary(false), rightStart, prec, noIn, indent, line)
+        }
+        this.finishNode(node, /&&|\|\|/.test(node.operator) ? "LogicalExpression" : "BinaryExpression")
+        return this.parseExprOp(node, start, minPrec, noIn, indent, line)
+      }
+    }
+    return left
+  }
+
+  lp$2.parseMaybeUnary = function(sawUnary) {
+    var this$1 = this;
+
+    var start = this.storeCurrentPos(), expr
+    if (this.options.ecmaVersion >= 8 && this.inAsync && this.toks.isContextual("await")) {
+      expr = this.parseAwait()
+      sawUnary = true
+    } else if (this.tok.type.prefix) {
+      var node = this.startNode(), update = this.tok.type === __acorn_js.tokTypes.incDec
+      if (!update) sawUnary = true
+      node.operator = this.tok.value
+      node.prefix = true
+      this.next()
+      node.argument = this.parseMaybeUnary(true)
+      if (update) node.argument = this.checkLVal(node.argument)
+      expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+    } else if (this.tok.type === __acorn_js.tokTypes.ellipsis) {
+      var node$1 = this.startNode()
+      this.next()
+      node$1.argument = this.parseMaybeUnary(sawUnary)
+      expr = this.finishNode(node$1, "SpreadElement")
+    } else {
+      expr = this.parseExprSubscripts()
+      while (this.tok.type.postfix && !this.canInsertSemicolon()) {
+        var node$2 = this$1.startNodeAt(start)
+        node$2.operator = this$1.tok.value
+        node$2.prefix = false
+        node$2.argument = this$1.checkLVal(expr)
+        this$1.next()
+        expr = this$1.finishNode(node$2, "UpdateExpression")
+      }
+    }
+
+    if (!sawUnary && this.eat(__acorn_js.tokTypes.starstar)) {
+      var node$3 = this.startNodeAt(start)
+      node$3.operator = "**"
+      node$3.left = expr
+      node$3.right = this.parseMaybeUnary(false)
+      return this.finishNode(node$3, "BinaryExpression")
+    }
+
+    return expr
+  }
+
+  lp$2.parseExprSubscripts = function() {
+    var start = this.storeCurrentPos()
+    return this.parseSubscripts(this.parseExprAtom(), start, false, this.curIndent, this.curLineStart)
+  }
+
+  lp$2.parseSubscripts = function(base, start, noCalls, startIndent, line) {
+    var this$1 = this;
+
+    for (;;) {
+      if (this$1.curLineStart != line && this$1.curIndent <= startIndent && this$1.tokenStartsLine()) {
+        if (this$1.tok.type == __acorn_js.tokTypes.dot && this$1.curIndent == startIndent)
+          --startIndent
+        else
+          return base
+      }
+
+      var maybeAsyncArrow = base.type === "Identifier" && base.name === "async" && !this$1.canInsertSemicolon()
+
+      if (this$1.eat(__acorn_js.tokTypes.dot)) {
+        var node = this$1.startNodeAt(start)
+        node.object = base
+        if (this$1.curLineStart != line && this$1.curIndent <= startIndent && this$1.tokenStartsLine())
+          node.property = this$1.dummyIdent()
+        else
+          node.property = this$1.parsePropertyAccessor() || this$1.dummyIdent()
+        node.computed = false
+        base = this$1.finishNode(node, "MemberExpression")
+      } else if (this$1.tok.type == __acorn_js.tokTypes.bracketL) {
+        this$1.pushCx()
+        this$1.next()
+        var node$1 = this$1.startNodeAt(start)
+        node$1.object = base
+        node$1.property = this$1.parseExpression()
+        node$1.computed = true
+        this$1.popCx()
+        this$1.expect(__acorn_js.tokTypes.bracketR)
+        base = this$1.finishNode(node$1, "MemberExpression")
+      } else if (!noCalls && this$1.tok.type == __acorn_js.tokTypes.parenL) {
+        var exprList = this$1.parseExprList(__acorn_js.tokTypes.parenR)
+        if (maybeAsyncArrow && this$1.eat(__acorn_js.tokTypes.arrow))
+          return this$1.parseArrowExpression(this$1.startNodeAt(start), exprList, true)
+        var node$2 = this$1.startNodeAt(start)
+        node$2.callee = base
+        node$2.arguments = exprList
+        base = this$1.finishNode(node$2, "CallExpression")
+      } else if (this$1.tok.type == __acorn_js.tokTypes.backQuote) {
+        var node$3 = this$1.startNodeAt(start)
+        node$3.tag = base
+        node$3.quasi = this$1.parseTemplate()
+        base = this$1.finishNode(node$3, "TaggedTemplateExpression")
+      } else {
+        return base
+      }
+    }
+  }
+
+  lp$2.parseExprAtom = function() {
+    var node
+    switch (this.tok.type) {
+    case __acorn_js.tokTypes._this:
+    case __acorn_js.tokTypes._super:
+      var type = this.tok.type === __acorn_js.tokTypes._this ? "ThisExpression" : "Super"
+      node = this.startNode()
+      this.next()
+      return this.finishNode(node, type)
+
+    case __acorn_js.tokTypes.name:
+      var start = this.storeCurrentPos()
+      var id = this.parseIdent()
+      var isAsync = false
+      if (id.name === "async" && !this.canInsertSemicolon()) {
+        if (this.eat(__acorn_js.tokTypes._function))
+          return this.parseFunction(this.startNodeAt(start), false, true)
+        if (this.tok.type === __acorn_js.tokTypes.name) {
+          id = this.parseIdent()
+          isAsync = true
+        }
+      }
+      return this.eat(__acorn_js.tokTypes.arrow) ? this.parseArrowExpression(this.startNodeAt(start), [id], isAsync) : id
+
+    case __acorn_js.tokTypes.regexp:
+      node = this.startNode()
+      var val = this.tok.value
+      node.regex = {pattern: val.pattern, flags: val.flags}
+      node.value = val.value
+      node.raw = this.input.slice(this.tok.start, this.tok.end)
+      this.next()
+      return this.finishNode(node, "Literal")
+
+    case __acorn_js.tokTypes.num: case __acorn_js.tokTypes.string:
+      node = this.startNode()
+      node.value = this.tok.value
+      node.raw = this.input.slice(this.tok.start, this.tok.end)
+      this.next()
+      return this.finishNode(node, "Literal")
+
+    case __acorn_js.tokTypes._null: case __acorn_js.tokTypes._true: case __acorn_js.tokTypes._false:
+      node = this.startNode()
+      node.value = this.tok.type === __acorn_js.tokTypes._null ? null : this.tok.type === __acorn_js.tokTypes._true
+      node.raw = this.tok.type.keyword
+      this.next()
+      return this.finishNode(node, "Literal")
+
+    case __acorn_js.tokTypes.parenL:
+      var parenStart = this.storeCurrentPos()
+      this.next()
+      var inner = this.parseExpression()
+      this.expect(__acorn_js.tokTypes.parenR)
+      if (this.eat(__acorn_js.tokTypes.arrow)) {
+        // (a,)=>a // SequenceExpression makes dummy in the last hole. Drop the dummy.
+        var params = inner.expressions || [inner]
+        if (params.length && isDummy(params[params.length - 1]))
+          params.pop()
+        return this.parseArrowExpression(this.startNodeAt(parenStart), params)
+      }
+      if (this.options.preserveParens) {
+        var par = this.startNodeAt(parenStart)
+        par.expression = inner
+        inner = this.finishNode(par, "ParenthesizedExpression")
+      }
+      return inner
+
+    case __acorn_js.tokTypes.bracketL:
+      node = this.startNode()
+      node.elements = this.parseExprList(__acorn_js.tokTypes.bracketR, true)
+      return this.finishNode(node, "ArrayExpression")
+
+    case __acorn_js.tokTypes.braceL:
+      return this.parseObj()
+
+    case __acorn_js.tokTypes._class:
+      return this.parseClass()
+
+    case __acorn_js.tokTypes._function:
+      node = this.startNode()
+      this.next()
+      return this.parseFunction(node, false)
+
+    case __acorn_js.tokTypes._new:
+      return this.parseNew()
+
+    case __acorn_js.tokTypes.backQuote:
+      return this.parseTemplate()
+
+    default:
+      return this.dummyIdent()
+    }
+  }
+
+  lp$2.parseNew = function() {
+    var node = this.startNode(), startIndent = this.curIndent, line = this.curLineStart
+    var meta = this.parseIdent(true)
+    if (this.options.ecmaVersion >= 6 && this.eat(__acorn_js.tokTypes.dot)) {
+      node.meta = meta
+      node.property = this.parseIdent(true)
+      return this.finishNode(node, "MetaProperty")
+    }
+    var start = this.storeCurrentPos()
+    node.callee = this.parseSubscripts(this.parseExprAtom(), start, true, startIndent, line)
+    if (this.tok.type == __acorn_js.tokTypes.parenL) {
+      node.arguments = this.parseExprList(__acorn_js.tokTypes.parenR)
+    } else {
+      node.arguments = []
+    }
+    return this.finishNode(node, "NewExpression")
+  }
+
+  lp$2.parseTemplateElement = function() {
+    var elem = this.startNode()
+    elem.value = {
+      raw: this.input.slice(this.tok.start, this.tok.end).replace(/\r\n?/g, '\n'),
+      cooked: this.tok.value
+    }
+    this.next()
+    elem.tail = this.tok.type === __acorn_js.tokTypes.backQuote
+    return this.finishNode(elem, "TemplateElement")
+  }
+
+  lp$2.parseTemplate = function() {
+    var this$1 = this;
+
+    var node = this.startNode()
+    this.next()
+    node.expressions = []
+    var curElt = this.parseTemplateElement()
+    node.quasis = [curElt]
+    while (!curElt.tail) {
+      this$1.next()
+      node.expressions.push(this$1.parseExpression())
+      if (this$1.expect(__acorn_js.tokTypes.braceR)) {
+        curElt = this$1.parseTemplateElement()
+      } else {
+        curElt = this$1.startNode()
+        curElt.value = {cooked: '', raw: ''}
+        curElt.tail = true
+        this$1.finishNode(curElt, "TemplateElement")
+      }
+      node.quasis.push(curElt)
+    }
+    this.expect(__acorn_js.tokTypes.backQuote)
+    return this.finishNode(node, "TemplateLiteral")
+  }
+
+  lp$2.parseObj = function() {
+    var this$1 = this;
+
+    var node = this.startNode()
+    node.properties = []
+    this.pushCx()
+    var indent = this.curIndent + 1, line = this.curLineStart
+    this.eat(__acorn_js.tokTypes.braceL)
+    if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+    while (!this.closes(__acorn_js.tokTypes.braceR, indent, line)) {
+      var prop = this$1.startNode(), isGenerator, isAsync, start
+      if (this$1.options.ecmaVersion >= 6) {
+        start = this$1.storeCurrentPos()
+        prop.method = false
+        prop.shorthand = false
+        isGenerator = this$1.eat(__acorn_js.tokTypes.star)
+      }
+      this$1.parsePropertyName(prop)
+      if (!prop.computed &&
+          prop.key.type === "Identifier" && prop.key.name === "async" && this$1.tok.type !== __acorn_js.tokTypes.parenL &&
+          this$1.tok.type !== __acorn_js.tokTypes.colon && !this$1.canInsertSemicolon()) {
+        this$1.parsePropertyName(prop)
+        isAsync = true
+      } else {
+        isAsync = false
+      }
+      if (isDummy(prop.key)) { if (isDummy(this$1.parseMaybeAssign())) this$1.next(); this$1.eat(__acorn_js.tokTypes.comma); continue }
+      if (this$1.eat(__acorn_js.tokTypes.colon)) {
+        prop.kind = "init"
+        prop.value = this$1.parseMaybeAssign()
+      } else if (this$1.options.ecmaVersion >= 6 && (this$1.tok.type === __acorn_js.tokTypes.parenL || this$1.tok.type === __acorn_js.tokTypes.braceL)) {
+        prop.kind = "init"
+        prop.method = true
+        prop.value = this$1.parseMethod(isGenerator, isAsync)
+      } else if (this$1.options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
+                 !prop.computed && (prop.key.name === "get" || prop.key.name === "set") &&
+                 (this$1.tok.type != __acorn_js.tokTypes.comma && this$1.tok.type != __acorn_js.tokTypes.braceR)) {
+        prop.kind = prop.key.name
+        this$1.parsePropertyName(prop)
+        prop.value = this$1.parseMethod(false)
+      } else {
+        prop.kind = "init"
+        if (this$1.options.ecmaVersion >= 6) {
+          if (this$1.eat(__acorn_js.tokTypes.eq)) {
+            var assign = this$1.startNodeAt(start)
+            assign.operator = "="
+            assign.left = prop.key
+            assign.right = this$1.parseMaybeAssign()
+            prop.value = this$1.finishNode(assign, "AssignmentExpression")
+          } else {
+            prop.value = prop.key
+          }
+        } else {
+          prop.value = this$1.dummyIdent()
+        }
+        prop.shorthand = true
+      }
+      node.properties.push(this$1.finishNode(prop, "Property"))
+      this$1.eat(__acorn_js.tokTypes.comma)
+    }
+    this.popCx()
+    if (!this.eat(__acorn_js.tokTypes.braceR)) {
+      // If there is no closing brace, make the node span to the start
+      // of the next token (this is useful for Tern)
+      this.last.end = this.tok.start
+      if (this.options.locations) this.last.loc.end = this.tok.loc.start
+    }
+    return this.finishNode(node, "ObjectExpression")
+  }
+
+  lp$2.parsePropertyName = function(prop) {
+    if (this.options.ecmaVersion >= 6) {
+      if (this.eat(__acorn_js.tokTypes.bracketL)) {
+        prop.computed = true
+        prop.key = this.parseExpression()
+        this.expect(__acorn_js.tokTypes.bracketR)
+        return
+      } else {
+        prop.computed = false
+      }
+    }
+    var key = (this.tok.type === __acorn_js.tokTypes.num || this.tok.type === __acorn_js.tokTypes.string) ? this.parseExprAtom() : this.parseIdent()
+    prop.key = key || this.dummyIdent()
+  }
+
+  lp$2.parsePropertyAccessor = function() {
+    if (this.tok.type === __acorn_js.tokTypes.name || this.tok.type.keyword) return this.parseIdent()
+  }
+
+  lp$2.parseIdent = function() {
+    var name = this.tok.type === __acorn_js.tokTypes.name ? this.tok.value : this.tok.type.keyword
+    if (!name) return this.dummyIdent()
+    var node = this.startNode()
+    this.next()
+    node.name = name
+    return this.finishNode(node, "Identifier")
+  }
+
+  lp$2.initFunction = function(node) {
+    node.id = null
+    node.params = []
+    if (this.options.ecmaVersion >= 6) {
+      node.generator = false
+      node.expression = false
+    }
+    if (this.options.ecmaVersion >= 8)
+      node.async = false
+  }
+
+  // Convert existing expression atom to assignable pattern
+  // if possible.
+
+  lp$2.toAssignable = function(node, binding) {
+    var this$1 = this;
+
+    if (!node || node.type == "Identifier" || (node.type == "MemberExpression" && !binding)) {
+      // Okay
+    } else if (node.type == "ParenthesizedExpression") {
+      node.expression = this.toAssignable(node.expression, binding)
+    } else if (this.options.ecmaVersion < 6) {
+      return this.dummyIdent()
+    } else if (node.type == "ObjectExpression") {
+      node.type = "ObjectPattern"
+      var props = node.properties
+      for (var i = 0; i < props.length; i++)
+        props[i].value = this$1.toAssignable(props[i].value, binding)
+    } else if (node.type == "ArrayExpression") {
+      node.type = "ArrayPattern"
+      this.toAssignableList(node.elements, binding)
+    } else if (node.type == "SpreadElement") {
+      node.type = "RestElement"
+      node.argument = this.toAssignable(node.argument, binding)
+    } else if (node.type == "AssignmentExpression") {
+      node.type = "AssignmentPattern"
+      delete node.operator
+    } else {
+      return this.dummyIdent()
+    }
+    return node
+  }
+
+  lp$2.toAssignableList = function(exprList, binding) {
+    var this$1 = this;
+
+    for (var i = 0; i < exprList.length; i++)
+      exprList[i] = this$1.toAssignable(exprList[i], binding)
+    return exprList
+  }
+
+  lp$2.parseFunctionParams = function(params) {
+    params = this.parseExprList(__acorn_js.tokTypes.parenR)
+    return this.toAssignableList(params, true)
+  }
+
+  lp$2.parseMethod = function(isGenerator, isAsync) {
+    var node = this.startNode(), oldInAsync = this.inAsync
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 6)
+      node.generator = !!isGenerator
+    if (this.options.ecmaVersion >= 8)
+      node.async = !!isAsync
+    this.inAsync = node.async
+    node.params = this.parseFunctionParams()
+    node.expression = this.options.ecmaVersion >= 6 && this.tok.type !== __acorn_js.tokTypes.braceL
+    node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+    this.inAsync = oldInAsync
+    return this.finishNode(node, "FunctionExpression")
+  }
+
+  lp$2.parseArrowExpression = function(node, params, isAsync) {
+    var oldInAsync = this.inAsync
+    this.initFunction(node)
+    if (this.options.ecmaVersion >= 8)
+      node.async = !!isAsync
+    this.inAsync = node.async
+    node.params = this.toAssignableList(params, true)
+    node.expression = this.tok.type !== __acorn_js.tokTypes.braceL
+    node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+    this.inAsync = oldInAsync
+    return this.finishNode(node, "ArrowFunctionExpression")
+  }
+
+  lp$2.parseExprList = function(close, allowEmpty) {
+    var this$1 = this;
+
+    this.pushCx()
+    var indent = this.curIndent, line = this.curLineStart, elts = []
+    this.next() // Opening bracket
+    while (!this.closes(close, indent + 1, line)) {
+      if (this$1.eat(__acorn_js.tokTypes.comma)) {
+        elts.push(allowEmpty ? null : this$1.dummyIdent())
+        continue
+      }
+      var elt = this$1.parseMaybeAssign()
+      if (isDummy(elt)) {
+        if (this$1.closes(close, indent, line)) break
+        this$1.next()
+      } else {
+        elts.push(elt)
+      }
+      this$1.eat(__acorn_js.tokTypes.comma)
+    }
+    this.popCx()
+    if (!this.eat(close)) {
+      // If there is no closing brace, make the node span to the start
+      // of the next token (this is useful for Tern)
+      this.last.end = this.tok.start
+      if (this.options.locations) this.last.loc.end = this.tok.loc.start
+    }
+    return elts
+  }
+
+  lp$2.parseAwait = function() {
+    var node = this.startNode()
+    this.next()
+    node.argument = this.parseMaybeUnary()
+    return this.finishNode(node, "AwaitExpression")
+  }
+
+  __acorn_js.defaultOptions.tabSize = 4
+
+  function parse_dammit(input, options) {
+    var p = new LooseParser(input, options)
+    p.next()
+    return p.parseTopLevel()
+  }
+
+  __acorn_js.addLooseExports(parse_dammit, LooseParser, pluginsLoose)
+
+  exports.parse_dammit = parse_dammit;
+  exports.LooseParser = LooseParser;
+  exports.pluginsLoose = pluginsLoose;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.es.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.es.js
new file mode 100644
index 0000000000..b717ed996e
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.es.js
@@ -0,0 +1,342 @@
+// AST walker module for Mozilla Parser API compatible trees
+
+// A simple walk is one where you simply specify callbacks to be
+// called on specific nodes. The last two arguments are optional. A
+// simple use would be
+//
+//     walk.simple(myTree, {
+//         Expression: function(node) { ... }
+//     });
+//
+// to do something with all expressions. All Parser API node types
+// can be used to identify node types, as well as Expression,
+// Statement, and ScopeBody, which denote categories of nodes.
+//
+// The base argument can be used to pass a custom (recursive)
+// walker, and state can be used to give this walked an initial
+// state.
+
+function simple(node, visitors, base, state, override) {
+  if (!base) base = exports.base
+  ;(function c(node, st, override) {
+    var type = override || node.type, found = visitors[type]
+    base[type](node, st, c)
+    if (found) found(node, st)
+  })(node, state, override)
+}
+
+// An ancestor walk keeps an array of ancestor nodes (including the
+// current node) and passes them to the callback as third parameter
+// (and also as state parameter when no other state is present).
+function ancestor(node, visitors, base, state) {
+  if (!base) base = exports.base
+  var ancestors = []
+  ;(function c(node, st, override) {
+    var type = override || node.type, found = visitors[type]
+    var isNew = node != ancestors[ancestors.length - 1]
+    if (isNew) ancestors.push(node)
+    base[type](node, st, c)
+    if (found) found(node, st || ancestors, ancestors)
+    if (isNew) ancestors.pop()
+  })(node, state)
+}
+
+// A recursive walk is one where your functions override the default
+// walkers. They can modify and replace the state parameter that's
+// threaded through the walk, and can opt how and whether to walk
+// their child nodes (by calling their third argument on these
+// nodes).
+function recursive(node, state, funcs, base, override) {
+  var visitor = funcs ? exports.make(funcs, base) : base
+  ;(function c(node, st, override) {
+    visitor[override || node.type](node, st, c)
+  })(node, state, override)
+}
+
+function makeTest(test) {
+  if (typeof test == "string")
+    return function (type) { return type == test; }
+  else if (!test)
+    return function () { return true; }
+  else
+    return test
+}
+
+var Found = function Found(node, state) { this.node = node; this.state = state };
+
+// Find a node with a given start, end, and type (all are optional,
+// null can be used as wildcard). Returns a {node, state} object, or
+// undefined when it doesn't find a matching node.
+function findNodeAt(node, start, end, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      var type = override || node.type
+      if ((start == null || node.start <= start) &&
+          (end == null || node.end >= end))
+        base[type](node, st, c)
+      if ((start == null || node.start == start) &&
+          (end == null || node.end == end) &&
+          test(type, node))
+        throw new Found(node, st)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the innermost node of a given type that contains the given
+// position. Interface similar to findNodeAt.
+function findNodeAround(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      var type = override || node.type
+      if (node.start > pos || node.end < pos) return
+      base[type](node, st, c)
+      if (test(type, node)) throw new Found(node, st)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the outermost matching node after a given position.
+function findNodeAfter(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      if (node.end < pos) return
+      var type = override || node.type
+      if (node.start >= pos && test(type, node)) throw new Found(node, st)
+      base[type](node, st, c)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the outermost matching node before a given position.
+function findNodeBefore(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  var max
+  ;(function c(node, st, override) {
+    if (node.start > pos) return
+    var type = override || node.type
+    if (node.end <= pos && (!max || max.node.end < node.end) && test(type, node))
+      max = new Found(node, st)
+    base[type](node, st, c)
+  })(node, state)
+  return max
+}
+
+// Fallback to an Object.create polyfill for older environments.
+var create = Object.create || function(proto) {
+  function Ctor() {}
+  Ctor.prototype = proto
+  return new Ctor
+}
+
+// Used to create a custom walker. Will fill in all missing node
+// type properties with the defaults.
+function make(funcs, base) {
+  if (!base) base = exports.base
+  var visitor = create(base)
+  for (var type in funcs) visitor[type] = funcs[type]
+  return visitor
+}
+
+function skipThrough(node, st, c) { c(node, st) }
+function ignore(_node, _st, _c) {}
+
+// Node walkers.
+
+var base = {}
+
+base.Program = base.BlockStatement = function (node, st, c) {
+  for (var i = 0; i < node.body.length; ++i)
+    c(node.body[i], st, "Statement")
+}
+base.Statement = skipThrough
+base.EmptyStatement = ignore
+base.ExpressionStatement = base.ParenthesizedExpression =
+  function (node, st, c) { return c(node.expression, st, "Expression"); }
+base.IfStatement = function (node, st, c) {
+  c(node.test, st, "Expression")
+  c(node.consequent, st, "Statement")
+  if (node.alternate) c(node.alternate, st, "Statement")
+}
+base.LabeledStatement = function (node, st, c) { return c(node.body, st, "Statement"); }
+base.BreakStatement = base.ContinueStatement = ignore
+base.WithStatement = function (node, st, c) {
+  c(node.object, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.SwitchStatement = function (node, st, c) {
+  c(node.discriminant, st, "Expression")
+  for (var i = 0; i < node.cases.length; ++i) {
+    var cs = node.cases[i]
+    if (cs.test) c(cs.test, st, "Expression")
+    for (var j = 0; j < cs.consequent.length; ++j)
+      c(cs.consequent[j], st, "Statement")
+  }
+}
+base.ReturnStatement = base.YieldExpression = base.AwaitExpression = function (node, st, c) {
+  if (node.argument) c(node.argument, st, "Expression")
+}
+base.ThrowStatement = base.SpreadElement =
+  function (node, st, c) { return c(node.argument, st, "Expression"); }
+base.TryStatement = function (node, st, c) {
+  c(node.block, st, "Statement")
+  if (node.handler) c(node.handler, st)
+  if (node.finalizer) c(node.finalizer, st, "Statement")
+}
+base.CatchClause = function (node, st, c) {
+  c(node.param, st, "Pattern")
+  c(node.body, st, "ScopeBody")
+}
+base.WhileStatement = base.DoWhileStatement = function (node, st, c) {
+  c(node.test, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForStatement = function (node, st, c) {
+  if (node.init) c(node.init, st, "ForInit")
+  if (node.test) c(node.test, st, "Expression")
+  if (node.update) c(node.update, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForInStatement = base.ForOfStatement = function (node, st, c) {
+  c(node.left, st, "ForInit")
+  c(node.right, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForInit = function (node, st, c) {
+  if (node.type == "VariableDeclaration") c(node, st)
+  else c(node, st, "Expression")
+}
+base.DebuggerStatement = ignore
+
+base.FunctionDeclaration = function (node, st, c) { return c(node, st, "Function"); }
+base.VariableDeclaration = function (node, st, c) {
+  for (var i = 0; i < node.declarations.length; ++i)
+    c(node.declarations[i], st)
+}
+base.VariableDeclarator = function (node, st, c) {
+  c(node.id, st, "Pattern")
+  if (node.init) c(node.init, st, "Expression")
+}
+
+base.Function = function (node, st, c) {
+  if (node.id) c(node.id, st, "Pattern")
+  for (var i = 0; i < node.params.length; i++)
+    c(node.params[i], st, "Pattern")
+  c(node.body, st, node.expression ? "ScopeExpression" : "ScopeBody")
+}
+// FIXME drop these node types in next major version
+// (They are awkward, and in ES6 every block can be a scope.)
+base.ScopeBody = function (node, st, c) { return c(node, st, "Statement"); }
+base.ScopeExpression = function (node, st, c) { return c(node, st, "Expression"); }
+
+base.Pattern = function (node, st, c) {
+  if (node.type == "Identifier")
+    c(node, st, "VariablePattern")
+  else if (node.type == "MemberExpression")
+    c(node, st, "MemberPattern")
+  else
+    c(node, st)
+}
+base.VariablePattern = ignore
+base.MemberPattern = skipThrough
+base.RestElement = function (node, st, c) { return c(node.argument, st, "Pattern"); }
+base.ArrayPattern =  function (node, st, c) {
+  for (var i = 0; i < node.elements.length; ++i) {
+    var elt = node.elements[i]
+    if (elt) c(elt, st, "Pattern")
+  }
+}
+base.ObjectPattern = function (node, st, c) {
+  for (var i = 0; i < node.properties.length; ++i)
+    c(node.properties[i].value, st, "Pattern")
+}
+
+base.Expression = skipThrough
+base.ThisExpression = base.Super = base.MetaProperty = ignore
+base.ArrayExpression = function (node, st, c) {
+  for (var i = 0; i < node.elements.length; ++i) {
+    var elt = node.elements[i]
+    if (elt) c(elt, st, "Expression")
+  }
+}
+base.ObjectExpression = function (node, st, c) {
+  for (var i = 0; i < node.properties.length; ++i)
+    c(node.properties[i], st)
+}
+base.FunctionExpression = base.ArrowFunctionExpression = base.FunctionDeclaration
+base.SequenceExpression = base.TemplateLiteral = function (node, st, c) {
+  for (var i = 0; i < node.expressions.length; ++i)
+    c(node.expressions[i], st, "Expression")
+}
+base.UnaryExpression = base.UpdateExpression = function (node, st, c) {
+  c(node.argument, st, "Expression")
+}
+base.BinaryExpression = base.LogicalExpression = function (node, st, c) {
+  c(node.left, st, "Expression")
+  c(node.right, st, "Expression")
+}
+base.AssignmentExpression = base.AssignmentPattern = function (node, st, c) {
+  c(node.left, st, "Pattern")
+  c(node.right, st, "Expression")
+}
+base.ConditionalExpression = function (node, st, c) {
+  c(node.test, st, "Expression")
+  c(node.consequent, st, "Expression")
+  c(node.alternate, st, "Expression")
+}
+base.NewExpression = base.CallExpression = function (node, st, c) {
+  c(node.callee, st, "Expression")
+  if (node.arguments) for (var i = 0; i < node.arguments.length; ++i)
+    c(node.arguments[i], st, "Expression")
+}
+base.MemberExpression = function (node, st, c) {
+  c(node.object, st, "Expression")
+  if (node.computed) c(node.property, st, "Expression")
+}
+base.ExportNamedDeclaration = base.ExportDefaultDeclaration = function (node, st, c) {
+  if (node.declaration)
+    c(node.declaration, st, node.type == "ExportNamedDeclaration" || node.declaration.id ? "Statement" : "Expression")
+  if (node.source) c(node.source, st, "Expression")
+}
+base.ExportAllDeclaration = function (node, st, c) {
+  c(node.source, st, "Expression")
+}
+base.ImportDeclaration = function (node, st, c) {
+  for (var i = 0; i < node.specifiers.length; i++)
+    c(node.specifiers[i], st)
+  c(node.source, st, "Expression")
+}
+base.ImportSpecifier = base.ImportDefaultSpecifier = base.ImportNamespaceSpecifier = base.Identifier = base.Literal = ignore
+
+base.TaggedTemplateExpression = function (node, st, c) {
+  c(node.tag, st, "Expression")
+  c(node.quasi, st)
+}
+base.ClassDeclaration = base.ClassExpression = function (node, st, c) { return c(node, st, "Class"); }
+base.Class = function (node, st, c) {
+  if (node.id) c(node.id, st, "Pattern")
+  if (node.superClass) c(node.superClass, st, "Expression")
+  for (var i = 0; i < node.body.body.length; i++)
+    c(node.body.body[i], st)
+}
+base.MethodDefinition = base.Property = function (node, st, c) {
+  if (node.computed) c(node.key, st, "Expression")
+  c(node.value, st, "Expression")
+}
+
+export { simple, ancestor, recursive, findNodeAt, findNodeAround, findNodeAfter, findNodeBefore, make, base };
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.js
new file mode 100644
index 0000000000..250a3edc35
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/dist/walk.js
@@ -0,0 +1,360 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (factory((global.acorn = global.acorn || {}, global.acorn.walk = global.acorn.walk || {})));
+}(this, function (exports) { 'use strict';
+
+  // AST walker module for Mozilla Parser API compatible trees
+
+  // A simple walk is one where you simply specify callbacks to be
+  // called on specific nodes. The last two arguments are optional. A
+  // simple use would be
+  //
+  //     walk.simple(myTree, {
+  //         Expression: function(node) { ... }
+  //     });
+  //
+  // to do something with all expressions. All Parser API node types
+  // can be used to identify node types, as well as Expression,
+  // Statement, and ScopeBody, which denote categories of nodes.
+  //
+  // The base argument can be used to pass a custom (recursive)
+  // walker, and state can be used to give this walked an initial
+  // state.
+
+  function simple(node, visitors, base, state, override) {
+    if (!base) base = exports.base
+    ;(function c(node, st, override) {
+      var type = override || node.type, found = visitors[type]
+      base[type](node, st, c)
+      if (found) found(node, st)
+    })(node, state, override)
+  }
+
+  // An ancestor walk keeps an array of ancestor nodes (including the
+  // current node) and passes them to the callback as third parameter
+  // (and also as state parameter when no other state is present).
+  function ancestor(node, visitors, base, state) {
+    if (!base) base = exports.base
+    var ancestors = []
+    ;(function c(node, st, override) {
+      var type = override || node.type, found = visitors[type]
+      var isNew = node != ancestors[ancestors.length - 1]
+      if (isNew) ancestors.push(node)
+      base[type](node, st, c)
+      if (found) found(node, st || ancestors, ancestors)
+      if (isNew) ancestors.pop()
+    })(node, state)
+  }
+
+  // A recursive walk is one where your functions override the default
+  // walkers. They can modify and replace the state parameter that's
+  // threaded through the walk, and can opt how and whether to walk
+  // their child nodes (by calling their third argument on these
+  // nodes).
+  function recursive(node, state, funcs, base, override) {
+    var visitor = funcs ? exports.make(funcs, base) : base
+    ;(function c(node, st, override) {
+      visitor[override || node.type](node, st, c)
+    })(node, state, override)
+  }
+
+  function makeTest(test) {
+    if (typeof test == "string")
+      return function (type) { return type == test; }
+    else if (!test)
+      return function () { return true; }
+    else
+      return test
+  }
+
+  var Found = function Found(node, state) { this.node = node; this.state = state };
+
+  // Find a node with a given start, end, and type (all are optional,
+  // null can be used as wildcard). Returns a {node, state} object, or
+  // undefined when it doesn't find a matching node.
+  function findNodeAt(node, start, end, test, base, state) {
+    test = makeTest(test)
+    if (!base) base = exports.base
+    try {
+      ;(function c(node, st, override) {
+        var type = override || node.type
+        if ((start == null || node.start <= start) &&
+            (end == null || node.end >= end))
+          base[type](node, st, c)
+        if ((start == null || node.start == start) &&
+            (end == null || node.end == end) &&
+            test(type, node))
+          throw new Found(node, st)
+      })(node, state)
+    } catch (e) {
+      if (e instanceof Found) return e
+      throw e
+    }
+  }
+
+  // Find the innermost node of a given type that contains the given
+  // position. Interface similar to findNodeAt.
+  function findNodeAround(node, pos, test, base, state) {
+    test = makeTest(test)
+    if (!base) base = exports.base
+    try {
+      ;(function c(node, st, override) {
+        var type = override || node.type
+        if (node.start > pos || node.end < pos) return
+        base[type](node, st, c)
+        if (test(type, node)) throw new Found(node, st)
+      })(node, state)
+    } catch (e) {
+      if (e instanceof Found) return e
+      throw e
+    }
+  }
+
+  // Find the outermost matching node after a given position.
+  function findNodeAfter(node, pos, test, base, state) {
+    test = makeTest(test)
+    if (!base) base = exports.base
+    try {
+      ;(function c(node, st, override) {
+        if (node.end < pos) return
+        var type = override || node.type
+        if (node.start >= pos && test(type, node)) throw new Found(node, st)
+        base[type](node, st, c)
+      })(node, state)
+    } catch (e) {
+      if (e instanceof Found) return e
+      throw e
+    }
+  }
+
+  // Find the outermost matching node before a given position.
+  function findNodeBefore(node, pos, test, base, state) {
+    test = makeTest(test)
+    if (!base) base = exports.base
+    var max
+    ;(function c(node, st, override) {
+      if (node.start > pos) return
+      var type = override || node.type
+      if (node.end <= pos && (!max || max.node.end < node.end) && test(type, node))
+        max = new Found(node, st)
+      base[type](node, st, c)
+    })(node, state)
+    return max
+  }
+
+  // Fallback to an Object.create polyfill for older environments.
+  var create = Object.create || function(proto) {
+    function Ctor() {}
+    Ctor.prototype = proto
+    return new Ctor
+  }
+
+  // Used to create a custom walker. Will fill in all missing node
+  // type properties with the defaults.
+  function make(funcs, base) {
+    if (!base) base = exports.base
+    var visitor = create(base)
+    for (var type in funcs) visitor[type] = funcs[type]
+    return visitor
+  }
+
+  function skipThrough(node, st, c) { c(node, st) }
+  function ignore(_node, _st, _c) {}
+
+  // Node walkers.
+
+  var base = {}
+
+  base.Program = base.BlockStatement = function (node, st, c) {
+    for (var i = 0; i < node.body.length; ++i)
+      c(node.body[i], st, "Statement")
+  }
+  base.Statement = skipThrough
+  base.EmptyStatement = ignore
+  base.ExpressionStatement = base.ParenthesizedExpression =
+    function (node, st, c) { return c(node.expression, st, "Expression"); }
+  base.IfStatement = function (node, st, c) {
+    c(node.test, st, "Expression")
+    c(node.consequent, st, "Statement")
+    if (node.alternate) c(node.alternate, st, "Statement")
+  }
+  base.LabeledStatement = function (node, st, c) { return c(node.body, st, "Statement"); }
+  base.BreakStatement = base.ContinueStatement = ignore
+  base.WithStatement = function (node, st, c) {
+    c(node.object, st, "Expression")
+    c(node.body, st, "Statement")
+  }
+  base.SwitchStatement = function (node, st, c) {
+    c(node.discriminant, st, "Expression")
+    for (var i = 0; i < node.cases.length; ++i) {
+      var cs = node.cases[i]
+      if (cs.test) c(cs.test, st, "Expression")
+      for (var j = 0; j < cs.consequent.length; ++j)
+        c(cs.consequent[j], st, "Statement")
+    }
+  }
+  base.ReturnStatement = base.YieldExpression = base.AwaitExpression = function (node, st, c) {
+    if (node.argument) c(node.argument, st, "Expression")
+  }
+  base.ThrowStatement = base.SpreadElement =
+    function (node, st, c) { return c(node.argument, st, "Expression"); }
+  base.TryStatement = function (node, st, c) {
+    c(node.block, st, "Statement")
+    if (node.handler) c(node.handler, st)
+    if (node.finalizer) c(node.finalizer, st, "Statement")
+  }
+  base.CatchClause = function (node, st, c) {
+    c(node.param, st, "Pattern")
+    c(node.body, st, "ScopeBody")
+  }
+  base.WhileStatement = base.DoWhileStatement = function (node, st, c) {
+    c(node.test, st, "Expression")
+    c(node.body, st, "Statement")
+  }
+  base.ForStatement = function (node, st, c) {
+    if (node.init) c(node.init, st, "ForInit")
+    if (node.test) c(node.test, st, "Expression")
+    if (node.update) c(node.update, st, "Expression")
+    c(node.body, st, "Statement")
+  }
+  base.ForInStatement = base.ForOfStatement = function (node, st, c) {
+    c(node.left, st, "ForInit")
+    c(node.right, st, "Expression")
+    c(node.body, st, "Statement")
+  }
+  base.ForInit = function (node, st, c) {
+    if (node.type == "VariableDeclaration") c(node, st)
+    else c(node, st, "Expression")
+  }
+  base.DebuggerStatement = ignore
+
+  base.FunctionDeclaration = function (node, st, c) { return c(node, st, "Function"); }
+  base.VariableDeclaration = function (node, st, c) {
+    for (var i = 0; i < node.declarations.length; ++i)
+      c(node.declarations[i], st)
+  }
+  base.VariableDeclarator = function (node, st, c) {
+    c(node.id, st, "Pattern")
+    if (node.init) c(node.init, st, "Expression")
+  }
+
+  base.Function = function (node, st, c) {
+    if (node.id) c(node.id, st, "Pattern")
+    for (var i = 0; i < node.params.length; i++)
+      c(node.params[i], st, "Pattern")
+    c(node.body, st, node.expression ? "ScopeExpression" : "ScopeBody")
+  }
+  // FIXME drop these node types in next major version
+  // (They are awkward, and in ES6 every block can be a scope.)
+  base.ScopeBody = function (node, st, c) { return c(node, st, "Statement"); }
+  base.ScopeExpression = function (node, st, c) { return c(node, st, "Expression"); }
+
+  base.Pattern = function (node, st, c) {
+    if (node.type == "Identifier")
+      c(node, st, "VariablePattern")
+    else if (node.type == "MemberExpression")
+      c(node, st, "MemberPattern")
+    else
+      c(node, st)
+  }
+  base.VariablePattern = ignore
+  base.MemberPattern = skipThrough
+  base.RestElement = function (node, st, c) { return c(node.argument, st, "Pattern"); }
+  base.ArrayPattern =  function (node, st, c) {
+    for (var i = 0; i < node.elements.length; ++i) {
+      var elt = node.elements[i]
+      if (elt) c(elt, st, "Pattern")
+    }
+  }
+  base.ObjectPattern = function (node, st, c) {
+    for (var i = 0; i < node.properties.length; ++i)
+      c(node.properties[i].value, st, "Pattern")
+  }
+
+  base.Expression = skipThrough
+  base.ThisExpression = base.Super = base.MetaProperty = ignore
+  base.ArrayExpression = function (node, st, c) {
+    for (var i = 0; i < node.elements.length; ++i) {
+      var elt = node.elements[i]
+      if (elt) c(elt, st, "Expression")
+    }
+  }
+  base.ObjectExpression = function (node, st, c) {
+    for (var i = 0; i < node.properties.length; ++i)
+      c(node.properties[i], st)
+  }
+  base.FunctionExpression = base.ArrowFunctionExpression = base.FunctionDeclaration
+  base.SequenceExpression = base.TemplateLiteral = function (node, st, c) {
+    for (var i = 0; i < node.expressions.length; ++i)
+      c(node.expressions[i], st, "Expression")
+  }
+  base.UnaryExpression = base.UpdateExpression = function (node, st, c) {
+    c(node.argument, st, "Expression")
+  }
+  base.BinaryExpression = base.LogicalExpression = function (node, st, c) {
+    c(node.left, st, "Expression")
+    c(node.right, st, "Expression")
+  }
+  base.AssignmentExpression = base.AssignmentPattern = function (node, st, c) {
+    c(node.left, st, "Pattern")
+    c(node.right, st, "Expression")
+  }
+  base.ConditionalExpression = function (node, st, c) {
+    c(node.test, st, "Expression")
+    c(node.consequent, st, "Expression")
+    c(node.alternate, st, "Expression")
+  }
+  base.NewExpression = base.CallExpression = function (node, st, c) {
+    c(node.callee, st, "Expression")
+    if (node.arguments) for (var i = 0; i < node.arguments.length; ++i)
+      c(node.arguments[i], st, "Expression")
+  }
+  base.MemberExpression = function (node, st, c) {
+    c(node.object, st, "Expression")
+    if (node.computed) c(node.property, st, "Expression")
+  }
+  base.ExportNamedDeclaration = base.ExportDefaultDeclaration = function (node, st, c) {
+    if (node.declaration)
+      c(node.declaration, st, node.type == "ExportNamedDeclaration" || node.declaration.id ? "Statement" : "Expression")
+    if (node.source) c(node.source, st, "Expression")
+  }
+  base.ExportAllDeclaration = function (node, st, c) {
+    c(node.source, st, "Expression")
+  }
+  base.ImportDeclaration = function (node, st, c) {
+    for (var i = 0; i < node.specifiers.length; i++)
+      c(node.specifiers[i], st)
+    c(node.source, st, "Expression")
+  }
+  base.ImportSpecifier = base.ImportDefaultSpecifier = base.ImportNamespaceSpecifier = base.Identifier = base.Literal = ignore
+
+  base.TaggedTemplateExpression = function (node, st, c) {
+    c(node.tag, st, "Expression")
+    c(node.quasi, st)
+  }
+  base.ClassDeclaration = base.ClassExpression = function (node, st, c) { return c(node, st, "Class"); }
+  base.Class = function (node, st, c) {
+    if (node.id) c(node.id, st, "Pattern")
+    if (node.superClass) c(node.superClass, st, "Expression")
+    for (var i = 0; i < node.body.body.length; i++)
+      c(node.body.body[i], st)
+  }
+  base.MethodDefinition = base.Property = function (node, st, c) {
+    if (node.computed) c(node.key, st, "Expression")
+    c(node.value, st, "Expression")
+  }
+
+  exports.simple = simple;
+  exports.ancestor = ancestor;
+  exports.recursive = recursive;
+  exports.findNodeAt = findNodeAt;
+  exports.findNodeAround = findNodeAround;
+  exports.findNodeAfter = findNodeAfter;
+  exports.findNodeBefore = findNodeBefore;
+  exports.make = make;
+  exports.base = base;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+}));
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/package.json b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/package.json
new file mode 100644
index 0000000000..6cf55512fe
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/package.json
@@ -0,0 +1,277 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "acorn",
+        "scope": null,
+        "escapedName": "acorn",
+        "name": "acorn",
+        "rawSpec": "",
+        "spec": "latest",
+        "type": "tag"
+      },
+      "/Users/ben/meteor/tools/tests/apps/modules/packages/modules-test-package"
+    ]
+  ],
+  "_from": "acorn@latest",
+  "_id": "acorn@4.0.3",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/acorn",
+  "_nodeVersion": "6.3.0",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/acorn-4.0.3.tgz_1474012883070_0.7297828732989728"
+  },
+  "_npmUser": {
+    "name": "marijn",
+    "email": "marijnh@gmail.com"
+  },
+  "_npmVersion": "3.10.3",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "acorn",
+    "scope": null,
+    "escapedName": "acorn",
+    "name": "acorn",
+    "rawSpec": "",
+    "spec": "latest",
+    "type": "tag"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz",
+  "_shasum": "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1",
+  "_shrinkwrap": null,
+  "_spec": "acorn",
+  "_where": "/Users/ben/meteor/tools/tests/apps/modules/packages/modules-test-package",
+  "bin": {
+    "acorn": "./bin/acorn"
+  },
+  "bugs": {
+    "url": "https://github.com/ternjs/acorn/issues"
+  },
+  "contributors": [
+    {
+      "name": "List of Acorn contributors. Updated before every release."
+    },
+    {
+      "name": "Adrian Rakovsky"
+    },
+    {
+      "name": "Alistair Braidwood"
+    },
+    {
+      "name": "Amila Welihinda"
+    },
+    {
+      "name": "Andres Suarez"
+    },
+    {
+      "name": "Angelo"
+    },
+    {
+      "name": "Aparajita Fishman"
+    },
+    {
+      "name": "Arian Stolwijk"
+    },
+    {
+      "name": "Artem Govorov"
+    },
+    {
+      "name": "Brandon Mills"
+    },
+    {
+      "name": "Charles Hughes"
+    },
+    {
+      "name": "Conrad Irwin"
+    },
+    {
+      "name": "Daniel Tschinder"
+    },
+    {
+      "name": "David Bonnet"
+    },
+    {
+      "name": "Domenico Matteo"
+    },
+    {
+      "name": "Forbes Lindesay"
+    },
+    {
+      "name": "Gilad Peleg"
+    },
+    {
+      "name": "impinball"
+    },
+    {
+      "name": "Ingvar Stepanyan"
+    },
+    {
+      "name": "Jackson Ray Hamilton"
+    },
+    {
+      "name": "Jesse McCarthy"
+    },
+    {
+      "name": "Jiaxing Wang"
+    },
+    {
+      "name": "Joel Kemp"
+    },
+    {
+      "name": "Johannes Herr"
+    },
+    {
+      "name": "Jordan Klassen"
+    },
+    {
+      "name": "Jürg Lehni"
+    },
+    {
+      "name": "keeyipchan"
+    },
+    {
+      "name": "Keheliya Gallaba"
+    },
+    {
+      "name": "Kevin Irish"
+    },
+    {
+      "name": "Kevin Kwok"
+    },
+    {
+      "name": "krator"
+    },
+    {
+      "name": "Marijn Haverbeke"
+    },
+    {
+      "name": "Martin Carlberg"
+    },
+    {
+      "name": "Mathias Bynens"
+    },
+    {
+      "name": "Mathieu 'p01' Henri"
+    },
+    {
+      "name": "Matthew Bastien"
+    },
+    {
+      "name": "Max Schaefer"
+    },
+    {
+      "name": "Max Zerzouri"
+    },
+    {
+      "name": "Mihai Bazon"
+    },
+    {
+      "name": "Mike Rennie"
+    },
+    {
+      "name": "Nicholas C. Zakas"
+    },
+    {
+      "name": "Nick Fitzgerald"
+    },
+    {
+      "name": "Olivier Thomann"
+    },
+    {
+      "name": "Oskar Schöldström"
+    },
+    {
+      "name": "Paul Harper"
+    },
+    {
+      "name": "Peter Rust"
+    },
+    {
+      "name": "PlNG"
+    },
+    {
+      "name": "Prayag Verma"
+    },
+    {
+      "name": "ReadmeCritic"
+    },
+    {
+      "name": "r-e-d"
+    },
+    {
+      "name": "Richard Gibson"
+    },
+    {
+      "name": "Rich Harris"
+    },
+    {
+      "name": "Sebastian McKenzie"
+    },
+    {
+      "name": "Simen Bekkhus"
+    },
+    {
+      "name": "Timothy Gu"
+    },
+    {
+      "name": "Toru Nagashima"
+    },
+    {
+      "name": "zsjforcn"
+    }
+  ],
+  "dependencies": {},
+  "description": "ECMAScript parser",
+  "devDependencies": {
+    "rollup": "^0.34.1",
+    "rollup-plugin-buble": "^0.11.0",
+    "unicode-9.0.0": "^0.7.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1",
+    "tarball": "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"
+  },
+  "engines": {
+    "node": ">=0.4.0"
+  },
+  "gitHead": "bb54adcdbceef01997a9549732139ca8f53a4e28",
+  "homepage": "https://github.com/ternjs/acorn",
+  "jsnext:main": "dist/acorn.es.js",
+  "license": "MIT",
+  "main": "dist/acorn.js",
+  "maintainers": [
+    {
+      "name": "marijn",
+      "email": "marijnh@gmail.com"
+    },
+    {
+      "name": "rreverser",
+      "email": "me@rreverser.com"
+    }
+  ],
+  "name": "acorn",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ternjs/acorn.git"
+  },
+  "scripts": {
+    "build": "npm run build:main && npm run build:walk && npm run build:loose && npm run build:bin",
+    "build:bin": "rollup -c rollup/config.bin.js",
+    "build:loose": "rollup -c rollup/config.loose.js",
+    "build:main": "rollup -c rollup/config.main.js",
+    "build:walk": "rollup -c rollup/config.walk.js",
+    "prepublish": "npm test",
+    "pretest": "npm run build",
+    "test": "node test/run.js"
+  },
+  "version": "4.0.3"
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.bin.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.bin.js
new file mode 100644
index 0000000000..3726606e0d
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.bin.js
@@ -0,0 +1,15 @@
+import buble from 'rollup-plugin-buble'
+
+export default {
+  entry: 'src/bin/acorn.js',
+  dest: 'bin/acorn',
+  format: 'cjs',
+  banner: '#!/usr/bin/env node',
+  external: [ 'fs', 'path', 'acorn' ],
+  paths: {
+    acorn: '../dist/acorn.js'
+  },
+  plugins: [
+    buble()
+  ]
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.loose.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.loose.js
new file mode 100644
index 0000000000..273e7a9265
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.loose.js
@@ -0,0 +1,22 @@
+import buble from 'rollup-plugin-buble'
+import {resolve} from 'path'
+
+var acorn = resolve('src/index.js')
+var paths = {}, globals = {}
+paths[acorn] = './acorn.js'
+globals[acorn] = 'acorn'
+
+export default {
+  entry: 'src/loose/index.js',
+  moduleName: 'acorn.loose',
+  external: [ acorn ],
+  paths: paths,
+  globals: globals,
+  targets: [
+    { dest: 'dist/acorn_loose.js', format: 'umd' },
+    { dest: 'dist/acorn_loose.es.js', format: 'es' }
+  ],
+  plugins: [
+    buble()
+  ]
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.main.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.main.js
new file mode 100644
index 0000000000..730b79b2fe
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.main.js
@@ -0,0 +1,11 @@
+import buble from 'rollup-plugin-buble';
+
+export default {
+	entry: 'src/index.js',
+	moduleName: 'acorn',
+	plugins: [ buble() ],
+	targets: [
+		{ dest: 'dist/acorn.js', format: 'umd' },
+		{ dest: 'dist/acorn.es.js', format: 'es' }
+	]
+};
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.walk.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.walk.js
new file mode 100644
index 0000000000..95f2a93db1
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/rollup/config.walk.js
@@ -0,0 +1,11 @@
+import buble from 'rollup-plugin-buble';
+
+export default {
+	entry: 'src/walk/index.js',
+	moduleName: 'acorn.walk',
+	plugins: [ buble() ],
+	targets: [
+		{ dest: 'dist/walk.js', format: 'umd' },
+		{ dest: 'dist/walk.es.js', format: 'es' }
+	]
+};
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/bin/acorn.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/bin/acorn.js
new file mode 100644
index 0000000000..62e0dad188
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/bin/acorn.js
@@ -0,0 +1,60 @@
+import {basename} from "path"
+import {readFileSync as readFile} from "fs"
+import * as acorn from "acorn"
+
+let infile, forceFile, silent = false, compact = false, tokenize = false
+const options = {}
+
+function help(status) {
+  const print = (status == 0) ? console.log : console.error
+  print("usage: " + basename(process.argv[1]) + " [--ecma3|--ecma5|--ecma6|--ecma7|...|--ecma2015|--ecma2016|...]")
+  print("        [--tokenize] [--locations] [---allow-hash-bang] [--compact] [--silent] [--module] [--help] [--] [infile]")
+  process.exit(status)
+}
+
+for (let i = 2; i < process.argv.length; ++i) {
+  const arg = process.argv[i]
+  if ((arg == "-" || arg[0] != "-") && !infile) infile = arg
+  else if (arg == "--" && !infile && i + 2 == process.argv.length) forceFile = infile = process.argv[++i]
+  else if (arg == "--locations") options.locations = true
+  else if (arg == "--allow-hash-bang") options.allowHashBang = true
+  else if (arg == "--silent") silent = true
+  else if (arg == "--compact") compact = true
+  else if (arg == "--help") help(0)
+  else if (arg == "--tokenize") tokenize = true
+  else if (arg == "--module") options.sourceType = 'module'
+  else {
+    let match = arg.match(/^--ecma(\d+)$/)
+    if (match)
+      options.ecmaVersion = +match[1]
+    else
+      help(1)
+  }
+}
+
+function run(code) {
+  let result
+  if (!tokenize) {
+    try { result = acorn.parse(code, options) }
+    catch(e) { console.error(e.message); process.exit(1) }
+  } else {
+    result = []
+    let tokenizer = acorn.tokenizer(code, options), token
+    while (true) {
+      try { token = tokenizer.getToken() }
+      catch(e) { console.error(e.message); process.exit(1) }
+      result.push(token)
+      if (token.type == acorn.tokTypes.eof) break
+    }
+  }
+  if (!silent) console.log(JSON.stringify(result, null, compact ? null : 2))
+}
+
+if (forceFile || infile && infile != "-") {
+  run(readFile(infile, "utf8"))
+} else {
+  let code = ""
+  process.stdin.resume()
+  process.stdin.on("data", chunk => code += chunk)
+  process.stdin.on("end", () => run(code))
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/expression.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/expression.js
new file mode 100644
index 0000000000..f8a7e0fff9
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/expression.js
@@ -0,0 +1,798 @@
+// A recursive descent parser operates by defining functions for all
+// syntactic elements, and recursively calling those, each function
+// advancing the input stream and returning an AST node. Precedence
+// of constructs (for example, the fact that `!x[1]` means `!(x[1])`
+// instead of `(!x)[1]` is handled by the fact that the parser
+// function that parses unary prefix operators is called first, and
+// in turn calls the function that parses `[]` subscripts — that
+// way, it'll receive the node for `x[1]` already parsed, and wraps
+// *that* in the unary operator node.
+//
+// Acorn uses an [operator precedence parser][opp] to handle binary
+// operator precedence, because it is much more compact than using
+// the technique outlined above, which uses different, nesting
+// functions to specify precedence, for all of the ten binary
+// precedence levels that JavaScript defines.
+//
+// [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
+
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {DestructuringErrors} from "./parseutil"
+
+const pp = Parser.prototype
+
+// Check if property name clashes with already added.
+// Object/class getters and setters are not allowed to clash —
+// either with each other or with an init property — and in
+// strict mode, init properties are also not allowed to be repeated.
+
+pp.checkPropClash = function(prop, propHash) {
+  if (this.options.ecmaVersion >= 6 && (prop.computed || prop.method || prop.shorthand))
+    return
+  let {key} = prop, name
+  switch (key.type) {
+  case "Identifier": name = key.name; break
+  case "Literal": name = String(key.value); break
+  default: return
+  }
+  let {kind} = prop
+  if (this.options.ecmaVersion >= 6) {
+    if (name === "__proto__" && kind === "init") {
+      if (propHash.proto) this.raiseRecoverable(key.start, "Redefinition of __proto__ property")
+      propHash.proto = true
+    }
+    return
+  }
+  name = "$" + name
+  let other = propHash[name]
+  if (other) {
+    let isGetSet = kind !== "init"
+    if ((this.strict || isGetSet) && other[kind] || !(isGetSet ^ other.init))
+      this.raiseRecoverable(key.start, "Redefinition of property")
+  } else {
+    other = propHash[name] = {
+      init: false,
+      get: false,
+      set: false
+    }
+  }
+  other[kind] = true
+}
+
+// ### Expression parsing
+
+// These nest, from the most general expression type at the top to
+// 'atomic', nondivisible expression types at the bottom. Most of
+// the functions will simply let the function(s) below them parse,
+// and, *if* the syntactic construct they handle is present, wrap
+// the AST node that the inner parser gave them in another node.
+
+// Parse a full expression. The optional arguments are used to
+// forbid the `in` operator (in for loops initalization expressions)
+// and provide reference for storing '=' operator inside shorthand
+// property assignment in contexts where both object expression
+// and object pattern might appear (so it's possible to raise
+// delayed syntax error at correct position).
+
+pp.parseExpression = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseMaybeAssign(noIn, refDestructuringErrors)
+  if (this.type === tt.comma) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.expressions = [expr]
+    while (this.eat(tt.comma)) node.expressions.push(this.parseMaybeAssign(noIn, refDestructuringErrors))
+    return this.finishNode(node, "SequenceExpression")
+  }
+  return expr
+}
+
+// Parse an assignment expression. This includes applications of
+// operators like `+=`.
+
+pp.parseMaybeAssign = function(noIn, refDestructuringErrors, afterLeftParse) {
+  if (this.inGenerator && this.isContextual("yield")) return this.parseYield()
+
+  let ownDestructuringErrors = false
+  if (!refDestructuringErrors) {
+    refDestructuringErrors = new DestructuringErrors
+    ownDestructuringErrors = true
+  }
+  let startPos = this.start, startLoc = this.startLoc
+  if (this.type == tt.parenL || this.type == tt.name)
+    this.potentialArrowAt = this.start
+  let left = this.parseMaybeConditional(noIn, refDestructuringErrors)
+  if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc)
+  if (this.type.isAssign) {
+    this.checkPatternErrors(refDestructuringErrors, true)
+    if (!ownDestructuringErrors) DestructuringErrors.call(refDestructuringErrors)
+    let node = this.startNodeAt(startPos, startLoc)
+    node.operator = this.value
+    node.left = this.type === tt.eq ? this.toAssignable(left) : left
+    refDestructuringErrors.shorthandAssign = 0 // reset because shorthand default was used correctly
+    this.checkLVal(left)
+    this.next()
+    node.right = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "AssignmentExpression")
+  } else {
+    if (ownDestructuringErrors) this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  return left
+}
+
+// Parse a ternary conditional (`?:`) operator.
+
+pp.parseMaybeConditional = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseExprOps(noIn, refDestructuringErrors)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  if (this.eat(tt.question)) {
+    let node = this.startNodeAt(startPos, startLoc)
+    node.test = expr
+    node.consequent = this.parseMaybeAssign()
+    this.expect(tt.colon)
+    node.alternate = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "ConditionalExpression")
+  }
+  return expr
+}
+
+// Start the precedence parser.
+
+pp.parseExprOps = function(noIn, refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseMaybeUnary(refDestructuringErrors, false)
+  if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+  return this.parseExprOp(expr, startPos, startLoc, -1, noIn)
+}
+
+// Parse binary operators with the operator precedence parsing
+// algorithm. `left` is the left-hand side of the operator.
+// `minPrec` provides context that allows the function to stop and
+// defer further parser to one of its callers when it encounters an
+// operator that has a lower precedence than the set it is parsing.
+
+pp.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {
+  let prec = this.type.binop
+  if (prec != null && (!noIn || this.type !== tt._in)) {
+    if (prec > minPrec) {
+      let logical = this.type === tt.logicalOR || this.type === tt.logicalAND
+      let op = this.value
+      this.next()
+      let startPos = this.start, startLoc = this.startLoc
+      let right = this.parseExprOp(this.parseMaybeUnary(null, false), startPos, startLoc, prec, noIn)
+      let node = this.buildBinary(leftStartPos, leftStartLoc, left, right, op, logical)
+      return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn)
+    }
+  }
+  return left
+}
+
+pp.buildBinary = function(startPos, startLoc, left, right, op, logical) {
+  let node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.operator = op
+  node.right = right
+  return this.finishNode(node, logical ? "LogicalExpression" : "BinaryExpression")
+}
+
+// Parse unary operators, both prefix and postfix.
+
+pp.parseMaybeUnary = function(refDestructuringErrors, sawUnary) {
+  let startPos = this.start, startLoc = this.startLoc, expr
+  if (this.inAsync && this.isContextual("await")) {
+    expr = this.parseAwait(refDestructuringErrors)
+    sawUnary = true
+  } else if (this.type.prefix) {
+    let node = this.startNode(), update = this.type === tt.incDec
+    node.operator = this.value
+    node.prefix = true
+    this.next()
+    node.argument = this.parseMaybeUnary(null, true)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    if (update) this.checkLVal(node.argument)
+    else if (this.strict && node.operator === "delete" &&
+             node.argument.type === "Identifier")
+      this.raiseRecoverable(node.start, "Deleting local variable in strict mode")
+    else sawUnary = true
+    expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+  } else {
+    expr = this.parseExprSubscripts(refDestructuringErrors)
+    if (this.checkExpressionErrors(refDestructuringErrors)) return expr
+    while (this.type.postfix && !this.canInsertSemicolon()) {
+      let node = this.startNodeAt(startPos, startLoc)
+      node.operator = this.value
+      node.prefix = false
+      node.argument = expr
+      this.checkLVal(expr)
+      this.next()
+      expr = this.finishNode(node, "UpdateExpression")
+    }
+  }
+
+  if (!sawUnary && this.eat(tt.starstar))
+    return this.buildBinary(startPos, startLoc, expr, this.parseMaybeUnary(null, false), "**", false)
+  else
+    return expr
+}
+
+// Parse call, dot, and `[]`-subscript expressions.
+
+pp.parseExprSubscripts = function(refDestructuringErrors) {
+  let startPos = this.start, startLoc = this.startLoc
+  let expr = this.parseExprAtom(refDestructuringErrors)
+  let skipArrowSubscripts = expr.type === "ArrowFunctionExpression" && this.input.slice(this.lastTokStart, this.lastTokEnd) !== ")"
+  if (this.checkExpressionErrors(refDestructuringErrors) || skipArrowSubscripts) return expr
+  return this.parseSubscripts(expr, startPos, startLoc)
+}
+
+pp.parseSubscripts = function(base, startPos, startLoc, noCalls) {
+  for (;;) {
+    let maybeAsyncArrow = this.options.ecmaVersion >= 8 && base.type === "Identifier" && base.name === "async" && !this.canInsertSemicolon()
+    if (this.eat(tt.dot)) {
+      let node = this.startNodeAt(startPos, startLoc)
+      node.object = base
+      node.property = this.parseIdent(true)
+      node.computed = false
+      base = this.finishNode(node, "MemberExpression")
+    } else if (this.eat(tt.bracketL)) {
+      let node = this.startNodeAt(startPos, startLoc)
+      node.object = base
+      node.property = this.parseExpression()
+      node.computed = true
+      this.expect(tt.bracketR)
+      base = this.finishNode(node, "MemberExpression")
+    } else if (!noCalls && this.eat(tt.parenL)) {
+      let refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+      this.yieldPos = 0
+      this.awaitPos = 0
+      let exprList = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false, refDestructuringErrors)
+      if (maybeAsyncArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+        this.checkPatternErrors(refDestructuringErrors, true)
+        this.checkYieldAwaitInDefaultParams()
+        this.yieldPos = oldYieldPos
+        this.awaitPos = oldAwaitPos
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList, true)
+      }
+      this.checkExpressionErrors(refDestructuringErrors, true)
+      this.yieldPos = oldYieldPos || this.yieldPos
+      this.awaitPos = oldAwaitPos || this.awaitPos
+      let node = this.startNodeAt(startPos, startLoc)
+      node.callee = base
+      node.arguments = exprList
+      base = this.finishNode(node, "CallExpression")
+    } else if (this.type === tt.backQuote) {
+      let node = this.startNodeAt(startPos, startLoc)
+      node.tag = base
+      node.quasi = this.parseTemplate()
+      base = this.finishNode(node, "TaggedTemplateExpression")
+    } else {
+      return base
+    }
+  }
+}
+
+// Parse an atomic expression — either a single token that is an
+// expression, an expression started by a keyword like `function` or
+// `new`, or an expression wrapped in punctuation like `()`, `[]`,
+// or `{}`.
+
+pp.parseExprAtom = function(refDestructuringErrors) {
+  let node, canBeArrow = this.potentialArrowAt == this.start
+  switch (this.type) {
+  case tt._super:
+    if (!this.inFunction)
+      this.raise(this.start, "'super' outside of function or class")
+
+  case tt._this:
+    let type = this.type === tt._this ? "ThisExpression" : "Super"
+    node = this.startNode()
+    this.next()
+    return this.finishNode(node, type)
+
+  case tt.name:
+    let startPos = this.start, startLoc = this.startLoc
+    let id = this.parseIdent(this.type !== tt.name)
+    if (this.options.ecmaVersion >= 8 && id.name === "async" && !this.canInsertSemicolon() && this.eat(tt._function))
+      return this.parseFunction(this.startNodeAt(startPos, startLoc), false, false, true)
+    if (canBeArrow && !this.canInsertSemicolon()) {
+      if (this.eat(tt.arrow))
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], false)
+      if (this.options.ecmaVersion >= 8 && id.name === "async" && this.type === tt.name) {
+        id = this.parseIdent()
+        if (this.canInsertSemicolon() || !this.eat(tt.arrow))
+          this.unexpected()
+        return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), [id], true)
+      }
+    }
+    return id
+
+  case tt.regexp:
+    let value = this.value
+    node = this.parseLiteral(value.value)
+    node.regex = {pattern: value.pattern, flags: value.flags}
+    return node
+
+  case tt.num: case tt.string:
+    return this.parseLiteral(this.value)
+
+  case tt._null: case tt._true: case tt._false:
+    node = this.startNode()
+    node.value = this.type === tt._null ? null : this.type === tt._true
+    node.raw = this.type.keyword
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt.parenL:
+    return this.parseParenAndDistinguishExpression(canBeArrow)
+
+  case tt.bracketL:
+    node = this.startNode()
+    this.next()
+    node.elements = this.parseExprList(tt.bracketR, true, true, refDestructuringErrors)
+    return this.finishNode(node, "ArrayExpression")
+
+  case tt.braceL:
+    return this.parseObj(false, refDestructuringErrors)
+
+  case tt._function:
+    node = this.startNode()
+    this.next()
+    return this.parseFunction(node, false)
+
+  case tt._class:
+    return this.parseClass(this.startNode(), false)
+
+  case tt._new:
+    return this.parseNew()
+
+  case tt.backQuote:
+    return this.parseTemplate()
+
+  default:
+    this.unexpected()
+  }
+}
+
+pp.parseLiteral = function(value) {
+  let node = this.startNode()
+  node.value = value
+  node.raw = this.input.slice(this.start, this.end)
+  this.next()
+  return this.finishNode(node, "Literal")
+}
+
+pp.parseParenExpression = function() {
+  this.expect(tt.parenL)
+  let val = this.parseExpression()
+  this.expect(tt.parenR)
+  return val
+}
+
+pp.parseParenAndDistinguishExpression = function(canBeArrow) {
+  let startPos = this.start, startLoc = this.startLoc, val, allowTrailingComma = this.options.ecmaVersion >= 8
+  if (this.options.ecmaVersion >= 6) {
+    this.next()
+
+    let innerStartPos = this.start, innerStartLoc = this.startLoc
+    let exprList = [], first = true, lastIsComma = false
+    let refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos, spreadStart, innerParenStart
+    this.yieldPos = 0
+    this.awaitPos = 0
+    while (this.type !== tt.parenR) {
+      first ? first = false : this.expect(tt.comma)
+      if (allowTrailingComma && this.afterTrailingComma(tt.parenR, true)) {
+        lastIsComma = true
+        break
+      } else if (this.type === tt.ellipsis) {
+        spreadStart = this.start
+        exprList.push(this.parseParenItem(this.parseRest()))
+        if (this.type === tt.comma) this.raise(this.start, "Comma is not permitted after the rest element")
+        break
+      } else {
+        if (this.type === tt.parenL && !innerParenStart) {
+          innerParenStart = this.start
+        }
+        exprList.push(this.parseMaybeAssign(false, refDestructuringErrors, this.parseParenItem))
+      }
+    }
+    let innerEndPos = this.start, innerEndLoc = this.startLoc
+    this.expect(tt.parenR)
+
+    if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
+      this.checkPatternErrors(refDestructuringErrors, true)
+      this.checkYieldAwaitInDefaultParams()
+      if (innerParenStart) this.unexpected(innerParenStart)
+      this.yieldPos = oldYieldPos
+      this.awaitPos = oldAwaitPos
+      return this.parseParenArrowList(startPos, startLoc, exprList)
+    }
+
+    if (!exprList.length || lastIsComma) this.unexpected(this.lastTokStart)
+    if (spreadStart) this.unexpected(spreadStart)
+    this.checkExpressionErrors(refDestructuringErrors, true)
+    this.yieldPos = oldYieldPos || this.yieldPos
+    this.awaitPos = oldAwaitPos || this.awaitPos
+
+    if (exprList.length > 1) {
+      val = this.startNodeAt(innerStartPos, innerStartLoc)
+      val.expressions = exprList
+      this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc)
+    } else {
+      val = exprList[0]
+    }
+  } else {
+    val = this.parseParenExpression()
+  }
+
+  if (this.options.preserveParens) {
+    let par = this.startNodeAt(startPos, startLoc)
+    par.expression = val
+    return this.finishNode(par, "ParenthesizedExpression")
+  } else {
+    return val
+  }
+}
+
+pp.parseParenItem = function(item) {
+  return item
+}
+
+pp.parseParenArrowList = function(startPos, startLoc, exprList) {
+  return this.parseArrowExpression(this.startNodeAt(startPos, startLoc), exprList)
+}
+
+// New's precedence is slightly tricky. It must allow its argument to
+// be a `[]` or dot subscript expression, but not a call — at least,
+// not without wrapping it in parentheses. Thus, it uses the noCalls
+// argument to parseSubscripts to prevent it from consuming the
+// argument list.
+
+const empty = []
+
+pp.parseNew = function() {
+  let node = this.startNode()
+  let meta = this.parseIdent(true)
+  if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) {
+    node.meta = meta
+    node.property = this.parseIdent(true)
+    if (node.property.name !== "target")
+      this.raiseRecoverable(node.property.start, "The only valid meta property for new is new.target")
+    if (!this.inFunction)
+      this.raiseRecoverable(node.start, "new.target can only be used in functions")
+    return this.finishNode(node, "MetaProperty")
+  }
+  let startPos = this.start, startLoc = this.startLoc
+  node.callee = this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true)
+  if (this.eat(tt.parenL)) node.arguments = this.parseExprList(tt.parenR, this.options.ecmaVersion >= 8, false)
+  else node.arguments = empty
+  return this.finishNode(node, "NewExpression")
+}
+
+// Parse template expression.
+
+pp.parseTemplateElement = function() {
+  let elem = this.startNode()
+  elem.value = {
+    raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, '\n'),
+    cooked: this.value
+  }
+  this.next()
+  elem.tail = this.type === tt.backQuote
+  return this.finishNode(elem, "TemplateElement")
+}
+
+pp.parseTemplate = function() {
+  let node = this.startNode()
+  this.next()
+  node.expressions = []
+  let curElt = this.parseTemplateElement()
+  node.quasis = [curElt]
+  while (!curElt.tail) {
+    this.expect(tt.dollarBraceL)
+    node.expressions.push(this.parseExpression())
+    this.expect(tt.braceR)
+    node.quasis.push(curElt = this.parseTemplateElement())
+  }
+  this.next()
+  return this.finishNode(node, "TemplateLiteral")
+}
+
+// Parse an object literal or binding pattern.
+
+pp.parseObj = function(isPattern, refDestructuringErrors) {
+  let node = this.startNode(), first = true, propHash = {}
+  node.properties = []
+  this.next()
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    let prop = this.startNode(), isGenerator, isAsync, startPos, startLoc
+    if (this.options.ecmaVersion >= 6) {
+      prop.method = false
+      prop.shorthand = false
+      if (isPattern || refDestructuringErrors) {
+        startPos = this.start
+        startLoc = this.startLoc
+      }
+      if (!isPattern)
+        isGenerator = this.eat(tt.star)
+    }
+    this.parsePropertyName(prop)
+    if (!isPattern && this.options.ecmaVersion >= 8 && !isGenerator && !prop.computed &&
+        prop.key.type === "Identifier" && prop.key.name === "async" && this.type !== tt.parenL &&
+        this.type !== tt.colon && !this.canInsertSemicolon()) {
+      isAsync = true
+      this.parsePropertyName(prop, refDestructuringErrors)
+    } else {
+      isAsync = false
+    }
+    this.parsePropertyValue(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors)
+    this.checkPropClash(prop, propHash)
+    node.properties.push(this.finishNode(prop, "Property"))
+  }
+  return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression")
+}
+
+pp.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startPos, startLoc, refDestructuringErrors) {
+  if ((isGenerator || isAsync) && this.type === tt.colon)
+    this.unexpected()
+
+  if (this.eat(tt.colon)) {
+    prop.value = isPattern ? this.parseMaybeDefault(this.start, this.startLoc) : this.parseMaybeAssign(false, refDestructuringErrors)
+    prop.kind = "init"
+  } else if (this.options.ecmaVersion >= 6 && this.type === tt.parenL) {
+    if (isPattern) this.unexpected()
+    prop.kind = "init"
+    prop.method = true
+    prop.value = this.parseMethod(isGenerator, isAsync)
+  } else if (this.options.ecmaVersion >= 5 && !prop.computed && prop.key.type === "Identifier" &&
+             (prop.key.name === "get" || prop.key.name === "set") &&
+             (this.type != tt.comma && this.type != tt.braceR)) {
+    if (isGenerator || isAsync || isPattern) this.unexpected()
+    prop.kind = prop.key.name
+    this.parsePropertyName(prop)
+    prop.value = this.parseMethod(false)
+    let paramCount = prop.kind === "get" ? 0 : 1
+    if (prop.value.params.length !== paramCount) {
+      let start = prop.value.start
+      if (prop.kind === "get")
+        this.raiseRecoverable(start, "getter should have no params")
+      else
+        this.raiseRecoverable(start, "setter should have exactly one param")
+    } else {
+      if (prop.kind === "set" && prop.value.params[0].type === "RestElement")
+        this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params")
+    }
+  } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
+    if (this.keywords.test(prop.key.name) ||
+        (this.strict ? this.reservedWordsStrict : this.reservedWords).test(prop.key.name) ||
+        (this.inGenerator && prop.key.name == "yield") ||
+        (this.inAsync && prop.key.name == "await"))
+      this.raiseRecoverable(prop.key.start, "'" + prop.key.name + "' can not be used as shorthand property")
+    prop.kind = "init"
+    if (isPattern) {
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else if (this.type === tt.eq && refDestructuringErrors) {
+      if (!refDestructuringErrors.shorthandAssign)
+        refDestructuringErrors.shorthandAssign = this.start
+      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
+    } else {
+      prop.value = prop.key
+    }
+    prop.shorthand = true
+  } else this.unexpected()
+}
+
+pp.parsePropertyName = function(prop) {
+  if (this.options.ecmaVersion >= 6) {
+    if (this.eat(tt.bracketL)) {
+      prop.computed = true
+      prop.key = this.parseMaybeAssign()
+      this.expect(tt.bracketR)
+      return prop.key
+    } else {
+      prop.computed = false
+    }
+  }
+  return prop.key = this.type === tt.num || this.type === tt.string ? this.parseExprAtom() : this.parseIdent(true)
+}
+
+// Initialize empty function node.
+
+pp.initFunction = function(node) {
+  node.id = null
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = false
+    node.expression = false
+  }
+  if (this.options.ecmaVersion >= 8)
+    node.async = false
+}
+
+// Parse object or class method.
+
+pp.parseMethod = function(isGenerator, isAsync) {
+  let node = this.startNode(), oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6)
+    node.generator = isGenerator
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  this.inGenerator = node.generator
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8)
+  this.checkYieldAwaitInDefaultParams()
+  this.parseFunctionBody(node, false)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, "FunctionExpression")
+}
+
+// Parse arrow function expression with given parameters.
+
+pp.parseArrowExpression = function(node, params, isAsync) {
+  let oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  this.inGenerator = false
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  node.params = this.toAssignableList(params, true)
+  this.parseFunctionBody(node, true)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, "ArrowFunctionExpression")
+}
+
+// Parse function body and check parameters.
+
+pp.parseFunctionBody = function(node, isArrowFunction) {
+  let isExpression = isArrowFunction && this.type !== tt.braceL
+
+  if (isExpression) {
+    node.body = this.parseMaybeAssign()
+    node.expression = true
+  } else {
+    // Start a new scope with regard to labels and the `inFunction`
+    // flag (restore them to their old value afterwards).
+    let oldInFunc = this.inFunction, oldLabels = this.labels
+    this.inFunction = true; this.labels = []
+    node.body = this.parseBlock(true)
+    node.expression = false
+    this.inFunction = oldInFunc; this.labels = oldLabels
+  }
+
+  // If this is a strict mode function, verify that argument names
+  // are not repeated, and it does not try to bind the words `eval`
+  // or `arguments`.
+  let useStrict = (!isExpression && node.body.body.length && this.isUseStrict(node.body.body[0])) ? node.body.body[0] : null
+  if (useStrict && this.options.ecmaVersion >= 7 && !this.isSimpleParamList(node.params))
+    this.raiseRecoverable(useStrict.start, "Illegal 'use strict' directive in function with non-simple parameter list")
+
+  if (this.strict || useStrict) {
+    let oldStrict = this.strict
+    this.strict = true
+    if (node.id)
+      this.checkLVal(node.id, true)
+    this.checkParams(node)
+    this.strict = oldStrict
+  } else if (isArrowFunction || !this.isSimpleParamList(node.params)) {
+    this.checkParams(node)
+  }
+}
+
+pp.isSimpleParamList = function(params) {
+  for (let i = 0; i < params.length; i++)
+    if (params[i].type !== "Identifier") return false
+  return true
+}
+
+// Checks function params for various disallowed patterns such as using "eval"
+// or "arguments" and duplicate parameters.
+
+pp.checkParams = function(node) {
+  let nameHash = {}
+  for (let i = 0; i < node.params.length; i++) this.checkLVal(node.params[i], true, nameHash)
+}
+
+// Parses a comma-separated list of expressions, and returns them as
+// an array. `close` is the token type that ends the list, and
+// `allowEmpty` can be turned on to allow subsequent commas with
+// nothing in between them to be parsed as `null` (which is needed
+// for array literals).
+
+pp.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestructuringErrors) {
+  let elts = [], first = true
+  while (!this.eat(close)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (allowTrailingComma && this.afterTrailingComma(close)) break
+    } else first = false
+
+    let elt
+    if (allowEmpty && this.type === tt.comma)
+      elt = null
+    else if (this.type === tt.ellipsis) {
+      elt = this.parseSpread(refDestructuringErrors)
+      if (this.type === tt.comma && refDestructuringErrors && !refDestructuringErrors.trailingComma) {
+        refDestructuringErrors.trailingComma = this.start
+      }
+    } else
+      elt = this.parseMaybeAssign(false, refDestructuringErrors)
+    elts.push(elt)
+  }
+  return elts
+}
+
+// Parse the next token as an identifier. If `liberal` is true (used
+// when parsing properties), it will also convert keywords into
+// identifiers.
+
+pp.parseIdent = function(liberal) {
+  let node = this.startNode()
+  if (liberal && this.options.allowReserved == "never") liberal = false
+  if (this.type === tt.name) {
+    if (!liberal && (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) &&
+        (this.options.ecmaVersion >= 6 ||
+         this.input.slice(this.start, this.end).indexOf("\\") == -1))
+      this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved")
+    if (this.inGenerator && this.value === "yield")
+      this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator")
+    if (this.inAsync && this.value === "await")
+      this.raiseRecoverable(this.start, "Can not use 'await' as identifier inside an async function")
+    node.name = this.value
+  } else if (liberal && this.type.keyword) {
+    node.name = this.type.keyword
+  } else {
+    this.unexpected()
+  }
+  this.next()
+  return this.finishNode(node, "Identifier")
+}
+
+// Parses yield expression inside generator.
+
+pp.parseYield = function() {
+  if (!this.yieldPos) this.yieldPos = this.start
+
+  let node = this.startNode()
+  this.next()
+  if (this.type == tt.semi || this.canInsertSemicolon() || (this.type != tt.star && !this.type.startsExpr)) {
+    node.delegate = false
+    node.argument = null
+  } else {
+    node.delegate = this.eat(tt.star)
+    node.argument = this.parseMaybeAssign()
+  }
+  return this.finishNode(node, "YieldExpression")
+}
+
+pp.parseAwait = function() {
+  if (!this.awaitPos) this.awaitPos = this.start
+
+  let node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeUnary(null, true)
+  return this.finishNode(node, "AwaitExpression")
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/identifier.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/identifier.js
new file mode 100644
index 0000000000..c65a24cf5f
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/identifier.js
@@ -0,0 +1,81 @@
+// Reserved word lists for various dialects of the language
+
+export const reservedWords = {
+  3: "abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile",
+  5: "class enum extends super const export import",
+  6: "enum",
+  strict: "implements interface let package private protected public static yield",
+  strictBind: "eval arguments"
+}
+
+// And the keywords
+
+var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this"
+
+export const keywords = {
+  5: ecma5AndLessKeywords,
+  6: ecma5AndLessKeywords + " const class extends export import super"
+}
+
+// ## Character categories
+
+// Big ugly regular expressions that match characters in the
+// whitespace, identifier, and identifier-start categories. These
+// are only applied when a character is found to actually have a
+// code point above 128.
+// Generated by `bin/generate-identifier-regex.js`.
+
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fd5\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7ae\ua7b0-\ua7b7\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab65\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d4-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d01-\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf8\u1cf9\u1dc0-\u1df5\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"
+
+const nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]")
+const nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]")
+
+nonASCIIidentifierStartChars = nonASCIIidentifierChars = null
+
+// These are a run-length and offset encoded representation of the
+// >0xffff code points that are a valid part of identifiers. The
+// offset starts at 0x10000, and each pair of numbers represents an
+// offset to the next range, and then a size of the range. They were
+// generated by bin/generate-identifier-regex.js
+const astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,17,26,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,26,45,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,785,52,76,44,33,24,27,35,42,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,54,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,86,25,391,63,32,0,449,56,264,8,2,36,18,0,50,29,881,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,881,68,12,0,67,12,65,0,32,6124,20,754,9486,1,3071,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,4149,196,60,67,1213,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,10591,541]
+const astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,1306,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,52,0,13,2,49,13,10,2,4,9,83,11,7,0,161,11,6,9,7,3,57,0,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,87,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,423,9,838,7,2,7,17,9,57,21,2,13,19882,9,135,4,60,6,26,9,1016,45,17,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,2214,6,110,6,6,9,792487,239]
+
+// This has a complexity linear to the value of the code. The
+// assumption is that looking up astral identifier characters is
+// rare.
+function isInAstralSet(code, set) {
+  let pos = 0x10000
+  for (let i = 0; i < set.length; i += 2) {
+    pos += set[i]
+    if (pos > code) return false
+    pos += set[i + 1]
+    if (pos >= code) return true
+  }
+}
+
+// Test whether a given character code starts an identifier.
+
+export function isIdentifierStart(code, astral) {
+  if (code < 65) return code === 36
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes)
+}
+
+// Test whether a given character is part of an identifier.
+
+export function isIdentifierChar(code, astral) {
+  if (code < 48) return code === 36
+  if (code < 58) return true
+  if (code < 65) return false
+  if (code < 91) return true
+  if (code < 97) return code === 95
+  if (code < 123) return true
+  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code))
+  if (astral === false) return false
+  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes)
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/index.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/index.js
new file mode 100644
index 0000000000..189bf5a269
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/index.js
@@ -0,0 +1,77 @@
+// Acorn is a tiny, fast JavaScript parser written in JavaScript.
+//
+// Acorn was written by Marijn Haverbeke, Ingvar Stepanyan, and
+// various contributors and released under an MIT license.
+//
+// Git repositories for Acorn are available at
+//
+//     http://marijnhaverbeke.nl/git/acorn
+//     https://github.com/ternjs/acorn.git
+//
+// Please use the [github bug tracker][ghbt] to report issues.
+//
+// [ghbt]: https://github.com/ternjs/acorn/issues
+//
+// This file defines the main parser interface. The library also comes
+// with a [error-tolerant parser][dammit] and an
+// [abstract syntax tree walker][walk], defined in other files.
+//
+// [dammit]: acorn_loose.js
+// [walk]: util/walk.js
+
+import {Parser} from "./state"
+import "./parseutil"
+import "./statement"
+import "./lval"
+import "./expression"
+import "./location"
+
+export {Parser, plugins} from "./state"
+export {defaultOptions} from "./options"
+export {Position, SourceLocation, getLineInfo} from "./locutil"
+export {Node} from "./node"
+export {TokenType, types as tokTypes} from "./tokentype"
+export {TokContext, types as tokContexts} from "./tokencontext"
+export {isIdentifierChar, isIdentifierStart} from "./identifier"
+export {Token} from "./tokenize"
+export {isNewLine, lineBreak, lineBreakG} from "./whitespace"
+
+export const version = "4.0.3"
+
+// The main exported interface (under `self.acorn` when in the
+// browser) is a `parse` function that takes a code string and
+// returns an abstract syntax tree as specified by [Mozilla parser
+// API][api].
+//
+// [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+
+export function parse(input, options) {
+  return new Parser(options, input).parse()
+}
+
+// This function tries to parse a single expression at a given
+// offset in a string. Useful for parsing mixed-language formats
+// that embed JavaScript expressions.
+
+export function parseExpressionAt(input, pos, options) {
+  let p = new Parser(options, input, pos)
+  p.nextToken()
+  return p.parseExpression()
+}
+
+// Acorn is organized as a tokenizer and a recursive-descent parser.
+// The `tokenizer` export provides an interface to the tokenizer.
+
+export function tokenizer(input, options) {
+  return new Parser(options, input)
+}
+
+// This is a terrible kludge to support the existing, pre-ES6
+// interface where the loose parser module retroactively adds exports
+// to this module.
+export let parse_dammit, LooseParser, pluginsLoose
+export function addLooseExports(parse, Parser, plugins) {
+  parse_dammit = parse
+  LooseParser = Parser
+  pluginsLoose = plugins
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/location.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/location.js
new file mode 100644
index 0000000000..99e71234cc
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/location.js
@@ -0,0 +1,26 @@
+import {Parser} from "./state"
+import {Position, getLineInfo} from "./locutil"
+
+const pp = Parser.prototype
+
+// This function is used to raise exceptions on parse errors. It
+// takes an offset integer (into the current `input`) to indicate
+// the location of the error, attaches the position to the end
+// of the error message, and then raises a `SyntaxError` with that
+// message.
+
+pp.raise = function(pos, message) {
+  let loc = getLineInfo(this.input, pos)
+  message += " (" + loc.line + ":" + loc.column + ")"
+  let err = new SyntaxError(message)
+  err.pos = pos; err.loc = loc; err.raisedAt = this.pos
+  throw err
+}
+
+pp.raiseRecoverable = pp.raise
+
+pp.curPosition = function() {
+  if (this.options.locations) {
+    return new Position(this.curLine, this.pos - this.lineStart)
+  }
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/locutil.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/locutil.js
new file mode 100644
index 0000000000..5a9465e017
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/locutil.js
@@ -0,0 +1,42 @@
+import {lineBreakG} from "./whitespace"
+
+// These are used when `options.locations` is on, for the
+// `startLoc` and `endLoc` properties.
+
+export class Position {
+  constructor(line, col) {
+    this.line = line
+    this.column = col
+  }
+
+  offset(n) {
+    return new Position(this.line, this.column + n)
+  }
+}
+
+export class SourceLocation {
+  constructor(p, start, end) {
+    this.start = start
+    this.end = end
+    if (p.sourceFile !== null) this.source = p.sourceFile
+  }
+}
+
+// The `getLineInfo` function is mostly useful when the
+// `locations` option is off (for performance reasons) and you
+// want to find the line/column position for a given character
+// offset. `input` should be the code string that the offset refers
+// into.
+
+export function getLineInfo(input, offset) {
+  for (let line = 1, cur = 0;;) {
+    lineBreakG.lastIndex = cur
+    let match = lineBreakG.exec(input)
+    if (match && match.index < offset) {
+      ++line
+      cur = match.index + match[0].length
+    } else {
+      return new Position(line, offset - cur)
+    }
+  }
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/expression.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/expression.js
new file mode 100644
index 0000000000..1ef11b836d
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/expression.js
@@ -0,0 +1,562 @@
+import {LooseParser} from "./state"
+import {isDummy} from "./parseutil"
+import {tokTypes as tt} from "../index"
+
+const lp = LooseParser.prototype
+
+lp.checkLVal = function(expr) {
+  if (!expr) return expr
+  switch (expr.type) {
+  case "Identifier":
+  case "MemberExpression":
+    return expr
+
+  case "ParenthesizedExpression":
+    expr.expression = this.checkLVal(expr.expression)
+    return expr
+
+  default:
+    return this.dummyIdent()
+  }
+}
+
+lp.parseExpression = function(noIn) {
+  let start = this.storeCurrentPos()
+  let expr = this.parseMaybeAssign(noIn)
+  if (this.tok.type === tt.comma) {
+    let node = this.startNodeAt(start)
+    node.expressions = [expr]
+    while (this.eat(tt.comma)) node.expressions.push(this.parseMaybeAssign(noIn))
+    return this.finishNode(node, "SequenceExpression")
+  }
+  return expr
+}
+
+lp.parseParenExpression = function() {
+  this.pushCx()
+  this.expect(tt.parenL)
+  let val = this.parseExpression()
+  this.popCx()
+  this.expect(tt.parenR)
+  return val
+}
+
+lp.parseMaybeAssign = function(noIn) {
+  if (this.toks.isContextual("yield")) {
+    let node = this.startNode()
+    this.next()
+    if (this.semicolon() || this.canInsertSemicolon() || (this.tok.type != tt.star && !this.tok.type.startsExpr)) {
+      node.delegate = false
+      node.argument = null
+    } else {
+      node.delegate = this.eat(tt.star)
+      node.argument = this.parseMaybeAssign()
+    }
+    return this.finishNode(node, "YieldExpression")
+  }
+
+  let start = this.storeCurrentPos()
+  let left = this.parseMaybeConditional(noIn)
+  if (this.tok.type.isAssign) {
+    let node = this.startNodeAt(start)
+    node.operator = this.tok.value
+    node.left = this.tok.type === tt.eq ? this.toAssignable(left) : this.checkLVal(left)
+    this.next()
+    node.right = this.parseMaybeAssign(noIn)
+    return this.finishNode(node, "AssignmentExpression")
+  }
+  return left
+}
+
+lp.parseMaybeConditional = function(noIn) {
+  let start = this.storeCurrentPos()
+  let expr = this.parseExprOps(noIn)
+  if (this.eat(tt.question)) {
+    let node = this.startNodeAt(start)
+    node.test = expr
+    node.consequent = this.parseMaybeAssign()
+    node.alternate = this.expect(tt.colon) ? this.parseMaybeAssign(noIn) : this.dummyIdent()
+    return this.finishNode(node, "ConditionalExpression")
+  }
+  return expr
+}
+
+lp.parseExprOps = function(noIn) {
+  let start = this.storeCurrentPos()
+  let indent = this.curIndent, line = this.curLineStart
+  return this.parseExprOp(this.parseMaybeUnary(false), start, -1, noIn, indent, line)
+}
+
+lp.parseExprOp = function(left, start, minPrec, noIn, indent, line) {
+  if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) return left
+  let prec = this.tok.type.binop
+  if (prec != null && (!noIn || this.tok.type !== tt._in)) {
+    if (prec > minPrec) {
+      let node = this.startNodeAt(start)
+      node.left = left
+      node.operator = this.tok.value
+      this.next()
+      if (this.curLineStart != line && this.curIndent < indent && this.tokenStartsLine()) {
+        node.right = this.dummyIdent()
+      } else {
+        let rightStart = this.storeCurrentPos()
+        node.right = this.parseExprOp(this.parseMaybeUnary(false), rightStart, prec, noIn, indent, line)
+      }
+      this.finishNode(node, /&&|\|\|/.test(node.operator) ? "LogicalExpression" : "BinaryExpression")
+      return this.parseExprOp(node, start, minPrec, noIn, indent, line)
+    }
+  }
+  return left
+}
+
+lp.parseMaybeUnary = function(sawUnary) {
+  let start = this.storeCurrentPos(), expr
+  if (this.options.ecmaVersion >= 8 && this.inAsync && this.toks.isContextual("await")) {
+    expr = this.parseAwait()
+    sawUnary = true
+  } else if (this.tok.type.prefix) {
+    let node = this.startNode(), update = this.tok.type === tt.incDec
+    if (!update) sawUnary = true
+    node.operator = this.tok.value
+    node.prefix = true
+    this.next()
+    node.argument = this.parseMaybeUnary(true)
+    if (update) node.argument = this.checkLVal(node.argument)
+    expr = this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression")
+  } else if (this.tok.type === tt.ellipsis) {
+    let node = this.startNode()
+    this.next()
+    node.argument = this.parseMaybeUnary(sawUnary)
+    expr = this.finishNode(node, "SpreadElement")
+  } else {
+    expr = this.parseExprSubscripts()
+    while (this.tok.type.postfix && !this.canInsertSemicolon()) {
+      let node = this.startNodeAt(start)
+      node.operator = this.tok.value
+      node.prefix = false
+      node.argument = this.checkLVal(expr)
+      this.next()
+      expr = this.finishNode(node, "UpdateExpression")
+    }
+  }
+
+  if (!sawUnary && this.eat(tt.starstar)) {
+    let node = this.startNodeAt(start)
+    node.operator = "**"
+    node.left = expr
+    node.right = this.parseMaybeUnary(false)
+    return this.finishNode(node, "BinaryExpression")
+  }
+
+  return expr
+}
+
+lp.parseExprSubscripts = function() {
+  let start = this.storeCurrentPos()
+  return this.parseSubscripts(this.parseExprAtom(), start, false, this.curIndent, this.curLineStart)
+}
+
+lp.parseSubscripts = function(base, start, noCalls, startIndent, line) {
+  for (;;) {
+    if (this.curLineStart != line && this.curIndent <= startIndent && this.tokenStartsLine()) {
+      if (this.tok.type == tt.dot && this.curIndent == startIndent)
+        --startIndent
+      else
+        return base
+    }
+
+    let maybeAsyncArrow = base.type === "Identifier" && base.name === "async" && !this.canInsertSemicolon()
+
+    if (this.eat(tt.dot)) {
+      let node = this.startNodeAt(start)
+      node.object = base
+      if (this.curLineStart != line && this.curIndent <= startIndent && this.tokenStartsLine())
+        node.property = this.dummyIdent()
+      else
+        node.property = this.parsePropertyAccessor() || this.dummyIdent()
+      node.computed = false
+      base = this.finishNode(node, "MemberExpression")
+    } else if (this.tok.type == tt.bracketL) {
+      this.pushCx()
+      this.next()
+      let node = this.startNodeAt(start)
+      node.object = base
+      node.property = this.parseExpression()
+      node.computed = true
+      this.popCx()
+      this.expect(tt.bracketR)
+      base = this.finishNode(node, "MemberExpression")
+    } else if (!noCalls && this.tok.type == tt.parenL) {
+      let exprList = this.parseExprList(tt.parenR)
+      if (maybeAsyncArrow && this.eat(tt.arrow))
+        return this.parseArrowExpression(this.startNodeAt(start), exprList, true)
+      let node = this.startNodeAt(start)
+      node.callee = base
+      node.arguments = exprList
+      base = this.finishNode(node, "CallExpression")
+    } else if (this.tok.type == tt.backQuote) {
+      let node = this.startNodeAt(start)
+      node.tag = base
+      node.quasi = this.parseTemplate()
+      base = this.finishNode(node, "TaggedTemplateExpression")
+    } else {
+      return base
+    }
+  }
+}
+
+lp.parseExprAtom = function() {
+  let node
+  switch (this.tok.type) {
+  case tt._this:
+  case tt._super:
+    let type = this.tok.type === tt._this ? "ThisExpression" : "Super"
+    node = this.startNode()
+    this.next()
+    return this.finishNode(node, type)
+
+  case tt.name:
+    let start = this.storeCurrentPos()
+    let id = this.parseIdent()
+    let isAsync = false
+    if (id.name === "async" && !this.canInsertSemicolon()) {
+      if (this.eat(tt._function))
+        return this.parseFunction(this.startNodeAt(start), false, true)
+      if (this.tok.type === tt.name) {
+        id = this.parseIdent()
+        isAsync = true
+      }
+    }
+    return this.eat(tt.arrow) ? this.parseArrowExpression(this.startNodeAt(start), [id], isAsync) : id
+
+  case tt.regexp:
+    node = this.startNode()
+    let val = this.tok.value
+    node.regex = {pattern: val.pattern, flags: val.flags}
+    node.value = val.value
+    node.raw = this.input.slice(this.tok.start, this.tok.end)
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt.num: case tt.string:
+    node = this.startNode()
+    node.value = this.tok.value
+    node.raw = this.input.slice(this.tok.start, this.tok.end)
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt._null: case tt._true: case tt._false:
+    node = this.startNode()
+    node.value = this.tok.type === tt._null ? null : this.tok.type === tt._true
+    node.raw = this.tok.type.keyword
+    this.next()
+    return this.finishNode(node, "Literal")
+
+  case tt.parenL:
+    let parenStart = this.storeCurrentPos()
+    this.next()
+    let inner = this.parseExpression()
+    this.expect(tt.parenR)
+    if (this.eat(tt.arrow)) {
+      // (a,)=>a // SequenceExpression makes dummy in the last hole. Drop the dummy.
+      let params = inner.expressions || [inner]
+      if (params.length && isDummy(params[params.length - 1]))
+        params.pop()
+      return this.parseArrowExpression(this.startNodeAt(parenStart), params)
+    }
+    if (this.options.preserveParens) {
+      let par = this.startNodeAt(parenStart)
+      par.expression = inner
+      inner = this.finishNode(par, "ParenthesizedExpression")
+    }
+    return inner
+
+  case tt.bracketL:
+    node = this.startNode()
+    node.elements = this.parseExprList(tt.bracketR, true)
+    return this.finishNode(node, "ArrayExpression")
+
+  case tt.braceL:
+    return this.parseObj()
+
+  case tt._class:
+    return this.parseClass()
+
+  case tt._function:
+    node = this.startNode()
+    this.next()
+    return this.parseFunction(node, false)
+
+  case tt._new:
+    return this.parseNew()
+
+  case tt.backQuote:
+    return this.parseTemplate()
+
+  default:
+    return this.dummyIdent()
+  }
+}
+
+lp.parseNew = function() {
+  let node = this.startNode(), startIndent = this.curIndent, line = this.curLineStart
+  let meta = this.parseIdent(true)
+  if (this.options.ecmaVersion >= 6 && this.eat(tt.dot)) {
+    node.meta = meta
+    node.property = this.parseIdent(true)
+    return this.finishNode(node, "MetaProperty")
+  }
+  let start = this.storeCurrentPos()
+  node.callee = this.parseSubscripts(this.parseExprAtom(), start, true, startIndent, line)
+  if (this.tok.type == tt.parenL) {
+    node.arguments = this.parseExprList(tt.parenR)
+  } else {
+    node.arguments = []
+  }
+  return this.finishNode(node, "NewExpression")
+}
+
+lp.parseTemplateElement = function() {
+  let elem = this.startNode()
+  elem.value = {
+    raw: this.input.slice(this.tok.start, this.tok.end).replace(/\r\n?/g, '\n'),
+    cooked: this.tok.value
+  }
+  this.next()
+  elem.tail = this.tok.type === tt.backQuote
+  return this.finishNode(elem, "TemplateElement")
+}
+
+lp.parseTemplate = function() {
+  let node = this.startNode()
+  this.next()
+  node.expressions = []
+  let curElt = this.parseTemplateElement()
+  node.quasis = [curElt]
+  while (!curElt.tail) {
+    this.next()
+    node.expressions.push(this.parseExpression())
+    if (this.expect(tt.braceR)) {
+      curElt = this.parseTemplateElement()
+    } else {
+      curElt = this.startNode()
+      curElt.value = {cooked: '', raw: ''}
+      curElt.tail = true
+      this.finishNode(curElt, "TemplateElement")
+    }
+    node.quasis.push(curElt)
+  }
+  this.expect(tt.backQuote)
+  return this.finishNode(node, "TemplateLiteral")
+}
+
+lp.parseObj = function() {
+  let node = this.startNode()
+  node.properties = []
+  this.pushCx()
+  let indent = this.curIndent + 1, line = this.curLineStart
+  this.eat(tt.braceL)
+  if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+  while (!this.closes(tt.braceR, indent, line)) {
+    let prop = this.startNode(), isGenerator, isAsync, start
+    if (this.options.ecmaVersion >= 6) {
+      start = this.storeCurrentPos()
+      prop.method = false
+      prop.shorthand = false
+      isGenerator = this.eat(tt.star)
+    }
+    this.parsePropertyName(prop)
+    if (!prop.computed &&
+        prop.key.type === "Identifier" && prop.key.name === "async" && this.tok.type !== tt.parenL &&
+        this.tok.type !== tt.colon && !this.canInsertSemicolon()) {
+      this.parsePropertyName(prop)
+      isAsync = true
+    } else {
+      isAsync = false
+    }
+    if (isDummy(prop.key)) { if (isDummy(this.parseMaybeAssign())) this.next(); this.eat(tt.comma); continue }
+    if (this.eat(tt.colon)) {
+      prop.kind = "init"
+      prop.value = this.parseMaybeAssign()
+    } else if (this.options.ecmaVersion >= 6 && (this.tok.type === tt.parenL || this.tok.type === tt.braceL)) {
+      prop.kind = "init"
+      prop.method = true
+      prop.value = this.parseMethod(isGenerator, isAsync)
+    } else if (this.options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
+               !prop.computed && (prop.key.name === "get" || prop.key.name === "set") &&
+               (this.tok.type != tt.comma && this.tok.type != tt.braceR)) {
+      prop.kind = prop.key.name
+      this.parsePropertyName(prop)
+      prop.value = this.parseMethod(false)
+    } else {
+      prop.kind = "init"
+      if (this.options.ecmaVersion >= 6) {
+        if (this.eat(tt.eq)) {
+          let assign = this.startNodeAt(start)
+          assign.operator = "="
+          assign.left = prop.key
+          assign.right = this.parseMaybeAssign()
+          prop.value = this.finishNode(assign, "AssignmentExpression")
+        } else {
+          prop.value = prop.key
+        }
+      } else {
+        prop.value = this.dummyIdent()
+      }
+      prop.shorthand = true
+    }
+    node.properties.push(this.finishNode(prop, "Property"))
+    this.eat(tt.comma)
+  }
+  this.popCx()
+  if (!this.eat(tt.braceR)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  return this.finishNode(node, "ObjectExpression")
+}
+
+lp.parsePropertyName = function(prop) {
+  if (this.options.ecmaVersion >= 6) {
+    if (this.eat(tt.bracketL)) {
+      prop.computed = true
+      prop.key = this.parseExpression()
+      this.expect(tt.bracketR)
+      return
+    } else {
+      prop.computed = false
+    }
+  }
+  let key = (this.tok.type === tt.num || this.tok.type === tt.string) ? this.parseExprAtom() : this.parseIdent()
+  prop.key = key || this.dummyIdent()
+}
+
+lp.parsePropertyAccessor = function() {
+  if (this.tok.type === tt.name || this.tok.type.keyword) return this.parseIdent()
+}
+
+lp.parseIdent = function() {
+  let name = this.tok.type === tt.name ? this.tok.value : this.tok.type.keyword
+  if (!name) return this.dummyIdent()
+  let node = this.startNode()
+  this.next()
+  node.name = name
+  return this.finishNode(node, "Identifier")
+}
+
+lp.initFunction = function(node) {
+  node.id = null
+  node.params = []
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = false
+    node.expression = false
+  }
+  if (this.options.ecmaVersion >= 8)
+    node.async = false
+}
+
+// Convert existing expression atom to assignable pattern
+// if possible.
+
+lp.toAssignable = function(node, binding) {
+  if (!node || node.type == "Identifier" || (node.type == "MemberExpression" && !binding)) {
+    // Okay
+  } else if (node.type == "ParenthesizedExpression") {
+    node.expression = this.toAssignable(node.expression, binding)
+  } else if (this.options.ecmaVersion < 6) {
+    return this.dummyIdent()
+  } else if (node.type == "ObjectExpression") {
+    node.type = "ObjectPattern"
+    let props = node.properties
+    for (let i = 0; i < props.length; i++)
+      props[i].value = this.toAssignable(props[i].value, binding)
+  } else if (node.type == "ArrayExpression") {
+    node.type = "ArrayPattern"
+    this.toAssignableList(node.elements, binding)
+  } else if (node.type == "SpreadElement") {
+    node.type = "RestElement"
+    node.argument = this.toAssignable(node.argument, binding)
+  } else if (node.type == "AssignmentExpression") {
+    node.type = "AssignmentPattern"
+    delete node.operator
+  } else {
+    return this.dummyIdent()
+  }
+  return node
+}
+
+lp.toAssignableList = function(exprList, binding) {
+  for (let i = 0; i < exprList.length; i++)
+    exprList[i] = this.toAssignable(exprList[i], binding)
+  return exprList
+}
+
+lp.parseFunctionParams = function(params) {
+  params = this.parseExprList(tt.parenR)
+  return this.toAssignableList(params, true)
+}
+
+lp.parseMethod = function(isGenerator, isAsync) {
+  let node = this.startNode(), oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6)
+    node.generator = !!isGenerator
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+  this.inAsync = node.async
+  node.params = this.parseFunctionParams()
+  node.expression = this.options.ecmaVersion >= 6 && this.tok.type !== tt.braceL
+  node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, "FunctionExpression")
+}
+
+lp.parseArrowExpression = function(node, params, isAsync) {
+  let oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+  this.inAsync = node.async
+  node.params = this.toAssignableList(params, true)
+  node.expression = this.tok.type !== tt.braceL
+  node.body = node.expression ? this.parseMaybeAssign() : this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, "ArrowFunctionExpression")
+}
+
+lp.parseExprList = function(close, allowEmpty) {
+  this.pushCx()
+  let indent = this.curIndent, line = this.curLineStart, elts = []
+  this.next() // Opening bracket
+  while (!this.closes(close, indent + 1, line)) {
+    if (this.eat(tt.comma)) {
+      elts.push(allowEmpty ? null : this.dummyIdent())
+      continue
+    }
+    let elt = this.parseMaybeAssign()
+    if (isDummy(elt)) {
+      if (this.closes(close, indent, line)) break
+      this.next()
+    } else {
+      elts.push(elt)
+    }
+    this.eat(tt.comma)
+  }
+  this.popCx()
+  if (!this.eat(close)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  return elts
+}
+
+lp.parseAwait = function() {
+  let node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeUnary()
+  return this.finishNode(node, "AwaitExpression")
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/index.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/index.js
new file mode 100644
index 0000000000..98bbf4b3be
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/index.js
@@ -0,0 +1,48 @@
+// Acorn: Loose parser
+//
+// This module provides an alternative parser (`parse_dammit`) that
+// exposes that same interface as `parse`, but will try to parse
+// anything as JavaScript, repairing syntax error the best it can.
+// There are circumstances in which it will raise an error and give
+// up, but they are very rare. The resulting AST will be a mostly
+// valid JavaScript AST (as per the [Mozilla parser API][api], except
+// that:
+//
+// - Return outside functions is allowed
+//
+// - Label consistency (no conflicts, break only to existing labels)
+//   is not enforced.
+//
+// - Bogus Identifier nodes with a name of `"✖"` are inserted whenever
+//   the parser got too confused to return anything meaningful.
+//
+// [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
+//
+// The expected use for this is to *first* try `acorn.parse`, and only
+// if that fails switch to `parse_dammit`. The loose parser might
+// parse badly indented code incorrectly, so **don't** use it as
+// your default parser.
+//
+// Quite a lot of acorn.js is duplicated here. The alternative was to
+// add a *lot* of extra cruft to that file, making it less readable
+// and slower. Copying and editing the code allowed me to make
+// invasive changes and simplifications without creating a complicated
+// tangle.
+
+import {addLooseExports, defaultOptions} from "../index"
+import {LooseParser, pluginsLoose} from "./state"
+import "./tokenize"
+import "./statement"
+import "./expression"
+
+export {LooseParser, pluginsLoose} from "./state"
+
+defaultOptions.tabSize = 4
+
+export function parse_dammit(input, options) {
+  let p = new LooseParser(input, options)
+  p.next()
+  return p.parseTopLevel()
+}
+
+addLooseExports(parse_dammit, LooseParser, pluginsLoose)
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/parseutil.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/parseutil.js
new file mode 100644
index 0000000000..c5ee096a1d
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/parseutil.js
@@ -0,0 +1 @@
+export function isDummy(node) { return node.name == "✖" }
\ No newline at end of file
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/state.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/state.js
new file mode 100644
index 0000000000..18987aa220
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/state.js
@@ -0,0 +1,161 @@
+import {tokenizer, SourceLocation, tokTypes as tt, Node, lineBreak, isNewLine} from "../index"
+
+// Registered plugins
+export const pluginsLoose = {}
+
+export class LooseParser {
+  constructor(input, options = {}) {
+    this.toks = tokenizer(input, options)
+    this.options = this.toks.options
+    this.input = this.toks.input
+    this.tok = this.last = {type: tt.eof, start: 0, end: 0}
+    if (this.options.locations) {
+      let here = this.toks.curPosition()
+      this.tok.loc = new SourceLocation(this.toks, here, here)
+    }
+    this.ahead = [] // Tokens ahead
+    this.context = [] // Indentation contexted
+    this.curIndent = 0
+    this.curLineStart = 0
+    this.nextLineStart = this.lineEnd(this.curLineStart) + 1
+    this.inAsync = false
+    // Load plugins
+    this.options.pluginsLoose = options.pluginsLoose || {}
+    this.loadPlugins(this.options.pluginsLoose)
+  }
+
+  startNode() {
+    return new Node(this.toks, this.tok.start, this.options.locations ? this.tok.loc.start : null)
+  }
+
+  storeCurrentPos() {
+    return this.options.locations ? [this.tok.start, this.tok.loc.start] : this.tok.start
+  }
+
+  startNodeAt(pos) {
+    if (this.options.locations) {
+      return new Node(this.toks, pos[0], pos[1])
+    } else {
+      return new Node(this.toks, pos)
+    }
+  }
+
+  finishNode(node, type) {
+    node.type = type
+    node.end = this.last.end
+    if (this.options.locations)
+      node.loc.end = this.last.loc.end
+    if (this.options.ranges)
+      node.range[1] = this.last.end
+    return node
+  }
+
+  dummyNode(type) {
+    let dummy = this.startNode()
+    dummy.type = type
+    dummy.end = dummy.start
+    if (this.options.locations)
+      dummy.loc.end = dummy.loc.start
+    if (this.options.ranges)
+      dummy.range[1] = dummy.start
+    this.last = {type: tt.name, start: dummy.start, end: dummy.start, loc: dummy.loc}
+    return dummy
+  }
+
+  dummyIdent() {
+    let dummy = this.dummyNode("Identifier")
+    dummy.name = "✖"
+    return dummy
+  }
+
+  dummyString() {
+    let dummy = this.dummyNode("Literal")
+    dummy.value = dummy.raw = "✖"
+    return dummy
+  }
+
+  eat(type) {
+    if (this.tok.type === type) {
+      this.next()
+      return true
+    } else {
+      return false
+    }
+  }
+
+  isContextual(name) {
+    return this.tok.type === tt.name && this.tok.value === name
+  }
+
+  eatContextual(name) {
+    return this.tok.value === name && this.eat(tt.name)
+  }
+
+  canInsertSemicolon() {
+    return this.tok.type === tt.eof || this.tok.type === tt.braceR ||
+      lineBreak.test(this.input.slice(this.last.end, this.tok.start))
+  }
+
+  semicolon() {
+    return this.eat(tt.semi)
+  }
+
+  expect(type) {
+    if (this.eat(type)) return true
+    for (let i = 1; i <= 2; i++) {
+      if (this.lookAhead(i).type == type) {
+        for (let j = 0; j < i; j++) this.next()
+        return true
+      }
+    }
+  }
+
+  pushCx() {
+    this.context.push(this.curIndent)
+  }
+
+  popCx() {
+    this.curIndent = this.context.pop()
+  }
+
+  lineEnd(pos) {
+    while (pos < this.input.length && !isNewLine(this.input.charCodeAt(pos))) ++pos
+    return pos
+  }
+
+  indentationAfter(pos) {
+    for (let count = 0;; ++pos) {
+      let ch = this.input.charCodeAt(pos)
+      if (ch === 32) ++count
+      else if (ch === 9) count += this.options.tabSize
+      else return count
+    }
+  }
+
+  closes(closeTok, indent, line, blockHeuristic) {
+    if (this.tok.type === closeTok || this.tok.type === tt.eof) return true
+    return line != this.curLineStart && this.curIndent < indent && this.tokenStartsLine() &&
+      (!blockHeuristic || this.nextLineStart >= this.input.length ||
+       this.indentationAfter(this.nextLineStart) < indent)
+  }
+
+  tokenStartsLine() {
+    for (let p = this.tok.start - 1; p >= this.curLineStart; --p) {
+      let ch = this.input.charCodeAt(p)
+      if (ch !== 9 && ch !== 32) return false
+    }
+    return true
+  }
+
+  extend(name, f) {
+    this[name] = f(this[name])
+  }
+
+  loadPlugins(pluginConfigs) {
+    for (let name in pluginConfigs) {
+      let plugin = pluginsLoose[name]
+      if (!plugin) throw new Error("Plugin '" + name + "' not found")
+      plugin(this, pluginConfigs[name])
+    }
+  }
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/statement.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/statement.js
new file mode 100644
index 0000000000..42eda0597e
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/statement.js
@@ -0,0 +1,446 @@
+import {LooseParser} from "./state"
+import {isDummy} from "./parseutil"
+import {getLineInfo, tokTypes as tt} from "../index"
+
+const lp = LooseParser.prototype
+
+lp.parseTopLevel = function() {
+  let node = this.startNodeAt(this.options.locations ? [0, getLineInfo(this.input, 0)] : 0)
+  node.body = []
+  while (this.tok.type !== tt.eof) node.body.push(this.parseStatement())
+  this.last = this.tok
+  if (this.options.ecmaVersion >= 6) {
+    node.sourceType = this.options.sourceType
+  }
+  return this.finishNode(node, "Program")
+}
+
+lp.parseStatement = function() {
+  let starttype = this.tok.type, node = this.startNode(), kind
+
+  if (this.toks.isLet()) {
+    starttype = tt._var
+    kind = "let"
+  }
+
+  switch (starttype) {
+  case tt._break: case tt._continue:
+    this.next()
+    let isBreak = starttype === tt._break
+    if (this.semicolon() || this.canInsertSemicolon()) {
+      node.label = null
+    } else {
+      node.label = this.tok.type === tt.name ? this.parseIdent() : null
+      this.semicolon()
+    }
+    return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+
+  case tt._debugger:
+    this.next()
+    this.semicolon()
+    return this.finishNode(node, "DebuggerStatement")
+
+  case tt._do:
+    this.next()
+    node.body = this.parseStatement()
+    node.test = this.eat(tt._while) ? this.parseParenExpression() : this.dummyIdent()
+    this.semicolon()
+    return this.finishNode(node, "DoWhileStatement")
+
+  case tt._for:
+    this.next()
+    this.pushCx()
+    this.expect(tt.parenL)
+    if (this.tok.type === tt.semi) return this.parseFor(node, null)
+    let isLet = this.toks.isLet()
+    if (isLet || this.tok.type === tt._var || this.tok.type === tt._const) {
+      let init = this.parseVar(true, isLet ? "let" : this.tok.value)
+      if (init.declarations.length === 1 && (this.tok.type === tt._in || this.isContextual("of"))) {
+        return this.parseForIn(node, init)
+      }
+      return this.parseFor(node, init)
+    }
+    let init = this.parseExpression(true)
+    if (this.tok.type === tt._in || this.isContextual("of"))
+      return this.parseForIn(node, this.toAssignable(init))
+    return this.parseFor(node, init)
+
+  case tt._function:
+    this.next()
+    return this.parseFunction(node, true)
+
+  case tt._if:
+    this.next()
+    node.test = this.parseParenExpression()
+    node.consequent = this.parseStatement()
+    node.alternate = this.eat(tt._else) ? this.parseStatement() : null
+    return this.finishNode(node, "IfStatement")
+
+  case tt._return:
+    this.next()
+    if (this.eat(tt.semi) || this.canInsertSemicolon()) node.argument = null
+    else { node.argument = this.parseExpression(); this.semicolon() }
+    return this.finishNode(node, "ReturnStatement")
+
+  case tt._switch:
+    let blockIndent = this.curIndent, line = this.curLineStart
+    this.next()
+    node.discriminant = this.parseParenExpression()
+    node.cases = []
+    this.pushCx()
+    this.expect(tt.braceL)
+
+    let cur
+    while (!this.closes(tt.braceR, blockIndent, line, true)) {
+      if (this.tok.type === tt._case || this.tok.type === tt._default) {
+        let isCase = this.tok.type === tt._case
+        if (cur) this.finishNode(cur, "SwitchCase")
+        node.cases.push(cur = this.startNode())
+        cur.consequent = []
+        this.next()
+        if (isCase) cur.test = this.parseExpression()
+        else cur.test = null
+        this.expect(tt.colon)
+      } else {
+        if (!cur) {
+          node.cases.push(cur = this.startNode())
+          cur.consequent = []
+          cur.test = null
+        }
+        cur.consequent.push(this.parseStatement())
+      }
+    }
+    if (cur) this.finishNode(cur, "SwitchCase")
+    this.popCx()
+    this.eat(tt.braceR)
+    return this.finishNode(node, "SwitchStatement")
+
+  case tt._throw:
+    this.next()
+    node.argument = this.parseExpression()
+    this.semicolon()
+    return this.finishNode(node, "ThrowStatement")
+
+  case tt._try:
+    this.next()
+    node.block = this.parseBlock()
+    node.handler = null
+    if (this.tok.type === tt._catch) {
+      let clause = this.startNode()
+      this.next()
+      this.expect(tt.parenL)
+      clause.param = this.toAssignable(this.parseExprAtom(), true)
+      this.expect(tt.parenR)
+      clause.body = this.parseBlock()
+      node.handler = this.finishNode(clause, "CatchClause")
+    }
+    node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null
+    if (!node.handler && !node.finalizer) return node.block
+    return this.finishNode(node, "TryStatement")
+
+  case tt._var:
+  case tt._const:
+    return this.parseVar(false, kind || this.tok.value)
+
+  case tt._while:
+    this.next()
+    node.test = this.parseParenExpression()
+    node.body = this.parseStatement()
+    return this.finishNode(node, "WhileStatement")
+
+  case tt._with:
+    this.next()
+    node.object = this.parseParenExpression()
+    node.body = this.parseStatement()
+    return this.finishNode(node, "WithStatement")
+
+  case tt.braceL:
+    return this.parseBlock()
+
+  case tt.semi:
+    this.next()
+    return this.finishNode(node, "EmptyStatement")
+
+  case tt._class:
+    return this.parseClass(true)
+
+  case tt._import:
+    return this.parseImport()
+
+  case tt._export:
+    return this.parseExport()
+
+  default:
+    if (this.toks.isAsyncFunction()) {
+      this.next()
+      this.next()
+      return this.parseFunction(node, true, true)
+    }
+    let expr = this.parseExpression()
+    if (isDummy(expr)) {
+      this.next()
+      if (this.tok.type === tt.eof) return this.finishNode(node, "EmptyStatement")
+      return this.parseStatement()
+    } else if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon)) {
+      node.body = this.parseStatement()
+      node.label = expr
+      return this.finishNode(node, "LabeledStatement")
+    } else {
+      node.expression = expr
+      this.semicolon()
+      return this.finishNode(node, "ExpressionStatement")
+    }
+  }
+}
+
+lp.parseBlock = function() {
+  let node = this.startNode()
+  this.pushCx()
+  this.expect(tt.braceL)
+  let blockIndent = this.curIndent, line = this.curLineStart
+  node.body = []
+  while (!this.closes(tt.braceR, blockIndent, line, true))
+    node.body.push(this.parseStatement())
+  this.popCx()
+  this.eat(tt.braceR)
+  return this.finishNode(node, "BlockStatement")
+}
+
+lp.parseFor = function(node, init) {
+  node.init = init
+  node.test = node.update = null
+  if (this.eat(tt.semi) && this.tok.type !== tt.semi) node.test = this.parseExpression()
+  if (this.eat(tt.semi) && this.tok.type !== tt.parenR) node.update = this.parseExpression()
+  this.popCx()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement()
+  return this.finishNode(node, "ForStatement")
+}
+
+lp.parseForIn = function(node, init) {
+  let type = this.tok.type === tt._in ? "ForInStatement" : "ForOfStatement"
+  this.next()
+  node.left = init
+  node.right = this.parseExpression()
+  this.popCx()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement()
+  return this.finishNode(node, type)
+}
+
+lp.parseVar = function(noIn, kind) {
+  let node = this.startNode()
+  node.kind = kind
+  this.next()
+  node.declarations = []
+  do {
+    let decl = this.startNode()
+    decl.id = this.options.ecmaVersion >= 6 ? this.toAssignable(this.parseExprAtom(), true) : this.parseIdent()
+    decl.init = this.eat(tt.eq) ? this.parseMaybeAssign(noIn) : null
+    node.declarations.push(this.finishNode(decl, "VariableDeclarator"))
+  } while (this.eat(tt.comma))
+  if (!node.declarations.length) {
+    let decl = this.startNode()
+    decl.id = this.dummyIdent()
+    node.declarations.push(this.finishNode(decl, "VariableDeclarator"))
+  }
+  if (!noIn) this.semicolon()
+  return this.finishNode(node, "VariableDeclaration")
+}
+
+lp.parseClass = function(isStatement) {
+  let node = this.startNode()
+  this.next()
+  if (this.tok.type === tt.name) node.id = this.parseIdent()
+  else if (isStatement) node.id = this.dummyIdent()
+  else node.id = null
+  node.superClass = this.eat(tt._extends) ? this.parseExpression() : null
+  node.body = this.startNode()
+  node.body.body = []
+  this.pushCx()
+  let indent = this.curIndent + 1, line = this.curLineStart
+  this.eat(tt.braceL)
+  if (this.curIndent + 1 < indent) { indent = this.curIndent; line = this.curLineStart }
+  while (!this.closes(tt.braceR, indent, line)) {
+    if (this.semicolon()) continue
+    let method = this.startNode(), isGenerator, isAsync
+    if (this.options.ecmaVersion >= 6) {
+      method.static = false
+      isGenerator = this.eat(tt.star)
+    }
+    this.parsePropertyName(method)
+    if (isDummy(method.key)) { if (isDummy(this.parseMaybeAssign())) this.next(); this.eat(tt.comma); continue }
+    if (method.key.type === "Identifier" && !method.computed && method.key.name === "static" &&
+        (this.tok.type != tt.parenL && this.tok.type != tt.braceL)) {
+      method.static = true
+      isGenerator = this.eat(tt.star)
+      this.parsePropertyName(method)
+    } else {
+      method.static = false
+    }
+    if (!method.computed &&
+        method.key.type === "Identifier" && method.key.name === "async" && this.tok.type !== tt.parenL &&
+        !this.canInsertSemicolon()) {
+      this.parsePropertyName(method)
+      isAsync = true
+    } else {
+      isAsync = false
+    }
+    if (this.options.ecmaVersion >= 5 && method.key.type === "Identifier" &&
+        !method.computed && (method.key.name === "get" || method.key.name === "set") &&
+        this.tok.type !== tt.parenL && this.tok.type !== tt.braceL) {
+      method.kind = method.key.name
+      this.parsePropertyName(method)
+      method.value = this.parseMethod(false)
+    } else {
+      if (!method.computed && !method.static && !isGenerator && !isAsync && (
+        method.key.type === "Identifier" && method.key.name === "constructor" ||
+          method.key.type === "Literal" && method.key.value === "constructor")) {
+        method.kind = "constructor"
+      } else {
+        method.kind =  "method"
+      }
+      method.value = this.parseMethod(isGenerator, isAsync)
+    }
+    node.body.body.push(this.finishNode(method, "MethodDefinition"))
+  }
+  this.popCx()
+  if (!this.eat(tt.braceR)) {
+    // If there is no closing brace, make the node span to the start
+    // of the next token (this is useful for Tern)
+    this.last.end = this.tok.start
+    if (this.options.locations) this.last.loc.end = this.tok.loc.start
+  }
+  this.semicolon()
+  this.finishNode(node.body, "ClassBody")
+  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+}
+
+lp.parseFunction = function(node, isStatement, isAsync) {
+  let oldInAsync = this.inAsync
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6) {
+    node.generator = this.eat(tt.star)
+  }
+  if (this.options.ecmaVersion >= 8) {
+    node.async = !!isAsync
+  }
+  if (this.tok.type === tt.name) node.id = this.parseIdent()
+  else if (isStatement) node.id = this.dummyIdent()
+  this.inAsync = node.async
+  node.params = this.parseFunctionParams()
+  node.body = this.parseBlock()
+  this.inAsync = oldInAsync
+  return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+}
+
+lp.parseExport = function() {
+  let node = this.startNode()
+  this.next()
+  if (this.eat(tt.star)) {
+    node.source = this.eatContextual("from") ? this.parseExprAtom() : this.dummyString()
+    return this.finishNode(node, "ExportAllDeclaration")
+  }
+  if (this.eat(tt._default)) {
+    // export default (function foo() {}) // This is FunctionExpression.
+    let isParenL = this.tok.type === tt.parenL
+    let expr = this.parseMaybeAssign()
+    if (!isParenL && expr.id) {
+      switch (expr.type) {
+      case "FunctionExpression": expr.type = "FunctionDeclaration"; break
+      case "ClassExpression": expr.type = "ClassDeclaration"; break
+      }
+    }
+    node.declaration = expr
+    this.semicolon()
+    return this.finishNode(node, "ExportDefaultDeclaration")
+  }
+  if (this.tok.type.keyword || this.toks.isLet() || this.toks.isAsyncFunction()) {
+    node.declaration = this.parseStatement()
+    node.specifiers = []
+    node.source = null
+  } else {
+    node.declaration = null
+    node.specifiers = this.parseExportSpecifierList()
+    node.source = this.eatContextual("from") ? this.parseExprAtom() : null
+    this.semicolon()
+  }
+  return this.finishNode(node, "ExportNamedDeclaration")
+}
+
+lp.parseImport = function() {
+  let node = this.startNode()
+  this.next()
+  if (this.tok.type === tt.string) {
+    node.specifiers = []
+    node.source = this.parseExprAtom()
+    node.kind = ''
+  } else {
+    let elt
+    if (this.tok.type === tt.name && this.tok.value !== "from") {
+      elt = this.startNode()
+      elt.local = this.parseIdent()
+      this.finishNode(elt, "ImportDefaultSpecifier")
+      this.eat(tt.comma)
+    }
+    node.specifiers = this.parseImportSpecifierList()
+    node.source = this.eatContextual("from") && this.tok.type == tt.string ? this.parseExprAtom() : this.dummyString()
+    if (elt) node.specifiers.unshift(elt)
+  }
+  this.semicolon()
+  return this.finishNode(node, "ImportDeclaration")
+}
+
+lp.parseImportSpecifierList = function() {
+  let elts = []
+  if (this.tok.type === tt.star) {
+    let elt = this.startNode()
+    this.next()
+    elt.local = this.eatContextual("as") ? this.parseIdent() : this.dummyIdent()
+    elts.push(this.finishNode(elt, "ImportNamespaceSpecifier"))
+  } else {
+    let indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+    this.pushCx()
+    this.eat(tt.braceL)
+    if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+    while (!this.closes(tt.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+      let elt = this.startNode()
+      if (this.eat(tt.star)) {
+        elt.local = this.eatContextual("as") ? this.parseIdent() : this.dummyIdent()
+        this.finishNode(elt, "ImportNamespaceSpecifier")
+      } else {
+        if (this.isContextual("from")) break
+        elt.imported = this.parseIdent()
+        if (isDummy(elt.imported)) break
+        elt.local = this.eatContextual("as") ? this.parseIdent() : elt.imported
+        this.finishNode(elt, "ImportSpecifier")
+      }
+      elts.push(elt)
+      this.eat(tt.comma)
+    }
+    this.eat(tt.braceR)
+    this.popCx()
+  }
+  return elts
+}
+
+lp.parseExportSpecifierList = function() {
+  let elts = []
+  let indent = this.curIndent, line = this.curLineStart, continuedLine = this.nextLineStart
+  this.pushCx()
+  this.eat(tt.braceL)
+  if (this.curLineStart > continuedLine) continuedLine = this.curLineStart
+  while (!this.closes(tt.braceR, indent + (this.curLineStart <= continuedLine ? 1 : 0), line)) {
+    if (this.isContextual("from")) break
+    let elt = this.startNode()
+    elt.local = this.parseIdent()
+    if (isDummy(elt.local)) break
+    elt.exported = this.eatContextual("as") ? this.parseIdent() : elt.local
+    this.finishNode(elt, "ExportSpecifier")
+    elts.push(elt)
+    this.eat(tt.comma)
+  }
+  this.eat(tt.braceR)
+  this.popCx()
+  return elts
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/tokenize.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/tokenize.js
new file mode 100644
index 0000000000..c08be97783
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/loose/tokenize.js
@@ -0,0 +1,108 @@
+import {tokTypes as tt, Token, isNewLine, SourceLocation, getLineInfo, lineBreakG} from "../index"
+import {LooseParser} from "./state"
+
+const lp = LooseParser.prototype
+
+function isSpace(ch) {
+  return (ch < 14 && ch > 8) || ch === 32 || ch === 160 || isNewLine(ch)
+}
+
+lp.next = function() {
+  this.last = this.tok
+  if (this.ahead.length)
+    this.tok = this.ahead.shift()
+  else
+    this.tok = this.readToken()
+
+  if (this.tok.start >= this.nextLineStart) {
+    while (this.tok.start >= this.nextLineStart) {
+      this.curLineStart = this.nextLineStart
+      this.nextLineStart = this.lineEnd(this.curLineStart) + 1
+    }
+    this.curIndent = this.indentationAfter(this.curLineStart)
+  }
+}
+
+lp.readToken = function() {
+  for (;;) {
+    try {
+      this.toks.next()
+      if (this.toks.type === tt.dot &&
+          this.input.substr(this.toks.end, 1) === "." &&
+          this.options.ecmaVersion >= 6) {
+        this.toks.end++
+        this.toks.type = tt.ellipsis
+      }
+      return new Token(this.toks)
+    } catch(e) {
+      if (!(e instanceof SyntaxError)) throw e
+
+      // Try to skip some text, based on the error message, and then continue
+      let msg = e.message, pos = e.raisedAt, replace = true
+      if (/unterminated/i.test(msg)) {
+        pos = this.lineEnd(e.pos + 1)
+        if (/string/.test(msg)) {
+          replace = {start: e.pos, end: pos, type: tt.string, value: this.input.slice(e.pos + 1, pos)}
+        } else if (/regular expr/i.test(msg)) {
+          let re = this.input.slice(e.pos, pos)
+          try { re = new RegExp(re) } catch(e) {}
+          replace = {start: e.pos, end: pos, type: tt.regexp, value: re}
+        } else if (/template/.test(msg)) {
+          replace = {start: e.pos, end: pos,
+                     type: tt.template,
+                     value: this.input.slice(e.pos, pos)}
+        } else {
+          replace = false
+        }
+      } else if (/invalid (unicode|regexp|number)|expecting unicode|octal literal|is reserved|directly after number|expected number in radix/i.test(msg)) {
+        while (pos < this.input.length && !isSpace(this.input.charCodeAt(pos))) ++pos
+      } else if (/character escape|expected hexadecimal/i.test(msg)) {
+        while (pos < this.input.length) {
+          let ch = this.input.charCodeAt(pos++)
+          if (ch === 34 || ch === 39 || isNewLine(ch)) break
+        }
+      } else if (/unexpected character/i.test(msg)) {
+        pos++
+        replace = false
+      } else if (/regular expression/i.test(msg)) {
+        replace = true
+      } else {
+        throw e
+      }
+      this.resetTo(pos)
+      if (replace === true) replace = {start: pos, end: pos, type: tt.name, value: "✖"}
+      if (replace) {
+        if (this.options.locations)
+          replace.loc = new SourceLocation(
+            this.toks,
+            getLineInfo(this.input, replace.start),
+            getLineInfo(this.input, replace.end))
+        return replace
+      }
+    }
+  }
+}
+
+lp.resetTo = function(pos) {
+  this.toks.pos = pos
+  let ch = this.input.charAt(pos - 1)
+  this.toks.exprAllowed = !ch || /[\[\{\(,;:?\/*=+\-~!|&%^<>]/.test(ch) ||
+    /[enwfd]/.test(ch) &&
+    /\b(keywords|case|else|return|throw|new|in|(instance|type)of|delete|void)$/.test(this.input.slice(pos - 10, pos))
+
+  if (this.options.locations) {
+    this.toks.curLine = 1
+    this.toks.lineStart = lineBreakG.lastIndex = 0
+    let match
+    while ((match = lineBreakG.exec(this.input)) && match.index < pos) {
+      ++this.toks.curLine
+      this.toks.lineStart = match.index + match[0].length
+    }
+  }
+}
+
+lp.lookAhead = function(n) {
+  while (n > this.ahead.length)
+    this.ahead.push(this.readToken())
+  return this.ahead[n - 1]
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/lval.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/lval.js
new file mode 100644
index 0000000000..c88d71938b
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/lval.js
@@ -0,0 +1,219 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {has} from "./util"
+
+const pp = Parser.prototype
+
+// Convert existing expression atom to assignable pattern
+// if possible.
+
+pp.toAssignable = function(node, isBinding) {
+  if (this.options.ecmaVersion >= 6 && node) {
+    switch (node.type) {
+      case "Identifier":
+      if (this.inAsync && node.name === "await")
+        this.raise(node.start, "Can not use 'await' as identifier inside an async function")
+      break
+
+    case "ObjectPattern":
+    case "ArrayPattern":
+      break
+
+    case "ObjectExpression":
+      node.type = "ObjectPattern"
+      for (let i = 0; i < node.properties.length; i++) {
+        let prop = node.properties[i]
+        if (prop.kind !== "init") this.raise(prop.key.start, "Object pattern can't contain getter or setter")
+        this.toAssignable(prop.value, isBinding)
+      }
+      break
+
+    case "ArrayExpression":
+      node.type = "ArrayPattern"
+      this.toAssignableList(node.elements, isBinding)
+      break
+
+    case "AssignmentExpression":
+      if (node.operator === "=") {
+        node.type = "AssignmentPattern"
+        delete node.operator
+        this.toAssignable(node.left, isBinding)
+        // falls through to AssignmentPattern
+      } else {
+        this.raise(node.left.end, "Only '=' operator can be used for specifying default value.")
+        break
+      }
+
+    case "AssignmentPattern":
+      break
+
+    case "ParenthesizedExpression":
+      node.expression = this.toAssignable(node.expression, isBinding)
+      break
+
+    case "MemberExpression":
+      if (!isBinding) break
+
+    default:
+      this.raise(node.start, "Assigning to rvalue")
+    }
+  }
+  return node
+}
+
+// Convert list of expression atoms to binding list.
+
+pp.toAssignableList = function(exprList, isBinding) {
+  let end = exprList.length
+  if (end) {
+    let last = exprList[end - 1]
+    if (last && last.type == "RestElement") {
+      --end
+    } else if (last && last.type == "SpreadElement") {
+      last.type = "RestElement"
+      let arg = last.argument
+      this.toAssignable(arg, isBinding)
+      if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern")
+        this.unexpected(arg.start)
+      --end
+    }
+
+    if (isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
+      this.unexpected(last.argument.start)
+  }
+  for (let i = 0; i < end; i++) {
+    let elt = exprList[i]
+    if (elt) this.toAssignable(elt, isBinding)
+  }
+  return exprList
+}
+
+// Parses spread element.
+
+pp.parseSpread = function(refDestructuringErrors) {
+  let node = this.startNode()
+  this.next()
+  node.argument = this.parseMaybeAssign(false, refDestructuringErrors)
+  return this.finishNode(node, "SpreadElement")
+}
+
+pp.parseRest = function(allowNonIdent) {
+  let node = this.startNode()
+  this.next()
+
+  // RestElement inside of a function parameter must be an identifier
+  if (allowNonIdent) node.argument = this.type === tt.name ? this.parseIdent() : this.unexpected()
+  else node.argument = this.type === tt.name || this.type === tt.bracketL ? this.parseBindingAtom() : this.unexpected()
+
+  return this.finishNode(node, "RestElement")
+}
+
+// Parses lvalue (assignable) atom.
+
+pp.parseBindingAtom = function() {
+  if (this.options.ecmaVersion < 6) return this.parseIdent()
+  switch (this.type) {
+  case tt.name:
+    return this.parseIdent()
+
+  case tt.bracketL:
+    let node = this.startNode()
+    this.next()
+    node.elements = this.parseBindingList(tt.bracketR, true, true)
+    return this.finishNode(node, "ArrayPattern")
+
+  case tt.braceL:
+    return this.parseObj(true)
+
+  default:
+    this.unexpected()
+  }
+}
+
+pp.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNonIdent) {
+  let elts = [], first = true
+  while (!this.eat(close)) {
+    if (first) first = false
+    else this.expect(tt.comma)
+    if (allowEmpty && this.type === tt.comma) {
+      elts.push(null)
+    } else if (allowTrailingComma && this.afterTrailingComma(close)) {
+      break
+    } else if (this.type === tt.ellipsis) {
+      let rest = this.parseRest(allowNonIdent)
+      this.parseBindingListItem(rest)
+      elts.push(rest)
+      if (this.type === tt.comma) this.raise(this.start, "Comma is not permitted after the rest element")
+      this.expect(close)
+      break
+    } else {
+      let elem = this.parseMaybeDefault(this.start, this.startLoc)
+      this.parseBindingListItem(elem)
+      elts.push(elem)
+    }
+  }
+  return elts
+}
+
+pp.parseBindingListItem = function(param) {
+  return param
+}
+
+// Parses assignment pattern around given atom if possible.
+
+pp.parseMaybeDefault = function(startPos, startLoc, left) {
+  left = left || this.parseBindingAtom()
+  if (this.options.ecmaVersion < 6 || !this.eat(tt.eq)) return left
+  let node = this.startNodeAt(startPos, startLoc)
+  node.left = left
+  node.right = this.parseMaybeAssign()
+  return this.finishNode(node, "AssignmentPattern")
+}
+
+// Verify that a node is an lval — something that can be assigned
+// to.
+
+pp.checkLVal = function(expr, isBinding, checkClashes) {
+  switch (expr.type) {
+  case "Identifier":
+    if (this.strict && this.reservedWordsStrictBind.test(expr.name))
+      this.raiseRecoverable(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode")
+    if (checkClashes) {
+      if (has(checkClashes, expr.name))
+        this.raiseRecoverable(expr.start, "Argument name clash")
+      checkClashes[expr.name] = true
+    }
+    break
+
+  case "MemberExpression":
+    if (isBinding) this.raiseRecoverable(expr.start, (isBinding ? "Binding" : "Assigning to") + " member expression")
+    break
+
+  case "ObjectPattern":
+    for (let i = 0; i < expr.properties.length; i++)
+      this.checkLVal(expr.properties[i].value, isBinding, checkClashes)
+    break
+
+  case "ArrayPattern":
+    for (let i = 0; i < expr.elements.length; i++) {
+      let elem = expr.elements[i]
+      if (elem) this.checkLVal(elem, isBinding, checkClashes)
+    }
+    break
+
+  case "AssignmentPattern":
+    this.checkLVal(expr.left, isBinding, checkClashes)
+    break
+
+  case "RestElement":
+    this.checkLVal(expr.argument, isBinding, checkClashes)
+    break
+
+  case "ParenthesizedExpression":
+    this.checkLVal(expr.expression, isBinding, checkClashes)
+    break
+
+  default:
+    this.raise(expr.start, (isBinding ? "Binding" : "Assigning to") + " rvalue")
+  }
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/node.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/node.js
new file mode 100644
index 0000000000..76b5b09825
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/node.js
@@ -0,0 +1,50 @@
+import {Parser} from "./state"
+import {SourceLocation} from "./locutil"
+
+export class Node {
+  constructor(parser, pos, loc) {
+    this.type = ""
+    this.start = pos
+    this.end = 0
+    if (parser.options.locations)
+      this.loc = new SourceLocation(parser, loc)
+    if (parser.options.directSourceFile)
+      this.sourceFile = parser.options.directSourceFile
+    if (parser.options.ranges)
+      this.range = [pos, 0]
+  }
+}
+
+// Start an AST node, attaching a start offset.
+
+const pp = Parser.prototype
+
+pp.startNode = function() {
+  return new Node(this, this.start, this.startLoc)
+}
+
+pp.startNodeAt = function(pos, loc) {
+  return new Node(this, pos, loc)
+}
+
+// Finish an AST node, adding `type` and `end` properties.
+
+function finishNodeAt(node, type, pos, loc) {
+  node.type = type
+  node.end = pos
+  if (this.options.locations)
+    node.loc.end = loc
+  if (this.options.ranges)
+    node.range[1] = pos
+  return node
+}
+
+pp.finishNode = function(node, type) {
+  return finishNodeAt.call(this, node, type, this.lastTokEnd, this.lastTokEndLoc)
+}
+
+// Finish node at given position
+
+pp.finishNodeAt = function(node, type, pos, loc) {
+  return finishNodeAt.call(this, node, type, pos, loc)
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/options.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/options.js
new file mode 100644
index 0000000000..e7b217e8d5
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/options.js
@@ -0,0 +1,128 @@
+import {has, isArray} from "./util"
+import {SourceLocation} from "./locutil"
+
+// A second optional argument can be given to further configure
+// the parser process. These options are recognized:
+
+export const defaultOptions = {
+  // `ecmaVersion` indicates the ECMAScript version to parse. Must
+  // be either 3, 5, 6 (2015), 7 (2016), or 8 (2017). This influences support
+  // for strict mode, the set of reserved words, and support for
+  // new syntax features. The default is 7.
+  ecmaVersion: 7,
+  // `sourceType` indicates the mode the code should be parsed in.
+  // Can be either `"script"` or `"module"`. This influences global
+  // strict mode and parsing of `import` and `export` declarations.
+  sourceType: "script",
+  // `onInsertedSemicolon` can be a callback that will be called
+  // when a semicolon is automatically inserted. It will be passed
+  // th position of the comma as an offset, and if `locations` is
+  // enabled, it is given the location as a `{line, column}` object
+  // as second argument.
+  onInsertedSemicolon: null,
+  // `onTrailingComma` is similar to `onInsertedSemicolon`, but for
+  // trailing commas.
+  onTrailingComma: null,
+  // By default, reserved words are only enforced if ecmaVersion >= 5.
+  // Set `allowReserved` to a boolean value to explicitly turn this on
+  // an off. When this option has the value "never", reserved words
+  // and keywords can also not be used as property names.
+  allowReserved: null,
+  // When enabled, a return at the top level is not considered an
+  // error.
+  allowReturnOutsideFunction: false,
+  // When enabled, import/export statements are not constrained to
+  // appearing at the top of the program.
+  allowImportExportEverywhere: false,
+  // When enabled, hashbang directive in the beginning of file
+  // is allowed and treated as a line comment.
+  allowHashBang: false,
+  // When `locations` is on, `loc` properties holding objects with
+  // `start` and `end` properties in `{line, column}` form (with
+  // line being 1-based and column 0-based) will be attached to the
+  // nodes.
+  locations: false,
+  // A function can be passed as `onToken` option, which will
+  // cause Acorn to call that function with object in the same
+  // format as tokens returned from `tokenizer().getToken()`. Note
+  // that you are not allowed to call the parser from the
+  // callback—that will corrupt its internal state.
+  onToken: null,
+  // A function can be passed as `onComment` option, which will
+  // cause Acorn to call that function with `(block, text, start,
+  // end)` parameters whenever a comment is skipped. `block` is a
+  // boolean indicating whether this is a block (`/* */`) comment,
+  // `text` is the content of the comment, and `start` and `end` are
+  // character offsets that denote the start and end of the comment.
+  // When the `locations` option is on, two more parameters are
+  // passed, the full `{line, column}` locations of the start and
+  // end of the comments. Note that you are not allowed to call the
+  // parser from the callback—that will corrupt its internal state.
+  onComment: null,
+  // Nodes have their start and end characters offsets recorded in
+  // `start` and `end` properties (directly on the node, rather than
+  // the `loc` object, which holds line/column data. To also add a
+  // [semi-standardized][range] `range` property holding a `[start,
+  // end]` array with the same numbers, set the `ranges` option to
+  // `true`.
+  //
+  // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
+  ranges: false,
+  // It is possible to parse multiple files into a single AST by
+  // passing the tree produced by parsing the first file as
+  // `program` option in subsequent parses. This will add the
+  // toplevel forms of the parsed file to the `Program` (top) node
+  // of an existing parse tree.
+  program: null,
+  // When `locations` is on, you can pass this to record the source
+  // file in every node's `loc` object.
+  sourceFile: null,
+  // This value, if given, is stored in every node, whether
+  // `locations` is on or off.
+  directSourceFile: null,
+  // When enabled, parenthesized expressions are represented by
+  // (non-standard) ParenthesizedExpression nodes
+  preserveParens: false,
+  plugins: {}
+}
+
+// Interpret and default an options object
+
+export function getOptions(opts) {
+  let options = {}
+
+  for (let opt in defaultOptions)
+    options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt]
+
+  if (options.ecmaVersion >= 2015)
+    options.ecmaVersion -= 2009
+
+  if (options.allowReserved == null)
+    options.allowReserved = options.ecmaVersion < 5
+
+  if (isArray(options.onToken)) {
+    let tokens = options.onToken
+    options.onToken = (token) => tokens.push(token)
+  }
+  if (isArray(options.onComment))
+    options.onComment = pushComment(options, options.onComment)
+
+  return options
+}
+
+function pushComment(options, array) {
+  return function (block, text, start, end, startLoc, endLoc) {
+    let comment = {
+      type: block ? 'Block' : 'Line',
+      value: text,
+      start: start,
+      end: end
+    }
+    if (options.locations)
+      comment.loc = new SourceLocation(this, startLoc, endLoc)
+    if (options.ranges)
+      comment.range = [start, end]
+    array.push(comment)
+  }
+}
+
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/parseutil.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/parseutil.js
new file mode 100644
index 0000000000..55d10344a8
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/parseutil.js
@@ -0,0 +1,117 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {lineBreak} from "./whitespace"
+
+const pp = Parser.prototype
+
+// ## Parser utilities
+
+// Test whether a statement node is the string literal `"use strict"`.
+
+pp.isUseStrict = function(stmt) {
+  return this.options.ecmaVersion >= 5 && stmt.type === "ExpressionStatement" &&
+    stmt.expression.type === "Literal" &&
+    stmt.expression.raw.slice(1, -1) === "use strict"
+}
+
+// Predicate that tests whether the next token is of the given
+// type, and if yes, consumes it as a side effect.
+
+pp.eat = function(type) {
+  if (this.type === type) {
+    this.next()
+    return true
+  } else {
+    return false
+  }
+}
+
+// Tests whether parsed token is a contextual keyword.
+
+pp.isContextual = function(name) {
+  return this.type === tt.name && this.value === name
+}
+
+// Consumes contextual keyword if possible.
+
+pp.eatContextual = function(name) {
+  return this.value === name && this.eat(tt.name)
+}
+
+// Asserts that following token is given contextual keyword.
+
+pp.expectContextual = function(name) {
+  if (!this.eatContextual(name)) this.unexpected()
+}
+
+// Test whether a semicolon can be inserted at the current position.
+
+pp.canInsertSemicolon = function() {
+  return this.type === tt.eof ||
+    this.type === tt.braceR ||
+    lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+}
+
+pp.insertSemicolon = function() {
+  if (this.canInsertSemicolon()) {
+    if (this.options.onInsertedSemicolon)
+      this.options.onInsertedSemicolon(this.lastTokEnd, this.lastTokEndLoc)
+    return true
+  }
+}
+
+// Consume a semicolon, or, failing that, see if we are allowed to
+// pretend that there is a semicolon at this position.
+
+pp.semicolon = function() {
+  if (!this.eat(tt.semi) && !this.insertSemicolon()) this.unexpected()
+}
+
+pp.afterTrailingComma = function(tokType, notNext) {
+  if (this.type == tokType) {
+    if (this.options.onTrailingComma)
+      this.options.onTrailingComma(this.lastTokStart, this.lastTokStartLoc)
+    if (!notNext)
+      this.next()
+    return true
+  }
+}
+
+// Expect a token of a given type. If found, consume it, otherwise,
+// raise an unexpected token error.
+
+pp.expect = function(type) {
+  this.eat(type) || this.unexpected()
+}
+
+// Raise an unexpected token error.
+
+pp.unexpected = function(pos) {
+  this.raise(pos != null ? pos : this.start, "Unexpected token")
+}
+
+export class DestructuringErrors {
+  constructor() {
+    this.shorthandAssign = 0
+    this.trailingComma = 0
+  }
+}
+
+pp.checkPatternErrors = function(refDestructuringErrors, andThrow) {
+  let trailing = refDestructuringErrors && refDestructuringErrors.trailingComma
+  if (!andThrow) return !!trailing
+  if (trailing) this.raise(trailing, "Comma is not permitted after the rest element")
+}
+
+pp.checkExpressionErrors = function(refDestructuringErrors, andThrow) {
+  let pos = refDestructuringErrors && refDestructuringErrors.shorthandAssign
+  if (!andThrow) return !!pos
+  if (pos) this.raise(pos, "Shorthand property assignments are valid only in destructuring patterns")
+}
+
+pp.checkYieldAwaitInDefaultParams = function() {
+  if (this.yieldPos && (!this.awaitPos || this.yieldPos < this.awaitPos))
+    this.raise(this.yieldPos, "Yield expression cannot be a default value")
+  if (this.awaitPos)
+    this.raise(this.awaitPos, "Await expression cannot be a default value")
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/state.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/state.js
new file mode 100644
index 0000000000..1a8e293172
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/state.js
@@ -0,0 +1,110 @@
+import {reservedWords, keywords} from "./identifier"
+import {types as tt} from "./tokentype"
+import {lineBreak} from "./whitespace"
+import {getOptions} from "./options"
+
+// Registered plugins
+export const plugins = {}
+
+function keywordRegexp(words) {
+  return new RegExp("^(" + words.replace(/ /g, "|") + ")$")
+}
+
+export class Parser {
+  constructor(options, input, startPos) {
+    this.options = options = getOptions(options)
+    this.sourceFile = options.sourceFile
+    this.keywords = keywordRegexp(keywords[options.ecmaVersion >= 6 ? 6 : 5])
+    let reserved = ""
+    if (!options.allowReserved) {
+      for (let v = options.ecmaVersion;; v--)
+        if (reserved = reservedWords[v]) break
+      if (options.sourceType == "module") reserved += " await"
+    }
+    this.reservedWords = keywordRegexp(reserved)
+    let reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict
+    this.reservedWordsStrict = keywordRegexp(reservedStrict)
+    this.reservedWordsStrictBind = keywordRegexp(reservedStrict + " " + reservedWords.strictBind)
+    this.input = String(input)
+
+    // Used to signal to callers of `readWord1` whether the word
+    // contained any escape sequences. This is needed because words with
+    // escape sequences must not be interpreted as keywords.
+    this.containsEsc = false
+
+    // Load plugins
+    this.loadPlugins(options.plugins)
+
+    // Set up token state
+
+    // The current position of the tokenizer in the input.
+    if (startPos) {
+      this.pos = startPos
+      this.lineStart = this.input.lastIndexOf("\n", startPos - 1) + 1
+      this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length
+    } else {
+      this.pos = this.lineStart = 0
+      this.curLine = 1
+    }
+
+    // Properties of the current token:
+    // Its type
+    this.type = tt.eof
+    // For tokens that include more information than their type, the value
+    this.value = null
+    // Its start and end offset
+    this.start = this.end = this.pos
+    // And, if locations are used, the {line, column} object
+    // corresponding to those offsets
+    this.startLoc = this.endLoc = this.curPosition()
+
+    // Position information for the previous token
+    this.lastTokEndLoc = this.lastTokStartLoc = null
+    this.lastTokStart = this.lastTokEnd = this.pos
+
+    // The context stack is used to superficially track syntactic
+    // context to predict whether a regular expression is allowed in a
+    // given position.
+    this.context = this.initialContext()
+    this.exprAllowed = true
+
+    // Figure out if it's a module code.
+    this.strict = this.inModule = options.sourceType === "module"
+
+    // Used to signify the start of a potential arrow function
+    this.potentialArrowAt = -1
+
+    // Flags to track whether we are in a function, a generator, an async function.
+    this.inFunction = this.inGenerator = this.inAsync = false
+    // Positions to delayed-check that yield/await does not exist in default parameters.
+    this.yieldPos = this.awaitPos = 0
+    // Labels in scope.
+    this.labels = []
+
+    // If enabled, skip leading hashbang line.
+    if (this.pos === 0 && options.allowHashBang && this.input.slice(0, 2) === '#!')
+      this.skipLineComment(2)
+  }
+
+  // DEPRECATED Kept for backwards compatibility until 3.0 in case a plugin uses them
+  isKeyword(word) { return this.keywords.test(word) }
+  isReservedWord(word) { return this.reservedWords.test(word) }
+
+  extend(name, f) {
+    this[name] = f(this[name])
+  }
+
+  loadPlugins(pluginConfigs) {
+    for (let name in pluginConfigs) {
+      let plugin = plugins[name]
+      if (!plugin) throw new Error("Plugin '" + name + "' not found")
+      plugin(this, pluginConfigs[name])
+    }
+  }
+
+  parse() {
+    let node = this.options.program || this.startNode()
+    this.nextToken()
+    return this.parseTopLevel(node)
+  }
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/statement.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/statement.js
new file mode 100644
index 0000000000..7a660f1919
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/statement.js
@@ -0,0 +1,740 @@
+import {types as tt} from "./tokentype"
+import {Parser} from "./state"
+import {lineBreak, skipWhiteSpace} from "./whitespace"
+import {isIdentifierStart, isIdentifierChar} from "./identifier"
+import {DestructuringErrors} from "./parseutil"
+
+const pp = Parser.prototype
+
+// ### Statement parsing
+
+// Parse a program. Initializes the parser, reads any number of
+// statements, and wraps them in a Program node.  Optionally takes a
+// `program` argument.  If present, the statements will be appended
+// to its body instead of creating a new node.
+
+pp.parseTopLevel = function(node) {
+  let first = true, exports = {}
+  if (!node.body) node.body = []
+  while (this.type !== tt.eof) {
+    let stmt = this.parseStatement(true, true, exports)
+    node.body.push(stmt)
+    if (first) {
+      if (this.isUseStrict(stmt)) this.setStrict(true)
+      first = false
+    }
+  }
+  this.next()
+  if (this.options.ecmaVersion >= 6) {
+    node.sourceType = this.options.sourceType
+  }
+  return this.finishNode(node, "Program")
+}
+
+const loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"}
+
+pp.isLet = function() {
+  if (this.type !== tt.name || this.options.ecmaVersion < 6 || this.value != "let") return false
+  skipWhiteSpace.lastIndex = this.pos
+  let skip = skipWhiteSpace.exec(this.input)
+  let next = this.pos + skip[0].length, nextCh = this.input.charCodeAt(next)
+  if (nextCh === 91 || nextCh == 123) return true // '{' and '['
+  if (isIdentifierStart(nextCh, true)) {
+    for (var pos = next + 1; isIdentifierChar(this.input.charCodeAt(pos), true); ++pos) {}
+    let ident = this.input.slice(next, pos)
+    if (!this.isKeyword(ident)) return true
+  }
+  return false
+}
+
+// check 'async [no LineTerminator here] function'
+// - 'async /*foo*/ function' is OK.
+// - 'async /*\n*/ function' is invalid.
+pp.isAsyncFunction = function() {
+  if (this.type !== tt.name || this.options.ecmaVersion < 8 || this.value != "async")
+    return false
+
+  skipWhiteSpace.lastIndex = this.pos
+  let skip = skipWhiteSpace.exec(this.input)
+  let next = this.pos + skip[0].length
+  return !lineBreak.test(this.input.slice(this.pos, next)) &&
+    this.input.slice(next, next + 8) === "function" &&
+    (next + 8 == this.input.length || !isIdentifierChar(this.input.charAt(next + 8)))
+}
+
+// Parse a single statement.
+//
+// If expecting a statement and finding a slash operator, parse a
+// regular expression literal. This is to handle cases like
+// `if (foo) /blah/.exec(foo)`, where looking at the previous token
+// does not help.
+
+pp.parseStatement = function(declaration, topLevel, exports) {
+  let starttype = this.type, node = this.startNode(), kind
+
+  if (this.isLet()) {
+    starttype = tt._var
+    kind = "let"
+  }
+
+  // Most types of statements are recognized by the keyword they
+  // start with. Many are trivial to parse, some require a bit of
+  // complexity.
+
+  switch (starttype) {
+  case tt._break: case tt._continue: return this.parseBreakContinueStatement(node, starttype.keyword)
+  case tt._debugger: return this.parseDebuggerStatement(node)
+  case tt._do: return this.parseDoStatement(node)
+  case tt._for: return this.parseForStatement(node)
+  case tt._function:
+    if (!declaration && this.options.ecmaVersion >= 6) this.unexpected()
+    return this.parseFunctionStatement(node, false)
+  case tt._class:
+    if (!declaration) this.unexpected()
+    return this.parseClass(node, true)
+  case tt._if: return this.parseIfStatement(node)
+  case tt._return: return this.parseReturnStatement(node)
+  case tt._switch: return this.parseSwitchStatement(node)
+  case tt._throw: return this.parseThrowStatement(node)
+  case tt._try: return this.parseTryStatement(node)
+  case tt._const: case tt._var:
+    kind = kind || this.value
+    if (!declaration && kind != "var") this.unexpected()
+    return this.parseVarStatement(node, kind)
+  case tt._while: return this.parseWhileStatement(node)
+  case tt._with: return this.parseWithStatement(node)
+  case tt.braceL: return this.parseBlock()
+  case tt.semi: return this.parseEmptyStatement(node)
+  case tt._export:
+  case tt._import:
+    if (!this.options.allowImportExportEverywhere) {
+      if (!topLevel)
+        this.raise(this.start, "'import' and 'export' may only appear at the top level")
+      if (!this.inModule)
+        this.raise(this.start, "'import' and 'export' may appear only with 'sourceType: module'")
+    }
+    return starttype === tt._import ? this.parseImport(node) : this.parseExport(node, exports)
+
+    // If the statement does not start with a statement keyword or a
+    // brace, it's an ExpressionStatement or LabeledStatement. We
+    // simply start parsing an expression, and afterwards, if the
+    // next token is a colon and the expression was a simple
+    // Identifier node, we switch to interpreting it as a label.
+  default:
+    if (this.isAsyncFunction() && declaration) {
+      this.next()
+      return this.parseFunctionStatement(node, true)
+    }
+
+    let maybeName = this.value, expr = this.parseExpression()
+    if (starttype === tt.name && expr.type === "Identifier" && this.eat(tt.colon))
+      return this.parseLabeledStatement(node, maybeName, expr)
+    else return this.parseExpressionStatement(node, expr)
+  }
+}
+
+pp.parseBreakContinueStatement = function(node, keyword) {
+  let isBreak = keyword == "break"
+  this.next()
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.label = null
+  else if (this.type !== tt.name) this.unexpected()
+  else {
+    node.label = this.parseIdent()
+    this.semicolon()
+  }
+
+  // Verify that there is an actual destination to break or
+  // continue to.
+  for (var i = 0; i < this.labels.length; ++i) {
+    let lab = this.labels[i]
+    if (node.label == null || lab.name === node.label.name) {
+      if (lab.kind != null && (isBreak || lab.kind === "loop")) break
+      if (node.label && isBreak) break
+    }
+  }
+  if (i === this.labels.length) this.raise(node.start, "Unsyntactic " + keyword)
+  return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement")
+}
+
+pp.parseDebuggerStatement = function(node) {
+  this.next()
+  this.semicolon()
+  return this.finishNode(node, "DebuggerStatement")
+}
+
+pp.parseDoStatement = function(node) {
+  this.next()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  this.expect(tt._while)
+  node.test = this.parseParenExpression()
+  if (this.options.ecmaVersion >= 6)
+    this.eat(tt.semi)
+  else
+    this.semicolon()
+  return this.finishNode(node, "DoWhileStatement")
+}
+
+// Disambiguating between a `for` and a `for`/`in` or `for`/`of`
+// loop is non-trivial. Basically, we have to parse the init `var`
+// statement or expression, disallowing the `in` operator (see
+// the second parameter to `parseExpression`), and then check
+// whether the next token is `in` or `of`. When there is no init
+// part (semicolon immediately after the opening parenthesis), it
+// is a regular `for` loop.
+
+pp.parseForStatement = function(node) {
+  this.next()
+  this.labels.push(loopLabel)
+  this.expect(tt.parenL)
+  if (this.type === tt.semi) return this.parseFor(node, null)
+  let isLet = this.isLet()
+  if (this.type === tt._var || this.type === tt._const || isLet) {
+    let init = this.startNode(), kind = isLet ? "let" : this.value
+    this.next()
+    this.parseVar(init, true, kind)
+    this.finishNode(init, "VariableDeclaration")
+    if ((this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) && init.declarations.length === 1 &&
+        !(kind !== "var" && init.declarations[0].init))
+      return this.parseForIn(node, init)
+    return this.parseFor(node, init)
+  }
+  let refDestructuringErrors = new DestructuringErrors
+  let init = this.parseExpression(true, refDestructuringErrors)
+  if (this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of"))) {
+    this.checkPatternErrors(refDestructuringErrors, true)
+    this.toAssignable(init)
+    this.checkLVal(init)
+    return this.parseForIn(node, init)
+  } else {
+    this.checkExpressionErrors(refDestructuringErrors, true)
+  }
+  return this.parseFor(node, init)
+}
+
+pp.parseFunctionStatement = function(node, isAsync) {
+  this.next()
+  return this.parseFunction(node, true, false, isAsync)
+}
+
+pp.isFunction = function() {
+  return this.type === tt._function || this.isAsyncFunction()
+}
+
+pp.parseIfStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  // allow function declarations in branches, but only in non-strict mode
+  node.consequent = this.parseStatement(!this.strict && this.isFunction())
+  node.alternate = this.eat(tt._else) ? this.parseStatement(!this.strict && this.isFunction()) : null
+  return this.finishNode(node, "IfStatement")
+}
+
+pp.parseReturnStatement = function(node) {
+  if (!this.inFunction && !this.options.allowReturnOutsideFunction)
+    this.raise(this.start, "'return' outside of function")
+  this.next()
+
+  // In `return` (and `break`/`continue`), the keywords with
+  // optional arguments, we eagerly look for a semicolon or the
+  // possibility to insert one.
+
+  if (this.eat(tt.semi) || this.insertSemicolon()) node.argument = null
+  else { node.argument = this.parseExpression(); this.semicolon() }
+  return this.finishNode(node, "ReturnStatement")
+}
+
+pp.parseSwitchStatement = function(node) {
+  this.next()
+  node.discriminant = this.parseParenExpression()
+  node.cases = []
+  this.expect(tt.braceL)
+  this.labels.push(switchLabel)
+
+  // Statements under must be grouped (by label) in SwitchCase
+  // nodes. `cur` is used to keep the node that we are currently
+  // adding statements to.
+
+  for (var cur, sawDefault = false; this.type != tt.braceR;) {
+    if (this.type === tt._case || this.type === tt._default) {
+      let isCase = this.type === tt._case
+      if (cur) this.finishNode(cur, "SwitchCase")
+      node.cases.push(cur = this.startNode())
+      cur.consequent = []
+      this.next()
+      if (isCase) {
+        cur.test = this.parseExpression()
+      } else {
+        if (sawDefault) this.raiseRecoverable(this.lastTokStart, "Multiple default clauses")
+        sawDefault = true
+        cur.test = null
+      }
+      this.expect(tt.colon)
+    } else {
+      if (!cur) this.unexpected()
+      cur.consequent.push(this.parseStatement(true))
+    }
+  }
+  if (cur) this.finishNode(cur, "SwitchCase")
+  this.next() // Closing brace
+  this.labels.pop()
+  return this.finishNode(node, "SwitchStatement")
+}
+
+pp.parseThrowStatement = function(node) {
+  this.next()
+  if (lineBreak.test(this.input.slice(this.lastTokEnd, this.start)))
+    this.raise(this.lastTokEnd, "Illegal newline after throw")
+  node.argument = this.parseExpression()
+  this.semicolon()
+  return this.finishNode(node, "ThrowStatement")
+}
+
+// Reused empty array added for node fields that are always empty.
+
+const empty = []
+
+pp.parseTryStatement = function(node) {
+  this.next()
+  node.block = this.parseBlock()
+  node.handler = null
+  if (this.type === tt._catch) {
+    let clause = this.startNode()
+    this.next()
+    this.expect(tt.parenL)
+    clause.param = this.parseBindingAtom()
+    this.checkLVal(clause.param, true)
+    this.expect(tt.parenR)
+    clause.body = this.parseBlock()
+    node.handler = this.finishNode(clause, "CatchClause")
+  }
+  node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null
+  if (!node.handler && !node.finalizer)
+    this.raise(node.start, "Missing catch or finally clause")
+  return this.finishNode(node, "TryStatement")
+}
+
+pp.parseVarStatement = function(node, kind) {
+  this.next()
+  this.parseVar(node, false, kind)
+  this.semicolon()
+  return this.finishNode(node, "VariableDeclaration")
+}
+
+pp.parseWhileStatement = function(node) {
+  this.next()
+  node.test = this.parseParenExpression()
+  this.labels.push(loopLabel)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, "WhileStatement")
+}
+
+pp.parseWithStatement = function(node) {
+  if (this.strict) this.raise(this.start, "'with' in strict mode")
+  this.next()
+  node.object = this.parseParenExpression()
+  node.body = this.parseStatement(false)
+  return this.finishNode(node, "WithStatement")
+}
+
+pp.parseEmptyStatement = function(node) {
+  this.next()
+  return this.finishNode(node, "EmptyStatement")
+}
+
+pp.parseLabeledStatement = function(node, maybeName, expr) {
+  for (let i = 0; i < this.labels.length; ++i)
+    if (this.labels[i].name === maybeName) this.raise(expr.start, "Label '" + maybeName + "' is already declared")
+  let kind = this.type.isLoop ? "loop" : this.type === tt._switch ? "switch" : null
+  for (let i = this.labels.length - 1; i >= 0; i--) {
+    let label = this.labels[i]
+    if (label.statementStart == node.start) {
+      label.statementStart = this.start
+      label.kind = kind
+    } else break
+  }
+  this.labels.push({name: maybeName, kind: kind, statementStart: this.start})
+  node.body = this.parseStatement(true)
+  this.labels.pop()
+  node.label = expr
+  return this.finishNode(node, "LabeledStatement")
+}
+
+pp.parseExpressionStatement = function(node, expr) {
+  node.expression = expr
+  this.semicolon()
+  return this.finishNode(node, "ExpressionStatement")
+}
+
+// Parse a semicolon-enclosed block of statements, handling `"use
+// strict"` declarations when `allowStrict` is true (used for
+// function bodies).
+
+pp.parseBlock = function(allowStrict) {
+  let node = this.startNode(), first = true, oldStrict
+  node.body = []
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    let stmt = this.parseStatement(true)
+    node.body.push(stmt)
+    if (first && allowStrict && this.isUseStrict(stmt)) {
+      oldStrict = this.strict
+      this.setStrict(this.strict = true)
+    }
+    first = false
+  }
+  if (oldStrict === false) this.setStrict(false)
+  return this.finishNode(node, "BlockStatement")
+}
+
+// Parse a regular `for` loop. The disambiguation code in
+// `parseStatement` will already have parsed the init statement or
+// expression.
+
+pp.parseFor = function(node, init) {
+  node.init = init
+  this.expect(tt.semi)
+  node.test = this.type === tt.semi ? null : this.parseExpression()
+  this.expect(tt.semi)
+  node.update = this.type === tt.parenR ? null : this.parseExpression()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, "ForStatement")
+}
+
+// Parse a `for`/`in` and `for`/`of` loop, which are almost
+// same from parser's perspective.
+
+pp.parseForIn = function(node, init) {
+  let type = this.type === tt._in ? "ForInStatement" : "ForOfStatement"
+  this.next()
+  node.left = init
+  node.right = this.parseExpression()
+  this.expect(tt.parenR)
+  node.body = this.parseStatement(false)
+  this.labels.pop()
+  return this.finishNode(node, type)
+}
+
+// Parse a list of variable declarations.
+
+pp.parseVar = function(node, isFor, kind) {
+  node.declarations = []
+  node.kind = kind
+  for (;;) {
+    let decl = this.startNode()
+    this.parseVarId(decl)
+    if (this.eat(tt.eq)) {
+      decl.init = this.parseMaybeAssign(isFor)
+    } else if (kind === "const" && !(this.type === tt._in || (this.options.ecmaVersion >= 6 && this.isContextual("of")))) {
+      this.unexpected()
+    } else if (decl.id.type != "Identifier" && !(isFor && (this.type === tt._in || this.isContextual("of")))) {
+      this.raise(this.lastTokEnd, "Complex binding patterns require an initialization value")
+    } else {
+      decl.init = null
+    }
+    node.declarations.push(this.finishNode(decl, "VariableDeclarator"))
+    if (!this.eat(tt.comma)) break
+  }
+  return node
+}
+
+pp.parseVarId = function(decl) {
+  decl.id = this.parseBindingAtom()
+  this.checkLVal(decl.id, true)
+}
+
+// Parse a function declaration or literal (depending on the
+// `isStatement` parameter).
+
+pp.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) {
+  this.initFunction(node)
+  if (this.options.ecmaVersion >= 6 && !isAsync)
+    node.generator = this.eat(tt.star)
+  if (this.options.ecmaVersion >= 8)
+    node.async = !!isAsync
+
+  if (isStatement)
+    node.id = this.parseIdent()
+
+  let oldInGen = this.inGenerator, oldInAsync = this.inAsync, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
+  this.inGenerator = node.generator
+  this.inAsync = node.async
+  this.yieldPos = 0
+  this.awaitPos = 0
+
+  if (!isStatement && this.type === tt.name)
+    node.id = this.parseIdent()
+  this.parseFunctionParams(node)
+  this.parseFunctionBody(node, allowExpressionBody)
+
+  this.inGenerator = oldInGen
+  this.inAsync = oldInAsync
+  this.yieldPos = oldYieldPos
+  this.awaitPos = oldAwaitPos
+  return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression")
+}
+
+pp.parseFunctionParams = function(node) {
+  this.expect(tt.parenL)
+  node.params = this.parseBindingList(tt.parenR, false, this.options.ecmaVersion >= 8, true)
+  this.checkYieldAwaitInDefaultParams()
+}
+
+// Parse a class declaration or literal (depending on the
+// `isStatement` parameter).
+
+pp.parseClass = function(node, isStatement) {
+  this.next()
+  this.parseClassId(node, isStatement)
+  this.parseClassSuper(node)
+  let classBody = this.startNode()
+  let hadConstructor = false
+  classBody.body = []
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (this.eat(tt.semi)) continue
+    let method = this.startNode()
+    let isGenerator = this.eat(tt.star)
+    let isAsync = false
+    let isMaybeStatic = this.type === tt.name && this.value === "static"
+    this.parsePropertyName(method)
+    method.static = isMaybeStatic && this.type !== tt.parenL
+    if (method.static) {
+      if (isGenerator) this.unexpected()
+      isGenerator = this.eat(tt.star)
+      this.parsePropertyName(method)
+    }
+    if (this.options.ecmaVersion >= 8 && !isGenerator && !method.computed &&
+        method.key.type === "Identifier" && method.key.name === "async" && this.type !== tt.parenL &&
+        !this.canInsertSemicolon()) {
+      isAsync = true
+      this.parsePropertyName(method)
+    }
+    method.kind = "method"
+    let isGetSet = false
+    if (!method.computed) {
+      let {key} = method
+      if (!isGenerator && !isAsync && key.type === "Identifier" && this.type !== tt.parenL && (key.name === "get" || key.name === "set")) {
+        isGetSet = true
+        method.kind = key.name
+        key = this.parsePropertyName(method)
+      }
+      if (!method.static && (key.type === "Identifier" && key.name === "constructor" ||
+          key.type === "Literal" && key.value === "constructor")) {
+        if (hadConstructor) this.raise(key.start, "Duplicate constructor in the same class")
+        if (isGetSet) this.raise(key.start, "Constructor can't have get/set modifier")
+        if (isGenerator) this.raise(key.start, "Constructor can't be a generator")
+        if (isAsync) this.raise(key.start, "Constructor can't be an async method")
+        method.kind = "constructor"
+        hadConstructor = true
+      }
+    }
+    this.parseClassMethod(classBody, method, isGenerator, isAsync)
+    if (isGetSet) {
+      let paramCount = method.kind === "get" ? 0 : 1
+      if (method.value.params.length !== paramCount) {
+        let start = method.value.start
+        if (method.kind === "get")
+          this.raiseRecoverable(start, "getter should have no params")
+        else
+          this.raiseRecoverable(start, "setter should have exactly one param")
+      } else {
+        if (method.kind === "set" && method.value.params[0].type === "RestElement")
+          this.raiseRecoverable(method.value.params[0].start, "Setter cannot use rest params")
+      }
+    }
+  }
+  node.body = this.finishNode(classBody, "ClassBody")
+  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression")
+}
+
+pp.parseClassMethod = function(classBody, method, isGenerator, isAsync) {
+  method.value = this.parseMethod(isGenerator, isAsync)
+  classBody.body.push(this.finishNode(method, "MethodDefinition"))
+}
+
+pp.parseClassId = function(node, isStatement) {
+  node.id = this.type === tt.name ? this.parseIdent() : isStatement ? this.unexpected() : null
+}
+
+pp.parseClassSuper = function(node) {
+  node.superClass = this.eat(tt._extends) ? this.parseExprSubscripts() : null
+}
+
+// Parses module export declaration.
+
+pp.parseExport = function(node, exports) {
+  this.next()
+  // export * from '...'
+  if (this.eat(tt.star)) {
+    this.expectContextual("from")
+    node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+    this.semicolon()
+    return this.finishNode(node, "ExportAllDeclaration")
+  }
+  if (this.eat(tt._default)) { // export default ...
+    this.checkExport(exports, "default", this.lastTokStart)
+    let parens = this.type == tt.parenL
+    let expr = this.parseMaybeAssign()
+    let needsSemi = true
+    if (!parens && (expr.type == "FunctionExpression" ||
+                    expr.type == "ClassExpression")) {
+      needsSemi = false
+      if (expr.id) {
+        expr.type = expr.type == "FunctionExpression"
+          ? "FunctionDeclaration"
+          : "ClassDeclaration"
+      }
+    }
+    node.declaration = expr
+    if (needsSemi) this.semicolon()
+    return this.finishNode(node, "ExportDefaultDeclaration")
+  }
+  // export var|const|let|function|class ...
+  if (this.shouldParseExportStatement()) {
+    node.declaration = this.parseStatement(true)
+    if (node.declaration.type === "VariableDeclaration")
+      this.checkVariableExport(exports, node.declaration.declarations)
+    else
+      this.checkExport(exports, node.declaration.id.name, node.declaration.id.start)
+    node.specifiers = []
+    node.source = null
+  } else { // export { x, y as z } [from '...']
+    node.declaration = null
+    node.specifiers = this.parseExportSpecifiers(exports)
+    if (this.eatContextual("from")) {
+      node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+    } else {
+      // check for keywords used as local names
+      for (let i = 0; i < node.specifiers.length; i++) {
+        if (this.keywords.test(node.specifiers[i].local.name) || this.reservedWords.test(node.specifiers[i].local.name)) {
+          this.unexpected(node.specifiers[i].local.start)
+        }
+      }
+
+      node.source = null
+    }
+    this.semicolon()
+  }
+  return this.finishNode(node, "ExportNamedDeclaration")
+}
+
+pp.checkExport = function(exports, name, pos) {
+  if (!exports) return
+  if (Object.prototype.hasOwnProperty.call(exports, name))
+    this.raiseRecoverable(pos, "Duplicate export '" + name + "'")
+  exports[name] = true
+}
+
+pp.checkPatternExport = function(exports, pat) {
+  let type = pat.type
+  if (type == "Identifier")
+    this.checkExport(exports, pat.name, pat.start)
+  else if (type == "ObjectPattern")
+    for (let i = 0; i < pat.properties.length; ++i)
+      this.checkPatternExport(exports, pat.properties[i].value)
+  else if (type == "ArrayPattern")
+    for (let i = 0; i < pat.elements.length; ++i) {
+      let elt = pat.elements[i]
+      if (elt) this.checkPatternExport(exports, elt)
+    }
+  else if (type == "AssignmentPattern")
+    this.checkPatternExport(exports, pat.left)
+  else if (type == "ParenthesizedExpression")
+    this.checkPatternExport(exports, pat.expression)
+}
+
+pp.checkVariableExport = function(exports, decls) {
+  if (!exports) return
+  for (let i = 0; i < decls.length; i++)
+    this.checkPatternExport(exports, decls[i].id)
+}
+
+pp.shouldParseExportStatement = function() {
+  return this.type.keyword || this.isLet() || this.isAsyncFunction()
+}
+
+// Parses a comma-separated list of module exports.
+
+pp.parseExportSpecifiers = function(exports) {
+  let nodes = [], first = true
+  // export { x, y as z } [from '...']
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    let node = this.startNode()
+    node.local = this.parseIdent(this.type === tt._default)
+    node.exported = this.eatContextual("as") ? this.parseIdent(true) : node.local
+    this.checkExport(exports, node.exported.name, node.exported.start)
+    nodes.push(this.finishNode(node, "ExportSpecifier"))
+  }
+  return nodes
+}
+
+// Parses import declaration.
+
+pp.parseImport = function(node) {
+  this.next()
+  // import '...'
+  if (this.type === tt.string) {
+    node.specifiers = empty
+    node.source = this.parseExprAtom()
+  } else {
+    node.specifiers = this.parseImportSpecifiers()
+    this.expectContextual("from")
+    node.source = this.type === tt.string ? this.parseExprAtom() : this.unexpected()
+  }
+  this.semicolon()
+  return this.finishNode(node, "ImportDeclaration")
+}
+
+// Parses a comma-separated list of module imports.
+
+pp.parseImportSpecifiers = function() {
+  let nodes = [], first = true
+  if (this.type === tt.name) {
+    // import defaultObj, { x, y as z } from '...'
+    let node = this.startNode()
+    node.local = this.parseIdent()
+    this.checkLVal(node.local, true)
+    nodes.push(this.finishNode(node, "ImportDefaultSpecifier"))
+    if (!this.eat(tt.comma)) return nodes
+  }
+  if (this.type === tt.star) {
+    let node = this.startNode()
+    this.next()
+    this.expectContextual("as")
+    node.local = this.parseIdent()
+    this.checkLVal(node.local, true)
+    nodes.push(this.finishNode(node, "ImportNamespaceSpecifier"))
+    return nodes
+  }
+  this.expect(tt.braceL)
+  while (!this.eat(tt.braceR)) {
+    if (!first) {
+      this.expect(tt.comma)
+      if (this.afterTrailingComma(tt.braceR)) break
+    } else first = false
+
+    let node = this.startNode()
+    node.imported = this.parseIdent(true)
+    if (this.eatContextual("as")) {
+      node.local = this.parseIdent()
+    } else {
+      node.local = node.imported
+      if (this.isKeyword(node.local.name)) this.unexpected(node.local.start)
+      if (this.reservedWordsStrict.test(node.local.name)) this.raiseRecoverable(node.local.start, "The keyword '" + node.local.name + "' is reserved")
+    }
+    this.checkLVal(node.local, true)
+    nodes.push(this.finishNode(node, "ImportSpecifier"))
+  }
+  return nodes
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokencontext.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokencontext.js
new file mode 100644
index 0000000000..911a51563d
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokencontext.js
@@ -0,0 +1,110 @@
+// The algorithm used to determine whether a regexp can appear at a
+// given point in the program is loosely based on sweet.js' approach.
+// See https://github.com/mozilla/sweet.js/wiki/design
+
+import {Parser} from "./state"
+import {types as tt} from "./tokentype"
+import {lineBreak} from "./whitespace"
+
+export class TokContext {
+  constructor(token, isExpr, preserveSpace, override) {
+    this.token = token
+    this.isExpr = !!isExpr
+    this.preserveSpace = !!preserveSpace
+    this.override = override
+  }
+}
+
+export const types = {
+  b_stat: new TokContext("{", false),
+  b_expr: new TokContext("{", true),
+  b_tmpl: new TokContext("${", true),
+  p_stat: new TokContext("(", false),
+  p_expr: new TokContext("(", true),
+  q_tmpl: new TokContext("`", true, true, p => p.readTmplToken()),
+  f_expr: new TokContext("function", true)
+}
+
+const pp = Parser.prototype
+
+pp.initialContext = function() {
+  return [types.b_stat]
+}
+
+pp.braceIsBlock = function(prevType) {
+  if (prevType === tt.colon) {
+    let parent = this.curContext()
+    if (parent === types.b_stat || parent === types.b_expr)
+      return !parent.isExpr
+  }
+  if (prevType === tt._return)
+    return lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+  if (prevType === tt._else || prevType === tt.semi || prevType === tt.eof || prevType === tt.parenR)
+    return true
+  if (prevType == tt.braceL)
+    return this.curContext() === types.b_stat
+  return !this.exprAllowed
+}
+
+pp.updateContext = function(prevType) {
+  let update, type = this.type
+  if (type.keyword && prevType == tt.dot)
+    this.exprAllowed = false
+  else if (update = type.updateContext)
+    update.call(this, prevType)
+  else
+    this.exprAllowed = type.beforeExpr
+}
+
+// Token-specific context update code
+
+tt.parenR.updateContext = tt.braceR.updateContext = function() {
+  if (this.context.length == 1) {
+    this.exprAllowed = true
+    return
+  }
+  let out = this.context.pop()
+  if (out === types.b_stat && this.curContext() === types.f_expr) {
+    this.context.pop()
+    this.exprAllowed = false
+  } else if (out === types.b_tmpl) {
+    this.exprAllowed = true
+  } else {
+    this.exprAllowed = !out.isExpr
+  }
+}
+
+tt.braceL.updateContext = function(prevType) {
+  this.context.push(this.braceIsBlock(prevType) ? types.b_stat : types.b_expr)
+  this.exprAllowed = true
+}
+
+tt.dollarBraceL.updateContext = function() {
+  this.context.push(types.b_tmpl)
+  this.exprAllowed = true
+}
+
+tt.parenL.updateContext = function(prevType) {
+  let statementParens = prevType === tt._if || prevType === tt._for || prevType === tt._with || prevType === tt._while
+  this.context.push(statementParens ? types.p_stat : types.p_expr)
+  this.exprAllowed = true
+}
+
+tt.incDec.updateContext = function() {
+  // tokExprAllowed stays unchanged
+}
+
+tt._function.updateContext = function(prevType) {
+  if (prevType.beforeExpr && prevType !== tt.semi && prevType !== tt._else &&
+      !((prevType === tt.colon || prevType === tt.braceL) && this.curContext() === types.b_stat))
+    this.context.push(types.f_expr)
+  this.exprAllowed = false
+}
+
+tt.backQuote.updateContext = function() {
+  if (this.curContext() === types.q_tmpl)
+    this.context.pop()
+  else
+    this.context.push(types.q_tmpl)
+  this.exprAllowed = false
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokenize.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokenize.js
new file mode 100644
index 0000000000..08ea7bf74f
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokenize.js
@@ -0,0 +1,697 @@
+import {isIdentifierStart, isIdentifierChar} from "./identifier"
+import {types as tt, keywords as keywordTypes} from "./tokentype"
+import {Parser} from "./state"
+import {SourceLocation} from "./locutil"
+import {lineBreak, lineBreakG, isNewLine, nonASCIIwhitespace} from "./whitespace"
+
+// Object type used to represent tokens. Note that normally, tokens
+// simply exist as properties on the parser object. This is only
+// used for the onToken callback and the external tokenizer.
+
+export class Token {
+  constructor(p) {
+    this.type = p.type
+    this.value = p.value
+    this.start = p.start
+    this.end = p.end
+    if (p.options.locations)
+      this.loc = new SourceLocation(p, p.startLoc, p.endLoc)
+    if (p.options.ranges)
+      this.range = [p.start, p.end]
+  }
+}
+
+// ## Tokenizer
+
+const pp = Parser.prototype
+
+// Are we running under Rhino?
+const isRhino = typeof Packages == "object" && Object.prototype.toString.call(Packages) == "[object JavaPackage]"
+
+// Move to the next token
+
+pp.next = function() {
+  if (this.options.onToken)
+    this.options.onToken(new Token(this))
+
+  this.lastTokEnd = this.end
+  this.lastTokStart = this.start
+  this.lastTokEndLoc = this.endLoc
+  this.lastTokStartLoc = this.startLoc
+  this.nextToken()
+}
+
+pp.getToken = function() {
+  this.next()
+  return new Token(this)
+}
+
+// If we're in an ES6 environment, make parsers iterable
+if (typeof Symbol !== "undefined")
+  pp[Symbol.iterator] = function () {
+    let self = this
+    return {next: function () {
+      let token = self.getToken()
+      return {
+        done: token.type === tt.eof,
+        value: token
+      }
+    }}
+  }
+
+// Toggle strict mode. Re-reads the next number or string to please
+// pedantic tests (`"use strict"; 010;` should fail).
+
+pp.setStrict = function(strict) {
+  this.strict = strict
+  if (this.type !== tt.num && this.type !== tt.string) return
+  this.pos = this.start
+  if (this.options.locations) {
+    while (this.pos < this.lineStart) {
+      this.lineStart = this.input.lastIndexOf("\n", this.lineStart - 2) + 1
+      --this.curLine
+    }
+  }
+  this.nextToken()
+}
+
+pp.curContext = function() {
+  return this.context[this.context.length - 1]
+}
+
+// Read a single token, updating the parser object's token-related
+// properties.
+
+pp.nextToken = function() {
+  let curContext = this.curContext()
+  if (!curContext || !curContext.preserveSpace) this.skipSpace()
+
+  this.start = this.pos
+  if (this.options.locations) this.startLoc = this.curPosition()
+  if (this.pos >= this.input.length) return this.finishToken(tt.eof)
+
+  if (curContext.override) return curContext.override(this)
+  else this.readToken(this.fullCharCodeAtPos())
+}
+
+pp.readToken = function(code) {
+  // Identifier or keyword. '\uXXXX' sequences are allowed in
+  // identifiers, so '\' also dispatches to that.
+  if (isIdentifierStart(code, this.options.ecmaVersion >= 6) || code === 92 /* '\' */)
+    return this.readWord()
+
+  return this.getTokenFromCode(code)
+}
+
+pp.fullCharCodeAtPos = function() {
+  let code = this.input.charCodeAt(this.pos)
+  if (code <= 0xd7ff || code >= 0xe000) return code
+  let next = this.input.charCodeAt(this.pos + 1)
+  return (code << 10) + next - 0x35fdc00
+}
+
+pp.skipBlockComment = function() {
+  let startLoc = this.options.onComment && this.curPosition()
+  let start = this.pos, end = this.input.indexOf("*/", this.pos += 2)
+  if (end === -1) this.raise(this.pos - 2, "Unterminated comment")
+  this.pos = end + 2
+  if (this.options.locations) {
+    lineBreakG.lastIndex = start
+    let match
+    while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
+      ++this.curLine
+      this.lineStart = match.index + match[0].length
+    }
+  }
+  if (this.options.onComment)
+    this.options.onComment(true, this.input.slice(start + 2, end), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+pp.skipLineComment = function(startSkip) {
+  let start = this.pos
+  let startLoc = this.options.onComment && this.curPosition()
+  let ch = this.input.charCodeAt(this.pos+=startSkip)
+  while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+    ++this.pos
+    ch = this.input.charCodeAt(this.pos)
+  }
+  if (this.options.onComment)
+    this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos,
+                           startLoc, this.curPosition())
+}
+
+// Called at the start of the parse and after every token. Skips
+// whitespace and comments, and.
+
+pp.skipSpace = function() {
+  loop: while (this.pos < this.input.length) {
+    let ch = this.input.charCodeAt(this.pos)
+    switch (ch) {
+      case 32: case 160: // ' '
+        ++this.pos
+        break
+      case 13:
+        if (this.input.charCodeAt(this.pos + 1) === 10) {
+          ++this.pos
+        }
+      case 10: case 8232: case 8233:
+        ++this.pos
+        if (this.options.locations) {
+          ++this.curLine
+          this.lineStart = this.pos
+        }
+        break
+      case 47: // '/'
+        switch (this.input.charCodeAt(this.pos + 1)) {
+          case 42: // '*'
+            this.skipBlockComment()
+            break
+          case 47:
+            this.skipLineComment(2)
+            break
+          default:
+            break loop
+        }
+        break
+      default:
+        if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+          ++this.pos
+        } else {
+          break loop
+        }
+    }
+  }
+}
+
+// Called at the end of every token. Sets `end`, `val`, and
+// maintains `context` and `exprAllowed`, and skips the space after
+// the token, so that the next one's `start` will point at the
+// right position.
+
+pp.finishToken = function(type, val) {
+  this.end = this.pos
+  if (this.options.locations) this.endLoc = this.curPosition()
+  let prevType = this.type
+  this.type = type
+  this.value = val
+
+  this.updateContext(prevType)
+}
+
+// ### Token reading
+
+// This is the function that is called to fetch the next token. It
+// is somewhat obscure, because it works in character codes rather
+// than characters, and because operator parsing has been inlined
+// into it.
+//
+// All in the name of speed.
+//
+pp.readToken_dot = function() {
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next >= 48 && next <= 57) return this.readNumber(true)
+  let next2 = this.input.charCodeAt(this.pos + 2)
+  if (this.options.ecmaVersion >= 6 && next === 46 && next2 === 46) { // 46 = dot '.'
+    this.pos += 3
+    return this.finishToken(tt.ellipsis)
+  } else {
+    ++this.pos
+    return this.finishToken(tt.dot)
+  }
+}
+
+pp.readToken_slash = function() { // '/'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (this.exprAllowed) {++this.pos; return this.readRegexp()}
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.slash, 1)
+}
+
+pp.readToken_mult_modulo_exp = function(code) { // '%*'
+  let next = this.input.charCodeAt(this.pos + 1)
+  let size = 1
+  let tokentype = code === 42 ? tt.star : tt.modulo
+
+  // exponentiation operator ** and **=
+  if (this.options.ecmaVersion >= 7 && next === 42) {
+    ++size
+    tokentype = tt.starstar
+    next = this.input.charCodeAt(this.pos + 2)
+  }
+
+  if (next === 61) return this.finishOp(tt.assign, size + 1)
+  return this.finishOp(tokentype, size)
+}
+
+pp.readToken_pipe_amp = function(code) { // '|&'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1)
+}
+
+pp.readToken_caret = function() { // '^'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.bitwiseXOR, 1)
+}
+
+pp.readToken_plus_min = function(code) { // '+-'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === code) {
+    if (next == 45 && this.input.charCodeAt(this.pos + 2) == 62 &&
+        lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
+      // A `-->` line comment
+      this.skipLineComment(3)
+      this.skipSpace()
+      return this.nextToken()
+    }
+    return this.finishOp(tt.incDec, 2)
+  }
+  if (next === 61) return this.finishOp(tt.assign, 2)
+  return this.finishOp(tt.plusMin, 1)
+}
+
+pp.readToken_lt_gt = function(code) { // '<>'
+  let next = this.input.charCodeAt(this.pos + 1)
+  let size = 1
+  if (next === code) {
+    size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2
+    if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1)
+    return this.finishOp(tt.bitShift, size)
+  }
+  if (next == 33 && code == 60 && this.input.charCodeAt(this.pos + 2) == 45 &&
+      this.input.charCodeAt(this.pos + 3) == 45) {
+    if (this.inModule) this.unexpected()
+    // `<!--`, an XML-style comment that should be interpreted as a line comment
+    this.skipLineComment(4)
+    this.skipSpace()
+    return this.nextToken()
+  }
+  if (next === 61) size = 2
+  return this.finishOp(tt.relational, size)
+}
+
+pp.readToken_eq_excl = function(code) { // '=!'
+  let next = this.input.charCodeAt(this.pos + 1)
+  if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2)
+  if (code === 61 && next === 62 && this.options.ecmaVersion >= 6) { // '=>'
+    this.pos += 2
+    return this.finishToken(tt.arrow)
+  }
+  return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1)
+}
+
+pp.getTokenFromCode = function(code) {
+  switch (code) {
+    // The interpretation of a dot depends on whether it is followed
+    // by a digit or another two dots.
+  case 46: // '.'
+    return this.readToken_dot()
+
+    // Punctuation tokens.
+  case 40: ++this.pos; return this.finishToken(tt.parenL)
+  case 41: ++this.pos; return this.finishToken(tt.parenR)
+  case 59: ++this.pos; return this.finishToken(tt.semi)
+  case 44: ++this.pos; return this.finishToken(tt.comma)
+  case 91: ++this.pos; return this.finishToken(tt.bracketL)
+  case 93: ++this.pos; return this.finishToken(tt.bracketR)
+  case 123: ++this.pos; return this.finishToken(tt.braceL)
+  case 125: ++this.pos; return this.finishToken(tt.braceR)
+  case 58: ++this.pos; return this.finishToken(tt.colon)
+  case 63: ++this.pos; return this.finishToken(tt.question)
+
+  case 96: // '`'
+    if (this.options.ecmaVersion < 6) break
+    ++this.pos
+    return this.finishToken(tt.backQuote)
+
+  case 48: // '0'
+    let next = this.input.charCodeAt(this.pos + 1)
+    if (next === 120 || next === 88) return this.readRadixNumber(16) // '0x', '0X' - hex number
+    if (this.options.ecmaVersion >= 6) {
+      if (next === 111 || next === 79) return this.readRadixNumber(8) // '0o', '0O' - octal number
+      if (next === 98 || next === 66) return this.readRadixNumber(2) // '0b', '0B' - binary number
+    }
+    // Anything else beginning with a digit is an integer, octal
+    // number, or float.
+  case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+    return this.readNumber(false)
+
+    // Quotes produce strings.
+  case 34: case 39: // '"', "'"
+    return this.readString(code)
+
+    // Operators are parsed inline in tiny state machines. '=' (61) is
+    // often referred to. `finishOp` simply skips the amount of
+    // characters it is given as second argument, and returns a token
+    // of the type given by its first argument.
+
+  case 47: // '/'
+    return this.readToken_slash()
+
+  case 37: case 42: // '%*'
+    return this.readToken_mult_modulo_exp(code)
+
+  case 124: case 38: // '|&'
+    return this.readToken_pipe_amp(code)
+
+  case 94: // '^'
+    return this.readToken_caret()
+
+  case 43: case 45: // '+-'
+    return this.readToken_plus_min(code)
+
+  case 60: case 62: // '<>'
+    return this.readToken_lt_gt(code)
+
+  case 61: case 33: // '=!'
+    return this.readToken_eq_excl(code)
+
+  case 126: // '~'
+    return this.finishOp(tt.prefix, 1)
+  }
+
+  this.raise(this.pos, "Unexpected character '" + codePointToString(code) + "'")
+}
+
+pp.finishOp = function(type, size) {
+  let str = this.input.slice(this.pos, this.pos + size)
+  this.pos += size
+  return this.finishToken(type, str)
+}
+
+// Parse a regular expression. Some context-awareness is necessary,
+// since a '/' inside a '[]' set does not end the expression.
+
+function tryCreateRegexp(src, flags, throwErrorAt, parser) {
+  try {
+    return new RegExp(src, flags)
+  } catch (e) {
+    if (throwErrorAt !== undefined) {
+      if (e instanceof SyntaxError) parser.raise(throwErrorAt, "Error parsing regular expression: " + e.message)
+      throw e
+    }
+  }
+}
+
+var regexpUnicodeSupport = !!tryCreateRegexp("\uffff", "u")
+
+pp.readRegexp = function() {
+  let escaped, inClass, start = this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(start, "Unterminated regular expression")
+    let ch = this.input.charAt(this.pos)
+    if (lineBreak.test(ch)) this.raise(start, "Unterminated regular expression")
+    if (!escaped) {
+      if (ch === "[") inClass = true
+      else if (ch === "]" && inClass) inClass = false
+      else if (ch === "/" && !inClass) break
+      escaped = ch === "\\"
+    } else escaped = false
+    ++this.pos
+  }
+  let content = this.input.slice(start, this.pos)
+  ++this.pos
+  // Need to use `readWord1` because '\uXXXX' sequences are allowed
+  // here (don't ask).
+  let mods = this.readWord1()
+  let tmp = content, tmpFlags = ""
+  if (mods) {
+    let validFlags = /^[gim]*$/
+    if (this.options.ecmaVersion >= 6) validFlags = /^[gimuy]*$/
+    if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag")
+    if (mods.indexOf("u") >= 0) {
+      if (regexpUnicodeSupport) {
+        tmpFlags = "u"
+      } else {
+        // Replace each astral symbol and every Unicode escape sequence that
+        // possibly represents an astral symbol or a paired surrogate with a
+        // single ASCII symbol to avoid throwing on regular expressions that
+        // are only valid in combination with the `/u` flag.
+        // Note: replacing with the ASCII symbol `x` might cause false
+        // negatives in unlikely scenarios. For example, `[\u{61}-b]` is a
+        // perfectly valid pattern that is equivalent to `[a-b]`, but it would
+        // be replaced by `[x-b]` which throws an error.
+        tmp = tmp.replace(/\\u\{([0-9a-fA-F]+)\}/g, (_match, code, offset) => {
+          code = Number("0x" + code)
+          if (code > 0x10FFFF) this.raise(start + offset + 3, "Code point out of bounds")
+          return "x"
+        })
+        tmp = tmp.replace(/\\u([a-fA-F0-9]{4})|[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "x")
+        tmpFlags = tmpFlags.replace("u", "")
+      }
+    }
+  }
+  // Detect invalid regular expressions.
+  let value = null
+  // Rhino's regular expression parser is flaky and throws uncatchable exceptions,
+  // so don't do detection if we are running under Rhino
+  if (!isRhino) {
+    tryCreateRegexp(tmp, tmpFlags, start, this)
+    // Get a regular expression object for this pattern-flag pair, or `null` in
+    // case the current environment doesn't support the flags it uses.
+    value = tryCreateRegexp(content, mods)
+  }
+  return this.finishToken(tt.regexp, {pattern: content, flags: mods, value: value})
+}
+
+// Read an integer in the given radix. Return null if zero digits
+// were read, the integer value otherwise. When `len` is given, this
+// will return `null` unless the integer has exactly `len` digits.
+
+pp.readInt = function(radix, len) {
+  let start = this.pos, total = 0
+  for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+    let code = this.input.charCodeAt(this.pos), val
+    if (code >= 97) val = code - 97 + 10 // a
+    else if (code >= 65) val = code - 65 + 10 // A
+    else if (code >= 48 && code <= 57) val = code - 48 // 0-9
+    else val = Infinity
+    if (val >= radix) break
+    ++this.pos
+    total = total * radix + val
+  }
+  if (this.pos === start || len != null && this.pos - start !== len) return null
+
+  return total
+}
+
+pp.readRadixNumber = function(radix) {
+  this.pos += 2 // 0x
+  let val = this.readInt(radix)
+  if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix)
+  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+  return this.finishToken(tt.num, val)
+}
+
+// Read an integer, octal integer, or floating-point number.
+
+pp.readNumber = function(startsWithDot) {
+  let start = this.pos, isFloat = false, octal = this.input.charCodeAt(this.pos) === 48
+  if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number")
+  if (octal && this.pos == start + 1) octal = false
+  let next = this.input.charCodeAt(this.pos)
+  if (next === 46 && !octal) { // '.'
+    ++this.pos
+    this.readInt(10)
+    isFloat = true
+    next = this.input.charCodeAt(this.pos)
+  }
+  if ((next === 69 || next === 101) && !octal) { // 'eE'
+    next = this.input.charCodeAt(++this.pos)
+    if (next === 43 || next === 45) ++this.pos // '+-'
+    if (this.readInt(10) === null) this.raise(start, "Invalid number")
+    isFloat = true
+  }
+  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number")
+
+  let str = this.input.slice(start, this.pos), val
+  if (isFloat) val = parseFloat(str)
+  else if (!octal || str.length === 1) val = parseInt(str, 10)
+  else if (/[89]/.test(str) || this.strict) this.raise(start, "Invalid number")
+  else val = parseInt(str, 8)
+  return this.finishToken(tt.num, val)
+}
+
+// Read a string value, interpreting backslash-escapes.
+
+pp.readCodePoint = function() {
+  let ch = this.input.charCodeAt(this.pos), code
+
+  if (ch === 123) {
+    if (this.options.ecmaVersion < 6) this.unexpected()
+    let codePos = ++this.pos
+    code = this.readHexChar(this.input.indexOf('}', this.pos) - this.pos)
+    ++this.pos
+    if (code > 0x10FFFF) this.raise(codePos, "Code point out of bounds")
+  } else {
+    code = this.readHexChar(4)
+  }
+  return code
+}
+
+function codePointToString(code) {
+  // UTF-16 Decoding
+  if (code <= 0xFFFF) return String.fromCharCode(code)
+  code -= 0x10000
+  return String.fromCharCode((code >> 10) + 0xD800, (code & 1023) + 0xDC00)
+}
+
+pp.readString = function(quote) {
+  let out = "", chunkStart = ++this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated string constant")
+    let ch = this.input.charCodeAt(this.pos)
+    if (ch === quote) break
+    if (ch === 92) { // '\'
+      out += this.input.slice(chunkStart, this.pos)
+      out += this.readEscapedChar(false)
+      chunkStart = this.pos
+    } else {
+      if (isNewLine(ch)) this.raise(this.start, "Unterminated string constant")
+      ++this.pos
+    }
+  }
+  out += this.input.slice(chunkStart, this.pos++)
+  return this.finishToken(tt.string, out)
+}
+
+// Reads template string tokens.
+
+pp.readTmplToken = function() {
+  let out = "", chunkStart = this.pos
+  for (;;) {
+    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated template")
+    let ch = this.input.charCodeAt(this.pos)
+    if (ch === 96 || ch === 36 && this.input.charCodeAt(this.pos + 1) === 123) { // '`', '${'
+      if (this.pos === this.start && this.type === tt.template) {
+        if (ch === 36) {
+          this.pos += 2
+          return this.finishToken(tt.dollarBraceL)
+        } else {
+          ++this.pos
+          return this.finishToken(tt.backQuote)
+        }
+      }
+      out += this.input.slice(chunkStart, this.pos)
+      return this.finishToken(tt.template, out)
+    }
+    if (ch === 92) { // '\'
+      out += this.input.slice(chunkStart, this.pos)
+      out += this.readEscapedChar(true)
+      chunkStart = this.pos
+    } else if (isNewLine(ch)) {
+      out += this.input.slice(chunkStart, this.pos)
+      ++this.pos
+      switch (ch) {
+        case 13:
+          if (this.input.charCodeAt(this.pos) === 10) ++this.pos
+        case 10:
+          out += "\n"
+          break
+        default:
+          out += String.fromCharCode(ch)
+          break
+      }
+      if (this.options.locations) {
+        ++this.curLine
+        this.lineStart = this.pos
+      }
+      chunkStart = this.pos
+    } else {
+      ++this.pos
+    }
+  }
+}
+
+// Used to read escaped characters
+
+pp.readEscapedChar = function(inTemplate) {
+  let ch = this.input.charCodeAt(++this.pos)
+  ++this.pos
+  switch (ch) {
+  case 110: return "\n" // 'n' -> '\n'
+  case 114: return "\r" // 'r' -> '\r'
+  case 120: return String.fromCharCode(this.readHexChar(2)) // 'x'
+  case 117: return codePointToString(this.readCodePoint()) // 'u'
+  case 116: return "\t" // 't' -> '\t'
+  case 98: return "\b" // 'b' -> '\b'
+  case 118: return "\u000b" // 'v' -> '\u000b'
+  case 102: return "\f" // 'f' -> '\f'
+  case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos // '\r\n'
+  case 10: // ' \n'
+    if (this.options.locations) { this.lineStart = this.pos; ++this.curLine }
+    return ""
+  default:
+    if (ch >= 48 && ch <= 55) {
+      let octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0]
+      let octal = parseInt(octalStr, 8)
+      if (octal > 255) {
+        octalStr = octalStr.slice(0, -1)
+        octal = parseInt(octalStr, 8)
+      }
+      if (octalStr !== "0" && (this.strict || inTemplate)) {
+        this.raise(this.pos - 2, "Octal literal in strict mode")
+      }
+      this.pos += octalStr.length - 1
+      return String.fromCharCode(octal)
+    }
+    return String.fromCharCode(ch)
+  }
+}
+
+// Used to read character escape sequences ('\x', '\u', '\U').
+
+pp.readHexChar = function(len) {
+  let codePos = this.pos
+  let n = this.readInt(16, len)
+  if (n === null) this.raise(codePos, "Bad character escape sequence")
+  return n
+}
+
+// Read an identifier, and return it as a string. Sets `this.containsEsc`
+// to whether the word contained a '\u' escape.
+//
+// Incrementally adds only escaped chars, adding other chunks as-is
+// as a micro-optimization.
+
+pp.readWord1 = function() {
+  this.containsEsc = false
+  let word = "", first = true, chunkStart = this.pos
+  let astral = this.options.ecmaVersion >= 6
+  while (this.pos < this.input.length) {
+    let ch = this.fullCharCodeAtPos()
+    if (isIdentifierChar(ch, astral)) {
+      this.pos += ch <= 0xffff ? 1 : 2
+    } else if (ch === 92) { // "\"
+      this.containsEsc = true
+      word += this.input.slice(chunkStart, this.pos)
+      let escStart = this.pos
+      if (this.input.charCodeAt(++this.pos) != 117) // "u"
+        this.raise(this.pos, "Expecting Unicode escape sequence \\uXXXX")
+      ++this.pos
+      let esc = this.readCodePoint()
+      if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral))
+        this.raise(escStart, "Invalid Unicode escape")
+      word += codePointToString(esc)
+      chunkStart = this.pos
+    } else {
+      break
+    }
+    first = false
+  }
+  return word + this.input.slice(chunkStart, this.pos)
+}
+
+// Read an identifier or keyword token. Will check for reserved
+// words when necessary.
+
+pp.readWord = function() {
+  let word = this.readWord1()
+  let type = tt.name
+  if ((this.options.ecmaVersion >= 6 || !this.containsEsc) && this.keywords.test(word))
+    type = keywordTypes[word]
+  return this.finishToken(type, word)
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokentype.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokentype.js
new file mode 100644
index 0000000000..7c36e2d49d
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/tokentype.js
@@ -0,0 +1,147 @@
+// ## Token types
+
+// The assignment of fine-grained, information-carrying type objects
+// allows the tokenizer to store the information it has about a
+// token in a way that is very cheap for the parser to look up.
+
+// All token type variables start with an underscore, to make them
+// easy to recognize.
+
+// The `beforeExpr` property is used to disambiguate between regular
+// expressions and divisions. It is set on all token types that can
+// be followed by an expression (thus, a slash after them would be a
+// regular expression).
+//
+// The `startsExpr` property is used to check if the token ends a
+// `yield` expression. It is set on all token types that either can
+// directly start an expression (like a quotation mark) or can
+// continue an expression (like the body of a string).
+//
+// `isLoop` marks a keyword as starting a loop, which is important
+// to know when parsing a label, in order to allow or disallow
+// continue jumps to that label.
+
+export class TokenType {
+  constructor(label, conf = {}) {
+    this.label = label
+    this.keyword = conf.keyword
+    this.beforeExpr = !!conf.beforeExpr
+    this.startsExpr = !!conf.startsExpr
+    this.isLoop = !!conf.isLoop
+    this.isAssign = !!conf.isAssign
+    this.prefix = !!conf.prefix
+    this.postfix = !!conf.postfix
+    this.binop = conf.binop || null
+    this.updateContext = null
+  }
+}
+
+function binop(name, prec) {
+  return new TokenType(name, {beforeExpr: true, binop: prec})
+}
+const beforeExpr = {beforeExpr: true}, startsExpr = {startsExpr: true}
+
+// Map keyword names to token types.
+
+export const keywords = {}
+
+// Succinct definitions of keyword token types
+function kw(name, options = {}) {
+  options.keyword = name
+  return keywords[name] = new TokenType(name, options)
+}
+
+export const types = {
+  num: new TokenType("num", startsExpr),
+  regexp: new TokenType("regexp", startsExpr),
+  string: new TokenType("string", startsExpr),
+  name: new TokenType("name", startsExpr),
+  eof: new TokenType("eof"),
+
+  // Punctuation token types.
+  bracketL: new TokenType("[", {beforeExpr: true, startsExpr: true}),
+  bracketR: new TokenType("]"),
+  braceL: new TokenType("{", {beforeExpr: true, startsExpr: true}),
+  braceR: new TokenType("}"),
+  parenL: new TokenType("(", {beforeExpr: true, startsExpr: true}),
+  parenR: new TokenType(")"),
+  comma: new TokenType(",", beforeExpr),
+  semi: new TokenType(";", beforeExpr),
+  colon: new TokenType(":", beforeExpr),
+  dot: new TokenType("."),
+  question: new TokenType("?", beforeExpr),
+  arrow: new TokenType("=>", beforeExpr),
+  template: new TokenType("template"),
+  ellipsis: new TokenType("...", beforeExpr),
+  backQuote: new TokenType("`", startsExpr),
+  dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}),
+
+  // Operators. These carry several kinds of properties to help the
+  // parser use them properly (the presence of these properties is
+  // what categorizes them as operators).
+  //
+  // `binop`, when present, specifies that this operator is a binary
+  // operator, and will refer to its precedence.
+  //
+  // `prefix` and `postfix` mark the operator as a prefix or postfix
+  // unary operator.
+  //
+  // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+  // binary operators with a very low precedence, that should result
+  // in AssignmentExpression nodes.
+
+  eq: new TokenType("=", {beforeExpr: true, isAssign: true}),
+  assign: new TokenType("_=", {beforeExpr: true, isAssign: true}),
+  incDec: new TokenType("++/--", {prefix: true, postfix: true, startsExpr: true}),
+  prefix: new TokenType("prefix", {beforeExpr: true, prefix: true, startsExpr: true}),
+  logicalOR: binop("||", 1),
+  logicalAND: binop("&&", 2),
+  bitwiseOR: binop("|", 3),
+  bitwiseXOR: binop("^", 4),
+  bitwiseAND: binop("&", 5),
+  equality: binop("==/!=", 6),
+  relational: binop("</>", 7),
+  bitShift: binop("<</>>", 8),
+  plusMin: new TokenType("+/-", {beforeExpr: true, binop: 9, prefix: true, startsExpr: true}),
+  modulo: binop("%", 10),
+  star: binop("*", 10),
+  slash: binop("/", 10),
+  starstar: new TokenType("**", {beforeExpr: true}),
+
+  // Keyword token types.
+  _break: kw("break"),
+  _case: kw("case", beforeExpr),
+  _catch: kw("catch"),
+  _continue: kw("continue"),
+  _debugger: kw("debugger"),
+  _default: kw("default", beforeExpr),
+  _do: kw("do", {isLoop: true, beforeExpr: true}),
+  _else: kw("else", beforeExpr),
+  _finally: kw("finally"),
+  _for: kw("for", {isLoop: true}),
+  _function: kw("function", startsExpr),
+  _if: kw("if"),
+  _return: kw("return", beforeExpr),
+  _switch: kw("switch"),
+  _throw: kw("throw", beforeExpr),
+  _try: kw("try"),
+  _var: kw("var"),
+  _const: kw("const"),
+  _while: kw("while", {isLoop: true}),
+  _with: kw("with"),
+  _new: kw("new", {beforeExpr: true, startsExpr: true}),
+  _this: kw("this", startsExpr),
+  _super: kw("super", startsExpr),
+  _class: kw("class"),
+  _extends: kw("extends", beforeExpr),
+  _export: kw("export"),
+  _import: kw("import"),
+  _null: kw("null", startsExpr),
+  _true: kw("true", startsExpr),
+  _false: kw("false", startsExpr),
+  _in: kw("in", {beforeExpr: true, binop: 7}),
+  _instanceof: kw("instanceof", {beforeExpr: true, binop: 7}),
+  _typeof: kw("typeof", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _void: kw("void", {beforeExpr: true, prefix: true, startsExpr: true}),
+  _delete: kw("delete", {beforeExpr: true, prefix: true, startsExpr: true})
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/util.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/util.js
new file mode 100644
index 0000000000..3517f8d212
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/util.js
@@ -0,0 +1,9 @@
+export function isArray(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]"
+}
+
+// Checks if an object has a property.
+
+export function has(obj, propName) {
+  return Object.prototype.hasOwnProperty.call(obj, propName)
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/walk/index.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/walk/index.js
new file mode 100644
index 0000000000..0da7e0d86c
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/walk/index.js
@@ -0,0 +1,342 @@
+// AST walker module for Mozilla Parser API compatible trees
+
+// A simple walk is one where you simply specify callbacks to be
+// called on specific nodes. The last two arguments are optional. A
+// simple use would be
+//
+//     walk.simple(myTree, {
+//         Expression: function(node) { ... }
+//     });
+//
+// to do something with all expressions. All Parser API node types
+// can be used to identify node types, as well as Expression,
+// Statement, and ScopeBody, which denote categories of nodes.
+//
+// The base argument can be used to pass a custom (recursive)
+// walker, and state can be used to give this walked an initial
+// state.
+
+export function simple(node, visitors, base, state, override) {
+  if (!base) base = exports.base
+  ;(function c(node, st, override) {
+    let type = override || node.type, found = visitors[type]
+    base[type](node, st, c)
+    if (found) found(node, st)
+  })(node, state, override)
+}
+
+// An ancestor walk keeps an array of ancestor nodes (including the
+// current node) and passes them to the callback as third parameter
+// (and also as state parameter when no other state is present).
+export function ancestor(node, visitors, base, state) {
+  if (!base) base = exports.base
+  let ancestors = []
+  ;(function c(node, st, override) {
+    let type = override || node.type, found = visitors[type]
+    let isNew = node != ancestors[ancestors.length - 1]
+    if (isNew) ancestors.push(node)
+    base[type](node, st, c)
+    if (found) found(node, st || ancestors, ancestors)
+    if (isNew) ancestors.pop()
+  })(node, state)
+}
+
+// A recursive walk is one where your functions override the default
+// walkers. They can modify and replace the state parameter that's
+// threaded through the walk, and can opt how and whether to walk
+// their child nodes (by calling their third argument on these
+// nodes).
+export function recursive(node, state, funcs, base, override) {
+  let visitor = funcs ? exports.make(funcs, base) : base
+  ;(function c(node, st, override) {
+    visitor[override || node.type](node, st, c)
+  })(node, state, override)
+}
+
+function makeTest(test) {
+  if (typeof test == "string")
+    return type => type == test
+  else if (!test)
+    return () => true
+  else
+    return test
+}
+
+class Found {
+  constructor(node, state) { this.node = node; this.state = state }
+}
+
+// Find a node with a given start, end, and type (all are optional,
+// null can be used as wildcard). Returns a {node, state} object, or
+// undefined when it doesn't find a matching node.
+export function findNodeAt(node, start, end, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      let type = override || node.type
+      if ((start == null || node.start <= start) &&
+          (end == null || node.end >= end))
+        base[type](node, st, c)
+      if ((start == null || node.start == start) &&
+          (end == null || node.end == end) &&
+          test(type, node))
+        throw new Found(node, st)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the innermost node of a given type that contains the given
+// position. Interface similar to findNodeAt.
+export function findNodeAround(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      let type = override || node.type
+      if (node.start > pos || node.end < pos) return
+      base[type](node, st, c)
+      if (test(type, node)) throw new Found(node, st)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the outermost matching node after a given position.
+export function findNodeAfter(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  try {
+    ;(function c(node, st, override) {
+      if (node.end < pos) return
+      let type = override || node.type
+      if (node.start >= pos && test(type, node)) throw new Found(node, st)
+      base[type](node, st, c)
+    })(node, state)
+  } catch (e) {
+    if (e instanceof Found) return e
+    throw e
+  }
+}
+
+// Find the outermost matching node before a given position.
+export function findNodeBefore(node, pos, test, base, state) {
+  test = makeTest(test)
+  if (!base) base = exports.base
+  let max
+  ;(function c(node, st, override) {
+    if (node.start > pos) return
+    let type = override || node.type
+    if (node.end <= pos && (!max || max.node.end < node.end) && test(type, node))
+      max = new Found(node, st)
+    base[type](node, st, c)
+  })(node, state)
+  return max
+}
+
+// Fallback to an Object.create polyfill for older environments.
+const create = Object.create || function(proto) {
+  function Ctor() {}
+  Ctor.prototype = proto
+  return new Ctor
+}
+
+// Used to create a custom walker. Will fill in all missing node
+// type properties with the defaults.
+export function make(funcs, base) {
+  if (!base) base = exports.base
+  let visitor = create(base)
+  for (var type in funcs) visitor[type] = funcs[type]
+  return visitor
+}
+
+function skipThrough(node, st, c) { c(node, st) }
+function ignore(_node, _st, _c) {}
+
+// Node walkers.
+
+export const base = {}
+
+base.Program = base.BlockStatement = (node, st, c) => {
+  for (let i = 0; i < node.body.length; ++i)
+    c(node.body[i], st, "Statement")
+}
+base.Statement = skipThrough
+base.EmptyStatement = ignore
+base.ExpressionStatement = base.ParenthesizedExpression =
+  (node, st, c) => c(node.expression, st, "Expression")
+base.IfStatement = (node, st, c) => {
+  c(node.test, st, "Expression")
+  c(node.consequent, st, "Statement")
+  if (node.alternate) c(node.alternate, st, "Statement")
+}
+base.LabeledStatement = (node, st, c) => c(node.body, st, "Statement")
+base.BreakStatement = base.ContinueStatement = ignore
+base.WithStatement = (node, st, c) => {
+  c(node.object, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.SwitchStatement = (node, st, c) => {
+  c(node.discriminant, st, "Expression")
+  for (let i = 0; i < node.cases.length; ++i) {
+    let cs = node.cases[i]
+    if (cs.test) c(cs.test, st, "Expression")
+    for (let j = 0; j < cs.consequent.length; ++j)
+      c(cs.consequent[j], st, "Statement")
+  }
+}
+base.ReturnStatement = base.YieldExpression = base.AwaitExpression = (node, st, c) => {
+  if (node.argument) c(node.argument, st, "Expression")
+}
+base.ThrowStatement = base.SpreadElement =
+  (node, st, c) => c(node.argument, st, "Expression")
+base.TryStatement = (node, st, c) => {
+  c(node.block, st, "Statement")
+  if (node.handler) c(node.handler, st)
+  if (node.finalizer) c(node.finalizer, st, "Statement")
+}
+base.CatchClause = (node, st, c) => {
+  c(node.param, st, "Pattern")
+  c(node.body, st, "ScopeBody")
+}
+base.WhileStatement = base.DoWhileStatement = (node, st, c) => {
+  c(node.test, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForStatement = (node, st, c) => {
+  if (node.init) c(node.init, st, "ForInit")
+  if (node.test) c(node.test, st, "Expression")
+  if (node.update) c(node.update, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForInStatement = base.ForOfStatement = (node, st, c) => {
+  c(node.left, st, "ForInit")
+  c(node.right, st, "Expression")
+  c(node.body, st, "Statement")
+}
+base.ForInit = (node, st, c) => {
+  if (node.type == "VariableDeclaration") c(node, st)
+  else c(node, st, "Expression")
+}
+base.DebuggerStatement = ignore
+
+base.FunctionDeclaration = (node, st, c) => c(node, st, "Function")
+base.VariableDeclaration = (node, st, c) => {
+  for (let i = 0; i < node.declarations.length; ++i)
+    c(node.declarations[i], st)
+}
+base.VariableDeclarator = (node, st, c) => {
+  c(node.id, st, "Pattern")
+  if (node.init) c(node.init, st, "Expression")
+}
+
+base.Function = (node, st, c) => {
+  if (node.id) c(node.id, st, "Pattern")
+  for (let i = 0; i < node.params.length; i++)
+    c(node.params[i], st, "Pattern")
+  c(node.body, st, node.expression ? "ScopeExpression" : "ScopeBody")
+}
+// FIXME drop these node types in next major version
+// (They are awkward, and in ES6 every block can be a scope.)
+base.ScopeBody = (node, st, c) => c(node, st, "Statement")
+base.ScopeExpression = (node, st, c) => c(node, st, "Expression")
+
+base.Pattern = (node, st, c) => {
+  if (node.type == "Identifier")
+    c(node, st, "VariablePattern")
+  else if (node.type == "MemberExpression")
+    c(node, st, "MemberPattern")
+  else
+    c(node, st)
+}
+base.VariablePattern = ignore
+base.MemberPattern = skipThrough
+base.RestElement = (node, st, c) => c(node.argument, st, "Pattern")
+base.ArrayPattern =  (node, st, c) => {
+  for (let i = 0; i < node.elements.length; ++i) {
+    let elt = node.elements[i]
+    if (elt) c(elt, st, "Pattern")
+  }
+}
+base.ObjectPattern = (node, st, c) => {
+  for (let i = 0; i < node.properties.length; ++i)
+    c(node.properties[i].value, st, "Pattern")
+}
+
+base.Expression = skipThrough
+base.ThisExpression = base.Super = base.MetaProperty = ignore
+base.ArrayExpression = (node, st, c) => {
+  for (let i = 0; i < node.elements.length; ++i) {
+    let elt = node.elements[i]
+    if (elt) c(elt, st, "Expression")
+  }
+}
+base.ObjectExpression = (node, st, c) => {
+  for (let i = 0; i < node.properties.length; ++i)
+    c(node.properties[i], st)
+}
+base.FunctionExpression = base.ArrowFunctionExpression = base.FunctionDeclaration
+base.SequenceExpression = base.TemplateLiteral = (node, st, c) => {
+  for (let i = 0; i < node.expressions.length; ++i)
+    c(node.expressions[i], st, "Expression")
+}
+base.UnaryExpression = base.UpdateExpression = (node, st, c) => {
+  c(node.argument, st, "Expression")
+}
+base.BinaryExpression = base.LogicalExpression = (node, st, c) => {
+  c(node.left, st, "Expression")
+  c(node.right, st, "Expression")
+}
+base.AssignmentExpression = base.AssignmentPattern = (node, st, c) => {
+  c(node.left, st, "Pattern")
+  c(node.right, st, "Expression")
+}
+base.ConditionalExpression = (node, st, c) => {
+  c(node.test, st, "Expression")
+  c(node.consequent, st, "Expression")
+  c(node.alternate, st, "Expression")
+}
+base.NewExpression = base.CallExpression = (node, st, c) => {
+  c(node.callee, st, "Expression")
+  if (node.arguments) for (let i = 0; i < node.arguments.length; ++i)
+    c(node.arguments[i], st, "Expression")
+}
+base.MemberExpression = (node, st, c) => {
+  c(node.object, st, "Expression")
+  if (node.computed) c(node.property, st, "Expression")
+}
+base.ExportNamedDeclaration = base.ExportDefaultDeclaration = (node, st, c) => {
+  if (node.declaration)
+    c(node.declaration, st, node.type == "ExportNamedDeclaration" || node.declaration.id ? "Statement" : "Expression")
+  if (node.source) c(node.source, st, "Expression")
+}
+base.ExportAllDeclaration = (node, st, c) => {
+  c(node.source, st, "Expression")
+}
+base.ImportDeclaration = (node, st, c) => {
+  for (let i = 0; i < node.specifiers.length; i++)
+    c(node.specifiers[i], st)
+  c(node.source, st, "Expression")
+}
+base.ImportSpecifier = base.ImportDefaultSpecifier = base.ImportNamespaceSpecifier = base.Identifier = base.Literal = ignore
+
+base.TaggedTemplateExpression = (node, st, c) => {
+  c(node.tag, st, "Expression")
+  c(node.quasi, st)
+}
+base.ClassDeclaration = base.ClassExpression = (node, st, c) => c(node, st, "Class")
+base.Class = (node, st, c) => {
+  if (node.id) c(node.id, st, "Pattern")
+  if (node.superClass) c(node.superClass, st, "Expression")
+  for (let i = 0; i < node.body.body.length; i++)
+    c(node.body.body[i], st)
+}
+base.MethodDefinition = base.Property = (node, st, c) => {
+  if (node.computed) c(node.key, st, "Expression")
+  c(node.value, st, "Expression")
+}
diff --git a/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/whitespace.js b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/whitespace.js
new file mode 100644
index 0000000000..094c2e4a47
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/node_modules/acorn/src/whitespace.js
@@ -0,0 +1,13 @@
+// Matches a whole line break (where CRLF is considered a single
+// line break). Used to count lines.
+
+export const lineBreak = /\r\n?|\n|\u2028|\u2029/
+export const lineBreakG = new RegExp(lineBreak.source, "g")
+
+export function isNewLine(code) {
+  return code === 10 || code === 13 || code === 0x2028 || code === 0x2029
+}
+
+export const nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/
+
+export const skipWhiteSpace = /(?:\s|\/\/.*|\/\*[^]*?\*\/)*/g

From aa6b8ff10a4ed2904429914b1a70d776168aebee Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 22 Sep 2016 15:02:20 -0400
Subject: [PATCH 211/688] Cleanup packages/stylus/.npm after upgrade.

This may help with the CircleCI timeout problems we've been having.
---
 .../.npm/plugin/compileStylus/.gitignore      |  1 -
 .../stylus/.npm/plugin/compileStylus/README   |  7 --
 .../plugin/compileStylus/npm-shrinkwrap.json  | 67 -------------------
 .../compileStylusBatch/npm-shrinkwrap.json    |  2 +-
 4 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 packages/stylus/.npm/plugin/compileStylus/.gitignore
 delete mode 100644 packages/stylus/.npm/plugin/compileStylus/README
 delete mode 100644 packages/stylus/.npm/plugin/compileStylus/npm-shrinkwrap.json

diff --git a/packages/stylus/.npm/plugin/compileStylus/.gitignore b/packages/stylus/.npm/plugin/compileStylus/.gitignore
deleted file mode 100644
index 3c3629e647..0000000000
--- a/packages/stylus/.npm/plugin/compileStylus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/packages/stylus/.npm/plugin/compileStylus/README b/packages/stylus/.npm/plugin/compileStylus/README
deleted file mode 100644
index 8310d7d486..0000000000
--- a/packages/stylus/.npm/plugin/compileStylus/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This directory and the files immediately inside it are automatically generated   
-when you change this package's NPM dependencies. Commit the files in this    
-directory (npm-shrinkwrap.json, .gitignore, and this README) to source control   
-so that others run the same versions of sub-dependencies.    
-   
-You should NOT check in the node_modules directory that Meteor automatically   
-creates; if you are using git, the .gitignore file tells git to ignore it.
diff --git a/packages/stylus/.npm/plugin/compileStylus/npm-shrinkwrap.json b/packages/stylus/.npm/plugin/compileStylus/npm-shrinkwrap.json
deleted file mode 100644
index 4ad385a39a..0000000000
--- a/packages/stylus/.npm/plugin/compileStylus/npm-shrinkwrap.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{    
-  "dependencies": {    
-    "nib": {   
-      "version": "1.0.2",    
-      "dependencies": {    
-        "stylus": {    
-          "version": "0.37.0",   
-          "dependencies": {    
-            "cssom": {   
-              "version": "0.2.5"   
-            },   
-            "mkdirp": {    
-              "version": "0.3.5"   
-            },   
-            "debug": {   
-              "version": "0.7.4"   
-            },   
-            "sax": {   
-              "version": "0.5.8"   
-            }    
-          }    
-        }    
-      }    
-    },   
-    "stylus": {    
-      "version": "0.46.3",   
-      "dependencies": {    
-        "css-parse": {   
-          "version": "1.7.0"   
-        },   
-        "mkdirp": {    
-          "version": "0.3.5"   
-        },   
-        "debug": {   
-          "version": "1.0.1",    
-          "dependencies": {    
-            "ms": {    
-              "version": "0.6.2"   
-            }    
-          }    
-        },   
-        "sax": {   
-          "version": "0.5.8"   
-        },   
-        "glob": {    
-          "version": "3.2.11",   
-          "dependencies": {    
-            "inherits": {    
-              "version": "2.0.1"   
-            },   
-            "minimatch": {   
-              "version": "0.3.0",    
-              "dependencies": {    
-                "lru-cache": {   
-                  "version": "2.5.0"   
-                },   
-                "sigmund": {   
-                  "version": "1.0.0"   
-                }    
-              }    
-            }    
-          }    
-        }    
-      }    
-    }    
-  }    
-}
diff --git a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
index 8cfd9d1005..08e5e9f1e1 100644
--- a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
@@ -98,7 +98,7 @@
     "stylus": {
       "version": "0.54.5",
       "resolved": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449",
-      "from": "stylus@https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449"
+      "from": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449"
     },
     "wrappy": {
       "version": "1.0.2",

From d4d648c8f761b535f5526cc4d2f15dddd41fb773 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 22 Sep 2016 14:44:01 -0400
Subject: [PATCH 212/688] Bump package versions for 1.4.2-beta.5 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index a0153b604e..113653732b 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.4"
+  version: "1.2.12-beta.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index efbdd0f215..f75352ae87 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index aaf788b731..dd2a20949d 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 0b5012170c..3b408deeea 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index ed740ff2d9..4bca94ea3a 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index e950442034..5c8e3157cc 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index b5ea191ae2..9a8bd8a7ad 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.4"
+  version: "1.3.1-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 21b243ac54..b5c4af95ea 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.4"
+  version: "1.1.12-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 5311f8af04..debf0c3c61 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.4"
+  version: "1.1.13-beta.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 8052ce7746..4ec704838a 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.4"
+  version: "1.0.11-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 94daa41410..0139ec3150 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1'
+  version: '6.9.2-beta.5'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index a3a2050c94..042780fc62 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11',
+  version: '0.1.12-beta.5',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index f9c2ac587b..0032abf5ef 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7',
+  version: '1.1.8-beta.5',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 8eeed77d67..211fbe92bf 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.4"
+  version: "1.2.5-beta.5"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index d49ca97779..c3544b2316 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1',
+  version: '1.3.2-beta.5',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index e3c599d45d..30cf7cb597 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10',
+  version: '1.3.11-beta.5',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 0174dcc23a..1f945d3907 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14",
+  version: "0.3.15-beta.5",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 9d5c2ee564..e6116dfc1d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.4',
+  version: '0.5.9-beta.5',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index bb30e9853e..807e37d41a 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17"
+  version: "1.1.18-beta.5"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index c7dcc696ab..3a9176731c 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14",
+  version: "4.6.15-beta.5",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 2cfae352d7..58e9815a54 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.4"
+  version: "1.2.10-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 79870fba5f..9539c1bd12 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.4'
+  version: '1.0.9-beta.5'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 1d7228278d..8c8751dbf3 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.4"
+  version: "1.1.9-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 864a132ba5..a61737740d 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.4"
+  version: "1.1.15-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index dd130ccb72..771ddf21dc 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9'
+  version: '1.2.10-beta.5'
 });
 
 Npm.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 8874362e1a..310ef8a2ff 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.4',
+  version: '2.7.6-beta.5',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 567aa4d3a6..521c4bc7f7 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15'
+  version: '1.1.16-beta.5'
 });
 
 Npm.depends({
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 8bc19f4d16..6b32ed0354 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.4"
+  version: "1.6.5-beta.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 88dc11836f..8002361997 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.4"
+  version: "1.1.10-beta.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e6b770be45..aead4dea56 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.4'
+  version: '1.4.2-beta.5'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 2941f35c7c..cba7912196 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17'
+  version: '1.2.18-beta.5'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 93d75bd005..13c3e196f4 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14"
+  version: "1.2.15-beta.5"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b53c6ceb37..c2ca789840 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14"
+  version: "1.2.15-beta.5"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index c18ad3de4d..9ef0bbf4e4 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6",
+  version: "0.7.7-beta.5",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 69ac7073bc..c9dc15eab6 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6",
+  version: "0.7.7-beta.5",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 3e420265e4..073a97192d 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12'
+  version: '1.1.13-beta.5'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index c6025af0c6..828aa1405d 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1",
+  version: "0.9.2-beta.5",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index abe2e1180d..345ac13915 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.50',
+  version: '1.5.51-beta.5',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 781ee1fe05..172c9afd74 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.7",
+  version: "0.8.8-beta.5",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 593a1fe8df..819993050b 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.4"
+  version: "2.513.6-beta.5"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 0fd6d82924..dacb99f262 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.4',
+  version: '1.0.13-beta.5',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index e7feea61b0..513cc1f15d 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.4'
+  version: '1.1.13-beta.5'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index c492b8ad05..508fc30c6f 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.4'
+  version: '1.3.12-beta.5'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 5c7bdac0f3..7b6e795756 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.4'
+  version: '1.1.9-beta.5'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 1caee9b139..4f9b8129db 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14'
+  version: '2.5.15-beta.5'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index c8ee4eeb25..d12901939b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.4",
+ "version": "1.4.2-beta.5",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4c2ba4ff4bae1d5503b19ce9497fa6a09069b053 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 23 Sep 2016 18:20:33 +0300
Subject: [PATCH 213/688] Await `Promise` when running `npm install` (#7805)

I believe this is the fix for the (recent) CI server timeouts.
---
 tools/isobuild/meteor-npm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index a6d0c77f26..e4c23a1b3f 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -770,7 +770,7 @@ Profile("meteorNpm.runNpmCommand", function (args, cwd) {
           });
         }
       );
-    });
+    }).await();
 
   }).await();
 });

From c5b2d6fef4efa0f56127563bc325ff1b0a7c8aee Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Fri, 23 Sep 2016 16:50:59 -0300
Subject: [PATCH 214/688] Add --headless option to the build command

There's no point in spinning the spinner when we're running automated builds, it actually makes the Travis-CI log files get over 4mb.
---
 tools/cli/commands.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index fa0c5be802..436353a00a 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -787,6 +787,10 @@ var buildCommands = {
     server: { type: String },
     // XXX COMPAT WITH 0.9.2.2
     "mobile-port": { type: String },
+    // Indicates whether these build is running headless, e.g. in a
+    // continuous integration building environment, where visual niceties
+    // like progress bars and spinners are unimportant.
+    headless: { type: Boolean },
     verbose: { type: Boolean, short: "v" },
     'allow-incompatible-update': { type: Boolean }
   },
@@ -818,6 +822,11 @@ main.registerCommand(_.extend({ name: 'bundle', hidden: true
 
 var buildCommand = function (options) {
   Console.setVerbose(!!options.verbose);
+  if (options.headless) {
+    // There's no point in spinning the spinner when we're running
+    // automated builds.
+    Console.setHeadless(true);
+  }
   // XXX output, to stderr, the name of the file written to (for human
   // comfort, especially since we might change the name)
 

From bfa67337dda1e90610830611fd99dcb1bd44846a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 23 Sep 2016 15:49:45 -0400
Subject: [PATCH 215/688] Cache merging of CSS files in standard-minifier-css.

It's silly that this was happening on every reload, regardless of whether
CSS files had changed.
---
 .../plugin/minifyStdCSS/npm-shrinkwrap.json   | 21 +++++++++++--
 packages/standard-minifier-css/package.js     |  8 ++---
 .../plugin/minify-css.js                      | 31 ++++++++++++++++---
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
index c3dc4b007c..02cae4cc35 100644
--- a/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
+++ b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
@@ -1,9 +1,24 @@
 {
   "dependencies": {
+    "lru-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
+      "from": "lru-cache@4.0.1"
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "from": "pseudomap@>=1.0.1 <2.0.0"
+    },
     "source-map": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz",
-      "from": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "from": "source-map@0.5.6"
+    },
+    "yallist": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz",
+      "from": "yallist@>=2.0.0 <3.0.0"
     }
   }
 }
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index cf53e0e1c0..5c3b1d9627 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0',
+  version: '1.2.1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
@@ -11,7 +11,8 @@ Package.registerBuildPlugin({
     'minifier-css'
   ],
   npmDependencies: {
-    "source-map": "0.5.3"
+    "source-map": "0.5.6",
+    "lru-cache": "4.0.1"
   },
   sources: [
     'plugin/minify-css.js'
@@ -21,6 +22,3 @@ Package.registerBuildPlugin({
 Package.onUse(function(api) {
   api.use('isobuild:minifier-plugin@1.0.0');
 });
-
-Package.onTest(function(api) {
-});
diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index 8858d0b43a..be3db08814 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -1,4 +1,6 @@
-var sourcemap = Npm.require('source-map');
+var sourcemap = Npm.require("source-map");
+var createHash = Npm.require("crypto").createHash;
+var LRU = Npm.require("lru-cache");
 
 Plugin.registerMinifier({
   extensions: ["css"],
@@ -37,10 +39,28 @@ CssToolsMinifier.prototype.processFilesForBundle = function (files, options) {
   }
 };
 
+var mergeCache = new LRU({
+  max: 100
+});
+
+var hashFiles = Profile("hashFiles", function (files) {
+  var hash = createHash("sha1");
+  var hashes = files.forEach(f => {
+    hash.update(f.getSourceHash()).update("\0");
+  });
+  return hash.digest("hex");
+});
+
 // Lints CSS files and merges them into one file, fixing up source maps and
 // pulling any @import directives up to the top since the CSS spec does not
 // allow them to appear in the middle of a file.
 var mergeCss = Profile("mergeCss", function (css) {
+  var hashOfFiles = hashFiles(css);
+  var merged = mergeCache.get(hashOfFiles);
+  if (merged) {
+    return merged;
+  }
+
   // Filenames passed to AST manipulator mapped to their original files
   var originals = {};
 
@@ -87,7 +107,8 @@ var mergeCss = Profile("mergeCss", function (css) {
   });
 
   if (! stringifiedCss.code) {
-    return { code: '' };
+    mergeCache.set(hashOfFiles, merged = { code: '' });
+    return merged;
   }
 
   // Add the contents of the input files to the source map of the new file
@@ -121,8 +142,10 @@ var mergeCss = Profile("mergeCss", function (css) {
     });
   });
 
-  return {
+  mergeCache.set(hashOfFiles, merged = {
     code: stringifiedCss.code,
     sourceMap: newMap.toString()
-  };
+  });
+
+  return merged;
 });

From ec644b729a8fda2a230d99f63b03b43a50230d1f Mon Sep 17 00:00:00 2001
From: Rishabh Singhal <rishabh_singhal@outlook.com>
Date: Sun, 25 Sep 2016 11:21:20 +0530
Subject: [PATCH 216/688] Use -s as short form of --settings flag

---
 tools/cli/commands.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index fa0c5be802..a6c069cdf8 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -259,7 +259,7 @@ var runCommandOptions = {
     'no-release-check': { type: Boolean },
     production: { type: Boolean },
     'raw-logs': { type: Boolean },
-    settings: { type: String },
+    settings: { type: String, short: "s" },
     verbose: { type: Boolean, short: "v" },
     // With --once, meteor does not re-run the project if it crashes
     // and does not monitor for file changes. Intentionally
@@ -1236,7 +1236,7 @@ main.registerCommand({
   options: {
     'delete': { type: Boolean, short: 'D' },
     debug: { type: Boolean },
-    settings: { type: String },
+    settings: { type: String, short: 's' },
     // No longer supported, but we still parse it out so that we can
     // print a custom error message.
     password: { type: String },
@@ -1434,7 +1434,7 @@ testCommandOptions = {
     'debug-port': { type: String },
     deploy: { type: String },
     production: { type: Boolean },
-    settings: { type: String },
+    settings: { type: String, short: 's' },
     // Indicates whether these self-tests are running headless, e.g. in a
     // continuous integration testing environment, where visual niceties
     // like progress bars and spinners are unimportant.

From cba649f709c6194c02bea21ab617bcd098240289 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 21 Sep 2016 20:05:45 +0300
Subject: [PATCH 217/688] Add Newlines to end of .gitignore files, specifically
 the new app skel

Even though I think the fight is a bit futile, it is considered best practice to have newlines at the end of all files.  At the request of meteor/meteor#7786, this commit adds newlines to the end of the new app skeleton `.gitignore` file.  These skel files are used when generating new meteor apps so this avoids perpetuation of this problem into futrue generations. ;)

In an effort to beef up this PR, I also took the liberty of fixing the few other Meteor files which were lacking newlines (all `.gitignore` files)

Closes meteor/meteor#7786
---
 packages/.gitignore                 | 2 +-
 packages/code-prettify/.gitignore   | 2 +-
 scripts/admin/eslint/.gitignore     | 2 +-
 scripts/windows/.gitignore          | 2 +-
 tools/static-assets/skel/.gitignore | 2 +-
 tools/tests/apps/shell/.gitignore   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/.gitignore b/packages/.gitignore
index cf6595efb8..5a8f31f2d0 100644
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -1,2 +1,2 @@
 .meteor
-*/.meteor
\ No newline at end of file
+*/.meteor
diff --git a/packages/code-prettify/.gitignore b/packages/code-prettify/.gitignore
index 5dc30d8d90..c765a6f21e 100644
--- a/packages/code-prettify/.gitignore
+++ b/packages/code-prettify/.gitignore
@@ -1,2 +1,2 @@
 .build*
-.!*
\ No newline at end of file
+.!*
diff --git a/scripts/admin/eslint/.gitignore b/scripts/admin/eslint/.gitignore
index b512c09d47..3c3629e647 100644
--- a/scripts/admin/eslint/.gitignore
+++ b/scripts/admin/eslint/.gitignore
@@ -1 +1 @@
-node_modules
\ No newline at end of file
+node_modules
diff --git a/scripts/windows/.gitignore b/scripts/windows/.gitignore
index 42d473b116..570ab4c1bb 100644
--- a/scripts/windows/.gitignore
+++ b/scripts/windows/.gitignore
@@ -1,4 +1,4 @@
 *.tar.gz
 *.exe
 *.pdb
-*_.cs
\ No newline at end of file
+*_.cs
diff --git a/tools/static-assets/skel/.gitignore b/tools/static-assets/skel/.gitignore
index 40b878db5b..c2658d7d1b 100644
--- a/tools/static-assets/skel/.gitignore
+++ b/tools/static-assets/skel/.gitignore
@@ -1 +1 @@
-node_modules/
\ No newline at end of file
+node_modules/
diff --git a/tools/tests/apps/shell/.gitignore b/tools/tests/apps/shell/.gitignore
index 40b878db5b..c2658d7d1b 100644
--- a/tools/tests/apps/shell/.gitignore
+++ b/tools/tests/apps/shell/.gitignore
@@ -1 +1 @@
-node_modules/
\ No newline at end of file
+node_modules/

From 26597c4fbba39184250f8bd74f16f029528a6154 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 13:13:17 -0400
Subject: [PATCH 218/688] Simplify rehashing in safe-pathwatcher.js.

---
 tools/fs/safe-pathwatcher.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 3588e3160b..9bcd5ee0d4 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -16,11 +16,6 @@ var DEFAULT_POLLING_INTERVAL =
 var NO_PATHWATCHER_POLLING_INTERVAL =
       ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500;
 
-// When a file changes, we wait for this long before actually recomputing
-// its hash, though of course we compute it immediately if anyone asks for
-// it in the meantime.
-const REHASH_DELAY_MS = 500;
-
 // This may seems like a long time to wait before actually closing the
 // file watchers, but it's to our advantage if they survive restarts.
 const WATCHER_CLEANUP_DELAY_MS = 30000;
@@ -44,24 +39,15 @@ function startNewWatcher(absPath) {
   let lastPathwatcherEventTime = 0;
   const callbacks = new Set;
   let latestHash = hashOrNull(absPath);
-  let requestRehashTimer = null;
   let watcherCleanupTimer = null;
 
   function fire(self, args) {
-    requestRehash();
+    latestHash = void 0;
     callbacks.forEach(cb => cb.apply(self, args));
   }
 
-  function requestRehash() {
-    if (requestRehashTimer === null) {
-      requestRehashTimer = setTimeout(ensureLatestHash, REHASH_DELAY_MS);
-    }
-  }
-
   function ensureLatestHash() {
-    if (requestRehashTimer !== null) {
-      clearTimeout(requestRehashTimer);
-      requestRehashTimer = null;
+    if (typeof latestHash === "undefined") {
       latestHash = hashOrNull(absPath);
     }
     return latestHash;

From 37647c8657228e3e9b5f647d8958969d2509e3ba Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 15:59:51 -0400
Subject: [PATCH 219/688] Implement optimistic versions of heavily used files.*
 methods.

---
 tools/fs/optimistic.js | 116 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 tools/fs/optimistic.js

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
new file mode 100644
index 0000000000..9d4cd72cd1
--- /dev/null
+++ b/tools/fs/optimistic.js
@@ -0,0 +1,116 @@
+import assert from "assert";
+import LRU from "lru-cache";
+import { Profile } from "../tool-env/profile.js";
+import { watch } from "./safe-pathwatcher.js";
+import { sha1 } from "./watch.js";
+import {
+  pathIsAbsolute,
+  statOrNull,
+  readFile,
+  readdir,
+} from "./files.js";
+
+function makeOptimistic(name, fn) {
+  assert.strictEqual(typeof fn, "function");
+
+  const cache = new LRU({
+    max: Math.pow(2, 14),
+    dispose(path, entry) {
+      if (entry.watcher) {
+        entry.watcher.close();
+        entry.watcher = null;
+      }
+    }
+  });
+
+  return Profile("optimistic " + name, (...args) => {
+    const path = args[0];
+    if (! pathIsAbsolute(path)) {
+      return fn(...args);
+    }
+
+    const key = makeCacheKey(args);
+    if (! key) {
+      return fn(...args);
+    }
+
+    let entry = cache.get(path);
+
+    if (! entry) {
+      entry = Object.create(null);
+
+      try {
+        entry.watcher = watch(path, (...args) => {
+          const result = entry.results[key];
+          // Trigger a cache miss the next time anyone asks.
+          delete result.value;
+          result.error = false;
+        });
+      } catch (e) {
+        // If we can't watch the file, we must not cache the result.
+        return fn(...args);
+      }
+
+      entry.results = Object.create(null);
+
+      // Equivalent to a cache miss, because there is no "value" key.
+      entry.results[key] = { error: false };
+
+      cache.set(path, entry);
+    }
+
+    const result = entry.results[key];
+
+    if ("value" in result) {
+      if (result.error) {
+        throw result.value;
+      }
+      return result.value;
+    }
+
+    try {
+      result.value = fn(...args)
+      result.error = false;
+    } catch (e) {
+      result.error = true;
+      throw result.value = e;
+    }
+
+    return result.value;
+  });
+}
+
+function makeCacheKey(args) {
+  var parts = [];
+
+  for (var i = 0; i < args.length; ++i) {
+    var arg = args[i];
+
+    if (typeof arg !== "string") {
+      // If any of the arguments is not a string, then we won't cache the
+      // result of the corresponding file.* method invocation.
+      return null;
+    }
+
+    parts.push(arg);
+  }
+
+  return parts.join("\0");
+}
+
+export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
+export const optimisticReadFile = makeOptimistic("readFile", readFile);
+export const optimisticReaddir = makeOptimistic("readdir", readdir);
+export const optimisticHashOrNull = makeOptimistic("hashOrNull", path => {
+  try {
+    return sha1(optimisticReadFile(path));
+
+  } catch (e) {
+    if (e.code !== "EISDIR" &&
+        e.code !== "ENOENT") {
+      throw e;
+    }
+  }
+
+  return null;
+});

From ae7bd2e5afedf75ede129221fcb41a12c73d0119 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:49:52 -0400
Subject: [PATCH 220/688] Ignore meaningless initial fs.watchFile callback.

As a reminder, we use fs.watchFile only as a fallback in environments
where pathwatcher.watch is not available, such as on network or virtual
file systems.
---
 tools/fs/safe-pathwatcher.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 9bcd5ee0d4..3005229830 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -36,7 +36,7 @@ function acquireWatcher(absPath, callback) {
 }
 
 function startNewWatcher(absPath) {
-  let lastPathwatcherEventTime = 0;
+  let lastPathwatcherEventTime = +new Date;
   const callbacks = new Set;
   let latestHash = hashOrNull(absPath);
   let watcherCleanupTimer = null;
@@ -72,7 +72,16 @@ function startNewWatcher(absPath) {
     : NO_PATHWATCHER_POLLING_INTERVAL;
 
   function watchFileWrapper(...args) {
-    const self = this;
+    const [newStat, oldStat] = args;
+
+    if (newStat.ino === 0 &&
+        oldStat.ino === 0 &&
+        +newStat.mtime === +oldStat.mtime) {
+      // Node calls the watchFile listener once with bogus identical stat
+      // objects, which should not trigger a file change event.
+      return;
+    }
+
     // If a pathwatcher event fired in the last polling interval, ignore
     // this event.
     if (new Date - lastPathwatcherEventTime > pollingInterval) {

From 6b320bd64b77c00094bf235a5590a1f91a3fc388 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:57:59 -0400
Subject: [PATCH 221/688] Avoid starting optimistic watchers for node_modules
 files.

I've also moved both try-catch blocks out of the optimistic wrapper
function in an effort to help V8 optimize the optimistic functions.
---
 tools/fs/optimistic.js | 62 +++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 9d4cd72cd1..040ceeb14a 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -4,6 +4,7 @@ import { Profile } from "../tool-env/profile.js";
 import { watch } from "./safe-pathwatcher.js";
 import { sha1 } from "./watch.js";
 import {
+  pathSep,
   pathIsAbsolute,
   statOrNull,
   readFile,
@@ -37,17 +38,9 @@ function makeOptimistic(name, fn) {
     let entry = cache.get(path);
 
     if (! entry) {
-      entry = Object.create(null);
+      entry = maybeStartWatcher(path, key);
 
-      try {
-        entry.watcher = watch(path, (...args) => {
-          const result = entry.results[key];
-          // Trigger a cache miss the next time anyone asks.
-          delete result.value;
-          result.error = false;
-        });
-      } catch (e) {
-        // If we can't watch the file, we must not cache the result.
+      if (! entry) {
         return fn(...args);
       }
 
@@ -68,18 +61,49 @@ function makeOptimistic(name, fn) {
       return result.value;
     }
 
-    try {
-      result.value = fn(...args)
-      result.error = false;
-    } catch (e) {
-      result.error = true;
-      throw result.value = e;
-    }
-
-    return result.value;
+    return tryApply(result, fn, args);
   });
 }
 
+function maybeStartWatcher(path, key) {
+  const entry = Object.create(null);
+
+  if (path.split(pathSep).indexOf("node_modules") >= 0) {
+    // Avoid starting a watcher for files in node_modules directories.
+    // This effectively results in caching the result until the server is
+    // fully restarted, which isn't ideal, but it's better than wasting
+    // thousands of watchers on rarely-changing node_modules files.
+    return entry;
+  }
+
+  try {
+    entry.watcher = watch(path, (...args) => {
+      const result = entry.results[key];
+      // Trigger a cache miss the next time anyone asks.
+      delete result.value;
+      result.error = false;
+    });
+
+  } catch (e) {
+    // If we can't watch the file, we must not cache the result.
+    return null;
+  }
+
+  return entry;
+}
+
+function tryApply(result, fn, args) {
+  try {
+    result.value = fn(...args)
+    result.error = false;
+  } catch (e) {
+    result.error = true;
+    throw result.value = e;
+  }
+
+  return result.value;
+}
+
 function makeCacheKey(args) {
   var parts = [];
 

From 033a935a891e7bb81490d048c36e05cb9ec75d13 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 16:02:27 -0400
Subject: [PATCH 222/688] Use optimistic functions to speed up IO-bound
 bottlenecks.

---
 tools/fs/safe-pathwatcher.js     | 24 ------------------------
 tools/fs/watch.js                | 10 +++++++---
 tools/isobuild/import-scanner.js | 18 +++++++++++++-----
 tools/isobuild/resolver.js       | 15 ++++++++++-----
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 3005229830..9cc7945d28 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -1,5 +1,4 @@
 var files = require('./files.js');
-import { readFile, sha1 } from "./watch.js";
 
 // Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
 // force the use of files.watchFile instead of pathwatcher.watch.
@@ -38,21 +37,12 @@ function acquireWatcher(absPath, callback) {
 function startNewWatcher(absPath) {
   let lastPathwatcherEventTime = +new Date;
   const callbacks = new Set;
-  let latestHash = hashOrNull(absPath);
   let watcherCleanupTimer = null;
 
   function fire(self, args) {
-    latestHash = void 0;
     callbacks.forEach(cb => cb.apply(self, args));
   }
 
-  function ensureLatestHash() {
-    if (typeof latestHash === "undefined") {
-      latestHash = hashOrNull(absPath);
-    }
-    return latestHash;
-  }
-
   function pathwatcherWrapper(...args) {
     lastPathwatcherEventTime = +new Date;
     fire(this, args);
@@ -102,8 +92,6 @@ function startNewWatcher(absPath) {
   return {
     callbacks,
 
-    cheapHashOrNull: ensureLatestHash,
-
     release(callback) {
       if (! watchers[absPath]) {
         return;
@@ -172,11 +160,6 @@ function pathwatcherWatch(absPath, callback) {
   return null;
 }
 
-function hashOrNull(absPath) {
-  const contents = readFile(absPath);
-  return contents && sha1(contents) || null;
-}
-
 export function watch(absPath, callback) {
   const entry = acquireWatcher(absPath, callback);
   return {
@@ -185,10 +168,3 @@ export function watch(absPath, callback) {
     }
   };
 }
-
-export function cheapHashOrNull(absPath) {
-  const entry = watchers[absPath];
-  return entry
-    ? entry.cheapHashOrNull()
-    : hashOrNull(absPath);
-}
diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index 18b8743327..8624112402 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -4,7 +4,11 @@ import pathwatcher from './safe-pathwatcher.js';
 import {createHash} from "crypto";
 import {coalesce} from '../utils/func-utils.js';
 import {Profile} from '../tool-env/profile.js';
-import { cheapHashOrNull } from "./safe-pathwatcher.js";
+
+import {
+  optimisticReaddir,
+  optimisticHashOrNull,
+} from "./optimistic.js";
 
 // Watch for changes to a set of files, and the first time that any of
 // the files change, call a user-provided callback. (If you want a
@@ -263,7 +267,7 @@ export function sha1(contents) {
 export function readDirectory({absPath, include, exclude, names}) {
   // Read the directory.
   try {
-    var contents = files.readdir(absPath);
+    var contents = optimisticReaddir(absPath);
   } catch (e) {
     // If the path is not a directory, return null; let other errors through.
     if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
@@ -370,7 +374,7 @@ export class Watcher {
       throw new Error("Checking unknown file " + absPath);
     }
 
-    var newHash = cheapHashOrNull(absPath);
+    var newHash = optimisticHashOrNull(absPath);
 
     if (newHash === null) {
       // File does not exist (or is a directory).
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 8f5c34d041..5ae54c7801 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -4,7 +4,7 @@ import {Script} from "vm";
 import {
   isString, isEmpty, has, keys, each, map, omit,
 } from "underscore";
-import {sha1, readAndWatchFileWithHash} from "../fs/watch.js";
+import {sha1} from "../fs/watch.js";
 import {matches as archMatches} from "../utils/archinfo.js";
 import {findImportedModuleIdentifiers} from "./js-analyze.js";
 import {cssToCommonJS} from "./css-modules.js";
@@ -20,11 +20,16 @@ import {
   pathBasename,
   pathExtname,
   pathIsAbsolute,
-  statOrNull as realStatOrNull,
   convertToOSPath,
   convertToPosixPath,
 } from "../fs/files.js";
 
+import {
+  optimisticReadFile,
+  optimisticStatOrNull,
+  optimisticHashOrNull,
+} from "../fs/optimistic.js";
+
 import Resolver from "./resolver.js";
 
 const fakeFileStat = {
@@ -135,7 +140,8 @@ export default class ImportScanner {
         if (file) {
           return fakeFileStat;
         }
-        return realStatOrNull(absPath);
+
+        return optimisticStatOrNull(absPath);
       }
     });
   }
@@ -549,8 +555,10 @@ export default class ImportScanner {
   }
 
   _readFile(absPath) {
-    let { contents, hash } =
-      readAndWatchFileWithHash(this.watchSet, absPath);
+    const contents = optimisticReadFile(absPath);
+    const hash = optimisticHashOrNull(absPath);
+
+    this.watchSet.addFile(absPath, hash);
 
     return {
       data: contents,
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 4b41d2780a..e33aed2499 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -5,18 +5,22 @@ import {
   has,
 } from "underscore";
 
-import { readAndWatchFileWithHash } from "../fs/watch.js";
+import { sha1 } from "../fs/watch.js";
 import { matches as archMatches } from "../utils/archinfo.js";
 import {
   pathJoin,
   pathRelative,
   pathNormalize,
   pathDirname,
-  statOrNull as realStatOrNull,
   convertToOSPath,
   convertToPosixPath,
 } from "../fs/files.js";
 
+import {
+  optimisticStatOrNull,
+  optimisticReadFile,
+} from "../fs/optimistic.js";
+
 const nativeModulesMap = Object.create(null);
 const nativeNames = Object.keys(process.binding("natives"));
 
@@ -47,7 +51,7 @@ export default class Resolver {
     watchSet = null,
     onPackageJson,
     onMissing,
-    statOrNull = realStatOrNull,
+    statOrNull = optimisticStatOrNull,
   }) {
     this.sourceRoot = sourceRoot;
     this.extensions = extensions;
@@ -260,8 +264,9 @@ export default class Resolver {
 
     let result = null;
     try {
-      result = JSON.parse(
-        readAndWatchFileWithHash(this.watchSet, path).contents);
+      const contents = optimisticReadFile(path);
+      result = JSON.parse(contents);
+      this.watchSet.addFile(path, sha1(contents));
     } catch (e) {
       if (! (e instanceof SyntaxError ||
              e.code === "ENOENT")) {

From 83e7b38779cc0c94f5a7e477e10a80bf52398209 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 16:47:00 -0400
Subject: [PATCH 223/688] Break circular dependency between
 {files,watch,optimistic}.js.

---
 tools/fs/files.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index ff3198512c..e683d1b8c8 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -21,7 +21,6 @@ var sourceMapRetrieverStack = require('../tool-env/source-map-retriever-stack.js
 var utils = require('../utils/utils.js');
 var cleanup = require('../tool-env/cleanup.js');
 var buildmessage = require('../utils/buildmessage.js');
-var watch = require('./watch.js');
 var fiberHelpers = require('../utils/fiber-helpers.js');
 var colonConverter = require('../utils/colon-converter.js');
 
@@ -215,7 +214,7 @@ files.getCurrentToolsDir = function () {
 files.getSettings = function (filename, watchSet) {
   buildmessage.assertInCapture();
   var absPath = files.pathResolve(filename);
-  var buffer = watch.readAndWatchFile(watchSet, absPath);
+  var buffer = require("./watch.js").readAndWatchFile(watchSet, absPath);
   if (buffer === null) {
     buildmessage.error("file not found (settings file)",
                        { file: filename });

From d95441575220f29ffa5cae877151c7fac928a251 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 17:18:03 -0400
Subject: [PATCH 224/688] Add profiling to PathWatcher watch function.

---
 tools/fs/safe-pathwatcher.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 9cc7945d28..8d52a74a5b 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -1,4 +1,5 @@
 var files = require('./files.js');
+import { Profile } from "../tool-env/profile.js";
 
 // Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
 // force the use of files.watchFile instead of pathwatcher.watch.
@@ -160,11 +161,14 @@ function pathwatcherWatch(absPath, callback) {
   return null;
 }
 
-export function watch(absPath, callback) {
-  const entry = acquireWatcher(absPath, callback);
-  return {
-    close() {
-      entry.release(callback);
-    }
-  };
-}
+export const watch = Profile(
+  "pathwatcher.watch",
+  (absPath, callback) => {
+    const entry = acquireWatcher(absPath, callback);
+    return {
+      close() {
+        entry.release(callback);
+      }
+    };
+  }
+);

From 978df6e043ecc2fc11b352e6ca89d4f63f915252 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 17:35:51 -0400
Subject: [PATCH 225/688] Use optimistic functions in meteorNpm.isPortable.

---
 tools/fs/optimistic.js       |  2 ++
 tools/isobuild/meteor-npm.js | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 040ceeb14a..a96886cc09 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -7,6 +7,7 @@ import {
   pathSep,
   pathIsAbsolute,
   statOrNull,
+  lstat,
   readFile,
   readdir,
 } from "./files.js";
@@ -123,6 +124,7 @@ function makeCacheKey(args) {
 }
 
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
+export const optimisticLStat = makeOptimistic("lstat", lstat);
 export const optimisticReadFile = makeOptimistic("readFile", readFile);
 export const optimisticReaddir = makeOptimistic("readdir", readdir);
 export const optimisticHashOrNull = makeOptimistic("hashOrNull", path => {
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index a6d0c77f26..88cc420692 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -22,6 +22,13 @@ import {
   convert as convertColonsInPath
 } from "../utils/colon-converter.js";
 
+import {
+  optimisticLStat,
+  optimisticStatOrNull,
+  optimisticReadFile,
+  optimisticReaddir,
+} from "../fs/optimistic.js";
+
 var meteorNpm = exports;
 
 // if a user exits meteor while we're trying to create a .npm
@@ -429,14 +436,14 @@ function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
   });
 }
 
-function isPortable(dir) {
-  const lstat = files.lstat(dir);
+const isPortable = Profile("meteorNpm.isPortable", dir => {
+  const lstat = optimisticLStat(dir);
   if (! lstat.isDirectory()) {
     // Non-directory files are portable unless they end with .node.
     return ! dir.endsWith(".node");
   }
 
-  const pkgJsonStat = files.statOrNull(files.pathJoin(dir, "package.json"));
+  const pkgJsonStat = optimisticStatOrNull(files.pathJoin(dir, "package.json"));
   const canCache = pkgJsonStat && pkgJsonStat.isFile();
   const portableFile = files.pathJoin(dir, ".meteor-portable");
 
@@ -448,7 +455,7 @@ function isPortable(dir) {
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
     try {
-      return JSON.parse(files.readFile(portableFile));
+      return JSON.parse(optimisticReadFile(portableFile));
     } catch (e) {
       if (! (e instanceof SyntaxError ||
              e.code === "ENOENT")) {
@@ -461,7 +468,7 @@ function isPortable(dir) {
     fs.unlink(portableFile, error => {});
   }
 
-  const result = files.readdir(dir).every(
+  const result = optimisticReaddir(dir).every(
     // Ignore files that start with a ".", such as .bin directories.
     itemName => itemName.startsWith(".") ||
       isPortable(files.pathJoin(dir, itemName)));
@@ -478,7 +485,7 @@ function isPortable(dir) {
   }
 
   return result;
-}
+});
 
 // Return true if all of a package's npm dependencies are portable
 // (that is, if the node_modules can be copied anywhere and we'd

From 50a1f11a10df24496e4d9eb5d0cfcd41fc4bcdba Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 18:21:47 -0400
Subject: [PATCH 226/688] Use optimistic functions in compileUnibuild.

---
 tools/isobuild/compiler.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index ba0146d921..aeafd54d1f 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -14,6 +14,11 @@ var compileStepModule = require('./compiler-deprecated-compile-step.js');
 var Profile = require('../tool-env/profile.js').Profile;
 import { SourceProcessorSet } from './build-plugin.js';
 
+import {
+  optimisticReadFile,
+  optimisticHashOrNull,
+} from "../fs/optimistic.js";
+
 var compiler = exports;
 
 // Whenever you change anything about the code that generates isopacks, bump
@@ -550,12 +555,9 @@ api.addAssets('${relPath}', 'client').`);
       return;
     }
 
-    // readAndWatchFileWithHash returns an object carrying a buffer with the
-    // file-contents. The buffer contains the original data of the file (no EOL
-    // transforms from the tools/files.js part).
-    const file = watch.readAndWatchFileWithHash(watchSet, absPath);
-    const hash = file.hash;
-    const contents = file.contents;
+    const contents = optimisticReadFile(absPath);
+    const hash = optimisticHashOrNull(absPath);
+    watchSet.addFile(absPath, hash);
 
     Console.nudge(true);
 

From 5af59c58bcc8bf489d180933527e3ff708ed75bc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:17:06 -0400
Subject: [PATCH 227/688] Always use rimraf.sync in files.rm_recursive.

---
 tools/fs/files.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index e683d1b8c8..8ef11de793 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -278,15 +278,7 @@ function statOrNull(path, preserveSymlinks) {
 
 // Like rm -r.
 files.rm_recursive = Profile("files.rm_recursive", function (p) {
-  if (Fiber.current && Fiber.yield && ! Fiber.yield.disallowed) {
-    new Promise((resolve, reject) => {
-      rimraf(files.convertToOSPath(p), err => {
-        err ? reject(err) : resolve();
-      });
-    }).await();
-  } else {
-    rimraf.sync(files.convertToOSPath(p));
-  }
+  rimraf.sync(files.convertToOSPath(p));
 });
 
 // Makes all files in a tree read-only.

From c7b8b72e778a2b20bc71ebf2358f60dc71351052 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:17:16 -0400
Subject: [PATCH 228/688] Never yield in files.symlink.

---
 tools/fs/files.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 8ef11de793..6601dafbba 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -1478,7 +1478,8 @@ function wrapFsFunc(fsFuncName, pathArgIndices, options) {
       // conditions, so we get a nice performance boost from making
       // these calls sync.
       const isQuickie = (fsFuncName === 'stat' ||
-                         fsFuncName === 'rename');
+                         fsFuncName === 'rename' ||
+                         fsFuncName === 'symlink');
 
       if (canYield && shouldBeSync && !isQuickie) {
         const promise = new Promise((resolve, reject) => {

From 8e57ecb7318ee98dbc00d3228cb2a2fcddc18703 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:18:23 -0400
Subject: [PATCH 229/688] Use optimistic functions in Builder#copyDirectory.

---
 tools/isobuild/builder.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 85b5644618..8a2df5ceb1 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -2,6 +2,11 @@ import {WatchSet, readAndWatchFile, sha1} from '../fs/watch.js';
 import files from '../fs/files.js';
 import NpmDiscards from './npm-discards.js';
 import {Profile} from '../tool-env/profile.js';
+import {
+  optimisticReadFile,
+  optimisticReaddir,
+  optimisticLStat,
+} from "../fs/optimistic.js";
 
 // Builder is in charge of writing "bundles" to disk, which are
 // directory trees such as site archives, programs, and packages.  In
@@ -455,7 +460,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
 
       this._ensureDirectory(relTo);
 
-      files.readdir(absFrom).forEach(item => {
+      optimisticReaddir(absFrom).forEach(item => {
         const thisAbsFrom = files.pathResolve(absFrom, item);
         const thisRelTo = files.pathJoin(relTo, item);
 
@@ -463,7 +468,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           return;
         }
 
-        const fileStatus = files.lstat(thisAbsFrom);
+        const fileStatus = optimisticLStat(thisAbsFrom);
 
         let itemForMatch = item;
         const isDirectory = fileStatus.isDirectory();
@@ -500,9 +505,11 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
         } else {
           // XXX can't really optimize this copying without reading
           // the file into memory to calculate the hash.
-          files.copyFile(thisAbsFrom,
-                         files.pathResolve(this.buildPath, thisRelTo),
-                         fileStatus.mode);
+          files.writeFile(
+            files.pathResolve(this.buildPath, thisRelTo),
+            optimisticReadFile(thisAbsFrom),
+            { mode: fileStatus.mode },
+          );
 
           this.usedAsFile[thisRelTo] = true;
         }

From c6b2a2f95eb253365a51c606be6ed5a3144d0d5e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 19:26:32 -0400
Subject: [PATCH 230/688] Use optimistic functions in
 meteorNpm.getProdPackageNames.

---
 tools/isobuild/meteor-npm.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 88cc420692..3ee10e538d 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -140,11 +140,11 @@ export function getProdPackageNames(nodeModulesDir) {
   // Returns true iff dir is a package directory.
   function walk(dir) {
     const packageJsonPath = files.pathJoin(dir, "package.json");
-    const packageJsonStat = files.statOrNull(packageJsonPath);
+    const packageJsonStat = optimisticStatOrNull(packageJsonPath);
 
     if (packageJsonStat &&
         packageJsonStat.isFile()) {
-      const pkg = JSON.parse(files.readFile(packageJsonPath));
+      const pkg = JSON.parse(optimisticReadFile(packageJsonPath));
       const nodeModulesDir = files.pathJoin(dir, "node_modules");
       nodeModulesDirStack.push(nodeModulesDir);
 
@@ -194,7 +194,7 @@ export function getProdPackageNames(nodeModulesDir) {
     for (let i = nodeModulesDirStack.length - 1; i >= 0; --i) {
       const nodeModulesDir = nodeModulesDirStack[i];
       const candidate = files.pathJoin(nodeModulesDir, name);
-      const stat = files.statOrNull(candidate);
+      const stat = optimisticStatOrNull(candidate);
       if (stat && stat.isDirectory()) {
         return candidate;
       }

From 1c42e0fe228056669126f0e40b658557d13dcc48 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 23 Sep 2016 18:20:33 +0300
Subject: [PATCH 231/688] Await `Promise` when running `npm install` (#7805)

I believe this is the fix for the (recent) CI server timeouts.
---
 tools/isobuild/meteor-npm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 3ee10e538d..5543522186 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -777,7 +777,7 @@ Profile("meteorNpm.runNpmCommand", function (args, cwd) {
           });
         }
       );
-    });
+    }).await();
 
   }).await();
 });

From 7c3fbad5d009c41e843b2239ea850c732ccb0551 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 20:27:50 -0400
Subject: [PATCH 232/688] Use version constraint for minifier-css in
 standard-minifier-css.

---
 packages/standard-minifier-css/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 5c3b1d9627..2778d693a9 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -8,7 +8,7 @@ Package.describe({
 Package.registerBuildPlugin({
   name: "minifyStdCSS",
   use: [
-    'minifier-css'
+    'minifier-css@1.2.14'
   ],
   npmDependencies: {
     "source-map": "0.5.6",

From ad69d59fa74b43c7bcf25b000c657a94a0a5f0e5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 26 Sep 2016 20:39:15 -0400
Subject: [PATCH 233/688] Clear dev_bundle/.npm before tests to ensure
 consistent results.

---
 packages/test-in-console/run.sh | 3 +++
 scripts/ci.sh                   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index c1922dd9d1..c6e005a5b6 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -4,6 +4,9 @@ cd "`dirname "$0"`"
 cd ../..
 export METEOR_HOME=`pwd`
 
+# Clear dev_bundle/.npm to ensure consistent test runs.
+./meteor npm cache clear
+
 export PATH=$METEOR_HOME:$PATH
 # synchronously get the dev bundle and NPM modules if they're not there.
 ./meteor --get-ready || exit 1
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 521bb37395..7f26543f66 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -5,6 +5,9 @@ export SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^log
 # Don't print as many progress indicators
 export EMACS=t
 
+# Clear dev_bundle/.npm to ensure consistent test runs.
+./meteor npm cache clear
+
 # Since PhantomJS has been removed from dev_bundle/lib/node_modules
 # (#6905), but self-test still needs it, install it now.
 ./meteor npm install -g phantomjs-prebuilt browserstack-webdriver

From ea92d83744fc77ada8d2946bd7b162f05382d9bd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 10:13:19 -0400
Subject: [PATCH 234/688] Don't cache exceptions in optimistic functions.

I originally added the exception-caching functionality in order to avoid
calling files.stat repeatedly for files known to be missing, but now that
we're using statOrNull, knowledge of missing files (as indicated by
statOrNull returning null) is being properly cached.

The reason it's dangerous to cache exceptions is that (for example) when
an ENOENT exception indicates the file is missing, there will be no more
change events for that file, effectively making the exception permanent,
even if the file comes to exist at a later time.
---
 tools/fs/optimistic.js | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index a96886cc09..31e14588f1 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -12,6 +12,8 @@ import {
   readdir,
 } from "./files.js";
 
+const CACHE_MISS_SENTINEL = Object.create(null);
+
 function makeOptimistic(name, fn) {
   assert.strictEqual(typeof fn, "function");
 
@@ -46,23 +48,17 @@ function makeOptimistic(name, fn) {
       }
 
       entry.results = Object.create(null);
-
-      // Equivalent to a cache miss, because there is no "value" key.
-      entry.results[key] = { error: false };
+      entry.results[key] = CACHE_MISS_SENTINEL;
 
       cache.set(path, entry);
     }
 
-    const result = entry.results[key];
-
-    if ("value" in result) {
-      if (result.error) {
-        throw result.value;
-      }
-      return result.value;
+    let result = entry.results[key];
+    if (result === CACHE_MISS_SENTINEL) {
+      result = entry.results[key] = fn(...args);
     }
 
-    return tryApply(result, fn, args);
+    return result;
   });
 }
 
@@ -79,10 +75,8 @@ function maybeStartWatcher(path, key) {
 
   try {
     entry.watcher = watch(path, (...args) => {
-      const result = entry.results[key];
       // Trigger a cache miss the next time anyone asks.
-      delete result.value;
-      result.error = false;
+      entry.results[key] = CACHE_MISS_SENTINEL;
     });
 
   } catch (e) {
@@ -93,18 +87,6 @@ function maybeStartWatcher(path, key) {
   return entry;
 }
 
-function tryApply(result, fn, args) {
-  try {
-    result.value = fn(...args)
-    result.error = false;
-  } catch (e) {
-    result.error = true;
-    throw result.value = e;
-  }
-
-  return result.value;
-}
-
 function makeCacheKey(args) {
   var parts = [];
 

From 0d3466b8828aa27e862fc76019b072ea0c72a43a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 10:28:51 -0400
Subject: [PATCH 235/688] Be more defensive when terminating watchers.

---
 tools/fs/safe-pathwatcher.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 8d52a74a5b..4f801a5769 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -56,7 +56,7 @@ function startNewWatcher(absPath) {
     // so our only hope of catching them is to continue polling.
   }
 
-  const watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
+  let watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
 
   const pollingInterval = watcher
     ? DEFAULT_POLLING_INTERVAL
@@ -113,9 +113,14 @@ function startNewWatcher(absPath) {
           return;
         }
 
-        watcher.close();
-        files.unwatchFile(absPath, watchFileWrapper);
         watchers[absPath] = null;
+
+        if (watcher) {
+          watcher.close();
+          watcher = null;
+        }
+
+        files.unwatchFile(absPath, watchFileWrapper);
       }, WATCHER_CLEANUP_DELAY_MS);
     }
   };

From b976cfa55221d72ab01f82db6bf20a09b0185529 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 11:03:28 -0400
Subject: [PATCH 236/688] Fix reference error for `file` variable in
 tools/isobuild/compiler.js.

---
 tools/isobuild/compiler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index aeafd54d1f..b67faf82db 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -557,6 +557,7 @@ api.addAssets('${relPath}', 'client').`);
 
     const contents = optimisticReadFile(absPath);
     const hash = optimisticHashOrNull(absPath);
+    const file = { contents, hash };
     watchSet.addFile(absPath, hash);
 
     Console.nudge(true);

From 9304f76b52b02ee9c484737c7571a7d39042369d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 11:09:46 -0400
Subject: [PATCH 237/688] Fix tests by avoiding printing inotify warning when
 Console.isHeadless().

---
 tools/console/console.js     | 14 ++++++++++----
 tools/fs/safe-pathwatcher.js | 12 +++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index de29118647..78ac0a93a6 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -541,6 +541,8 @@ var Console = function (options) {
 
   options = options || {};
 
+  self._headless = false;
+
   // The progress display we are showing on-screen
   self._progressDisplay = new ProgressDisplayNone(self);
 
@@ -1265,12 +1267,16 @@ _.extend(Console.prototype, {
     self._setProgressDisplay(newProgressDisplay);
   },
 
-  setHeadless(headless) {
-    if (typeof headless === "undefined") headless = true;
-    headless = !! headless;
+  isHeadless() {
+    return this._headless;
+  },
+
+  setHeadless(headless = true) {
+    this._headless = !! headless;
+
     if (this._progressDisplay &&
         this._progressDisplay.setHeadless) {
-      this._progressDisplay.setHeadless(headless);
+      this._progressDisplay.setHeadless(this._headless);
     }
   },
 
diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 4f801a5769..d18d62c82c 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -152,11 +152,13 @@ function pathwatcherWatch(absPath, callback) {
           archinfo.matches(archinfo.host(), 'os.linux')) {
         suggestedRaisingWatchLimit = true;
         var Console = require('../console/console.js').Console;
-        Console.arrowWarn(
-          "It looks like a simple tweak to your system's configuration will " +
-            "make many tools (including this Meteor command) more efficient. " +
-            "To learn more, see " +
-            Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
+        if (! Console.isHeadless()) {
+          Console.arrowWarn(
+            "It looks like a simple tweak to your system's configuration will " +
+              "make many tools (including this Meteor command) more efficient. " +
+              "To learn more, see " +
+              Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
+        }
       }
       // ... ignore the error.  We'll still have watchFile, which is good
       // enough.

From 670c30592795bea777e7a41f861b636d899d62b0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 12:07:41 -0400
Subject: [PATCH 238/688] Update the `npm` npm package to v3.10.8.

---
 History.md                         | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 6c581a2eaf..e90a1c63a6 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,6 @@
 ## v1.4.2
 
-* The `npm` npm package has been updated to 3.10.7.
+* The `npm` npm package has been updated to 3.10.8.
 
 * The `node-pre-gyp` npm package has been updated to 0.6.30.
 
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index fdc31fe8db..9f037020c6 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -7,7 +7,7 @@ UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
 NODE_VERSION=4.5.0
-NPM_VERSION=3.10.7
+NPM_VERSION=3.10.8
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index bb5d8378ae..312eccfaa0 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.7",
+    npm: "3.10.8",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.12.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7a7099688e..6bb1a62dfd 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -3,7 +3,7 @@
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.5.0"
-$NPM_VERSION = "3.10.7"
+$NPM_VERSION = "3.10.8"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists

From a13d3fd938c1e77afffbf5262eeb4ce25c2f1dfb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 12:14:06 -0400
Subject: [PATCH 239/688] Update the `pathwatcher` npm package to v6.7.1.

Also remove explicit dependency on `runas`, which is depended upon by
`pathwatcher`.
---
 scripts/dev-bundle-tool-package.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 312eccfaa0..028fb203bb 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -50,8 +50,7 @@ var packageJson = {
     // 2.4.0 (more or less, the package.json change isn't committed) plus our PR
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
-    pathwatcher: "6.7.0",
-    runas: "3.1.1",
+    pathwatcher: "6.7.1",
     'lru-cache': '2.6.4',
     'cordova-lib': "6.0.0",
     longjohn: '0.2.11'

From 67116898d95c7b468a3e7b7e4f2ebf394c954736 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 12:42:49 -0400
Subject: [PATCH 240/688] Update History.md with recent changes for 1.4.2.

---
 History.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/History.md b/History.md
index e90a1c63a6..b691c45b81 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
 ## v1.4.2
 
+* This release implements a number of rebuild performance optimizations.
+  As you edit files in development, the server should restart and rebuild
+  much more quickly, especially if you have many `node_modules` files.
+  See https://github.com/meteor/meteor/pull/7668 for more details.
+
 * The `npm` npm package has been updated to 3.10.8.
 
 * The `node-pre-gyp` npm package has been updated to 0.6.30.
@@ -24,6 +29,24 @@
   and `wss:` WebSocket protocols.
   [#7774](https://github.com/meteor/meteor/pull/7774)
 
+* `meteor npm` commands are now configured to use `dev_bundle/.npm` as the
+  npm cache directory by default, which should make npm commands less
+  sensitive to non-reproducible factors in the external environment.
+  https://github.com/meteor/meteor/pull/7668/commits/3313180a6ff33ee63602f7592a9506012029e919
+
+* The `meteor test` command now supports the `--no-release-check` flag.
+  https://github.com/meteor/meteor/pull/7668/commits/7097f78926f331fb9e70a06300ce1711adae2850
+
+* JavaScript module bundles on the server no longer include transitive
+  `node_modules` dependencies, since those dependencies can be evaluated
+  directly by Node. This optimization should improve server rebuild times
+  for apps and packages with large `node_modules` directories.
+  https://github.com/meteor/meteor/pull/7668/commits/03c5346873849151cecc3e00606c6e5aa13b3bbc
+
+* The `standard-minifier-css` package now does basic caching for the
+  expensive `mergeCss` function.
+  https://github.com/meteor/meteor/pull/7668/commits/bfa67337dda1e90610830611fd99dcb1bd44846a
+
 ## v1.4.1.1
 
 * Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in

From 2483fb3cb329eb34bd090616ef9e17043cde586a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 12:46:43 -0400
Subject: [PATCH 241/688] Update the `lru-cache` npm package to v4.0.1.

---
 History.md                         | 2 ++
 scripts/dev-bundle-tool-package.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index b691c45b81..cd9874bc13 100644
--- a/History.md
+++ b/History.md
@@ -11,6 +11,8 @@
 
 * The `fibers` npm package has been updated to 1.0.14.
 
+* The `lru-cache` npm package has been updated to 4.0.1.
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 028fb203bb..1e22ec482e 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -51,7 +51,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
-    'lru-cache': '2.6.4',
+    'lru-cache': '4.0.1',
     'cordova-lib': "6.0.0",
     longjohn: '0.2.11'
   }

From beafa8ab18c0eae4fe89756f5a49e19d33d9e291 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 12:47:18 -0400
Subject: [PATCH 242/688] Bump $BUNDLE_VERSION to 4.2.12 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 1464e4977a..551e938fe7 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.11
+BUNDLE_VERSION=4.2.12
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 9338fbd73f4f80a5726ae48a5f415d8c062730c1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 13:31:41 -0400
Subject: [PATCH 243/688] Bump package versions for 1.4.2-beta.6 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 113653732b..d6a8d11b4d 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.5"
+  version: "1.2.12-beta.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index f75352ae87..9523070184 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index dd2a20949d..1b00e54bc4 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 3b408deeea..f9e602f1e3 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 4bca94ea3a..df16ca8410 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 5c8e3157cc..5fe8cae4cf 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 9a8bd8a7ad..d3ffdc8aa9 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.5"
+  version: "1.3.1-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index b5c4af95ea..d60e315e42 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.5"
+  version: "1.1.12-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index debf0c3c61..f807ba828d 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.5"
+  version: "1.1.13-beta.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 4ec704838a..c07db7db3b 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.5"
+  version: "1.0.11-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 0139ec3150..7eec124adc 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.2-beta.5'
+  version: '6.9.2-beta.6'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 042780fc62..143b8bcee2 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.5',
+  version: '0.1.12-beta.6',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 0032abf5ef..1fa7481a52 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.5',
+  version: '1.1.8-beta.6',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 211fbe92bf..d346635e4a 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.5"
+  version: "1.2.5-beta.6"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index c3544b2316..e08a4b3cbf 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.5',
+  version: '1.3.2-beta.6',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 30cf7cb597..739437a6dc 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.5',
+  version: '1.3.11-beta.6',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 1f945d3907..41244403e0 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.5",
+  version: "0.3.15-beta.6",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index e6116dfc1d..9dc3f03798 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.5',
+  version: '0.5.9-beta.6',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 807e37d41a..0a375ff429 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.5"
+  version: "1.1.18-beta.6"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 3a9176731c..49ef40f638 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.5",
+  version: "4.6.15-beta.6",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 58e9815a54..174f461b9f 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.5"
+  version: "1.2.10-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 9539c1bd12..46fbf675e4 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.5'
+  version: '1.0.9-beta.6'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 8c8751dbf3..5e48d1c4c6 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.5"
+  version: "1.1.9-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index a61737740d..094c85b687 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.5"
+  version: "1.1.15-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 771ddf21dc..3c77af6722 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.5'
+  version: '1.2.10-beta.6'
 });
 
 Npm.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 310ef8a2ff..939294800d 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.5',
+  version: '2.7.6-beta.6',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 521c4bc7f7..90601d2616 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.5'
+  version: '1.1.16-beta.6'
 });
 
 Npm.depends({
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 6b32ed0354..df196bb814 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.5"
+  version: "1.6.5-beta.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 8002361997..2092e76f3d 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.5"
+  version: "1.1.10-beta.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index aead4dea56..f3a71ab200 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.5'
+  version: '1.4.2-beta.6'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index cba7912196..89d07d9af0 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.5'
+  version: '1.2.18-beta.6'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 13c3e196f4..30dd982fbb 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.5"
+  version: "1.2.15-beta.6"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index c2ca789840..6e318c3692 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.5"
+  version: "1.2.15-beta.6"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 9ef0bbf4e4..fe542f2e3c 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.5",
+  version: "0.7.7-beta.6",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index c9dc15eab6..a4fcc88b7e 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.5",
+  version: "0.7.7-beta.6",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 073a97192d..e32a77a2c9 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.13-beta.5'
+  version: '1.1.13-beta.6'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 828aa1405d..33b8350f3b 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.5",
+  version: "0.9.2-beta.6",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 345ac13915..601b8fc8fd 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.51-beta.5',
+  version: '1.5.51-beta.6',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 172c9afd74..ae2cac5fe9 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.5",
+  version: "0.8.8-beta.6",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 819993050b..62072a57b3 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.5"
+  version: "2.513.6-beta.6"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index dacb99f262..8775dc65fa 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.5',
+  version: '1.0.13-beta.6',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 513cc1f15d..addbf2ce6d 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.5'
+  version: '1.1.13-beta.6'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 508fc30c6f..f55ef5f368 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.5'
+  version: '1.3.12-beta.6'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 7b6e795756..9d66ae58ee 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.5'
+  version: '1.1.9-beta.6'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 4f9b8129db..e967d45da4 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.5'
+  version: '2.5.15-beta.6'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index d12901939b..4278fdff3e 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.5",
+ "version": "1.4.2-beta.6",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From d787654e60094a95c98184a4c2f583e6d40910d7 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 28 Sep 2016 02:41:26 +0300
Subject: [PATCH 244/688] Update help.txt with -s shorthand for --settings
 flags.

The -s flag is now shorthand for --settings

Related to meteor/meteor#7478
---
 tools/cli/help.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index c402e8db51..aeb0fd090a 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -54,7 +54,7 @@ Options:
                    example, --mobile-server=https://example.com:443).
   --production     Simulate production mode. Minify and bundle CSS and JS files.
   --raw-logs       Run without parsing logs from stdout and stderr.
-  --settings       Set optional data for Meteor.settings on the server.
+  --settings, -s   Set optional data for Meteor.settings on the server.
   --release        Specify the release of Meteor to use.
   --verbose        Print all output from builds logs.
   --no-lint        Don't run linters used by the app on every rebuild.
@@ -410,13 +410,13 @@ The --delete flag permanently removes a deployed application, including
 all of its stored data.
 
 Options:
-  --delete, -D  permanently delete this deployment
-  --debug       deploy in debug mode (don't minify, etc)
-  --settings    set optional data for Meteor.settings
+  --delete, -D    permanently delete this deployment
+  --debug         deploy in debug mode (don't minify, etc)
+  --settings, -s  set optional data for Meteor.settings
   --allow-incompatible-update   Allow packages in your project to be upgraded or
-                downgraded to versions that are potentially incompatible with
-                the current versions, if required to satisfy all package version
-                constraints.
+                  downgraded to versions that are potentially incompatible with
+                  the current versions, if required to satisfy all package version
+                  constraints.
 
 
 >>> logs
@@ -527,7 +527,7 @@ Options:
                     URL scheme (for example,
                     --mobile-server=https://example.com:443).
   --production      Simulate production mode. Minify and bundle CSS, JS files.
-  --settings        Set optional data for Meteor.settings on the server
+  --settings, -s    Set optional data for Meteor.settings on the server
 
   --ios,            Run tests in an emulator or on a mobile device. All of
   --android,        the tests for client and server will run in addition to
@@ -581,7 +581,7 @@ Options:
                     URL scheme (for example,
                     --mobile-server=https://example.com:443).
   --raw-logs        Run without parsing logs from stdout and stderr.
-  --settings        Set optional data for Meteor.settings on the server
+  --settings, -s    Set optional data for Meteor.settings on the server
 
   --ios,            Run tests in an emulator or on a mobile device. All of
   --android,        the tests for client and server will run in addition to

From cb0ef6c505e0c6adfc3ecee37d07a2045eaeebc2 Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Sat, 23 Jul 2016 20:19:42 +0800
Subject: [PATCH 245/688] Merge ignoreFiles patterns

Summary:

Reduce (files * ignore patterns) times of matching filename, which
cause the build tool scan files very slow.
---
 tools/isobuild/bundler.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index cd82a9bd26..0e84614ab4 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -173,11 +173,13 @@ import { CORDOVA_PLATFORM_VERSIONS } from '../cordova';
 
 // files to ignore when bundling. node has no globs, so use regexps
 exports.ignoreFiles = [
-    /~$/, /^\.#/, /^#.*#$/,  // emacs swap files
-    /^\..*\.sw.$/,  // vim swap files
-    /^\.DS_Store\/?$/, /^ehthumbs\.db$/, /^Icon.$/, /^Thumbs\.db$/,
-    /^\.meteor\/$/, /* avoids scanning N^2 files when bundling all packages */
-    /^\.git\/$/ /* often has too many files to watch */
+    /~$/, /^\.#/,
+    /^(\.meteor\/|\.git\/|Thumbs\.db|\.DS_Store\/?|Icon.|ehthumbs\.db|\..*\.sw.|#.*#)$/, 
+      /* .meteor => avoids scanning N^2 files when bundling all packages
+        .git => often has too many files to watch 
+        ....sw(.) => vim swap files
+        #.*# => emacs swap files
+      */
 ];
 
 function rejectBadPath(p) {

From 637f4b16ac3c90cae5083d449e9b58c7bdac3912 Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Thu, 18 Aug 2016 09:27:33 +0800
Subject: [PATCH 246/688] Add ignore pattern test case

---
 tools/tests/bundle-ignore-files.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 tools/tests/bundle-ignore-files.js

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
new file mode 100644
index 0000000000..cda85d78c2
--- /dev/null
+++ b/tools/tests/bundle-ignore-files.js
@@ -0,0 +1,20 @@
+var selftest = require('../tool-testing/selftest.js');
+var Sandbox = selftest.Sandbox;
+var files = require('../fs/files.js');
+var bundler = require('../isobuild/bundle.js');
+
+selftest.define("bundle-ignore-files", () => {
+  var patterns = bundler.ignoreFiles;
+  var inputs = [
+    '.git/refs',
+    '.git/HEAD',
+    '.meteor/local',
+    '.meteor/packages',
+  ];
+  _.each(inputs, (input) => {
+    let matched = _.any(patterns, (ptn) => {
+      return ptn.test(input);
+    });
+    selftest.expectEqual(matched, true);
+  });
+});

From a2ba3ca386384990ad4e65f3de0cdea8ef4fd184 Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Thu, 18 Aug 2016 09:28:05 +0800
Subject: [PATCH 247/688] Require underscore

---
 tools/tests/bundle-ignore-files.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index cda85d78c2..500c1c823c 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -1,3 +1,4 @@
+var _ = require('underscore');
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
 var files = require('../fs/files.js');

From 73ceed4ba3ed10efe788971f18ed041873d2b68c Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Thu, 18 Aug 2016 09:31:41 +0800
Subject: [PATCH 248/688] Fix input patterns

---
 tools/tests/bundle-ignore-files.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index 500c1c823c..0fc2eb39e9 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -7,10 +7,11 @@ var bundler = require('../isobuild/bundle.js');
 selftest.define("bundle-ignore-files", () => {
   var patterns = bundler.ignoreFiles;
   var inputs = [
-    '.git/refs',
-    '.git/HEAD',
-    '.meteor/local',
-    '.meteor/packages',
+    '.git/',
+    '.meteor/',
+    '.DS_Store',
+    '.aaabbb.swp',
+    'Thumbs.db',
   ];
   _.each(inputs, (input) => {
     let matched = _.any(patterns, (ptn) => {

From b0a8e1d360d707eb6cc87c4dbb3e145f9f706db3 Mon Sep 17 00:00:00 2001
From: seke <sebastian.kerckhof@barco.com>
Date: Wed, 28 Sep 2016 09:10:11 +0200
Subject: [PATCH 249/688] fix type in import

---
 tools/tests/bundle-ignore-files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index 0fc2eb39e9..70de1db237 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
 var files = require('../fs/files.js');
-var bundler = require('../isobuild/bundle.js');
+var bundler = require('../isobuild/bundler.js');
 
 selftest.define("bundle-ignore-files", () => {
   var patterns = bundler.ignoreFiles;

From 1fe669f9bc657881239e481dbca06d7add80f61e Mon Sep 17 00:00:00 2001
From: seke <sebastian.kerckhof@barco.com>
Date: Wed, 28 Sep 2016 10:35:56 +0200
Subject: [PATCH 250/688] fix test

---
 tools/tests/bundle-ignore-files.js | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index 70de1db237..b4de4f97ad 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -1,22 +1,15 @@
-var _ = require('underscore');
-var selftest = require('../tool-testing/selftest.js');
-var Sandbox = selftest.Sandbox;
-var files = require('../fs/files.js');
-var bundler = require('../isobuild/bundler.js');
+const selftest = require('../tool-testing/selftest.js');
+const bundler = require('../isobuild/bundler.js');
 
 selftest.define("bundle-ignore-files", () => {
-  var patterns = bundler.ignoreFiles;
-  var inputs = [
+  const patterns = bundler.ignoreFiles;
+  const matchingInputs = [
     '.git/',
     '.meteor/',
     '.DS_Store',
     '.aaabbb.swp',
-    'Thumbs.db',
+    'Thumbs.db'
   ];
-  _.each(inputs, (input) => {
-    let matched = _.any(patterns, (ptn) => {
-      return ptn.test(input);
-    });
-    selftest.expectEqual(matched, true);
-  });
+
+  matchingInputs.forEach(input => selftest.expectEqual(patterns.some(p => p.test(input)),true));
 });

From ccc55cac25d63222623529316dd91940238a2350 Mon Sep 17 00:00:00 2001
From: seke <sebastian.kerckhof@barco.com>
Date: Wed, 28 Sep 2016 15:28:44 +0200
Subject: [PATCH 251/688] fix typo and expand test a little bit

---
 tools/isobuild/bundler.js          | 2 +-
 tools/tests/bundle-ignore-files.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 0e84614ab4..f3e7bf4b7b 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -174,7 +174,7 @@ import { CORDOVA_PLATFORM_VERSIONS } from '../cordova';
 // files to ignore when bundling. node has no globs, so use regexps
 exports.ignoreFiles = [
     /~$/, /^\.#/,
-    /^(\.meteor\/|\.git\/|Thumbs\.db|\.DS_Store\/?|Icon.|ehthumbs\.db|\..*\.sw.|#.*#)$/, 
+    /^(\.meteor\/|\.git\/|Thumbs\.db|\.DS_Store\/?|Icon\.|ehthumbs\.db|\..*\.sw.|#.*#)$/,
       /* .meteor => avoids scanning N^2 files when bundling all packages
         .git => often has too many files to watch 
         ....sw(.) => vim swap files
diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index b4de4f97ad..9384ec28f0 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -12,4 +12,10 @@ selftest.define("bundle-ignore-files", () => {
   ];
 
   matchingInputs.forEach(input => selftest.expectEqual(patterns.some(p => p.test(input)),true));
+
+  const nonMatchingInputs = [
+    '/imports/components/Icon/index.js',
+  ];
+
+  nonMatchingInputs.forEach(input => selftest.expectEqual(patterns.some(p => p.test(input)),false));
 });

From 8cdab91bc415433aa693e045534996e5a3ba4f05 Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Wed, 28 Sep 2016 15:29:35 +0200
Subject: [PATCH 252/688] Do not check connection with protected npm registries
 (#7637)

* Do not check connection with protected npm registries

* Remove need for registry http get check by tuning npm retry parameters
---
 tools/isobuild/meteor-npm-userconfig |  7 +++++++
 tools/isobuild/meteor-npm.js         | 16 ----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/tools/isobuild/meteor-npm-userconfig b/tools/isobuild/meteor-npm-userconfig
index 2e3829ef42..bf0ed46f70 100644
--- a/tools/isobuild/meteor-npm-userconfig
+++ b/tools/isobuild/meteor-npm-userconfig
@@ -6,3 +6,10 @@
 
 loglevel = error
 progress = false
+
+# By default if the NPM registry is unavailable, it will timeout after more than 60s.
+# These settings make sure we throw an error faster
+fetch-retries = 1
+fetch-retry-factor = 4
+fetch-retry-mintimeout = 1000
+fetch-retry-maxtimeout = 10000
\ No newline at end of file
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index e4c23a1b3f..5ebc0850d0 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -886,7 +886,6 @@ var getShrinkwrappedDependencies = function (dir) {
 };
 
 var installNpmModule = function (name, version, dir) {
-  ensureConnected();
 
   var installArg = utils.isNpmUrl(version)
     ? version : (name + "@" + version);
@@ -959,8 +958,6 @@ var installFromShrinkwrap = function (dir) {
       "Can't call `npm install` without a npm-shrinkwrap.json file present");
   }
 
-  ensureConnected();
-
   const tempPkgJsonPath = files.pathJoin(dir, "package.json");
   const pkgJsonExisted = files.exists(tempPkgJsonPath);
   if (! pkgJsonExisted) {
@@ -992,19 +989,6 @@ var installFromShrinkwrap = function (dir) {
   });
 };
 
-// ensure we can reach http://npmjs.org before we try to install
-// dependencies. `npm install` times out after more than a minute.
-var ensureConnected = function () {
-  try {
-    httpHelpers.getUrl(process.env.NPM_CONFIG_REGISTRY || "http://registry.npmjs.org");
-  } catch (e) {
-    buildmessage.error("Can't install npm dependencies. " +
-                       "Are you connected to the internet?");
-    // Recover by returning false from updateDependencies
-    throw new NpmFailure;
-  }
-};
-
 // `npm shrinkwrap`
 function shrinkwrap(dir) {
   const tree = getInstalledDependenciesTree(dir);

From 2bc5b4b3b62456809158cd490354224065ab80ab Mon Sep 17 00:00:00 2001
From: Mehdi Ahraoui <benabed.mehdi@gmail.com>
Date: Wed, 28 Sep 2016 14:34:53 +0100
Subject: [PATCH 253/688] Meteor should check if is running as root and prevent
 it on Unix (#7821)

* Prevent running sudo meteor run it on Unix

Prevent running sudo meteor run it on Unix

Fix for all commands

remove empty line

Revert "Prevent running sudo meteor run it on Unix"

This reverts commit d2867561bb6fb1b259a59556628b56a64c677a0b.

improve PR

improve PR

improve PR

fix PR

* improve PR

* fix PR

* fix PR

* fix PR
---
 tools/cli/main.js | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index b04ad74fe6..5d8b1c3942 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -594,7 +594,7 @@ Fiber(function () {
   // tight timetable for 1.0 and there is no advantage to doing it now
   // rather than later. #ImprovingCrossVersionOptionParsing
 
-  var isBoolean = { "--help": true };
+  var isBoolean = { "--help": true, "--unsafe-perm": true };
   var walkCommands = function (node) {
     _.each(node, function (value, key) {
       if (value instanceof Command) {
@@ -746,6 +746,36 @@ Fiber(function () {
     rawArgs.push(term);
   }
 
+  // Prevent running meteor as root
+  if (process.getuid) {
+    // On UNIX platforms.
+    if (process.getuid() === 0){
+      if (_.has(rawOptions, '--unsafe-perm')) {
+        // Meteor is running as root and has the --unsafe-perm flag, just notice.
+        Console.info("");
+        Console.info("You have run Meteor as root.",
+        "Your permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as your non-root user.",
+        "You probably didn't want this, but you can fix it by running the following from the root of your project:");
+        Console.info("");
+        Console.info("sudo chown -Rh <username> .meteor/local");
+        Console.info("");
+        // Fix issue when running `sudo meteor --unsafe-perm`, --unsafe-perm: unknown option.
+        delete rawOptions['--unsafe-perm'];
+      }
+      else {
+        // Meteor is running as root without the --unsafe-perm flag, notice and stop.
+        Console.error("");
+        Console.error("You are attempting to run Meteor as the \"root\" user.",
+        "If you are developing, this is almost certainly *not* what you want to do and will likely result in incorrect file permissions.",
+        "However, if you are running this in a build process (CI, etc.) or you are absolutely sure you know what you are doing,",
+        "add the `--unsafe-perm` flag to this command to proceed.");
+        Console.error("");
+
+        process.exit(1);
+      }
+    }
+  }
+
   // Figure out if we're running in a directory that is part of a Meteor
   // application or package. Determine any additional directories to
   // search for packages.

From 12472cfe7a1e33d907131e8c4a33679948f25da0 Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <GeoffreyBooth@users.noreply.github.com>
Date: Wed, 28 Sep 2016 06:36:53 -0700
Subject: [PATCH 254/688] CoffeeScript now supports ES2015 modules (#7818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update CoffeeScript to 1.11.0, which supports modules; update check for whether to pass CoffeeScript’s output to Babel to look not just for backticks, but also for `import`, `export` and `function*`, the current ESNext features output by CoffeeScript

* Add tests for imported modules using CoffeeScript’s new native import statement

* Test that CoffeeScript native export statements work, by importing something exported by such a statement

* Improve regex

* Optimize regex
---
 .../compileCoffeescript/npm-shrinkwrap.json   |  8 +++----
 packages/coffeescript/package.js              | 11 +++++-----
 .../plugin/compile-coffeescript.js            |  5 +++--
 .../tests/coffeescript_module.coffee          |  1 +
 .../tests/coffeescript_tests.coffee           | 22 +++++++++++++++----
 packages/coffeescript/tests/es2015_module.js  |  1 +
 6 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 packages/coffeescript/tests/coffeescript_module.coffee

diff --git a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
index 8a5954b454..e54aa8427f 100644
--- a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
+++ b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "coffee-script": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz",
-      "from": "coffee-script@1.10.0"
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz",
+      "from": "coffee-script@1.11.0"
     },
     "source-map": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-      "from": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      "from": "source-map@0.5.6"
     }
   }
 }
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 211fbe92bf..f4caac9aeb 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -8,7 +8,7 @@ Package.registerBuildPlugin({
   use: ['caching-compiler', 'ecmascript'],
   sources: ['plugin/compile-coffeescript.js'],
   npmDependencies: {
-    "coffee-script": "1.10.0",
+    "coffee-script": "1.11.0",
     "source-map": "0.5.6"
   }
 });
@@ -18,10 +18,10 @@ Package.onUse(function (api) {
   api.use('babel-compiler');
 
   // Because the CoffeeScript plugin now calls
-  // BabelCompiler.prototype.processOneFileForTarget for any raw
-  // JavaScript enclosed by backticks, it must provide the same runtime
-  // environment that the 'ecmascript' package provides. The following
-  // api.imply calls should match those in ../ecmascript/package.js,
+  // BabelCompiler.prototype.processOneFileForTarget for any ES2015+
+  // JavaScript or JavaScript enclosed by backticks, it must provide the
+  // same runtime environment that the 'ecmascript' package provides.
+  // The following api.imply calls should match those in ../ecmascript/package.js,
   // except that coffeescript does not api.imply('modules').
   api.imply('ecmascript-runtime');
   api.imply('babel-runtime');
@@ -37,6 +37,7 @@ Package.onTest(function (api) {
     'tests/coffeescript_test_setup.js',
     'tests/coffeescript_tests.coffee',
     'tests/coffeescript_strict_tests.coffee',
+    'tests/coffeescript_module.coffee',
     'tests/es2015_module.js',
     'tests/litcoffeescript_tests.litcoffee',
     'tests/litcoffeescript_tests.coffee.md',
diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 68c6bc1363..d8ce16b906 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -83,8 +83,9 @@ export class CoffeeCompiler extends CachingCompiler {
 
     let sourceMap = JSON.parse(output.v3SourceMap);
 
-    if (source.indexOf('`') !== -1) {
-      // If source contains backticks, pass the coffee output through babel-compiler
+    if (source.match(/`|\b(?:import|export|yield)\b/)) {
+      // If source contains backticks or features that output as ES2015+,
+      // pass the coffee output through babel-compiler
       const doubleRoastedCoffee =
         this.babelCompiler.processOneFileForTarget(inputFile, output.js);
 
diff --git a/packages/coffeescript/tests/coffeescript_module.coffee b/packages/coffeescript/tests/coffeescript_module.coffee
new file mode 100644
index 0000000000..953914deb5
--- /dev/null
+++ b/packages/coffeescript/tests/coffeescript_module.coffee
@@ -0,0 +1 @@
+export testingForNativeImportedModule123456789 = true
diff --git a/packages/coffeescript/tests/coffeescript_tests.coffee b/packages/coffeescript/tests/coffeescript_tests.coffee
index 5268f8e459..ef584dc8cd 100644
--- a/packages/coffeescript/tests/coffeescript_tests.coffee
+++ b/packages/coffeescript/tests/coffeescript_tests.coffee
@@ -7,10 +7,24 @@ Tinytest.add "coffeescript - compile", (test) -> test.isTrue true
 
 
 # import/export statements must be top-level
-`import { Meteor as testingForImportedSymbol123456789 } from "meteor/meteor";`
-Tinytest.add "coffeescript - import external package via backticks", (test) ->
-  test.isTrue testingForImportedSymbol123456789?
+`import { Meteor as testingForBacktickedImportedSymbol } from "meteor/meteor";`
+Tinytest.add "coffeescript - import external package via backticked import statement", (test) ->
+  test.isTrue testingForBacktickedImportedSymbol?
 
 `import { testingForImportedModule987654321 } from "./es2015_module.js";`
-Tinytest.add "coffeescript - import local module via backticks", (test) ->
+Tinytest.add "coffeescript - import local module via backticked import statement", (test) ->
   test.isTrue testingForImportedModule987654321?
+
+
+import { Meteor as testingForNativeImportedSymbol } from "meteor/meteor"
+Tinytest.add "coffeescript - import external package via native import statement", (test) ->
+  test.isTrue testingForNativeImportedSymbol?
+
+import { testingForImportedModule123456789 } from "./es2015_module.js";
+Tinytest.add "coffeescript - import local module via native import statement", (test) ->
+  test.isTrue testingForImportedModule123456789?
+
+
+import { testingForNativeImportedModule123456789 } from "./coffeescript_module.coffee";
+Tinytest.add "coffeescript - import local module exported by a CoffeeScript native export statement, via native import statement", (test) ->
+  test.isTrue testingForNativeImportedModule123456789?
diff --git a/packages/coffeescript/tests/es2015_module.js b/packages/coffeescript/tests/es2015_module.js
index 9eb8c9f8c1..40cf34fbac 100644
--- a/packages/coffeescript/tests/es2015_module.js
+++ b/packages/coffeescript/tests/es2015_module.js
@@ -1 +1,2 @@
+export const testingForImportedModule123456789 = true;
 export const testingForImportedModule987654321 = true;

From e06da93fd8d61400953b30375b0ad52f2790f4a9 Mon Sep 17 00:00:00 2001
From: lucfranken <lucfranken@tentoday.com>
Date: Wed, 28 Sep 2016 15:41:32 +0200
Subject: [PATCH 255/688] Fix #7827 - Fix link in Contributing.md (#7834)

Link to Meteor website was broken and there were 2 links which looked
like one. Replaced with a link to the list of packages in the Meteor
repository to give the best currently available overview of the parts
of Meteor.
---
 Contributing.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 547278dc69..7bca90b0d9 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -61,9 +61,8 @@ for more details on proposing changes to core code.
 As of May 2016, we use GitHub to track feature requests. Feature request issues get the `feature` label, as well as a label
 corresponding to the Meteor subproject that they are a part of.
 
-Meteor is a big project with [many](https://www.meteor.com/projects)
-[subprojects](https://github.com/meteor/meteor/labels). Right now, the project
-doesn't have as many
+Meteor is a big project with [many subprojects](https://github.com/meteor/meteor/tree/devel/packages). 
+Right now, the project doesn't have as many
 [core developers (we're hiring!)](https://www.meteor.com/jobs/core-developer)
 as subprojects, so we're not able to work on every single subproject every
 month.  We use our [roadmap](Roadmap.md) to communicate the high level features we're prioritizing over the near and medium term.

From 323ed8884ed160d5249f4eeb089eb200d3d43460 Mon Sep 17 00:00:00 2001
From: seke <sebastian.kerckhof@barco.com>
Date: Wed, 28 Sep 2016 16:07:20 +0200
Subject: [PATCH 256/688] enhance test

---
 tools/tests/bundle-ignore-files.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index 9384ec28f0..dbb09e103b 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -8,13 +8,14 @@ selftest.define("bundle-ignore-files", () => {
     '.meteor/',
     '.DS_Store',
     '.aaabbb.swp',
+    'Icon.',
     'Thumbs.db'
   ];
 
   matchingInputs.forEach(input => selftest.expectEqual(patterns.some(p => p.test(input)),true));
 
   const nonMatchingInputs = [
-    '/imports/components/Icon/index.js',
+    'Icon',
   ];
 
   nonMatchingInputs.forEach(input => selftest.expectEqual(patterns.some(p => p.test(input)),false));

From 697e7ae0f7384e613c6156ecb6ca6c02a67ba58e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Wed, 28 Sep 2016 19:54:10 -0400
Subject: [PATCH 257/688] Protect against null return values from
 getDevBundleForRelease. (#7841)

Fixes #7838.
---
 tools/cli/dev-bundle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cli/dev-bundle.js b/tools/cli/dev-bundle.js
index 6e032527fe..31439eb03e 100644
--- a/tools/cli/dev-bundle.js
+++ b/tools/cli/dev-bundle.js
@@ -52,7 +52,9 @@ function getDevBundleDir() {
     return defaultDevBundlePromise;
   }
 
-  return getDevBundleForRelease(release).then(function (devBundleDir) {
+  return Promise.resolve(
+    getDevBundleForRelease(release)
+  ).then(function (devBundleDir) {
     if (devBundleDir) {
       links.makeLink(devBundleDir, devBundleLink);
       return devBundleDir;

From f8ba1226b18ff07b8b497732585403c82ceaf21f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 28 Sep 2016 12:21:18 -0400
Subject: [PATCH 258/688] Rename test entry point module so that it isn't
 ignored.

---
 tools/tests/old/app-with-private/{test.js => main.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tools/tests/old/app-with-private/{test.js => main.js} (100%)

diff --git a/tools/tests/old/app-with-private/test.js b/tools/tests/old/app-with-private/main.js
similarity index 100%
rename from tools/tests/old/app-with-private/test.js
rename to tools/tests/old/app-with-private/main.js

From 20a66041264f7dba1a2634710f12a7199b60934e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 28 Sep 2016 12:27:00 -0400
Subject: [PATCH 259/688] Remove pointless and exception-swallowing
 assert.doesNotThrow wrappers.

---
 tools/tests/old/test-bundler-assets.js | 161 ++++++++++++-------------
 1 file changed, 80 insertions(+), 81 deletions(-)

diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index df3a543dbb..3a2ebdccc1 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -50,96 +50,95 @@ var runTest = function () {
   catalog.official.initialize();
 
   console.log("Bundle app with public/ directory");
-  assert.doesNotThrow(function () {
-    var projectContext = makeProjectContext("app-with-public");
 
-    var tmpOutputDir = tmpDir();
-    var result = bundler.bundle({
-      projectContext: projectContext,
-      outputPath: tmpOutputDir
-    });
-    var clientManifest = JSON.parse(
-      files.readFile(
-        files.pathJoin(tmpOutputDir, "programs", "web.browser", "program.json")
-      )
-    );
+  var projectContext = makeProjectContext("app-with-public");
+  var tmpOutputDir = tmpDir();
 
-    var testCases = [["/test.txt", "Test\n"],
-                     ["/nested/nested.txt", "Nested\n"]];
-    _.each(testCases, function (file) {
-      var manifestItem = _.find(clientManifest.manifest, function (m) {
-        return m.url === file[0];
-      });
-      assert(manifestItem);
-      var diskPath = files.pathJoin(tmpOutputDir, "programs", "web.browser",
-                               manifestItem.path);
-      assert(files.exists(diskPath));
-      assert.strictEqual(files.readFile(diskPath, "utf8"), file[1]);
+  var result = bundler.bundle({
+    projectContext: projectContext,
+    outputPath: tmpOutputDir
+  });
+
+  var clientManifest = JSON.parse(
+    files.readFile(
+      files.pathJoin(tmpOutputDir, "programs", "web.browser", "program.json")
+    )
+  );
+
+  var testCases = [["/test.txt", "Test\n"],
+                   ["/nested/nested.txt", "Nested\n"]];
+  _.each(testCases, function (file) {
+    var manifestItem = _.find(clientManifest.manifest, function (m) {
+      return m.url === file[0];
     });
+    assert(manifestItem);
+    var diskPath = files.pathJoin(tmpOutputDir, "programs", "web.browser",
+                                  manifestItem.path);
+    assert(files.exists(diskPath));
+    assert.strictEqual(files.readFile(diskPath, "utf8"), file[1]);
   });
 
   console.log("Bundle app with private/ directory and package asset");
-  assert.doesNotThrow(function () {
-    var projectContext = makeProjectContext("app-with-private");
 
-    var tmpOutputDir = tmpDir();
+  var projectContext = makeProjectContext("app-with-private");
+  var tmpOutputDir = tmpDir();
 
-    var result = bundler.bundle({
-      projectContext: projectContext,
-      outputPath: tmpOutputDir
-    });
-
-    var serverManifest = JSON.parse(
-      files.readFile(
-        files.pathJoin(tmpOutputDir, "programs", "server",
-                  "program.json")
-      )
-    );
-    var testTxtPath;
-    var nestedTxtPath;
-    var packageTxtPath;
-    var unregisteredExtensionPath;
-    _.each(serverManifest.load, function (item) {
-      if (item.path === "packages/test-package.js") {
-        packageTxtPath = files.pathJoin(
-          tmpOutputDir, "programs", "server", item.assets['test-package.txt']);
-        unregisteredExtensionPath = files.pathJoin(
-          tmpOutputDir, "programs", "server", item.assets["test.notregistered"]);
-      }
-      if (item.path === "app/test.js") {
-        testTxtPath = files.pathJoin(
-          tmpOutputDir, "programs", "server", item.assets['test.txt']);
-        nestedTxtPath = files.pathJoin(
-          tmpOutputDir, "programs", "server", item.assets["nested/test.txt"]);
-      }
-    });
-    // check that the files are where the manifest says they are
-    assert.strictEqual(result.errors, false, result.errors && result.errors[0]);
-    assert(files.exists(testTxtPath));
-    assert(files.exists(nestedTxtPath));
-    assert(files.exists(packageTxtPath));
-    assert(files.exists(unregisteredExtensionPath));
-    assert.strictEqual(files.readFile(testTxtPath, "utf8"), "Test\n");
-    assert.strictEqual(files.readFile(nestedTxtPath, "utf8"), "Nested\n");
-    assert.strictEqual(files.readFile(packageTxtPath, "utf8"), "Package\n");
-    assert.strictEqual(files.readFile(unregisteredExtensionPath, "utf8"),
-                       "No extension handler\n");
-
-    // Run the app to check that Assets.getText/Binary do the right things.
-    var meteorToolPath = files.convertToOSPath(process.env.METEOR_TOOL_PATH);
-    var fut = new Future();
-    require('child_process').execFile(
-      meteorToolPath,
-      // use a non-default port so we don't fail if someone is running an app
-      // now
-      ["--once", "--port", "4123"], {
-        cwd: files.convertToOSPath(projectContext.projectDir),
-        stdio: 'inherit'
-      },
-      fut.resolver()
-    );
-    fut.wait();  // would throw if command failed
+  var result = bundler.bundle({
+    projectContext: projectContext,
+    outputPath: tmpOutputDir
   });
+
+  var serverManifest = JSON.parse(
+    files.readFile(
+      files.pathJoin(tmpOutputDir, "programs", "server",
+                     "program.json")
+    )
+  );
+
+  var testTxtPath;
+  var nestedTxtPath;
+  var packageTxtPath;
+  var unregisteredExtensionPath;
+  _.each(serverManifest.load, function (item) {
+    if (item.path === "packages/test-package.js") {
+      packageTxtPath = files.pathJoin(
+        tmpOutputDir, "programs", "server", item.assets['test-package.txt']);
+      unregisteredExtensionPath = files.pathJoin(
+        tmpOutputDir, "programs", "server", item.assets["test.notregistered"]);
+    }
+    if (item.path === "app/main.js") {
+      testTxtPath = files.pathJoin(
+        tmpOutputDir, "programs", "server", item.assets['test.txt']);
+      nestedTxtPath = files.pathJoin(
+        tmpOutputDir, "programs", "server", item.assets["nested/test.txt"]);
+    }
+  });
+  // check that the files are where the manifest says they are
+  assert.strictEqual(result.errors, false, result.errors && result.errors[0]);
+  assert(files.exists(testTxtPath));
+  assert(files.exists(nestedTxtPath));
+  assert(files.exists(packageTxtPath));
+  assert(files.exists(unregisteredExtensionPath));
+  assert.strictEqual(files.readFile(testTxtPath, "utf8"), "Test\n");
+  assert.strictEqual(files.readFile(nestedTxtPath, "utf8"), "Nested\n");
+  assert.strictEqual(files.readFile(packageTxtPath, "utf8"), "Package\n");
+  assert.strictEqual(files.readFile(unregisteredExtensionPath, "utf8"),
+                     "No extension handler\n");
+
+  // Run the app to check that Assets.getText/Binary do the right things.
+  var meteorToolPath = files.convertToOSPath(process.env.METEOR_TOOL_PATH);
+  var fut = new Future();
+  require('child_process').execFile(
+    meteorToolPath,
+    // use a non-default port so we don't fail if someone is running an app
+    // now
+    ["--once", "--port", "4123"], {
+      cwd: files.convertToOSPath(projectContext.projectDir),
+      stdio: 'inherit'
+    },
+    fut.resolver()
+  );
+  fut.wait();  // would throw if command failed
 };
 
 var Fiber = require('fibers');

From 5b2e08a80cfe15616d222cd86a0e1a9ea317addc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 28 Sep 2016 16:57:52 -0400
Subject: [PATCH 260/688] Automatically reconfigure Mongo replication set when
 --port differs.

Fixes #7563.
---
 tools/runners/run-mongo.js                    | 30 +++++++++--
 .../mongo-sanity/.meteor/.finished-upgraders  | 15 ++++++
 .../apps/mongo-sanity/.meteor/.gitignore      |  1 +
 tools/tests/apps/mongo-sanity/.meteor/.id     |  7 +++
 .../tests/apps/mongo-sanity/.meteor/packages  | 12 +++++
 .../tests/apps/mongo-sanity/.meteor/platforms |  2 +
 tools/tests/apps/mongo-sanity/.meteor/release |  1 +
 .../tests/apps/mongo-sanity/.meteor/versions  | 54 +++++++++++++++++++
 tools/tests/apps/mongo-sanity/server/main.js  | 18 +++++++
 tools/tests/mongo.js                          | 29 ++++++++++
 10 files changed, 165 insertions(+), 4 deletions(-)
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.gitignore
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.id
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/packages
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/platforms
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/release
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/versions
 create mode 100644 tools/tests/apps/mongo-sanity/server/main.js

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 9f9b692a20..d308a8066c 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -532,7 +532,8 @@ var launchMongo = function (options) {
     var stdoutOnData = fiberHelpers.bindEnvironment(function (data) {
       // note: don't use "else ifs" in this, because 'data' can have multiple
       // lines
-      if (/\[initandlisten\] Did not find local replica set configuration document at startup/.test(data)) {
+      if (/\[initandlisten\] Did not find local replica set configuration document at startup/.test(data) ||
+          /\[ReplicationExecutor\] Locally stored replica set configuration does not have a valid entry for the current node/.test(data)) {
         replSetReadyToBeInitiated = true;
         maybeReadyToTalk();
       }
@@ -596,10 +597,25 @@ var launchMongo = function (options) {
       if (stopped) {
         return;
       }
+
       var configuration = {
         _id: replSetName,
+        version: 1,
         members: [{_id: 0, host: '127.0.0.1:' + options.port, priority: 100}]
       };
+
+      try {
+        const config = yieldingMethod(db.admin(), "command", {
+          replSetGetConfig: 1,
+        }).config;
+
+        // If a replication set configuration already exists, it's
+        // important that the new version number is greater than the old.
+        if (config && _.has(config, "version")) {
+          configuration.version = config.version + 1;
+        }
+      } catch (e) {}
+
       if (options.multiple) {
         // Add two more members: one of which should start as secondary but
         // could in theory become primary, and one of which can never be
@@ -613,10 +629,16 @@ var launchMongo = function (options) {
       }
 
       try {
-        var initiateResult = yieldingMethod(
-          db.admin(), 'command', {replSetInitiate: configuration});
+        yieldingMethod(db.admin(), 'command', {
+          replSetInitiate: configuration,
+        });
       } catch (e) {
-        if (e.message !== 'already initialized') {
+        if (e.message === 'already initialized') {
+          yieldingMethod(db.admin(), 'command', {
+            replSetReconfig: configuration,
+            force: true,
+          });
+        } else {
           throw Error("rs.initiate error: " + e.message);
         }
       }
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders b/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..aa607041da
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
@@ -0,0 +1,15 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.gitignore b/tools/tests/apps/mongo-sanity/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.id b/tools/tests/apps/mongo-sanity/.meteor/.id
new file mode 100644
index 0000000000..789b92d073
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+fgbyyt1b3uxw5u734ug
diff --git a/tools/tests/apps/mongo-sanity/.meteor/packages b/tools/tests/apps/mongo-sanity/.meteor/packages
new file mode 100644
index 0000000000..6205c4c08c
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/packages
@@ -0,0 +1,12 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mongo                   # The database Meteor supports right now
+
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+
diff --git a/tools/tests/apps/mongo-sanity/.meteor/platforms b/tools/tests/apps/mongo-sanity/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/mongo-sanity/.meteor/release b/tools/tests/apps/mongo-sanity/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/mongo-sanity/.meteor/versions b/tools/tests/apps/mongo-sanity/.meteor/versions
new file mode 100644
index 0000000000..e675491585
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/versions
@@ -0,0 +1,54 @@
+allow-deny@1.0.5
+autoupdate@1.3.11
+babel-compiler@6.9.2-beta.5
+babel-runtime@0.1.12-beta.5
+base64@1.0.9
+binary-heap@1.0.9
+blaze@2.1.8
+blaze-tools@1.0.9
+boilerplate-generator@1.0.10
+callback-hook@1.0.9
+check@1.2.3
+ddp@1.2.5
+ddp-client@1.3.2-beta.5
+ddp-common@1.2.6
+ddp-server@1.3.11-beta.5
+deps@1.0.12
+diff-sequence@1.0.6
+ecmascript@0.5.9-beta.5
+ecmascript-runtime@0.3.15-beta.5
+ejson@1.0.12
+geojson-utils@1.0.9
+hot-code-push@1.0.4
+html-tools@1.0.10
+htmljs@1.0.10
+http@1.2.10-beta.5
+id-map@1.0.8
+jquery@1.11.9
+livedata@1.0.18
+logging@1.1.16-beta.5
+meteor@1.2.18-beta.5
+meteor-base@1.0.4
+minimongo@1.0.17
+modules@0.7.7-beta.5
+modules-runtime@0.7.7-beta.5
+mongo@1.1.13-beta.5
+mongo-id@1.0.5
+npm-mongo@1.5.51-beta.5
+observe-sequence@1.0.12
+ordered-dict@1.0.8
+promise@0.8.8-beta.5
+random@1.0.10
+reactive-var@1.0.10
+reload@1.1.10
+retry@1.0.8
+routepolicy@1.0.11
+shell-server@0.2.1
+spacebars@1.0.12
+spacebars-compiler@1.0.12
+tracker@1.1.0
+ui@1.0.11
+underscore@1.0.9
+url@1.0.10
+webapp@1.3.12-beta.5
+webapp-hashing@1.0.9
diff --git a/tools/tests/apps/mongo-sanity/server/main.js b/tools/tests/apps/mongo-sanity/server/main.js
new file mode 100644
index 0000000000..45aa6e530a
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/server/main.js
@@ -0,0 +1,18 @@
+import { Mongo } from 'meteor/mongo';
+
+const collection = new Mongo.Collection("sanity");
+
+Meteor.startup(() => {
+  let doc = collection.findOne();
+
+  if (! doc) {
+    collection.insert({ count: 0 });
+    doc = collection.findOne();
+  }
+
+  collection.update(doc._id, {
+    $inc: { count: 1 }
+  });
+
+  console.log("count: " + collection.findOne().count);
+});
diff --git a/tools/tests/mongo.js b/tools/tests/mongo.js
index eafc5fecd3..eb9794a446 100644
--- a/tools/tests/mongo.js
+++ b/tools/tests/mongo.js
@@ -56,3 +56,32 @@ selftest.define("meteor mongo", function () {
 selftest.define("meteor mongo in unicode dir", function () {
   testMeteorMongo('asdf\u0442asdf');
 });
+
+selftest.define("mongo with multiple --port numbers (#7563)", function () {
+  var s = new Sandbox();
+  s.createApp("mongo-multiple-ports", "mongo-sanity");
+  s.cd("mongo-multiple-ports");
+
+  function check(args, matches) {
+    const run = s.run(...args);
+    run.waitSecs(30);
+    matches.forEach(m => {
+      run.waitSecs(10);
+      run.match(m);
+    });
+    run.stop();
+  }
+
+  // Make absolutely sure we're creating the database for the first time.
+  check(["reset"], ["Project reset."]);
+
+  let count = 0;
+  function next() {
+    return ["Started MongoDB", "count: " + (++count)];
+  }
+
+  check(["run"], next());
+  check(["--port", "4321"], next());
+  check(["--port", "4123"], next());
+  check([], next());
+});

From 295d3d5678228f06ee0ab6c0d60139849a0ea192 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 09:42:54 -0400
Subject: [PATCH 261/688] Kill mongo when server process exits.

We try to kill any mongod processes before starting new ones, but this
change kills it when the development server shuts down, too.

Killing mongo on shutdown is particularly important for tests that run
meteor multiple times in a row, and for whatever reason fail to find and
kill running mongod processes on startup, e.g. because the --port has
changed (#7563).

This comment by @glasser seems to suggest this is a reasonable idea:
https://github.com/meteor/meteor/issues/2182#issuecomment-45685614

Fixes #2182 and possibly other related bugs.
---
 tools/runners/run-mongo.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index d308a8066c..551d36d63b 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -482,15 +482,15 @@ var launchMongo = function (options) {
 
     proc = spawnMongod(mongod_path, port, dbPath, replSetName);
 
-    subHandles.push({
-      stop: function () {
-        if (proc) {
-          proc.removeListener('exit', procExitHandler);
-          proc.kill('SIGINT');
-          proc = null;
-        }
+    function stop() {
+      if (proc) {
+        proc.removeListener('exit', procExitHandler);
+        proc.kill('SIGINT');
+        proc = null;
       }
-    });
+    }
+    require("../tool-env/cleanup.js").onExit(stop);
+    subHandles.push({ stop });
 
     var procExitHandler = fiberHelpers.bindEnvironment(function (code, signal) {
       // Defang subHandle.stop().

From 3ea64dfe8c298e9d000ed96e2cb0e3cf4bdc082d Mon Sep 17 00:00:00 2001
From: seke <sebastian.kerckhof@barco.com>
Date: Thu, 29 Sep 2016 17:44:27 +0200
Subject: [PATCH 262/688] Fix regexp for Icon\r files

---
 tools/isobuild/bundler.js          | 2 +-
 tools/tests/bundle-ignore-files.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index f3e7bf4b7b..04a9dc14b9 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -174,7 +174,7 @@ import { CORDOVA_PLATFORM_VERSIONS } from '../cordova';
 // files to ignore when bundling. node has no globs, so use regexps
 exports.ignoreFiles = [
     /~$/, /^\.#/,
-    /^(\.meteor\/|\.git\/|Thumbs\.db|\.DS_Store\/?|Icon\.|ehthumbs\.db|\..*\.sw.|#.*#)$/,
+    /^(\.meteor\/|\.git\/|Thumbs\.db|\.DS_Store\/?|Icon\r|ehthumbs\.db|\..*\.sw.|#.*#)$/,
       /* .meteor => avoids scanning N^2 files when bundling all packages
         .git => often has too many files to watch 
         ....sw(.) => vim swap files
diff --git a/tools/tests/bundle-ignore-files.js b/tools/tests/bundle-ignore-files.js
index dbb09e103b..91be1046ab 100644
--- a/tools/tests/bundle-ignore-files.js
+++ b/tools/tests/bundle-ignore-files.js
@@ -8,7 +8,7 @@ selftest.define("bundle-ignore-files", () => {
     '.meteor/',
     '.DS_Store',
     '.aaabbb.swp',
-    'Icon.',
+    'Icon\r',
     'Thumbs.db'
   ];
 

From c13fe33aa3e2f49bbcf45d8a1ea0e3fa7d8315ab Mon Sep 17 00:00:00 2001
From: Lieuwe Rooijakkers <lieuwerooijakkers@gmail.com>
Date: Thu, 29 Sep 2016 21:59:06 +0200
Subject: [PATCH 263/688] coffeescript: improve es6 regex performance (#7846)

---
 packages/coffeescript/plugin/compile-coffeescript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index d8ce16b906..f0d8b32d73 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -83,7 +83,7 @@ export class CoffeeCompiler extends CachingCompiler {
 
     let sourceMap = JSON.parse(output.v3SourceMap);
 
-    if (source.match(/`|\b(?:import|export|yield)\b/)) {
+    if (/`|\b(?:import|export|yield)\b/.test(source)) {
       // If source contains backticks or features that output as ES2015+,
       // pass the coffee output through babel-compiler
       const doubleRoastedCoffee =

From 8dbfd9769a08a19878999de42a247102d8d5717f Mon Sep 17 00:00:00 2001
From: Michiel ter Reehorst <jamiter@users.noreply.github.com>
Date: Thu, 29 Sep 2016 21:59:35 +0200
Subject: [PATCH 264/688] Bump the coffeescript package version (#7845)

That way everyone who wants to can update to version `1.2.6` and enjoy coffeescript `1.11.0`.
---
 packages/coffeescript/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index f4caac9aeb..b109abdf53 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.5-beta.5"
+  version: "1.2.6"
 });
 
 Package.registerBuildPlugin({

From dd3fe9a264a00f085b9fa7654d18b3fd67dbae30 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 16:03:02 -0400
Subject: [PATCH 265/688] Add additional delay to "run: run" test.

---
 tools/tests/run.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/tests/run.js b/tools/tests/run.js
index 908cdc8593..3be4636150 100644
--- a/tools/tests/run.js
+++ b/tools/tests/run.js
@@ -106,6 +106,7 @@ try {
   run.match('s.json: parse error reading settings file');
   run.match('Waiting for file change');
   s.write('s.json', '{}');
+  run.waitSecs(15);
   run.match('App running at');
   run.stop();
 

From 42e0efef61ce98fcba5c8c5d351eca67ad907b05 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 17:47:15 -0400
Subject: [PATCH 266/688] Update History.md with recent changes in the 1.4.2
 release.

---
 History.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/History.md b/History.md
index cd9874bc13..58d99111c5 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,10 @@
 
 * The `lru-cache` npm package has been updated to 4.0.1.
 
+* The `mongodb` npm package used by the `npm-mongo` Meteor package has
+  been updated to version 2.2.10.
+  [#7780](https://github.com/meteor/meteor/pull/7780)
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now
@@ -49,6 +53,17 @@
   expensive `mergeCss` function.
   https://github.com/meteor/meteor/pull/7668/commits/bfa67337dda1e90610830611fd99dcb1bd44846a
 
+* The `coffeescript` package now natively supports `import` and `export`
+  declarations. [#7818](https://github.com/meteor/meteor/pull/7818)
+
+* Running Meteor with a different `--port` will now automatically
+  reconfigure the Mongo replica set when using the WiredTiger storage
+  engine, instead of failing to start Mongo.
+  [#7840](https://github.com/meteor/meteor/pull/7840).
+
+* Running Meteor with root privileges now displays a warning.
+  [#7821](https://github.com/meteor/meteor/pull/7821)
+
 ## v1.4.1.1
 
 * Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in

From 0808325846f04740d919e58f37fb77d4254dcab5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 17:48:31 -0400
Subject: [PATCH 267/688] Bump package versions for 1.4.2-beta.7 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-github/package.js            | 2 +-
 packages/accounts-google/package.js            | 2 +-
 packages/accounts-meetup/package.js            | 2 +-
 packages/accounts-meteor-developer/package.js  | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/accounts-twitter/package.js           | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/accounts-weibo/package.js             | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/facebook/package.js                   | 2 +-
 packages/facts/package.js                      | 2 +-
 packages/github/package.js                     | 2 +-
 packages/google/package.js                     | 2 +-
 packages/http/package.js                       | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meetup/package.js                     | 2 +-
 packages/meteor-developer/package.js           | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/test-in-browser/package.js            | 2 +-
 packages/twitter/package.js                    | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/weibo/package.js                      | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index d6a8d11b4d..59e13c1ebf 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.6"
+  version: "1.2.12-beta.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 9523070184..3df68c0fed 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 1b00e54bc4..340afc3106 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index f9e602f1e3..4081aa0f0d 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index df16ca8410..6e0cc1b6ad 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 5fe8cae4cf..118adefbc2 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index d3ffdc8aa9..cd30634a6d 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.6"
+  version: "1.3.1-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index d60e315e42..c98a126bb1 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.6"
+  version: "1.1.12-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index f807ba828d..27efe64cd5 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.6"
+  version: "1.1.13-beta.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index c07db7db3b..5d158ae3f0 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.6"
+  version: "1.0.11-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 7eec124adc..2a210354b5 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.2-beta.6'
+  version: '6.9.2-beta.7'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 143b8bcee2..e950a87ff7 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.6',
+  version: '0.1.12-beta.7',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 1fa7481a52..51907e44da 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.6',
+  version: '1.1.8-beta.7',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index e08a4b3cbf..60ccf6a6f7 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.6',
+  version: '1.3.2-beta.7',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 739437a6dc..6d3a707d53 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.6',
+  version: '1.3.11-beta.7',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 41244403e0..4f9fc56c9e 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.6",
+  version: "0.3.15-beta.7",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 9dc3f03798..7ce5e287e9 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.6',
+  version: '0.5.9-beta.7',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 0a375ff429..26def37322 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.6"
+  version: "1.1.18-beta.7"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 49ef40f638..85dd480e9e 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.6",
+  version: "4.6.15-beta.7",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 174f461b9f..3f3c9fd2ab 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.6"
+  version: "1.2.10-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 46fbf675e4..59835000b1 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.6'
+  version: '1.0.9-beta.7'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 5e48d1c4c6..199eae52e2 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.6"
+  version: "1.1.9-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 094c85b687..6dd605f52c 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.6"
+  version: "1.1.15-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 3c77af6722..9e36ad1492 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.6'
+  version: '1.2.10-beta.7'
 });
 
 Npm.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 939294800d..66f0bf6ebe 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.6',
+  version: '2.7.6-beta.7',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 90601d2616..6821fe4c98 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.6'
+  version: '1.1.16-beta.7'
 });
 
 Npm.depends({
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index df196bb814..a1999720b9 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.6"
+  version: "1.6.5-beta.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 2092e76f3d..366a0419c3 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.6"
+  version: "1.1.10-beta.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index f3a71ab200..3512b03335 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.6'
+  version: '1.4.2-beta.7'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 89d07d9af0..23419088ff 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.6'
+  version: '1.2.18-beta.7'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 30dd982fbb..b33df7d658 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.6"
+  version: "1.2.15-beta.7"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 6e318c3692..bc8a72afed 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.6"
+  version: "1.2.15-beta.7"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index fe542f2e3c..3bb85ea13f 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.6",
+  version: "0.7.7-beta.7",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index a4fcc88b7e..2ff6f94c7a 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.6",
+  version: "0.7.7-beta.7",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e32a77a2c9..5d1b3930e5 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.13-beta.6'
+  version: '1.1.13-beta.7'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 33b8350f3b..14729d9016 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.6",
+  version: "0.9.2-beta.7",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 601b8fc8fd..0f0498feca 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.51-beta.6',
+  version: '1.5.51-beta.7',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index ae2cac5fe9..4905dc9a14 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.6",
+  version: "0.8.8-beta.7",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 62072a57b3..989214d651 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.6"
+  version: "2.513.6-beta.7"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 8775dc65fa..fd9789fb58 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.6',
+  version: '1.0.13-beta.7',
   documentation: null
 });
 
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index addbf2ce6d..a375b432cc 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.6'
+  version: '1.1.13-beta.7'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index f55ef5f368..4883472e13 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.6'
+  version: '1.3.12-beta.7'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 9d66ae58ee..569576ca21 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.6'
+  version: '1.1.9-beta.7'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index e967d45da4..ec5cc6a8d7 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.6'
+  version: '2.5.15-beta.7'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4278fdff3e..f83b1a9ebe 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.6",
+ "version": "1.4.2-beta.7",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From bfa3eaa57d023a1451c8836a095290e35f406cf8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 19:25:32 -0400
Subject: [PATCH 268/688] Use async rimraf as a fallback if rimraf.sync throws
 ENOTEMPTY.

This change preserves the performance benefits of my previous commit
5af59c58bcc8bf489d180933527e3ff708ed75bc, since rimraf.sync is still
attempted first.
---
 tools/fs/files.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 6601dafbba..bb67de86f8 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -278,7 +278,23 @@ function statOrNull(path, preserveSymlinks) {
 
 // Like rm -r.
 files.rm_recursive = Profile("files.rm_recursive", function (p) {
-  rimraf.sync(files.convertToOSPath(p));
+  const path = files.convertToOSPath(p);
+  try {
+    rimraf.sync(path);
+  } catch (e) {
+    if (e.code === "ENOTEMPTY" &&
+        Fiber.current &&
+        Fiber.yield &&
+        ! Fiber.yield.disallowed) {
+      new Promise((resolve, reject) => {
+        rimraf(path, err => {
+          err ? reject(err) : resolve();
+        });
+      }).await();
+      return;
+    }
+    throw e;
+  }
 });
 
 // Makes all files in a tree read-only.

From bd6ddc0800c6772055961ce2f223791e8a6fe38a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 19:27:11 -0400
Subject: [PATCH 269/688] Add note about killing mongod on shutdown to
 History.md.

---
 History.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/History.md b/History.md
index 58d99111c5..5b36231aa0 100644
--- a/History.md
+++ b/History.md
@@ -17,6 +17,11 @@
   been updated to version 2.2.10.
   [#7780](https://github.com/meteor/meteor/pull/7780)
 
+* When the Meteor development server shuts down, it now attempts to kill
+  the `mongod` process it spawned, in addition to killing any running
+  `mongod` processes when the server first starts up.
+  https://github.com/meteor/meteor/pull/7668/commits/295d3d5678228f06ee0ab6c0d60139849a0ea192
+
 * Blaze-related packages have been extracted to
   [`meteor/blaze`](https://github.com/meteor/blaze), and the main
   [`meteor/meteor`](https://github.com/meteor/meteor) repository now

From eb4c04da8661b01a271b83e01934764f812330ec Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 21:14:55 -0400
Subject: [PATCH 270/688] Cache result of findAssignedGlobals in memory to
 speed up rebuilds.

---
 tools/isobuild/js-analyze.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index 4be6c22790..bfe4156722 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -218,9 +218,22 @@ function getImportedModuleId(node) {
 //
 // It only cares about assignments to variables; an assignment to a field on an
 // object (`Foo.Bar = true`) neither causes `Foo` nor `Foo.Bar` to be returned.
+const globalsCache = new LRU({
+  max: Math.pow(2, 12),
+  length(globals) {
+    let sum = 0;
+    Object.keys(globals).forEach(name => sum += name.length);
+    return sum;
+  }
+});
+
 export function findAssignedGlobals(source, hash) {
   const ast = tryToParse(source, hash);
 
+  if (hash && globalsCache.has(hash)) {
+    return globalsCache.get(hash);
+  }
+
   // We have to pass ignoreEval; otherwise, the existence of a direct eval call
   // causes escope to not bother to resolve references in the eval's scope.
   // This is because an eval can pull references inward:
@@ -266,5 +279,9 @@ export function findAssignedGlobals(source, hash) {
     }
   });
 
+  if (hash) {
+    globalsCache.set(hash, assignedGlobals);
+  }
+
   return assignedGlobals;
 }

From 80fdc16e21c0568b6169d2a4a753f148100923ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 30 Sep 2016 10:31:58 -0400
Subject: [PATCH 271/688] Add v8-profiler@5.6.5 to the dev bundle.

---
 scripts/dev-bundle-tool-package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 1e22ec482e..1644f50355 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -34,6 +34,7 @@ var packageJson = {
     kexec: "2.0.2",
     "source-map": "0.5.3",
     "node-inspector": "0.12.8",
+    "v8-profiler": "5.6.5",
     chalk: "0.5.1",
     sqlite3: "3.1.3",
     netroute: "1.0.2",

From 75032f0a8de1096ffd5895b2a99c96f9adf887f4 Mon Sep 17 00:00:00 2001
From: Rodrigo Palhares <rodrigo.palhares@hotmart.com.br>
Date: Fri, 30 Sep 2016 15:52:18 -0300
Subject: [PATCH 272/688] observer-sequence: Bug, array with null values. fixes
 #7850

---
 packages/observe-sequence/observe_sequence.js       | 5 +++--
 packages/observe-sequence/observe_sequence_tests.js | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/observe-sequence/observe_sequence.js b/packages/observe-sequence/observe_sequence.js
index 0ba750bcf5..1a823ab019 100644
--- a/packages/observe-sequence/observe_sequence.js
+++ b/packages/observe-sequence/observe_sequence.js
@@ -289,7 +289,8 @@ seqChangedToArray = function (lastSeqArray, array, callbacks) {
       id = "-" + item;
     } else if (typeof item === 'number' ||
                typeof item === 'boolean' ||
-               item === undefined) {
+               item === undefined ||
+               item === null) {
       id = item;
     } else if (typeof item === 'object') {
       id = (item && ('_id' in item)) ? item._id : index;
@@ -300,7 +301,7 @@ seqChangedToArray = function (lastSeqArray, array, callbacks) {
 
     var idString = idStringify(id);
     if (idsUsed[idString]) {
-      if (typeof item === 'object' && '_id' in item)
+      if (item && typeof item === 'object' && '_id' in item)
         warn("duplicate id " + id + " in", array);
       id = Random.id();
     } else {
diff --git a/packages/observe-sequence/observe_sequence_tests.js b/packages/observe-sequence/observe_sequence_tests.js
index 4e126eca8f..e6a6ed823d 100644
--- a/packages/observe-sequence/observe_sequence_tests.js
+++ b/packages/observe-sequence/observe_sequence_tests.js
@@ -177,6 +177,15 @@ Tinytest.add('observe-sequence - array to other array, strings', function (test)
   ]);
 });
 
+Tinytest.add('observe-sequence - bug #7850 array with null values', function (test) {
+  runOneObserveSequenceTestCase(test, function () {
+    return [1, null];
+  }, function () {}, [
+    {addedAt: [1, 1, 0, null]},
+    {addedAt: [null, null, 1, null]}
+  ]);
+});
+
 Tinytest.add('observe-sequence - array to other array, objects without ids', function (test) {
   var dep = new Tracker.Dependency;
   var seq = [{foo: 1}, {bar: 2}];

From 29c37d5d2df25353eefe6ca814219ada2ea37bee Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Fri, 30 Sep 2016 22:33:32 -0700
Subject: [PATCH 273/688] CoffeeScript compiler: strip exported variables
 *before* running through the Babel compiler, to avoid Babel turning a
 one-line `var` statement into a multiline `var` statement and breaking the
 parsing logic in `stripExportedVars`

---
 packages/coffeescript/plugin/compile-coffeescript.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 68c6bc1363..0de7fbadc0 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -83,6 +83,11 @@ export class CoffeeCompiler extends CachingCompiler {
 
     let sourceMap = JSON.parse(output.v3SourceMap);
 
+    output.js = stripExportedVars(
+      output.js,
+      inputFile.getDeclaredExports().map(e => e.name)
+    );
+
     if (source.indexOf('`') !== -1) {
       // If source contains backticks, pass the coffee output through babel-compiler
       const doubleRoastedCoffee =
@@ -108,10 +113,7 @@ export class CoffeeCompiler extends CachingCompiler {
       }
     }
 
-    return addSharedHeader(stripExportedVars(
-      output.js,
-      inputFile.getDeclaredExports().map(e => e.name)
-    ), sourceMap);
+    return addSharedHeader(output.js, sourceMap);
   }
 
   addCompileResult(inputFile, sourceWithMap) {

From 7296323a54ea29293413ecd5c2920b5710ae61fe Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Sun, 2 Oct 2016 12:14:01 -0700
Subject: [PATCH 274/688] Bump version of CoffeeScript to 1.11.1

---
 .../.npm/plugin/compileCoffeescript/npm-shrinkwrap.json     | 6 +++---
 packages/coffeescript/package.js                            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
index e54aa8427f..e00e5397ac 100644
--- a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
+++ b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "coffee-script": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz",
-      "from": "coffee-script@1.11.0"
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz",
+      "from": "coffee-script@1.11.1"
     },
     "source-map": {
       "version": "0.5.6",
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index b109abdf53..c84856553e 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -8,7 +8,7 @@ Package.registerBuildPlugin({
   use: ['caching-compiler', 'ecmascript'],
   sources: ['plugin/compile-coffeescript.js'],
   npmDependencies: {
-    "coffee-script": "1.11.0",
+    "coffee-script": "1.11.1",
     "source-map": "0.5.6"
   }
 });

From 354d05fba8999165619296af8c95b26a8c709db9 Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Sun, 2 Oct 2016 12:16:04 -0700
Subject: [PATCH 275/688] Bump version of `coffeescript` package

---
 packages/coffeescript/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c84856553e..360e52f583 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.6"
+  version: "1.2.7"
 });
 
 Package.registerBuildPlugin({

From 8b42bfa6f07f77888129f82237f0e6d3d3362d40 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 17:25:42 -0400
Subject: [PATCH 276/688] Add optimism@0.2.2 to the dev bundle.

---
 scripts/dev-bundle-tool-package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 1644f50355..83573353b0 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -52,6 +52,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
+    optimism: "0.2.2",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.0.0",
     longjohn: '0.2.11'

From 0d32423fe0757db313a00437c1757a2ef0fe8909 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 17:31:17 -0400
Subject: [PATCH 277/688] Upgrade Node to version 4.6.0.

https://nodejs.org/en/blog/release/v4.6.0/
---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 5b36231aa0..bd29d7e5a6 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v1.4.2
 
+* Node has been updated to version 4.6.0.
+
 * This release implements a number of rebuild performance optimizations.
   As you edit files in development, the server should restart and rebuild
   much more quickly, especially if you have many `node_modules` files.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 9f037020c6..b0807c45fb 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.5.0
+NODE_VERSION=4.6.0
 NPM_VERSION=3.10.8
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 6bb1a62dfd..7b9823ef84 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.5.0"
+$NODE_VERSION = "4.6.0"
 $NPM_VERSION = "3.10.8"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 

From 27316ed78b876810f6e40d357f587ef581de0169 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 17:26:04 -0400
Subject: [PATCH 278/688] Bump $BUNDLE_VERSION to 4.2.13 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 551e938fe7..635261ae04 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.12
+BUNDLE_VERSION=4.2.13
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 23d62408b247d306d37f442a913bac6233a889ba Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 17:26:41 -0400
Subject: [PATCH 279/688] Use my `optimism` npm package to implement optimistic
 functions.

---
 tools/fs/optimistic.js | 130 ++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 87 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 31e14588f1..791343ce09 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -1,5 +1,5 @@
 import assert from "assert";
-import LRU from "lru-cache";
+import { wrap } from "optimism";
 import { Profile } from "../tool-env/profile.js";
 import { watch } from "./safe-pathwatcher.js";
 import { sha1 } from "./watch.js";
@@ -12,97 +12,53 @@ import {
   readdir,
 } from "./files.js";
 
-const CACHE_MISS_SENTINEL = Object.create(null);
-
 function makeOptimistic(name, fn) {
-  assert.strictEqual(typeof fn, "function");
-
-  const cache = new LRU({
-    max: Math.pow(2, 14),
-    dispose(path, entry) {
-      if (entry.watcher) {
-        entry.watcher.close();
-        entry.watcher = null;
-      }
-    }
-  });
-
-  return Profile("optimistic " + name, (...args) => {
-    const path = args[0];
-    if (! pathIsAbsolute(path)) {
-      return fn(...args);
-    }
-
-    const key = makeCacheKey(args);
-    if (! key) {
-      return fn(...args);
-    }
-
-    let entry = cache.get(path);
-
-    if (! entry) {
-      entry = maybeStartWatcher(path, key);
-
-      if (! entry) {
-        return fn(...args);
+  return Profile("optimistic " + name, wrap(fn, {
+    makeCacheKey(...args) {
+      const path = args[0];
+      if (! pathIsAbsolute(path)) {
+        return;
       }
 
-      entry.results = Object.create(null);
-      entry.results[key] = CACHE_MISS_SENTINEL;
+      var parts = [];
 
-      cache.set(path, entry);
+      for (var i = 0; i < args.length; ++i) {
+        var arg = args[i];
+
+        if (typeof arg !== "string") {
+          // If any of the arguments is not a string, then we won't cache the
+          // result of the corresponding file.* method invocation.
+          return;
+        }
+
+        parts.push(arg);
+      }
+
+      return parts.join("\0");
+    },
+
+    subscribe(...args) {
+      const path = args[0];
+      assert.ok(pathIsAbsolute(path));
+
+      // Only start a watcher for files not in node_modules directories.
+      // This results in caching the result until the server is fully
+      // restarted, which isn't ideal, but it's better than wasting
+      // thousands of watchers on rarely-changing node_modules files.
+      if (path.split(pathSep).indexOf("node_modules") >= 0) {
+        return;
+      }
+
+      let watcher = watch(path, () => this.dirty(...args));
+
+      return () => {
+        if (watcher) {
+          watcher.close();
+          watcher = null;
+        }
+      };
     }
-
-    let result = entry.results[key];
-    if (result === CACHE_MISS_SENTINEL) {
-      result = entry.results[key] = fn(...args);
-    }
-
-    return result;
-  });
-}
-
-function maybeStartWatcher(path, key) {
-  const entry = Object.create(null);
-
-  if (path.split(pathSep).indexOf("node_modules") >= 0) {
-    // Avoid starting a watcher for files in node_modules directories.
-    // This effectively results in caching the result until the server is
-    // fully restarted, which isn't ideal, but it's better than wasting
-    // thousands of watchers on rarely-changing node_modules files.
-    return entry;
-  }
-
-  try {
-    entry.watcher = watch(path, (...args) => {
-      // Trigger a cache miss the next time anyone asks.
-      entry.results[key] = CACHE_MISS_SENTINEL;
-    });
-
-  } catch (e) {
-    // If we can't watch the file, we must not cache the result.
-    return null;
-  }
-
-  return entry;
-}
-
-function makeCacheKey(args) {
-  var parts = [];
-
-  for (var i = 0; i < args.length; ++i) {
-    var arg = args[i];
-
-    if (typeof arg !== "string") {
-      // If any of the arguments is not a string, then we won't cache the
-      // result of the corresponding file.* method invocation.
-      return null;
-    }
-
-    parts.push(arg);
-  }
-
-  return parts.join("\0");
+  }));
 }
 
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);

From 1a3ae4e117b415ff74b7f90f2e96cecbfdaff6f2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 21:01:01 -0400
Subject: [PATCH 280/688] Remove _statCache and _pkgJsonCache members from
 Resolver.

This caching is redundant now that we're using optimistic functions for
accessing the file system in Resolver methods.
---
 tools/isobuild/resolver.js | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index e33aed2499..ef31b7da2a 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -63,8 +63,6 @@ export default class Resolver {
     this.statOrNull = statOrNull;
 
     this._resolveCache = new Map;
-    this._statCache = new Map;
-    this._pkgJsonCache = new Map;
   }
 
   static isTopLevel(id) {
@@ -138,10 +136,6 @@ export default class Resolver {
 
   _joinAndStat(...joinArgs) {
     const joined = pathJoin(...joinArgs);
-    if (this._statCache.has(joined)) {
-      return this._statCache.get(joined);
-    }
-
     const path = pathNormalize(joined);
     const exactStat = this.statOrNull(path);
     const exactResult = exactStat && { path, stat: exactStat };
@@ -166,7 +160,6 @@ export default class Resolver {
       result = exactResult;
     }
 
-    this._statCache.set(joined, result);
     return result;
   }
 
@@ -258,15 +251,8 @@ export default class Resolver {
   }
 
   _readPkgJson(path) {
-    if (this._pkgJsonCache.has(path)) {
-      return this._pkgJsonCache.get(path);
-    }
-
-    let result = null;
     try {
-      const contents = optimisticReadFile(path);
-      result = JSON.parse(contents);
-      this.watchSet.addFile(path, sha1(contents));
+      return JSON.parse(optimisticReadFile(path));
     } catch (e) {
       if (! (e instanceof SyntaxError ||
              e.code === "ENOENT")) {
@@ -274,8 +260,7 @@ export default class Resolver {
       }
     }
 
-    this._pkgJsonCache.set(path, result);
-    return result;
+    return null;
   }
 
   _resolvePkgJsonMain(dirPath, _seenDirPaths) {

From 97ca5f1836646670629fde92fa993e021a89c5f2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 21:03:44 -0400
Subject: [PATCH 281/688] Don't pass watchSet when instantiating Resolver
 objects.

We used the watchSet only when reading package.json files, and I think we
can add package.json files to the watchSet in the ImportScanner instead.
---
 tools/isobuild/compiler-plugin.js | 1 -
 tools/isobuild/import-scanner.js  | 1 -
 tools/isobuild/resolver.js        | 2 --
 3 files changed, 4 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 8e22ba6375..86c587467e 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -878,7 +878,6 @@ export class PackageSourceBatch {
       targetArch: this.processor.arch,
       extensions: this.importExtensions,
       nodeModulesPaths,
-      watchSet: this.unibuild.watchSet,
       onMissing(id) {
         const error = new Error("Cannot find module '" + id + "'");
         error.code = "MODULE_NOT_FOUND";
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 5ae54c7801..f45582398a 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -125,7 +125,6 @@ export default class ImportScanner {
       targetArch: bundleArch,
       extensions,
       nodeModulesPaths,
-      watchSet,
 
       onPackageJson(path, pkg) {
         return scanner._addPkgJsonToOutput(path, pkg);
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index ef31b7da2a..f1f3320682 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -48,7 +48,6 @@ export default class Resolver {
     targetArch,
     extensions = [".js", ".json"],
     nodeModulesPaths = [],
-    watchSet = null,
     onPackageJson,
     onMissing,
     statOrNull = optimisticStatOrNull,
@@ -57,7 +56,6 @@ export default class Resolver {
     this.extensions = extensions;
     this.targetArch = targetArch;
     this.nodeModulesPaths = nodeModulesPaths;
-    this.watchSet = watchSet;
     this.onPackageJson = onPackageJson;
     this.onMissing = onMissing;
     this.statOrNull = statOrNull;

From 5b238bb0c7296b3f297180d2bcb46275bac8c814 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 21:08:23 -0400
Subject: [PATCH 282/688] Eliminate the onPackageJson callback from the
 Resolver API.

---
 tools/isobuild/import-scanner.js | 10 ++++++----
 tools/isobuild/resolver.js       | 30 ++++++++++++------------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index f45582398a..8c83e7543f 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -126,10 +126,6 @@ export default class ImportScanner {
       extensions,
       nodeModulesPaths,
 
-      onPackageJson(path, pkg) {
-        return scanner._addPkgJsonToOutput(path, pkg);
-      },
-
       onMissing(id, parentPath) {
         return scanner._onMissing(id, parentPath);
       },
@@ -484,6 +480,12 @@ export default class ImportScanner {
         return;
       }
 
+      if (resolved.packageJsonMap) {
+        each(resolved.packageJsonMap, (pkg, path) => {
+          this._addPkgJsonToOutput(path, pkg);
+        });
+      }
+
       const absImportedPath = resolved.path;
 
       let depFile = this._getFile(absImportedPath);
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index f1f3320682..6258764474 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -48,7 +48,6 @@ export default class Resolver {
     targetArch,
     extensions = [".js", ".json"],
     nodeModulesPaths = [],
-    onPackageJson,
     onMissing,
     statOrNull = optimisticStatOrNull,
   }) {
@@ -56,7 +55,6 @@ export default class Resolver {
     this.extensions = extensions;
     this.targetArch = targetArch;
     this.nodeModulesPaths = nodeModulesPaths;
-    this.onPackageJson = onPackageJson;
     this.onMissing = onMissing;
     this.statOrNull = statOrNull;
 
@@ -287,27 +285,23 @@ export default class Resolver {
 
     if (isString(main)) {
       pkgSubset.main = main;
-    }
 
-    if (isFunction(this.onPackageJson)) {
-      this.onPackageJson(pkgJsonPath, pkgSubset);
-    }
-
-    if (isString(main)) {
       // The "main" field of package.json does not have to begin with ./
       // to be considered relative, so first we try simply appending it to
       // the directory path before falling back to a full resolve, which
       // might return a package from a node_modules directory.
-      return this._joinAndStat(dirPath, main) ||
-        // The _tryToResolveImportedPath method takes a file object as its
-        // first parameter, but only the .sourcePath and .deps properties
-        // are ever used, so we can get away with passing a fake file
-        // object with only those properties.
-        this.resolve(
-          main,
-          pkgJsonPath,
-          _seenDirPaths
-        );
+      const resolved = this._joinAndStat(dirPath, main) ||
+        this.resolve(main, pkgJsonPath, _seenDirPaths);
+
+      if (resolved) {
+        if (! resolved.packageJsonMap) {
+          resolved.packageJsonMap = Object.create(null);
+        }
+
+        resolved.packageJsonMap[pkgJsonPath] = pkgSubset;
+
+        return resolved;
+      }
     }
 
     return null;

From 3ef7a08297a61c9a53e47d3a64c02c34f88c0f40 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 21:20:59 -0400
Subject: [PATCH 283/688] Eliminate the onMissing callback from the Resolver
 API.

---
 tools/isobuild/compiler-plugin.js | 21 +++++++++++----------
 tools/isobuild/import-scanner.js  | 30 ++++++++++++++++++------------
 tools/isobuild/resolver.js        | 15 ++++++++-------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 86c587467e..c70e1d02db 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -335,9 +335,9 @@ class InputFile extends buildPluginModule.InputFile {
       this.getPathInPackage()
     );
 
-    let resolved = this._resolveCacheLookup(id, parentPath);
-    if (resolved) {
-      return resolved;
+    const resId = this._resolveCacheLookup(id, parentPath);
+    if (resId) {
+      return resId;
     }
 
     const parentStat = files.statOrNull(parentPath);
@@ -347,9 +347,15 @@ class InputFile extends buildPluginModule.InputFile {
     }
 
     const resolver = batch.getResolver();
+    const resolved = resolver.resolve(id, parentPath);
 
-    return this._resolveCacheStore(
-      id, parentPath, resolver.resolve(id, parentPath).id);
+    if (resolved === "missing") {
+      const error = new Error("Cannot find module '" + id + "'");
+      error.code = "MODULE_NOT_FOUND";
+      throw error;
+    }
+
+    return this._resolveCacheStore(id, parentPath, resolved.id);
   }
 
   require(id, parentPath) {
@@ -878,11 +884,6 @@ export class PackageSourceBatch {
       targetArch: this.processor.arch,
       extensions: this.importExtensions,
       nodeModulesPaths,
-      onMissing(id) {
-        const error = new Error("Cannot find module '" + id + "'");
-        error.code = "MODULE_NOT_FOUND";
-        throw error;
-      }
     });
   }
 
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 8c83e7543f..ed8bb8efbe 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -126,10 +126,6 @@ export default class ImportScanner {
       extensions,
       nodeModulesPaths,
 
-      onMissing(id, parentPath) {
-        return scanner._onMissing(id, parentPath);
-      },
-
       statOrNull(absPath) {
         const file = scanner._getFile(absPath);
         if (file) {
@@ -457,6 +453,22 @@ export default class ImportScanner {
     return result;
   }
 
+  _resolve(id, absPath) {
+    const resolved = this.resolver.resolve(id, absPath);
+
+    if (resolved === "missing") {
+      return this._onMissing(id, absPath);
+    }
+
+    if (resolved && resolved.packageJsonMap) {
+      each(resolved.packageJsonMap, (pkg, path) => {
+        this._addPkgJsonToOutput(path, pkg);
+      });
+    }
+
+    return resolved;
+  }
+
   _scanFile(file) {
     const absPath = pathJoin(this.sourceRoot, file.sourcePath);
 
@@ -475,17 +487,11 @@ export default class ImportScanner {
     }
 
     each(file.deps, (info, id) => {
-      const resolved = this.resolver.resolve(id, absPath);
+      const resolved = this._resolve(id, absPath);
       if (! resolved) {
         return;
       }
 
-      if (resolved.packageJsonMap) {
-        each(resolved.packageJsonMap, (pkg, path) => {
-          this._addPkgJsonToOutput(path, pkg);
-        });
-      }
-
       const absImportedPath = resolved.path;
 
       let depFile = this._getFile(absImportedPath);
@@ -721,7 +727,7 @@ export default class ImportScanner {
             parentFile.deps) {
           parentFile.deps[stubId] = parentFile.deps[id];
         }
-        return this.resolver.resolve(stubId, absParentPath);
+        return this._resolve(stubId, absParentPath);
       }
     }
 
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 6258764474..12de503bec 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -48,14 +48,12 @@ export default class Resolver {
     targetArch,
     extensions = [".js", ".json"],
     nodeModulesPaths = [],
-    onMissing,
     statOrNull = optimisticStatOrNull,
   }) {
     this.sourceRoot = sourceRoot;
     this.extensions = extensions;
     this.targetArch = targetArch;
     this.nodeModulesPaths = nodeModulesPaths;
-    this.onMissing = onMissing;
     this.statOrNull = statOrNull;
 
     this._resolveCache = new Map;
@@ -92,6 +90,13 @@ export default class Resolver {
       this._resolveRelative(id, absParentPath) ||
       this._resolveNodeModule(id, absParentPath);
 
+    if (typeof resolved === "string") {
+      // The _resolveNodeModule method can return "missing" to indicate
+      // that the ImportScanner should look elsewhere for this module,
+      // such as in the app node_modules directory.
+      return byParentDir[absParentDir] = resolved;
+    }
+
     while (resolved && resolved.stat.isDirectory()) {
       let dirPath = resolved.path;
       _seenDirPaths = _seenDirPaths || new Set;
@@ -231,10 +236,6 @@ export default class Resolver {
       });
     }
 
-    if (! resolved && isFunction(this.onMissing)) {
-      return this.onMissing(id, absParentPath);
-    }
-
     // If the dependency is still not resolved, it might be handled by the
     // fallback function defined in meteor/packages/modules/modules.js, or
     // it might be imported in code that will never run on this platform,
@@ -243,7 +244,7 @@ export default class Resolver {
     // dependencies here, we just don't have enough information to make
     // that determination until the code actually runs.
 
-    return resolved;
+    return resolved || "missing";
   }
 
   _readPkgJson(path) {

From d0f093413cbaff28d96ea0cc2c29101586ff4a71 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 3 Oct 2016 22:19:13 -0400
Subject: [PATCH 284/688] Use optimisticStatOrNull in tools/fs/watch.js.

---
 tools/fs/watch.js | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index 8624112402..348178e0a0 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -6,6 +6,7 @@ import {coalesce} from '../utils/func-utils.js';
 import {Profile} from '../tool-env/profile.js';
 
 import {
+  optimisticStatOrNull,
   optimisticReaddir,
   optimisticHashOrNull,
 } from "./optimistic.js";
@@ -279,22 +280,19 @@ export function readDirectory({absPath, include, exclude, names}) {
   // Add slashes to the end of directories.
   var contentsWithSlashes = [];
   _.each(contents, function (entry) {
-    try {
-      // We do stat instead of lstat here, so that we treat symlinks to
-      // directories just like directories themselves.
-      // XXX Does the treatment of symlinks make sense?
-      var stats = files.stat(files.pathJoin(absPath, entry));
-    } catch (e) {
-      if (e && (e.code === 'ENOENT')) {
-        // Disappeared after the readdir (or a dangling symlink)? Eh,
-        // pretend it was never there in the first place.
-        return;
-      }
-      throw e;
+    // We do stat instead of lstat here, so that we treat symlinks to
+    // directories just like directories themselves.
+    const stat = optimisticStatOrNull(files.pathJoin(absPath, entry));
+    if (! stat) {
+      // Disappeared after the readdir (or a dangling symlink)?
+      // Eh, pretend it was never there in the first place.
+      return;
     }
-    if (stats.isDirectory()) {
+
+    if (stat.isDirectory()) {
       entry += '/';
     }
+
     contentsWithSlashes.push(entry);
   });
 
@@ -592,16 +590,7 @@ export class Watcher {
     var self = this;
     var entry = self.watches[absPath];
     var lastStat = entry.lastStat;
-
-    try {
-      var stat = files.stat(absPath);
-    } catch (err) {
-      stat = null;
-      if (err.code !== "ENOENT") {
-        throw err;
-      }
-    }
-
+    var stat = optimisticStatOrNull(absPath);
     var mustNotExist = self._mustNotExist(absPath);
     var mustBeAFile = self._mustBeAFile(absPath);
 

From 9ecf3f2b509cce2fbc5ad1137fed52422a0b1225 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 11:50:03 -0400
Subject: [PATCH 285/688] Upgrade Node to 4.6.0 and npm to 3.10.8.

---
 History.md                         | 7 +++++++
 scripts/build-dev-bundle-common.sh | 4 ++--
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index ce5a62aa2a..ed93c7f288 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,12 @@
 ## v.NEXT
 
+## v1.4.1.2
+
+* Node has been upgraded to version 4.6.0, a recommended security release:
+  https://nodejs.org/en/blog/release/v4.6.0/
+
+* `npm` has been upgraded to version 3.10.8.
+
 ## v1.4.1.1
 
 * Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 5e2e858e55..b0807c45fb 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,8 +6,8 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.5.0
-NPM_VERSION=3.10.6
+NODE_VERSION=4.6.0
+NPM_VERSION=3.10.8
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 7daff12cda..2156c75fa0 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.6",
+    npm: "3.10.8",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.29",
     "meteor-babel": "0.12.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 61953f70d4..7b9823ef84 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,8 +2,8 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.5.0"
-$NPM_VERSION = "3.10.6"
+$NODE_VERSION = "4.6.0"
+$NPM_VERSION = "3.10.8"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists

From 595f67fda86ab127d3314755ef0ef132813cca95 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 11:50:23 -0400
Subject: [PATCH 286/688] Bump $BUNDLE_VERSION to 4.3.0 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 03d4169b23..f7e92d6cd0 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.2.9
+BUNDLE_VERSION=4.3.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 2937403be0166837e2d97d0bb7b27105e084cd4e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 12:07:55 -0400
Subject: [PATCH 287/688] Bump package versions for 1.4.1.2-rc.0 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-client/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/email/package.js                      | 2 +-
 packages/es5-shim/package.js                   | 2 +-
 packages/http/package.js                       | 2 +-
 packages/jshint/package.js                     | 2 +-
 packages/less/package.js                       | 2 +-
 packages/logging/package.js                    | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/meteor/package.js                     | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 4 ++--
 packages/npm-bcrypt/package.js                 | 2 +-
 packages/npm-mongo/package.js                  | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/static-html/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/templating/package.js                 | 2 +-
 packages/webapp/package.js                     | 2 +-
 packages/xmlbuilder/package.js                 | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 32 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 94daa41410..33a6dd7018 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1'
+  version: '6.9.1-1-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index a3a2050c94..0306f4533d 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11',
+  version: '0.1.11-1-rc.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index f9c2ac587b..15e2759521 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7',
+  version: '1.1.7-1-rc.0',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 3feb3ff339..a6135f5567 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4_1"
+  version: "1.2.4-2-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index d49ca97779..68dddb985a 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1',
+  version: '1.3.1-1-rc.0',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index e3c599d45d..727a154505 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10',
+  version: '1.3.10-1-rc.0',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 0174dcc23a..5278481e54 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14",
+  version: "0.3.14-1-rc.0",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 7643da24c9..e873c1baaf 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8',
+  version: '0.5.8-1-rc.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index bb30e9853e..9c37723794 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17"
+  version: "1.1.17-1-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index c7dcc696ab..40a7374a1e 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14",
+  version: "4.6.14-1-rc.0",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/http/package.js b/packages/http/package.js
index dd130ccb72..0844c6c948 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9'
+  version: '1.2.9-1-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 6527945fd5..a800dfd0a9 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6',
+  version: '1.1.6-1-rc.0',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index ac0a88c577..1b281bb0d5 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5',
+  version: '2.7.5-1-rc.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 567aa4d3a6..c10ce9ef3a 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15'
+  version: '1.1.15-1-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 0ac0d2148c..a3186a7564 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1_1'
+  version: '1.4.1-2-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 2941f35c7c..a1ee553bf0 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17'
+  version: '1.2.17-1-rc.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 93d75bd005..e8a5fbe261 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14"
+  version: "1.2.14-1-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b53c6ceb37..059d04fb72 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14"
+  version: "1.2.14-1-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index c18ad3de4d..4be251c9ca 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6",
+  version: "0.7.6-1-rc.0",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 69ac7073bc..620c0a928b 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6",
+  version: "0.7.6-1-rc.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 3e420265e4..310b2d3dc4 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12'
+  version: '1.1.12-1-rc.0'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@1.5.48', 'server');
+  api.use('npm-mongo@1.5.48-1-rc.0', 'server');
   api.use('allow-deny');
 
   api.use([
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index c6025af0c6..1d1585f956 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1",
+  version: "0.9.1-1-rc.0",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 86dab645cb..87586c8ebe 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.48',
+  version: '1.5.48-1-rc.0',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 9e4589b23f..7edb963fda 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4",
+  version: "0.8.4-1-rc.0",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index cf53e0e1c0..b1dacc94f3 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0',
+  version: '1.2.0-1-rc.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 72c501e663..d973f1660a 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0',
+  version: '1.2.0-1-rc.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 4efeb39971..13bb8df73e 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12',
+  version: '1.1.12-1-rc.0',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 8285d3017f..7f3ff4bae7 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5"
+  version: "2.513.5-1-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 2e23bd1c2a..05cd67dc45 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14'
+  version: '1.2.14-1-rc.0'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 6fcf9a54b8..e5178646e1 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11'
+  version: '1.3.11-1-rc.0'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 1caee9b139..66e7469d14 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14'
+  version: '2.5.14-1-rc.0'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 2a7ca869b9..934f0fb5e1 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1-rc.7",
+ "version": "1.4.1.2-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 1d74c0ce5e2134fbc58ba0aa77353fe1534f76bb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 12:44:28 -0400
Subject: [PATCH 288/688] Bump package versions for the official 1.4.1.2
 release.

---
 packages/babel-compiler/package.js         | 2 +-
 packages/babel-runtime/package.js          | 2 +-
 packages/caching-compiler/package.js       | 2 +-
 packages/coffeescript/package.js           | 2 +-
 packages/ddp-client/package.js             | 2 +-
 packages/ddp-server/package.js             | 2 +-
 packages/ecmascript-runtime/package.js     | 2 +-
 packages/ecmascript/package.js             | 2 +-
 packages/email/package.js                  | 2 +-
 packages/es5-shim/package.js               | 2 +-
 packages/http/package.js                   | 2 +-
 packages/jshint/package.js                 | 2 +-
 packages/less/package.js                   | 2 +-
 packages/logging/package.js                | 2 +-
 packages/meteor-tool/package.js            | 2 +-
 packages/meteor/package.js                 | 2 +-
 packages/minifier-css/package.js           | 2 +-
 packages/minifier-js/package.js            | 2 +-
 packages/modules-runtime/package.js        | 2 +-
 packages/modules/package.js                | 2 +-
 packages/mongo/package.js                  | 2 +-
 packages/npm-bcrypt/package.js             | 2 +-
 packages/npm-mongo/package.js              | 2 +-
 packages/promise/package.js                | 2 +-
 packages/standard-minifier-css/package.js  | 2 +-
 packages/standard-minifier-js/package.js   | 2 +-
 packages/static-html/package.js            | 2 +-
 packages/stylus/package.js                 | 2 +-
 packages/templating/package.js             | 2 +-
 packages/webapp/package.js                 | 2 +-
 packages/xmlbuilder/package.js             | 2 +-
 scripts/admin/meteor-release-official.json | 4 ++--
 32 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 33a6dd7018..55aa60f64b 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.1-1-rc.0'
+  version: '6.9.1_1'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 0306f4533d..297d5a5183 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.11-1-rc.0',
+  version: '0.1.11_1',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 15e2759521..d7d0166791 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.7-1-rc.0',
+  version: '1.1.7_1',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index a6135f5567..dcfcec2264 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.4-2-rc.0"
+  version: "1.2.4_2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 68dddb985a..ea71593dc9 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.1-1-rc.0',
+  version: '1.3.1_1',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 727a154505..8164390a88 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.10-1-rc.0',
+  version: '1.3.10_1',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 5278481e54..9518fcc111 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.14-1-rc.0",
+  version: "0.3.14_1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index e873c1baaf..61059cbd1d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.8-1-rc.0',
+  version: '0.5.8_1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/email/package.js b/packages/email/package.js
index 9c37723794..731edd87b0 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.17-1-rc.0"
+  version: "1.1.17_1"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 40a7374a1e..f3f318fe1a 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.14-1-rc.0",
+  version: "4.6.14_1",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/http/package.js b/packages/http/package.js
index 0844c6c948..9d676a16ae 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.9-1-rc.0'
+  version: '1.2.9_1'
 });
 
 Npm.depends({
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index a800dfd0a9..d27523098c 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6-1-rc.0',
+  version: '1.1.6_1',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 1b281bb0d5..11cb834139 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.5-1-rc.0',
+  version: '2.7.5_1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/logging/package.js b/packages/logging/package.js
index c10ce9ef3a..3e23cb9ef4 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.15-1-rc.0'
+  version: '1.1.15_1'
 });
 
 Npm.depends({
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index a3186a7564..764cc54fe4 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-2-rc.0'
+  version: '1.4.1_2'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index a1ee553bf0..67cf28d435 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.17-1-rc.0'
+  version: '1.2.17_1'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index e8a5fbe261..6127e0c540 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.14-1-rc.0"
+  version: "1.2.14_1"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 059d04fb72..c4feaa0cce 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.14-1-rc.0"
+  version: "1.2.14_1"
 });
 
 Npm.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 4be251c9ca..39fb3e6139 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.6-1-rc.0",
+  version: "0.7.6_1",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 620c0a928b..d99217c7b1 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.6-1-rc.0",
+  version: "0.7.6_1",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 310b2d3dc4..5af9494d1f 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-1-rc.0'
+  version: '1.1.12_1'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 1d1585f956..79e184bf3b 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.1-1-rc.0",
+  version: "0.9.1_1",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 87586c8ebe..33c34710c2 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.48-1-rc.0',
+  version: '1.5.48_1',
   documentation: null
 });
 
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 7edb963fda..e7b9b2a4ca 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.4-1-rc.0",
+  version: "0.8.4_1",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index b1dacc94f3..40e9dddfa7 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.0-1-rc.0',
+  version: '1.2.0_1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index d973f1660a..96eda1b389 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0-1-rc.0',
+  version: '1.2.0_1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 13bb8df73e..04e9441c30 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.1.12-1-rc.0',
+  version: '1.1.12_1',
   // Brief, one-line summary of the package.
   summary: 'Define static page content in .html files',
   git: 'https://github.com/meteor/meteor',
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 7f3ff4bae7..6f63dadec7 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.5-1-rc.0"
+  version: "2.513.5_1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 05cd67dc45..f32ab9f5fc 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allows templates to be defined in .html files",
-  version: '1.2.14-1-rc.0'
+  version: '1.2.14_1'
 });
 
 // Today, this package is closely intertwined with Handlebars, meaning
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index e5178646e1..39f3567481 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.11-1-rc.0'
+  version: '1.3.11_1'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 66e7469d14..bd621c5e19 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.14-1-rc.0'
+  version: '2.5.14_1'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 3f211afbdd..34188e3837 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,8 +1,8 @@
 {
   "track": "METEOR",
-  "version": "1.4.1.1",
+  "version": "1.4.1.2",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution",
-  "patchFrom": ["1.4.1"]
+  "patchFrom": ["1.4.1.1"]
 }

From dd3d4363b7f60455183956844632cda0ae34996f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 12:59:16 -0400
Subject: [PATCH 289/688] Use optimistic wapper for Resolver#resolve instead of
 _resolveCache.

---
 tools/isobuild/resolver.js | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 12de503bec..0381540944 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -16,6 +16,7 @@ import {
   convertToPosixPath,
 } from "../fs/files.js";
 
+import { wrap } from "optimism";
 import {
   optimisticStatOrNull,
   optimisticReadFile,
@@ -56,7 +57,14 @@ export default class Resolver {
     this.nodeModulesPaths = nodeModulesPaths;
     this.statOrNull = statOrNull;
 
-    this._resolveCache = new Map;
+    this.resolve = wrap((id, absParentPath) => {
+      return this._resolve(id, absParentPath);
+    }, {
+      makeCacheKey(id, absParentPath) {
+        // Only the directory of the absParentPath matters for caching.
+        return JSON.stringify([id, pathDirname(absParentPath)]);
+      }
+    });
   }
 
   static isTopLevel(id) {
@@ -74,17 +82,7 @@ export default class Resolver {
   // Resolve the given module identifier to an object { path, stat } or
   // null, relative to an absolute parent path. The _seenDirPaths
   // parameter is for internal use only and should be ommitted.
-  resolve(id, absParentPath, _seenDirPaths) {
-    if (! this._resolveCache.has(id)) {
-      this._resolveCache.set(id, Object.create(null));
-    }
-
-    const byParentDir = this._resolveCache.get(id);
-    const absParentDir = pathDirname(absParentPath);
-    if (has(byParentDir, absParentDir)) {
-      return byParentDir[absParentDir];
-    }
-
+  _resolve(id, absParentPath, _seenDirPaths) {
     let resolved =
       this._resolveAbsolute(id, absParentPath) ||
       this._resolveRelative(id, absParentPath) ||
@@ -94,7 +92,7 @@ export default class Resolver {
       // The _resolveNodeModule method can return "missing" to indicate
       // that the ImportScanner should look elsewhere for this module,
       // such as in the app node_modules directory.
-      return byParentDir[absParentDir] = resolved;
+      return resolved;
     }
 
     while (resolved && resolved.stat.isDirectory()) {
@@ -132,7 +130,7 @@ export default class Resolver {
       );
     }
 
-    return byParentDir[absParentDir] = resolved;
+    return resolved;
   }
 
   _joinAndStat(...joinArgs) {
@@ -292,7 +290,7 @@ export default class Resolver {
       // the directory path before falling back to a full resolve, which
       // might return a package from a node_modules directory.
       const resolved = this._joinAndStat(dirPath, main) ||
-        this.resolve(main, pkgJsonPath, _seenDirPaths);
+        this._resolve(main, pkgJsonPath, _seenDirPaths);
 
       if (resolved) {
         if (! resolved.packageJsonMap) {

From 21b4c664f41a3d014b679f3616a59c1baf18ea19 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 13:06:22 -0400
Subject: [PATCH 290/688] Cache Resolver objects by their constructor
 arguments.

This is critical because it means Resolver objects can now survive
development server restarts, which means the optimistic Resolver#resolve
method can remember results indefinitely. Thanks to this change, the
Resolver#resolve method has practically disappeared from rebuild
performance profiles.
---
 tools/isobuild/compiler-plugin.js |  2 +-
 tools/isobuild/import-scanner.js  |  2 +-
 tools/isobuild/resolver.js        | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index c70e1d02db..edfc7f3755 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -879,7 +879,7 @@ export class PackageSourceBatch {
       }
     });
 
-    return this._resolver = new Resolver({
+    return this._resolver = Resolver.getOrCreate({
       sourceRoot: this.sourceRoot,
       targetArch: this.processor.arch,
       extensions: this.importExtensions,
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index ed8bb8efbe..af0c72355f 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -120,7 +120,7 @@ export default class ImportScanner {
     this.allMissingNodeModules = Object.create(null);
     this.outputFiles = [];
 
-    this.resolver = new Resolver({
+    this.resolver = Resolver.getOrCreate({
       sourceRoot,
       targetArch: bundleArch,
       extensions,
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 0381540944..bcd9abb18b 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -16,6 +16,8 @@ import {
   convertToPosixPath,
 } from "../fs/files.js";
 
+import LRU from "lru-cache";
+
 import { wrap } from "optimism";
 import {
   optimisticStatOrNull,
@@ -43,7 +45,20 @@ nativeNames.forEach(id => {
   nativeModulesMap[id] =  "meteor-node-stubs/deps/" + id;
 });
 
+const resolverCache = new LRU({
+  max: Math.pow(2, 12)
+});
+
 export default class Resolver {
+  static getOrCreate(options) {
+    const key = JSON.stringify(options);
+    let resolver = resolverCache.get(key);
+    if (! resolver) {
+      resolverCache.set(key, resolver = new Resolver(options));
+    }
+    return resolver;
+  }
+
   constructor({
     sourceRoot,
     targetArch,

From 5c9d72450d8a819dfce1ac8a3862431916ae4a61 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 15:18:37 -0400
Subject: [PATCH 291/688] Watch package.json files reported from
 Resolver#resolve.

This change should mitigate any regressions from my earlier commit
97ca5f1836646670629fde92fa993e021a89c5f2.
---
 tools/isobuild/import-scanner.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index af0c72355f..b21cf36146 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -785,6 +785,11 @@ export default class ImportScanner {
       };
 
       this._addFile(pkgJsonPath, pkgFile);
+
+      this.watchSet.addFile(
+        pkgJsonPath,
+        optimisticHashOrNull(pkgJsonPath),
+      );
     }
   }
 }

From 339ccc9db37434b6c43276315a607bc79fe8ac86 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 17:15:25 -0400
Subject: [PATCH 292/688] Fix tests by not watching package.json files if hash
 is null.

---
 tools/isobuild/import-scanner.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index b21cf36146..d9a1036b3f 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -786,10 +786,10 @@ export default class ImportScanner {
 
       this._addFile(pkgJsonPath, pkgFile);
 
-      this.watchSet.addFile(
-        pkgJsonPath,
-        optimisticHashOrNull(pkgJsonPath),
-      );
+      const hash = optimisticHashOrNull(pkgJsonPath);
+      if (hash) {
+        this.watchSet.addFile(pkgJsonPath, hash);
+      }
     }
   }
 }

From 1d64cf6f612b9c152a402566e196c7229c0cce26 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 18:34:28 -0400
Subject: [PATCH 293/688] Attempt to fix Travis CI tests.

---
 .travis.yml                     | 1 -
 packages/test-in-console/run.sh | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d172d1e022..e943bf20c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ node_js:
   - "4.0"
 cache:
   directories:
-    - "dev_bundle"
     - ".meteor"
     - ".babel-cache"
 script: TEST_PACKAGES_EXCLUDE="less" ./packages/test-in-console/run.sh
diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index c6e005a5b6..8bff4bb0a1 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -7,6 +7,9 @@ export METEOR_HOME=`pwd`
 # Clear dev_bundle/.npm to ensure consistent test runs.
 ./meteor npm cache clear
 
+# Just in case these packages haven't been installed elsewhere.
+./meteor npm install -g phantomjs-prebuilt browserstack-webdriver
+
 export PATH=$METEOR_HOME:$PATH
 # synchronously get the dev bundle and NPM modules if they're not there.
 ./meteor --get-ready || exit 1
@@ -17,7 +20,7 @@ exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclud
 EXEC_PID=$!
 
 sed '/test-in-console listening$/q' <&3
-phantomjs $METEOR_HOME/packages/test-in-console/runner.js
+./dev_bundle/bin/phantomjs "$METEOR_HOME/packages/test-in-console/runner.js"
 STATUS=$?
 
 pkill -TERM -P $EXEC_PID

From a421da5a5e64c09fa37b2eb439c8e6d37192e7b7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 18:53:36 -0400
Subject: [PATCH 294/688] Use console.log to print test-in-console listening
 message.

---
 packages/test-in-console/package.js  |  2 +-
 packages/test-in-console/reporter.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 3f6a67482e..e521bfd1cb 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.12'
+  version: '1.0.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-console/reporter.js b/packages/test-in-console/reporter.js
index 5f12d912f9..54c95f3a02 100644
--- a/packages/test-in-console/reporter.js
+++ b/packages/test-in-console/reporter.js
@@ -1,3 +1,10 @@
+// provide some notification we're started. This is to allow use
+// in automated scripts with `meteor run --once` which does not
+// print when the proxy is listening.
+Meteor.startup(function () {
+  console.log("test-in-console listening");
+});
+
 // A hacky way to extract the phantom runner script from the package.
 if (process.env.WRITE_RUNNER_JS) {
   Npm.require('fs').writeFileSync(
@@ -26,10 +33,3 @@ Meteor.methods({
     return null;
   }
 });
-
-// provide some notification we're started. This is to allow use
-// in automated scripts with `meteor run --once` which does not
-// print when the proxy is listening.
-Meteor.startup(function () {
-  Meteor._debug("test-in-console listening");
-});

From 0713b9d153b11679e5185f3a45e66030954ed893 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Oct 2016 20:09:45 -0400
Subject: [PATCH 295/688] Wait for "=> App running at:" in
 packages/test-in-console/run.sh.

For some unknown reason, the "test-in-console listening" message is not
being printed to STDOUT when this script runs on Travis CI any more. We
should investigate why that is, but it's important to get these tests
running (and passing) again.
---
 packages/test-in-console/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index 8bff4bb0a1..ca965cb18f 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -19,7 +19,7 @@ export URL='http://localhost:4096/'
 exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''})
 EXEC_PID=$!
 
-sed '/test-in-console listening$/q' <&3
+sed '/^=> App running at:/q' <&3
 ./dev_bundle/bin/phantomjs "$METEOR_HOME/packages/test-in-console/runner.js"
 STATUS=$?
 

From 76903f0cfc95822c6b37fe0827673bba081ee728 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 13:53:02 -0400
Subject: [PATCH 296/688] Add a failing test to the logging package.

This test case currently fails because the `cli-color` npm package cannot
be required, which means all colorized logging messages printed by the app
will throw in the eachline callback(s) in AppProcess#start, which breaks
virtually any test that waits for an app to print a ready message.
---
 packages/logging/logging_test.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/logging/logging_test.js b/packages/logging/logging_test.js
index 144dce4798..3f569b3916 100644
--- a/packages/logging/logging_test.js
+++ b/packages/logging/logging_test.js
@@ -190,4 +190,12 @@ Tinytest.add("logging - format", function (test) {
       Log.format({message: "message", time: time, level: level, file: "app.js", line: 42}),
       level.charAt(0).toUpperCase() + '20120908-07:06:05.004' + utcOffsetStr + ' (app.js:42) message');
   });
+
+  test.matches(Log.format({
+    message: "oyez",
+    time: new Date,
+    level: "error"
+  }, {
+    color: true
+  }), /oyez/);
 });

From bcc5f7ff972406ec0faa96428d3a44b413f6a397 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 14:46:12 -0400
Subject: [PATCH 297/688] Avoid dropping package.json files when "main" names a
 directory.

An example of an npm package that triggers this bug is the `cli-color`
package, which has a package.json file with a "main" property whose value
is "lib", and a "lib" directory that contains an index.js file.
---
 tools/isobuild/resolver.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index bcd9abb18b..f569b82365 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -110,6 +110,8 @@ export default class Resolver {
       return resolved;
     }
 
+    let packageJsonMap = null;
+
     while (resolved && resolved.stat.isDirectory()) {
       let dirPath = resolved.path;
       _seenDirPaths = _seenDirPaths || new Set;
@@ -122,8 +124,17 @@ export default class Resolver {
         resolved = this._resolvePkgJsonMain(dirPath, _seenDirPaths);
         if (resolved) {
           // The _resolvePkgJsonMain call above may have returned a
-          // directory, so continue the loop to make sure we fully resolve
-          // it to a non-directory.
+          // directory, so first merge resolved.packageJsonMap into
+          // packageJsonMap so that we don't forget the package.json we
+          // just resolved, then continue the loop to make sure we fully
+          // resolve the "main" module identifier to a non-directory.
+          // Technically this could involve even more package.json files,
+          // but in practice the "main" property will almost always name a
+          // directory containing an index.js file.
+          Object.assign(
+            packageJsonMap || (packageJsonMap = Object.create(null)),
+            resolved.packageJsonMap,
+          );
           continue;
         }
       }
@@ -139,6 +150,10 @@ export default class Resolver {
     }
 
     if (resolved) {
+      if (packageJsonMap) {
+        resolved.packageJsonMap = packageJsonMap;
+      }
+
       resolved.id = convertToPosixPath(
         convertToOSPath(resolved.path),
         true

From 3fffb9bebc9ab6c93ee565826ed2da758e2c8f1c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 14:58:29 -0400
Subject: [PATCH 298/688] Revert unnecessary commits attempting to fix
 Travis/Circle CI tests.

After much debugging, I have tracked down and fixed the root cause of the
test failures: colorized app output was silenced because the Log.format
function could not require("cli-color").

Revert "Wait for "=> App running at:" in packages/test-in-console/run.sh."
This reverts commit 0713b9d153b11679e5185f3a45e66030954ed893.

Revert "Use console.log to print test-in-console listening message."
This reverts commit a421da5a5e64c09fa37b2eb439c8e6d37192e7b7.
---
 packages/test-in-console/package.js  |  2 +-
 packages/test-in-console/reporter.js | 14 +++++++-------
 packages/test-in-console/run.sh      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index e521bfd1cb..3f6a67482e 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13'
+  version: '1.0.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-console/reporter.js b/packages/test-in-console/reporter.js
index 54c95f3a02..5f12d912f9 100644
--- a/packages/test-in-console/reporter.js
+++ b/packages/test-in-console/reporter.js
@@ -1,10 +1,3 @@
-// provide some notification we're started. This is to allow use
-// in automated scripts with `meteor run --once` which does not
-// print when the proxy is listening.
-Meteor.startup(function () {
-  console.log("test-in-console listening");
-});
-
 // A hacky way to extract the phantom runner script from the package.
 if (process.env.WRITE_RUNNER_JS) {
   Npm.require('fs').writeFileSync(
@@ -33,3 +26,10 @@ Meteor.methods({
     return null;
   }
 });
+
+// provide some notification we're started. This is to allow use
+// in automated scripts with `meteor run --once` which does not
+// print when the proxy is listening.
+Meteor.startup(function () {
+  Meteor._debug("test-in-console listening");
+});
diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index ca965cb18f..8bff4bb0a1 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -19,7 +19,7 @@ export URL='http://localhost:4096/'
 exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''})
 EXEC_PID=$!
 
-sed '/^=> App running at:/q' <&3
+sed '/test-in-console listening$/q' <&3
 ./dev_bundle/bin/phantomjs "$METEOR_HOME/packages/test-in-console/runner.js"
 STATUS=$?
 

From cc9882b12df15488a8ff0229a5514a2c43281028 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Sun, 2 Oct 2016 17:43:20 -0700
Subject: [PATCH 299/688] Update cordova-lib in dev bundle to 6.3.1

---
 scripts/dev-bundle-tool-package.js |  2 +-
 scripts/generate-dev-bundle.sh     |  1 -
 tools/cordova/index.js             |  2 +-
 tools/cordova/project.js           | 14 ++++++++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 83573353b0..d2ceceb8b6 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -54,7 +54,7 @@ var packageJson = {
     pathwatcher: "6.7.1",
     optimism: "0.2.2",
     'lru-cache': '4.0.1',
-    'cordova-lib': "6.0.0",
+    'cordova-lib': "6.3.1",
     longjohn: '0.2.11'
   }
 };
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index d37a3e1f04..fbc8d0756d 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -131,7 +131,6 @@ delete sqlite3/node_modules/nan
 delete sqlite3/node_modules/node-pre-gyp
 delete wordwrap/test
 delete moment/min
-delete cordova-app-hello-world
 
 # Remove esprima tests to reduce the size of the dev bundle
 find . -path '*/esprima-fb/test' | xargs rm -rf
diff --git a/tools/cordova/index.js b/tools/cordova/index.js
index dfe118914f..bce7981462 100644
--- a/tools/cordova/index.js
+++ b/tools/cordova/index.js
@@ -4,7 +4,7 @@ import utils from '../utils/utils.js';
 import buildmessage from '../utils/buildmessage.js';
 
 import { oldToNew as oldToNewPluginIds, newToOld as newToOldPluginIds }
-  from 'cordova-lib/node_modules/cordova-registry-mapper';
+  from 'cordova-registry-mapper';
 
 export const CORDOVA_ARCH = "web.cordova";
 
diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index aee36dceea..0dd9757cc2 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -16,8 +16,8 @@ import './protect-string-proto.js'; // must always come before 'cordova-lib'
 import { cordova as cordova_lib, events as cordova_events, CordovaError }
   from 'cordova-lib';
 import cordova_util from 'cordova-lib/src/cordova/util.js';
-import superspawn from 'cordova-lib/node_modules/cordova-common/src/superspawn.js';
-import PluginInfoProvider from 'cordova-lib/node_modules/cordova-common/src/PluginInfo/PluginInfoProvider.js';
+import superspawn from 'cordova-common/src/superspawn.js';
+import PluginInfoProvider from 'cordova-common/src/PluginInfo/PluginInfoProvider.js';
 
 import { CORDOVA_PLATFORMS, CORDOVA_PLATFORM_VERSIONS, displayNameForPlatform, displayNamesForPlatforms,
   newPluginId, convertPluginVersions, convertToGitUrl } from './index.js';
@@ -152,8 +152,14 @@ outdated platforms`);
       // Create the Cordova project root directory
       files.mkdir_p(files.pathDirname(this.projectRoot));
 
-      const config = { lib:
-        { www: { url: files.convertToOSPath(templatePath) } } };
+      const config = {
+        lib: {
+          www: {
+            url: files.convertToOSPath(templatePath),
+            template: true
+          }
+        }
+      };
 
       // Don't set cwd to project root in runCommands because it doesn't
       // exist yet

From 6322a55985c8b25483a3443f848640cdfc837cc7 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Sun, 2 Oct 2016 17:43:45 -0700
Subject: [PATCH 300/688] Update cordova-ios and cordova-android to latest
 versions

---
 tools/cordova/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cordova/index.js b/tools/cordova/index.js
index bce7981462..3dbf74f9f1 100644
--- a/tools/cordova/index.js
+++ b/tools/cordova/index.js
@@ -11,8 +11,8 @@ export const CORDOVA_ARCH = "web.cordova";
 export const CORDOVA_PLATFORMS = ['ios', 'android'];
 
 export const CORDOVA_PLATFORM_VERSIONS = {
-  'android': '5.1.1',
-  'ios': '4.1.0'
+  'android': '5.2.2',
+  'ios': '4.2.1'
 };
 
 const PLATFORM_TO_DISPLAY_NAME_MAP = {

From 458c5b40f05ca3a81622dee394148970393ed33a Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Sun, 2 Oct 2016 17:44:34 -0700
Subject: [PATCH 301/688] Update Cordova pinned plugin versions and
 dependencies to latest versions

---
 packages/launch-screen/package.js     |  2 +-
 packages/logging/package.js           |  2 +-
 packages/mobile-status-bar/package.js |  2 +-
 packages/oauth/package.js             |  2 +-
 packages/webapp/package.js            |  4 +--
 tools/cordova/project.js              | 43 ++++++++++++++-------------
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 56f5695b4b..ec4ecadce0 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Cordova.depends({
-  'cordova-plugin-splashscreen': '3.2.1'
+  'cordova-plugin-splashscreen': '4.0.0'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 6821fe4c98..c59705221b 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -12,7 +12,7 @@ Npm.strip({
 });
 
 Cordova.depends({
-  'cordova-plugin-console': '1.0.2'
+  'cordova-plugin-console': '1.0.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 29e918a331..91dff6fc0c 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -4,5 +4,5 @@ Package.describe({
 });
 
 Cordova.depends({
-  'cordova-plugin-statusbar': '2.1.2'
+  'cordova-plugin-statusbar': '2.2.0'
 });
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 3ebf01bfb5..059d04b1d3 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -57,5 +57,5 @@ Package.onTest(function (api) {
 });
 
 Cordova.depends({
-  'cordova-plugin-inappbrowser': '1.3.0'
+  'cordova-plugin-inappbrowser': '1.5.0'
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 4883472e13..e9236b1b8e 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -14,9 +14,9 @@ Npm.strip({
 });
 
 Cordova.depends({
-  'cordova-plugin-whitelist': '1.2.1',
-  'cordova-plugin-wkwebview-engine': '1.0.2',
   'cordova-plugin-meteor-webapp': '1.3.0'
+  'cordova-plugin-whitelist': '1.3.0',
+  'cordova-plugin-wkwebview-engine': '1.1.0',
 });
 
 Package.onUse(function (api) {
diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index 0dd9757cc2..03d85c4806 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -51,28 +51,29 @@ const pinnedPlatformVersions = CORDOVA_PLATFORM_VERSIONS;
 // Versions are taken from cordova-lib's package.json and should be updated
 // when we update to a newer version of cordova-lib.
 const pinnedPluginVersions = {
-  "cordova-plugin-battery-status": "1.1.1",
-  "cordova-plugin-camera": "2.1.1",
-  "cordova-plugin-console": "1.0.2",
-  "cordova-plugin-contacts": "2.0.1",
-  "cordova-plugin-device": "1.1.1",
-  "cordova-plugin-device-motion": "1.2.0",
-  "cordova-plugin-device-orientation": "1.0.2",
-  "cordova-plugin-dialogs": "1.2.0",
-  "cordova-plugin-file": "4.1.1",
-  "cordova-plugin-file-transfer": "1.5.0",
-  "cordova-plugin-geolocation": "2.1.0",
-  "cordova-plugin-globalization": "1.0.3",
-  "cordova-plugin-inappbrowser": "1.3.0",
+  "cordova-plugin-battery-status": "1.2.0",
+  "cordova-plugin-camera": "2.3.0",
+  "cordova-plugin-console": "1.0.4",
+  "cordova-plugin-contacts": "2.2.0",
+  "cordova-plugin-device": "1.1.3",
+  "cordova-plugin-device-motion": "1.2.2",
+  "cordova-plugin-device-orientation": "1.0.4",
+  "cordova-plugin-dialogs": "1.3.0",
+  "cordova-plugin-file": "4.3.0",
+  "cordova-plugin-file-transfer": "1.6.0",
+  "cordova-plugin-geolocation": "2.3.0",
+  "cordova-plugin-globalization": "1.0.4",
+  "cordova-plugin-inappbrowser": "1.5.0",
   "cordova-plugin-legacy-whitelist": "1.1.1",
-  "cordova-plugin-media": "2.2.0",
-  "cordova-plugin-media-capture": "1.2.0",
-  "cordova-plugin-network-information": "1.2.0",
-  "cordova-plugin-splashscreen": "3.2.1",
-  "cordova-plugin-statusbar": "2.1.2",
-  "cordova-plugin-test-framework": "1.1.1",
-  "cordova-plugin-vibration": "2.1.0",
-  "cordova-plugin-whitelist": "1.2.1"
+  "cordova-plugin-media": "2.4.0",
+  "cordova-plugin-media-capture": "1.4.0",
+  "cordova-plugin-network-information": "1.3.0",
+  "cordova-plugin-splashscreen": "4.0.0",
+  "cordova-plugin-statusbar": "2.2.0",
+  "cordova-plugin-test-framework": "1.1.3",
+  "cordova-plugin-vibration": "2.1.2",
+  "cordova-plugin-whitelist": "1.3.0",
+  "cordova-plugin-wkwebview-engine": "1.1.0"
 }
 
 export class CordovaProject {

From f574b46adceab1db52cd6bcb9ce6086880048ba2 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Sun, 2 Oct 2016 17:44:48 -0700
Subject: [PATCH 302/688] Update Crosswalk plugin to latest version

---
 packages/crosswalk/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 2af0fe2352..eaa4c6538f 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -6,5 +6,5 @@ instead of the System WebView on Android",
 });
 
 Cordova.depends({
-  'cordova-plugin-crosswalk-webview': '1.6.0'
+  'cordova-plugin-crosswalk-webview': '2.1.0'
 });

From e8b1126ad4e0b435007fa9a9b6c56cfb0f57b5f8 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Sun, 2 Oct 2016 21:23:57 -0700
Subject: [PATCH 303/688] Add temporary workaround for cordova-ios bug

---
 tools/cordova/project.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index 03d85c4806..424e5e1d2c 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -218,6 +218,13 @@ outdated platforms`);
   prepareForPlatform(platform) {
     assert(platform);
 
+    // Temporary workaround for Cordova iOS bug until
+    // https://issues.apache.org/jira/browse/CB-11731 has been released
+    delete require.cache[files.pathJoin(this.projectRoot,
+      'platforms/ios/cordova/lib/configMunger.js')];
+    delete require.cache[files.pathJoin(this.projectRoot,
+      'platforms/ios/cordova/lib/prepare.js')];
+
     const commandOptions = _.extend(this.defaultOptions,
       { platforms: [platform] });
 

From e9aa8082dc190fdebcc0e2928ae4b265b7ba4110 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Mon, 3 Oct 2016 02:11:00 -0700
Subject: [PATCH 304/688] Update cordova-plugin-meteor-webapp dependency to
 1.4.0

---
 packages/webapp/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index e9236b1b8e..b883acdbd5 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -14,9 +14,9 @@ Npm.strip({
 });
 
 Cordova.depends({
-  'cordova-plugin-meteor-webapp': '1.3.0'
   'cordova-plugin-whitelist': '1.3.0',
   'cordova-plugin-wkwebview-engine': '1.1.0',
+  'cordova-plugin-meteor-webapp': '1.4.0'
 });
 
 Package.onUse(function (api) {

From 6b0fc9110b6e5fe4b4469f37910fbe109959e858 Mon Sep 17 00:00:00 2001
From: Martijn Walraven <martijn@martijnwalraven.com>
Date: Mon, 3 Oct 2016 02:46:17 -0700
Subject: [PATCH 305/688] Update cordova-plugin-meteor-webapp dependency to
 1.4.1

---
 packages/webapp/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index b883acdbd5..ade3e36a58 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -16,7 +16,7 @@ Npm.strip({
 Cordova.depends({
   'cordova-plugin-whitelist': '1.3.0',
   'cordova-plugin-wkwebview-engine': '1.1.0',
-  'cordova-plugin-meteor-webapp': '1.4.0'
+  'cordova-plugin-meteor-webapp': '1.4.1'
 });
 
 Package.onUse(function (api) {

From 95286804fe36b30665e789292b3cfc8bc1fc7261 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 16:12:09 -0400
Subject: [PATCH 306/688] Bump $BUNDLE_VERSION to 4.3.2 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 9a0e4bd8ff..29e4d35209 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.1
+BUNDLE_VERSION=4.3.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From a6269c3c740d6be0c4a50282170348a91fe7e9a1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 16:16:55 -0400
Subject: [PATCH 307/688] Add a note to History.md about Cordova updates.

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 834110f979..47cefd9a23 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,9 @@
   much more quickly, especially if you have many `node_modules` files.
   See https://github.com/meteor/meteor/pull/7668 for more details.
 
+* The `cordova-lib` npm package has been updated to 6.3.1, along with
+  cordova-android (5.2.2) and cordova-ios (4.2.1), and various plugins.
+
 * The `node-pre-gyp` npm package has been updated to 0.6.30.
 
 * The `fibers` npm package has been updated to 1.0.14.

From 2ec570251a2e409488a0102116717e325c30626d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 17:13:14 -0400
Subject: [PATCH 308/688] Stop generating identity source maps for files
 without actual source maps.

This speeds up both getPrelinkedOutput (because we don't spend any time
generating the identity source map) and toStringWithSourceMap (because we
don't have to combine those source maps).

We still generate line number comments for files without source maps, so
it's relatively easy to find the source line for a stack trace.
---
 tools/isobuild/compiler-plugin.js |  2 +-
 tools/isobuild/compiler.js        |  2 +-
 tools/isobuild/linker.js          | 36 ++-----------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index edfc7f3755..f51dbbfdfc 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -59,7 +59,7 @@ import { isTestFilePath } from './test-files.js';
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 9; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 10; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index b67faf82db..eeb1643166 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -34,7 +34,7 @@ var compiler = exports;
 // dependencies. (At least for now, packages only used in target creation (eg
 // minifiers) don't require you to update BUILT_BY, though you will need to quit
 // and rerun "meteor run".)
-compiler.BUILT_BY = 'meteor/22';
+compiler.BUILT_BY = 'meteor/23';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 823aa584e1..d04817177a 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -610,47 +610,15 @@ _.extend(File.prototype, {
 
       consumer = new sourcemap.SourceMapConsumer(result.map);
 
-    } else if (noLineNumbers && preserveLineNumbers) {
-      // No need to generate a source map if we don't want line numbers.
-      result = {
-        code: self.source,
-        map: null
-      };
-
     } else {
-      // If we're planning to annotate the source with line number
-      // comments (e.g. because we're combining this file with others in a
-      // package), and we don't already have a source map, then we need to
-      // generate one, but it doesn't have to be very detailed, since we
-      // we can use a dumb implementation of originalPositionFor.
-      const smg = new sourcemap.SourceMapGenerator({
-        file: self.servePath
-      });
-
-      lines = self.source.split(/\r?\n/);
-
-      function addIdentityMapping(pos) {
-        smg.addMapping({
-          original: pos,
-          generated: pos,
-          source: self.servePath,
-        });
-      }
-
-      for (var line = 1; line <= lines.length; ++line) {
-        addIdentityMapping({ line, column: 0 });
-      }
-
-      smg.setSourceContent(self.servePath, self.source);
-
       result = {
         code: self.source,
-        map: smg.toJSON(),
+        map: null,
       };
 
       // Generating line number comments for really big files is not
       // really worth it when there's no meaningful self.sourceMap.
-      if (self.source.length < 500000) {
+      if (! noLineNumbers && result.code.length < 500000) {
         consumer = {
           originalPositionFor(pos) {
             return pos;

From c74a95c0b879f131a607277f53651a52e83aa52d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 17:41:32 -0400
Subject: [PATCH 309/688] Clean up findAssignedGlobals caching.

Two mistakes: we were maintaining two redundant caches for
findAssignedGlobals, and callings tryToParse before checking globalsCache,
when often globalsCache already had a stored result.
---
 tools/isobuild/js-analyze.js |  4 ++--
 tools/isobuild/linker.js     | 16 +---------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index bfe4156722..e95b1a788b 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -228,12 +228,12 @@ const globalsCache = new LRU({
 });
 
 export function findAssignedGlobals(source, hash) {
-  const ast = tryToParse(source, hash);
-
   if (hash && globalsCache.has(hash)) {
     return globalsCache.get(hash);
   }
 
+  const ast = tryToParse(source, hash);
+
   // We have to pass ignoreEval; otherwise, the existence of a direct eval call
   // causes escope to not bother to resolve references in the eval's scope.
   // This is because an eval can pull references inward:
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index d04817177a..311451f386 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -453,15 +453,6 @@ var File = function (inputFile, module) {
   self.module = module;
 };
 
-// findAssignedGlobals is somewhat slow, and we often compute assigned variables
-// on the same file multiple times in one process (notably, a single file is
-// often processed for two or three different unibuilds, and is processed again
-// when rebuilding a package when another file has changed). We cache the
-// calculated variables under the source file's hash (calculating the source
-// file's hash is faster than running findAssignedGlobals, and in the case of
-// *.js files we have the hash already anyway).
-var ASSIGNED_GLOBALS_CACHE = {};
-
 _.extend(File.prototype, {
   // Return the globals in this file as an array of symbol names.  For
   // example: if the code references 'Foo.bar.baz' and 'Quux', and
@@ -470,13 +461,8 @@ _.extend(File.prototype, {
   computeAssignedVariables: Profile("linker File#computeAssignedVariables", function () {
     var self = this;
 
-    if (_.has(ASSIGNED_GLOBALS_CACHE, self.sourceHash)) {
-      return ASSIGNED_GLOBALS_CACHE[self.sourceHash];
-    }
-
     try {
-      return ASSIGNED_GLOBALS_CACHE[self.sourceHash] =
-        _.keys(findAssignedGlobals(self.source, self.sourceHash));
+      return _.keys(findAssignedGlobals(self.source, self.sourceHash));
     } catch (e) {
       if (!e.$ParseError) {
         throw e;

From 082bd48b025877e0ccce32f5530941956a1c5748 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 18:35:12 -0400
Subject: [PATCH 310/688] Shorten implicit description of Tracker package.

This tweak is intended to fix the following publish-release error:

  => Errors while publishing:

  While publishing package tracker:
  error: Longform package description is too long. Meteor uses the section of the Markdown documentation file between the first and second headings. That section must be less than 1500 characters long.
---
 packages/tracker/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/tracker/README.md b/packages/tracker/README.md
index f4f8fc50cd..6c7fb404c1 100644
--- a/packages/tracker/README.md
+++ b/packages/tracker/README.md
@@ -3,8 +3,9 @@
 ***
 
 Meteor Tracker is an incredibly tiny (~1k) but incredibly powerful
-library for **transparent reactive programming** in JavaScript. (It
-was previously called Deps.)
+library for **transparent reactive programming** in JavaScript.
+
+## Overview
 
 Tracker gives you much of the power of a full-blown
 [Functional Reactive Programming](http://en.wikipedia.org/wiki/Functional_reactive_programming) (FRP) system without requiring you to rewrite your program as a FRP data flow graph. Combined with Tracker-aware libraries, this lets you build complex event-driven programs without writing a lot of boilerplate event-handling code.

From 232ab2d20903df1b87317080d2c57a6835374b02 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 16:28:42 -0400
Subject: [PATCH 311/688] Bump package versions for 1.4.2-beta.9 release.

I had to scrap the 1.4.2-beta.8 release because meteor-tool@1.4.2-beta.8
got published by a partial run of the publish-release script, but then the
publish-release script thought meteor-tool changed after that, and I
didn't want to republish it as something like 1.4.2-1-beta.8.
---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-css/package.js             | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 59e13c1ebf..a73386b8fa 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.7"
+  version: "1.2.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 3df68c0fed..7e23b61a90 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 340afc3106..ca46f9434e 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 4081aa0f0d..50260e65fa 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 6e0cc1b6ad..5ae576a58b 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 118adefbc2..9ba9eea641 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index c0830a3b4e..659a7a31a1 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.13"
+  version: "1.1.14-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index cd30634a6d..b495901c2f 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.7"
+  version: "1.3.1-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index c98a126bb1..74c1738027 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.7"
+  version: "1.1.12-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 27efe64cd5..44fcd7c0e1 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.7"
+  version: "1.1.13-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 5d158ae3f0..3093dd5d75 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.7"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index bc53628346..5a3482c9df 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.11"
+  version: "1.0.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index c4b13bde2d..062b2a09c3 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.11'
+  version: '1.3.12-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 2a210354b5..9fd3b036c4 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.2-beta.7'
+  version: '6.9.2-beta.9'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index e950a87ff7..176c8f858e 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.7',
+  version: '0.1.12-beta.9',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 0cddfdd739..e9684a4ede 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.9'
+  version: '1.0.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 99c59d67f9..71377cdbae 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.9'
+  version: '1.0.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index b9db37ca68..add4ca38fe 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.10'
+  version: '1.0.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index d306854849..ed3273ac61 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 2f13f124eb..05ff13fabd 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.11"
+  version: "1.0.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index e87937ae29..4b0ead6a1f 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.11"
+  version: "1.0.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 51907e44da..62324ceffe 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.7',
+  version: '1.1.8-beta.9',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index dcbed7a49e..902c3e2c90 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.9'
+  version: '1.0.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index fef64a58e7..dc5faa8ee4 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.3'
+  version: '1.2.4-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 872735ec48..b5ad2e584d 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index b109abdf53..eec13544d7 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.6"
+  version: "1.2.7-beta.9"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index f4655d7309..a0326726a9 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.0"
+  version: "1.1.1-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index eaa4c6538f..083a2076a3 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.6.2',
+  version: '1.7.0-beta.9',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 60ccf6a6f7..9547f5c588 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.7',
+  version: '1.3.2-beta.9',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index ca4d2eaf2f..0ee668137c 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.6',
+  version: '1.2.7-beta.9',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index ef3d1902de..611cda3189 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.5',
+  version: '1.0.6-beta.9',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 6d3a707d53..1d706359a0 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.7',
+  version: '1.3.11-beta.9',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index b9237b882b..6ee9548fe9 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.6',
+  version: '1.0.7-beta.9',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 4f9fc56c9e..c5075a7cf0 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.7",
+  version: "0.3.15-beta.9",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 7ce5e287e9..58f26ffafa 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.7',
+  version: '0.5.9-beta.9',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 4fef9e2748..3fdac93edd 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.12'
+  version: '1.0.13-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index 26def37322..9ffeef7538 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.7"
+  version: "1.1.18-beta.9"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 85dd480e9e..ba6d7d154e 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.7",
+  version: "4.6.15-beta.9",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 3f3c9fd2ab..fd15421c77 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.7"
+  version: "1.2.10-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 59835000b1..e3aed0f21d 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.7'
+  version: '1.0.9-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 319008989b..c6cdf2ba3e 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.12'
+  version: '1.0.13-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 7e9f371b58..d833e771ec 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.12",
+  version: "1.0.13-beta.9",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index ba4f6a9768..c44a0c6ef8 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.9'
+  version: '1.0.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 199eae52e2..a2df186fc0 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.7"
+  version: "1.1.9-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 6dd605f52c..c5a1c9026e 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.7"
+  version: "1.1.15-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 9e36ad1492..ac2bae1609 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.7'
+  version: '1.2.10-beta.9'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 39c2051c39..84bc216071 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.8'
+  version: '1.0.9-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index a6d4b4d283..04613bc4eb 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.9'
+  version: '1.11.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index d27523098c..2f9c265836 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.6_1',
+  version: '1.1.7-beta.9',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index ffe337b70a..ffcf3dfebd 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.9"
+  version: "1.0.10-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index ec4ecadce0..696be11cf5 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.0.12'
+  version: '1.1.0-beta.9'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 66f0bf6ebe..28126e34a5 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.7',
+  version: '2.7.6-beta.9',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 0ddb80293c..5d96d71c4b 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.11"
+  version: "1.0.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index c59705221b..01c0e617b5 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.7'
+  version: '1.1.16-beta.9'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 0458ba6a97..8272c9f56b 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.6'
+  version: '2.0.7-beta.9'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 9022229e38..97c9d7287c 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index a1999720b9..a03161ba68 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.7"
+  version: "1.6.5-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 366a0419c3..9e81e696f6 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.7"
+  version: "1.1.10-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3512b03335..c3218513cd 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.7'
+  version: '1.4.2-beta.9'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 23419088ff..6b11ee2c47 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.7'
+  version: '1.2.18-beta.9'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index b33df7d658..09bf694b61 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.7"
+  version: "1.2.15-beta.9"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index bc8a72afed..22fd8aa6cc 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.7"
+  version: "1.2.15-beta.9"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 5058b576a3..87725b0891 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.17'
+  version: '1.0.18-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 91dff6fc0c..63990f160b 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.12"
+  version: "1.0.13-beta.9"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 3bb85ea13f..a8503cf1a7 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.7",
+  version: "0.7.7-beta.9",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 2ff6f94c7a..da90cd5073 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.7",
+  version: "0.7.7-beta.9",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 9a1021284d..e3ef7f0c21 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.5',
+  version: '1.0.6-beta.9',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index caae60ff2a..8648b7ab9b 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.13-beta.7'
+  version: '1.1.13-beta.9'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 14729d9016..79c29cde72 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.7",
+  version: "0.9.2-beta.9",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 0f0498feca..9de6aaeed5 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.51-beta.7',
+  version: '1.5.51-beta.9',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 6712d1363c..6a2a1f91a6 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.0'
+  version: '1.2.1-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 059d04b1d3..bacc0fefa2 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.11"
+  version: "1.1.12-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 35cda44784..eedaccc6f8 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.10"
+  version: "1.1.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index bde7f326af..431ebe2d7d 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.10"
+  version: "1.1.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 94c4605acf..c49413460f 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.12"
+  version: "1.0.13-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index ae17be0037..11c7e6343e 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.8',
+  version: '1.0.9-beta.9',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 94f872f794..a2a423147c 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.9"
+  version: "3.0.10-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index fa4c02bf5a..8173fe81a7 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 4905dc9a14..01643fedc0 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.7",
+  version: "0.8.8-beta.9",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 656548f146..b5564aed48 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.5',
+  version: '1.0.6-beta.9',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 5d24a2aaaf..0cdaca7dce 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.10'
+  version: '1.0.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index c7f78e172c..1af9fa6e13 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.10'
+  version: '1.0.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 0be626208a..ac2e4e17d3 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.10'
+  version: '1.1.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 41a80c7efb..09289922b6 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.8'
+  version: '1.0.9-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index 8aad7e6744..e355ad0d41 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.11'
+  version: '1.0.12-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 5486424e0a..6aa54b8c66 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 7f97d4293f..073d61ddf8 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.6'
+  version: '1.1.7-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index e103a7aaef..00b4686674 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.8',
+  version: '1.0.9-beta.9',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 6cae8fa49a..2cc11cea8a 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.9"
+  version: "1.0.10-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 2778d693a9..6bec4cbaad 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.1',
+  version: '1.2.2-beta.9',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 96eda1b389..0d38f93cee 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.0_1',
+  version: '1.2.1-beta.9',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 989214d651..535f81da43 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.7"
+  version: "2.513.6-beta.9"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index f35302023a..870e8c9318 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.10'
+  version: '1.0.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index fd9789fb58..b837005e99 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.7',
+  version: '1.0.13-beta.9',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 3f6a67482e..752d24cb92 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.12'
+  version: '1.0.13-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index f7d54b4e94..59dfa03813 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.10'
+  version: '1.0.11-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 3b4fba4040..8c32882774 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.11'
+  version: '1.0.12-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 56a3709ffe..0c66b5ee24 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.0'
+  version: '1.1.1-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index a375b432cc..45e817b9ae 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.7'
+  version: '1.1.13-beta.9'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index b963d76057..bd0ea27226 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.9'
+  version: '1.0.10-beta.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 9943d997d8..84041a8fc1 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.10"
+  version: "1.0.11-beta.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index ade3e36a58..92703ebfb6 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.7'
+  version: '1.3.12-beta.9'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 569576ca21..4b597b171b 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.7'
+  version: '1.1.9-beta.9'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index ec5cc6a8d7..23a51e7a12 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.7'
+  version: '2.5.15-beta.9'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index f83b1a9ebe..b402d769c4 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.7",
+ "version": "1.4.2-beta.9",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 00fc89b373594077138cc736b4e97c1eb7d963ca Mon Sep 17 00:00:00 2001
From: Christian Klaussner <developer@klaussner.me>
Date: Thu, 6 Oct 2016 18:20:00 +0200
Subject: [PATCH 312/688] Rewrite source map composition for CSS files

The previous implementation had a run time quadratic in the number of CSS files with an associated source map. This new implementation has a linear run time because it iterates only once through all mappings of each CSS file.
---
 .../plugin/minify-css.js                      | 79 +++++++++++++++----
 1 file changed, 63 insertions(+), 16 deletions(-)

diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index be3db08814..7b00058394 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -119,26 +119,73 @@ var mergeCss = Profile("mergeCss", function (css) {
 
   var newMap;
 
+  // Compose the concatenated file's source map with source maps from the
+  // previous build step if necessary.
   Profile.time("composing source maps", function () {
-    // If any input files had source maps, apply them.
-    // Ex.: less -> css source map should be composed with css -> css source map
-    newMap = sourcemap.SourceMapGenerator.fromSourceMap(
-      new sourcemap.SourceMapConsumer(stringifiedCss.map));
+    var concatConsumer;
 
-    Object.keys(originals).forEach(function (name) {
+    newMap = new sourcemap.SourceMapGenerator();
+    concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
+
+    // Create a dictionary of source map consumers for fast access
+    var consumers = Object.keys(originals).reduce(function (consumers, name) {
       var file = originals[name];
-      if (! file.getSourceMap())
-        return;
-      try {
-        newMap.applySourceMap(
-          new sourcemap.SourceMapConsumer(file.getSourceMap()), name);
-      } catch (err) {
-        // If we can't apply the source map, silently drop it.
-        //
-        // XXX This is here because there are some less files that
-        // produce source maps that throw when consumed. We should
-        // figure out exactly why and fix it, but this will do for now.
+      var sourceMap = file.getSourceMap();
+
+      if (sourceMap) {
+        try {
+          consumers[name] = new sourcemap.SourceMapConsumer(sourceMap);
+        } catch (err) {
+          // If we can't apply the source map, silently drop it.
+          //
+          // XXX This is here because there are some less files that
+          // produce source maps that throw when consumed. We should
+          // figure out exactly why and fix it, but this will do for now.
+        }
       }
+
+      return consumers;
+    }, Object.create(null));
+
+    // Find mappings from the concatenated file back to the original files
+    concatConsumer.eachMapping(function (mapping) {
+      var consumer = consumers[mapping.source];
+      var source;
+
+      // If there is a source map for the original file, e.g., if it has been
+      // compiled from Less to CSS, find the source location in the original's
+      // original file. Otherwise, use the mapping of the concatenated file's
+      // source map.
+      var original = {
+        line: mapping.originalLine,
+        column: mapping.originalColumn
+      };
+
+      if (consumer) {
+        original = consumer.originalPositionFor(original);
+        source = original.source;
+      } else {
+        source = mapping.source;
+      }
+
+      // Add a new mapping to the final source map
+      newMap.addMapping({
+        generated: {
+          line: mapping.generatedLine,
+          column: mapping.generatedColumn
+        },
+        original: {
+          line: original.line,
+          column: original.column
+        },
+        source: source
+      });
+
+      // Set the correct content for the mapping's source
+      newMap.setSourceContent(
+        source,
+        (consumer || concatConsumer).sourceContentFor(source)
+      );
     });
   });
 

From 43aa2c777b78974bc11ac654551fdb4a797d9a20 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 6 Oct 2016 12:33:47 -0400
Subject: [PATCH 313/688] Avoid calling files.realpath in
 IsopackCache#getSourceRoot.

It's difficult to keep track of all the factors that could affect the
output of files.realpath, so it doesn't seem feasible to replace this call
with an optimistic function.

Fortunately, it's fine if the paths returned by IsopackCache#getSourceRoot
contain symlinks, and possibly even preferable, since

  ~/.meteor/packages/<name>/<version>

is more consistent than

  ~/.meteor/packages/<name>/.<version>.<junk>++<more junk>

though the latter happens to be a symlink to the latter.
---
 tools/isobuild/isopack-cache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/isopack-cache.js b/tools/isobuild/isopack-cache.js
index 257588de27..69fb8846c8 100644
--- a/tools/isobuild/isopack-cache.js
+++ b/tools/isobuild/isopack-cache.js
@@ -134,7 +134,7 @@ export class IsopackCache {
           packageInfo.version
         );
 
-        return files.realpath(files.pathJoin(isopackPath, arch));
+        return files.pathJoin(isopackPath, arch);
       }
     }
 

From 1d149a0ed76a7e67f06a9c79d5bb11e2b5f2fbb4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 6 Oct 2016 12:43:37 -0400
Subject: [PATCH 314/688] Keep Resolver.getOrCreate cache results distinct by
 caller.

The options.statOrNull function is not included in the JSON.stringify key,
but it affects the results because the implementation provided by the
ImportScanner relies on scanner._getFile to return fakeFileStat for
make-believe files created by the ImportScanner.

This becomes a problem if PackageSourceBatch#getResolver accidentally uses
a Resolver created initially for the ImportScanner, or vice-versa.

In particular, when a compiler plugin calls addJavaScript with a path
different from the original file path, the ImportScanner generates two
different modules, one of which imports the other. Only one of the files
exists on disk, though, so a special implementation of statOrNull is
necessary to keep the Resolver from having to share implementation details
with the ImportScanner.

When this system fails, users of compiler plugins see errors like this:
https://github.com/meteor/meteor/pull/7668#issuecomment-251976739
---
 tools/isobuild/compiler-plugin.js | 1 +
 tools/isobuild/import-scanner.js  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index f51dbbfdfc..b1d5af444e 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -880,6 +880,7 @@ export class PackageSourceBatch {
     });
 
     return this._resolver = Resolver.getOrCreate({
+      caller: "PackageSourceBatch#getResolver",
       sourceRoot: this.sourceRoot,
       targetArch: this.processor.arch,
       extensions: this.importExtensions,
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index d9a1036b3f..5a62812c4f 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -121,6 +121,8 @@ export default class ImportScanner {
     this.outputFiles = [];
 
     this.resolver = Resolver.getOrCreate({
+      caller: "ImportScanner#constructor",
+
       sourceRoot,
       targetArch: bundleArch,
       extensions,

From 14ee8775c3b2b0e6a90f911a68a1895110c6cf62 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 6 Oct 2016 17:12:04 -0400
Subject: [PATCH 315/688] Decompose PackageNamespace, PackageNpm, and
 PackageCordova classes.

Similar to the treatment given to PackageAPI in my commit
af50b4cc5b55a958607b427a8f35e33cb8967f30.

This clear separation of concerns will be helpful for optimizing
PackageSource#initFromPackageDir.
---
 tools/isobuild/package-api.js       |  19 +-
 tools/isobuild/package-cordova.js   |  85 +++++
 tools/isobuild/package-namespace.js | 307 +++++++++++++++++
 tools/isobuild/package-npm.js       | 122 +++++++
 tools/isobuild/package-source.js    | 505 ++--------------------------
 5 files changed, 551 insertions(+), 487 deletions(-)
 create mode 100644 tools/isobuild/package-cordova.js
 create mode 100644 tools/isobuild/package-namespace.js
 create mode 100644 tools/isobuild/package-npm.js

diff --git a/tools/isobuild/package-api.js b/tools/isobuild/package-api.js
index 2a465f3edd..d204d278c7 100644
--- a/tools/isobuild/package-api.js
+++ b/tools/isobuild/package-api.js
@@ -4,9 +4,16 @@ var buildmessage = require('../utils/buildmessage.js');
 var utils = require('../utils/utils.js');
 var compiler = require('./compiler.js');
 var archinfo = require('../utils/archinfo.js');
-var files = require('../fs/files.js');
 var catalog = require('../packaging/catalog/catalog.js');
 
+// It's important that we import these functions individually instead of
+// importing the whole files.* namespace, because now it's easier to tell
+// that this module doesn't actually touch the file system.
+import {
+  pathRelative,
+  convertToPosixPath,
+} from "../fs/files.js";
+
 function toArray (x) {
   if (_.isArray(x)) {
     return x;
@@ -70,7 +77,7 @@ function forAllMatchingArchs (archs, f) {
  * @global
  * @summary Type of the API object passed into the `Package.onUse` function.
  */
-function PackageAPI (options) {
+export function PackageAPI(options) {
   var self = this;
   assert.ok(self instanceof PackageAPI);
 
@@ -343,7 +350,7 @@ _.extend(PackageAPI.prototype, {
     forAllMatchingArchs(arch, a => {
       const filesForArch = this.files[a];
       const source = {
-        relPath: files.pathRelative(".", path),
+        relPath: pathRelative(".", path),
         fileOptions: {
           mainModule: true
         }
@@ -407,14 +414,14 @@ _.extend(PackageAPI.prototype, {
     // consisting of two components. #WindowsPathApi
     paths = _.map(paths, function (p) {
       // Normalize ./foo.js to foo.js.
-      p = files.pathRelative(".", p);
+      p = pathRelative(".", p);
 
       if (p.indexOf('/') !== -1) {
         // it is already a Unix-style path most likely
         return p;
       }
 
-      return files.convertToPosixPath(p, true);
+      return convertToPosixPath(p, true);
     });
 
     var errors = [];
@@ -587,5 +594,3 @@ _.extend(PackageAPI.prototype, {
 
 // XXX COMPAT WITH 0.8.x
 PackageAPI.prototype.add_files = PackageAPI.prototype.addFiles;
-
-exports.PackageAPI = PackageAPI;
diff --git a/tools/isobuild/package-cordova.js b/tools/isobuild/package-cordova.js
new file mode 100644
index 0000000000..7ea3fb3aec
--- /dev/null
+++ b/tools/isobuild/package-cordova.js
@@ -0,0 +1,85 @@
+import { ensureOnlyValidVersions } from "../utils/utils.js";
+import buildmessage from "../utils/buildmessage.js";
+
+// == Class of the `Cordova` object visible in package.js ==
+
+export class PackageCordova {
+  constructor() {
+    this._dependencies = null;
+  }
+
+  /**
+   * @summary Specify which [Cordova / PhoneGap](http://cordova.apache.org/)
+   * plugins your Meteor package depends on.
+   *
+   * Plugins are installed from
+   * [plugins.cordova.io](http://plugins.cordova.io/), so the plugins and
+   * versions specified must exist there. Alternatively, the version
+   * can be replaced with a GitHub tarball URL as described in the
+   * [Cordova](https://github.com/meteor/meteor/wiki/Meteor-Cordova-integration#meteor-packages-with-cordova-dependencies)
+   * page of the Meteor wiki on GitHub.
+   * @param  {Object} dependencies An object where the keys are plugin
+   * names and the values are version numbers or GitHub tarball URLs
+   * in string form.
+   * Example:
+   *
+   * ```js
+   * Cordova.depends({
+   *   "org.apache.cordova.camera": "0.3.0"
+   * });
+   * ```
+   *
+   * Alternatively, with a GitHub URL:
+   *
+   * ```js
+   * Cordova.depends({
+   *   "org.apache.cordova.camera":
+   *     "https://github.com/apache/cordova-plugin-camera/tarball/d84b875c449d68937520a1b352e09f6d39044fbf"
+   * });
+   * ```
+   *
+   * @locus package.js
+   * @memberOf  Cordova
+   */
+  depends(dependencies) {
+    // XXX make cordovaDependencies be separate between use and test, so that
+    // production doesn't have to ship all of the npm modules used by test
+    // code
+    if (this._dependencies) {
+      buildmessage.error("Cordova.depends may only be called once per package",
+                         { useMyCaller: true });
+      // recover by ignoring the Cordova.depends line
+      return;
+    }
+
+    if (typeof dependencies !== 'object') {
+      buildmessage.error("the argument to Cordova.depends should be an " +
+                         "object, like this: {gcd: '0.0.0'}",
+                         { useMyCaller: true });
+      // recover by ignoring the Cordova.depends line
+      return;
+    }
+
+    // don't allow cordova fuzzy versions so that there is complete
+    // consistency when deploying a meteor app
+    //
+    // XXX use something like seal or lockdown to have *complete*
+    // confidence we're running the same code?
+    try {
+      ensureOnlyValidVersions(dependencies, {
+        forCordova: true
+      });
+
+    } catch (e) {
+      buildmessage.error(e.message, {
+        useMyCaller: true,
+        downcase: true
+      });
+
+      // recover by ignoring the Cordova.depends line
+      return;
+    }
+
+    this._dependencies = dependencies;
+  }
+}
diff --git a/tools/isobuild/package-namespace.js b/tools/isobuild/package-namespace.js
new file mode 100644
index 0000000000..89124655b4
--- /dev/null
+++ b/tools/isobuild/package-namespace.js
@@ -0,0 +1,307 @@
+import { each, size, compact } from "underscore";
+import { inCheckout } from "../fs/files.js";
+import buildmessage from "../utils/buildmessage.js";
+import packageVersionParser from "../packaging/package-version-parser.js";
+
+// == Class of the 'Package' object visible in package.js ==
+
+export class PackageNamespace {
+  constructor(packageSource) {
+    this._packageSource = packageSource;
+    this._fileAndDepLoader = null;
+    this._hasTests = false;
+  }
+
+  // Set package metadata. Options:
+  // - summary: for 'meteor list' & package server
+  // - version: package version string
+  // There used to be a third option documented here,
+  // 'environments', but it was never implemented and no package
+  // ever used it.
+
+  /**
+   * @summary Provide basic package information.
+   * @locus package.js
+   * @memberOf Package
+   * @param {Object} options
+   * @param {String} options.summary A concise 1-2 sentence description of
+   * the package, required for publication.
+   * @param {String} options.version The (extended)
+   * [semver](http://www.semver.org) version for your package. Additionally,
+   * Meteor allows a wrap number: a positive integer that follows the
+   * version number. If you are porting another package that uses semver
+   * versioning, you may want to use the original version, postfixed with
+   * `_wrapnumber`. For example, `1.2.3_1` or `2.4.5-rc1_4`. Wrap numbers
+   * sort after the original numbers: `1.2.3` < `1.2.3_1` < `1.2.3_2` <
+   * `1.2.4-rc.0`. If no version is specified, this field defaults to
+   * `0.0.0`. If you want to publish your package to the package server, you
+   * must specify a version.
+   * @param {String} options.name Optional name override. By default, the
+   * package name comes from the name of its directory.
+   * @param {String} options.git Optional Git URL to the source repository.
+   * @param {String} options.documentation Optional Filepath to
+   * documentation. Set to 'README.md' by default. Set this to null to submit
+   * no documentation.
+   * @param {Boolean} options.debugOnly A package with this flag set to true
+   * will not be bundled into production builds. This is useful for packages
+   * meant to be used in development only.
+   * @param {Boolean} options.prodOnly A package with this flag set to true
+   * will ONLY be bundled into production builds.
+   * @param {Boolean} options.testOnly A package with this flag set to true
+   * will ONLY be bundled as part of `meteor test`.
+   */
+  describe(options) {
+    const source = this._packageSource;
+
+    each(options, function (value, key) {
+      if (key === "summary" ||
+          key === "git") {
+        source.metadata[key] = value;
+      } else if (key === "documentation") {
+        source.metadata[key] = value;
+        source.docsExplicitlyProvided = true;
+      } else if (key === "version") {
+        if (typeof(value) !== "string") {
+          buildmessage.error("The package version (specified with "
+                             + "Package.describe) must be a string.");
+          // Recover by pretending that version was not set.
+        } else {
+          var goodVersion = true;
+          try {
+            var parsedVersion =
+              packageVersionParser.getValidServerVersion(value);
+          } catch (e) {
+            if (!e.versionParserError) {
+              throw e;
+            }
+            buildmessage.error(
+              "The package version " + value + " (specified with Package.describe) "
+                + "is not a valid Meteor package version.\n"
+                + "Valid package versions are semver (see http://semver.org/), "
+                + "optionally followed by '_' and an integer greater or equal to 1.");
+            goodVersion = false;
+          }
+          // Recover by pretending that the version was not set.
+        }
+        if (goodVersion && parsedVersion !== value) {
+          buildmessage.error(
+            "The package version (specified with Package.describe) may not "
+              + "contain a plus-separated build ID.");
+          // Recover by pretending that the version was not set.
+          goodVersion = false;
+        }
+        if (goodVersion) {
+          source.version = value;
+          source.versionExplicitlyProvided = true;
+        }
+      } else if (key === "name" && ! source.isTest) {
+        if (! source.name) {
+          source.name = value;
+        } else if (source.name !== value) {
+          // Woah, so we requested a non-test package by name, and it is not
+          // the name that we find inside. That's super weird.
+          buildmessage.error(
+            "trying to initialize a nonexistent base package " + value);
+        }
+
+      // `debugOnly`, `prodOnly` and `testOnly` are boolean
+      // flags you can put on a package, currently undocumented.
+      // when set to true, they cause a package's code to be
+      // only included (i.e. linked into the bundle) in dev
+      // mode, prod mode (`meteor --production`) or app tests
+      // (`meteor test`), and excluded otherwise.
+      //
+      // Notes:
+      //
+      // * These flags do not affect which packages or which versions are
+      //   are selected by the version solver.
+      //
+      // * When you use a debugOnly, prodOnly or testOnly
+      //   package, its exports are not imported for you.  You
+      //   have to access them using
+      //   `Package["my-package"].MySymbol`.
+      //
+      // * These flags CAN cause different package load orders in
+      //   development and production!  We should probably fix this.
+      //   Basically, packages that are excluded from the build using
+      //   these flags are also excluded fro the build order calculation,
+      //   and that's the problem
+      //
+      // * We should consider publicly documenting these flags, since they
+      //   are effectively part of the public API.
+      } else if (key === "debugOnly") {
+        source.debugOnly = !!value;
+      } else if (key === "prodOnly") {
+        source.prodOnly = !!value;
+      } else if (key === "testOnly") {
+        source.testOnly = !!value;
+      } else {
+        // Do nothing. We might want to add some keys later, and we should err
+        // on the side of backwards compatibility.
+      }
+      if (size(compact([source.debugOnly, source.prodOnly, source.testOnly])) > 1) {
+        buildmessage.error(
+          "Package can't have more than one of: debugOnly, prodOnly, testOnly.");
+      }
+    });
+  }
+
+  /**
+   * @summary Define package dependencies and expose package methods.
+   * @locus package.js
+   * @memberOf Package
+   * @param {Function} func A function that takes in the package control `api` object, which keeps track of dependencies and exports.
+   */
+  onUse(f) {
+    if (! this._packageSource.isTest) {
+      if (this._fileAndDepLoader) {
+        buildmessage.error("duplicate onUse handler; a package may have " +
+                           "only one", { useMyCaller: true });
+        // Recover by ignoring the duplicate
+        return;
+      }
+
+      this._fileAndDepLoader = f;
+    }
+  }
+
+  /**
+   * @deprecated in 0.9.0
+   */
+  on_use(f) {
+    this.onUse(f);
+  }
+
+  /**
+   * @summary Define dependencies and expose package methods for unit tests.
+   * @locus package.js
+   * @memberOf Package
+   * @param {Function} func A function that takes in the package control 'api' object, which keeps track of dependencies and exports.
+   */
+  onTest(f) {
+    const isTest = this._packageSource.isTest;
+
+    // If we are not initializing the test package, then we are initializing
+    // the normal package and have now noticed that it has tests. So, let's
+    // register the test. This is a medium-length hack until we have new
+    // control files.
+    if (! isTest) {
+      this._hasTests = true;
+      return;
+    }
+
+    // We are initializing the test, so proceed as normal.
+    if (isTest) {
+      if (this._fileAndDepLoader) {
+        buildmessage.error("duplicate onTest handler; a package may have " +
+                           "only one", { useMyCaller: true });
+        // Recover by ignoring the duplicate
+        return;
+      }
+
+      this._fileAndDepLoader = f;
+    }
+  }
+
+  /**
+   * @deprecated in 0.9.0
+   */
+  on_test(f) {
+    this.onTest(f);
+  }
+
+  // Define a plugin. A plugin extends the build process for
+  // targets that use this package. For example, a Coffeescript
+  // compiler would be a plugin. A plugin is its own little
+  // program, with its own set of source files, used packages, and
+  // npm dependencies.
+  //
+  // This is an experimental API and for now you should assume
+  // that it will change frequently and radically (thus the
+  // '_transitional_'). For maximum R&D velocity and for the good
+  // of the platform, we will push changes that break your
+  // packages that use this API. You've been warned.
+  //
+  // Options:
+  // - name: a name for this plugin. required (cosmetic -- string)
+  // - use: package to use for the plugin (names, as strings)
+  // - sources: sources for the plugin (array of string)
+  // - npmDependencies: map from npm package name to required
+  //   version (string)
+
+  /**
+   * @summary Define a build plugin. A build plugin extends the build
+   * process for apps and packages that use this package. For example,
+   * the `coffeescript` package uses a build plugin to compile CoffeeScript
+   * source files into JavaScript.
+   * @param  {Object} [options]
+   * @param {String} options.name A cosmetic name, must be unique in the
+   * package.
+   * @param {String|String[]} options.use Meteor packages that this
+   * plugin uses, independent of the packages specified in
+   * [api.onUse](#pack_onUse).
+   * @param {String[]} options.sources The source files that make up the
+   * build plugin, independent from [api.addFiles](#pack_addFiles).
+   * @param {Object} options.npmDependencies An object where the keys
+   * are NPM package names, and the values are the version numbers of
+   * required NPM packages, just like in [Npm.depends](#Npm-depends).
+   * @memberOf Package
+   * @locus package.js
+   */
+  registerBuildPlugin(options) {
+    const isTest = this._packageSource.isTest;
+
+    // Tests don't have plugins; plugins initialized in the control file
+    // belong to the package and not to the test. (This will be less
+    // confusing in the new control file format).
+    if (isTest) {
+      return;
+    }
+
+    if (! ('name' in options)) {
+      buildmessage.error("build plugins require a name",
+                         { useMyCaller: true });
+      // recover by ignoring plugin
+      return;
+    }
+
+    const pluginInfo = this._packageSource.pluginInfo;
+
+    if (options.name in pluginInfo) {
+      buildmessage.error("this package already has a plugin named '" +
+                         options.name + "'",
+                         { useMyCaller: true });
+      // recover by ignoring plugin
+      return;
+    }
+
+    if (options.name.match(/\.\./) ||
+        options.name.match(/[\\\/]/)) {
+      buildmessage.error("bad plugin name", { useMyCaller: true });
+      // recover by ignoring plugin
+      return;
+    }
+
+    // XXX probably want further type checking
+    pluginInfo[options.name] = options;
+  }
+
+  /**
+   * @deprecated in 0.9.4
+   */
+  _transitional_registerBuildPlugin(options) {
+    this.registerBuildPlugin(options);
+  }
+
+  includeTool() {
+    const source = this._packageSource;
+    if (! inCheckout()) {
+      buildmessage.error("Package.includeTool() can only be used with a " +
+                         "checkout of meteor");
+    } else if (source.includeTool) {
+      buildmessage.error("Duplicate includeTool call");
+    } else {
+      source.includeTool = true;
+    }
+  }
+}
diff --git a/tools/isobuild/package-npm.js b/tools/isobuild/package-npm.js
new file mode 100644
index 0000000000..0a0476e49d
--- /dev/null
+++ b/tools/isobuild/package-npm.js
@@ -0,0 +1,122 @@
+import { ensureOnlyValidVersions } from "../utils/utils.js";
+import buildmessage from "../utils/buildmessage.js";
+import NpmDiscards from "./npm-discards.js";
+
+const nodeRequire = require;
+
+// == Class of the `Npm` object visible in package.js ==
+
+export class PackageNpm {
+  constructor() {
+    // Files to be stripped from the installed NPM dependency tree. See
+    // the Npm.strip comment below for further usage information.
+    this._discards = new NpmDiscards;
+    this._dependencies = null;
+  }
+
+  /**
+   * @summary Specify which [NPM](https://www.npmjs.org/) packages
+   * your Meteor package depends on.
+   * @param  {Object} dependencies An object where the keys are package
+   * names and the values are one of:
+   *   1. Version numbers in string form
+   *   2. Http(s) URLs to a git commit by SHA.   
+   *   3. Git URLs in the format described [here](https://docs.npmjs.com/files/package.json#git-urls-as-dependencies)
+   *
+   * Https URL example:
+   *
+   * ```js
+   * Npm.depends({
+   *   moment: "2.8.3",
+   *   async: "https://github.com/caolan/async/archive/71fa2638973dafd8761fa5457c472a312cc820fe.tar.gz"
+   * });
+   * ```
+   *
+   * Git URL example:
+   *
+   * ```js
+   * Npm.depends({
+   *   moment: "2.8.3",
+   *   async: "git+https://github.com/caolan/async#master"
+   * });
+   * ```
+   * @locus package.js
+   * @memberOf  Npm
+   */
+  depends(dependencies) {
+    // XXX make dependencies be separate between use and test, so that
+    // production doesn't have to ship all of the npm modules used by test
+    // code
+    if (this._dependencies) {
+      buildmessage.error("Npm.depends may only be called once per package",
+                         { useMyCaller: true });
+      // recover by ignoring the Npm.depends line
+      return;
+    }
+
+    if (typeof dependencies !== 'object') {
+      buildmessage.error("the argument to Npm.depends should be an " +
+                         "object, like this: {gcd: '0.0.0'}",
+                         { useMyCaller: true });
+      // recover by ignoring the Npm.depends line
+      return;
+    }
+
+    // don't allow npm fuzzy versions so that there is complete
+    // consistency when deploying a meteor app
+    //
+    // XXX use something like seal or lockdown to have *complete*
+    // confidence we're running the same code?
+    try {
+      ensureOnlyValidVersions(dependencies, {
+        forCordova: false
+      });
+
+    } catch (e) {
+      buildmessage.error(e.message, {
+        useMyCaller: true,
+        downcase: true
+      });
+
+      // recover by ignoring the Npm.depends line
+      return;
+    }
+
+    this._dependencies = dependencies;
+  }
+
+  // The `Npm.strip` method makes up for packages that have missing
+  // or incomplete .npmignore files by telling the bundler to strip out
+  // certain unnecessary files and/or directories during `meteor build`.
+  //
+  // The `discards` parameter should be an object whose keys are
+  // top-level package names and whose values are arrays of strings
+  // (or regular expressions) that match paths in that package's
+  // directory that should be stripped before installation. For
+  // example:
+  //
+  //   Npm.strip({
+  //     connect: [/*\.wmv$/],
+  //     useragent: ["tests/"]
+  //   });
+  //
+  // This means (1) "remove any files with the `.wmv` extension from
+  // the 'connect' package directory" and (2) "remove the 'tests'
+  // directory from the 'useragent' package directory."
+  strip(discards) {
+    this._discards.merge(discards);
+  }
+
+  require(name) {
+    try {
+      return nodeRequire(name); // from the dev bundle
+    } catch (e) {
+      buildmessage.error(
+        "can't find npm module '" + name +
+          "'. In package.js, Npm.require can only find built-in modules.",
+        { useMyCaller: true });
+      // recover by, uh, returning undefined, which is likely to
+      // have some knock-on effects
+    }
+  }
+}
diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index 2b2636967a..a1a50dd2fc 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -6,16 +6,18 @@ var utils = require('../utils/utils.js');
 var watch = require('../fs/watch.js');
 var buildmessage = require('../utils/buildmessage.js');
 var meteorNpm = require('./meteor-npm.js');
-var NpmDiscards = require('./npm-discards.js');
 import Builder from './builder.js';
 var archinfo = require('../utils/archinfo.js');
 var catalog = require('../packaging/catalog/catalog.js');
 var packageVersionParser = require('../packaging/package-version-parser.js');
 var compiler = require('./compiler.js');
-var packageAPIModule = require('./package-api.js');
 var Profile = require('../tool-env/profile.js').Profile;
 
 import SourceArch from './source-arch.js';
+import { PackageNamespace } from "./package-namespace.js";
+import { PackageNpm } from "./package-npm.js";
+import { PackageCordova } from "./package-cordova.js";
+import { PackageAPI } from "./package-api.js";
 
 import {
   TEST_FILENAME_REGEXPS,
@@ -288,7 +290,7 @@ var PackageSource = function () {
 
   // Files to be stripped from the installed NPM dependency tree. See the
   // Npm.strip comment below for further usage information.
-  self.npmDiscards = new NpmDiscards;
+  self.npmDiscards = null;
 
   // Absolute path to a directory on disk that serves as a cache for
   // the npm dependencies, so we don't have to fetch them on every
@@ -444,7 +446,7 @@ _.extend(PackageSource.prototype, {
   // - name: override the name of this package with a different name.
   // - buildingIsopackets: true if this is being scanned in the process
   //   of building isopackets
-  initFromPackageDir: function (dir, options) {
+  initFromPackageDir: Profile("initFromPackageDir", function (dir, options) {
     var self = this;
     buildmessage.assertInCapture();
     var isPortable = true;
@@ -484,10 +486,6 @@ _.extend(PackageSource.prototype, {
       throw new Error("putative package directory " + dir + " doesn't exist?");
     }
 
-    var fileAndDepLoader = null;
-    var npmDependencies = null;
-    var cordovaDependencies = null;
-
     const packageFileHashes = Object.create(null);
     const packageJsPath = files.pathJoin(self.sourceRoot, 'package.js');
     const packageJsCode = files.readFile(packageJsPath);
@@ -513,10 +511,6 @@ _.extend(PackageSource.prototype, {
     // an asset.
     watchPackageFiles(self.pluginWatchSet);
 
-    var hasTests = false;
-
-    // == 'Package' object visible in package.js ==
-
     /**
      * @global
      * @name  Package
@@ -524,476 +518,26 @@ _.extend(PackageSource.prototype, {
      * @namespace
      * @locus package.js
      */
-    var Package = {
-      // Set package metadata. Options:
-      // - summary: for 'meteor list' & package server
-      // - version: package version string
-      // There used to be a third option documented here,
-      // 'environments', but it was never implemented and no package
-      // ever used it.
-
-      /**
-       * @summary Provide basic package information.
-       * @locus package.js
-       * @memberOf Package
-       * @param {Object} options
-       * @param {String} options.summary A concise 1-2 sentence description of
-       * the package, required for publication.
-       * @param {String} options.version The (extended)
-       * [semver](http://www.semver.org) version for your package. Additionally,
-       * Meteor allows a wrap number: a positive integer that follows the
-       * version number. If you are porting another package that uses semver
-       * versioning, you may want to use the original version, postfixed with
-       * `_wrapnumber`. For example, `1.2.3_1` or `2.4.5-rc1_4`. Wrap numbers
-       * sort after the original numbers: `1.2.3` < `1.2.3_1` < `1.2.3_2` <
-       * `1.2.4-rc.0`. If no version is specified, this field defaults to
-       * `0.0.0`. If you want to publish your package to the package server, you
-       * must specify a version.
-       * @param {String} options.name Optional name override. By default, the
-       * package name comes from the name of its directory.
-       * @param {String} options.git Optional Git URL to the source repository.
-       * @param {String} options.documentation Optional Filepath to
-       * documentation. Set to 'README.md' by default. Set this to null to submit
-       * no documentation.
-       * @param {Boolean} options.debugOnly A package with this flag set to true
-       * will not be bundled into production builds. This is useful for packages
-       * meant to be used in development only.
-       * @param {Boolean} options.prodOnly A package with this flag set to true
-       * will ONLY be bundled into production builds.
-       * @param {Boolean} options.testOnly A package with this flag set to true
-       * will ONLY be bundled as part of `meteor test`.
-       */
-      describe: function (options) {
-        _.each(options, function (value, key) {
-          if (key === "summary" ||
-              key === "git") {
-            self.metadata[key] = value;
-          } else if (key === "documentation") {
-            self.metadata[key] = value;
-            self.docsExplicitlyProvided = true;
-          } else if (key === "version") {
-            if (typeof(value) !== "string") {
-              buildmessage.error("The package version (specified with "
-                                 + "Package.describe) must be a string.");
-              // Recover by pretending that version was not set.
-            } else {
-              var goodVersion = true;
-              try {
-                var parsedVersion = packageVersionParser.getValidServerVersion(
-                  value);
-              } catch (e) {
-                if (!e.versionParserError) {
-                  throw e;
-                }
-                buildmessage.error(
-                  "The package version " + value + " (specified with Package.describe) "
-                    + "is not a valid Meteor package version.\n"
-                    + "Valid package versions are semver (see http://semver.org/), "
-                    + "optionally followed by '_' and an integer greater or equal to 1.");
-                goodVersion = false;
-              }
-              // Recover by pretending that the version was not set.
-            }
-            if (goodVersion && parsedVersion !== value) {
-              buildmessage.error(
-                "The package version (specified with Package.describe) may not "
-                  + "contain a plus-separated build ID.");
-              // Recover by pretending that the version was not set.
-              goodVersion = false;
-            }
-            if (goodVersion) {
-              self.version = value;
-              self.versionExplicitlyProvided = true;
-            }
-          } else if (key === "name" && !self.isTest) {
-            if (!self.name) {
-              self.name = value;
-            } else if (self.name !== value) {
-              // Woah, so we requested a non-test package by name, and it is not
-              // the name that we find inside. That's super weird.
-              buildmessage.error(
-                "trying to initialize a nonexistent base package " + value);
-            }
-            // `debugOnly`, `prodOnly` and `testOnly` are boolean
-            // flags you can put on a package, currently undocumented.
-            // when set to true, they cause a package's code to be
-            // only included (i.e. linked into the bundle) in dev
-            // mode, prod mode (`meteor --production`) or app tests
-            // (`meteor test`), and excluded otherwise.
-            //
-            // Notes:
-            //
-            // * These flags do not affect which packages or which versions are
-            //   are selected by the version solver.
-            //
-            // * When you use a debugOnly, prodOnly or testOnly
-            //   package, its exports are not imported for you.  You
-            //   have to access them using
-            //   `Package["my-package"].MySymbol`.
-            //
-            // * These flags CAN cause different package load orders in
-            //   development and production!  We should probably fix this.
-            //   Basically, packages that are excluded from the build using
-            //   these flags are also excluded fro the build order calculation,
-            //   and that's the problem
-            //
-            // * We should consider publicly documenting these flags, since they
-            //   are effectively part of the public API.
-          } else if (key === "debugOnly") {
-            self.debugOnly = !!value;
-          } else if (key === "prodOnly") {
-            self.prodOnly = !!value;
-          } else if (key === "testOnly") {
-            self.testOnly = !!value;
-          } else {
-            // Do nothing. We might want to add some keys later, and we should err
-            // on the side of backwards compatibility.
-          }
-          if (_.size(_.compact([self.debugOnly, self.prodOnly, self.testOnly])) > 1) {
-            buildmessage.error(
-              "Package can't have more than one of: debugOnly, prodOnly, testOnly.");
-          }
-        });
-      },
-
-      /**
-       * @summary Define package dependencies and expose package methods.
-       * @locus package.js
-       * @memberOf Package
-       * @param {Function} func A function that takes in the package control `api` object, which keeps track of dependencies and exports.
-       */
-      onUse: function (f) {
-        if (!self.isTest) {
-          if (fileAndDepLoader) {
-            buildmessage.error("duplicate onUse handler; a package may have " +
-                               "only one", { useMyCaller: true });
-            // Recover by ignoring the duplicate
-            return;
-          }
-          fileAndDepLoader = f;
-        }
-      },
-
-      /**
-       * @deprecated in 0.9.0
-       */
-      on_use: function (f) {
-        this.onUse(f);
-      },
-
-      /**
-       * @summary Define dependencies and expose package methods for unit tests.
-       * @locus package.js
-       * @memberOf Package
-       * @param {Function} func A function that takes in the package control 'api' object, which keeps track of dependencies and exports.
-       */
-      onTest: function (f) {
-        // If we are not initializing the test package, then we are initializing
-        // the normal package and have now noticed that it has tests. So, let's
-        // register the test. This is a medium-length hack until we have new
-        // control files.
-        if (!self.isTest) {
-          hasTests = true;
-          return;
-        }
-
-        // We are initializing the test, so proceed as normal.
-        if (self.isTest) {
-          if (fileAndDepLoader) {
-            buildmessage.error("duplicate onTest handler; a package may have " +
-                               "only one", { useMyCaller: true });
-            // Recover by ignoring the duplicate
-            return;
-          }
-          fileAndDepLoader = f;
-        }
-      },
-
-      /**
-       * @deprecated in 0.9.0
-       */
-      on_test: function (f) {
-        this.onTest(f);
-      },
-
-      // Define a plugin. A plugin extends the build process for
-      // targets that use this package. For example, a Coffeescript
-      // compiler would be a plugin. A plugin is its own little
-      // program, with its own set of source files, used packages, and
-      // npm dependencies.
-      //
-      // This is an experimental API and for now you should assume
-      // that it will change frequently and radically (thus the
-      // '_transitional_'). For maximum R&D velocity and for the good
-      // of the platform, we will push changes that break your
-      // packages that use this API. You've been warned.
-      //
-      // Options:
-      // - name: a name for this plugin. required (cosmetic -- string)
-      // - use: package to use for the plugin (names, as strings)
-      // - sources: sources for the plugin (array of string)
-      // - npmDependencies: map from npm package name to required
-      //   version (string)
-
-      /**
-       * @summary Define a build plugin. A build plugin extends the build
-       * process for apps and packages that use this package. For example,
-       * the `coffeescript` package uses a build plugin to compile CoffeeScript
-       * source files into JavaScript.
-       * @param  {Object} [options]
-       * @param {String} options.name A cosmetic name, must be unique in the
-       * package.
-       * @param {String|String[]} options.use Meteor packages that this
-       * plugin uses, independent of the packages specified in
-       * [api.onUse](#pack_onUse).
-       * @param {String[]} options.sources The source files that make up the
-       * build plugin, independent from [api.addFiles](#pack_addFiles).
-       * @param {Object} options.npmDependencies An object where the keys
-       * are NPM package names, and the values are the version numbers of
-       * required NPM packages, just like in [Npm.depends](#Npm-depends).
-       * @memberOf Package
-       * @locus package.js
-       */
-      registerBuildPlugin: function (options) {
-        // Tests don't have plugins; plugins initialized in the control file
-        // belong to the package and not to the test. (This will be less
-        // confusing in the new control file format).
-        if (self.isTest) {
-          return;
-        }
-
-        if (! ('name' in options)) {
-          buildmessage.error("build plugins require a name",
-                             { useMyCaller: true });
-          // recover by ignoring plugin
-          return;
-        }
-
-        if (options.name in self.pluginInfo) {
-          buildmessage.error("this package already has a plugin named '" +
-                             options.name + "'",
-                             { useMyCaller: true });
-          // recover by ignoring plugin
-          return;
-        }
-
-        if (options.name.match(/\.\./) || options.name.match(/[\\\/]/)) {
-          buildmessage.error("bad plugin name", { useMyCaller: true });
-          // recover by ignoring plugin
-          return;
-        }
-
-        // XXX probably want further type checking
-        self.pluginInfo[options.name] = options;
-      },
-
-      /**
-       * @deprecated in 0.9.4
-       */
-      _transitional_registerBuildPlugin: function (options) {
-        this.registerBuildPlugin(options);
-      },
-
-      includeTool: function () {
-        if (!files.inCheckout()) {
-          buildmessage.error("Package.includeTool() can only be used with a " +
-                             "checkout of meteor");
-        } else if (self.includeTool) {
-          buildmessage.error("Duplicate includeTool call");
-        } else {
-          self.includeTool = true;
-        }
-      }
-    };
-
-    // == 'Npm' object visible in package.js ==
+    const Package = new PackageNamespace(this);
 
     /**
      * @namespace Npm
      * @global
      * @summary The Npm object in package.js and package source files.
      */
-    var Npm = {
-      /**
-       * @summary Specify which [NPM](https://www.npmjs.org/) packages
-       * your Meteor package depends on.
-       * @param  {Object} dependencies An object where the keys are package
-       * names and the values are one of:
-       *   1. Version numbers in string form
-       *   2. Http(s) URLs to a git commit by SHA.   
-       *   3. Git URLs in the format described [here](https://docs.npmjs.com/files/package.json#git-urls-as-dependencies)
-       *
-       * Https URL example:
-       *
-       * ```js
-       * Npm.depends({
-       *   moment: "2.8.3",
-       *   async: "https://github.com/caolan/async/archive/71fa2638973dafd8761fa5457c472a312cc820fe.tar.gz"
-       * });
-       * ```
-       *
-       * Git URL example:
-       *
-       * ```js
-       * Npm.depends({
-       *   moment: "2.8.3",
-       *   async: "git+https://github.com/caolan/async#master"
-       * });
-       * ```
-       * @locus package.js
-       * @memberOf  Npm
-       */
-      depends: function (_npmDependencies) {
-        // XXX make npmDependencies be separate between use and test, so that
-        // production doesn't have to ship all of the npm modules used by test
-        // code
-        if (npmDependencies) {
-          buildmessage.error("Npm.depends may only be called once per package",
-                             { useMyCaller: true });
-          // recover by ignoring the Npm.depends line
-          return;
-        }
-        if (typeof _npmDependencies !== 'object') {
-          buildmessage.error("the argument to Npm.depends should be an " +
-                             "object, like this: {gcd: '0.0.0'}",
-                             { useMyCaller: true });
-          // recover by ignoring the Npm.depends line
-          return;
-        }
-
-        // don't allow npm fuzzy versions so that there is complete
-        // consistency when deploying a meteor app
-        //
-        // XXX use something like seal or lockdown to have *complete*
-        // confidence we're running the same code?
-        try {
-          utils.ensureOnlyValidVersions(_npmDependencies, {forCordova: false});
-        } catch (e) {
-          buildmessage.error(e.message, { useMyCaller: true, downcase: true });
-          // recover by ignoring the Npm.depends line
-          return;
-        }
-
-        npmDependencies = _npmDependencies;
-      },
-
-      // The `Npm.strip` method makes up for packages that have missing
-      // or incomplete .npmignore files by telling the bundler to strip out
-      // certain unnecessary files and/or directories during `meteor build`.
-      //
-      // The `discards` parameter should be an object whose keys are
-      // top-level package names and whose values are arrays of strings
-      // (or regular expressions) that match paths in that package's
-      // directory that should be stripped before installation. For
-      // example:
-      //
-      //   Npm.strip({
-      //     connect: [/*\.wmv$/],
-      //     useragent: ["tests/"]
-      //   });
-      //
-      // This means (1) "remove any files with the `.wmv` extension from
-      // the 'connect' package directory" and (2) "remove the 'tests'
-      // directory from the 'useragent' package directory."
-      strip: function(discards) {
-        self.npmDiscards.merge(discards);
-      },
-
-      require: function (name) {
-        try {
-          return require(name); // from the dev bundle
-        } catch (e) {
-          buildmessage.error(
-            "can't find npm module '" + name +
-              "'. In package.js, Npm.require can only find built-in modules.",
-            { useMyCaller: true });
-          // recover by, uh, returning undefined, which is likely to
-          // have some knock-on effects
-          return undefined;
-        }
-      }
-    };
-
-    // == 'Cordova' object visible in package.js ==
+    const Npm = new PackageNpm();
 
     /**
      * @namespace Cordova
      * @global
      * @summary The Cordova object in package.js.
      */
-    var Cordova = {
-      /**
-       * @summary Specify which [Cordova / PhoneGap](http://cordova.apache.org/)
-       * plugins your Meteor package depends on.
-       *
-       * Plugins are installed from
-       * [plugins.cordova.io](http://plugins.cordova.io/), so the plugins and
-       * versions specified must exist there. Alternatively, the version
-       * can be replaced with a GitHub tarball URL as described in the
-       * [Cordova](https://github.com/meteor/meteor/wiki/Meteor-Cordova-integration#meteor-packages-with-cordova-dependencies)
-       * page of the Meteor wiki on GitHub.
-       * @param  {Object} dependencies An object where the keys are plugin
-       * names and the values are version numbers or GitHub tarball URLs
-       * in string form.
-       * Example:
-       *
-       * ```js
-       * Cordova.depends({
-       *   "org.apache.cordova.camera": "0.3.0"
-       * });
-       * ```
-       *
-       * Alternatively, with a GitHub URL:
-       *
-       * ```js
-       * Cordova.depends({
-       *   "org.apache.cordova.camera":
-       *     "https://github.com/apache/cordova-plugin-camera/tarball/d84b875c449d68937520a1b352e09f6d39044fbf"
-       * });
-       * ```
-       *
-       * @locus package.js
-       * @memberOf  Cordova
-       */
-      depends: function (_cordovaDependencies) {
-        // XXX make cordovaDependencies be separate between use and test, so that
-        // production doesn't have to ship all of the npm modules used by test
-        // code
-        if (cordovaDependencies) {
-          buildmessage.error("Cordova.depends may only be called once per package",
-                             { useMyCaller: true });
-          // recover by ignoring the Cordova.depends line
-          return;
-        }
-        if (typeof _cordovaDependencies !== 'object') {
-          buildmessage.error("the argument to Cordova.depends should be an " +
-                             "object, like this: {gcd: '0.0.0'}",
-                             { useMyCaller: true });
-          // recover by ignoring the Cordova.depends line
-          return;
-        }
-
-        // don't allow cordova fuzzy versions so that there is complete
-        // consistency when deploying a meteor app
-        //
-        // XXX use something like seal or lockdown to have *complete*
-        // confidence we're running the same code?
-        try {
-          utils.ensureOnlyValidVersions(_cordovaDependencies, {forCordova: true});
-        } catch (e) {
-          buildmessage.error(e.message, { useMyCaller: true, downcase: true });
-          // recover by ignoring the Npm.depends line
-          return;
-        }
-
-        cordovaDependencies = _cordovaDependencies;
-      },
-    };
+    const Cordova = new PackageCordova();
 
     try {
       files.runJavaScript(packageJsCode.toString('utf8'), {
         filename: 'package.js',
-        symbols: { Package: Package, Npm: Npm, Cordova: Cordova }
+        symbols: { Package, Npm, Cordova }
       });
     } catch (e) {
       buildmessage.exception(e);
@@ -1004,10 +548,10 @@ _.extend(PackageSource.prototype, {
       // out to feel pretty disconcerting -- definitely violates the
       // principle of least surprise.) Leave the metadata if we have
       // it, though.
-      fileAndDepLoader = null;
+      Package._fileAndDepLoader = null;
       self.pluginInfo = {};
-      npmDependencies = null;
-      cordovaDependencies = null;
+      Npm._dependencies = null;
+      Cordova._dependencies = null;
     }
 
     // In the past, we did not require a Package.Describe.name field. So, it is
@@ -1060,13 +604,13 @@ _.extend(PackageSource.prototype, {
     // probably is sufficient for virtually all packages that actually
     // exist in the field, if not every single one. #OldStylePackageSupport
 
-    var api = new packageAPIModule.PackageAPI({
-      buildingIsopackets: !!initFromPackageDirOptions.buildingIsopackets
+    var api = new PackageAPI({
+      buildingIsopackets: !! initFromPackageDirOptions.buildingIsopackets
     });
 
-    if (fileAndDepLoader) {
+    if (Package._fileAndDepLoader) {
       try {
-        buildmessage.markBoundary(fileAndDepLoader)(api);
+        buildmessage.markBoundary(Package._fileAndDepLoader)(api);
       } catch (e) {
         console.log(e.stack); // XXX should we keep this here -- or do we want broken
                               // packages to fail silently?
@@ -1084,10 +628,10 @@ _.extend(PackageSource.prototype, {
           };
         });
 
-        fileAndDepLoader = null;
+        Package._fileAndDepLoader = null;
         self.pluginInfo = {};
-        npmDependencies = null;
-        cordovaDependencies = null;
+        Npm._dependencies = null;
+        Cordova._dependencies = null;
       }
     }
 
@@ -1173,9 +717,10 @@ _.extend(PackageSource.prototype, {
     // dirs for use vs test?
     self.npmCacheDirectory =
       files.pathResolve(files.pathJoin(self.sourceRoot, '.npm', 'package'));
-    self.npmDependencies = npmDependencies;
+    self.npmDependencies = Npm._dependencies;
+    self.npmDiscards = Npm._discards;
 
-    self.cordovaDependencies = cordovaDependencies;
+    self.cordovaDependencies = Cordova._dependencies;
 
     // Create source architectures, one for the server and one for each web
     // arch.
@@ -1256,10 +801,10 @@ _.extend(PackageSource.prototype, {
     self.serveRoot = files.pathJoin('/packages/', self.name);
 
     // Name of the test.
-    if (hasTests) {
+    if (Package._hasTests) {
       self.testName = genTestName(self.name);
     }
-  },
+  }),
 
   _readAndWatchDirectory(relDir, watchSet, {include, exclude, names}) {
     return watch.readAndWatchDirectory(watchSet, {

From 2d18c25f7e08f12802f110d25970ea4c4aa00f0e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 27 Sep 2016 10:28:51 -0400
Subject: [PATCH 316/688] Be more defensive when terminating watchers.

---
 tools/fs/safe-pathwatcher.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
index 3588e3160b..e6aeef898d 100644
--- a/tools/fs/safe-pathwatcher.js
+++ b/tools/fs/safe-pathwatcher.js
@@ -79,7 +79,7 @@ function startNewWatcher(absPath) {
     // so our only hope of catching them is to continue polling.
   }
 
-  const watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
+  let watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
 
   const pollingInterval = watcher
     ? DEFAULT_POLLING_INTERVAL
@@ -129,9 +129,14 @@ function startNewWatcher(absPath) {
           return;
         }
 
-        watcher.close();
-        files.unwatchFile(absPath, watchFileWrapper);
         watchers[absPath] = null;
+
+        if (watcher) {
+          watcher.close();
+          watcher = null;
+        }
+
+        files.unwatchFile(absPath, watchFileWrapper);
       }, WATCHER_CLEANUP_DELAY_MS);
     }
   };

From 1d3d6c2bda9eacc94dacc6351dca919dfe9d66ca Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 7 Oct 2016 12:53:41 +0300
Subject: [PATCH 317/688] Fix for `Console.failInfo` and `Console.failWarn`
 when `pretty` is false

These functions were both using the `Console._fail` function which is passed a severity of failure as a string (e.g. "warn", "error", etc.) which corresponds to the appropriate `Console` function.  Previously, the string was just being called as if it was a function.

Fixes meteor/meteor#7882
---
 tools/console/console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index de29118647..e8bf9667d3 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -958,7 +958,7 @@ _.extend(Console.prototype, {
     var self = this;
 
     if (! self._pretty) {
-      return printFn(message);
+      return self[printFn](message);
     }
 
     var xmark = chalk.red('\u2717');

From 58a6d743c86673688c08121a27cf43c67cec968d Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 7 Oct 2016 13:14:30 +0300
Subject: [PATCH 318/688] `Console.success` should provide an indicator when
 pretty is disabled

`Console.success` is currently called in only one place but it relies on the fact that `pretty` console mode is enabled for it to make any sense.  This adds the ability to pass an "ugly" (less pretty?) message to `Console.success` (default: "success") and changes the Cordova dependency checker to use "installed" when showing a met-dependency.

Fixes meteor/meteor#7883
---
 tools/console/console.js | 4 ++--
 tools/cordova/project.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index de29118647..f8fe1b577f 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -920,12 +920,12 @@ _.extend(Console.prototype, {
 
   // A wrapper around Console.info. Prints the message out in green (if pretty),
   // with the CHECKMARK as the bullet point in front of it.
-  success: function (message) {
+  success: function (message, uglySuccessKeyword = "success") {
     var self = this;
     var checkmark;
 
     if (! self._pretty) {
-      return self.info(message);
+      return self.info(`${message}: ${uglySuccessKeyword}`);
     }
 
     if (process.platform === "win32") {
diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index aee36dceea..b49cec2595 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -314,7 +314,7 @@ to build apps for ${displayNameForPlatform(platform)}.`);
       for (requirement of requirements) {
         const name = requirement.name;
         if (requirement.installed) {
-          Console.success(name);
+          Console.success(name, "installed");
         } else {
           const reason = requirement.metadata && requirement.metadata.reason;
           if (reason) {

From 932750f77df037b7b4b3e5d04bcb79522588ee27 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 7 Oct 2016 14:07:14 +0300
Subject: [PATCH 319/688] Fix redeclared var & change to let

---
 tools/tests/cordova-platforms.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/tests/cordova-platforms.js b/tools/tests/cordova-platforms.js
index 4f50a1371c..3ed63449d5 100644
--- a/tools/tests/cordova-platforms.js
+++ b/tools/tests/cordova-platforms.js
@@ -4,7 +4,7 @@ var files = require('../fs/files.js');
 
 selftest.define("add cordova platforms", ["cordova"], function () {
   var s = new Sandbox();
-  var run;
+  let run;
 
   // Starting a run
   s.createApp("myapp", "package-tests");
@@ -15,7 +15,7 @@ selftest.define("add cordova platforms", ["cordova"], function () {
   run.match("meteor add-platform android");
   run.expectExit(1);
 
-  var run = s.run("add-platform", "android");
+  run = s.run("add-platform", "android");
   // Cordova may need to download cordova-android if it's not already
   // cached (in ~/.cordova).
   run.waitSecs(30);

From 3359d2397c41aba7bcf663496a60e06c3724e78e Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 7 Oct 2016 14:08:51 +0300
Subject: [PATCH 320/688] Add test which verifies the Cordova dependency
 messages are working

Previously, the Cordova message was failing in CI.  It wasn't caught on CircleCI since they have Cordova installed by default so this path was never tested.  I found this when I ran this through Semaphore CI who does not have Cordova available by default.

This test fails without meteor/meteor#7884 and passes with it.
---
 tools/tests/cordova-platforms.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tools/tests/cordova-platforms.js b/tools/tests/cordova-platforms.js
index 3ed63449d5..3b134a533d 100644
--- a/tools/tests/cordova-platforms.js
+++ b/tools/tests/cordova-platforms.js
@@ -32,4 +32,27 @@ selftest.define("add cordova platforms", ["cordova"], function () {
   run.matchErr("Please add the Android platform to your project first");
   run.match("meteor add-platform android");
   run.expectExit(1);
+
+  if (process.platform !== 'win32') {
+    const originalAndroidHome = process.env.ANDROID_HOME;
+    const originalPath = process.env.PATH;
+
+    // Hide the fact that Android is installed (as it is on CircleCI) by providing
+    // access to only bare system functionality. Android is installed globally in /usr/local/
+    // on CircleCI and on Mac.
+    s.set("ANDROID_HOME", undefined);
+    s.set("PATH", "/usr/bin:/bin:/usr/sbin:/sbin");
+
+    run = s.run("add-platform", "android");
+    run.match("added platform");
+    run.match("Your system does not yet seem to fulfill all requirements to build apps for Android");
+    run.expectExit(0);
+
+    run = s.run("remove-platform", "android");
+    run.match("removed");
+    run.expectExit(0);
+
+    s.set("ANDROID_HOME", originalAndroidHome);
+    s.set("PATH", originalPath);
+  }
 });

From 8c948d2ebc120c1924578b8a79fe2dc651661d8b Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 7 Oct 2016 14:17:11 +0300
Subject: [PATCH 321/688] Test: Ensure message when platform already added

If the platform is already added, it should provide the appropriate message.
---
 tools/tests/cordova-platforms.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/tests/cordova-platforms.js b/tools/tests/cordova-platforms.js
index 3b134a533d..cc29ab2480 100644
--- a/tools/tests/cordova-platforms.js
+++ b/tools/tests/cordova-platforms.js
@@ -22,6 +22,10 @@ selftest.define("add cordova platforms", ["cordova"], function () {
   run.match("added platform");
   run.expectExit(0);
 
+  run = s.run("add-platform", "android");
+  run.matchErr("android: platform is already added");
+  run.expectExit(1);
+
   run = s.run("remove-platform", "foo");
   run.matchErr("foo: platform is not");
   run.expectExit(1);

From 92bfc5f1e1de11b0251d212e7383101bb02d350e Mon Sep 17 00:00:00 2001
From: Christian Klaussner <developer@klaussner.me>
Date: Fri, 7 Oct 2016 15:12:52 +0200
Subject: [PATCH 322/688] Use `forEach` instead of `reduce`

---
 packages/standard-minifier-css/plugin/minify-css.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index 7b00058394..49078d63d2 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -128,7 +128,9 @@ var mergeCss = Profile("mergeCss", function (css) {
     concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
 
     // Create a dictionary of source map consumers for fast access
-    var consumers = Object.keys(originals).reduce(function (consumers, name) {
+    var consumers = Object.create(null);
+
+    Object.keys(originals).forEach(function (name) {
       var file = originals[name];
       var sourceMap = file.getSourceMap();
 
@@ -143,9 +145,7 @@ var mergeCss = Profile("mergeCss", function (css) {
           // figure out exactly why and fix it, but this will do for now.
         }
       }
-
-      return consumers;
-    }, Object.create(null));
+    });
 
     // Find mappings from the concatenated file back to the original files
     concatConsumer.eachMapping(function (mapping) {

From 83b3ca7f7aa360d88dc9a42573425ff3fb53c775 Mon Sep 17 00:00:00 2001
From: Christian Klaussner <developer@klaussner.me>
Date: Fri, 7 Oct 2016 15:31:38 +0200
Subject: [PATCH 323/688] Make sure only valid mappings are added to the map

---
 .../plugin/minify-css.js                      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index 49078d63d2..8a979034b6 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -149,23 +149,28 @@ var mergeCss = Profile("mergeCss", function (css) {
 
     // Find mappings from the concatenated file back to the original files
     concatConsumer.eachMapping(function (mapping) {
-      var consumer = consumers[mapping.source];
-      var source;
+      var source = mapping.source;
+      var consumer = consumers[source];
 
-      // If there is a source map for the original file, e.g., if it has been
-      // compiled from Less to CSS, find the source location in the original's
-      // original file. Otherwise, use the mapping of the concatenated file's
-      // source map.
       var original = {
         line: mapping.originalLine,
         column: mapping.originalColumn
       };
 
+      // If there is a source map for the original file, e.g., if it has been
+      // compiled from Less to CSS, find the source location in the original's
+      // original file. Otherwise, use the mapping of the concatenated file's
+      // source map.
       if (consumer) {
-        original = consumer.originalPositionFor(original);
-        source = original.source;
-      } else {
-        source = mapping.source;
+        var newOriginal = consumer.originalPositionFor(original);
+
+        // Finding the original position should always be possible (otherwise,
+        // one of the source maps would have incorrect mappings). However, in
+        // case there is something wrong, use the intermediate mapping.
+        if (newOriginal.source !== null) {
+          original = newOriginal;
+          source = original.source;
+        }
       }
 
       // Add a new mapping to the final source map
@@ -174,10 +179,7 @@ var mergeCss = Profile("mergeCss", function (css) {
           line: mapping.generatedLine,
           column: mapping.generatedColumn
         },
-        original: {
-          line: original.line,
-          column: original.column
-        },
+        original: original,
         source: source
       });
 

From 9ed63c22cce28737f875c42adb52e866ca55ec96 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 11:27:51 -0400
Subject: [PATCH 324/688] Bump coffeescript version to match coffee-script npm
 version.

As suggested by @mitar and agreed by @tmeasday.
---
 packages/coffeescript/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 360e52f583..ca6daeb68a 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.2.7"
+  version: "1.11.1_1"
 });
 
 Package.registerBuildPlugin({

From 0ffb9ac8247c53b9ab5658d75139b64771fd4de3 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@percolatestudio.com>
Date: Sat, 8 Oct 2016 06:47:35 +1100
Subject: [PATCH 325/688] Reconnect to mongo indefinitely. (#7880)

* Reconnect to mongo indefinitely.

A fix for https://github.com/meteor/meteor/issues/7822

It seems the driver now always autoReconnects, but only for 30s.

To get the old (sensible) behavior of endlessly reconnecting, we set `reconnectTries` to 0.

* Releasing an rc of mongo package
---
 packages/mongo/mongo_driver.js | 18 +++++++++---------
 packages/mongo/package.js      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 567c349e4c..5d5ecbdcb8 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -130,15 +130,15 @@ MongoConnection = function (url, options) {
   self._observeMultiplexers = {};
   self._onFailoverHook = new Hook;
 
-  var mongoOptions = _.extend({db: {safe: true}, server: {}, replSet: {}},
-                               Mongo._connectionOptions);
-
-  // Set autoReconnect to true, unless passed on the URL. Why someone
-  // would want to set autoReconnect to false, I'm not really sure, but
-  // keeping this for backwards compatibility for now.
-  if (!(/[\?&]auto_?[rR]econnect=/.test(url))) {
-    mongoOptions.server.auto_reconnect = true;
-  }
+  var mongoOptions = _.extend({
+      db: { safe: true },
+      // Set reconnectTries to 0 which means keep trying to reconnect forever,
+      // rather than the default of losing the connection permanently after 30
+      // retries (separated by 1000ms).
+      server: { reconnectTries: 0 },
+      replSet: {}
+    },
+    Mongo._connectionOptions);
 
   // Disable the native parser by default, unless specifically enabled
   // in the mongo URL.
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 5af9494d1f..c22cca55f2 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_1'
+  version: '1.1.12-2-rc.0'
 });
 
 Npm.depends({

From 904c77fe806a04f3b06e15118c599c0b2ccfab41 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 16:02:07 -0400
Subject: [PATCH 326/688] Add version constraints to dependencies of the mongo
 package.

---
 packages/accounts-base/package.js |  4 ++--
 packages/mongo/package.js         | 40 +++++++++++++++----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 113653732b..68d10fa8e1 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.5"
+  version: "1.2.12_1"
 });
 
 Package.onUse(function (api) {
@@ -23,7 +23,7 @@ Package.onUse(function (api) {
 
   // need this because of the Meteor.users collection but in the future
   // we'd probably want to abstract this away
-  api.use('mongo@1.1.10', ['client', 'server']);
+  api.use('mongo@1.1.12_2', ['client', 'server']);
 
   // If the 'blaze' package is loaded, we'll define some helpers like
   // {{currentUser}}.  If not, no biggie.
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index c22cca55f2..442b446f1b 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-2-rc.0'
+  version: '1.1.12_2'
 });
 
 Npm.depends({
@@ -21,45 +21,45 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@1.5.48-1-rc.0', 'server');
-  api.use('allow-deny');
+  api.use('npm-mongo@1.5.48_1', 'server');
+  api.use('allow-deny@1.0.5');
 
   api.use([
-    'random',
-    'ejson',
-    'underscore',
-    'minimongo',
-    'ddp',
-    'tracker',
-    'diff-sequence',
-    'mongo-id',
-    'check',
-    'ecmascript'
+    'random@1.0.10',
+    'ejson@1.0.12',
+    'underscore@1.0.9',
+    'minimongo@1.0.17',
+    'ddp@1.2.5',
+    'tracker@1.1.0',
+    'diff-sequence@1.0.6',
+    'mongo-id@1.0.5',
+    'check@1.2.3',
+    'ecmascript@0.5.8'
   ]);
 
   // Binary Heap data structure is used to optimize oplog observe driver
   // performance.
-  api.use('binary-heap', 'server');
+  api.use('binary-heap@1.0.9', 'server');
 
   // Allow us to detect 'insecure'.
-  api.use('insecure', {weak: true});
+  api.use('insecure@1.0.7', {weak: true});
 
   // Allow us to detect 'autopublish', and publish collections if it's loaded.
-  api.use('autopublish', 'server', {weak: true});
+  api.use('autopublish@1.0.7', 'server', {weak: true});
 
   // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
   // app even if it's configured in the environment. (This package will be
   // probably be removed before 1.0.)
-  api.use('disable-oplog', 'server', {weak: true});
+  api.use('disable-oplog@1.0.7', 'server', {weak: true});
 
   // defaultRemoteCollectionDriver gets its deployConfig from something that is
   // (for questionable reasons) initialized by the webapp package.
-  api.use('webapp', 'server', {weak: true});
+  api.use('webapp@1.3.11', 'server', {weak: true});
 
   // If the facts package is loaded, publish some statistics.
-  api.use('facts', 'server', {weak: true});
+  api.use('facts@1.0.9', 'server', {weak: true});
 
-  api.use('callback-hook', 'server');
+  api.use('callback-hook@1.0.9', 'server');
 
   // Stuff that should be exposed via a real API, but we haven't yet.
   api.export('MongoInternals', 'server');

From 7e7885c2a5b045ccd146e1ab5c9ba9c71d1ea41d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 16:30:15 -0400
Subject: [PATCH 327/688] Remove -beta.5 suffix from facts package version.

---
 packages/facts/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/facts/package.js b/packages/facts/package.js
index 9539c1bd12..1c73053180 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.5'
+  version: '1.0.9'
 });
 
 Package.onUse(function (api) {

From d8d70eaba65a6099bc9e9aae85cd70819cda2d2a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 16:37:00 -0400
Subject: [PATCH 328/688] Revert "Add version constraints to dependencies of
 the mongo package."

This (partially) reverts commit 904c77fe806a04f3b06e15118c599c0b2ccfab41.
---
 packages/accounts-base/package.js |  4 ++--
 packages/mongo/package.js         | 38 +++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 68d10fa8e1..113653732b 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12_1"
+  version: "1.2.12-beta.5"
 });
 
 Package.onUse(function (api) {
@@ -23,7 +23,7 @@ Package.onUse(function (api) {
 
   // need this because of the Meteor.users collection but in the future
   // we'd probably want to abstract this away
-  api.use('mongo@1.1.12_2', ['client', 'server']);
+  api.use('mongo@1.1.10', ['client', 'server']);
 
   // If the 'blaze' package is loaded, we'll define some helpers like
   // {{currentUser}}.  If not, no biggie.
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 442b446f1b..e924f867c4 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_2'
+  version: '1.1.12_3'
 });
 
 Npm.depends({
@@ -22,44 +22,44 @@ Npm.strip({
 
 Package.onUse(function (api) {
   api.use('npm-mongo@1.5.48_1', 'server');
-  api.use('allow-deny@1.0.5');
+  api.use('allow-deny');
 
   api.use([
-    'random@1.0.10',
-    'ejson@1.0.12',
-    'underscore@1.0.9',
-    'minimongo@1.0.17',
-    'ddp@1.2.5',
-    'tracker@1.1.0',
-    'diff-sequence@1.0.6',
-    'mongo-id@1.0.5',
-    'check@1.2.3',
-    'ecmascript@0.5.8'
+    'random',
+    'ejson',
+    'underscore',
+    'minimongo',
+    'ddp',
+    'tracker',
+    'diff-sequence',
+    'mongo-id',
+    'check',
+    'ecmascript'
   ]);
 
   // Binary Heap data structure is used to optimize oplog observe driver
   // performance.
-  api.use('binary-heap@1.0.9', 'server');
+  api.use('binary-heap', 'server');
 
   // Allow us to detect 'insecure'.
-  api.use('insecure@1.0.7', {weak: true});
+  api.use('insecure', {weak: true});
 
   // Allow us to detect 'autopublish', and publish collections if it's loaded.
-  api.use('autopublish@1.0.7', 'server', {weak: true});
+  api.use('autopublish', 'server', {weak: true});
 
   // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
   // app even if it's configured in the environment. (This package will be
   // probably be removed before 1.0.)
-  api.use('disable-oplog@1.0.7', 'server', {weak: true});
+  api.use('disable-oplog', 'server', {weak: true});
 
   // defaultRemoteCollectionDriver gets its deployConfig from something that is
   // (for questionable reasons) initialized by the webapp package.
-  api.use('webapp@1.3.11', 'server', {weak: true});
+  api.use('webapp', 'server', {weak: true});
 
   // If the facts package is loaded, publish some statistics.
-  api.use('facts@1.0.9', 'server', {weak: true});
+  api.use('facts', 'server', {weak: true});
 
-  api.use('callback-hook@1.0.9', 'server');
+  api.use('callback-hook', 'server');
 
   // Stuff that should be exposed via a real API, but we haven't yet.
   api.export('MongoInternals', 'server');

From 281a73ddece7bf85525c371bb04806800a75d396 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 18:28:32 -0400
Subject: [PATCH 329/688] Be sure to get original CSS contents from appropriate
 SourceMapConsumer.

https://github.com/meteor/meteor/pull/7877#issuecomment-252359894
---
 .../plugin/minify-css.js                      | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/packages/standard-minifier-css/plugin/minify-css.js b/packages/standard-minifier-css/plugin/minify-css.js
index 8a979034b6..bef5274b94 100644
--- a/packages/standard-minifier-css/plugin/minify-css.js
+++ b/packages/standard-minifier-css/plugin/minify-css.js
@@ -117,15 +117,11 @@ var mergeCss = Profile("mergeCss", function (css) {
       return originals[filename].getContentsAsString();
     });
 
-  var newMap;
-
   // Compose the concatenated file's source map with source maps from the
   // previous build step if necessary.
-  Profile.time("composing source maps", function () {
-    var concatConsumer;
-
-    newMap = new sourcemap.SourceMapGenerator();
-    concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
+  var newMap = Profile.time("composing source maps", function () {
+    var newMap = new sourcemap.SourceMapGenerator();
+    var concatConsumer = new sourcemap.SourceMapConsumer(stringifiedCss.map);
 
     // Create a dictionary of source map consumers for fast access
     var consumers = Object.create(null);
@@ -147,6 +143,10 @@ var mergeCss = Profile("mergeCss", function (css) {
       }
     });
 
+    // Maps each original source file name to the SourceMapConsumer that
+    // can provide its content.
+    var sourceToConsumerMap = Object.create(null);
+
     // Find mappings from the concatenated file back to the original files
     concatConsumer.eachMapping(function (mapping) {
       var source = mapping.source;
@@ -170,9 +170,22 @@ var mergeCss = Profile("mergeCss", function (css) {
         if (newOriginal.source !== null) {
           original = newOriginal;
           source = original.source;
+
+          if (source) {
+            // Since the new consumer provided a different
+            // original.source, we should ask it for the original source
+            // content instead of asking the concatConsumer.
+            sourceToConsumerMap[source] = consumer;
+          }
         }
       }
 
+      if (source && ! sourceToConsumerMap[source]) {
+        // If we didn't set sourceToConsumerMap[source] = consumer above,
+        // use the concatConsumer to determine the original content.
+        sourceToConsumerMap[source] = concatConsumer;
+      }
+
       // Add a new mapping to the final source map
       newMap.addMapping({
         generated: {
@@ -182,13 +195,19 @@ var mergeCss = Profile("mergeCss", function (css) {
         original: original,
         source: source
       });
-
-      // Set the correct content for the mapping's source
-      newMap.setSourceContent(
-        source,
-        (consumer || concatConsumer).sourceContentFor(source)
-      );
     });
+
+    // The consumer.sourceContentFor and newMap.setSourceContent methods
+    // are relatively fast, but not entirely trivial, so it's better to
+    // call them only once per source, rather than calling them every time
+    // we call newMap.addMapping in the loop above.
+    Object.keys(sourceToConsumerMap).forEach(function (source) {
+      var consumer = sourceToConsumerMap[source];
+      var content = consumer.sourceContentFor(source);
+      newMap.setSourceContent(source, content);
+    });
+
+    return newMap;
   });
 
   mergeCache.set(hashOfFiles, merged = {

From 68347cdb76ae80707bc4a3c5789b0d96f02c03b3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 18:48:57 -0400
Subject: [PATCH 330/688] Bump standard-minifier-css version to 1.3.1.

Because I previously published a 1.2.3 version with the same code as
1.3.0, I have also published a 1.2.4 with the same code as 1.3.1, though
of course you should use the latest version (1.3.1) if possible.
---
 packages/standard-minifier-css/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 6bec4cbaad..07fd802d14 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.2.2-beta.9',
+  version: '1.3.1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });

From dfd477568fb5e7ebde8c10289d6adcebbaac08fc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 12:05:55 -0400
Subject: [PATCH 331/688] Fix test failure by tolerating different line/column
 numbers.

---
 tools/tests/compiler-plugins.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/tests/compiler-plugins.js b/tools/tests/compiler-plugins.js
index 561513110f..7c8b178c30 100644
--- a/tools/tests/compiler-plugins.js
+++ b/tools/tests/compiler-plugins.js
@@ -329,8 +329,9 @@ selftest.define("compiler plugins - compiler throws", () => {
   // XXX This is wrong! The path on disk is packages/local-plugin/plugin.js, but
   // at some point we switched to the servePath which is based on the *plugin*'s
   // "package" name.
-  run.matchErr('packages/compilePrintme/plugin.js:5:1: Error in my ' +
-               'registerCompiler callback!');
+  run.matchErr(
+    /packages\/compilePrintme_plugin\.js:\d+:\d+: Error in my registerCompiler callback!/
+  );
   run.expectExit(1);
 });
 

From a1cfbc7ab2156acf88e25e45e7f86e1aa2b15b96 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 6 Oct 2016 17:17:10 -0400
Subject: [PATCH 332/688] Add profiling and use optimistic functions in
 LocalCatalog.

---
 tools/packaging/catalog/catalog-local.js | 97 +++++++++++++++---------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index 5a613c3e5a..c4add4ba05 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -5,6 +5,10 @@ var watch = require('../../fs/watch.js');
 var PackageSource = require('../../isobuild/package-source.js');
 import { KNOWN_ISOBUILD_FEATURE_PACKAGES } from '../../isobuild/compiler.js';
 import { sync as glob } from "glob";
+import { Profile } from "../../tool-env/profile.js";
+import {
+  optimisticHashOrNull,
+} from "../../fs/optimistic.js";
 
 // LocalCatalog represents packages located in the application's
 // package directory, other package directories specified via an
@@ -68,37 +72,38 @@ _.extend(LocalCatalog.prototype, {
   //    are package source trees.  Takes precedence over packages found
   //    via localPackageSearchDirs.
   //  - buildingIsopackets: true if we are building isopackets
-  initialize: function (options) {
+  initialize(options) {
     var self = this;
     buildmessage.assertInCapture();
 
     options = options || {};
 
-    function addPatternsToList(patterns, list) {
-      if (! patterns) {
-        return;
-      }
-
-      patterns.forEach(pattern => {
-        if (process.platform === "win32") {
-          pattern = files.convertToOSPath(pattern);
-
-          if (pattern.charAt(1) === ":") {
-            // Get rid of drive prefix, e.g. C:
-            pattern = pattern.slice(2);
-          }
-
-          // Convert to /forward/slash/path without /C
-          pattern = files.convertToPosixPath(pattern, true);
+    const addPatternsToList =
+      Profile("addPatternsToList", (patterns, list) => {
+        if (! patterns) {
+          return;
         }
 
-        // Note: glob expects POSIX-style paths, even on Windows.
-        // https://github.com/isaacs/node-glob/blob/master/README.md#windows
-        glob(pattern).forEach(
-          p => list.push(files.pathResolve(p))
-        );
+        patterns.forEach(pattern => {
+          if (process.platform === "win32") {
+            pattern = files.convertToOSPath(pattern);
+
+            if (pattern.charAt(1) === ":") {
+              // Get rid of drive prefix, e.g. C:
+              pattern = pattern.slice(2);
+            }
+
+            // Convert to /forward/slash/path without /C
+            pattern = files.convertToPosixPath(pattern, true);
+          }
+
+          // Note: glob expects POSIX-style paths, even on Windows.
+          // https://github.com/isaacs/node-glob/blob/master/README.md#windows
+          glob(pattern).forEach(
+            p => list.push(files.pathResolve(p))
+          );
+        });
       });
-    }
 
     addPatternsToList(
       options.localPackageSearchDirs,
@@ -249,25 +254,31 @@ _.extend(LocalCatalog.prototype, {
 
   // Compute self.effectiveLocalPackageDirs from self.localPackageSearchDirs and
   // self.explicitlyAddedLocalPackageDirs.
-  _computeEffectiveLocalPackages: function () {
+  _computeEffectiveLocalPackages() {
     var self = this;
     buildmessage.assertInCapture();
 
     self.effectiveLocalPackageDirs = [];
 
     buildmessage.enterJob("looking for packages", function () {
-      _.each(self.explicitlyAddedLocalPackageDirs, function (explicitDir) {
-        var packageJs = watch.readAndWatchFile(
-          self.packageLocationWatchSet,
-          files.pathJoin(explicitDir, 'package.js'));
-        // We asked specifically for this directory, but it has no package!
-        if (packageJs === null) {
+      _.each(self.explicitlyAddedLocalPackageDirs, (explicitDir) => {
+        const packageJsPath = files.pathJoin(explicitDir, "package.js");
+        const packageJsHash = optimisticHashOrNull(packageJsPath);
+
+        if (packageJsHash) {
+          self.packageLocationWatchSet.addFile(
+            packageJsPath,
+            packageJsHash,
+          );
+
+          self.effectiveLocalPackageDirs.push(explicitDir);
+
+        } else {
+          // We asked specifically for this directory, but it has no package!
           buildmessage.error("package has no package.js file", {
             file: explicitDir
           });
-          return;  // recover by ignoring
         }
-        self.effectiveLocalPackageDirs.push(explicitDir);
       });
 
       _.each(self.localPackageSearchDirs, function (searchDir) {
@@ -289,12 +300,17 @@ _.extend(LocalCatalog.prototype, {
           // Consider a directory to be a package source tree if it contains
           // 'package.js'. (We used to support isopacks in
           // localPackageSearchDirs, but no longer.)
-          var packageJs = watch.readAndWatchFile(
-            self.packageLocationWatchSet,
-            files.pathJoin(absPackageDir, 'package.js'));
-          if (packageJs !== null) {
+
+          const packageJsPath = files.pathJoin(absPackageDir, "package.js");
+          const packageJsHash = optimisticHashOrNull(packageJsPath);
+
+          if (packageJsHash) {
             // Let earlier package directories override later package
             // directories.
+            self.packageLocationWatchSet.addFile(
+              packageJsPath,
+              packageJsHash,
+            );
 
             // We don't know the name of the package, so we can't deal with
             // duplicates yet. We are going to have to rely on the fact that we
@@ -306,7 +322,7 @@ _.extend(LocalCatalog.prototype, {
     });
   },
 
-  _loadLocalPackages: function (buildingIsopackets) {
+  _loadLocalPackages(buildingIsopackets) {
     var self = this;
     buildmessage.assertInCapture();
 
@@ -407,4 +423,11 @@ _.extend(LocalCatalog.prototype, {
   }
 });
 
+["initialize",
+ "_computeEffectiveLocalPackages",
+ "_loadLocalPackages",
+].forEach(function (method) {
+  this[method] = Profile("LocalCatalog#" + method, this[method]);
+}, LocalCatalog.prototype);
+
 exports.LocalCatalog = LocalCatalog;

From 817876f7b35704d15fa29e119c99162aab40f30e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 6 Oct 2016 18:04:40 -0400
Subject: [PATCH 333/688] Use optimistic functions in
 PackageSource#initFromPackageDir.

---
 tools/isobuild/package-source.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index a1a50dd2fc..41f81b46aa 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -28,6 +28,12 @@ import {
   convert as convertColonsInPath
 } from '../utils/colon-converter.js';
 
+import {
+  optimisticReadFile,
+  optimisticHashOrNull,
+  optimisticStatOrNull,
+} from "../fs/optimistic.js";
+
 // XXX: This is a medium-term hack, to avoid having the user set a package name
 // & test-name in package.describe. We will change this in the new control file
 // world in some way.
@@ -446,7 +452,7 @@ _.extend(PackageSource.prototype, {
   // - name: override the name of this package with a different name.
   // - buildingIsopackets: true if this is being scanned in the process
   //   of building isopackets
-  initFromPackageDir: Profile("initFromPackageDir", function (dir, options) {
+  initFromPackageDir: Profile("PackageSource#initFromPackageDir", function (dir, options) {
     var self = this;
     buildmessage.assertInCapture();
     var isPortable = true;
@@ -488,15 +494,16 @@ _.extend(PackageSource.prototype, {
 
     const packageFileHashes = Object.create(null);
     const packageJsPath = files.pathJoin(self.sourceRoot, 'package.js');
-    const packageJsCode = files.readFile(packageJsPath);
-    packageFileHashes[packageJsPath] = watch.sha1(packageJsCode);
+    const packageJsCode = optimisticReadFile(packageJsPath);
+    packageFileHashes[packageJsPath] =
+      optimisticHashOrNull(packageJsPath);
 
     const pkgJsonPath = files.pathJoin(self.sourceRoot, 'package.json');
-    const pkgJsonStat = files.statOrNull(pkgJsonPath);
+    const pkgJsonStat = optimisticStatOrNull(pkgJsonPath);
     if (pkgJsonStat &&
         pkgJsonStat.isFile()) {
       packageFileHashes[pkgJsonPath] =
-        watch.sha1(files.readFile(pkgJsonPath));
+        optimisticHashOrNull(pkgJsonPath);
     }
 
     function watchPackageFiles(watchSet) {

From 875222c8ec15d3e28dc3785ba5c3311e4373c157 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 19:32:18 -0400
Subject: [PATCH 334/688] Update the `optimism` npm package to v0.2.3.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index d2ceceb8b6..d165e0da93 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -52,7 +52,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
-    optimism: "0.2.2",
+    optimism: "0.2.3",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
     longjohn: '0.2.11'

From 70fb77dedea74b3680d963d1d983ad92c9c616cd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Oct 2016 19:34:01 -0400
Subject: [PATCH 335/688] Bump $BUNDLE_VERSION to 4.3.3 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 29e4d35209..e48a8628dd 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.2
+BUNDLE_VERSION=4.3.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From e34e236fe089067072c049a65693c8922d24e11e Mon Sep 17 00:00:00 2001
From: Mehdi AHRAOUI <benabed.mehdi@gmail.com>
Date: Sun, 28 Aug 2016 22:01:21 +0100
Subject: [PATCH 336/688] Scaffold an official project structure

Scaffold an official project structure
Add --bare option to meteor create

Notice scaffold options on meteor create

add full skeleton

add spaces

remove shell-server package from skew-full + add description of new packages

Add --bare option to meteor create

Notice scaffold options on meteor create

add full skeleton

add spaces

remove shell-server package from skew-full + add description of new packages

improve PR

resolve conflict

Fix rebase

fix static-assets readme

Fix tipo

Remove insecure and auto publish packages

Remove useraccounts-configuration.js

add tests

fix PR
---
 tools/cli/commands.js                         |  38 ++++--
 tools/cli/help.txt                            |   7 +-
 tools/static-assets/README.md                 |   8 ++
 tools/static-assets/skel-bare/.gitignore      |   1 +
 .../skel-bare/.meteor/.gitignore              |   1 +
 .../static-assets/skel-bare/.meteor/packages  |  22 ++++
 .../static-assets/skel-bare/.meteor/platforms |   2 +
 tools/static-assets/skel-bare/package.json    |  10 ++
 tools/static-assets/skel-full/.gitignore      |   1 +
 .../skel-full/.meteor/.gitignore              |   1 +
 .../static-assets/skel-full/.meteor/packages  |  26 ++++
 .../static-assets/skel-full/.meteor/platforms |   2 +
 .../static-assets/skel-full/client/head.html  |   3 +
 tools/static-assets/skel-full/client/main.js  |   4 +
 .../static-assets/skel-full/client/main.less  |   1 +
 .../skel-full/imports/api/links/links.js      |   5 +
 .../imports/api/links/links.tests.js          |  21 ++++
 .../skel-full/imports/api/links/methods.js    |  19 +++
 .../imports/api/links/methods.tests.js        |  51 ++++++++
 .../imports/api/links/server/publications.js  |  10 ++
 .../api/links/server/publications.tests.js    |  27 +++++
 .../skel-full/imports/startup/both/index.js   |   1 +
 .../skel-full/imports/startup/client/index.js |   3 +
 .../imports/startup/client/routes.js          |  21 ++++
 .../imports/startup/server/fixtures.js        |  37 ++++++
 .../skel-full/imports/startup/server/index.js |   4 +
 .../imports/startup/server/register-api.js    |   4 +
 .../imports/ui/components/hello/hello.html    |   4 +
 .../imports/ui/components/hello/hello.js      |  19 +++
 .../imports/ui/components/info/info.html      |  15 +++
 .../imports/ui/components/info/info.js        |  33 +++++
 .../imports/ui/layouts/body/body.html         |   3 +
 .../skel-full/imports/ui/layouts/body/body.js |   1 +
 .../skel-full/imports/ui/pages/home/home.html |   4 +
 .../skel-full/imports/ui/pages/home/home.js   |   4 +
 .../imports/ui/pages/not-found/not-found.html |  12 ++
 .../imports/ui/pages/not-found/not-found.js   |   1 +
 .../imports/ui/stylesheets/not-found.less     |  35 ++++++
 tools/static-assets/skel-full/package.json    |  10 ++
 .../static-assets/skel-full/private/README.md |   3 +
 .../skel-full/public/img/404.svg              | 113 ++++++++++++++++++
 .../skel-full/public/img/bg-footer.svg        |  12 ++
 tools/static-assets/skel-full/server/main.js  |   4 +
 43 files changed, 592 insertions(+), 11 deletions(-)
 create mode 100644 tools/static-assets/skel-bare/.gitignore
 create mode 100644 tools/static-assets/skel-bare/.meteor/.gitignore
 create mode 100644 tools/static-assets/skel-bare/.meteor/packages
 create mode 100644 tools/static-assets/skel-bare/.meteor/platforms
 create mode 100644 tools/static-assets/skel-bare/package.json
 create mode 100644 tools/static-assets/skel-full/.gitignore
 create mode 100644 tools/static-assets/skel-full/.meteor/.gitignore
 create mode 100644 tools/static-assets/skel-full/.meteor/packages
 create mode 100644 tools/static-assets/skel-full/.meteor/platforms
 create mode 100644 tools/static-assets/skel-full/client/head.html
 create mode 100644 tools/static-assets/skel-full/client/main.js
 create mode 100644 tools/static-assets/skel-full/client/main.less
 create mode 100644 tools/static-assets/skel-full/imports/api/links/links.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/links.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/methods.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/methods.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/server/publications.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/both/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/client/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/client/routes.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/fixtures.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/register-api.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/hello/hello.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/hello/hello.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/info/info.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/info/info.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/layouts/body/body.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/layouts/body/body.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/home/home.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/home/home.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
 create mode 100644 tools/static-assets/skel-full/package.json
 create mode 100644 tools/static-assets/skel-full/private/README.md
 create mode 100644 tools/static-assets/skel-full/public/img/404.svg
 create mode 100644 tools/static-assets/skel-full/public/img/bg-footer.svg
 create mode 100644 tools/static-assets/skel-full/server/main.js

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 51d8789917..6bbb9ecbf5 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -329,7 +329,7 @@ function doRunCommand(options) {
   if (options.production) {
     Console.warn(
       "Warning: The --production flag should only be used to simulate production " +
-      "bundling for testing purposes. Use meteor build to create a bundle for " + 
+      "bundling for testing purposes. Use meteor build to create a bundle for " +
       "production deployment. See: https://guide.meteor.com/deployment.html"
     );
   }
@@ -433,7 +433,9 @@ main.registerCommand({
   options: {
     list: { type: Boolean },
     example: { type: String },
-    package: { type: Boolean }
+    package: { type: Boolean },
+    full: { type: Boolean },
+    bare: { type: Boolean }
   },
   catalogRefresh: new catalog.Refresh.Never()
 }, function (options) {
@@ -576,7 +578,7 @@ main.registerCommand({
 
     Console.info();
     Console.info("To create an example, simply", Console.command("git clone"),
-      "the relevant repository and branch (run", 
+      "the relevant repository and branch (run",
       Console.command("'meteor create --example <name>'"),
       " to see the full command).");
     return 0;
@@ -676,7 +678,16 @@ main.registerCommand({
     toIgnore.push(/(\.html|\.js|\.css)/)
   }
 
-  files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', 'skel'), appPath, {
+  let skelName = 'skel';
+
+  if(options.bare){
+    skelName += '-bare';
+  }
+  else if(options.full){
+    skelName += '-full';
+  }
+
+  files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', skelName), appPath, {
     transformFilename: function (f) {
       return transform(f);
     },
@@ -767,6 +778,15 @@ main.registerCommand({
     Console.url("https://www.meteor.com/learn"),
       Console.options({ indent: 2 }));
 
+  if (!options.full && !options.bare){
+    // Notice people about --bare and --full
+    const bareOptionNotice = 'meteor create --bare to create an empty app.';
+    const fullOptionNotice = 'meteor create --full to create a scaffolded app.';
+
+    Console.info("");
+    Console.info(bareOptionNotice + '\n' + fullOptionNotice);
+  }
+
   Console.info("");
 });
 
@@ -983,7 +1003,7 @@ ${Console.command("meteor build ../output")}`,
           { title: `building Cordova app for \
 ${cordova.displayNameForPlatform(platform)}` }, () => {
             let buildOptions = { release: !options.debug };
-            
+
             const buildPath = files.pathJoin(
               projectContext.getProjectLocalDirectory('cordova-build'),
               'platforms', platform);
@@ -1208,7 +1228,7 @@ main.registerCommand({
       Console.command("meteor deploy appname"), Console.options({ indent: 2 }));
     return 1;
   }
-  
+
   if (process.env.MONGO_URL) {
     Console.info("As a precaution, meteor reset only clears the local database that is " +
                  "provided by meteor run for development. The database specified with " +
@@ -1639,7 +1659,7 @@ function doTestCommand(options) {
 
     global.testCommandMetadata.isAppTest = options['full-app'];
     global.testCommandMetadata.isTest = !global.testCommandMetadata.isAppTest;
-    
+
     projectContextOptions.projectDir = options.appDir;
     projectContextOptions.projectLocalDir = files.pathJoin(testRunnerAppDir, '.meteor', 'local');
 
@@ -1669,7 +1689,7 @@ function doTestCommand(options) {
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'isopacks');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'plugin-cache');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'shell');
-    
+
     projectContext = new projectContextModule.ProjectContext(projectContextOptions);
 
     main.captureAndExit("=> Errors while setting up tests:", function () {
@@ -1771,7 +1791,7 @@ var runTestAppForPackages = function (projectContext, options) {
     minifyMode: options.production ? 'production' : 'development'
   };
   buildOptions.buildMode = "test";
-  
+
   if (options.deploy) {
     // Run the constraint solver and build local packages.
     main.captureAndExit("=> Errors while initializing project:", function () {
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index aeb0fd090a..380ac99bbe 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -89,14 +89,15 @@ Options:
 
 >>> create
 Create a new project.
-Usage: meteor create [--release <release>] <path>
+Usage: meteor create [--release <release>] [--bare|--full] <path>
        meteor create [--release <release>] --example <example_name> [<path>]
        meteor create --list
        meteor create --package [<package_name>]
 
 Make a subdirectory named <path> if it doesn't exist and create a new Meteor app
 there. You can pass an absolute path, relative path, or '.' for the current
-directory.
+directory. Use the --bare option to create an empty app. To scaffold the app
+use the --full option.
 
 With the --package option, creates a Meteor package instead of an app. If you're
 in an app, the package will go in the app's top-level 'packages' directory;
@@ -115,6 +116,8 @@ Options:
   --package  Create a new meteor package instead of an app.
   --example  Example template to use.
   --list     Show list of available examples.
+  --bare     Create an empty app.
+  --full     Create a scaffolded app.
 
 
 >>> update
diff --git a/tools/static-assets/README.md b/tools/static-assets/README.md
index ddc7166572..43fa20da30 100644
--- a/tools/static-assets/README.md
+++ b/tools/static-assets/README.md
@@ -12,6 +12,14 @@ Sometimes, for code sharing, the JS files can be imported by parts of the tool
 destination on `meteor create` command. The important part of the skeleton is
 the packages it includes by default.
 
+## skel-bare - Empty App Skeleton
+
+Similar to `skel`, `skel-bare` is copied on `meteor create --bare` command.
+
+## skel-full - Scaffold App Skeleton
+
+Similar to `skel`, `skel-full` is copied on `meteor create --full` command.
+
 ## skel-pack - Package Skeleton
 
 Similar to `skel`, `skel-pack` is copied on `meteor create --package` command.
diff --git a/tools/static-assets/skel-bare/.gitignore b/tools/static-assets/skel-bare/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/static-assets/skel-bare/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/static-assets/skel-bare/.meteor/.gitignore b/tools/static-assets/skel-bare/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/static-assets/skel-bare/.meteor/packages b/tools/static-assets/skel-bare/.meteor/packages
new file mode 100644
index 0000000000..1615051104
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/packages
@@ -0,0 +1,22 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+reactive-var            # Reactive variable for tracker
+jquery                  # Helpful client-side library
+tracker                 # Meteor's client-side reactive programming library
+
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers.
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+
+autopublish             # Publish all data to the clients (for prototyping)
+insecure                # Allow all DB writes from clients (for prototyping)
diff --git a/tools/static-assets/skel-bare/.meteor/platforms b/tools/static-assets/skel-bare/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/static-assets/skel-bare/package.json b/tools/static-assets/skel-bare/package.json
new file mode 100644
index 0000000000..509ac7e54f
--- /dev/null
+++ b/tools/static-assets/skel-bare/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "~name~",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "meteor-node-stubs": "~0.2.0"
+  }
+}
diff --git a/tools/static-assets/skel-full/.gitignore b/tools/static-assets/skel-full/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/static-assets/skel-full/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/static-assets/skel-full/.meteor/.gitignore b/tools/static-assets/skel-full/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages
new file mode 100644
index 0000000000..1920d7a37f
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/packages
@@ -0,0 +1,26 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+reactive-var            # Reactive variable for tracker
+jquery                  # Helpful client-side library
+tracker                 # Meteor's client-side reactive programming library
+
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers.
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+
+kadira:flow-router      # FlowRouter is a very simple router for Meteor
+kadira:blaze-layout     # Layout manager for blaze (works well with FlowRouter)
+less                    # Leaner CSS language
+
+
+practicalmeteor:mocha             # A package for writing and running your meteor app and package tests with mocha
+johanbrook:publication-collector  # Test a Meteor publication by collecting its output
diff --git a/tools/static-assets/skel-full/.meteor/platforms b/tools/static-assets/skel-full/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/static-assets/skel-full/client/head.html b/tools/static-assets/skel-full/client/head.html
new file mode 100644
index 0000000000..4ca4a25383
--- /dev/null
+++ b/tools/static-assets/skel-full/client/head.html
@@ -0,0 +1,3 @@
+<head>
+  <title>~name~</title>
+</head>
diff --git a/tools/static-assets/skel-full/client/main.js b/tools/static-assets/skel-full/client/main.js
new file mode 100644
index 0000000000..f5384b43a6
--- /dev/null
+++ b/tools/static-assets/skel-full/client/main.js
@@ -0,0 +1,4 @@
+// Client entry point, imports all client code
+
+import '/imports/startup/client';
+import '/imports/startup/both';
diff --git a/tools/static-assets/skel-full/client/main.less b/tools/static-assets/skel-full/client/main.less
new file mode 100644
index 0000000000..bca7b340a3
--- /dev/null
+++ b/tools/static-assets/skel-full/client/main.less
@@ -0,0 +1 @@
+@import "{}/imports/ui/stylesheets/not-found.less";
diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
new file mode 100644
index 0000000000..7c700cf2c6
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -0,0 +1,5 @@
+// Definition of the links collection
+
+import { Mongo } from 'meteor/mongo';
+
+export const Links = new Mongo.Collection('links');
diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
new file mode 100644
index 0000000000..f5dadd915d
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -0,0 +1,21 @@
+// Tests for the behavior of the links collection
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { assert } from 'meteor/practicalmeteor:chai';
+import { Links } from './links.js';
+
+if (Meteor.isServer) {
+  describe('links collection', function () {
+    it('insert correctly', function () {
+      const link = Links.insert({ title:'meteor homepage', url: 'https://www.meteor.com'});
+      const added = Links.find({_id: link});
+      const collectionName = added._getCollectionName();
+      const count = added.count();
+
+      assert.equal(collectionName, 'links');
+      assert.equal(count, 1);
+    })
+  })
+}
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
new file mode 100644
index 0000000000..7d5cace149
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -0,0 +1,19 @@
+// Methods related to links
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from './links.js';
+import { check } from 'meteor/check';
+
+Meteor.methods({
+  'links.insert'(title, url) {
+    check(url, String);
+    check(title, String);
+
+    // Check if this is a valid url
+    if (!url.match(/((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g)){
+      throw new Meteor.Error('Bad url. I.e https://www.meteor.com');
+    }
+
+    return Links.insert({url, title, createdAt: new Date()});
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
new file mode 100644
index 0000000000..3403e4e912
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -0,0 +1,51 @@
+// Tests for links methods
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { chai, assert } from 'meteor/practicalmeteor:chai';
+import { Links } from './links.js';
+import './methods.js';
+
+if (Meteor.isServer) {
+  describe('links methods', function () {
+
+    beforeEach(() => {
+      Links.remove({});
+    })
+
+    it('can add new link', function () {
+      const addLink = Meteor.server.method_handlers['links.insert'];
+
+      addLink.apply({}, ['meteor.com', 'https://www.meteor.com']);
+
+      assert.equal(Links.find().count(), 1);
+    })
+    it('insert link method validation', function () {
+      const addLink = Meteor.server.method_handlers['links.insert'];
+
+      let errors = 0;
+
+      // Check url is String
+      try {
+        addLink.apply({}, ['meteor.com', 2]);
+      } catch (e) {
+        errors++;
+      }
+      // Check title is String
+      try {
+        addLink.apply({}, [1, 'meteor.com']);
+      } catch (e) {
+        errors++;
+      }
+      // Check url is valid
+      try {
+        addLink.apply({}, ['meteor.com', 'meteor.com']);
+      } catch (e) {
+        errors++;
+      }
+
+      assert.equal(errors, 3);
+    })
+  })
+}
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
new file mode 100644
index 0000000000..62dd32ae1e
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -0,0 +1,10 @@
+//All links-related publications
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from '../links.js';
+
+Meteor.publish({
+  'links.all': function () {
+    return Links.find({});
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
new file mode 100644
index 0000000000..7b29ab376b
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -0,0 +1,27 @@
+// Tests for the links publications
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { assert } from 'meteor/practicalmeteor:chai';
+import { Links } from '../links.js';
+import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
+import './publications.js';
+
+describe('links publications', function () {
+
+  beforeEach(() => {
+    Links.remove({});
+    Links.insert({ title: 'meteor homepage', url: 'https://www.meteor.com'});
+  })
+
+  describe('links.all', function () {
+    it('sends all links', function (done) {
+      const collector = new PublicationCollector();
+      collector.collect('links.all', (collections) => {
+        assert.equal(collections.links.length, 1);
+        done();
+      });
+    });
+  });
+})
diff --git a/tools/static-assets/skel-full/imports/startup/both/index.js b/tools/static-assets/skel-full/imports/startup/both/index.js
new file mode 100644
index 0000000000..22b9c1af13
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/both/index.js
@@ -0,0 +1 @@
+// Import modules used by both client and server through a single index entry point (i.e. useraccounts configuration file).
diff --git a/tools/static-assets/skel-full/imports/startup/client/index.js b/tools/static-assets/skel-full/imports/startup/client/index.js
new file mode 100644
index 0000000000..fd8ca6b7bd
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/client/index.js
@@ -0,0 +1,3 @@
+// Import client startup through a single index entry point
+
+import './routes.js';
diff --git a/tools/static-assets/skel-full/imports/startup/client/routes.js b/tools/static-assets/skel-full/imports/startup/client/routes.js
new file mode 100644
index 0000000000..df5f472d6d
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/client/routes.js
@@ -0,0 +1,21 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
+// Import needed templates
+import '../../ui/layouts/body/body.js';
+import '../../ui/pages/home/home.js';
+import '../../ui/pages/not-found/not-found.js';
+
+// Set up all routes in the app
+FlowRouter.route('/', {
+  name: 'App.home',
+  action() {
+    BlazeLayout.render('App_body', { main: 'App_home' });
+  },
+});
+
+FlowRouter.notFound = {
+  action() {
+    BlazeLayout.render('App_body', { main: 'App_notFound' });
+  },
+};
diff --git a/tools/static-assets/skel-full/imports/startup/server/fixtures.js b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
new file mode 100644
index 0000000000..c60a6960c1
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
@@ -0,0 +1,37 @@
+// Fill the DB with example data on startup
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from '../../api/links/links.js';
+
+Meteor.startup(() => {
+
+  // if the Links collection is empty
+  if (Links.find().count() === 0) {
+    const data = [
+      {
+        'title': 'Do the Tutorial',
+        'url': 'https://www.meteor.com/try',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Follow the Guide',
+        'url': 'http://guide.meteor.com',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Read the Docs',
+        'url': 'https://docs.meteor.com',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Discussions',
+        'url': 'https://forums.meteor.com',
+        'createdAt': new Date()
+      },
+    ];
+
+    data.forEach((link) => {
+      Links.insert(link);
+    });
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/startup/server/index.js b/tools/static-assets/skel-full/imports/startup/server/index.js
new file mode 100644
index 0000000000..4b8e0a0865
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/index.js
@@ -0,0 +1,4 @@
+// Import server startup through a single index entry point
+
+import './fixtures.js';
+import './register-api.js';
diff --git a/tools/static-assets/skel-full/imports/startup/server/register-api.js b/tools/static-assets/skel-full/imports/startup/server/register-api.js
new file mode 100644
index 0000000000..79e834f4ac
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/register-api.js
@@ -0,0 +1,4 @@
+// Register your apis here
+
+import '../../api/links/methods.js';
+import '../../api/links/server/publications.js';
diff --git a/tools/static-assets/skel-full/imports/ui/components/hello/hello.html b/tools/static-assets/skel-full/imports/ui/components/hello/hello.html
new file mode 100644
index 0000000000..58bd0b35d6
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/hello/hello.html
@@ -0,0 +1,4 @@
+<template name="hello">
+  <button>Click Me</button>
+  <p>You've pressed the button {{counter}} times.</p>
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/hello/hello.js b/tools/static-assets/skel-full/imports/ui/components/hello/hello.js
new file mode 100644
index 0000000000..e4aff73a79
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/hello/hello.js
@@ -0,0 +1,19 @@
+import './hello.html';
+
+Template.hello.onCreated(function helloOnCreated() {
+  // counter starts at 0
+  this.counter = new ReactiveVar(0);
+});
+
+Template.hello.helpers({
+  counter() {
+    return Template.instance().counter.get();
+  },
+});
+
+Template.hello.events({
+  'click button'(event, instance) {
+    // increment the counter when button is clicked
+    instance.counter.set(instance.counter.get() + 1);
+  },
+});
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.html b/tools/static-assets/skel-full/imports/ui/components/info/info.html
new file mode 100644
index 0000000000..6c2a10a61b
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.html
@@ -0,0 +1,15 @@
+<template name="info">
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li>
+      <form class="info-link-add">
+        <input type="text" name="title" placeholder="Title" required>
+        <input type="url" name="url" placeholder="Url" required>
+        <input type="submit" name="submit" value="Add new link">
+      </form>
+    </li>
+  {{#each links}}
+    <li><a href="{{url}}" target="_blank">{{title}}</a></li>
+  {{/each}}
+  </ul>
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
new file mode 100644
index 0000000000..de5ce70014
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -0,0 +1,33 @@
+import './info.html';
+import { Links } from '/imports/api/links/links.js'
+import { Meteor } from 'meteor/meteor'
+
+Template.info.onCreated(function infoOnCreated() {
+  Meteor.subscribe('links.all');
+});
+
+Template.info.helpers({
+  links() {
+    return Links.find({});
+  },
+});
+
+Template.info.events({
+  'submit .info-link-add': function (e){
+    e.preventDefault();
+
+    const target = e.target;
+    const title = target.title;
+    const url = target.url;
+
+    Meteor.call('links.insert', title.value, url.value, function (error) {
+      if(error){
+        alert(error.error);
+      }
+      else{
+        title.value = '';
+        url.value = '';
+      }
+    });
+  }
+})
diff --git a/tools/static-assets/skel-full/imports/ui/layouts/body/body.html b/tools/static-assets/skel-full/imports/ui/layouts/body/body.html
new file mode 100644
index 0000000000..4a8480d6c3
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/layouts/body/body.html
@@ -0,0 +1,3 @@
+<template name="App_body">
+  {{> Template.dynamic template=main}}
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/layouts/body/body.js b/tools/static-assets/skel-full/imports/ui/layouts/body/body.js
new file mode 100644
index 0000000000..2da6810f1f
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/layouts/body/body.js
@@ -0,0 +1 @@
+import './body.html';
diff --git a/tools/static-assets/skel-full/imports/ui/pages/home/home.html b/tools/static-assets/skel-full/imports/ui/pages/home/home.html
new file mode 100644
index 0000000000..8b2e47142f
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/home/home.html
@@ -0,0 +1,4 @@
+<template name="App_home">
+  {{> hello}}
+  {{> info}}
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/pages/home/home.js b/tools/static-assets/skel-full/imports/ui/pages/home/home.js
new file mode 100644
index 0000000000..f97ae7b7ec
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/home/home.js
@@ -0,0 +1,4 @@
+import './home.html';
+
+import '../../components/hello/hello.js';
+import '../../components/info/info.js';
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
new file mode 100644
index 0000000000..4bfc6fe2a8
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
@@ -0,0 +1,12 @@
+<template name="App_notFound">
+  <div id="not-found">
+    <div class="not-found-image">
+      <img src="/img/404.svg" alt="" />
+    </div>
+    <div class="not-found-title">
+      <h1>Sorry, that page doesn't exist</h1>
+      <a href="/" class="gotohomepage">Go to home</a>
+    </div>
+  </div>
+
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
new file mode 100644
index 0000000000..f252259132
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
@@ -0,0 +1 @@
+import './not-found.html';
diff --git a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
new file mode 100644
index 0000000000..12e840d5b8
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
@@ -0,0 +1,35 @@
+#not-found{
+  width: 700px;
+  margin: 0 auto;
+  .not-found-image{
+    width: 25%;
+    float: left;
+  }
+  .not-found-title{
+    width: 70%;
+    float: right;
+    background: url(/img/bg-footer.svg);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;
+    min-height: 400px;
+    h1{
+      font-size: 30px;
+      color: #1f2128;
+      margin-bottom: 20px;
+      margin-top: 155px;
+    }
+    a.gotohomepage{
+      background-color: #de4f4f;
+      color: #fff;
+      width: 180px;
+      line-height: 40px;
+      display: block;
+      text-align: center;
+      font-size: 14px;
+      text-decoration: none;
+      text-transform: uppercase;
+      height: 40px;
+    }
+  }
+}
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
new file mode 100644
index 0000000000..509ac7e54f
--- /dev/null
+++ b/tools/static-assets/skel-full/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "~name~",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "meteor-node-stubs": "~0.2.0"
+  }
+}
diff --git a/tools/static-assets/skel-full/private/README.md b/tools/static-assets/skel-full/private/README.md
new file mode 100644
index 0000000000..2071259f55
--- /dev/null
+++ b/tools/static-assets/skel-full/private/README.md
@@ -0,0 +1,3 @@
+**private folder**
+
+All files inside a top-level directory called `private/` are only accessible from server code and can be loaded via the [`Assets`](http://docs.meteor.com/#/full/assets_getText) API. This can be used for private data files and any files that are in your project directory that you don't want to be accessible from the outside.
diff --git a/tools/static-assets/skel-full/public/img/404.svg b/tools/static-assets/skel-full/public/img/404.svg
new file mode 100644
index 0000000000..53fa7e7bf9
--- /dev/null
+++ b/tools/static-assets/skel-full/public/img/404.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 213.4 496.9" style="enable-background:new 0 0 213.4 496.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#576492;}
+	.st1{fill:#697089;}
+	.st2{font-family:'ProximaNova-Light';}
+	.st3{font-size:16.6919px;}
+	.st4{font-size:47px;}
+	.st5{fill:none;stroke:#576492;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<g id="XMLID_20_">
+	<g id="XMLID_18_">
+		<path id="XMLID_19_" class="st0" d="M117.8,456.3l-7.8-20l-32.3,12.6l-1.3-3.4l13.8-57.2l4.3-1.7l17.6,45.3l10.4-4l1.2,3.1
+			l-10.4,4l7.8,20L117.8,456.3z M92.7,391.6l-12.5,52.8l28.7-11.2L92.7,391.6z"/>
+	</g>
+	<g id="XMLID_14_">
+		<path id="XMLID_15_" class="st0" d="M98.7,282l7.6-20.1l-32.4-12.2l1.3-3.4l48.4-33.4l4.3,1.6l-17.1,45.5l10.4,3.9l-1.2,3.1
+			l-10.4-3.9l-7.6,20.1L98.7,282z M123.1,217l-44.6,31l28.8,10.8L123.1,217z"/>
+	</g>
+	<g id="XMLID_25_">
+		<text id="XMLID_70_" transform="matrix(1.1336 0 0 1 43.3333 248.7083)" class="st1 st2 st3">+</text>
+		<text id="XMLID_102_" transform="matrix(1.1336 0 0 1 12.8275 227.8912)" class="st1 st2 st3">+</text>
+		<text id="XMLID_105_" transform="matrix(1.1336 0 0 1 -1.831055e-04 151.8095)" class="st1 st2 st3">+</text>
+		<text id="XMLID_103_" transform="matrix(1.1336 0 0 1 191.9995 71.0848)" class="st1 st2 st3">+</text>
+		<text id="XMLID_104_" transform="matrix(1.1336 0 0 1 191.9999 228.4598)" class="st1 st2 st3">+</text>
+		<text id="XMLID_101_" transform="matrix(1 0 0 1 65.7456 228.4598)" class="st1 st2 st4">.</text>
+		<text id="XMLID_108_" transform="matrix(1 0 0 1 8.4122 170.9184)" class="st1 st2 st4">.</text>
+		<text id="XMLID_109_" transform="matrix(1 0 0 1 177.2454 223.6633)" class="st1 st2 st4">.</text>
+		<text id="XMLID_110_" transform="matrix(1 0 0 1 203.079 207.7512)" class="st1 st2 st4">.</text>
+		<text id="XMLID_106_" transform="matrix(1.1336 0 0 1 48.1553 408.8952)" class="st1 st2 st3">+</text>
+		<text id="XMLID_118_" transform="matrix(1.1336 0 0 1 68.7441 292.113)" class="st1 st2 st3">+</text>
+		<text id="XMLID_100_" transform="matrix(1 0 0 1 66.4658 394.8952)" class="st1 st2 st4">.</text>
+		<text id="XMLID_99_" transform="matrix(1 0 0 1 49.9659 298.7329)" class="st1 st2 st4">.</text>
+		<text id="XMLID_117_" transform="matrix(1.1336 0 0 1 140.082 372.895)" class="st1 st2 st3">+</text>
+		<text id="XMLID_116_" transform="matrix(1 0 0 1 125.3273 388.8376)" class="st1 st2 st4">.</text>
+		<text id="XMLID_115_" transform="matrix(1 0 0 1 160.0616 383.28)" class="st1 st2 st4">.</text>
+		<text id="XMLID_114_" transform="matrix(1.1336 0 0 1 17.7247 59.883)" class="st1 st2 st3">+</text>
+		<text id="XMLID_113_" transform="matrix(1 0 0 1 2.9702 55.0865)" class="st1 st2 st4">.</text>
+		<text id="XMLID_107_" transform="matrix(1 0 0 1 28.8038 39.1744)" class="st1 st2 st4">.</text>
+		<text id="XMLID_111_" transform="matrix(1 0 0 1 179.2975 90.645)" class="st1 st2 st4">.</text>
+		<text id="XMLID_112_" transform="matrix(1 0 0 1 145.079 261.77)" class="st1 st2 st4">.</text>
+		<g id="XMLID_26_">
+			<path id="XMLID_56_" class="st0" d="M169.5,120h-143v-1c0-39.4,32.1-71.5,71.5-71.5s71.5,32.1,71.5,71.5V120z M28.5,118h139
+				C166.9,80.2,136,49.5,98,49.5S29,80.2,28.5,118z"/>
+			<path id="XMLID_29_" class="st0" d="M185,127.8H11v-1c0-48,39-87,87-87s87,39,87,87V127.8z M13,125.8h170
+				c-0.5-46.4-38.5-84-85-84S13.5,79.4,13,125.8z"/>
+			<path id="XMLID_30_" class="st0" d="M170.3,161.5H25.7c-7.1,0-12.8-5.8-12.8-12.8c0-7.1,5.8-12.8,12.8-12.8h144.7
+				c7.1,0,12.8,5.8,12.8,12.8C183.2,155.8,177.4,161.5,170.3,161.5z M25.7,137.9c-6,0-10.8,4.9-10.8,10.8s4.9,10.8,10.8,10.8h144.7
+				c6,0,10.8-4.9,10.8-10.8s-4.9-10.8-10.8-10.8H25.7z"/>
+			<path id="XMLID_32_" class="st0" d="M19.1,139.3c-6.9-5.2-8-12.1-8.1-12.4l2-0.3c0,0.1,1.1,6.4,7.3,11.1L19.1,139.3z"/>
+			<path id="XMLID_34_" class="st0" d="M176.9,139.3l-1.2-1.6c6.2-4.7,7.3-11,7.3-11.1l2,0.3C184.9,127.2,183.8,134.1,176.9,139.3z"
+				/>
+			<path id="XMLID_35_" class="st0" d="M108.2,172.6H86.1c-6.7,0-12.1-5.4-12.1-12.1v-1h46.3v1C120.3,167.2,114.9,172.6,108.2,172.6
+				z M76,161.5c0.5,5.1,4.8,9.1,10,9.1h22.2c5.2,0,9.5-4,10-9.1H76z"/>
+			
+				<rect id="XMLID_36_" x="36.4" y="157.5" transform="matrix(0.8275 0.5614 -0.5614 0.8275 104.7897 9.2067)" class="st0" width="2" height="35.3"/>
+			
+				<rect id="XMLID_37_" x="140" y="174.2" transform="matrix(0.5651 0.825 -0.825 0.5651 213.0817 -53.9113)" class="st0" width="35.4" height="2"/>
+			<path id="XMLID_72_" class="st0" d="M98,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C103.3,151.6,100.9,154,98,154z M98,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S99.8,145.4,98,145.4z"/>
+			<path id="XMLID_71_" class="st0" d="M78.3,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C83.7,151.6,81.3,154,78.3,154z M78.3,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S80.2,145.4,78.3,145.4z"/>
+			<path id="XMLID_73_" class="st0" d="M116,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C121.3,151.6,118.9,154,116,154z M116,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S117.8,145.4,116,145.4z"/>
+			<rect id="XMLID_80_" x="56" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_134_" x="35.4" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_81_" x="125.5" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_126_" x="143.3" y="147.7" class="st0" width="12.8" height="2"/>
+			
+				<rect id="XMLID_57_" x="69.7" y="166.9" transform="matrix(0.8603 0.5097 -0.5097 0.8603 110.3682 -8.4804)" class="st0" width="2" height="60.5"/>
+			
+				<rect id="XMLID_82_" x="93.5" y="196.2" transform="matrix(0.51 0.8602 -0.8602 0.51 230.2202 -9.8254)" class="st0" width="60.5" height="2"/>
+			<path id="XMLID_127_" class="st0" d="M164.2,44.8c-4.7,0-9.4-1.8-13-5.4c-7.2-7.2-7.2-18.8,0-26l0.7-0.7l26,26l-0.7,0.7
+				C173.7,43,168.9,44.8,164.2,44.8z M152,15.6c-5.7,6.4-5.5,16.3,0.7,22.5c6.2,6.2,16,6.4,22.5,0.7L152,15.6z"/>
+			<path id="XMLID_128_" class="st0" d="M170.1,33.7L157,20.6l0.7-0.7c3.6-3.6,9.5-3.6,13.1,0c3.6,3.6,3.6,9.5,0,13.1L170.1,33.7z
+				 M159.9,20.7L170,30.8c2.1-2.8,1.9-6.9-0.7-9.5S162.7,18.5,159.9,20.7z"/>
+			<polygon id="XMLID_129_" class="st0" points="144.5,54.3 142.5,54.3 142.5,43.3 151.4,37.9 152.4,39.6 144.5,44.4 			"/>
+			<path id="XMLID_135_" class="st5" d="M152,33.7c-1.3-2.1-2.1-4.6-2.1-7.3c0-2,0.4-3.9,1.2-5.5"/>
+			<path id="XMLID_136_" class="st5" d="M142.8,70.4c0.5,0.5,1.1,1,1.6,1.6c2.4,2.4,4.6,5,6.5,7.7"/>
+			<path id="XMLID_31_" class="st5" d="M98,52.6c13.9,0,26.7,4.3,37.3,11.7c1.8,1.3,3.5,2.6,5.2,4"/>
+			<path id="XMLID_33_" class="st0" d="M24.5,209.2c-5.9,0-10.7-4.8-10.7-10.7c0-5.9,4.8-10.7,10.7-10.7c5.9,0,10.7,4.8,10.7,10.7
+				C35.2,204.4,30.4,209.2,24.5,209.2z M24.5,189.8c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7s8.7-3.9,8.7-8.7S29.3,189.8,24.5,189.8z
+				"/>
+			<path id="XMLID_64_" class="st0" d="M171.5,209.2c-5.9,0-10.7-4.8-10.7-10.7c0-5.9,4.8-10.7,10.7-10.7c5.9,0,10.7,4.8,10.7,10.7
+				C182.2,204.4,177.4,209.2,171.5,209.2z M171.5,189.8c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7s8.7-3.9,8.7-8.7
+				S176.3,189.8,171.5,189.8z"/>
+		</g>
+		<g id="XMLID_27_">
+			<path id="XMLID_83_" class="st0" d="M111.4,311.1c-1.3,0-2.6-0.1-3.9-0.4c-2.7-0.6-5.1-1.7-6.8-3.1c-1.9-1.6-2.7-3.3-2.4-5
+				c0.4-1.7,1.9-3,4.2-3.6c2.1-0.6,4.8-0.6,7.4,0c5.8,1.3,9.8,4.8,9.1,8.1c-0.4,1.7-1.9,3-4.2,3.6
+				C113.8,310.9,112.6,311.1,111.4,311.1z M106.1,300.5c-1.1,0-2.1,0.1-3,0.4c-1.6,0.4-2.6,1.2-2.8,2.1s0.4,2,1.7,3.1
+				c1.5,1.2,3.6,2.1,5.9,2.7c2.4,0.5,4.7,0.5,6.5,0c1.6-0.4,2.6-1.2,2.8-2.1l0,0c0.4-1.8-2.6-4.7-7.6-5.7
+				C108.4,300.6,107.2,300.5,106.1,300.5z"/>
+			<path id="XMLID_85_" class="st0" d="M92.5,369.7c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5S97.7,369.7,92.5,369.7z
+				 M92.5,352.7c-4.1,0-7.5,3.4-7.5,7.5s3.4,7.5,7.5,7.5s7.5-3.4,7.5-7.5S96.6,352.7,92.5,352.7z"/>
+			<path id="XMLID_84_" class="st0" d="M121.4,341.9c-2.9,0-5.2-2.4-5.2-5.2c0-2.9,2.4-5.2,5.2-5.2s5.2,2.4,5.2,5.2
+				C126.7,339.6,124.3,341.9,121.4,341.9z M121.4,333.4c-1.8,0-3.2,1.5-3.2,3.2s1.5,3.2,3.2,3.2c1.8,0,3.2-1.5,3.2-3.2
+				S123.2,333.4,121.4,333.4z"/>
+			<path id="XMLID_87_" class="st0" d="M69.2,329.9c-0.7,0-1.4-0.2-2-0.5c-3.1-1.6-3.6-6.4-1.3-11l0,0c2.3-4.6,6.6-7,9.6-5.5
+				c3.1,1.6,3.6,6.4,1.3,11C75,327.6,71.9,329.9,69.2,329.9z M73.5,314.5c-1.9,0-4.4,1.9-5.8,4.9l0,0c-1.8,3.5-1.6,7.3,0.4,8.3
+				c2,1,5.2-1.1,7-4.6c1.8-3.5,1.6-7.3-0.4-8.3C74.3,314.6,73.9,314.5,73.5,314.5z"/>
+			<path id="XMLID_86_" class="st0" d="M98,383.3c-16.5,0-31.4-8.4-39.9-22.5l-0.5-0.8l0.8-0.5c1.9-1.2,3.1-3.3,3.1-5.6
+				c0-3.7-3-6.6-6.6-6.6c-0.4,0-0.8,0-1.2,0.1l-1,0.2l-0.2-1c-0.7-3.2-1.1-6.6-1.1-9.8c0-25.7,20.9-46.6,46.6-46.6
+				c19.5,0,37.1,12.3,43.8,30.6l0.4,1.2L141,322c-2.9,0.4-4.8,4.2-4.2,8.5c0.6,4.3,3.4,7.5,6.4,7.1l0.2-0.1l1.2-0.3l-0.1,1.3
+				C143.5,363.6,123.1,383.3,98,383.3z M60.3,360.5c8.2,13,22.3,20.8,37.7,20.8c23.6,0,43-18.2,44.5-41.6c-3.7-0.1-7.1-3.8-7.7-8.8
+				c-0.7-4.8,1.4-9.2,4.8-10.5c-6.7-16.9-23.2-28.2-41.5-28.2c-24.6,0-44.6,20-44.6,44.6c0,2.8,0.3,5.7,0.8,8.5
+				c5.1-0.4,9.3,3.6,9.3,8.6C63.5,356.4,62.3,358.9,60.3,360.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/tools/static-assets/skel-full/public/img/bg-footer.svg b/tools/static-assets/skel-full/public/img/bg-footer.svg
new file mode 100644
index 0000000000..9169356de7
--- /dev/null
+++ b/tools/static-assets/skel-full/public/img/bg-footer.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" width="1524" height="942" viewBox="0 0 1524 942">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #a9a8c3;
+        opacity: 0.2;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path d="M1523.556,541.539 C1522.707,543.791 1520.194,544.931 1517.935,544.074 C1517.924,544.070 1517.914,544.066 1517.904,544.062 C1515.658,543.210 1514.544,540.696 1515.378,538.470 C1516.238,536.204 1518.753,535.064 1521.020,535.924 C1521.020,535.924 1521.034,535.929 1521.041,535.931 C1523.280,536.781 1524.407,539.295 1523.556,541.539 ZM1509.627,429.311 C1507.382,428.459 1506.245,425.948 1507.098,423.699 C1507.956,421.438 1510.462,420.297 1512.721,421.154 C1514.972,422.007 1516.117,424.519 1515.259,426.781 C1514.414,429.035 1511.892,430.170 1509.627,429.311 ZM1317.983,624.824 C1315.719,623.965 1314.580,621.455 1315.439,619.192 C1316.291,616.944 1318.801,615.816 1321.059,616.658 C1323.312,617.513 1324.453,620.025 1323.609,622.279 C1322.757,624.541 1320.234,625.678 1317.983,624.824 ZM1379.476,494.094 C1379.469,494.091 1379.464,494.089 1379.457,494.087 C1377.216,493.237 1376.077,490.718 1376.928,488.473 C1377.785,486.213 1380.294,485.086 1382.558,485.931 C1384.809,486.785 1385.936,489.305 1385.096,491.540 C1384.237,493.805 1381.729,494.948 1379.476,494.094 ZM1389.501,573.661 C1388.657,575.900 1386.144,577.038 1383.886,576.181 C1383.876,576.178 1383.865,576.174 1383.855,576.170 C1381.624,575.323 1380.485,572.803 1381.335,570.563 C1382.186,568.319 1384.712,567.177 1386.961,568.030 C1389.214,568.884 1390.359,571.399 1389.501,573.661 ZM1438.188,747.839 C1436.593,747.234 1435.561,745.796 1435.388,744.211 L1323.511,755.123 C1323.518,755.646 1323.429,756.180 1323.234,756.700 C1322.437,758.802 1320.209,759.923 1318.093,759.384 L1258.839,929.054 L1259.208,931.875 C1260.513,933.041 1261.036,934.928 1260.381,936.670 C1260.265,936.976 1260.118,937.263 1259.945,937.526 L1262.344,955.899 C1263.011,955.910 1263.687,956.035 1264.347,956.286 C1267.418,957.450 1268.961,960.880 1267.799,963.944 C1266.635,967.012 1263.207,968.552 1260.136,967.387 C1258.938,966.932 1257.972,966.132 1257.308,965.142 L1213.334,988.325 L1160.343,1053.171 L1160.211,1053.341 L1106.384,1044.709 L963.297,1120.145 C964.341,1119.636 965.587,1119.543 966.761,1119.988 C969.019,1120.844 970.156,1123.355 969.303,1125.603 C968.457,1127.860 965.933,1129.000 963.680,1128.154 C963.676,1128.152 963.673,1128.151 963.669,1128.149 C961.415,1127.294 960.278,1124.780 961.135,1122.520 C961.505,1121.533 962.197,1120.761 963.049,1120.276 L916.216,1144.966 C916.833,1146.507 916.894,1148.273 916.260,1149.946 C914.912,1153.500 910.944,1155.285 907.387,1153.936 C906.753,1153.695 906.177,1153.373 905.664,1152.984 L724.719,1343.803 C726.156,1345.638 726.630,1348.155 725.744,1350.489 C724.399,1354.035 720.415,1355.817 716.858,1354.468 C713.301,1353.119 711.517,1349.149 712.862,1345.603 C712.900,1345.503 712.940,1345.404 712.981,1345.307 L617.154,1264.137 L552.637,1310.656 C553.291,1311.757 553.456,1313.133 552.967,1314.423 C552.111,1316.679 549.595,1317.811 547.338,1316.964 L547.329,1316.960 C545.075,1316.105 543.941,1313.592 544.795,1311.340 C545.001,1310.796 545.302,1310.317 545.673,1309.914 L369.406,1114.144 C368.252,1115.004 366.695,1115.275 365.250,1114.726 C362.997,1113.872 361.852,1111.368 362.713,1109.099 C363.562,1106.859 366.077,1105.722 368.329,1106.577 L368.337,1106.580 C368.350,1106.584 368.362,1106.589 368.373,1106.593 L427.439,988.118 C427.110,987.916 426.815,987.674 426.558,987.402 L345.993,1050.727 C346.726,1051.855 346.934,1053.306 346.422,1054.655 C345.569,1056.904 343.058,1058.037 340.791,1057.187 L340.780,1057.182 C338.531,1056.329 337.409,1053.818 338.245,1051.562 C338.648,1050.498 339.424,1049.681 340.370,1049.208 L290.884,923.521 L203.162,898.883 C202.312,901.124 199.794,902.254 197.547,901.402 C197.547,901.402 197.531,901.396 197.523,901.393 C195.269,900.538 194.154,898.028 194.987,895.779 C195.793,893.654 198.091,892.521 200.241,893.115 L238.339,792.205 C236.328,791.236 235.370,788.860 236.165,786.733 C236.191,786.663 236.219,786.592 236.250,786.524 L105.271,714.442 C104.094,715.562 102.334,715.983 100.705,715.365 C98.454,714.511 97.325,711.995 98.168,709.735 C98.819,708.021 100.435,706.952 102.169,706.921 L112.208,593.076 C111.974,593.030 111.740,592.964 111.509,592.877 C109.258,592.023 108.130,589.506 108.970,587.257 C109.826,585.000 112.338,583.865 114.591,584.720 C114.594,584.721 114.598,584.723 114.598,584.723 C115.939,585.231 116.884,586.324 117.250,587.599 L246.130,556.008 C246.021,555.295 246.088,554.545 246.362,553.823 C247.206,551.558 249.730,550.429 251.998,551.282 C253.657,551.911 254.714,553.439 254.813,555.106 L263.517,555.373 L260.619,491.881 C260.380,491.822 260.141,491.748 259.906,491.659 C256.823,490.490 255.278,487.063 256.441,483.996 C257.605,480.927 261.034,479.388 264.117,480.557 C264.574,480.731 264.999,480.955 265.385,481.221 L771.964,149.543 C771.229,148.103 771.082,146.371 771.701,144.740 C772.864,141.672 776.294,140.130 779.367,141.296 C782.432,142.458 783.977,145.887 782.813,148.955 C782.377,150.105 781.623,151.039 780.690,151.699 L861.240,311.716 C862.422,311.383 863.719,311.413 864.958,311.883 C868.030,313.048 869.576,316.476 868.412,319.543 C867.894,320.911 866.918,321.978 865.720,322.634 L900.241,432.882 L952.362,396.866 C951.744,395.778 951.594,394.432 952.072,393.167 C952.910,390.932 955.448,389.781 957.698,390.634 C957.922,390.719 958.135,390.821 958.337,390.937 L1059.222,248.007 C1057.957,246.833 1057.456,244.976 1058.106,243.264 C1058.957,241.019 1061.481,239.880 1063.731,240.734 C1065.985,241.589 1067.135,244.103 1066.282,246.351 C1066.073,246.903 1065.765,247.387 1065.388,247.791 L1169.330,359.105 C1170.490,358.205 1172.077,357.913 1173.547,358.470 C1173.795,358.565 1174.028,358.679 1174.248,358.810 L1203.473,318.850 L1394.136,434.286 C1395.251,433.588 1396.667,433.405 1397.997,433.909 C1398.006,433.913 1398.017,433.917 1398.026,433.920 C1400.267,434.771 1401.396,437.277 1400.547,439.530 C1399.697,441.772 1397.176,442.903 1394.923,442.060 C1394.350,441.843 1393.848,441.517 1393.432,441.116 L1274.883,574.446 L1274.753,574.597 L1188.483,567.100 C1188.435,567.359 1188.364,567.618 1188.267,567.873 C1187.428,570.130 1184.896,571.266 1182.645,570.412 C1181.812,570.096 1181.131,569.553 1180.646,568.880 L1167.908,576.405 L1207.736,588.137 C1208.986,585.234 1212.323,583.807 1215.313,584.941 C1218.375,586.102 1219.919,589.531 1218.756,592.600 C1218.136,594.234 1216.872,595.435 1215.363,596.025 L1226.767,683.382 L1370.869,675.355 C1370.905,674.972 1370.990,674.588 1371.133,674.212 C1371.979,671.961 1374.510,670.822 1376.780,671.669 C1379.017,672.517 1380.164,675.046 1379.311,677.295 C1379.091,677.877 1378.759,678.383 1378.352,678.801 L1437.297,740.124 C1438.430,739.368 1439.898,739.150 1441.269,739.670 C1443.528,740.527 1444.667,743.038 1443.820,745.291 C1442.962,747.552 1440.445,748.695 1438.188,747.839 ZM1317.343,759.121 C1315.260,758.169 1314.239,755.770 1315.052,753.610 C1315.148,753.359 1315.265,753.121 1315.399,752.898 L1227.431,688.466 L1258.607,927.278 L1317.343,759.121 ZM1260.825,956.070 L1258.576,938.846 C1257.468,939.518 1256.069,939.693 1254.757,939.195 L1254.746,939.191 C1254.427,939.070 1254.131,938.916 1253.859,938.733 L1244.709,949.932 L1257.763,957.934 C1258.572,957.006 1259.648,956.361 1260.825,956.070 ZM766.756,530.020 C766.261,530.027 765.758,529.950 765.265,529.780 L747.308,569.905 L770.252,561.239 L766.755,530.020 C766.755,530.020 766.756,530.020 766.756,530.020 ZM772.756,411.000 C772.167,412.554 770.779,413.580 769.233,413.781 L769.123,419.442 L858.638,321.617 C858.354,321.331 858.102,321.017 857.884,320.683 L790.357,348.409 L799.218,375.558 L772.006,406.629 C772.995,407.803 773.338,409.467 772.756,411.000 ZM770.222,405.365 C770.678,405.538 771.090,405.781 771.447,406.077 L798.318,375.371 L789.619,348.712 L733.643,371.695 L742.935,381.512 L766.074,405.948 C767.226,405.095 768.779,404.831 770.222,405.365 ZM267.801,487.411 L565.703,634.127 C566.926,632.122 569.230,631.033 571.544,631.339 L579.781,600.708 L557.166,489.709 C556.504,489.782 555.816,489.704 555.150,489.452 C552.884,488.592 551.760,486.067 552.595,483.830 C553.453,481.569 555.963,480.442 558.223,481.279 C558.517,481.391 558.790,481.530 559.045,481.692 L608.428,418.160 L267.709,484.446 C267.984,485.390 268.028,486.406 267.801,487.411 ZM407.743,764.699 C406.888,766.953 404.375,768.090 402.123,767.236 L402.114,767.233 C401.101,766.848 400.314,766.131 399.831,765.254 L351.339,801.257 L357.564,819.124 C358.243,819.041 358.951,819.117 359.635,819.377 C359.641,819.380 359.646,819.382 359.652,819.383 C360.802,819.820 361.658,820.684 362.109,821.726 L429.375,811.301 C429.335,810.700 429.418,810.080 429.642,809.478 C430.496,807.227 433.024,806.101 435.274,806.946 C436.392,807.370 437.238,808.203 437.702,809.208 L575.339,760.688 L570.183,643.139 C569.677,643.088 569.169,642.969 568.671,642.780 C567.865,642.475 567.165,642.013 566.591,641.443 L406.775,760.099 C407.927,761.272 408.359,763.053 407.743,764.699 ZM365.656,703.249 C366.454,701.179 368.653,700.047 370.757,700.552 L411.926,616.560 L362.680,559.210 L265.087,556.205 L267.483,608.663 L277.520,640.867 L288.727,676.806 C289.519,676.636 290.369,676.686 291.188,676.994 C293.443,677.849 294.583,680.366 293.729,682.617 C293.405,683.469 292.844,684.160 292.149,684.645 L337.012,762.610 C338.034,762.140 339.236,762.063 340.373,762.494 C340.380,762.497 340.386,762.499 340.393,762.502 L367.010,708.196 C365.586,707.048 364.979,705.062 365.656,703.249 ZM334.754,765.028 C335.074,764.184 335.629,763.496 336.316,763.011 L291.463,685.035 C290.466,685.491 289.297,685.572 288.187,685.178 C288.187,685.178 288.184,685.178 288.182,685.177 C288.184,685.178 288.185,685.178 288.185,685.178 L273.590,716.856 L272.528,719.163 L275.313,780.144 L334.501,767.117 C334.416,766.435 334.492,765.720 334.754,765.028 ZM271.134,722.191 L242.433,784.500 C243.398,785.051 244.088,785.935 244.413,786.944 L273.794,780.478 L271.134,722.191 ZM272.448,717.420 L287.454,684.843 C285.633,683.798 284.785,681.554 285.552,679.532 C285.996,678.361 286.887,677.492 287.957,677.046 L279.501,649.914 L267.626,611.819 L272.448,717.420 ZM339.886,770.809 C339.054,771.014 338.153,770.976 337.292,770.649 C337.292,770.649 337.280,770.646 337.275,770.644 C335.986,770.154 335.063,769.120 334.674,767.900 L275.350,780.960 L278.427,848.351 C279.190,848.325 279.969,848.446 280.726,848.734 C281.576,849.056 282.309,849.549 282.901,850.158 L350.134,800.239 L339.886,770.809 ZM283.820,851.387 C284.300,852.239 284.569,853.204 284.585,854.194 L332.905,860.069 L355.216,826.729 C353.889,825.564 353.351,823.660 354.015,821.910 C354.507,820.613 355.548,819.687 356.773,819.297 L350.664,801.759 L283.820,851.387 ZM434.080,984.790 L523.928,1001.140 L578.388,896.070 C576.591,895.030 575.498,893.125 575.437,891.103 L432.690,873.749 L430.239,980.071 C430.584,980.112 430.931,980.196 431.270,980.324 C431.270,980.324 431.278,980.327 431.282,980.329 C433.158,981.040 434.252,982.894 434.080,984.790 ZM695.233,1202.861 C695.234,1202.857 695.236,1202.853 695.236,1202.853 C695.714,1201.586 696.726,1200.675 697.922,1200.274 L657.862,1030.137 C657.161,1030.235 656.429,1030.164 655.724,1029.896 C654.265,1029.343 653.271,1028.095 652.980,1026.675 L464.915,1126.374 C465.501,1127.897 465.550,1129.630 464.927,1131.274 C464.746,1131.752 464.517,1132.198 464.247,1132.610 L473.294,1140.272 L695.237,1202.849 C695.237,1202.849 695.234,1202.857 695.233,1202.861 ZM732.180,1152.561 C733.081,1150.184 735.159,1148.599 737.500,1148.214 L754.122,978.156 C753.782,978.083 753.443,977.984 753.109,977.857 C751.741,977.338 750.635,976.433 749.870,975.311 L660.372,1022.756 C661.530,1023.932 661.970,1025.714 661.349,1027.365 C660.866,1028.640 659.846,1029.557 658.641,1029.956 L698.699,1200.091 C699.404,1199.990 700.144,1200.061 700.858,1200.330 C701.495,1200.571 702.045,1200.947 702.484,1201.412 L734.779,1176.050 L736.206,1161.447 C736.198,1161.444 736.189,1161.440 736.180,1161.436 C732.623,1160.087 730.835,1156.107 732.180,1152.561 ZM824.848,1101.072 C825.232,1100.053 825.960,1099.263 826.851,1098.784 L788.875,1010.608 L759.485,977.077 C758.367,977.851 757.032,978.287 755.652,978.306 L739.052,1148.137 C739.722,1148.180 740.398,1148.323 741.059,1148.573 C743.375,1149.452 744.944,1151.446 745.385,1153.710 L764.255,1152.904 L825.270,1104.992 C824.544,1103.866 824.342,1102.424 824.848,1101.072 ZM836.263,1064.670 L790.573,1012.546 L827.578,1098.474 C828.160,1098.286 828.786,1098.218 829.413,1098.290 C829.413,1098.290 829.416,1098.290 829.417,1098.290 C829.416,1098.290 829.414,1098.289 829.414,1098.289 L829.413,1098.290 L836.263,1064.670 ZM1007.104,1027.499 C1007.627,1026.110 1008.785,1025.148 1010.126,1024.813 L1006.719,1002.811 L996.720,938.300 C996.720,938.300 996.728,938.300 996.732,938.299 C996.728,938.300 996.724,938.300 996.724,938.300 C996.122,938.337 995.508,938.250 994.910,938.025 C992.927,937.273 991.802,935.233 992.149,933.215 C992.149,933.215 992.149,933.213 992.149,933.212 L874.262,901.759 C874.262,901.759 874.254,901.779 874.250,901.789 C873.533,903.698 871.625,904.802 869.686,904.582 L864.975,927.699 L837.306,1063.534 L860.150,1089.594 L1007.007,1030.304 C1006.738,1029.415 1006.749,1028.435 1007.104,1027.499 ZM1036.878,798.788 C1036.884,798.773 1036.890,798.756 1036.896,798.740 C1036.898,798.737 1036.899,798.734 1036.899,798.734 C1036.998,798.483 1037.114,798.249 1037.249,798.030 C1037.114,798.249 1036.998,798.483 1036.900,798.731 C1036.900,798.731 1036.898,798.737 1036.896,798.740 L994.205,777.485 L984.921,785.334 C985.905,786.863 986.178,788.823 985.483,790.655 C985.443,790.761 985.400,790.865 985.354,790.968 L1033.764,820.640 L1039.200,804.313 C1037.089,803.381 1036.055,800.958 1036.878,798.788 ZM854.007,641.686 C854.250,641.037 854.632,640.482 855.108,640.040 L847.969,630.859 L798.076,714.883 C799.921,716.390 800.732,718.916 799.976,721.282 L808.934,724.590 L824.353,698.829 L855.513,646.758 C853.962,645.627 853.292,643.570 854.007,641.686 ZM738.111,445.477 L636.855,415.491 C635.758,418.096 632.963,419.543 630.242,419.012 L609.763,495.138 L686.402,509.845 L740.220,451.030 C738.592,449.703 737.767,447.582 738.111,445.477 ZM641.938,502.134 L609.552,495.922 L580.925,602.341 L584.720,620.967 L685.762,510.542 L641.938,502.134 ZM437.823,812.562 C437.199,814.209 435.688,815.259 434.036,815.373 L432.726,872.203 L575.593,889.571 C575.652,889.320 575.728,889.069 575.822,888.821 C576.648,886.646 578.621,885.234 580.791,885.015 L575.375,761.521 L437.968,809.953 C438.182,810.788 438.152,811.695 437.823,812.562 ZM866.082,898.709 C866.670,897.140 868.075,896.110 869.639,895.921 C869.639,895.921 869.647,895.921 869.651,895.920 C869.647,895.921 869.642,895.921 869.642,895.921 L869.639,895.921 L869.194,879.793 L768.685,961.718 L788.605,1007.974 L836.648,1062.782 L847.246,1010.759 L868.906,904.421 C868.811,904.391 868.714,904.358 868.618,904.322 C868.615,904.321 868.613,904.320 868.613,904.320 L868.610,904.318 C866.360,903.465 865.228,900.960 866.082,898.709 ZM874.469,900.989 L992.358,932.438 C992.363,932.426 992.367,932.415 992.371,932.404 C993.154,930.339 995.343,929.207 997.447,929.704 C997.450,929.705 997.453,929.706 997.453,929.706 C997.638,929.750 997.819,929.805 997.997,929.872 C997.819,929.805 997.638,929.750 997.457,929.706 C997.457,929.706 997.450,929.705 997.447,929.704 L1009.984,892.078 L1033.263,822.147 L984.545,792.288 C982.974,794.226 980.278,795.031 977.818,794.098 C977.062,793.812 976.398,793.386 975.843,792.864 L869.979,879.153 L870.442,895.900 C870.865,895.927 871.291,896.018 871.708,896.176 L871.723,896.181 C873.701,896.932 874.814,898.977 874.469,900.989 ZM974.870,791.669 C974.690,791.380 974.536,791.077 974.409,790.761 L871.749,817.208 C871.083,818.568 869.774,819.450 868.334,819.619 L869.925,877.208 L974.870,791.669 ZM946.673,777.094 L808.895,726.218 L794.745,749.862 C796.294,750.994 796.963,753.058 796.250,754.937 C796.129,755.260 795.973,755.559 795.788,755.833 L864.708,812.231 C865.881,811.039 867.692,810.578 869.360,811.210 C869.365,811.213 869.371,811.215 869.371,811.215 C870.331,811.579 871.081,812.239 871.566,813.049 C871.567,813.052 871.568,813.053 871.568,813.053 C871.705,813.282 871.820,813.521 871.912,813.769 C872.117,814.317 872.213,814.910 872.184,815.509 L974.023,789.275 C973.940,788.605 973.970,787.915 974.126,787.231 L947.720,777.480 L919.953,790.769 L871.912,813.769 C871.820,813.521 871.705,813.282 871.570,813.055 C871.570,813.055 871.567,813.052 871.566,813.049 L946.673,777.094 ZM790.259,757.313 C788.251,756.338 787.281,753.979 788.078,751.852 C788.089,751.825 788.098,751.800 788.108,751.773 L692.052,702.995 C690.977,704.716 688.792,705.501 686.814,704.751 C686.011,704.446 685.349,703.931 684.868,703.291 L625.662,739.795 L614.265,746.823 C614.788,747.872 614.889,749.127 614.441,750.309 C614.231,750.863 613.919,751.350 613.536,751.757 L617.898,756.677 L707.638,857.900 L757.095,845.158 L790.267,757.315 C790.267,757.315 790.265,757.315 790.265,757.314 L757.095,845.158 L790.259,757.313 ZM743.176,895.527 C742.789,896.548 742.061,897.339 741.169,897.820 L768.051,960.244 L869.141,877.847 L867.537,819.640 C867.115,819.611 866.690,819.522 866.274,819.364 C865.930,819.234 865.613,819.065 865.324,818.863 L860.861,820.013 L783.960,867.019 L743.001,892.058 C743.516,893.104 743.616,894.353 743.176,895.527 ZM742.586,891.379 L858.200,820.699 L757.374,846.674 L740.991,890.059 C741.639,890.372 742.178,890.831 742.586,891.379 ZM756.432,846.916 L708.784,859.191 L736.501,890.456 C737.555,889.689 738.929,889.405 740.247,889.776 L756.432,846.916 ZM734.988,892.441 C735.198,891.886 735.509,891.400 735.891,890.994 L707.902,859.419 L587.300,890.488 C587.354,891.210 587.277,891.952 587.052,892.678 L705.447,947.414 L736.449,897.464 C734.943,896.326 734.301,894.291 734.988,892.441 ZM706.757,858.126 L612.940,752.283 C611.789,753.126 610.250,753.390 608.817,752.851 C607.700,752.427 606.857,751.593 606.395,750.587 L576.881,760.990 L582.326,885.062 C582.711,885.125 583.096,885.228 583.475,885.372 C585.188,886.021 586.426,887.377 586.985,888.982 L706.757,858.126 ZM611.900,744.686 C611.903,744.687 611.906,744.688 611.906,744.688 C612.711,744.993 613.371,745.509 613.851,746.150 C613.852,746.151 613.852,746.153 613.852,746.153 C614.010,746.364 614.148,746.587 614.265,746.822 C614.148,746.587 614.010,746.364 613.853,746.154 C613.853,746.154 613.852,746.151 613.851,746.150 L640.002,730.023 L684.446,702.607 C683.926,701.562 683.826,700.313 684.273,699.134 C685.103,696.909 687.561,695.769 689.766,696.534 L695.260,684.256 L589.673,645.267 L609.882,744.431 C610.545,744.359 611.234,744.435 611.900,744.686 ZM758.037,844.916 L862.686,817.956 L863.904,817.211 C863.390,816.169 863.293,814.924 863.738,813.751 C863.860,813.426 864.018,813.124 864.203,812.847 L795.283,756.453 C795.284,756.453 795.285,756.450 795.285,756.450 L864.206,812.843 L795.287,756.449 C795.287,756.449 795.284,756.453 795.283,756.453 C794.198,757.554 792.568,758.029 791.009,757.596 L758.037,844.916 ZM768.045,962.239 L761.336,967.707 C762.479,969.479 762.795,971.750 761.992,973.868 C761.674,974.706 761.210,975.446 760.638,976.069 L786.907,1006.037 L768.045,962.239 ZM767.410,960.766 L740.436,898.134 C739.527,898.429 738.514,898.430 737.547,898.068 L737.534,898.063 C737.396,898.010 737.262,897.952 737.132,897.887 C737.132,897.887 737.128,897.886 737.126,897.884 C737.128,897.886 737.130,897.886 737.130,897.886 L706.181,947.753 L749.664,967.856 C751.348,965.074 754.829,963.802 757.986,964.999 C758.903,965.347 759.703,965.868 760.361,966.512 L767.410,960.766 ZM749.018,969.257 L705.363,949.071 L660.880,1020.739 L749.147,973.947 C748.574,972.493 748.491,970.841 749.018,969.257 ZM704.629,948.732 L586.417,894.072 C585.046,896.275 582.360,897.359 579.812,896.664 L525.510,1001.429 L653.049,1024.640 C653.084,1024.515 653.125,1024.391 653.170,1024.268 C654.026,1022.014 656.542,1020.883 658.803,1021.734 C658.842,1021.749 658.880,1021.763 658.917,1021.778 L659.471,1021.485 L704.629,948.732 ZM576.844,760.157 L606.128,749.833 C605.915,748.996 605.948,748.091 606.276,747.228 C606.766,745.904 607.839,744.968 609.097,744.590 L588.795,644.942 L575.932,640.193 C575.023,641.777 573.448,642.821 571.706,643.096 L576.844,760.157 ZM574.250,632.409 L584.056,621.692 L580.463,604.056 L573.018,631.730 C573.463,631.912 573.875,632.140 574.250,632.409 ZM608.039,495.631 L560.880,486.587 C560.847,486.697 560.810,486.809 560.768,486.918 C560.269,488.235 559.196,489.174 557.940,489.551 L580.242,598.992 L608.039,495.631 ZM584.439,623.572 L575.380,633.472 C575.660,633.814 575.900,634.185 576.096,634.577 L585.926,630.865 L584.439,623.572 ZM576.601,636.031 C576.785,636.917 576.768,637.853 576.519,638.774 L588.433,643.173 L586.236,632.391 L576.601,636.031 ZM589.312,643.497 L695.890,682.850 L745.368,572.282 L586.991,632.107 L589.312,643.497 ZM696.640,683.127 L787.664,716.736 L785.277,695.420 L770.428,562.815 L746.423,571.885 L696.640,683.127 ZM696.011,684.533 L690.494,696.863 C692.350,697.910 693.212,700.168 692.435,702.218 C692.427,702.239 692.418,702.262 692.409,702.283 L708.545,710.478 L788.471,751.060 C788.469,751.062 788.467,751.066 788.467,751.066 L788.465,751.069 C788.465,751.069 788.469,751.062 788.471,751.060 C789.114,750.039 790.144,749.349 791.288,749.113 L787.856,718.448 L696.011,684.533 ZM792.075,749.023 C792.618,749.012 793.172,749.100 793.711,749.303 C793.829,749.348 793.943,749.397 794.054,749.449 L808.129,725.934 L799.321,722.682 C797.838,725.003 794.887,726.047 792.211,725.033 C790.816,724.503 789.736,723.507 789.081,722.289 L792.075,749.023 ZM844.062,667.451 L809.699,724.873 L948.613,776.166 L967.327,767.206 C966.975,766.254 966.951,765.176 967.336,764.155 C967.533,763.632 967.819,763.169 968.171,762.777 C968.171,762.777 968.175,762.772 968.178,762.769 C968.175,762.772 968.173,762.774 968.173,762.774 L968.171,762.777 L860.744,646.693 C859.585,647.583 858.010,647.871 856.544,647.315 C856.427,647.270 856.312,647.221 856.201,647.168 L844.062,667.451 ZM924.047,713.925 L968.757,762.234 C969.716,761.498 970.965,761.173 972.202,761.395 L973.003,758.524 L945.819,625.462 L874.120,640.314 L862.428,642.736 C862.507,643.402 862.430,644.095 862.176,644.765 C861.976,645.292 861.687,645.759 861.330,646.153 L924.047,713.925 ZM972.968,761.604 C973.230,761.704 973.476,761.827 973.707,761.969 L973.351,760.229 L972.968,761.604 ZM973.908,755.278 L1013.067,614.888 C1011.756,614.386 1010.826,613.322 1010.445,612.075 L947.324,625.150 L973.908,755.278 ZM969.877,769.771 C969.877,769.771 969.864,769.767 969.857,769.764 C968.907,769.404 968.157,768.743 967.674,767.931 L949.661,776.552 L974.659,785.783 C975.381,784.405 976.591,783.408 977.989,782.929 L974.985,768.225 C973.860,769.799 971.770,770.490 969.877,769.771 ZM979.495,782.622 C980.330,782.562 981.194,782.678 982.030,782.995 C982.752,783.269 983.390,783.669 983.929,784.160 L992.708,776.739 L976.660,768.748 L979.495,782.622 ZM1025.242,848.780 L998.202,929.956 C1000.316,930.872 1001.360,933.307 1000.536,935.494 C1000.009,936.884 998.850,937.846 997.511,938.179 L1010.916,1024.691 C1011.515,1024.654 1012.132,1024.741 1012.731,1024.964 C1012.807,1024.993 1012.882,1025.024 1012.956,1025.057 L1102.576,864.627 L1033.969,822.579 L1025.242,848.780 ZM836.922,1065.423 L830.194,1098.453 C830.288,1098.480 830.380,1098.512 830.472,1098.547 L830.483,1098.551 C831.531,1098.949 832.339,1099.707 832.816,1100.630 L858.643,1090.203 L836.922,1065.423 ZM745.506,1155.246 C745.482,1155.980 745.338,1156.723 745.063,1157.447 C743.909,1160.490 740.813,1162.240 737.713,1161.825 L736.451,1174.739 L762.181,1154.533 L745.506,1155.246 ZM652.254,1025.311 L525.125,1002.173 L462.404,1123.181 C463.122,1123.677 463.727,1124.298 464.201,1125.000 L652.254,1025.311 ZM433.231,815.354 C432.880,815.313 432.528,815.229 432.182,815.098 C430.795,814.572 429.832,813.414 429.497,812.073 L362.361,822.495 C362.542,823.298 362.499,824.164 362.189,824.996 C361.333,827.250 358.812,828.372 356.554,827.532 C356.308,827.439 356.077,827.327 355.859,827.196 L347.003,840.433 L333.794,860.177 L431.921,872.106 L433.231,815.354 ZM559.663,482.173 C560.650,483.091 561.168,484.426 561.035,485.787 L608.250,494.846 L628.775,418.523 C627.213,417.762 626.115,416.385 625.662,414.807 L609.610,417.930 L559.663,482.173 ZM625.432,413.281 C625.418,412.547 625.542,411.800 625.816,411.075 C626.980,408.008 630.407,406.467 633.481,407.632 C634.713,408.100 635.700,408.934 636.365,409.962 L731.725,370.816 L730.971,370.019 L727.945,366.822 C726.783,367.731 725.186,368.031 723.698,367.466 C722.207,366.901 721.204,365.610 720.943,364.152 L651.060,370.044 C650.111,372.097 647.717,373.108 645.561,372.291 C645.440,372.245 645.324,372.195 645.210,372.140 L611.049,416.079 L625.432,413.281 ZM729.329,364.937 C729.136,365.445 728.859,365.897 728.519,366.281 L732.507,370.495 L789.141,347.246 L784.752,333.795 C783.899,334.024 782.970,333.996 782.078,333.657 C780.408,333.024 779.345,331.468 779.263,329.781 L739.225,327.449 L727.143,359.461 C729.161,360.433 730.137,362.807 729.329,364.937 ZM767.137,413.533 C767.130,413.530 767.123,413.527 767.123,413.527 L767.114,413.524 C764.878,412.676 763.744,410.161 764.596,407.916 C764.800,407.368 765.102,406.887 765.475,406.484 L732.861,372.016 L637.031,411.362 C637.304,412.204 637.391,413.109 637.263,414.014 L738.557,443.997 C739.833,441.147 743.127,439.757 746.082,440.878 C746.916,441.195 747.638,441.680 748.225,442.282 L768.321,420.320 L768.447,413.811 C768.010,413.787 767.568,413.696 767.137,413.533 ZM749.164,443.542 C749.989,445.018 750.181,446.834 749.535,448.539 C748.371,451.607 744.930,453.141 741.870,451.981 C741.764,451.941 741.661,451.898 741.558,451.853 L688.185,510.187 L762.490,524.446 C762.489,524.449 762.488,524.451 762.488,524.451 L688.177,510.194 L762.488,524.454 C762.413,524.710 762.364,524.969 762.338,525.227 C762.338,525.227 762.337,525.232 762.337,525.234 L687.547,510.885 L585.104,622.846 L586.680,630.580 L746.254,570.304 L764.535,529.454 C763.021,528.605 762.169,526.933 762.337,525.234 C762.337,525.232 762.338,525.230 762.338,525.230 C762.364,524.969 762.413,524.710 762.488,524.454 C762.488,524.454 762.489,524.449 762.490,524.446 C762.522,524.337 762.558,524.226 762.599,524.117 C763.209,522.473 764.722,521.425 766.368,521.309 L768.276,422.654 L749.164,443.542 ZM771.022,560.948 L788.480,554.354 L769.027,529.340 C768.577,529.626 768.076,529.828 767.551,529.934 C767.551,529.934 767.549,529.935 767.548,529.935 L771.022,560.948 ZM771.199,562.525 L784.640,682.630 L788.493,717.043 L788.838,717.170 C790.072,714.238 793.422,712.791 796.423,713.930 C796.540,713.974 796.655,714.023 796.768,714.074 L846.954,629.554 L801.878,571.583 L789.468,555.624 L771.199,562.525 ZM791.751,557.275 L847.387,628.823 L851.578,621.765 C851.476,621.062 851.546,620.325 851.816,619.614 C852.276,618.384 853.230,617.493 854.368,617.069 L918.197,509.569 C917.520,509.031 916.978,508.357 916.596,507.604 L790.241,555.332 L791.751,557.275 ZM856.311,616.811 C856.690,616.846 857.072,616.931 857.446,617.071 C859.695,617.924 860.841,620.437 859.983,622.698 C859.130,624.948 856.618,626.086 854.357,625.228 C853.481,624.896 852.773,624.313 852.285,623.590 L848.403,630.128 L855.734,639.556 C856.853,638.847 858.283,638.657 859.618,639.164 C859.618,639.164 859.635,639.169 859.643,639.172 C860.952,639.668 861.883,640.725 862.265,641.963 L945.659,624.681 L944.870,620.820 C943.888,622.810 941.536,623.774 939.420,622.971 C939.413,622.969 939.405,622.966 939.405,622.966 L939.398,622.963 C937.150,622.110 936.020,619.594 936.861,617.350 C937.714,615.099 940.236,613.964 942.487,614.818 C942.497,614.822 942.508,614.826 942.519,614.830 C943.002,615.013 943.432,615.274 943.803,615.593 L922.401,510.836 C921.539,510.910 920.649,510.798 919.786,510.471 C919.696,510.437 919.606,510.400 919.518,510.362 L856.311,616.811 ZM947.165,624.370 L1010.282,611.289 C1010.206,610.623 1010.283,609.929 1010.533,609.259 C1010.996,608.032 1011.956,607.132 1013.100,606.705 L991.262,525.978 L927.396,507.164 C926.739,508.775 925.440,509.952 923.903,510.505 L947.165,624.370 ZM1011.975,599.508 L1013.866,606.495 C1014.613,606.362 1015.405,606.422 1016.166,606.710 C1017.821,607.338 1018.870,608.864 1018.979,610.519 L1059.155,611.594 L1100.216,612.686 C1100.253,612.316 1100.339,611.944 1100.478,611.579 C1101.335,609.318 1103.846,608.173 1106.105,609.030 C1107.009,609.373 1107.734,609.980 1108.222,610.732 L1165.049,577.176 L992.157,526.242 L1011.975,599.508 ZM1103.023,617.198 C1101.399,616.582 1100.350,615.105 1100.211,613.484 L1087.168,613.135 L1018.959,611.305 C1018.959,611.305 1018.958,611.307 1018.958,611.308 L1087.168,613.135 L1018.957,611.316 C1018.916,611.659 1018.832,612.002 1018.705,612.339 C1017.946,614.339 1015.873,615.466 1013.836,615.100 L974.861,754.817 L974.257,756.983 L974.257,756.984 L976.457,767.756 L993.371,776.178 L1131.178,659.683 L1106.546,617.007 C1105.490,617.543 1104.219,617.652 1103.023,617.198 ZM994.869,776.923 L1037.251,798.027 C1038.325,796.282 1040.516,795.498 1042.502,796.235 C1043.456,796.597 1044.210,797.258 1044.697,798.070 L1171.201,736.843 C1170.839,735.884 1170.810,734.795 1171.198,733.762 C1171.516,732.911 1172.075,732.221 1172.769,731.736 L1131.959,661.035 L994.869,776.923 ZM1171.547,737.557 L1045.043,798.786 C1045.405,799.745 1045.432,800.834 1045.042,801.865 C1044.263,803.935 1042.069,805.066 1039.967,804.571 L1034.470,821.073 L1103.330,863.278 L1172.813,738.897 C1172.292,738.541 1171.863,738.081 1171.547,737.557 ZM1104.009,863.694 L1244.020,949.510 L1253.237,938.229 C1252.042,937.057 1251.581,935.250 1252.211,933.587 C1252.609,932.530 1253.368,931.720 1254.294,931.244 L1187.566,766.670 L1176.541,739.481 C1175.656,739.747 1174.678,739.734 1173.746,739.380 C1173.739,739.377 1173.733,739.375 1173.726,739.372 C1173.653,739.345 1173.581,739.315 1173.511,739.284 L1104.009,863.694 ZM1256.627,963.773 C1256.189,962.505 1256.175,961.083 1256.688,959.730 C1256.755,959.553 1256.829,959.382 1256.911,959.216 L1243.725,951.134 L1215.817,985.287 L1256.627,963.773 ZM1159.880,1052.495 L1211.530,989.277 L1107.545,1044.097 L1159.880,1052.495 ZM1214.013,986.239 L1243.037,950.714 L1103.255,865.043 L1062.597,937.823 L1013.651,1025.444 C1014.928,1026.317 1015.645,1027.805 1015.545,1029.334 L1105.027,1043.693 L1214.013,986.239 ZM905.938,1141.829 C907.731,1140.607 910.073,1140.251 912.263,1141.082 C913.623,1141.597 914.725,1142.498 915.491,1143.611 L1103.865,1044.305 L1015.420,1030.124 C1015.380,1030.278 1015.333,1030.431 1015.275,1030.582 C1014.418,1032.843 1011.905,1033.969 1009.646,1033.123 L1009.637,1033.119 C1008.589,1032.722 1007.781,1031.963 1007.305,1031.039 L860.700,1090.221 L905.938,1141.829 ZM859.192,1090.830 L833.113,1101.358 C833.386,1102.245 833.378,1103.224 833.026,1104.158 C832.167,1106.422 829.649,1107.560 827.394,1106.705 C826.754,1106.462 826.206,1106.087 825.765,1105.622 L765.619,1152.846 L803.616,1151.222 C803.195,1150.229 803.139,1149.079 803.550,1147.991 C804.405,1145.735 806.923,1144.603 809.177,1145.449 L809.193,1145.456 C811.381,1146.285 812.503,1148.677 811.785,1150.875 L902.962,1146.979 C903.011,1146.339 903.151,1145.696 903.391,1145.065 C903.714,1144.212 904.190,1143.462 904.774,1142.832 L859.192,1090.830 ZM721.734,1341.612 C722.442,1341.881 723.081,1342.252 723.639,1342.705 L904.550,1151.923 C903.736,1150.952 903.204,1149.770 903.017,1148.517 L810.881,1152.454 C809.719,1153.746 807.831,1154.263 806.091,1153.603 C805.546,1153.396 805.066,1153.092 804.663,1152.719 L763.544,1154.476 L736.344,1175.832 L720.176,1341.219 C720.698,1341.287 721.220,1341.417 721.734,1341.612 ZM713.760,1343.952 C714.928,1342.370 716.715,1341.377 718.639,1341.193 L734.673,1177.144 L702.973,1202.033 C703.705,1203.159 703.911,1204.603 703.399,1205.953 C702.548,1208.198 700.030,1209.346 697.779,1208.492 C697.774,1208.490 697.769,1208.488 697.769,1208.488 L697.762,1208.486 C697.065,1208.221 696.476,1207.798 696.019,1207.271 L618.436,1263.212 L713.760,1343.952 ZM617.819,1262.688 L695.560,1206.634 C695.033,1205.746 694.825,1204.677 695.021,1203.620 L474.755,1141.510 L617.819,1262.688 ZM546.261,1309.384 C547.413,1308.520 548.969,1308.248 550.418,1308.798 C551.121,1309.064 551.715,1309.491 552.175,1310.019 L616.536,1263.613 L471.198,1140.507 L370.863,1112.214 C370.659,1112.749 370.360,1113.221 369.992,1113.618 L546.261,1309.384 ZM369.077,1106.942 C370.617,1107.884 371.417,1109.683 371.082,1111.449 L455.056,1135.130 L469.737,1139.269 L463.269,1133.791 C461.411,1135.575 458.624,1136.239 456.052,1135.263 C452.493,1133.913 450.711,1129.947 452.059,1126.393 C453.404,1122.846 457.369,1121.059 460.928,1122.409 C460.968,1122.424 461.009,1122.439 461.048,1122.455 L523.542,1001.885 L433.934,985.575 C433.900,985.700 433.859,985.824 433.812,985.946 C432.970,988.200 430.442,989.339 428.189,988.485 C428.183,988.482 428.178,988.480 428.172,988.478 C428.163,988.474 428.154,988.471 428.145,988.468 L369.077,1106.942 ZM341.110,1048.917 C341.989,1048.663 342.957,1048.679 343.886,1049.027 C344.523,1049.269 345.072,1049.647 345.511,1050.114 L426.070,986.779 C425.343,985.654 425.139,984.210 425.648,982.868 C426.265,981.214 427.782,980.162 429.433,980.051 L431.886,873.651 L332.835,861.609 L291.611,923.233 L341.110,1048.917 ZM200.991,893.397 C200.877,893.342 200.759,893.292 200.638,893.246 C200.638,893.246 200.637,893.246 200.637,893.246 C200.760,893.293 200.878,893.343 200.991,893.397 C202.777,894.257 203.738,896.205 203.379,898.116 L290.978,922.724 L331.947,861.501 L284.410,855.723 C284.354,855.946 284.284,856.170 284.200,856.392 C283.037,859.459 279.604,861.008 276.515,859.837 C273.460,858.677 271.919,855.242 273.082,852.174 C273.760,850.389 275.208,849.121 276.905,848.605 L273.831,781.293 L244.588,787.731 C244.674,788.414 244.599,789.128 244.338,789.817 C243.531,791.945 241.246,793.081 239.088,792.486 L200.991,893.397 ZM251.359,559.630 C250.572,559.797 249.729,559.747 248.921,559.441 C247.653,558.960 246.735,557.961 246.322,556.780 L117.397,588.375 C117.461,589.020 117.379,589.688 117.134,590.336 C116.479,592.101 114.789,593.177 113.003,593.159 L102.962,706.979 C103.242,707.025 103.522,707.101 103.799,707.207 L103.811,707.211 C106.061,708.064 107.191,710.586 106.341,712.827 C106.203,713.192 106.021,713.526 105.804,713.829 L236.629,785.837 C237.718,784.224 239.799,783.492 241.703,784.166 L271.054,720.447 L265.831,606.060 L251.359,559.630 C251.619,559.575 251.872,559.496 252.118,559.395 L252.118,559.395 C251.871,559.496 251.618,559.576 251.359,559.630 ZM254.787,555.889 C254.745,556.231 254.662,556.574 254.534,556.911 C254.090,558.080 253.197,558.949 252.125,559.392 L265.688,602.905 L263.553,556.159 L254.787,555.889 ZM262.157,492.044 L265.052,555.419 L362.887,558.420 L363.054,558.436 L412.861,616.442 L371.507,700.805 C373.627,701.732 374.657,704.157 373.832,706.332 C372.992,708.595 370.478,709.738 368.196,708.872 C368.196,708.872 368.190,708.870 368.187,708.869 C368.007,708.800 367.834,708.721 367.669,708.632 L341.094,762.845 C342.867,763.917 343.670,766.124 342.923,768.120 C342.496,769.246 341.655,770.090 340.639,770.548 L350.810,799.738 L399.326,763.716 C399.235,763.026 399.309,762.304 399.572,761.608 C400.426,759.358 402.940,758.217 405.204,759.076 L405.214,759.080 C405.291,759.109 405.367,759.141 405.442,759.175 L565.647,640.226 C564.839,638.846 564.594,637.155 565.078,635.532 L267.265,488.866 C266.251,490.805 264.268,491.990 262.157,492.044 ZM779.330,152.414 C778.030,152.898 776.555,152.930 775.155,152.400 C774.237,152.051 773.454,151.501 772.841,150.818 L266.555,482.287 C266.747,482.516 266.921,482.759 267.074,483.011 L609.867,416.310 L644.520,371.726 C642.972,370.595 642.307,368.544 643.008,366.670 C643.866,364.408 646.386,363.287 648.639,364.142 C650.716,364.929 651.849,367.125 651.345,369.226 L720.875,363.355 C720.879,362.854 720.969,362.346 721.157,361.851 C721.962,359.730 724.245,358.595 726.403,359.185 L738.694,326.626 L779.297,328.989 C779.341,328.665 779.422,328.341 779.543,328.023 C780.389,325.791 782.904,324.653 785.174,325.495 C787.428,326.350 788.552,328.875 787.718,331.112 C787.299,332.215 786.485,333.053 785.499,333.520 L789.879,346.943 L857.216,319.300 C856.797,318.048 856.792,316.650 857.295,315.326 C857.791,314.016 858.701,312.985 859.821,312.323 L779.330,152.414 ZM864.291,323.194 C863.155,323.479 861.924,323.432 860.747,322.985 C860.434,322.867 860.137,322.725 859.857,322.561 L769.078,421.777 L767.150,521.325 C767.506,521.365 767.864,521.450 768.214,521.582 C768.942,521.859 769.553,522.308 770.018,522.866 L898.919,433.796 L864.291,323.194 ZM899.165,434.583 L770.470,523.520 C771.083,524.606 771.227,525.947 770.758,527.211 C770.512,527.860 770.130,528.415 769.655,528.855 L789.253,554.062 L916.082,506.155 C915.848,505.073 915.913,503.916 916.333,502.811 C916.920,501.263 918.083,500.105 919.485,499.486 L899.165,434.583 ZM954.618,398.797 C953.889,398.521 953.276,398.071 952.810,397.512 L900.488,433.669 L920.961,499.051 C921.951,498.896 922.993,498.987 923.997,499.368 C926.622,500.364 928.132,503.011 927.790,505.675 L990.788,524.232 L975.064,466.108 L956.908,399.010 C956.163,399.141 955.375,399.080 954.618,398.797 ZM1064.807,248.312 C1063.655,249.170 1062.106,249.438 1060.661,248.898 C1060.371,248.788 1060.099,248.651 1059.848,248.490 L958.988,391.397 C959.687,391.998 960.175,392.803 960.394,393.683 C960.394,393.683 960.395,393.690 960.396,393.694 C960.395,393.690 960.394,393.686 960.394,393.686 L1093.636,373.831 C1093.122,373.831 1092.599,373.739 1092.091,373.546 C1092.084,373.544 1092.076,373.541 1092.069,373.538 C1089.820,372.685 1088.701,370.168 1089.540,367.928 C1090.393,365.678 1092.919,364.536 1095.167,365.389 C1097.427,366.246 1098.564,368.763 1097.718,371.010 C1097.223,372.326 1096.153,373.263 1094.900,373.643 L1167.648,362.804 C1167.648,362.804 1167.649,362.810 1167.649,362.812 C1167.649,362.810 1167.649,362.806 1167.649,362.806 C1167.615,362.213 1167.701,361.607 1167.924,361.018 C1168.118,360.500 1168.402,360.040 1168.747,359.650 L1064.807,248.312 ZM1185.726,562.244 C1187.469,562.905 1188.546,564.552 1188.553,566.308 L1274.421,573.775 L1392.913,440.513 C1392.091,439.364 1391.840,437.844 1392.372,436.443 C1392.616,435.799 1392.994,435.247 1393.462,434.806 L1203.681,319.912 L1174.883,359.275 C1176.208,360.440 1176.752,362.347 1176.087,364.101 C1175.511,365.629 1174.164,366.641 1172.657,366.869 C1172.657,366.869 1172.656,366.869 1172.655,366.870 L1184.336,561.970 C1184.799,561.985 1185.269,562.074 1185.726,562.244 ZM1180.245,568.202 C1179.754,567.171 1179.666,565.949 1180.103,564.797 C1180.679,563.259 1182.026,562.245 1183.538,562.017 L1171.863,366.916 C1171.397,366.901 1170.927,366.809 1170.469,366.635 C1169.066,366.103 1168.096,364.935 1167.766,363.589 L1025.567,384.771 L960.515,394.467 C960.552,395.059 960.469,395.667 960.248,396.253 C959.783,397.486 958.825,398.377 957.683,398.800 L991.684,524.496 L1166.872,576.100 L1180.245,568.202 ZM1207.312,589.627 L1166.086,577.482 L1108.597,611.442 C1109.008,612.432 1109.056,613.577 1108.649,614.667 C1108.350,615.454 1107.847,616.105 1107.222,616.582 L1131.796,659.160 L1208.594,594.240 C1207.557,592.968 1207.068,591.295 1207.312,589.627 ZM1213.863,596.396 C1212.956,596.497 1212.011,596.390 1211.100,596.045 C1210.598,595.854 1210.135,595.603 1209.720,595.302 L1132.578,660.513 L1173.457,731.342 C1174.483,730.873 1175.689,730.799 1176.824,731.229 C1177.223,731.380 1177.588,731.585 1177.913,731.829 L1218.858,686.983 C1217.779,685.804 1217.386,684.078 1217.994,682.491 C1218.841,680.239 1221.354,679.102 1223.612,679.958 C1224.082,680.136 1224.503,680.387 1224.869,680.691 L1213.863,596.396 ZM1225.721,687.214 L1225.343,686.937 C1225.343,686.937 1225.348,686.931 1225.350,686.929 C1225.348,686.931 1225.345,686.934 1225.345,686.934 C1224.179,688.245 1222.278,688.782 1220.539,688.122 C1220.136,687.969 1219.769,687.764 1219.441,687.516 L1178.501,732.364 C1179.573,733.538 1179.963,735.255 1179.367,736.839 C1178.966,737.896 1178.206,738.705 1177.282,739.182 C1177.282,739.182 1177.278,739.183 1177.276,739.185 C1177.278,739.183 1177.280,739.183 1177.280,739.183 L1255.034,930.945 C1255.768,930.724 1256.563,930.694 1257.346,930.891 L1257.485,930.491 L1225.721,687.214 ZM1370.871,676.147 L1226.870,684.171 L1227.286,687.362 L1315.873,752.256 C1317.041,750.945 1318.940,750.418 1320.684,751.079 C1320.899,751.161 1321.105,751.257 1321.299,751.369 L1371.987,678.677 C1371.353,677.978 1370.959,677.086 1370.871,676.147 ZM1377.739,679.320 C1376.597,680.121 1375.095,680.361 1373.695,679.829 C1373.684,679.825 1373.673,679.822 1373.662,679.817 C1373.267,679.667 1372.906,679.466 1372.585,679.223 L1344.150,719.993 L1321.953,751.825 C1322.723,752.473 1323.241,753.367 1323.431,754.338 L1435.374,743.428 C1435.403,743.018 1435.492,742.606 1435.642,742.202 C1435.874,741.593 1436.229,741.064 1436.668,740.634 L1377.739,679.320 ZM1142.031,664.347 C1139.781,663.493 1138.642,660.981 1139.495,658.732 C1140.347,656.469 1142.856,655.342 1145.106,656.195 C1145.117,656.199 1145.127,656.203 1145.137,656.207 C1147.391,657.062 1148.506,659.575 1147.664,661.817 C1146.813,664.061 1144.295,665.206 1142.031,664.347 ZM1140.308,451.506 C1140.302,451.504 1140.295,451.501 1140.289,451.499 C1138.039,450.646 1136.914,448.133 1137.766,445.888 C1138.613,443.636 1141.134,442.502 1143.393,443.359 C1143.405,443.364 1143.416,443.368 1143.428,443.372 C1145.661,444.219 1146.783,446.737 1145.935,448.974 C1145.083,451.238 1142.567,452.363 1140.308,451.506 ZM1068.205,482.221 C1065.953,481.366 1064.807,478.853 1065.664,476.591 C1066.517,474.344 1069.033,473.204 1071.290,474.060 C1073.550,474.917 1074.680,477.424 1073.831,479.689 C1072.982,481.940 1070.465,483.078 1068.205,482.221 ZM1337.212,464.492 C1339.471,465.349 1340.606,467.872 1339.758,470.124 C1338.913,472.378 1336.395,473.501 1334.133,472.657 C1331.883,471.803 1330.737,469.288 1331.587,467.024 C1332.440,464.775 1334.962,463.639 1337.212,464.492 ZM978.653,494.305 C977.795,496.567 975.286,497.694 973.023,496.849 C970.779,495.998 969.627,493.482 970.485,491.221 C971.338,488.971 973.851,487.832 976.111,488.689 C978.362,489.543 979.500,492.054 978.653,494.305 ZM804.614,521.687 C804.603,521.683 804.593,521.679 804.581,521.675 C802.344,520.826 801.219,518.308 802.065,516.076 C802.919,513.825 805.434,512.680 807.687,513.535 C807.695,513.538 807.702,513.541 807.709,513.543 C809.963,514.398 811.097,516.915 810.246,519.158 C809.393,521.408 806.880,522.547 804.614,521.687 ZM842.289,444.107 C844.553,444.965 845.684,447.471 844.850,449.723 C843.997,451.970 841.481,453.117 839.216,452.258 C839.209,452.256 839.202,452.253 839.202,452.253 L839.196,452.251 C836.952,451.399 835.818,448.883 836.669,446.640 C837.523,444.390 840.036,443.252 842.289,444.107 ZM774.005,318.024 C773.998,318.021 773.991,318.018 773.984,318.016 C771.729,317.160 770.614,314.649 771.464,312.406 C772.300,310.151 774.831,309.019 777.085,309.874 C777.095,309.878 777.105,309.882 777.116,309.885 C779.348,310.732 780.475,313.250 779.628,315.483 C778.775,317.732 776.258,318.878 774.005,318.024 ZM722.637,271.233 C720.384,270.378 719.240,267.867 720.087,265.600 C720.940,263.352 723.467,262.211 725.721,263.066 C727.968,263.919 729.113,266.439 728.275,268.686 C727.417,270.947 724.889,272.087 722.637,271.233 ZM604.852,308.971 C602.588,308.112 601.444,305.587 602.294,303.348 C603.151,301.087 605.665,299.949 607.934,300.810 C610.181,301.662 611.312,304.169 610.473,306.438 C609.619,308.688 607.105,309.826 604.852,308.971 ZM451.278,715.730 C453.531,716.584 454.670,719.106 453.818,721.353 C452.962,723.609 450.450,724.744 448.197,723.889 C448.193,723.887 448.189,723.886 448.185,723.884 C445.926,723.028 444.793,720.512 445.646,718.263 C446.499,716.015 449.011,714.880 451.278,715.730 ZM166.777,587.626 C164.507,586.765 163.368,584.245 164.222,581.995 C165.074,579.748 167.600,578.611 169.855,579.460 C169.861,579.462 169.867,579.465 169.873,579.467 C172.118,580.318 173.247,582.833 172.394,585.081 C171.538,587.337 169.028,588.470 166.777,587.626 ZM592.190,1236.074 C593.046,1233.818 595.568,1232.686 597.832,1233.545 L597.841,1233.548 C600.081,1234.398 601.214,1236.913 600.363,1239.157 C599.507,1241.414 596.988,1242.554 594.743,1241.702 L594.734,1241.699 C592.476,1240.842 591.341,1238.329 592.190,1236.074 ZM723.633,1194.514 C723.633,1194.514 723.645,1194.518 723.650,1194.520 C725.894,1195.371 727.017,1197.892 726.167,1200.134 C725.324,1202.385 722.800,1203.522 720.551,1202.668 C718.292,1201.811 717.152,1199.301 718.004,1197.055 C718.854,1194.798 721.375,1193.657 723.633,1194.514 ZM863.018,1134.416 C860.758,1133.559 859.612,1131.045 860.464,1128.799 C861.319,1126.543 863.832,1125.407 866.093,1126.259 C868.352,1127.115 869.482,1129.624 868.644,1131.876 C867.789,1134.131 865.275,1135.272 863.018,1134.416 ZM1027.156,1054.850 C1029.408,1055.704 1030.551,1058.226 1029.700,1060.484 C1028.848,1062.730 1026.324,1063.869 1024.074,1063.015 C1024.069,1063.014 1024.064,1063.011 1024.060,1063.010 C1021.807,1062.155 1020.673,1059.639 1021.526,1057.390 C1022.382,1055.135 1024.894,1054.003 1027.156,1054.850 ZM1065.312,835.762 C1065.302,835.758 1065.291,835.755 1065.281,835.751 C1063.044,834.902 1061.920,832.384 1062.761,830.141 C1063.606,827.895 1066.131,826.753 1068.399,827.602 C1070.649,828.455 1071.791,830.981 1070.938,833.230 C1070.085,835.479 1067.570,836.618 1065.312,835.762 ZM795.553,692.578 C797.808,693.433 798.946,695.964 798.093,698.214 C797.247,700.459 794.725,701.601 792.472,700.747 C792.464,700.745 792.457,700.742 792.457,700.742 L792.450,700.740 C790.203,699.886 789.066,697.368 789.917,695.125 C790.774,692.864 793.290,691.740 795.553,692.578 ZM654.826,380.390 C654.826,380.390 654.840,380.396 654.848,380.399 C657.090,381.249 658.224,383.766 657.373,386.009 C656.532,388.261 654.000,389.395 651.752,388.543 C649.500,387.689 648.351,385.194 649.209,382.931 C650.046,380.677 652.577,379.538 654.826,380.390 ZM410.107,837.139 C410.111,837.140 410.115,837.142 410.115,837.142 C412.349,837.989 413.500,840.509 412.646,842.759 C411.790,845.016 409.279,846.152 407.012,845.298 C404.760,844.444 403.632,841.928 404.485,839.680 C405.327,837.420 407.839,836.288 410.107,837.139 ZM1046.039,954.192 C1045.185,956.444 1042.661,957.582 1040.397,956.723 C1038.153,955.872 1037.007,953.359 1037.863,951.103 C1038.714,948.859 1041.225,947.713 1043.483,948.570 C1043.483,948.570 1043.490,948.572 1043.493,948.573 C1045.747,949.428 1046.885,951.943 1046.039,954.192 ZM936.339,745.749 C938.600,746.606 939.736,749.114 938.892,751.366 C938.041,753.630 935.516,754.751 933.263,753.909 C931.003,753.052 929.869,750.531 930.715,748.277 C931.561,746.026 934.088,744.895 936.339,745.749 ZM682.130,634.797 C679.878,633.942 678.748,631.435 679.589,629.181 C680.447,626.920 682.962,625.775 685.214,626.629 C687.462,627.481 688.610,629.995 687.763,632.262 C686.910,634.510 684.383,635.651 682.130,634.797 ZM791.092,874.200 C791.097,874.202 791.103,874.205 791.108,874.206 C793.352,875.058 794.488,877.573 793.637,879.817 C792.787,882.075 790.264,883.213 788.014,882.360 C788.009,882.357 788.004,882.356 787.999,882.354 C785.749,881.500 784.618,878.986 785.464,876.735 C786.312,874.484 788.834,873.344 791.092,874.200 ZM742.874,796.242 C745.126,797.096 746.271,799.609 745.419,801.856 C744.568,804.113 742.041,805.243 739.791,804.397 C737.531,803.540 736.392,801.030 737.238,798.780 C738.093,796.524 740.614,795.385 742.874,796.242 ZM649.511,478.396 C647.259,477.542 646.112,475.027 646.969,472.767 C647.810,470.512 650.354,469.384 652.606,470.238 C654.852,471.090 656.001,473.604 655.148,475.854 C654.290,478.115 651.762,479.236 649.511,478.396 ZM850.499,1058.853 C848.246,1057.999 847.112,1055.483 847.957,1053.230 C848.811,1050.978 851.326,1049.836 853.579,1050.691 C855.837,1051.547 856.982,1054.059 856.126,1056.316 C855.280,1058.566 852.759,1059.703 850.499,1058.853 ZM527.460,927.559 C529.711,928.413 530.850,930.933 530.013,933.196 C529.161,935.441 526.631,936.573 524.381,935.728 C522.128,934.873 520.982,932.356 521.834,930.110 C522.693,927.847 525.210,926.714 527.460,927.559 ZM567.602,717.846 C569.867,718.705 570.997,721.212 570.145,723.460 C569.308,725.715 566.780,726.843 564.523,725.995 C564.523,725.995 564.516,725.992 564.512,725.991 C562.252,725.133 561.130,722.624 561.970,720.373 C562.824,718.121 565.346,716.995 567.602,717.846 ZM436.336,528.436 C436.347,528.441 436.357,528.445 436.368,528.449 C438.606,529.297 439.727,531.814 438.878,534.052 C438.045,536.304 435.507,537.453 433.241,536.594 C431.006,535.745 429.863,533.220 430.704,530.966 C431.558,528.716 434.084,527.582 436.336,528.436 ZM1244.057,793.922 C1241.808,793.069 1240.662,790.556 1241.509,788.304 C1242.363,786.053 1244.881,784.918 1247.135,785.773 C1247.142,785.775 1247.150,785.778 1247.158,785.781 C1249.396,786.631 1250.532,789.149 1249.683,791.390 C1248.839,793.643 1246.315,794.779 1244.057,793.922 ZM1368.738,403.221 C1366.478,402.363 1365.341,399.853 1366.186,397.599 C1367.043,395.339 1369.553,394.212 1371.806,395.067 C1371.814,395.070 1371.822,395.072 1371.830,395.075 C1374.084,395.930 1375.207,398.444 1374.363,400.690 C1373.510,402.940 1370.996,404.077 1368.738,403.221 ZM1144.772,269.901 C1142.515,269.045 1141.361,266.528 1142.214,264.279 C1143.072,262.018 1145.590,260.895 1147.856,261.733 C1150.108,262.587 1151.250,265.106 1150.392,267.368 C1149.550,269.614 1147.025,270.756 1144.772,269.901 ZM973.963,237.288 C971.693,236.427 970.557,233.918 971.410,231.668 C972.260,229.404 974.785,228.262 977.043,229.119 C979.295,229.973 980.425,232.487 979.573,234.750 C978.729,236.996 976.213,238.142 973.963,237.288 ZM899.598,191.568 C897.345,190.713 896.198,188.199 897.056,185.937 C897.909,183.689 900.429,182.553 902.674,183.405 C904.928,184.260 906.088,186.777 905.234,189.027 C904.376,191.289 901.850,192.408 899.598,191.568 ZM835.497,187.306 C833.243,186.451 832.101,183.939 832.959,181.678 C833.796,179.422 836.312,178.277 838.576,179.136 C840.829,179.990 841.958,182.504 841.107,184.749 C840.266,187.017 837.757,188.143 835.497,187.306 ZM782.214,53.867 C779.950,53.008 778.813,50.498 779.667,48.248 C780.512,45.982 783.040,44.862 785.292,45.696 C787.546,46.551 788.689,49.064 787.828,51.332 C786.995,53.582 784.461,54.719 782.214,53.867 ZM714.187,118.239 C711.940,117.387 710.809,114.864 711.655,112.599 C712.502,110.366 715.017,109.222 717.282,110.081 C717.282,110.081 717.296,110.086 717.303,110.089 C719.536,110.936 720.663,113.451 719.813,115.693 C718.970,117.948 716.455,119.085 714.187,118.239 ZM583.040,49.983 C583.030,49.980 583.020,49.976 583.009,49.972 C580.771,49.123 579.647,46.607 580.484,44.349 C581.330,42.118 583.851,40.960 586.117,41.819 C588.370,42.674 589.517,45.188 588.663,47.438 C587.805,49.699 585.292,50.838 583.040,49.983 ZM476.152,96.793 C476.141,96.789 476.129,96.784 476.118,96.780 C473.882,95.932 472.762,93.415 473.615,91.166 C474.468,88.916 476.977,87.789 479.229,88.631 C481.480,89.484 482.626,92.011 481.772,94.260 C480.919,96.510 478.405,97.648 476.152,96.793 ZM462.501,8.934 C460.249,8.080 459.109,5.562 459.967,3.300 C460.802,1.050 463.333,-0.088 465.587,0.767 C467.833,1.619 468.994,4.138 468.137,6.399 C467.283,8.649 464.757,9.790 462.501,8.934 ZM400.877,320.939 C400.870,320.936 400.863,320.933 400.856,320.931 C398.599,320.075 397.467,317.560 398.317,315.317 C399.164,313.085 401.684,311.929 403.948,312.788 C406.190,313.639 407.326,316.167 406.479,318.399 C405.637,320.653 403.112,321.787 400.877,320.939 ZM391.620,126.244 C389.366,125.389 388.213,122.887 389.071,120.626 C389.925,118.375 392.444,117.239 394.709,118.099 C394.718,118.102 394.725,118.105 394.725,118.105 C396.973,118.958 398.089,121.469 397.251,123.714 C396.398,125.964 393.871,127.098 391.620,126.244 ZM392.472,207.940 C394.719,208.792 395.866,211.306 395.015,213.550 C394.156,215.817 391.642,216.955 389.378,216.096 C387.125,215.242 385.977,212.729 386.835,210.467 C387.688,208.218 390.219,207.085 392.472,207.940 ZM344.718,46.672 C342.454,45.814 341.312,43.282 342.158,41.050 C343.016,38.789 345.531,37.650 347.794,38.508 C350.048,39.363 351.192,41.890 350.339,44.139 C349.488,46.383 346.971,47.527 344.718,46.672 ZM301.704,315.928 C299.451,315.074 298.321,312.566 299.178,310.305 C300.032,308.056 302.541,306.929 304.798,307.770 C307.061,308.629 308.193,311.137 307.335,313.399 C306.482,315.647 303.967,316.786 301.704,315.928 ZM283.094,430.526 C280.831,429.667 279.700,427.159 280.554,424.909 C281.393,422.662 283.912,421.505 286.178,422.365 C288.442,423.223 289.573,425.730 288.715,427.993 C287.862,430.240 285.348,431.381 283.094,430.526 ZM206.532,330.559 C204.280,329.705 203.131,327.190 203.989,324.930 C204.842,322.680 207.352,321.554 209.626,322.402 C211.874,323.255 213.001,325.775 212.147,328.025 C211.312,330.280 208.802,331.408 206.532,330.559 ZM172.919,456.679 C172.910,456.676 172.903,456.673 172.903,456.673 L172.895,456.670 C170.651,455.819 169.526,453.303 170.376,451.063 C171.229,448.814 173.744,447.674 175.997,448.528 C176.007,448.533 176.019,448.537 176.030,448.541 C178.279,449.394 179.387,451.907 178.534,454.158 C177.699,456.392 175.171,457.533 172.919,456.679 ZM99.576,978.057 C101.823,978.909 102.955,981.422 102.104,983.665 C101.269,985.922 98.740,987.049 96.488,986.194 C96.483,986.193 96.478,986.191 96.478,986.191 L96.473,986.189 C94.226,985.336 93.080,982.825 93.931,980.581 C94.786,978.326 97.298,977.193 99.562,978.052 L99.576,978.057 ZM94.162,1192.278 C93.307,1194.533 90.803,1195.680 88.527,1194.816 L88.518,1194.813 C86.281,1193.964 85.146,1191.447 85.999,1189.198 C86.853,1186.948 89.367,1185.806 91.620,1186.661 C91.620,1186.661 91.626,1186.663 91.630,1186.664 C93.890,1187.522 95.015,1190.030 94.162,1192.278 ZM56.342,1195.931 C54.089,1195.077 52.942,1192.563 53.796,1190.314 C54.641,1188.048 57.170,1186.921 59.420,1187.765 C59.423,1187.766 59.426,1187.767 59.426,1187.767 C61.678,1188.621 62.814,1191.134 61.974,1193.403 C61.122,1195.650 58.592,1196.779 56.342,1195.931 ZM3.426,916.475 C1.159,915.615 0.033,913.097 0.869,910.841 C1.721,908.595 4.238,907.446 6.505,908.298 C8.758,909.152 9.901,911.681 9.049,913.930 C8.196,916.179 5.690,917.334 3.426,916.475 ZM-19.841,984.093 C-22.105,983.234 -23.254,980.721 -22.398,978.466 C-21.546,976.220 -19.027,975.078 -16.762,975.937 C-14.508,976.792 -13.365,979.305 -14.222,981.562 C-15.077,983.817 -17.586,984.945 -19.841,984.093 ZM-61.017,1105.510 C-63.281,1104.651 -64.407,1102.134 -63.556,1099.888 C-62.712,1097.628 -60.198,1096.487 -57.933,1097.346 C-57.933,1097.346 -57.926,1097.348 -57.922,1097.350 C-55.680,1098.201 -54.539,1100.716 -55.393,1102.967 C-56.249,1105.223 -58.760,1106.356 -61.017,1105.510 ZM-65.915,1027.439 L-65.933,1027.433 C-68.190,1026.578 -69.320,1024.063 -68.467,1021.813 C-67.611,1019.558 -65.100,1018.424 -62.836,1019.283 L-62.821,1019.289 C-60.575,1020.141 -59.453,1022.651 -60.304,1024.894 C-61.159,1027.148 -63.661,1028.294 -65.915,1027.439 ZM124.279,798.732 C124.284,798.735 124.288,798.736 124.292,798.738 C126.520,799.583 127.658,802.108 126.810,804.343 C125.955,806.599 123.437,807.731 121.185,806.887 C118.933,806.033 117.794,803.512 118.647,801.263 C119.480,799.015 122.014,797.873 124.279,798.732 ZM156.653,1014.366 C158.935,1015.231 160.062,1017.747 159.210,1019.995 C158.357,1022.243 155.840,1023.391 153.570,1022.530 C153.567,1022.528 153.563,1022.527 153.559,1022.526 C151.328,1021.679 150.197,1019.158 151.048,1016.915 C151.883,1014.659 154.416,1013.523 156.653,1014.366 ZM340.535,1186.588 C342.790,1187.443 343.928,1189.964 343.076,1192.211 C342.221,1194.466 339.708,1195.602 337.457,1194.755 C335.206,1193.901 334.057,1191.387 334.915,1189.125 C335.757,1186.871 338.281,1185.739 340.535,1186.588 ZM631.418,1370.827 C631.418,1370.827 631.429,1370.831 631.435,1370.834 C633.677,1371.684 634.811,1374.199 633.968,1376.443 C633.115,1378.692 630.596,1379.821 628.349,1378.980 C626.083,1378.121 624.945,1375.610 625.798,1373.360 C626.645,1371.112 629.159,1369.970 631.418,1370.827 ZM754.053,1381.720 C756.302,1382.573 757.448,1385.086 756.597,1387.355 C755.744,1389.602 753.222,1390.740 750.972,1389.887 C750.972,1389.887 750.962,1389.883 750.956,1389.881 C748.706,1389.026 747.570,1386.511 748.424,1384.260 C749.270,1382.001 751.798,1380.875 754.053,1381.720 ZM830.999,1243.945 C833.251,1244.800 834.396,1247.314 833.547,1249.570 C832.699,1251.824 830.172,1252.960 827.912,1252.109 C825.659,1251.254 824.517,1248.732 825.369,1246.485 C826.219,1244.229 828.749,1243.092 830.999,1243.945 ZM925.528,1347.233 C927.777,1348.086 928.914,1350.607 928.065,1352.865 C927.218,1355.112 924.700,1356.248 922.439,1355.396 C920.179,1354.539 919.042,1352.030 919.891,1349.770 C920.746,1347.516 923.269,1346.376 925.528,1347.233 ZM940.197,1285.168 C942.449,1286.022 943.600,1288.545 942.745,1290.800 C941.891,1293.050 939.370,1294.190 937.115,1293.340 C934.864,1292.486 933.712,1289.964 934.560,1287.712 C935.418,1285.451 937.940,1284.318 940.197,1285.168 ZM994.380,1434.600 C996.632,1435.454 997.778,1437.967 996.928,1440.226 C996.077,1442.482 993.550,1443.613 991.298,1442.766 C989.049,1441.913 987.895,1439.396 988.744,1437.137 C989.600,1434.882 992.126,1433.751 994.380,1434.600 ZM994.580,1295.526 L994.569,1295.522 C992.315,1294.667 991.183,1292.154 992.031,1289.902 C992.885,1287.652 995.407,1286.506 997.661,1287.361 C999.916,1288.216 1001.053,1290.733 1000.198,1292.989 C999.344,1295.238 996.834,1296.372 994.580,1295.526 ZM1051.960,1410.223 L1051.973,1410.228 C1054.227,1411.083 1055.353,1413.594 1054.509,1415.849 C1053.653,1418.105 1051.136,1419.240 1048.872,1418.381 C1048.872,1418.381 1048.864,1418.378 1048.861,1418.376 C1046.617,1417.525 1045.488,1415.020 1046.336,1412.766 C1047.187,1410.508 1049.708,1409.369 1051.960,1410.223 ZM1083.208,1238.305 L1083.218,1238.308 C1085.471,1239.163 1086.594,1241.680 1085.750,1243.920 C1084.903,1246.180 1082.382,1247.309 1080.121,1246.460 C1077.871,1245.607 1076.729,1243.086 1077.579,1240.845 C1078.435,1238.589 1080.950,1237.458 1083.208,1238.305 ZM1096.016,1142.219 C1098.265,1143.072 1099.404,1145.586 1098.553,1147.851 C1097.708,1150.100 1095.181,1151.231 1092.928,1150.383 C1090.675,1149.529 1089.531,1147.016 1090.381,1144.758 C1091.236,1142.502 1093.762,1141.374 1096.016,1142.219 ZM1105.025,1336.792 C1107.274,1337.645 1108.427,1340.168 1107.572,1342.422 C1106.723,1344.675 1104.194,1345.810 1101.945,1344.956 C1101.942,1344.955 1101.937,1344.953 1101.937,1344.953 L1101.933,1344.952 C1099.680,1344.098 1098.547,1341.585 1099.399,1339.339 C1100.249,1337.082 1102.773,1335.944 1105.025,1336.792 ZM1124.488,1562.513 C1124.493,1562.515 1124.498,1562.516 1124.502,1562.518 C1126.749,1563.370 1127.875,1565.884 1127.035,1568.126 C1126.181,1570.378 1123.661,1571.505 1121.407,1570.661 L1121.393,1570.656 C1119.143,1569.802 1118.019,1567.293 1118.863,1565.045 C1119.709,1562.796 1122.224,1561.654 1124.488,1562.513 ZM1124.527,1151.713 C1122.274,1150.858 1121.133,1148.334 1121.985,1146.089 C1122.841,1143.832 1125.351,1142.688 1127.609,1143.544 C1129.868,1144.401 1131.004,1146.911 1130.157,1149.170 C1129.305,1151.417 1126.787,1152.557 1124.527,1151.713 ZM1140.123,1219.114 C1142.381,1219.970 1143.512,1222.479 1142.666,1224.736 C1141.813,1226.984 1139.296,1228.126 1137.046,1227.273 C1134.786,1226.416 1133.642,1223.900 1134.494,1221.654 C1135.350,1219.397 1137.864,1218.257 1140.123,1219.114 ZM1139.881,1080.680 C1140.734,1078.431 1143.249,1077.289 1145.508,1078.146 L1145.517,1078.149 C1147.762,1079.001 1148.910,1081.520 1148.056,1083.771 C1147.207,1086.022 1144.680,1087.161 1142.421,1086.309 C1140.168,1085.455 1139.025,1082.936 1139.881,1080.680 ZM1153.587,1117.840 C1153.587,1117.840 1153.594,1117.842 1153.598,1117.844 C1155.851,1118.698 1156.987,1121.223 1156.141,1123.477 C1155.289,1125.724 1152.774,1126.859 1150.501,1126.003 C1148.257,1125.151 1147.118,1122.641 1147.968,1120.384 C1148.823,1118.128 1151.335,1116.995 1153.587,1117.840 ZM1214.228,1378.022 C1216.481,1378.877 1217.623,1381.400 1216.768,1383.655 C1215.926,1385.906 1213.401,1387.045 1211.147,1386.190 C1208.887,1385.336 1207.736,1382.816 1208.589,1380.567 C1209.447,1378.305 1211.973,1377.167 1214.228,1378.022 ZM1230.471,1152.982 C1232.724,1153.837 1233.852,1156.349 1233.004,1158.602 C1232.149,1160.858 1229.638,1161.989 1227.394,1161.138 C1227.394,1161.138 1227.382,1161.134 1227.376,1161.131 C1225.120,1160.276 1223.991,1157.762 1224.840,1155.511 C1225.691,1153.265 1228.205,1152.123 1230.471,1152.982 ZM1254.237,1228.523 C1256.488,1229.376 1257.634,1231.891 1256.784,1234.148 C1255.928,1236.403 1253.407,1237.542 1251.154,1236.688 C1248.899,1235.832 1247.754,1233.320 1248.610,1231.064 C1249.465,1228.809 1251.973,1227.664 1254.237,1228.523 ZM1288.173,1102.258 C1290.432,1103.115 1291.579,1105.640 1290.724,1107.895 C1289.879,1110.146 1287.350,1111.283 1285.091,1110.426 L1285.080,1110.421 C1282.842,1109.571 1281.696,1107.056 1282.548,1104.808 C1283.398,1102.544 1285.923,1101.417 1288.173,1102.258 ZM1355.870,936.148 C1358.123,937.002 1359.261,939.513 1358.414,941.765 C1357.562,944.028 1355.038,945.149 1352.789,944.296 C1352.777,944.293 1352.766,944.289 1352.755,944.285 C1350.513,943.433 1349.394,940.917 1350.238,938.678 C1351.089,936.433 1353.605,935.289 1355.870,936.148 Z" class="cls-1"/>
+</svg>
diff --git a/tools/static-assets/skel-full/server/main.js b/tools/static-assets/skel-full/server/main.js
new file mode 100644
index 0000000000..68cc7679b6
--- /dev/null
+++ b/tools/static-assets/skel-full/server/main.js
@@ -0,0 +1,4 @@
+// Server entry point, imports all server code
+
+import '/imports/startup/server';
+import '/imports/startup/both';

From 39046e4eb84a6b8587cecd08ff51df4b76ea01e2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 13:55:58 -0400
Subject: [PATCH 337/688] Make npm-mongo package version match npm mongodb
 package.

---
 packages/npm-mongo/.versions  | 3 ---
 packages/npm-mongo/package.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 packages/npm-mongo/.versions

diff --git a/packages/npm-mongo/.versions b/packages/npm-mongo/.versions
deleted file mode 100644
index 0c932803b4..0000000000
--- a/packages/npm-mongo/.versions
+++ /dev/null
@@ -1,3 +0,0 @@
-meteor@1.0.3
-npm-mongo@1.5.49
-underscore@1.0.0
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index e60bc759d0..5ee017f3c3 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.48_1',
+  version: '2.2.10_1',
   documentation: null
 });
 

From cc5bb8661108c9e0640a917363e8234bc071f351 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 13:57:58 -0400
Subject: [PATCH 338/688] Use npm-mongo@2.2.10_1 in mongo@1.1.12_4.

---
 packages/mongo/.npm/package/npm-shrinkwrap.json | 2 +-
 packages/mongo/package.js                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
index c5840f7d36..61615e3eb5 100644
--- a/packages/mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/mongo/.npm/package/npm-shrinkwrap.json
@@ -3,7 +3,7 @@
     "mongodb-uri": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "from": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz"
+      "from": "mongodb-uri@0.9.7"
     }
   }
 }
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index e924f867c4..263dbb8e89 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_3'
+  version: '1.1.12_4'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@1.5.48_1', 'server');
+  api.use('npm-mongo@2.2.10_1', 'server');
   api.use('allow-deny');
 
   api.use([

From 3ee0cd73e15ded98aef8eda21fc891bd14a8afd6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 14:34:27 -0400
Subject: [PATCH 339/688] Set mongoOptions.server.reconnectTries = Infinity.

Setting mongoOptions.server.auto_reconnect was removed by #7880 via commit
0ffb9ac8247c53b9ab5658d75139b64771fd4de3, though it seems the Server
options still respect autoReconnect, even in version 2.2 of the driver:
http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html

That said, having inspected the code of the `mongodb` package, I do not
believe this change is really critical, since the default value for
autoReconnect appears to be true.

More importantly, I can't find any support in the code of the `mongodb`
npm package or its dependencies for the claim that setting
mongoOptions.server.reconnectTries to 0 is the same as making it infinite,
so this commit sets it to Infinity.
---
 packages/mongo/mongo_driver.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 5d5ecbdcb8..77eabdc3b6 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -131,14 +131,17 @@ MongoConnection = function (url, options) {
   self._onFailoverHook = new Hook;
 
   var mongoOptions = _.extend({
-      db: { safe: true },
-      // Set reconnectTries to 0 which means keep trying to reconnect forever,
-      // rather than the default of losing the connection permanently after 30
-      // retries (separated by 1000ms).
-      server: { reconnectTries: 0 },
-      replSet: {}
+    db: { safe: true },
+    // http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+    server: {
+      // Reconnect on error.
+      autoReconnect: true,
+      // Try to reconnect forever, instead of stopping after 30 tries (the
+      // default), with each attempt separated by 1000ms.
+      reconnectTries: Infinity
     },
-    Mongo._connectionOptions);
+    replSet: {}
+  }, Mongo._connectionOptions);
 
   // Disable the native parser by default, unless specifically enabled
   // in the mongo URL.

From 0c324f31458cb8223ec2f2c3fd0c3ad253d766d7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 14:58:45 -0400
Subject: [PATCH 340/688] Bump mongo package version to 1.1.12_5.

---
 packages/mongo/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 263dbb8e89..6ee25d9354 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_4'
+  version: '1.1.12_5'
 });
 
 Npm.depends({

From 1e5b414e487fe054ac7c2433d9fbecdcce71f00b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 11:47:19 -0400
Subject: [PATCH 341/688] Prepare for breaking API change affecting optimistic
 subscribe functions.

As of optimism@0.3.0, the value of `this` within subscribe functions is no
longer the optimistic wrapper function object (instead: null or global, as
if called with no receiver object), so we need to retain a reference to
the optimistic function so that the watcher can call .dirty(...args).
---
 tools/fs/optimistic.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 791343ce09..92ce79f73d 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -13,7 +13,7 @@ import {
 } from "./files.js";
 
 function makeOptimistic(name, fn) {
-  return Profile("optimistic " + name, wrap(fn, {
+  const wrapper = wrap(fn, {
     makeCacheKey(...args) {
       const path = args[0];
       if (! pathIsAbsolute(path)) {
@@ -49,7 +49,7 @@ function makeOptimistic(name, fn) {
         return;
       }
 
-      let watcher = watch(path, () => this.dirty(...args));
+      var watcher = watch(path, () => wrapper.dirty(...args));
 
       return () => {
         if (watcher) {
@@ -58,7 +58,9 @@ function makeOptimistic(name, fn) {
         }
       };
     }
-  }));
+  });
+
+  return Profile("optimistic " + name, wrapper);
 }
 
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);

From 59696289904848a28b655789d358d7de2a6f7926 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 11:52:40 -0400
Subject: [PATCH 342/688] Update the `optimism` npm package to version 0.3.0.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index d165e0da93..e5750033a7 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -52,7 +52,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
-    optimism: "0.2.3",
+    optimism: "0.3.0",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
     longjohn: '0.2.11'

From 117b1a8525e4867fa428692647330dbea9f73fe8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 12:30:04 -0400
Subject: [PATCH 343/688] Use chokidar for file watching instead of
 pathwatcher.

Healthy competition among fs.watch wrappers appears to have produced a
clear winner: https://www.npmjs.com/package/chokidar

This wrapper is better for Meteor than pathwatcher was, because it can
watch directory trees recursively, and it has no trouble watching
nonexistent file paths, whereas pathwatcher would throw an exception.
---
 scripts/dev-bundle-tool-package.js |   2 +-
 tools/fs/README.md                 |   5 +-
 tools/fs/files.js                  |  11 --
 tools/fs/optimistic.js             |   2 +-
 tools/fs/safe-pathwatcher.js       | 181 -----------------------------
 tools/fs/safe-watcher.js           |  87 ++++++++++++++
 tools/fs/watch.js                  |   8 +-
 tools/tests/old.js                 |  16 ---
 8 files changed, 94 insertions(+), 218 deletions(-)
 delete mode 100644 tools/fs/safe-pathwatcher.js
 create mode 100644 tools/fs/safe-watcher.js

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index e5750033a7..85f19e9df7 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -51,7 +51,7 @@ var packageJson = {
     // 2.4.0 (more or less, the package.json change isn't committed) plus our PR
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
-    pathwatcher: "6.7.1",
+    chokidar: "1.6.0",
     optimism: "0.3.0",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
diff --git a/tools/fs/README.md b/tools/fs/README.md
index 11798687b8..28fc31d980 100644
--- a/tools/fs/README.md
+++ b/tools/fs/README.md
@@ -36,10 +36,7 @@ copied to a built bundle (`boot.js`). The shared code is stored in
 Since node.js doesn't ship a stable library to watch a folder on all
 file-systems, a wrapper is used. The wrapper checks if the native functionality
 works, if not (while on Windows, or a virtualized shared file-system like in
-VirtualBox), a 5s long-polling is used.
-
-The polling and its numbers are tweakable with the environment variables
-`METEOR_WATCH_POLLING_INTERVAL_MS` and `METEOR_WATCH_FORCE_POLLING`.
+VirtualBox), polling is used.
 
 ## Watchset
 
diff --git a/tools/fs/files.js b/tools/fs/files.js
index bb67de86f8..9af4a79c78 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -1720,17 +1720,6 @@ files.unwatchFile = function (...args) {
   return fs.unwatchFile(...args);
 };
 
-// wrap pathwatcher because it works with file system paths
-// XXX we don't currently convert the path argument passed to the watch
-//     callback, but we currently don't use the argument either
-files.pathwatcherWatch = function (...args) {
-  args[0] = files.convertToOSPath(args[0]);
-  // don't import pathwatcher until the moment we actually need it
-  // pathwatcher has a record of keeping some global state
-  var pathwatcher = require('pathwatcher');
-  return require("pathwatcher").watch(...args);
-};
-
 files.readBufferWithLengthAndOffset = function (filename, length, offset) {
   var data = new Buffer(length);
   // Read the data from disk, if it is non-empty. Avoid doing IO for empty
diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 92ce79f73d..daecd077de 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -1,7 +1,7 @@
 import assert from "assert";
 import { wrap } from "optimism";
 import { Profile } from "../tool-env/profile.js";
-import { watch } from "./safe-pathwatcher.js";
+import { watch } from "./safe-watcher.js";
 import { sha1 } from "./watch.js";
 import {
   pathSep,
diff --git a/tools/fs/safe-pathwatcher.js b/tools/fs/safe-pathwatcher.js
deleted file mode 100644
index d18d62c82c..0000000000
--- a/tools/fs/safe-pathwatcher.js
+++ /dev/null
@@ -1,181 +0,0 @@
-var files = require('./files.js');
-import { Profile } from "../tool-env/profile.js";
-
-// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
-// force the use of files.watchFile instead of pathwatcher.watch.
-// Enabled on Mac and Linux and disabled on Windows by default.
-var PATHWATCHER_ENABLED = !process.env.METEOR_WATCH_FORCE_POLLING;
-if (process.platform === "win32") {
-  PATHWATCHER_ENABLED = false;
-}
-
-var DEFAULT_POLLING_INTERVAL =
-      ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000;
-
-
-var NO_PATHWATCHER_POLLING_INTERVAL =
-      ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500;
-
-// This may seems like a long time to wait before actually closing the
-// file watchers, but it's to our advantage if they survive restarts.
-const WATCHER_CLEANUP_DELAY_MS = 30000;
-
-var suggestedRaisingWatchLimit = false;
-
-const watchers = Object.create(null);
-
-function acquireWatcher(absPath, callback) {
-  const entry = watchers[absPath] || (
-    watchers[absPath] = startNewWatcher(absPath));
-
-  // The size of the entry.callbacks Set also serves as a reference count
-  // for this watcher.
-  entry.callbacks.add(callback);
-
-  return entry;
-}
-
-function startNewWatcher(absPath) {
-  let lastPathwatcherEventTime = +new Date;
-  const callbacks = new Set;
-  let watcherCleanupTimer = null;
-
-  function fire(self, args) {
-    callbacks.forEach(cb => cb.apply(self, args));
-  }
-
-  function pathwatcherWrapper(...args) {
-    lastPathwatcherEventTime = +new Date;
-    fire(this, args);
-
-    // It's tempting to call files.unwatchFile(absPath, watchFileWrapper)
-    // here, but previous pathwatcher success is no guarantee of future
-    // pathwatcher reliability. For example, pathwatcher works just fine
-    // when file changes originate from within a Vagrant VM, but changes
-    // to shared files made outside the VM are invisible to pathwatcher,
-    // so our only hope of catching them is to continue polling.
-  }
-
-  let watcher = pathwatcherWatch(absPath, pathwatcherWrapper);
-
-  const pollingInterval = watcher
-    ? DEFAULT_POLLING_INTERVAL
-    : NO_PATHWATCHER_POLLING_INTERVAL;
-
-  function watchFileWrapper(...args) {
-    const [newStat, oldStat] = args;
-
-    if (newStat.ino === 0 &&
-        oldStat.ino === 0 &&
-        +newStat.mtime === +oldStat.mtime) {
-      // Node calls the watchFile listener once with bogus identical stat
-      // objects, which should not trigger a file change event.
-      return;
-    }
-
-    // If a pathwatcher event fired in the last polling interval, ignore
-    // this event.
-    if (new Date - lastPathwatcherEventTime > pollingInterval) {
-      fire(this, args);
-    }
-  }
-
-  // We use files.watchFile in addition to pathwatcher.watch as a
-  // fail-safe to detect file changes even on network file systems.
-  // However (unless the user disabled pathwatcher or this pathwatcher
-  // call failed), we use a relatively long default polling interval of
-  // 5000ms to save CPU cycles.
-  files.watchFile(absPath, {
-    persistent: false,
-    interval: pollingInterval
-  }, watchFileWrapper);
-
-  return {
-    callbacks,
-
-    release(callback) {
-      if (! watchers[absPath]) {
-        return;
-      }
-
-      callbacks.delete(callback);
-      if (callbacks.size > 0) {
-        return;
-      }
-
-      // Once there are no more callbacks in the Set, close both watchers
-      // and nullify the shared data.
-      clearTimeout(watcherCleanupTimer);
-      watcherCleanupTimer = setTimeout(() => {
-        if (callbacks.size > 0) {
-          // If another callback was added while the timer was pending, we
-          // can avoid tearing anything down.
-          return;
-        }
-
-        watchers[absPath] = null;
-
-        if (watcher) {
-          watcher.close();
-          watcher = null;
-        }
-
-        files.unwatchFile(absPath, watchFileWrapper);
-      }, WATCHER_CLEANUP_DELAY_MS);
-    }
-  };
-}
-
-
-function pathwatcherWatch(absPath, callback) {
-  if (PATHWATCHER_ENABLED) {
-    try {
-      return files.pathwatcherWatch(absPath, callback);
-    } catch (e) {
-      // If it isn't an actual pathwatcher failure, rethrow.
-      if (e.message !== 'Unable to watch path') {
-        throw e;
-      }
-      var constants = require('constants');
-      var archinfo = require('../utils/archinfo.js');
-      if (! suggestedRaisingWatchLimit &&
-          // Note: the not-super-documented require('constants') maps from
-          // strings to SYSTEM errno values. System errno values aren't the same
-          // as the numbers used internally by libuv! Once we're upgraded
-          // to Node 0.12, we'll have the system errno as a string (on 'code'),
-          // but the support for that wasn't in Node 0.10's uv.
-          // See our PR https://github.com/atom/node-pathwatcher/pull/53
-          // (and make sure to read the final commit message, not the original
-          // proposed PR, which had a slightly different interface).
-          e.errno === constants.ENOSPC &&
-          // The only suggestion we currently have is for Linux.
-          archinfo.matches(archinfo.host(), 'os.linux')) {
-        suggestedRaisingWatchLimit = true;
-        var Console = require('../console/console.js').Console;
-        if (! Console.isHeadless()) {
-          Console.arrowWarn(
-            "It looks like a simple tweak to your system's configuration will " +
-              "make many tools (including this Meteor command) more efficient. " +
-              "To learn more, see " +
-              Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
-        }
-      }
-      // ... ignore the error.  We'll still have watchFile, which is good
-      // enough.
-    }
-  }
-
-  return null;
-}
-
-export const watch = Profile(
-  "pathwatcher.watch",
-  (absPath, callback) => {
-    const entry = acquireWatcher(absPath, callback);
-    return {
-      close() {
-        entry.release(callback);
-      }
-    };
-  }
-);
diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
new file mode 100644
index 0000000000..2a7a059286
--- /dev/null
+++ b/tools/fs/safe-watcher.js
@@ -0,0 +1,87 @@
+import chokidar from "chokidar";
+import { Profile } from "../tool-env/profile.js";
+import {
+  pathDirname,
+  convertToOSPath,
+} from "./files.js";
+
+// This may seems like a long time to wait before actually closing the
+// file watchers, but it's to our advantage if they survive restarts.
+const WATCHER_CLEANUP_DELAY_MS = 30000;
+
+const watchers = Object.create(null);
+
+function acquireWatcher(absPath, callback) {
+  const entry = watchers[absPath] || (
+    watchers[absPath] = startNewWatcher(absPath));
+
+  // The size of the entry.callbacks Set also serves as a reference count
+  // for this watcher.
+  entry.callbacks.add(callback);
+
+  return entry;
+}
+
+function startNewWatcher(absPath) {
+  const callbacks = new Set;
+  let watcherCleanupTimer = null;
+
+  let watcher = chokidar.watch(convertToOSPath(absPath), {
+    // Ignore initial "add" events.
+    ignoreInitial: true,
+    // Avoid recursively watching subdirectories.
+    ignored(path) {
+      return path !== absPath &&
+        // If absPath is a directory and an event fires for a file that it
+        // contains, fire callbacks for the directory.
+        pathDirname(path) !== absPath;
+    }
+  }).on("all", Profile("chokidar callback", function (event, path) {
+    callbacks.forEach(cb => cb.call(this, event, path));
+  }));
+
+  return {
+    callbacks,
+
+    release(callback) {
+      if (! watchers[absPath]) {
+        return;
+      }
+
+      callbacks.delete(callback);
+      if (callbacks.size > 0) {
+        return;
+      }
+
+      // Once there are no more callbacks in the Set, close both watchers
+      // and nullify the shared data.
+      clearTimeout(watcherCleanupTimer);
+      watcherCleanupTimer = setTimeout(() => {
+        if (callbacks.size > 0) {
+          // If another callback was added while the timer was pending, we
+          // can avoid tearing anything down.
+          return;
+        }
+
+        watchers[absPath] = null;
+
+        if (watcher) {
+          watcher.close();
+          watcher = null;
+        }
+      }, WATCHER_CLEANUP_DELAY_MS);
+    }
+  };
+}
+
+export const watch = Profile(
+  "safeWatcher.watch",
+  (absPath, callback) => {
+    const entry = acquireWatcher(absPath, callback);
+    return {
+      close() {
+        entry.release(callback);
+      }
+    };
+  }
+);
diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index 348178e0a0..df0d813c8c 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -1,6 +1,6 @@
 import files from './files.js';
 import _ from "underscore";
-import pathwatcher from './safe-pathwatcher.js';
+import * as safeWatcher from './safe-watcher.js';
 import {createHash} from "crypto";
 import {coalesce} from '../utils/func-utils.js';
 import {Profile} from '../tool-env/profile.js';
@@ -341,8 +341,8 @@ export class Watcher {
 
     self.watches = {
       // <absolute path of watched file or directory>: {
-      //   // Null until pathwatcher.watch succeeds in watching the file.
-      //   watcher: <object returned by pathwatcher.watch> | null,
+      //   // Null until safeWatcher.watch succeeds in watching the file.
+      //   watcher: <object returned by safeWatcher.watch> | null,
       //   // Undefined until we stat the file for the first time, then null
       //   // if the file is observed to be missing.
       //   lastStat: <object returned by files.stat> | null | undefined
@@ -467,7 +467,7 @@ export class Watcher {
       }
 
       var onWatchEvent = self._makeWatchEventCallback(absPath);
-      entry.watcher = pathwatcher.watch(absPath, onWatchEvent);
+      entry.watcher = safeWatcher.watch(absPath, onWatchEvent);
 
       // If we successfully created the watcher, invoke the callback
       // immediately, so that we examine this file at least once.
diff --git a/tools/tests/old.js b/tools/tests/old.js
index 670c0d7436..5abe06f96c 100644
--- a/tools/tests/old.js
+++ b/tools/tests/old.js
@@ -51,22 +51,6 @@ var runOldTest = function (filename, extraEnv) {
 // will take another look at them later, but it is not worth that much more time
 // before 0.9.0.
 //
-selftest.define("watch", ["slow"], function () {
-  var runFuture = runOldTest.future();
-  var futures = [
-    // Run with pathwatcher (if possible)
-    runFuture('test-watch.js'),
-    // Run with fs.watchFile fallback
-    runFuture('test-watch.js', {
-      METEOR_WATCH_FORCE_POLLING: 1
-    })
-  ];
-  Future.wait(futures);
-  // Throw if any threw.
-  _.each(futures, function (f) {
-    f.get();
-  });
-});
 
 selftest.define("bundler-assets", ["checkout"], function () {
   runOldTest('test-bundler-assets.js');

From df7ab75da145b7dae767935644283307bfd13788 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 11:53:32 -0400
Subject: [PATCH 344/688] Bump $BUNDLE_VERSION to 4.3.4 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index e48a8628dd..78eb552844 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.3
+BUNDLE_VERSION=4.3.4
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 6a66368e09c98ac72a617872bccc0650fdbb92e3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 14:38:43 -0400
Subject: [PATCH 345/688] Cache optimistic stat objects in
 InputFile#findControlFile.

---
 tools/isobuild/compiler-plugin.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index b1d5af444e..844f399fba 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -16,6 +16,9 @@ import {Console} from '../console/console.js';
 import ImportScanner from './import-scanner.js';
 import {cssToCommonJS} from "./css-modules.js";
 import Resolver from "./resolver.js";
+import {
+  optimisticStatOrNull,
+} from "../fs/optimistic.js";
 
 import { isTestFilePath } from './test-files.js';
 
@@ -205,6 +208,10 @@ class InputFile extends buildPluginModule.InputFile {
     // document.
     this._resourceSlot = resourceSlot;
 
+    // Map from absolute paths to stat objects (or null if the file does
+    // not exist).
+    this._statCache = Object.create(null);
+
     // Map from control file names (e.g. package.json, .babelrc) to
     // absolute paths, or null to indicate absence.
     this._controlFileCache = Object.create(null);
@@ -278,6 +285,12 @@ class InputFile extends buildPluginModule.InputFile {
     return this.readAndWatchFileWithHash(path).contents;
   }
 
+  _stat(absPath) {
+    return _.has(this._statCache, absPath)
+      ? this._statCache[absPath]
+      : this._statCache[absPath] = optimisticStatOrNull(absPath);
+  }
+
   // Search ancestor directories for control files (e.g. package.json,
   // .babelrc), and return the absolute path of the first one found, or
   // null if the search failed.
@@ -296,7 +309,7 @@ class InputFile extends buildPluginModule.InputFile {
     while (true) {
       absPath = files.pathJoin(sourceRoot, dir, basename);
 
-      const stat = files.statOrNull(absPath);
+      const stat = this._stat(absPath);
       if (stat && stat.isFile()) {
         return this._controlFileCache[basename] = absPath;
       }

From 96c95629eb60711d7466180b78874b1a9c70dd6a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 15:05:59 -0400
Subject: [PATCH 346/688] Use optimistic functions throughout
 tools/fs/watch.js.

---
 tools/fs/watch.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index df0d813c8c..21b7a352bd 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -7,6 +7,7 @@ import {Profile} from '../tool-env/profile.js';
 
 import {
   optimisticStatOrNull,
+  optimisticReadFile,
   optimisticReaddir,
   optimisticHashOrNull,
 } from "./optimistic.js";
@@ -246,7 +247,7 @@ export class WatchSet {
 
 export function readFile(absPath) {
   try {
-    return files.readFile(absPath);
+    return optimisticReadFile(absPath);
   } catch (e) {
     // Rethrow most errors.
     if (! e || (e.code !== 'ENOENT' && e.code !== 'EISDIR')) {
@@ -460,7 +461,8 @@ export class Watcher {
       return;
     }
 
-    if (files.exists(absPath)) {
+    const exists = !! optimisticStatOrNull(absPath);
+    if (exists) {
       if (self._mustNotExist(absPath)) {
         self._fire();
         return;
@@ -522,7 +524,7 @@ export class Watcher {
 
       } else if (stat.isDirectory()) {
         try {
-          var dirFiles = files.readdir(absPath);
+          var dirFiles = optimisticReaddir(absPath);
         } catch (err) {
           if (err.code === "ENOENT" ||
               err.code === "ENOTDIR") {
@@ -725,14 +727,16 @@ export function readAndWatchDirectory(watchSet, options) {
 export function readAndWatchFileWithHash(watchSet, absPath) {
   var contents = readFile(absPath);
   var hash = null;
+
   // Allow null watchSet, if we want to use readFile-style error handling in a
   // context where we might not always have a WatchSet (eg, reading
   // settings.json where we watch for "meteor run" but not for "meteor deploy").
   if (watchSet) {
-    hash = contents === null ? null : sha1(contents);
+    hash = optimisticHashOrNull(absPath);
     watchSet.addFile(absPath, hash);
   }
-  return {contents: contents, hash: hash};
+
+  return { contents, hash };
 }
 
 export function readAndWatchFile(watchSet, absPath) {

From 0311e766739d163eee64a7c698ab99b5e625cbb1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 16:56:05 -0400
Subject: [PATCH 347/688] Bring back fs.watchFile fallback when chokidar.watch
 fails.

Especially on Linux, chokidar.watch tends to throw ENOSPC errors when too
many files are being watched.

I removed this logic earlier because I thought chokidar could handle such
failures by itself, but that was wishful thinking.
---
 tools/fs/safe-watcher.js | 131 +++++++++++++++++++++++++++++++++++----
 1 file changed, 119 insertions(+), 12 deletions(-)

diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index 2a7a059286..e22f113471 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -3,12 +3,31 @@ import { Profile } from "../tool-env/profile.js";
 import {
   pathDirname,
   convertToOSPath,
+  convertToStandardPath,
+  watchFile,
+  unwatchFile,
 } from "./files.js";
 
+// Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
+// force the use of files.watchFile instead of chokidar.watch.
+// Enabled on Mac and Linux and disabled on Windows by default.
+var WATCHER_ENABLED = ! process.env.METEOR_WATCH_FORCE_POLLING;
+if (process.platform === "win32") {
+  WATCHER_ENABLED = false;
+}
+
+var DEFAULT_POLLING_INTERVAL =
+  ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 5000;
+
+var NO_WATCHER_POLLING_INTERVAL =
+  ~~process.env.METEOR_WATCH_POLLING_INTERVAL_MS || 500;
+
 // This may seems like a long time to wait before actually closing the
 // file watchers, but it's to our advantage if they survive restarts.
 const WATCHER_CLEANUP_DELAY_MS = 30000;
 
+var suggestedRaisingWatchLimit = false;
+
 const watchers = Object.create(null);
 
 function acquireWatcher(absPath, callback) {
@@ -23,22 +42,59 @@ function acquireWatcher(absPath, callback) {
 }
 
 function startNewWatcher(absPath) {
+  let lastWatcherEventTime = +new Date;
   const callbacks = new Set;
   let watcherCleanupTimer = null;
 
-  let watcher = chokidar.watch(convertToOSPath(absPath), {
-    // Ignore initial "add" events.
-    ignoreInitial: true,
-    // Avoid recursively watching subdirectories.
-    ignored(path) {
-      return path !== absPath &&
-        // If absPath is a directory and an event fires for a file that it
-        // contains, fire callbacks for the directory.
-        pathDirname(path) !== absPath;
+  function fire(event) {
+    callbacks.forEach(cb => cb.call(this, event));
+  }
+
+  function watchWrapper(event) {
+    lastWatcherEventTime = +new Date;
+    fire.call(this, event);
+
+    // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
+    // but previous watcher success is no guarantee of future watcher
+    // reliability. For example, chokidar.watch works just fine when file
+    // changes originate from within a Vagrant VM, but changes to shared
+    // files made outside the VM are invisible to watcher, so our only
+    // hope of catching them is to continue polling.
+  }
+
+  let watcher = chokidarWatch(absPath, watchWrapper);
+
+  const pollingInterval = watcher
+    ? DEFAULT_POLLING_INTERVAL
+    : NO_WATCHER_POLLING_INTERVAL;
+
+  function watchFileWrapper(...args) {
+    const [newStat, oldStat] = args;
+
+    if (newStat.ino === 0 &&
+        oldStat.ino === 0 &&
+        +newStat.mtime === +oldStat.mtime) {
+      // Node calls the watchFile listener once with bogus identical stat
+      // objects, which should not trigger a file change event.
+      return;
     }
-  }).on("all", Profile("chokidar callback", function (event, path) {
-    callbacks.forEach(cb => cb.call(this, event, path));
-  }));
+
+    // If a watcher event fired in the last polling interval, ignore
+    // this event.
+    if (new Date - lastWatcherEventTime > pollingInterval) {
+      fire.call(this, "change");
+    }
+  }
+
+  // We use files.watchFile in addition to watcher.watch as a
+  // fail-safe to detect file changes even on network file systems.
+  // However (unless the user disabled watcher or this watcher
+  // call failed), we use a relatively long default polling interval of
+  // 5000ms to save CPU cycles.
+  watchFile(absPath, {
+    persistent: false,
+    interval: pollingInterval
+  }, watchFileWrapper);
 
   return {
     callbacks,
@@ -69,11 +125,62 @@ function startNewWatcher(absPath) {
           watcher.close();
           watcher = null;
         }
+
+        unwatchFile(absPath, watchFileWrapper);
       }, WATCHER_CLEANUP_DELAY_MS);
     }
   };
 }
 
+function chokidarWatch(absPath, callback) {
+  if (WATCHER_ENABLED) {
+    try {
+      return chokidar.watch(convertToOSPath(absPath), {
+        // Ignore initial "add" events.
+        ignoreInitial: true,
+        // Avoid recursively watching subdirectories.
+        ignored(path) {
+          path = convertToStandardPath(path);
+          return path !== absPath &&
+            // If absPath is a directory and an event fires for a file
+            // that it contains, fire callbacks for the directory.
+            pathDirname(path) !== absPath;
+        }
+      }).on("all", callback);
+
+    } catch (e) {
+      var constants = require('constants');
+      var archinfo = require('../utils/archinfo.js');
+      if (! suggestedRaisingWatchLimit &&
+          // Note: the not-super-documented require('constants') maps from
+          // strings to SYSTEM errno values. System errno values aren't the same
+          // as the numbers used internally by libuv! Once we're upgraded
+          // to Node 0.12, we'll have the system errno as a string (on 'code'),
+          // but the support for that wasn't in Node 0.10's uv.
+          // See our PR https://github.com/atom/node-pathwatcher/pull/53
+          // (and make sure to read the final commit message, not the original
+          // proposed PR, which had a slightly different interface).
+          e.errno === constants.ENOSPC &&
+          // The only suggestion we currently have is for Linux.
+          archinfo.matches(archinfo.host(), 'os.linux')) {
+        suggestedRaisingWatchLimit = true;
+        var Console = require('../console/console.js').Console;
+        if (! Console.isHeadless()) {
+          Console.arrowWarn(
+            "It looks like a simple tweak to your system's configuration will " +
+              "make many tools (including this Meteor command) more efficient. " +
+              "To learn more, see " +
+              Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
+        }
+      }
+      // ... ignore the error.  We'll still have watchFile, which is good
+      // enough.
+    }
+  }
+
+  return null;
+}
+
 export const watch = Profile(
   "safeWatcher.watch",
   (absPath, callback) => {

From b814311266373a8cba848f4cef571fd088f2c76c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 10 Oct 2016 17:39:17 -0400
Subject: [PATCH 348/688] Catch async chokidar.watch errors and suggest raising
 watch limit.

---
 tools/fs/safe-watcher.js | 59 ++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index e22f113471..e05b0abbb8 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -26,8 +26,6 @@ var NO_WATCHER_POLLING_INTERVAL =
 // file watchers, but it's to our advantage if they survive restarts.
 const WATCHER_CLEANUP_DELAY_MS = 30000;
 
-var suggestedRaisingWatchLimit = false;
-
 const watchers = Object.create(null);
 
 function acquireWatcher(absPath, callback) {
@@ -146,33 +144,11 @@ function chokidarWatch(absPath, callback) {
             // that it contains, fire callbacks for the directory.
             pathDirname(path) !== absPath;
         }
-      }).on("all", callback);
+      }).on("all", callback)
+        .on("error", maybeSuggestRaisingWatchLimit);
 
     } catch (e) {
-      var constants = require('constants');
-      var archinfo = require('../utils/archinfo.js');
-      if (! suggestedRaisingWatchLimit &&
-          // Note: the not-super-documented require('constants') maps from
-          // strings to SYSTEM errno values. System errno values aren't the same
-          // as the numbers used internally by libuv! Once we're upgraded
-          // to Node 0.12, we'll have the system errno as a string (on 'code'),
-          // but the support for that wasn't in Node 0.10's uv.
-          // See our PR https://github.com/atom/node-pathwatcher/pull/53
-          // (and make sure to read the final commit message, not the original
-          // proposed PR, which had a slightly different interface).
-          e.errno === constants.ENOSPC &&
-          // The only suggestion we currently have is for Linux.
-          archinfo.matches(archinfo.host(), 'os.linux')) {
-        suggestedRaisingWatchLimit = true;
-        var Console = require('../console/console.js').Console;
-        if (! Console.isHeadless()) {
-          Console.arrowWarn(
-            "It looks like a simple tweak to your system's configuration will " +
-              "make many tools (including this Meteor command) more efficient. " +
-              "To learn more, see " +
-              Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
-        }
-      }
+      maybeSuggestRaisingWatchLimit(e);
       // ... ignore the error.  We'll still have watchFile, which is good
       // enough.
     }
@@ -181,6 +157,35 @@ function chokidarWatch(absPath, callback) {
   return null;
 }
 
+let suggestedRaisingWatchLimit = false;
+
+function maybeSuggestRaisingWatchLimit(error) {
+  var constants = require('constants');
+  var archinfo = require('../utils/archinfo.js');
+  if (! suggestedRaisingWatchLimit &&
+      // Note: the not-super-documented require('constants') maps from
+      // strings to SYSTEM errno values. System errno values aren't the same
+      // as the numbers used internally by libuv! Once we're upgraded
+      // to Node 0.12, we'll have the system errno as a string (on 'code'),
+      // but the support for that wasn't in Node 0.10's uv.
+      // See our PR https://github.com/atom/node-pathwatcher/pull/53
+      // (and make sure to read the final commit message, not the original
+      // proposed PR, which had a slightly different interface).
+      error.errno === constants.ENOSPC &&
+      // The only suggestion we currently have is for Linux.
+      archinfo.matches(archinfo.host(), 'os.linux')) {
+    suggestedRaisingWatchLimit = true;
+    var Console = require('../console/console.js').Console;
+    if (! Console.isHeadless()) {
+      Console.arrowWarn(
+        "It looks like a simple tweak to your system's configuration will " +
+          "make many tools (including this Meteor command) more efficient. " +
+          "To learn more, see " +
+          Console.url("https://github.com/meteor/meteor/wiki/File-Change-Watcher-Efficiency"));
+    }
+  }
+}
+
 export const watch = Profile(
   "safeWatcher.watch",
   (absPath, callback) => {

From b594b460a4c53f6ff0a361edb86cc2bdebd56b9b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 09:04:10 -0400
Subject: [PATCH 349/688] Go back to using pathwatcher.watch, with new
 rewatching logic.

Judging from the variety and extent of test failures, switching to
chokidar.watch was too drastic a change for this late-beta stage of the
release cycle.

The problem with pathwatcher.watch was that watches don't survive the
deletion of the watched file, because (like fs.watch) it watches files
based on inodes, not paths. This problem can be solved in a relatively
narrow way, by attempting to rewatch the file after any "delete" or
"rename" events.
---
 scripts/dev-bundle-tool-package.js |  2 +-
 tools/fs/safe-watcher.js           | 86 +++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 85f19e9df7..e5750033a7 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -51,7 +51,7 @@ var packageJson = {
     // 2.4.0 (more or less, the package.json change isn't committed) plus our PR
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
-    chokidar: "1.6.0",
+    pathwatcher: "6.7.1",
     optimism: "0.3.0",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index e05b0abbb8..78ea0309e9 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -1,4 +1,4 @@
-import chokidar from "chokidar";
+import * as watchLibrary from "pathwatcher";
 import { Profile } from "../tool-env/profile.js";
 import {
   pathDirname,
@@ -9,7 +9,7 @@ import {
 } from "./files.js";
 
 // Set METEOR_WATCH_FORCE_POLLING environment variable to a truthy value to
-// force the use of files.watchFile instead of chokidar.watch.
+// force the use of files.watchFile instead of watchLibrary.watch.
 // Enabled on Mac and Linux and disabled on Windows by default.
 var WATCHER_ENABLED = ! process.env.METEOR_WATCH_FORCE_POLLING;
 if (process.platform === "win32") {
@@ -32,6 +32,11 @@ function acquireWatcher(absPath, callback) {
   const entry = watchers[absPath] || (
     watchers[absPath] = startNewWatcher(absPath));
 
+  // Watches successfully established in the past may have become invalid
+  // because the watched file was deleted or renamed, so we need to make
+  // sure we're still watching every time we call safeWatcher.watch.
+  entry.rewatch();
+
   // The size of the entry.callbacks Set also serves as a reference count
   // for this watcher.
   entry.callbacks.add(callback);
@@ -43,8 +48,27 @@ function startNewWatcher(absPath) {
   let lastWatcherEventTime = +new Date;
   const callbacks = new Set;
   let watcherCleanupTimer = null;
+  let watcher;
+  let pollingInterval;
 
   function fire(event) {
+    if (event !== "change") {
+      if (watcher) {
+        // When we receive a "delete" or "rename" event, the watcher is
+        // probably not going to generate any more notifications for this
+        // file, so we close and nullify the watcher to ensure that
+        // entry.rewatch() will attempt to reestablish the watcher the
+        // next time we call safeWatcher.watch.
+        watcher.close();
+        watcher = null;
+      }
+
+      // Make sure we don't throttle the watchFile callback after a
+      // "delete" or "rename" event, since it is now our only reliable
+      // source of file change notifications.
+      lastWatcherEventTime = 0;
+    }
+
     callbacks.forEach(cb => cb.call(this, event));
   }
 
@@ -54,17 +78,37 @@ function startNewWatcher(absPath) {
 
     // It's tempting to call unwatchFile(absPath, watchFileWrapper) here,
     // but previous watcher success is no guarantee of future watcher
-    // reliability. For example, chokidar.watch works just fine when file
+    // reliability. For example, watchLibrary.watch works just fine when file
     // changes originate from within a Vagrant VM, but changes to shared
     // files made outside the VM are invisible to watcher, so our only
     // hope of catching them is to continue polling.
   }
 
-  let watcher = chokidarWatch(absPath, watchWrapper);
+  function rewatch() {
+    if (watcher) {
+      // Already watching; nothing to do.
+      return;
+    }
 
-  const pollingInterval = watcher
-    ? DEFAULT_POLLING_INTERVAL
-    : NO_WATCHER_POLLING_INTERVAL;
+    watcher = watchLibraryWatch(absPath, watchWrapper);
+
+    pollingInterval = watcher
+      ? DEFAULT_POLLING_INTERVAL
+      : NO_WATCHER_POLLING_INTERVAL;
+
+    // This is a no-op if we're not watching the file.
+    unwatchFile(absPath, watchFileWrapper);
+
+    // We use files.watchFile in addition to watcher.watch as a fail-safe
+    // to detect file changes even on network file systems.  However
+    // (unless the user disabled watcher or this watcher call failed), we
+    // use a relatively long default polling interval of 5000ms to save
+    // CPU cycles.
+    watchFile(absPath, {
+      persistent: false,
+      interval: pollingInterval,
+    }, watchFileWrapper);
+  }
 
   function watchFileWrapper(...args) {
     const [newStat, oldStat] = args;
@@ -84,18 +128,11 @@ function startNewWatcher(absPath) {
     }
   }
 
-  // We use files.watchFile in addition to watcher.watch as a
-  // fail-safe to detect file changes even on network file systems.
-  // However (unless the user disabled watcher or this watcher
-  // call failed), we use a relatively long default polling interval of
-  // 5000ms to save CPU cycles.
-  watchFile(absPath, {
-    persistent: false,
-    interval: pollingInterval
-  }, watchFileWrapper);
+  rewatch();
 
   return {
     callbacks,
+    rewatch,
 
     release(callback) {
       if (! watchers[absPath]) {
@@ -130,23 +167,10 @@ function startNewWatcher(absPath) {
   };
 }
 
-function chokidarWatch(absPath, callback) {
+function watchLibraryWatch(absPath, callback) {
   if (WATCHER_ENABLED) {
     try {
-      return chokidar.watch(convertToOSPath(absPath), {
-        // Ignore initial "add" events.
-        ignoreInitial: true,
-        // Avoid recursively watching subdirectories.
-        ignored(path) {
-          path = convertToStandardPath(path);
-          return path !== absPath &&
-            // If absPath is a directory and an event fires for a file
-            // that it contains, fire callbacks for the directory.
-            pathDirname(path) !== absPath;
-        }
-      }).on("all", callback)
-        .on("error", maybeSuggestRaisingWatchLimit);
-
+      return watchLibrary.watch(convertToOSPath(absPath), callback);
     } catch (e) {
       maybeSuggestRaisingWatchLimit(e);
       // ... ignore the error.  We'll still have watchFile, which is good

From c8c4686588bd98503df639678211a8af9a364bc9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 10:06:35 -0400
Subject: [PATCH 350/688] Bump $BUNDLE_VERSION to 4.3.5 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 78eb552844..ee358b03cf 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.4
+BUNDLE_VERSION=4.3.5
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 1d375ffb700aeefe110a4e3a14a2c3f69cded8bb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 11:23:31 -0400
Subject: [PATCH 351/688] Hold off on using optimistic functions in
 watch.readAndWatchFileWithHash.

This partially reverts commit 96c95629eb60711d7466180b78874b1a9c70dd6a.

When running `meteor update`, we call writeReleaseFileAndDevBundleLink
immediately before reading .meteor/release, so there's no time for a file
change notification to invalidate the cached contents of that file.

In the future, we could perhaps call optimisticReadFile.dirty(path) as a
consequence of files.writeFile(path, ...), but that may be tricky.
---
 tools/fs/watch.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index 21b7a352bd..c7508e9993 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -7,7 +7,6 @@ import {Profile} from '../tool-env/profile.js';
 
 import {
   optimisticStatOrNull,
-  optimisticReadFile,
   optimisticReaddir,
   optimisticHashOrNull,
 } from "./optimistic.js";
@@ -247,7 +246,7 @@ export class WatchSet {
 
 export function readFile(absPath) {
   try {
-    return optimisticReadFile(absPath);
+    return files.readFile(absPath);
   } catch (e) {
     // Rethrow most errors.
     if (! e || (e.code !== 'ENOENT' && e.code !== 'EISDIR')) {
@@ -732,7 +731,7 @@ export function readAndWatchFileWithHash(watchSet, absPath) {
   // context where we might not always have a WatchSet (eg, reading
   // settings.json where we watch for "meteor run" but not for "meteor deploy").
   if (watchSet) {
-    hash = optimisticHashOrNull(absPath);
+    hash = contents === null ? null : sha1(contents);
     watchSet.addFile(absPath, hash);
   }
 

From c7c42b843eeff121592422bb699f8a216a116a7e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 19:48:29 -0400
Subject: [PATCH 352/688] Update the `optimism` npm package to version 0.3.1.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index e5750033a7..06e653763d 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -52,7 +52,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
-    optimism: "0.3.0",
+    optimism: "0.3.1",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
     longjohn: '0.2.11'

From 9a85f0cbb369dea10110cc9f33d3ddedc8b38a8f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 21:21:43 -0400
Subject: [PATCH 353/688] Add package version constraints to observe-sequence
 package.js.

---
 packages/observe-sequence/package.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 94c4605acf..cb5589b37f 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,14 +1,14 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.12"
+  version: "1.0.13"
 });
 
 Package.onUse(function (api) {
-  api.use('tracker');
-  api.use('mongo-id');  // for idStringify
-  api.use('diff-sequence');
-  api.use('underscore');
-  api.use('random');
+  api.use('tracker@1.1.0');
+  api.use('mongo-id@1.0.5');  // for idStringify
+  api.use('diff-sequence@1.0.6');
+  api.use('underscore@1.0.9');
+  api.use('random@1.0.10');
   api.export('ObserveSequence');
   api.addFiles(['observe_sequence.js']);
 });

From 6bb4bd739b973e8dd496f105385ce8c4c004f8d4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 11 Oct 2016 22:30:19 -0400
Subject: [PATCH 354/688] Update the `meteor-babel` npm package to version
 0.13.0.

---
 .../.npm/package/npm-shrinkwrap.json          | 287 +++++++++---------
 packages/babel-compiler/package.js            |   4 +-
 scripts/dev-bundle-tool-package.js            |   2 +-
 3 files changed, 149 insertions(+), 144 deletions(-)

diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 7ca8edd8db..1db6764f73 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.2.0.tgz",
-      "from": "acorn@>=3.2.0 <3.3.0"
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+      "from": "acorn@>=3.3.0 <3.4.0"
     },
-    "amdefine": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
-      "from": "amdefine@>=0.0.4"
+    "acorn-es7-plugin": {
+      "version": "1.0.18",
+      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.0.18.tgz",
+      "from": "acorn-es7-plugin@>=1.0.17 <1.1.0"
     },
     "ansi-regex": {
       "version": "2.0.0",
@@ -21,24 +21,24 @@
       "from": "ansi-styles@>=2.2.1 <3.0.0"
     },
     "ast-types": {
-      "version": "0.8.17",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.17.tgz",
-      "from": "ast-types@>=0.8.16 <0.9.0"
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.0.tgz",
+      "from": "ast-types@>=0.9.0 <0.10.0"
     },
     "babel-code-frame": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz",
-      "from": "babel-code-frame@>=6.8.0 <7.0.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz",
+      "from": "babel-code-frame@>=6.16.0 <7.0.0"
     },
     "babel-core": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.9.1.tgz",
-      "from": "babel-core@>=6.9.1 <6.10.0"
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.17.0.tgz",
+      "from": "babel-core@>=6.17.0 <6.18.0"
     },
     "babel-generator": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.11.0.tgz",
-      "from": "babel-generator@>=6.9.0 <7.0.0"
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.17.0.tgz",
+      "from": "babel-generator@>=6.17.0 <7.0.0"
     },
     "babel-helper-builder-react-jsx": {
       "version": "6.9.0",
@@ -81,14 +81,14 @@
       "from": "babel-helper-regex@>=6.8.0 <7.0.0"
     },
     "babel-helper-replace-supers": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.8.0.tgz",
-      "from": "babel-helper-replace-supers@>=6.8.0 <7.0.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.16.0.tgz",
+      "from": "babel-helper-replace-supers@>=6.14.0 <7.0.0"
     },
     "babel-helpers": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.8.0.tgz",
-      "from": "babel-helpers@>=6.8.0 <7.0.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.16.0.tgz",
+      "from": "babel-helpers@>=6.16.0 <7.0.0"
     },
     "babel-messages": {
       "version": "6.8.0",
@@ -101,34 +101,34 @@
       "from": "babel-plugin-check-es2015-constants@>=6.8.0 <7.0.0"
     },
     "babel-plugin-syntax-async-functions": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.8.0.tgz",
-      "from": "babel-plugin-syntax-async-functions@>=6.8.0 <7.0.0"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "from": "babel-plugin-syntax-async-functions@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-async-generators": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.8.0.tgz",
-      "from": "babel-plugin-syntax-async-generators@>=6.8.0 <7.0.0"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "from": "babel-plugin-syntax-async-generators@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-flow": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.8.0.tgz",
-      "from": "babel-plugin-syntax-flow@>=6.8.0 <7.0.0"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.13.0.tgz",
+      "from": "babel-plugin-syntax-flow@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-jsx": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.8.0.tgz",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.13.0.tgz",
       "from": "babel-plugin-syntax-jsx@>=6.3.13 <7.0.0"
     },
     "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.8.0.tgz",
-      "from": "babel-plugin-syntax-object-rest-spread@>=6.8.0 <7.0.0"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "from": "babel-plugin-syntax-object-rest-spread@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.8.0.tgz",
-      "from": "babel-plugin-syntax-trailing-function-commas@>=6.8.0 <7.0.0"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.13.0.tgz",
+      "from": "babel-plugin-syntax-trailing-function-commas@>=6.13.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.8.0",
@@ -141,14 +141,14 @@
       "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.10.1.tgz",
-      "from": "babel-plugin-transform-es2015-block-scoping@>=6.10.1 <7.0.0"
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.15.0.tgz",
+      "from": "babel-plugin-transform-es2015-block-scoping@>=6.15.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-classes": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.9.0.tgz",
-      "from": "babel-plugin-transform-es2015-classes@>=6.9.0 <7.0.0"
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.14.0.tgz",
+      "from": "babel-plugin-transform-es2015-classes@>=6.14.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-computed-properties": {
       "version": "6.8.0",
@@ -156,9 +156,9 @@
       "from": "babel-plugin-transform-es2015-computed-properties@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.9.0.tgz",
-      "from": "babel-plugin-transform-es2015-destructuring@>=6.9.0 <7.0.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.16.0.tgz",
+      "from": "babel-plugin-transform-es2015-destructuring@>=6.16.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-for-of": {
       "version": "6.8.0",
@@ -176,9 +176,9 @@
       "from": "babel-plugin-transform-es2015-literals@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.8.0 <6.9.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.16.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.16.0 <6.17.0"
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.8.0",
@@ -186,9 +186,9 @@
       "from": "babel-plugin-transform-es2015-object-super@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-parameters": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.9.0.tgz",
-      "from": "babel-plugin-transform-es2015-parameters@>=6.9.0 <7.0.0"
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.17.0.tgz",
+      "from": "babel-plugin-transform-es2015-parameters@>=6.17.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
       "version": "6.8.0",
@@ -218,7 +218,7 @@
     "babel-plugin-transform-es2015-unicode-regex": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz",
-      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.8.0 <7.0.0"
+      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.11.0 <7.0.0"
     },
     "babel-plugin-transform-es3-member-expression-literals": {
       "version": "6.8.0",
@@ -231,14 +231,14 @@
       "from": "babel-plugin-transform-es3-property-literals@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-flow-strip-types": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.8.0.tgz",
-      "from": "babel-plugin-transform-flow-strip-types@>=6.8.0 <7.0.0"
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.14.0.tgz",
+      "from": "babel-plugin-transform-flow-strip-types@>=6.14.0 <7.0.0"
     },
     "babel-plugin-transform-object-rest-spread": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.8.0.tgz",
-      "from": "babel-plugin-transform-object-rest-spread@>=6.8.0 <7.0.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz",
+      "from": "babel-plugin-transform-object-rest-spread@>=6.16.0 <7.0.0"
     },
     "babel-plugin-transform-react-display-name": {
       "version": "6.8.0",
@@ -250,74 +250,79 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.8.0.tgz",
       "from": "babel-plugin-transform-react-jsx@>=6.3.13 <7.0.0"
     },
+    "babel-plugin-transform-react-jsx-self": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.11.0.tgz",
+      "from": "babel-plugin-transform-react-jsx-self@>=6.11.0 <7.0.0"
+    },
     "babel-plugin-transform-react-jsx-source": {
       "version": "6.9.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.9.0.tgz",
       "from": "babel-plugin-transform-react-jsx-source@>=6.3.13 <7.0.0"
     },
     "babel-plugin-transform-regenerator": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.9.0.tgz",
-      "from": "babel-plugin-transform-regenerator@>=6.9.0 <7.0.0"
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.16.1.tgz",
+      "from": "babel-plugin-transform-regenerator@>=6.16.1 <7.0.0"
     },
     "babel-plugin-transform-runtime": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.9.0.tgz",
-      "from": "babel-plugin-transform-runtime@>=6.9.0 <6.10.0"
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.15.0.tgz",
+      "from": "babel-plugin-transform-runtime@>=6.15.0 <6.16.0"
     },
     "babel-plugin-transform-strict-mode": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.8.0.tgz",
+      "version": "6.11.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.11.3.tgz",
       "from": "babel-plugin-transform-strict-mode@>=6.8.0 <7.0.0"
     },
     "babel-preset-meteor": {
-      "version": "6.11.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.11.1.tgz",
-      "from": "babel-preset-meteor@6.11.1"
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.13.0.tgz",
+      "from": "babel-preset-meteor@6.13.0"
     },
     "babel-preset-react": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.5.0.tgz",
-      "from": "babel-preset-react@>=6.5.0 <6.6.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.16.0.tgz",
+      "from": "babel-preset-react@>=6.16.0 <6.17.0"
     },
     "babel-register": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.9.0.tgz",
-      "from": "babel-register@>=6.9.0 <7.0.0"
+      "version": "6.16.3",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.16.3.tgz",
+      "from": "babel-register@>=6.16.0 <7.0.0"
     },
     "babel-runtime": {
-      "version": "6.9.2",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.9.2.tgz",
-      "from": "babel-runtime@>=6.9.2 <6.10.0"
+      "version": "6.11.6",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz",
+      "from": "babel-runtime@>=6.11.6 <6.12.0"
     },
     "babel-template": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.9.0.tgz",
-      "from": "babel-template@>=6.9.0 <6.10.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.16.0.tgz",
+      "from": "babel-template@>=6.16.0 <6.17.0"
     },
     "babel-traverse": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.9.0.tgz",
-      "from": "babel-traverse@>=6.9.0 <6.10.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.16.0.tgz",
+      "from": "babel-traverse@>=6.16.0 <6.17.0"
     },
     "babel-types": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.10.2.tgz",
-      "from": "babel-types@>=6.10.0 <6.11.0"
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.16.0.tgz",
+      "from": "babel-types@>=6.16.0 <6.17.0"
     },
     "babylon": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.1.tgz",
-      "from": "babylon@6.8.1"
+      "version": "6.11.4",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.11.4.tgz",
+      "from": "babylon@>=6.11.4 <6.12.0"
     },
     "balanced-match": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
       "from": "balanced-match@>=0.4.1 <0.5.0"
     },
     "brace-expansion": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
       "from": "brace-expansion@>=1.0.0 <2.0.0"
     },
     "chalk": {
@@ -331,13 +336,13 @@
       "from": "concat-map@0.0.1"
     },
     "convert-source-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.2.0.tgz",
-      "from": "convert-source-map@>=1.2.0 <1.3.0"
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz",
+      "from": "convert-source-map@>=1.3.0 <1.4.0"
     },
     "core-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
@@ -386,8 +391,8 @@
       "from": "invariant@>=2.2.0 <3.0.0"
     },
     "is-finite": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "from": "is-finite@>=1.0.0 <2.0.0"
     },
     "js-tokens": {
@@ -396,9 +401,9 @@
       "from": "js-tokens@>=2.0.0 <3.0.0"
     },
     "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "from": "jsesc@>=0.5.0 <0.6.0"
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "from": "jsesc@>=1.3.0 <2.0.0"
     },
     "json5": {
       "version": "0.4.0",
@@ -406,9 +411,9 @@
       "from": "json5@>=0.4.0 <0.5.0"
     },
     "lodash": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz",
-      "from": "lodash@>=4.13.1 <4.14.0"
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz",
+      "from": "lodash@>=4.16.4 <4.17.0"
     },
     "loose-envify": {
       "version": "1.2.0",
@@ -423,14 +428,14 @@
       }
     },
     "magic-string": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.2.tgz",
-      "from": "magic-string@>=0.15.0 <0.16.0"
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+      "from": "magic-string@>=0.16.0 <0.17.0"
     },
     "meteor-babel": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.11.7.tgz",
-      "from": "meteor-babel@0.11.7"
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.13.0.tgz",
+      "from": "meteor-babel@0.13.0"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -438,9 +443,9 @@
       "from": "meteor-babel-helpers@0.0.3"
     },
     "minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "from": "minimatch@>=2.0.3 <3.0.0"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+      "from": "minimatch@>=3.0.2 <4.0.0"
     },
     "minimist": {
       "version": "1.2.0",
@@ -465,13 +470,13 @@
       "from": "ms@0.7.1"
     },
     "number-is-nan": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "from": "number-is-nan@>=1.0.0 <2.0.0"
     },
     "os-tmpdir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "from": "os-tmpdir@>=1.0.1 <2.0.0"
     },
     "path-exists": {
@@ -480,8 +485,8 @@
       "from": "path-exists@>=1.0.0 <2.0.0"
     },
     "path-is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "from": "path-is-absolute@>=1.0.0 <2.0.0"
     },
     "private": {
@@ -512,11 +517,18 @@
     "regjsparser": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "from": "regjsparser@>=0.1.4 <0.2.0"
+      "from": "regjsparser@>=0.1.4 <0.2.0",
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "from": "jsesc@>=0.5.0 <0.6.0"
+        }
+      }
     },
     "reify": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.6.tgz",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.8.tgz",
       "from": "reify@>=0.3.6 <0.4.0"
     },
     "repeating": {
@@ -540,16 +552,9 @@
       "from": "source-map@>=0.5.0 <0.6.0"
     },
     "source-map-support": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-      "from": "source-map-support@>=0.2.10 <0.3.0",
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-          "from": "source-map@0.1.32"
-        }
-      }
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.3.tgz",
+      "from": "source-map-support@>=0.4.2 <0.5.0"
     },
     "strip-ansi": {
       "version": "3.0.1",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 9fd3b036c4..6b29c87947 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,11 +6,11 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.9.2-beta.9'
+  version: '6.13.0-beta.9'
 });
 
 Npm.depends({
-  'meteor-babel': '0.11.7',
+  'meteor-babel': '0.13.0'
 });
 
 Package.onUse(function (api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 06e653763d..bf4defe10e 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "3.10.8",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
-    "meteor-babel": "0.12.0",
+    "meteor-babel": "0.13.0",
     "meteor-promise": "0.7.2",
     fibers: "1.0.14",
     promise: "7.1.1",

From 5f0303699a847416d087dd2660a75f286094bb06 Mon Sep 17 00:00:00 2001
From: Rishabh Singhal <rishabh_singhal@outlook.com>
Date: Sat, 24 Sep 2016 20:29:46 +0530
Subject: [PATCH 355/688] Separate timeouts for expiration of password reset
 and enrollment

---
 packages/accounts-base/accounts_common.js     |  10 +-
 packages/accounts-base/accounts_server.js     |  60 ++++++++---
 packages/accounts-password/password_server.js |  10 +-
 packages/accounts-password/password_tests.js  | 101 +++++++++++++++++-
 4 files changed, 163 insertions(+), 18 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index aea362c462..e968ec2e5e 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -97,6 +97,7 @@ export class AccountsCommon {
    * @param {Number} options.loginExpirationInDays The number of days from when a user logs in until their token expires and they are logged out. Defaults to 90. Set to `null` to disable login expiration.
    * @param {String} options.oauthSecretKey When using the `oauth-encryption` package, the 16 byte key using to encrypt sensitive account credentials in the database, encoded in base64.  This option may only be specifed on the server.  See packages/oauth-encryption/README.md for details.
    * @param {Number} options.passwordResetTokenExpirationInDays The number of days from when a link to reset password is sent until token expires and user can't reset password with the link anymore. Defaults to 3.
+   * @param {Number} options.passwordEnrollTokenExpirationInDays The number of days from when a link to set inital password is sent until token expires and user can't set password with the link anymore. Defaults to 30.
    */
   config(options) {
     var self = this;
@@ -128,7 +129,7 @@ export class AccountsCommon {
     }
 
     // validate option keys
-    var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
+    var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation", "passwordEnrollTokenExpirationInDays",
                       "restrictCreationByEmailDomain", "loginExpirationInDays", "passwordResetTokenExpirationInDays"];
     _.each(_.keys(options), function (key) {
       if (!_.contains(VALID_KEYS, key)) {
@@ -217,6 +218,11 @@ export class AccountsCommon {
             DEFAULT_PASSWORD_RESET_TOKEN_EXPIRATION_DAYS) * 24 * 60 * 60 * 1000;
   }
 
+  _getPasswordEnrollTokenLifetimeMs() {
+    return (this._options.passwordEnrollTokenExpirationInDays ||
+        DEFAULT_PASSWORD_ENROLL_TOKEN_EXPIRATION_DAYS) * 24 * 60 * 60 * 1000;
+  }
+
   _tokenExpiration(when) {
     // We pass when through the Date constructor for backwards compatibility;
     // `when` used to be a number.
@@ -259,6 +265,8 @@ Meteor.user = function () {
 var DEFAULT_LOGIN_EXPIRATION_DAYS = 90;
 // how long (in days) until reset password token expires
 var DEFAULT_PASSWORD_RESET_TOKEN_EXPIRATION_DAYS = 3;
+// how long (in days) until enrol password token expires
+var DEFAULT_PASSWORD_ENROLL_TOKEN_EXPIRATION_DAYS = 30;
 // Clients don't try to auto-login with a token that is going to expire within
 // .1 * DEFAULT_LOGIN_EXPIRATION_DAYS, capped at MIN_TOKEN_LIFETIME_CAP_SECS.
 // Tries to avoid abrupt disconnects from expiring tokens.
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index abeebd651a..57ea4eb6e0 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -1075,6 +1075,21 @@ Ap._generateStampedLoginToken = function () {
 /// TOKEN EXPIRATION
 ///
 
+function expirePasswordToken(accounts, oldestValidDate, tokenFilter, userId) {
+  var userFilter = userId ? {_id: userId} : {};
+
+  accounts.users.update(_.extend(userFilter, tokenFilter, {
+    $or: [
+      { "services.password.reset.when": { $lt: oldestValidDate } },
+      { "services.password.reset.when": { $lt: +oldestValidDate } }
+    ]
+  }), {
+    $unset: {
+      "services.password.reset": ""
+    }
+  }, { multi: true });
+}
+
 // Deletes expired tokens from the database and closes all open connections
 // associated with these tokens.
 //
@@ -1132,23 +1147,39 @@ Ap._expirePasswordResetTokens = function (oldestValidDate, userId) {
 
   oldestValidDate = oldestValidDate ||
     (new Date(new Date() - tokenLifetimeMs));
-  var userFilter = userId ? {_id: userId} : {};
 
-  this.users.update(_.extend(userFilter, {
+  var tokenFilter = {
     $or: [
-      { "services.password.reset.when": { $lt: oldestValidDate } },
-      { "services.password.reset.when": { $lt: +oldestValidDate } }
+      { "services.password.reset.reason": "reset"},
+      { "services.password.reset.reason": {$exists: false}}
     ]
-  }), {
-    $unset: {
-      "services.password.reset": {
-        $or: [
-          { when: { $lt: oldestValidDate } },
-          { when: { $lt: +oldestValidDate } }
-        ]
-      }
-    }
-  }, { multi: true });
+  };
+
+  expirePasswordToken(this, oldestValidDate, tokenFilter, userId);
+}
+
+// Deletes expired password enroll tokens from the database.
+//
+// Exported for tests. Also, the arguments are only used by
+// tests. oldestValidDate is simulate expiring tokens without waiting
+// for them to actually expire. userId is used by tests to only expire
+// tokens for the test user.
+Ap._expirePasswordEnrollTokens = function (oldestValidDate, userId) {
+  var tokenLifetimeMs = this._getPasswordEnrollTokenLifetimeMs();
+
+  // when calling from a test with extra arguments, you must specify both!
+  if ((oldestValidDate && !userId) || (!oldestValidDate && userId)) {
+    throw new Error("Bad test. Must specify both oldestValidDate and userId.");
+  }
+
+  oldestValidDate = oldestValidDate ||
+    (new Date(new Date() - tokenLifetimeMs));
+
+  var tokenFilter = {
+    "services.password.reset.reason": "enroll"
+  };
+
+  expirePasswordToken(this, oldestValidDate, tokenFilter, userId);
 }
 
 // @override from accounts_common.js
@@ -1172,6 +1203,7 @@ function setExpireTokensInterval(accounts) {
   accounts.expireTokenInterval = Meteor.setInterval(function () {
     accounts._expireTokens();
     accounts._expirePasswordResetTokens();
+    accounts._expirePasswordEnrollTokens();
   }, EXPIRE_TOKENS_INTERVAL_MS);
 }
 
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index bd36804bb6..7333493c73 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -543,7 +543,8 @@ Accounts.sendResetPasswordEmail = function (userId, email) {
   var tokenRecord = {
     token: token,
     email: email,
-    when: when
+    when: when,
+    reason: 'reset'
   };
   Meteor.users.update(userId, {$set: {
     "services.password.reset": tokenRecord
@@ -611,7 +612,8 @@ Accounts.sendEnrollmentEmail = function (userId, email) {
   var tokenRecord = {
     token: token,
     email: email,
-    when: when
+    when: when,
+    reason: 'enroll'
   };
   Meteor.users.update(userId, {$set: {
     "services.password.reset": tokenRecord
@@ -665,7 +667,11 @@ Meteor.methods({resetPassword: function (token, newPassword) {
       if (!user)
         throw new Meteor.Error(403, "Token expired");
       var when = user.services.password.reset.when;
+      var reason = user.services.password.reset.reason;
       var tokenLifetimeMs = Accounts._getPasswordResetTokenLifetimeMs();
+      if (reason === "enroll") {
+        tokenLifetimeMs = Accounts._getPasswordEnrollTokenLifetimeMs();
+      }
       var currentTimeMs = Date.now();
       if ((currentTimeMs - when) > tokenLifetimeMs)
         throw new Meteor.Error(403, "Token expired");
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index a60cb25fb9..1d9467d6b5 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1556,7 +1556,7 @@ if (Meteor.isServer) (function () {
     });
 
   Tinytest.add(
-    'passwords - reset tokens get cleaned up',
+    'passwords - reset tokens with reasons get cleaned up',
     function (test) {
       var email = test.id + '-intercept@example.com';
       var userId = Accounts.createUser({email: email, password: 'password'});
@@ -1565,6 +1565,105 @@ if (Meteor.isServer) (function () {
 
       Accounts._expirePasswordResetTokens(new Date(), userId);
 
+      test.isUndefined(Meteor.users.findOne(userId).services.password.reset);
+    });
+
+  Tinytest.add(
+    'passwords - reset tokens without reasons get cleaned up',
+    function (test) {
+      var email = test.id + '-intercept@example.com';
+      var userId = Accounts.createUser({email: email, password: 'password'});
+      Accounts.sendResetPasswordEmail(userId, email);
+      Meteor.users.update({_id: userId}, {$unset: {"services.password.reset.reason": 1}});
+      test.isTrue(!!Meteor.users.findOne(userId).services.password.reset);
+      test.isUndefined(Meteor.users.findOne(userId).services.password.reset.reason);
+
+      Accounts._expirePasswordResetTokens(new Date(), userId);
+
+      test.isUndefined(Meteor.users.findOne(userId).services.password.reset);
+    });
+
+  Tinytest.addAsync(
+    'passwords - enroll password should work when token is not expired',
+    function (test, onComplete) {
+      var username = Random.id();
+      var email = username + '-intercept@example.com';
+
+      var userId = Accounts.createUser({
+        username: username,
+        email: email
+      });
+
+      var user = Meteor.users.findOne(userId);
+
+      Accounts.sendEnrollmentEmail(userId, email);
+
+      var enrollPasswordEmailOptions =
+        Meteor.call("getInterceptedEmails", email)[0];
+
+      var re = new RegExp(Meteor.absoluteUrl() + "#/enroll-account/(\\S*)");
+      var match = enrollPasswordEmailOptions.text.match(re);
+      test.isTrue(match);
+      var enrollPasswordToken = match[1];
+
+      makeTestConnection(
+        test,
+        function (clientConn) {
+          test.isTrue(clientConn.call(
+            "resetPassword",
+            enrollPasswordToken,
+            "new-password"
+          ));
+
+          test.isTrue(clientConn.call("login", {
+            user: { username },
+            password: "new-password"
+          }));
+
+          onComplete();
+        });
+    });
+
+  Tinytest.add(
+    'passwords - enroll password should not work when token is expired',
+    function (test) {
+      var username = Random.id();
+      var email = username + '-intercept@example.com';
+
+      var userId = Accounts.createUser({
+        username: username,
+        email: email
+      });
+
+      var user = Meteor.users.findOne(userId);
+
+      Accounts.sendEnrollmentEmail(userId, email);
+
+      var enrollPasswordEmailOptions =
+        Meteor.call("getInterceptedEmails", email)[0];
+
+      var re = new RegExp(Meteor.absoluteUrl() + "#/enroll-account/(\\S*)");
+      var match = enrollPasswordEmailOptions.text.match(re);
+      test.isTrue(match);
+      var enrollPasswordToken = match[1];
+
+      Meteor.users.update(userId, {$set: {"services.password.reset.when":  new Date(Date.now() + -35 * 24 * 3600 * 1000) }});
+
+      test.throws(function () {
+        Meteor.call("resetPassword", enrollPasswordToken, "new-password");
+      }, /Token expired/);
+    });
+
+  Tinytest.add(
+    'passwords - enroll tokens get cleaned up',
+    function (test) {
+      var email = test.id + '-intercept@example.com';
+      var userId = Accounts.createUser({email: email, password: 'password'});
+      Accounts.sendEnrollmentEmail(userId, email);
+      test.isTrue(!!Meteor.users.findOne(userId).services.password.reset);
+
+      Accounts._expirePasswordEnrollTokens(new Date(), userId);
+
       test.isUndefined(Meteor.users.findOne(userId).services.password.reset);
     }
   )

From 8cd6db7191e37e0b2b9ced7ac5417d8da0a0671a Mon Sep 17 00:00:00 2001
From: lucfranken <lucfranken@tentoday.com>
Date: Tue, 27 Sep 2016 10:58:07 +0200
Subject: [PATCH 356/688] Make clear how to run your app with a local checkout
 of Meteor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The README explained how to run Meteor from a checkout.

The example used is the Meteor docs app which is available in the
Meteor repository itself. However it did not mention how you can run
the local Meteor checkout from a local app.

That is the most basic use case, for example to reproduce a bug. That’s
why an example of that is added based on meteor create so we focus on
creating a clean reproduction. That way we can point to it when people
want to debug their own issue.
---
 README.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/README.md b/README.md
index b70cd38fa3..d5737ab50c 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ meteor
 If you want to run on the bleeding edge, or help develop Meteor, you
 can run Meteor directly from a git checkout.
 
+### Clone
+
 ```bash
 git clone --recursive git://github.com/meteor/meteor.git
 cd meteor
@@ -61,6 +63,35 @@ in the root of the `meteor` repository. The typical symptom of not
 updating submodules will be `Error: Depending on unknown package ...`
 when you run most Meteor commands.
 
+### Create testing app
+
+To create a local app to test with your Meteor checkout this is a good 
+structure:
+
+```
+./meteor
+./demo-app
+```
+
+Create the demo app by running:
+
+```bash
+./meteor create demo-app
+```
+
+To run the demo-app with the local copy of Meteor:
+
+```bash
+cd demo-app
+../meteor/meteor
+```
+
+The first time you will see a message which confirms running locally:
+
+> It's the first time you've run Meteor from a git checkout.
+
+### Build from scratch
+
 If you're the sort of person who likes to build everything from scratch,
 you can build all the Meteor dependencies (node.js, npm, mongodb, etc)
 with the provided script. This requires git, a C and C++ compiler,
@@ -80,6 +111,8 @@ download a pre-build version).
 ./meteor --help
 ```
 
+### Local docs
+
 From your checkout, you can read the docs locally. The `/docs` directory is a
 meteor application, so simply change into the `/docs` directory and launch
 the app:

From 01b902bfb388f2a5a7e50e0ff532fa215f36a31f Mon Sep 17 00:00:00 2001
From: lucfranken <lucfranken@tentoday.com>
Date: Tue, 27 Sep 2016 17:30:41 +0200
Subject: [PATCH 357/688] Fix missing /meteor part in command

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d5737ab50c..d021c234e8 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ structure:
 Create the demo app by running:
 
 ```bash
-./meteor create demo-app
+./meteor/meteor create demo-app
 ```
 
 To run the demo-app with the local copy of Meteor:

From fd9594d3a0e0791151ca2858869d0894d7d0f0d3 Mon Sep 17 00:00:00 2001
From: lucfranken <lucfranken@tentoday.com>
Date: Wed, 28 Sep 2016 10:49:47 +0200
Subject: [PATCH 358/688] Remove reference to local docs which are not
 available anymore

As discussed in:
https://github.com/meteor/meteor/issues/7824#issuecomment-250106125

The docs are in a separate repository now:
https://github.com/meteor/docs/ and are not included anymore in a
standard checkout from meteor/meteor.
---
 README.md | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d021c234e8..027e52f885 100644
--- a/README.md
+++ b/README.md
@@ -107,23 +107,13 @@ Now you can run meteor directly from the checkout (if you did not
 build the dependency bundle above, this will take a few moments to
 download a pre-build version).
 
+Run at least one Meteor command to install required dependencies, like:
+
 ```bash
 ./meteor --help
 ```
 
-### Local docs
-
-From your checkout, you can read the docs locally. The `/docs` directory is a
-meteor application, so simply change into the `/docs` directory and launch
-the app:
-
-```bash
-cd docs/
-../meteor
-```
-
-You'll then be able to read the docs locally in your browser at
-`http://localhost:3000/`.
+You local Meteor checkout is now ready for use.
 
 Note that if you run Meteor from a git checkout, you cannot pin apps to specific
 Meteor releases or run using different Meteor releases using `--release`.

From d059f9540645f15162c71062da53517ad304dd17 Mon Sep 17 00:00:00 2001
From: lucfranken <lucfranken@tentoday.com>
Date: Wed, 28 Sep 2016 10:58:44 +0200
Subject: [PATCH 359/688] Fix typo in Your local Meteor checkout

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 027e52f885..c9e6095e41 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ Run at least one Meteor command to install required dependencies, like:
 ./meteor --help
 ```
 
-You local Meteor checkout is now ready for use.
+Your local Meteor checkout is now ready for use.
 
 Note that if you run Meteor from a git checkout, you cannot pin apps to specific
 Meteor releases or run using different Meteor releases using `--release`.

From 8576e6dcd681a5571ff147a89296970c525a7295 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 12 Oct 2016 17:05:09 +0300
Subject: [PATCH 360/688] Formatting and Finalization of "Slow Start for
 Developers"

This is a wrapup/cleanup on @lucfranken's PR to clarify and clean up the "Slow Start (for developers)" section of the README.

The next step will be to move this to a separate file where much more information can be added, but this incorporates most of the original suggestions and adds some additional formatting.
---
 README.md | 95 ++++++++++++++++++++-----------------------------------
 1 file changed, 34 insertions(+), 61 deletions(-)

diff --git a/README.md b/README.md
index c9e6095e41..1767105485 100644
--- a/README.md
+++ b/README.md
@@ -41,82 +41,55 @@ meteor
 
 ## Slow Start (for developers)
 
-If you want to run on the bleeding edge, or help develop Meteor, you
-can run Meteor directly from a git checkout.
+If you want to run on the bleeding edge, or [help contribute to Meteor](Contributing.md), you
+can run Meteor directly from a Git checkout using these steps:
 
-### Clone
+0. **Clone from GitHub**
 
-```bash
-git clone --recursive git://github.com/meteor/meteor.git
-cd meteor
-```
+    ```sh
+    $ git clone --recursive https://github.com/meteor/meteor.git
+    $ cd meteor
+    ```
 
-The `--recursive` flag ensures that submodules will be initialized and
-updated as part of the cloning process. If you cloned the `meteor`
-repository without the `--recursive` flag, you can equivalently run
+    > ##### Important note about Git submodules!
+    >
+    > This repository uses Git submodules.  If you clone without the `--recursive` flag,
+    > re-fetch with `git pull` or experience "`Depending on unknown package`" errors,
+    > run the following in the repository root to sync things up again:
+    >
+    >     $ git submodule update --init --recursive
 
-```bash
-git submodule update --init --recursive
-```
+0. **_(Optional)_ Compile dependencies**
 
-in the root of the `meteor` repository. The typical symptom of not
-updating submodules will be `Error: Depending on unknown package ...`
-when you run most Meteor commands.
+    > This optional step requires `git`, a C and C++ compiler, autotools, and scons.
+    > If this step is skipped, Meteor will simply download pre-built binaries.
 
-### Create testing app
+    To build everything from scratch (`node`, `npm`, `mongodb`, etc.) run the following:
 
-To create a local app to test with your Meteor checkout this is a good 
-structure:
+    ```sh
+    $ ./scripts/generate-dev-bundle.sh # OPTIONAL!
+    ```
 
-```
-./meteor
-./demo-app
-```
+0. **Run a Meteor command to install dependencies**
 
-Create the demo app by running:
+    > If you did not compile dependencies above, this will also download the binaries.
 
-```bash
-./meteor/meteor create demo-app
-```
 
-To run the demo-app with the local copy of Meteor:
+    ```sh
+    $ ./meteor --help
+    ```
 
-```bash
-cd demo-app
-../meteor/meteor
-```
+0. **Ready to Go!**
 
-The first time you will see a message which confirms running locally:
+    Your local Meteor checkout is now ready to use!  You can use this `./meteor`
+    anywhere you would normally call the system `meteor`.  For example,:
 
-> It's the first time you've run Meteor from a git checkout.
+    ```sh
+    any-app-directory $ /path/to/meteor-checkout/meteor
+    ```
 
-### Build from scratch
-
-If you're the sort of person who likes to build everything from scratch,
-you can build all the Meteor dependencies (node.js, npm, mongodb, etc)
-with the provided script. This requires git, a C and C++ compiler,
-autotools, and scons. If you do not run this script, Meteor will
-automatically download pre-compiled binaries when you first run it.
-
-```bash
-# OPTIONAL
-./scripts/generate-dev-bundle.sh
-```
-
-Now you can run meteor directly from the checkout (if you did not
-build the dependency bundle above, this will take a few moments to
-download a pre-build version).
-
-Run at least one Meteor command to install required dependencies, like:
-
-```bash
-./meteor --help
-```
-
-Your local Meteor checkout is now ready for use.
-
-Note that if you run Meteor from a git checkout, you cannot pin apps to specific
-Meteor releases or run using different Meteor releases using `--release`.
+    > _Note:_ When running from a `git` checkout, you cannot pin apps to specific
+    > Meteor releases or change the release using `--release`.
 
 ## Uninstalling Meteor
 

From ebecfeeb3e4fc07952bff3382b76a38e932d10d1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 11:41:34 -0400
Subject: [PATCH 361/688] Prevent exceptional optimisticReadFile from
 invalidating Resolver caching.

---
 tools/isobuild/resolver.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index f569b82365..b838282fa2 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -276,6 +276,10 @@ export default class Resolver {
   }
 
   _readPkgJson(path) {
+    if (! optimisticStatOrNull(path)) {
+      return null;
+    }
+
     try {
       return JSON.parse(optimisticReadFile(path));
     } catch (e) {

From 3c5059b72ad3f1de4467a21622ff32dc5793fcb7 Mon Sep 17 00:00:00 2001
From: c9s <yoanlin93@gmail.com>
Date: Fri, 5 Aug 2016 10:04:26 +0800
Subject: [PATCH 362/688] Add METEOR_PACKAGE_DIRS support

- Use path.delimiter to support windows platform
- Add console.warn message when PACAKGE_DIRS is defined
---
 tools/cli/help.txt           |  4 ++--
 tools/packaging/warehouse.js |  2 +-
 tools/project-context.js     | 20 ++++++++++++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index aeb0fd090a..44334da3ad 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -505,7 +505,7 @@ modified.
 Packages may be specified by name or by path. If a package argument
 contains a '/', it is loaded from a directory of that name; otherwise,
 the package name is resolved according to the usual package search
-algorithm ('packages' subdirectory of the current app, $PACKAGE_DIRS
+algorithm ('packages' subdirectory of the current app, $METEOR_PACKAGE_DIRS
 directories, and core packages in that order). You can test any number
 of packages simultaneously. If you don't specify any package names
 then all available packages will be tested.
@@ -778,7 +778,7 @@ and rebuilds the package from scratch. Packages are specified by name.
 
 If you pass no arguments, this will rebuild all local packages.
 That includes packages found through the
-PACKAGE_DIRS environment variable, local packages in the current
+METEOR_PACKAGE_DIRS environment variable, local packages in the current
 application, and, if running Meteor from a checkout, the packages in
 the checkout. It doesn't include any packages for which we don't have
 the source.
diff --git a/tools/packaging/warehouse.js b/tools/packaging/warehouse.js
index b37bda6ee9..35f134fc9d 100644
--- a/tools/packaging/warehouse.js
+++ b/tools/packaging/warehouse.js
@@ -33,7 +33,7 @@
 ///
 /// The warehouse is not used at all when running from a
 /// checkout. Only local packages will be loaded (from
-/// CHECKOUT/packages or within a directory in the PACKAGE_DIRS
+/// CHECKOUT/packages or within a directory in the METEOR_PACKAGE_DIRS or PACKAGE_DIRS
 /// environment variable). The setup of that is handled by release.js.
 
 var os = require("os");
diff --git a/tools/project-context.js b/tools/project-context.js
index ee954a0a31..0bf75946ba 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1,5 +1,6 @@
 var assert = require("assert");
 var _ = require('underscore');
+var path = require('path');
 
 var archinfo = require('./utils/archinfo.js');
 var buildmessage = require('./utils/buildmessage.js');
@@ -596,10 +597,21 @@ _.extend(ProjectContext.prototype, {
     var self = this;
     var searchDirs = [files.pathJoin(self._projectDirForLocalPackages, 'packages')];
 
-    if (! self._ignorePackageDirsEnvVar && process.env.PACKAGE_DIRS) {
-      // User can provide additional package directories to search in
-      // PACKAGE_DIRS (colon-separated).
-      _.each(process.env.PACKAGE_DIRS.split(':'), function (p) {
+    // User can provide additional package directories to search in
+    // METEOR_PACKAGE_DIRS (colon-separated),
+    // This was added after 1.4.0.1
+    var envPackageDirs = process.env.METEOR_PACKAGE_DIRS || process.env.PACKAGE_DIRS;
+
+    // If the PACKAGE_DIRS, warn users to migrate to the new env vars.
+    if (process.env.PACKAGE_DIRS) {
+      console.warn("For compatibility reasons, the 'PACKAGE_DIRS' environment"
+                   + " variable is deprecated and will be removed in a future"
+                   + " release of Meteor.  Developers should now use"
+                   + " 'METEOR_PACKAGE_DIRS'.");
+    }
+    if (! self._ignorePackageDirsEnvVar && envPackageDirs) {
+      // path.delimiter was added in v0.9.3
+      _.each(envPackageDirs.split(path.delimiter), function (p) {
         searchDirs.push(files.pathResolve(p));
       });
     }

From 4300d261f3a265a8e29f06fdc9974ed2ee330cdf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 11:41:35 -0400
Subject: [PATCH 363/688] Support `meteor <command>` for any
 dev_bundle/bin/<command> executable.

This will make it easier to use tools like https://yarnpkg.com/ with the
right version of Node, etc.

With this commit, here's all you have to do:

  meteor npm install -g yarnpkg

Then test that it works:

  meteor yarn info

Note that any commands registered by Meteor itself will not be honored.
---
 History.md                           |  3 ++
 tools/cli/dev-bundle-bin-commands.js | 17 ++++-----
 tools/cli/dev-bundle-bin-helpers.js  | 53 ++++++++++++++++++++++++++++
 tools/cli/main.js                    | 22 ++++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index 0bd8ebb202..30054ae735 100644
--- a/History.md
+++ b/History.md
@@ -48,6 +48,9 @@
   sensitive to non-reproducible factors in the external environment.
   https://github.com/meteor/meteor/pull/7668/commits/3313180a6ff33ee63602f7592a9506012029e919
 
+* The `meteor <command> ...` syntax will now work for any command
+  installed in `dev_bundle/bin`, except for Meteor's own commands.
+
 * The `meteor test` command now supports the `--no-release-check` flag.
   https://github.com/meteor/meteor/pull/7668/commits/7097f78926f331fb9e70a06300ce1711adae2850
 
diff --git a/tools/cli/dev-bundle-bin-commands.js b/tools/cli/dev-bundle-bin-commands.js
index 5988abe27d..c9325b9799 100644
--- a/tools/cli/dev-bundle-bin-commands.js
+++ b/tools/cli/dev-bundle-bin-commands.js
@@ -1,11 +1,8 @@
 // Note that this file is required before we install our Babel hooks in
 // ../tool-env/install-babel.js, so we can't use ES2015+ syntax here.
 
+var fs = require("fs");
 var path = require("path");
-var win32Extensions = {
-  node: ".exe",
-  npm: ".cmd"
-};
 
 // The dev_bundle/bin command has to come immediately after the meteor
 // command, as in `meteor npm` or `meteor node`, because we don't want to
@@ -14,22 +11,22 @@ var devBundleBinCommand = process.argv[2];
 var args = process.argv.slice(3);
 
 function getChildProcess() {
-  if (! win32Extensions.hasOwnProperty(devBundleBinCommand)) {
+  if (typeof devBundleBinCommand !== "string") {
     return Promise.resolve(null);
   }
 
   var helpers = require("./dev-bundle-bin-helpers.js");
 
-  if (process.platform === "win32") {
-    devBundleBinCommand += win32Extensions[devBundleBinCommand];
-  }
-
   return Promise.all([
     helpers.getDevBundle(),
     helpers.getEnv()
   ]).then(function (devBundleAndEnv) {
     var devBundleDir = devBundleAndEnv[0];
-    var cmd = path.join(devBundleDir, "bin", devBundleBinCommand);
+    var cmd = helpers.getCommand(devBundleBinCommand, devBundleDir);
+    if (! cmd) {
+      return null;
+    }
+
     var env = devBundleAndEnv[1];
     var child = require("child_process").spawn(cmd, args, {
       stdio: "inherit",
diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 23aa66955a..665b34702a 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -1,12 +1,65 @@
 var fs = require("fs");
 var path = require("path");
 var files = require("../fs/mini-files.js");
+var isWindows = process.platform === "win32";
+var extensions = isWindows ? [".cmd", ".exe"] : [""];
+var hasOwn = Object.prototype.hasOwnProperty;
 
 function getDevBundle() {
   return require("./dev-bundle.js");
 }
 exports.getDevBundle = getDevBundle;
 
+exports.getCommand = function (name, devBundleDir) {
+  var result = null;
+
+  // Strip leading and/or trailing whitespace.
+  name = name.replace(/^\s+|\s+$/g, "");
+
+  if (! isValidCommand(name, devBundleDir)) {
+    return result;
+  }
+
+  extensions.some(function (ext) {
+    var cmd = path.join(devBundleDir, "bin", name + ext);
+    try {
+      if (fs.statSync(cmd).isFile()) {
+        result = cmd;
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
+  });
+
+  return result;
+};
+
+function isValidCommand(name, devBundleDir) {
+  if (name === "node" ||
+      name === "npm") {
+    return true;
+  }
+
+  if (! name || name.charAt(0) === ".") {
+    // Disallow empty commands and commands that start with a period.
+    return false;
+  }
+
+  var meteorCommandsJsonPath =
+    path.join(devBundleDir, "bin", ".meteor-commands.json");
+
+  try {
+    var meteorCommands = require(meteorCommandsJsonPath);
+  } catch (e) {
+    return false;
+  }
+
+  // If `meteor <name>` is already a Meteor command, don't let anything in
+  // dev_bundle/bin override it.
+  return ! hasOwn.call(meteorCommands, name);
+}
+
 exports.getEnv = function (options) {
   var devBundle = options && options.devBundle;
   var devBundlePromise = typeof devBundle === "string"
diff --git a/tools/cli/main.js b/tools/cli/main.js
index 5d8b1c3942..611d4a7f78 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -291,6 +291,28 @@ require('./commands-packages-query.js');
 require('./commands-cordova.js');
 require('./commands-aliases.js');
 
+///////////////////////////////////////////////////////////////////////////////
+// Record all the top-level commands as JSON
+///////////////////////////////////////////////////////////////////////////////
+
+export const meteorCommandsJsonPath = files.pathJoin(
+  files.getDevBundle(), "bin", ".meteor-commands.json"
+);
+
+export function dumpMeteorCommands() {
+  const all = Object.create(null);
+  Object.keys(commands).forEach(name => all[name] = true);
+  const json = JSON.stringify(all, null, 2);
+  files.writeFile(meteorCommandsJsonPath, json + "\n");
+  return all;
+}
+
+if (files.inCheckout()) {
+  // If we're running Meteor from a checkout, dump the commands every
+  // time, so that the file remains up to date.
+  dumpMeteorCommands();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Long-form help
 ///////////////////////////////////////////////////////////////////////////////

From ca51aa327b97392da4084c43e92d1d8809f109c4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 11:41:37 -0400
Subject: [PATCH 364/688] Update the `optimism` npm package to version 0.3.3.

---
 scripts/dev-bundle-tool-package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index bf4defe10e..a9045e86d6 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -52,7 +52,7 @@ var packageJson = {
     // https://github.com/williamwicks/node-eachline/pull/4
     eachline: "https://github.com/meteor/node-eachline/tarball/ff89722ff94e6b6a08652bf5f44c8fffea8a21da",
     pathwatcher: "6.7.1",
-    optimism: "0.3.1",
+    optimism: "0.3.3",
     'lru-cache': '4.0.1',
     'cordova-lib': "6.3.1",
     longjohn: '0.2.11'

From 56de90e4403bf99213286c09023481f1abac73fe Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 18:08:05 -0400
Subject: [PATCH 365/688] Switch back some optimistic functions in
 tools/fs/watch.js.

In particular, optimisticReaddir was getting called before relevant dirty
callbacks were firing, and thus failing to notice actual changes on the
file system.

In general, the tools/fs/watch.js code is the one place where we really
need an up-to-date view of the file system. Put another way, if optimistic
functions worked perfectly, we wouldn't need to rely so much on WatchSet
logic, but for now it's a balance of equally important strategies, and we
shouldn't be compromising one by intermingling it with the other.
---
 tools/fs/watch.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index c7508e9993..ded8d3c21e 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -268,7 +268,7 @@ export function sha1(contents) {
 export function readDirectory({absPath, include, exclude, names}) {
   // Read the directory.
   try {
-    var contents = optimisticReaddir(absPath);
+    var contents = files.readdir(absPath);
   } catch (e) {
     // If the path is not a directory, return null; let other errors through.
     if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
@@ -282,7 +282,7 @@ export function readDirectory({absPath, include, exclude, names}) {
   _.each(contents, function (entry) {
     // We do stat instead of lstat here, so that we treat symlinks to
     // directories just like directories themselves.
-    const stat = optimisticStatOrNull(files.pathJoin(absPath, entry));
+    const stat = files.statOrNull(files.pathJoin(absPath, entry));
     if (! stat) {
       // Disappeared after the readdir (or a dangling symlink)?
       // Eh, pretend it was never there in the first place.
@@ -460,8 +460,7 @@ export class Watcher {
       return;
     }
 
-    const exists = !! optimisticStatOrNull(absPath);
-    if (exists) {
+    if (files.statOrNull(absPath)) {
       if (self._mustNotExist(absPath)) {
         self._fire();
         return;
@@ -523,7 +522,7 @@ export class Watcher {
 
       } else if (stat.isDirectory()) {
         try {
-          var dirFiles = optimisticReaddir(absPath);
+          var dirFiles = files.readdir(absPath);
         } catch (err) {
           if (err.code === "ENOENT" ||
               err.code === "ENOTDIR") {
@@ -591,7 +590,7 @@ export class Watcher {
     var self = this;
     var entry = self.watches[absPath];
     var lastStat = entry.lastStat;
-    var stat = optimisticStatOrNull(absPath);
+    var stat = files.statOrNull(absPath);
     var mustNotExist = self._mustNotExist(absPath);
     var mustBeAFile = self._mustBeAFile(absPath);
 

From fb2f863a3799ec67fc6b818daeed69cfd2d84e5b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 11:41:39 -0400
Subject: [PATCH 366/688] Bump $BUNDLE_VERSION to 4.3.6 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index ee358b03cf..86f47df4e7 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.5
+BUNDLE_VERSION=4.3.6
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 6da919f4340ff3ec0e30845ff5cc38442644ddfa Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 13 Oct 2016 11:55:40 +0300
Subject: [PATCH 367/688] Don't use $PS1 prompt to indicate `cwd`.  Be more
 explicit.

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1767105485..44b7cd5543 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,8 @@ can run Meteor directly from a Git checkout using these steps:
     anywhere you would normally call the system `meteor`.  For example,:
 
     ```sh
-    any-app-directory $ /path/to/meteor-checkout/meteor
+    $ cd my-app/
+    $ /path/to/meteor-checkout/meteor run
     ```
 
     > _Note:_ When running from a `git` checkout, you cannot pin apps to specific

From 815e32e68be7365f9e9eeed5b0a09ffd6fa2303e Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 13 Oct 2016 13:39:16 +0300
Subject: [PATCH 368/688] Add METEOR_PACKAGE_DIRS support and deprecate
 PACKAGE_DIRS

This is a refactor/finishing-move of @c9s's original PR meteor/meteor#7586.

This maintains backward compatibility with PACKAGE_DIRS using the original separator that it expected (':').  Users of the new METEOR_PACKAGE_DIRS variable should use the correct path separator for their platform (`:` on BSD/Linux and `;` on Windows).

Fixes meteor/meteor#7585
Fixes meteor/meteor#4204
---
 tools/packaging/warehouse.js |  2 +-
 tools/project-context.js     | 40 ++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/tools/packaging/warehouse.js b/tools/packaging/warehouse.js
index 35f134fc9d..7e3bc42495 100644
--- a/tools/packaging/warehouse.js
+++ b/tools/packaging/warehouse.js
@@ -33,7 +33,7 @@
 ///
 /// The warehouse is not used at all when running from a
 /// checkout. Only local packages will be loaded (from
-/// CHECKOUT/packages or within a directory in the METEOR_PACKAGE_DIRS or PACKAGE_DIRS
+/// CHECKOUT/packages or within a directory in the METEOR_PACKAGE_DIRS
 /// environment variable). The setup of that is handled by release.js.
 
 var os = require("os");
diff --git a/tools/project-context.js b/tools/project-context.js
index 0bf75946ba..cffdee0693 100644
--- a/tools/project-context.js
+++ b/tools/project-context.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var _ = require('underscore');
-var path = require('path');
 
 var archinfo = require('./utils/archinfo.js');
 var buildmessage = require('./utils/buildmessage.js');
@@ -594,26 +593,37 @@ _.extend(ProjectContext.prototype, {
   },
 
   _localPackageSearchDirs: function () {
-    var self = this;
-    var searchDirs = [files.pathJoin(self._projectDirForLocalPackages, 'packages')];
+    const self = this;
+    let searchDirs = [
+      files.pathJoin(self._projectDirForLocalPackages, 'packages'),
+    ];
 
     // User can provide additional package directories to search in
-    // METEOR_PACKAGE_DIRS (colon-separated),
-    // This was added after 1.4.0.1
-    var envPackageDirs = process.env.METEOR_PACKAGE_DIRS || process.env.PACKAGE_DIRS;
+    // METEOR_PACKAGE_DIRS (semi-colon/colon-separated, depending on OS),
 
-    // If the PACKAGE_DIRS, warn users to migrate to the new env vars.
+    // PACKAGE_DIRS Deprecated in 2016-10
+    // Warn users to migrate from PACKAGE_DIRS to METEOR_PACKAGE_DIRS
     if (process.env.PACKAGE_DIRS) {
-      console.warn("For compatibility reasons, the 'PACKAGE_DIRS' environment"
-                   + " variable is deprecated and will be removed in a future"
-                   + " release of Meteor.  Developers should now use"
-                   + " 'METEOR_PACKAGE_DIRS'.");
+      Console.warn('For compatibility, the PACKAGE_DIRS environment variable',
+        'is deprecated and will be removed in a future Meteor release.');
+      Console.warn('Developers should now use METEOR_PACKAGE_DIRS and',
+        'Windows projects should now use a semi-colon (;) to separate paths.');
     }
-    if (! self._ignorePackageDirsEnvVar && envPackageDirs) {
+
+    function packageDirsFromEnvVar(envVar, delimiter = files.pathOsDelimiter) {
+      return process.env[envVar] && process.env[envVar].split(delimiter) || [];
+    }
+
+    const envPackageDirs = [
+    // METEOR_PACKAGE_DIRS should use the arch-specific delimiter
+      ...(packageDirsFromEnvVar('METEOR_PACKAGE_DIRS')),
+      // PACKAGE_DIRS (deprecated) always used ':' separator (yes, even Windows)
+      ...(packageDirsFromEnvVar('PACKAGE_DIRS', ':')),
+    ];
+
+    if (! self._ignorePackageDirsEnvVar && envPackageDirs.length) {
       // path.delimiter was added in v0.9.3
-      _.each(envPackageDirs.split(path.delimiter), function (p) {
-        searchDirs.push(files.pathResolve(p));
-      });
+      envPackageDirs.forEach( p => searchDirs.push(files.pathResolve(p)) );
     }
 
     if (! self._ignoreCheckoutPackages && files.inCheckout()) {

From 246563e46c0c0acca976247f71d5903913982859 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 13 Oct 2016 12:16:54 +0300
Subject: [PATCH 369/688] Remove explanation that you need `git` to compile
 dependencies

Obvious cat is obvious.  You couldn't have got to this step without `git`.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44b7cd5543..9c471c747c 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ can run Meteor directly from a Git checkout using these steps:
 
 0. **_(Optional)_ Compile dependencies**
 
-    > This optional step requires `git`, a C and C++ compiler, autotools, and scons.
+    > This optional step requires a C and C++ compiler, autotools, and scons.
     > If this step is skipped, Meteor will simply download pre-built binaries.
 
     To build everything from scratch (`node`, `npm`, `mongodb`, etc.) run the following:

From ec34a4ecc6d4a9891ccaa382538f8972d3f2fa7d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Oct 2016 13:53:40 -0400
Subject: [PATCH 370/688] Fix tests by making sure to close optimistic file
 watchers.

If a test process does not explicitly call process.exit, pathwatcher
watchers may keep it alive indefinitely (either that, or there's a bug
with the persistent:false option to fs.watchFile).

This accidental immortality can be prevented by explicitly closing all
watchers when we no longer have any interest in file change notifications.
---
 tools/fs/safe-watcher.js                | 40 ++++++++++++++++++-------
 tools/runners/run-app.js                |  5 ++++
 tools/tests/old/test-bundler-assets.js  |  5 ++++
 tools/tests/old/test-bundler-options.js |  6 +++-
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index 78ea0309e9..16d91705e3 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -130,7 +130,7 @@ function startNewWatcher(absPath) {
 
   rewatch();
 
-  return {
+  const entry = {
     callbacks,
     rewatch,
 
@@ -153,18 +153,38 @@ function startNewWatcher(absPath) {
           // can avoid tearing anything down.
           return;
         }
-
-        watchers[absPath] = null;
-
-        if (watcher) {
-          watcher.close();
-          watcher = null;
-        }
-
-        unwatchFile(absPath, watchFileWrapper);
+        entry.close();
       }, WATCHER_CLEANUP_DELAY_MS);
+    },
+
+    close() {
+      if (watchers[absPath] !== entry) return;
+      watchers[absPath] = null;
+
+      if (watcherCleanupTimer) {
+        clearTimeout(watcherCleanupTimer);
+        watcherCleanupTimer = null;
+      }
+
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+
+      unwatchFile(absPath, watchFileWrapper);
     }
   };
+
+  return entry;
+}
+
+export function closeAllWatchers() {
+  Object.keys(watchers).forEach(absPath => {
+    const entry = watchers[absPath];
+    if (entry) {
+      entry.close();
+    }
+  });
 }
 
 function watchLibraryWatch(absPath, callback) {
diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index e0568e6cdc..f50ea91c74 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -13,6 +13,7 @@ var Profile = require('../tool-env/profile.js').Profile;
 var release = require('../packaging/release.js');
 import * as cordova from '../cordova';
 import { CordovaBuilder } from '../cordova/builder.js';
+import { closeAllWatchers } from "../fs/safe-watcher.js";
 
 // Parse out s as if it were a bash command line.
 var bashParse = function (s) {
@@ -980,6 +981,10 @@ _.extend(AppRunner.prototype, {
       break;
     }
 
+    // Allow the process to exit normally, since optimistic file watchers
+    // may be keeping the event loop busy.
+    closeAllWatchers();
+
     // Giving up for good.
     self._cleanUpPromises();
 
diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 3a2ebdccc1..953ab0b9e1 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -10,6 +10,7 @@ var release = require('../../packaging/release.js');
 var catalog = require('../../packaging/catalog/catalog.js');
 var buildmessage = require('../../utils/buildmessage.js');
 var projectContextModule = require('../../project-context.js');
+var safeWatcher = require("../../fs/safe-watcher.js");
 
 var lastTmpDir = null;
 var tmpDir = function () {
@@ -156,4 +157,8 @@ Fiber(function () {
     console.log('\nBundle can be found at ' + lastTmpDir);
     process.exit(1);
   }
+
+  // Allow the process to exit normally, since optimistic file watchers
+  // may be keeping the event loop busy.
+  safeWatcher.closeAllWatchers();
 }).run();
diff --git a/tools/tests/old/test-bundler-options.js b/tools/tests/old/test-bundler-options.js
index 23daa42588..12b9a8c5e8 100644
--- a/tools/tests/old/test-bundler-options.js
+++ b/tools/tests/old/test-bundler-options.js
@@ -9,7 +9,7 @@ var catalog = require('../../packaging/catalog/catalog.js');
 var buildmessage = require('../../utils/buildmessage.js');
 var isopackets = require('../../tool-env/isopackets.js');
 var projectContextModule = require('../../project-context.js');
-
+var safeWatcher = require("../../fs/safe-watcher.js");
 
 var lastTmpDir = null;
 var tmpDir = function () {
@@ -165,4 +165,8 @@ Fiber(function () {
     console.log('\nBundle can be found at ' + lastTmpDir);
     process.exit(1);
   }
+
+  // Allow the process to exit normally, since optimistic file watchers
+  // may be keeping the event loop busy.
+  safeWatcher.closeAllWatchers();
 }).run();

From ff0d822369af81b5c0766a0608404b42248813b1 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 13 Oct 2016 16:06:43 +0300
Subject: [PATCH 371/688] Move History entry about #7821 higher explain further

meteor/meteor#7821 is a breaking change for anyone running the `meteor` tool as `root` right now.  This moves it higher and explain that it's not just a warning.
---
 History.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 30054ae735..eab5fad65a 100644
--- a/History.md
+++ b/History.md
@@ -20,6 +20,12 @@
   been updated to version 2.2.10.
   [#7780](https://github.com/meteor/meteor/pull/7780)
 
+* The `meteor` tool is now prevented from running as `root` as this is
+  not recommended and can cause issues with permissions.  In some environments,
+  (e.g. Docker), it may still be desired to run as `root` and this can be
+  permitted by passing `--unsafe-perm` to the `meteor` command.
+  [#7821](https://github.com/meteor/meteor/pull/7821)
+
 * When the Meteor development server shuts down, it now attempts to kill
   the `mongod` process it spawned, in addition to killing any running
   `mongod` processes when the server first starts up.
@@ -72,9 +78,6 @@
   engine, instead of failing to start Mongo.
   [#7840](https://github.com/meteor/meteor/pull/7840).
 
-* Running Meteor with root privileges now displays a warning.
-  [#7821](https://github.com/meteor/meteor/pull/7821)
-
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:

From 7ea95063b01e4c374fb3ddad671a1eecce036ea0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Oct 2016 18:27:51 -0400
Subject: [PATCH 372/688] Ignore non-top-level identifiers early in
 Resolver#_resolveNodeModule.

---
 tools/isobuild/resolver.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index b838282fa2..a5f48a79ff 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -204,7 +204,9 @@ export default class Resolver {
   }
 
   _resolveNodeModule(id, absParentPath) {
-    let resolved = null;
+    if (! Resolver.isTopLevel(id)) {
+      return null;
+    }
 
     if (Resolver.isNative(id) &&
         archMatches(this.targetArch, "os")) {
@@ -234,6 +236,8 @@ export default class Resolver {
       }
     });
 
+    let resolved = null;
+
     if (sourceRoot) {
       let dir = absParentPath; // It's ok for absParentPath to be a directory!
       let info = this._joinAndStat(dir);

From 5de9070c9ca0b5984bbfd1d5e29fab147de08279 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Oct 2016 19:07:16 -0400
Subject: [PATCH 373/688] Implement ImportScanner#isWeb convenience method.

---
 tools/isobuild/import-scanner.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 5a62812c4f..2fd905aad6 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -551,7 +551,7 @@ export default class ImportScanner {
       // Append this file to the output array and record its index.
       this._addFile(absImportedPath, depFile);
 
-      if (archMatches(this.bundleArch, "os") &&
+      if (! this.isWeb() &&
           depFile.installPath.startsWith("node_modules/")) {
         // On the server, modules in node_modules directories will be
         // handled natively by Node, so we don't need to build a
@@ -563,6 +563,10 @@ export default class ImportScanner {
     });
   }
 
+  isWeb() {
+    return archMatches(this.bundleArch, "web");
+  }
+
   _readFile(absPath) {
     const contents = optimisticReadFile(absPath);
     const hash = optimisticHashOrNull(absPath);
@@ -663,7 +667,7 @@ export default class ImportScanner {
 
     const dirs = this._splitPath(pathDirname(installPath));
     const isApp = ! this.name;
-    const bundlingForWeb = archMatches(this.bundleArch, "web");
+    const bundlingForWeb = this.isWeb();
 
     const topLevelDir = dirs[0];
     if (topLevelDir === "private" ||
@@ -720,7 +724,7 @@ export default class ImportScanner {
 
     if (isApp &&
         Resolver.isNative(id) &&
-        archMatches(this.bundleArch, "web")) {
+        this.isWeb()) {
       // To ensure the native module can be evaluated at runtime, register
       // a dependency on meteor-node-stubs/deps/<id>.js.
       const stubId = Resolver.getNativeStubId(id);

From 56c041c8582cedb8650028fa1ed45540edd1d955 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Oct 2016 18:33:36 -0400
Subject: [PATCH 374/688] Filter out node_modules/babel-runtime/* when Meteor
 provides babel-runtime.

Should fix #7872 and others (e.g. #7833).
---
 tools/isobuild/compiler-plugin.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 844f399fba..456d3ab72d 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1088,14 +1088,38 @@ export class PackageSourceBatch {
 
     this._warnAboutMissingModules(allMissingNodeModules);
 
+    const meteorProvidesBabelRuntime = map.has("babel-runtime");
+
     scannerMap.forEach((scanner, name) => {
       const isApp = ! name;
+      const isWeb = scanner.isWeb();
+      const outputFiles = scanner.getOutputFiles();
 
       if (isApp) {
         const appFilesWithoutNodeModules = [];
 
-        scanner.getOutputFiles().forEach(file => {
+        outputFiles.forEach(file => {
           const parts = file.installPath.split("/");
+
+          if (meteorProvidesBabelRuntime || ! isWeb) {
+            // If the Meteor babel-runtime package is installed, it will
+            // provide implementations for babel-runtime/helpers/* and
+            // babel-runtime/regenerator at runtime, so we should filter
+            // out any node_modules/babel-runtime/* modules from the app.
+            // If the Meteor babel-runtime package is not installed, then
+            // we should rely on node_modules/babel-runtime/* instead. On
+            // the server that still means removing bundled files here and
+            // relying on programs/server/npm/node_modules/babel-runtime,
+            // but on the web these bundled files are all we have, so we'd
+            // better not remove them.
+            if (parts[0] === "node_modules" &&
+                parts[1] === "babel-runtime" &&
+                // Can't just be node_modules/babel-runtime.
+                parts.length > 2) {
+              return;
+            }
+          }
+
           const nodeModulesIndex = parts.indexOf("node_modules");
 
           if (nodeModulesIndex === -1 || (nodeModulesIndex === 0 &&
@@ -1118,7 +1142,7 @@ export class PackageSourceBatch {
         map.get(null).files = appFilesWithoutNodeModules;
 
       } else {
-        map.get(name).files = scanner.getOutputFiles();
+        map.get(name).files = outputFiles;
       }
     });
 

From f42ca04fdb3f064bc776b1292cd53d031efa0ed8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 13 Oct 2016 20:06:11 -0400
Subject: [PATCH 375/688] Bump package versions for 1.4.2-beta.11 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 4 ++--
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index a73386b8fa..d4d22c4c64 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.9"
+  version: "1.2.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 7e23b61a90..e3f2938f70 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index ca46f9434e..e3420e30a5 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 50260e65fa..449bac32d7 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 5ae576a58b..a79f78c4b2 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 9ba9eea641..188c24cfa6 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 659a7a31a1..a914c837a5 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-beta.9"
+  version: "1.1.14-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index b495901c2f..03426dbcfa 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.9"
+  version: "1.3.1-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 74c1738027..7bb5004949 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.9"
+  version: "1.1.12-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 44fcd7c0e1..e768d2480f 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.9"
+  version: "1.1.13-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 3093dd5d75..1291d1fddc 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 5a3482c9df..970409670a 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-beta.9"
+  version: "1.0.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 062b2a09c3..e6c3e8fad4 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-beta.9'
+  version: '1.3.12-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 6b29c87947..e5bf0d399a 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-beta.9'
+  version: '6.13.0-beta.11'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 176c8f858e..c1e5711266 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.9',
+  version: '0.1.12-beta.11',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index e9684a4ede..639ae48968 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-beta.9'
+  version: '1.0.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 71377cdbae..1260c9c916 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-beta.9'
+  version: '1.0.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index add4ca38fe..61dbfc3844 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-beta.9'
+  version: '1.0.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index ed3273ac61..a7a14ac1de 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 05ff13fabd..2ff81a3012 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-beta.9"
+  version: "1.0.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 4b0ead6a1f..296c80b60d 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-beta.9"
+  version: "1.0.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 62324ceffe..c7ff8fcd65 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.9',
+  version: '1.1.8-beta.11',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 902c3e2c90..e6107a1ea2 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-beta.9'
+  version: '1.0.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index dc5faa8ee4..b71609ef1c 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-beta.9'
+  version: '1.2.4-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index b5ad2e584d..4c3f60bf83 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 4d8549bdb8..947069798c 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.7"
+  version: "1.0.8-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index ca6daeb68a..70d8a4296e 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1_1"
+  version: "1.11.1-2-beta.11"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index a0326726a9..b48db9839b 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-beta.9"
+  version: "1.1.1-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 083a2076a3..9adef5ae39 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-beta.9',
+  version: '1.7.0-beta.11',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 9547f5c588..fbaf33c9c1 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.9',
+  version: '1.3.2-beta.11',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 0ee668137c..869cc4521b 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-beta.9',
+  version: '1.2.7-beta.11',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 611cda3189..2c055186d6 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-beta.9',
+  version: '1.0.6-beta.11',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 1d706359a0..732d3b7635 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.9',
+  version: '1.3.11-beta.11',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index 6ee9548fe9..489417f026 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-beta.9',
+  version: '1.0.7-beta.11',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index c5075a7cf0..ac7b721733 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.9",
+  version: "0.3.15-beta.11",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 58f26ffafa..8d1731a496 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.9',
+  version: '0.5.9-beta.11',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 3fdac93edd..8a933b9893 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-beta.9'
+  version: '1.0.13-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index 9ffeef7538..0cda5939ec 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.9"
+  version: "1.1.18-beta.11"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index ba6d7d154e..0298cd52dc 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.9",
+  version: "4.6.15-beta.11",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index fd15421c77..3743dd2921 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.9"
+  version: "1.2.10-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index e3aed0f21d..419e51c06c 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.9'
+  version: '1.0.9-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index c6cdf2ba3e..a7e2740cb8 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-beta.9'
+  version: '1.0.13-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index d833e771ec..242664e5d5 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-beta.9",
+  version: "1.0.13-beta.11",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index c44a0c6ef8..e3347aa885 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-beta.9'
+  version: '1.0.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index a2df186fc0..a5914fdee9 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.9"
+  version: "1.1.9-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index c5a1c9026e..544d44c8ac 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.9"
+  version: "1.1.15-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index ac2bae1609..3b5b8a7230 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.9'
+  version: '1.2.10-beta.11'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 84bc216071..98ba923adb 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-beta.9'
+  version: '1.0.9-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 04613bc4eb..0cec5957e1 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-beta.9'
+  version: '1.11.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 2f9c265836..d8aaddbe7c 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-beta.9',
+  version: '1.1.7-beta.11',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index ffcf3dfebd..bed5ca6a46 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-beta.9"
+  version: "1.0.10-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 696be11cf5..5c3dcae8da 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-beta.9'
+  version: '1.1.0-beta.11'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 28126e34a5..c93e5da671 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.9',
+  version: '2.7.6-beta.11',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 5d96d71c4b..ea673bfee2 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-beta.9"
+  version: "1.0.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 01c0e617b5..6330e6adb9 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.9'
+  version: '1.1.16-beta.11'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 8272c9f56b..1006ee1ef8 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-beta.9'
+  version: '2.0.7-beta.11'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 97c9d7287c..c2815a993c 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index a03161ba68..2fc4e609ad 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.9"
+  version: "1.6.5-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 9e81e696f6..09a2a3acf2 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.9"
+  version: "1.1.10-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index c3218513cd..3b645da68e 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.9'
+  version: '1.4.2-beta.11'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 6b11ee2c47..bb0c88b4d2 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.9'
+  version: '1.2.18-beta.11'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 09bf694b61..0652aa575c 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.9"
+  version: "1.2.15-beta.11"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 22fd8aa6cc..e4a1bf7475 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.9"
+  version: "1.2.15-beta.11"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 87725b0891..2396e78a39 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-beta.9'
+  version: '1.0.18-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 63990f160b..d7c2db7002 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-beta.9"
+  version: "1.0.13-beta.11"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index a8503cf1a7..8964259d92 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.9",
+  version: "0.7.7-beta.11",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index da90cd5073..7d9ec9c542 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.9",
+  version: "0.7.7-beta.11",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index e3ef7f0c21..455b4cbe62 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-beta.9',
+  version: '1.0.6-beta.11',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 6ee25d9354..c0ce474862 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_5'
+  version: '1.1.12-6-beta.11'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@2.2.10_1', 'server');
+  api.use('npm-mongo', 'server');
   api.use('allow-deny');
 
   api.use([
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 79c29cde72..de9295632b 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.9",
+  version: "0.9.2-beta.11",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 5ee017f3c3..a37e65252a 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10_1',
+  version: '2.2.10-2-beta.11',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 6a2a1f91a6..f0f9a6f734 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-beta.9'
+  version: '1.2.1-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index bacc0fefa2..2a88b9291f 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-beta.9"
+  version: "1.1.12-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index eedaccc6f8..9c87deed53 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-beta.9"
+  version: "1.1.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index 431ebe2d7d..a76be256db 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-beta.9"
+  version: "1.1.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index cb5589b37f..2ea3933ab9 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.13"
+  version: "1.0.14-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 11c7e6343e..588a04cdd8 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-beta.9',
+  version: '1.0.9-beta.11',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index a2a423147c..312632497b 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-beta.9"
+  version: "3.0.10-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 8173fe81a7..81ec765ab5 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 01643fedc0..01a91f87e9 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.9",
+  version: "0.8.8-beta.11",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index b5564aed48..58c32159af 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-beta.9',
+  version: '1.0.6-beta.11',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 0cdaca7dce..1b0399ace5 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-beta.9'
+  version: '1.0.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index 1af9fa6e13..a5aafe8476 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-beta.9'
+  version: '1.0.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index ac2e4e17d3..665c42c541 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-beta.9'
+  version: '1.1.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 09289922b6..6850799cad 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-beta.9'
+  version: '1.0.9-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index e355ad0d41..c7ca60eb63 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-beta.9'
+  version: '1.0.12-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 6aa54b8c66..22e79e6362 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 073d61ddf8..cf64dc7be3 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-beta.9'
+  version: '1.1.7-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index 00b4686674..f676021853 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-beta.9',
+  version: '1.0.9-beta.11',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 2cc11cea8a..3d2b4798fc 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-beta.9"
+  version: "1.0.10-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 0d38f93cee..ca165bc5cb 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-beta.9',
+  version: '1.2.1-beta.11',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 535f81da43..dd614e27b3 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.9"
+  version: "2.513.6-beta.11"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 870e8c9318..902f468127 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-beta.9'
+  version: '1.0.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index b837005e99..7c145a4c60 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.9',
+  version: '1.0.13-beta.11',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 752d24cb92..c0b2cb0a66 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-beta.9'
+  version: '1.0.13-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 59dfa03813..74aa91feea 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-beta.9'
+  version: '1.0.11-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 8c32882774..0c0a65c17d 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-beta.9'
+  version: '1.0.12-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 0c66b5ee24..181389e54e 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-beta.9'
+  version: '1.1.1-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 45e817b9ae..9851a747b6 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.9'
+  version: '1.1.13-beta.11'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index bd0ea27226..ace98def0d 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-beta.9'
+  version: '1.0.10-beta.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 84041a8fc1..fffe88b13d 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-beta.9"
+  version: "1.0.11-beta.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 92703ebfb6..a6e96266d6 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.9'
+  version: '1.3.12-beta.11'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 4b597b171b..8bd4cbe78d 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.9'
+  version: '1.1.9-beta.11'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 23a51e7a12..34e6ca5c9e 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.9'
+  version: '2.5.15-beta.11'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index b402d769c4..3c30731c4d 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.9",
+ "version": "1.4.2-beta.11",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 53304c487b3ffbdae86cbdd2fd0109169df12d1d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 14:29:32 -0400
Subject: [PATCH 376/688] Set extraFeatures.jscript on the server too for
 better caching.

The jscript transform is perfectly safe for server code, and relatively
cheap compared to the cost of having to compile every file for both the
client and the server, just because the set of plugins is different.
---
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 4 ++--
 packages/babel-compiler/babel-compiler.js                | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 1db6764f73..79f5262e54 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -311,8 +311,8 @@
       "from": "babel-types@>=6.16.0 <6.17.0"
     },
     "babylon": {
-      "version": "6.11.4",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.11.4.tgz",
+      "version": "6.11.6",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.11.6.tgz",
       "from": "babylon@>=6.11.4 <6.12.0"
     },
     "balanced-match": {
diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 485ecb8aa9..97169aa21a 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -64,16 +64,13 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       // compilation, give it the following file extension: .es5.js
       ! excludedFileExtensionPattern.test(inputFilePath)) {
 
-    var targetCouldBeInternetExplorer8 =
-      inputFile.getArch() === "web.browser";
-
     var extraFeatures = Object.assign({}, this.extraFeatures);
 
     if (! extraFeatures.hasOwnProperty("jscript")) {
       // Perform some additional transformations to improve compatibility
       // in older browsers (e.g. wrapping named function expressions, per
       // http://kiro.me/blog/nfe_dilemma.html).
-      extraFeatures.jscript = targetCouldBeInternetExplorer8;
+      extraFeatures.jscript = true;
     }
 
     var babelOptions = Babel.getDefaultOptions(extraFeatures);

From 9039f98b304ff3b19f0efc44a64df3e4b962ee7e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 16:24:27 -0400
Subject: [PATCH 377/688] Make findMongoPort return null if net.connect throws.

---
 tools/runners/run-mongo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 551d36d63b..a8a2dab23f 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -285,7 +285,7 @@ if (process.platform === 'win32') {
         resolve(mongoPort);
       });
       client.on('error', () => resolve(null));
-    }).await();
+    }).catch(() => null).await();
   }
 }
 

From c572b12f26859c94889658c4e1838ea1b5156739 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 16:25:07 -0400
Subject: [PATCH 378/688] Allow Builder#copyDirectory to make junction links on
 Windows.

---
 tools/isobuild/builder.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 8a2df5ceb1..dd97da33f9 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -420,8 +420,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
 
     const absPathTo = files.pathJoin(this.buildPath, to);
 
-    let canSymlink = !! symlink;
-    if (canSymlink) {
+    if (symlink) {
       if (specificFiles) {
         throw new Error("can't copy only specific paths with a single symlink");
       }
@@ -430,12 +429,6 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
         throw new Error("tried to copy a directory onto " + to +
                         " but it is is already a file");
       }
-
-      // Symlinks don't work exactly the same way on Windows, and furthermore
-      // they request Admin permissions to set.
-      if (process.platform === 'win32') {
-        canSymlink = false;
-      }
     }
 
     ignore = ignore || [];
@@ -451,7 +444,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
     }
 
     let walk = (absFrom, relTo) => {
-      if (canSymlink && ! (relTo in this.usedAsFile)) {
+      if (symlink && ! (relTo in this.usedAsFile)) {
         this._ensureDirectory(files.pathDirname(relTo));
         const absTo = files.pathResolve(this.buildPath, relTo);
         symlinkWithOverwrite(absFrom, absTo);
@@ -651,13 +644,23 @@ function atomicallyRewriteFile(path, data, options) {
 // create a symlink, overwriting the target link, file, or directory
 // if it exists
 function symlinkWithOverwrite(source, target) {
+  const args = [source, target];
+
+  if (process.platform === "win32") {
+    if (! files.stat(source).isDirectory()) {
+      throw new Error("symlink source must be a directory: " + source);
+    }
+
+    args[2] = "junction";
+  }
+
   try {
-    files.symlink(source, target);
+    files.symlink(...args);
   } catch (e) {
     if (e.code === 'EEXIST') {
       // overwrite existing link, file, or directory
       files.rm_recursive(target);
-      files.symlink(source, target);
+      files.symlink(...args);
     } else {
       throw e;
     }

From 91058b53a743b3504b833591281768f9e4fc2e9e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 16:26:19 -0400
Subject: [PATCH 379/688] Allow (junction) symlinking node_modules on Windows.

Hopefully fixes #7830 by ensuring that server node_modules are physically
present in the programs/server/npm directory.
---
 tools/runners/run-app.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js
index f50ea91c74..112b5f3e6d 100644
--- a/tools/runners/run-app.js
+++ b/tools/runners/run-app.js
@@ -571,19 +571,10 @@ _.extend(AppRunner.prototype, {
       }
 
       var bundleResult = Profile.run((firstRun?"B":"Reb")+"uild App", () => {
-        var includeNodeModules = 'symlink';
-
-        // On Windows we cannot symlink node_modules. Copying them is too slow.
-        // Instead receive the NODE_PATH env that we need to set and set it
-        // later on running.
-        if (process.platform === 'win32') {
-          includeNodeModules = 'reference-directly';
-        }
-
         var bundleResult = bundler.bundle({
           projectContext: self.projectContext,
           outputPath: bundlePath,
-          includeNodeModules: includeNodeModules,
+          includeNodeModules: "symlink",
           buildOptions: self.buildOptions,
           hasCachedBundle: !! cachedServerWatchSet,
           previousBuilders: self.builders

From 168351c47219fb9cf98c5079a51bd377e1a8eacb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 16:47:59 -0400
Subject: [PATCH 380/688] Bump package versions for 1.4.2-beta.12 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index d4d22c4c64..0a6ceafd54 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.11"
+  version: "1.2.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index e3f2938f70..09eb941d9f 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index e3420e30a5..08fbde5737 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 449bac32d7..38306e2efb 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index a79f78c4b2..a3ea109b46 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 188c24cfa6..2e61ea0ea0 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index a914c837a5..e66ac4d477 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-beta.11"
+  version: "1.1.14-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 03426dbcfa..fdd649b9ac 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.11"
+  version: "1.3.1-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 7bb5004949..d60ef953b8 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.11"
+  version: "1.1.12-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index e768d2480f..45b495fbf4 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.11"
+  version: "1.1.13-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 1291d1fddc..0df1412ba2 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 970409670a..7dcd22fccf 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-beta.11"
+  version: "1.0.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index e6c3e8fad4..ff68503182 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-beta.11'
+  version: '1.3.12-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index e5bf0d399a..16bf761a54 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-beta.11'
+  version: '6.13.0-beta.12'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index c1e5711266..f424cfb97d 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.11',
+  version: '0.1.12-beta.12',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 639ae48968..2a76deb188 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-beta.11'
+  version: '1.0.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 1260c9c916..6c559fa998 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-beta.11'
+  version: '1.0.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 61dbfc3844..54a69ae261 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-beta.11'
+  version: '1.0.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index a7a14ac1de..dbb53809d4 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 2ff81a3012..db8d439477 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-beta.11"
+  version: "1.0.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 296c80b60d..6490425ee0 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-beta.11"
+  version: "1.0.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index c7ff8fcd65..28829e6790 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.11',
+  version: '1.1.8-beta.12',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index e6107a1ea2..9d141b1726 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-beta.11'
+  version: '1.0.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index b71609ef1c..0e81bf6ef3 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-beta.11'
+  version: '1.2.4-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 4c3f60bf83..1b60ff90ac 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 947069798c..2f76a5892e 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-beta.11"
+  version: "1.0.8-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 70d8a4296e..c55073f651 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-beta.11"
+  version: "1.11.1-2-beta.12"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index b48db9839b..23b5056b6a 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-beta.11"
+  version: "1.1.1-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 9adef5ae39..f0add90b58 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-beta.11',
+  version: '1.7.0-beta.12',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index fbaf33c9c1..934b762100 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.11',
+  version: '1.3.2-beta.12',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 869cc4521b..073f5be0f5 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-beta.11',
+  version: '1.2.7-beta.12',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 2c055186d6..58e01a6123 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-beta.11',
+  version: '1.0.6-beta.12',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 732d3b7635..e5a6de8b9a 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.11',
+  version: '1.3.11-beta.12',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index 489417f026..94da7f4899 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-beta.11',
+  version: '1.0.7-beta.12',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index ac7b721733..4e1c5f9fbd 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.11",
+  version: "0.3.15-beta.12",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 8d1731a496..91b9dd0f12 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.11',
+  version: '0.5.9-beta.12',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 8a933b9893..59d0f36fd3 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-beta.11'
+  version: '1.0.13-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index 0cda5939ec..cc97d6f72a 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.11"
+  version: "1.1.18-beta.12"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 0298cd52dc..26254adac7 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.11",
+  version: "4.6.15-beta.12",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 3743dd2921..692219e45b 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.11"
+  version: "1.2.10-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 419e51c06c..58ef927c42 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.11'
+  version: '1.0.9-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index a7e2740cb8..234fa52d90 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-beta.11'
+  version: '1.0.13-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 242664e5d5..814bedc7b3 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-beta.11",
+  version: "1.0.13-beta.12",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index e3347aa885..31ca47fa58 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-beta.11'
+  version: '1.0.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index a5914fdee9..b8541c67f0 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.11"
+  version: "1.1.9-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 544d44c8ac..9ff3a256dc 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.11"
+  version: "1.1.15-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 3b5b8a7230..1ca8929116 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.11'
+  version: '1.2.10-beta.12'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 98ba923adb..488091eb8a 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-beta.11'
+  version: '1.0.9-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 0cec5957e1..c7791ebcef 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-beta.11'
+  version: '1.11.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index d8aaddbe7c..c33f4aa6db 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-beta.11',
+  version: '1.1.7-beta.12',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index bed5ca6a46..49426b4eba 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-beta.11"
+  version: "1.0.10-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 5c3dcae8da..0f21dabcb8 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-beta.11'
+  version: '1.1.0-beta.12'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index c93e5da671..37e328b65a 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.11',
+  version: '2.7.6-beta.12',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index ea673bfee2..93b2538196 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-beta.11"
+  version: "1.0.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 6330e6adb9..f1e9f4dd79 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.11'
+  version: '1.1.16-beta.12'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 1006ee1ef8..bfe57ff266 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-beta.11'
+  version: '2.0.7-beta.12'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index c2815a993c..035133d81c 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 2fc4e609ad..cdd3515353 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.11"
+  version: "1.6.5-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 09a2a3acf2..120a503bf1 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.11"
+  version: "1.1.10-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3b645da68e..d25a0489ca 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.11'
+  version: '1.4.2-beta.12'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index bb0c88b4d2..18c2839871 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.11'
+  version: '1.2.18-beta.12'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 0652aa575c..e5fd61f471 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.11"
+  version: "1.2.15-beta.12"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index e4a1bf7475..5a49d7a7ee 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.11"
+  version: "1.2.15-beta.12"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 2396e78a39..2da2163936 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-beta.11'
+  version: '1.0.18-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index d7c2db7002..b8a0f8a350 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-beta.11"
+  version: "1.0.13-beta.12"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 8964259d92..25852fd48b 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.11",
+  version: "0.7.7-beta.12",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 7d9ec9c542..7c15b0f17e 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.11",
+  version: "0.7.7-beta.12",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 455b4cbe62..31685f9101 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-beta.11',
+  version: '1.0.6-beta.12',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index c0ce474862..b78f650b22 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-6-beta.11'
+  version: '1.1.12-6-beta.12'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index de9295632b..8616a899f0 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.11",
+  version: "0.9.2-beta.12",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index a37e65252a..a2af170503 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10-2-beta.11',
+  version: '2.2.10-2-beta.12',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index f0f9a6f734..ff5316b02b 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-beta.11'
+  version: '1.2.1-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 2a88b9291f..3988ee7a9b 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-beta.11"
+  version: "1.1.12-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 9c87deed53..6fc66dab0a 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-beta.11"
+  version: "1.1.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index a76be256db..3ffaa5280f 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-beta.11"
+  version: "1.1.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 2ea3933ab9..e073f68a8f 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-beta.11"
+  version: "1.0.14-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 588a04cdd8..81fa427257 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-beta.11',
+  version: '1.0.9-beta.12',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 312632497b..56005c625b 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-beta.11"
+  version: "3.0.10-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 81ec765ab5..2b20f03394 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 01a91f87e9..2fa1a00100 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.11",
+  version: "0.8.8-beta.12",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 58c32159af..40b635d98f 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-beta.11',
+  version: '1.0.6-beta.12',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 1b0399ace5..3dcd04e1b7 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-beta.11'
+  version: '1.0.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index a5aafe8476..e2a1a04612 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-beta.11'
+  version: '1.0.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 665c42c541..40e46e4c7e 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-beta.11'
+  version: '1.1.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 6850799cad..98015eeab1 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-beta.11'
+  version: '1.0.9-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index c7ca60eb63..abcb20a1d4 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-beta.11'
+  version: '1.0.12-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 22e79e6362..7e73e4fb73 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index cf64dc7be3..0ac899a4c6 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-beta.11'
+  version: '1.1.7-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index f676021853..a1b3e3dabe 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-beta.11',
+  version: '1.0.9-beta.12',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 3d2b4798fc..bd1908633c 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-beta.11"
+  version: "1.0.10-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index ca165bc5cb..76f7c3427f 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-beta.11',
+  version: '1.2.1-beta.12',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index dd614e27b3..f939a83a5b 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.11"
+  version: "2.513.6-beta.12"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 902f468127..71da388bf3 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-beta.11'
+  version: '1.0.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 7c145a4c60..1ab0acaf53 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.11',
+  version: '1.0.13-beta.12',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index c0b2cb0a66..50e660ebca 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-beta.11'
+  version: '1.0.13-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 74aa91feea..3dc7a4f953 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-beta.11'
+  version: '1.0.11-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 0c0a65c17d..7958b61056 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-beta.11'
+  version: '1.0.12-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 181389e54e..8478e6d473 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-beta.11'
+  version: '1.1.1-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 9851a747b6..629e4035e0 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.11'
+  version: '1.1.13-beta.12'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index ace98def0d..15fc8c1a28 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-beta.11'
+  version: '1.0.10-beta.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index fffe88b13d..34ee2354fa 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-beta.11"
+  version: "1.0.11-beta.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index a6e96266d6..60fa90c65c 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.11'
+  version: '1.3.12-beta.12'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 8bd4cbe78d..8bd16b9ae9 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.11'
+  version: '1.1.9-beta.12'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 34e6ca5c9e..db8fd7f8c9 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.11'
+  version: '2.5.15-beta.12'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 3c30731c4d..66662db4e8 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.11",
+ "version": "1.4.2-beta.12",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e94d2ad4fc20c7288e955fa49cb14e64023dd07c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 14 Oct 2016 17:01:47 -0400
Subject: [PATCH 381/688] Remove references to node_modules
 "reference-directly" mode.

---
 tools/isobuild/bundler.js | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 04a9dc14b9..93368cde88 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1809,8 +1809,8 @@ class JsImage {
   // Write this image out to disk
   //
   // options:
-  // - includeNodeModules: falsy or 'symlink' or 'reference-directly'.
-  //   Documented on exports.bundle.
+  // - includeNodeModules: falsy or 'symlink', documented on
+  //   exports.bundle.
   //
   // Returns an object with the following keys:
   // - controlFile: the path (relative to 'builder') of the control file for
@@ -1834,14 +1834,12 @@ class JsImage {
       if (! options.includeNodeModules ||
           options.includeNodeModules === 'symlink') {
         modulesPhysicalLocation = nmd.getPreferredBundlePath("bundle");
-      } else if (options.includeNodeModules === 'reference-directly') {
-        modulesPhysicalLocation = nmd.sourcePath;
       } else {
         // This is some option we didn't expect - someone has added another case
         // to the includeNodeModules option but didn't update this if block.
         // Fail hard.
-        throw new Error("Option includeNodeModules wasn't falsy, 'symlink', " +
-          "or 'reference-directly'. It was: " + options.includeNodeModules);
+        throw new Error("Option includeNodeModules wasn't falsy or 'symlink'. " +
+                        "It was: " + options.includeNodeModules);
       }
 
       nmd = nmd.copy();
@@ -2139,8 +2137,8 @@ class ServerTarget extends JsImageTarget {
 
   // Output the finished target to disk
   // options:
-  // - includeNodeModules: falsy, 'symlink' or 'reference-directly',
-  //   documented in exports.bundle
+  // - includeNodeModules: falsy or 'symlink', documented in
+  //   exports.bundle.
   // - getRelativeTargetPath: a function that takes {forTarget:
   //   Target, relativeTo: Target} and return the path of one target
   //   in the bundle relative to another. hack to get the path of the
@@ -2203,16 +2201,11 @@ class ServerTarget extends JsImageTarget {
       builder.write('node_modules', {
         symlink: files.pathJoin(files.getDevBundle(), 'server-lib', 'node_modules')
       });
-    } else if (options.includeNodeModules === 'reference-directly') {
-      nodePath.push(
-        files.pathJoin(files.getDevBundle(), 'server-lib', 'node_modules')
-      );
     } else if (options.includeNodeModules) {
       // This is some option we didn't expect - someone has added another case
       // to the includeNodeModules option but didn't update this if block. Fail
       // hard.
-      throw new Error("Option includeNodeModules wasn't falsy, 'symlink', " +
-        "or 'reference-directly'.");
+      throw new Error("Option includeNodeModules wasn't falsy or 'symlink'");
     }
 
     // Linked JavaScript image (including static assets, assuming that there are
@@ -2501,14 +2494,6 @@ Find out more about Meteor at meteor.com.
  *   $NODE_PATH because then random node_modules directories above cwd take
  *   precedence.) To make it even hackier, this also means we make node_modules
  *   directories for packages symlinks instead of copies.
- *   + 'reference-directly' - don't copy the files of node modules.
- *   Instead, use paths directly to files we already have on the file-system: in
- *   package catalog, isopacks folder or the dev_bundle folder.
- *   return the NODE_PATH string with the resulting bundle that would be set as
- *   the NODE_PATH environment variable when the node process is running. (The
- *   fallback option for Windows). For isopacks (meteor packages), link to the
- *   location of the locally stored isopack build (e.g.
- *   ~/.meteor/packages/package/version/npm)
  *
  * - buildOptions: may include
  *   - minifyMode: string, type of minification for the CSS and JS assets

From 8de559a967818e8410c20564e9b7fd94665d1a39 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 14 Oct 2016 17:24:50 +0300
Subject: [PATCH 382/688] Change Facebook oAuth param from `authType` to
 `auth_type`

According to the Facebook docs:

https://developers.facebook.com/docs/facebook-login/manually-build-a-login-flow

The parameter should be `auth_type`, not `authType`.  A cursory look through their API history didn't show anything about it being changed, but I can confirm that using this feature does not work with `authType` in the current implementation.

Related meteor/docs#94
Related meteor/meteor#7584
Closes meteor/meteor#7078
---
 packages/facebook/facebook_client.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/facebook/facebook_client.js b/packages/facebook/facebook_client.js
index 6ad938b545..5cd457ee7f 100644
--- a/packages/facebook/facebook_client.js
+++ b/packages/facebook/facebook_client.js
@@ -37,8 +37,8 @@ Facebook.requestCredential = function (options, credentialRequestCompleteCallbac
         '&state=' + OAuth._stateParam(loginStyle, credentialToken, options && options.redirectUrl);
 
   // Handle authentication type (e.g. for force login you need authType: "reauthenticate")
-  if (options && options.authType) {
-    loginUrl += "&authType=" + encodeURIComponent(options.authType);
+  if (options && options.auth_type) {
+    loginUrl += "&auth_type=" + encodeURIComponent(options.auth_type);
   }
 
   OAuth.launchLogin({

From 8d4ef3f1f715fd26e2fd0e2fea9cc84321e008de Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 15 Oct 2016 11:59:15 -0400
Subject: [PATCH 383/688] Only filter out
 node_modules/babel-runtime/{helpers,regenerator} modules.

This is a refinement of my previous commit 56c041c8582cedb8650028fa1ed45540edd1d955.

The Meteor babel-runtime package does not provide substitutes for
babel-runtime/core-js/* modules, so we should not be discarding them from
the client bundle.

Fixes #7930.
---
 tools/isobuild/compiler-plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 456d3ab72d..4215e133fc 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1114,8 +1114,8 @@ export class PackageSourceBatch {
             // better not remove them.
             if (parts[0] === "node_modules" &&
                 parts[1] === "babel-runtime" &&
-                // Can't just be node_modules/babel-runtime.
-                parts.length > 2) {
+                (parts[2] === "helpers" ||
+                 parts[2].startsWith("regenerator"))) {
               return;
             }
           }

From dfa8c343ce39caa4447f966135ff3ba996be4029 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 16 Oct 2016 16:29:29 -0400
Subject: [PATCH 384/688] Export checkHelper function from babel-runtime
 package.

---
 packages/babel-runtime/babel-runtime.js | 35 ++++++++++++++++++++++++-
 packages/babel-runtime/package.js       |  2 +-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/babel-runtime/babel-runtime.js b/packages/babel-runtime/babel-runtime.js
index c0314c6fec..85cb22718e 100644
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -2,7 +2,40 @@ var hasOwn = Object.prototype.hasOwnProperty;
 var S = typeof Symbol === "function" ? Symbol : {};
 var iteratorSymbol = S.iterator || "@@iterator";
 
-meteorBabelHelpers = require("meteor-babel-helpers");
+exports.meteorBabelHelpers = require("meteor-babel-helpers");
+
+// Returns true if a given absolute identifier will be provided at runtime
+// by the babel-runtime package.
+exports.checkHelper = function checkHelper(id) {
+  var parts = id.split("/");
+  var index = 0;
+
+  // Skip over leading / and node_modules.
+  if (parts[index] === "") ++index;
+  if (parts[index] === "node_modules") ++index;
+
+  if (parts[index] !== "babel-runtime") {
+    return false;
+  }
+
+  // Skip over babel-runtime.
+  ++index;
+
+  if (parts.length - index === 2) {
+    return parts[index] === "helpers" &&
+      hasOwn.call(BabelRuntime, stripDotJS(parts[index + 1]));
+  }
+
+  if (parts.length - index === 1) {
+    return stripDotJS(parts[index]) === "regenerator";
+  }
+
+  return false;
+};
+
+function stripDotJS(name) {
+  return name.replace(/\.js$/, "");
+}
 
 var BabelRuntime = {
   // es6.templateLiterals
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index f424cfb97d..f45d13b953 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -17,6 +17,6 @@ Package.onUse(function (api) {
   api.use("es5-shim", { weak: true });
   api.use("modules");
   api.use("promise"); // Needed by Regenerator.
-  api.addFiles("babel-runtime.js");
+  api.mainModule("babel-runtime.js");
   api.export("meteorBabelHelpers");
 });

From 7a180129751df831858b41bce14865ad63dcc1ed Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 16 Oct 2016 16:29:37 -0400
Subject: [PATCH 385/688] Consult babel-runtime package when discarding helper
 modules.

The most fool-proof way to tell if a module is provided by babel-runtime
is to load babel-runtime as an isopacket and ask it.

This should fix any remaining issues like this one:
https://github.com/meteor/meteor/pull/7668#pullrequestreview-4379559
---
 tools/isobuild/compiler-plugin.js | 14 ++++++++++----
 tools/tool-env/isopackets.js      |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 4215e133fc..24d859d06c 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -771,6 +771,15 @@ class ResourceSlot {
   }
 }
 
+let babelRuntime;
+function checkBabelRuntimeHelper(id) {
+  if (! babelRuntime) {
+    babelRuntime = require("../tool-env/isopackets.js")
+      .load("runtime")["babel-runtime"];
+  }
+  return babelRuntime.checkHelper(id);
+}
+
 export class PackageSourceBatch {
   constructor(unibuild, processor, {
     sourceRoot,
@@ -1112,10 +1121,7 @@ export class PackageSourceBatch {
             // relying on programs/server/npm/node_modules/babel-runtime,
             // but on the web these bundled files are all we have, so we'd
             // better not remove them.
-            if (parts[0] === "node_modules" &&
-                parts[1] === "babel-runtime" &&
-                (parts[2] === "helpers" ||
-                 parts[2].startsWith("regenerator"))) {
+            if (checkBabelRuntimeHelper(file.installPath)) {
               return;
             }
           }
diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index 2e491a999d..c097a78bea 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -56,7 +56,8 @@ export const ISOPACKETS = {
   'constraint-solver': ['constraint-solver'],
   'cordova-support': ['boilerplate-generator', 'logging', 'webapp-hashing',
                       'xmlbuilder'],
-  'logging': ['logging']
+  'logging': ['logging'],
+  'runtime': ['babel-runtime'],
 };
 
 // Caches isopackets in memory (each isopacket only needs to be loaded

From 492021b8df7f1d2f7faca090729c7b261b9e1b7d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 16 Oct 2016 16:38:52 -0400
Subject: [PATCH 386/688] Provide babel-runtime/helpers/defineProperty at
 runtime.

---
 packages/babel-runtime/babel-runtime.js | 79 ++++++++++++++-----------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/packages/babel-runtime/babel-runtime.js b/packages/babel-runtime/babel-runtime.js
index 85cb22718e..adaa0377b8 100644
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -2,6 +2,24 @@ var hasOwn = Object.prototype.hasOwnProperty;
 var S = typeof Symbol === "function" ? Symbol : {};
 var iteratorSymbol = S.iterator || "@@iterator";
 
+var hasDefineProperty = false;
+try {
+  // IE 8 has a broken Object.defineProperty, so feature-test by
+  // trying to call it.
+  Object.defineProperty({}, 'x', {});
+  hasDefineProperty = true;
+} catch (e) {}
+
+function defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor) descriptor.writable = true;
+    Object.defineProperty(target, descriptor.key, descriptor);
+  }
+}
+
 exports.meteorBabelHelpers = require("meteor-babel-helpers");
 
 // Returns true if a given absolute identifier will be provided at runtime
@@ -129,42 +147,37 @@ var BabelRuntime = {
     }
   },
 
-  createClass: (function () {
-    var hasDefineProperty = false;
-    try {
-      // IE 8 has a broken Object.defineProperty, so feature-test by
-      // trying to call it.
-      Object.defineProperty({}, 'x', {});
-      hasDefineProperty = true;
-    } catch (e) {}
-
-    function defineProperties(target, props) {
-      for (var i = 0; i < props.length; i++) {
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-      }
+  defineProperty: function (obj, key, value) {
+    if (hasDefineProperty && (key in obj)) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
     }
 
-    return function (Constructor, protoProps, staticProps) {
-      if (! hasDefineProperty) {
-        // e.g. `class Foo { get bar() {} }`.  If you try to use getters and
-        // setters in IE 8, you will get a big nasty error, with or without
-        // Babel.  I don't know of any other syntax features besides getters
-        // and setters that will trigger this error.
-        throw new Error(
-          "Your browser does not support this type of class property.  " +
-            "For example, Internet Explorer 8 does not support getters and " +
-            "setters.");
-      }
+    return obj;
+  },
 
-      if (protoProps) defineProperties(Constructor.prototype, protoProps);
-      if (staticProps) defineProperties(Constructor, staticProps);
-      return Constructor;
-    };
-  })(),
+  createClass: function (Constructor, protoProps, staticProps) {
+    if (! hasDefineProperty) {
+      // e.g. `class Foo { get bar() {} }`.  If you try to use getters and
+      // setters in IE 8, you will get a big nasty error, with or without
+      // Babel.  I don't know of any other syntax features besides getters
+      // and setters that will trigger this error.
+      throw new Error(
+        "Your browser does not support this type of class property.  " +
+          "For example, Internet Explorer 8 does not support getters and " +
+          "setters.");
+    }
+
+    if (protoProps) defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) defineProperties(Constructor, staticProps);
+    return Constructor;
+  },
 
   "typeof": function (obj) {
     return obj && obj.constructor === Symbol ? "symbol" : typeof obj;

From c33c68f817a48590b94964909906915b107e5c35 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 11:41:28 -0400
Subject: [PATCH 387/688] Avoid scanning app node_modules for global variable
 assignments.

File#computeAssignedVariables is one of the most expensive methods called
during initial startup. This change significantly reduces the number of
times it needs to call through to findAssignedGlobals, which saves quite a
bit of parsing time. The exact savings are hard to quantify, of course,
because they depend entirely on how many modules you have in your app's
node_modules directory.

Scanning for global variable assignments is only really useful in Meteor
packages, where we sometimes need to intercept assignments for the
purposes of api.export, though this is increasingly unnecessary now that
you can (and should) just import values from node_modules.

In the app, the only possible value of intercepting global variable
assignments was to prevent polluting the global scope, but we don't even
create a private scope for the app when useGlobalNamespace is true, so
there really was no point to scanning app node_modules.
---
 tools/isobuild/linker.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 311451f386..1dbd48ebc2 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -461,6 +461,17 @@ _.extend(File.prototype, {
   computeAssignedVariables: Profile("linker File#computeAssignedVariables", function () {
     var self = this;
 
+    if (self.installPath) {
+      const parts = self.installPath.split("/");
+      const nmi = parts.indexOf("node_modules");
+      if (nmi >= 0 && parts[nmi + 1] !== "meteor") {
+        // If this file is in a node_modules directory and is not part of
+        // a Meteor package, then we don't care about capturing its global
+        // variable assignments.
+        return [];
+      }
+    }
+
     try {
       return _.keys(findAssignedGlobals(self.source, self.sourceHash));
     } catch (e) {

From 1ac4bbaa840c6c27ccbd7fa5efce6981be124b7b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 10:42:27 -0400
Subject: [PATCH 388/688] Bump package versions for 1.4.2-beta.13 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 0a6ceafd54..1771f19130 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.12"
+  version: "1.2.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 09eb941d9f..ebbe5196eb 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 08fbde5737..6cc394fe98 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 38306e2efb..f4ed6f6b01 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index a3ea109b46..9d0527ebea 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 2e61ea0ea0..91dd739629 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index e66ac4d477..60b750ca20 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-beta.12"
+  version: "1.1.14-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index fdd649b9ac..2af4a21176 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.12"
+  version: "1.3.1-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index d60ef953b8..305f12ee0b 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.12"
+  version: "1.1.12-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 45b495fbf4..339b62878a 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.12"
+  version: "1.1.13-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 0df1412ba2..f722ae4dea 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 7dcd22fccf..b76c577a43 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-beta.12"
+  version: "1.0.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index ff68503182..6b22ec1ae1 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-beta.12'
+  version: '1.3.12-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 16bf761a54..02f1aa1c03 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-beta.12'
+  version: '6.13.0-beta.13'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index f45d13b953..965091edb5 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.12',
+  version: '0.1.12-beta.13',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 2a76deb188..9f7e4cbd26 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-beta.12'
+  version: '1.0.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 6c559fa998..5739d70215 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-beta.12'
+  version: '1.0.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 54a69ae261..e0b878e303 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-beta.12'
+  version: '1.0.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index dbb53809d4..574be4fd78 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index db8d439477..5e0329019a 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-beta.12"
+  version: "1.0.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 6490425ee0..c7932ae756 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-beta.12"
+  version: "1.0.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 28829e6790..fa2a44f480 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.12',
+  version: '1.1.8-beta.13',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 9d141b1726..0b6273ac02 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-beta.12'
+  version: '1.0.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index 0e81bf6ef3..c69edee61d 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-beta.12'
+  version: '1.2.4-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 1b60ff90ac..507cf02644 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 2f76a5892e..7d32493e33 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-beta.12"
+  version: "1.0.8-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c55073f651..9bf231e67b 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-beta.12"
+  version: "1.11.1-2-beta.13"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index 23b5056b6a..c74613bc4a 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-beta.12"
+  version: "1.1.1-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index f0add90b58..5e45627b03 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-beta.12',
+  version: '1.7.0-beta.13',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 934b762100..31675a2cc0 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.12',
+  version: '1.3.2-beta.13',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 073f5be0f5..da8327058c 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-beta.12',
+  version: '1.2.7-beta.13',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 58e01a6123..1943b3ce7e 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-beta.12',
+  version: '1.0.6-beta.13',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index e5a6de8b9a..7d3f490d7c 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.12',
+  version: '1.3.11-beta.13',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index 94da7f4899..a2d41ba188 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-beta.12',
+  version: '1.0.7-beta.13',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 4e1c5f9fbd..7dcfd62f0b 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.12",
+  version: "0.3.15-beta.13",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 91b9dd0f12..07e4e6f506 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.12',
+  version: '0.5.9-beta.13',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 59d0f36fd3..73b3c875fd 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-beta.12'
+  version: '1.0.13-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index cc97d6f72a..c403bd1109 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.12"
+  version: "1.1.18-beta.13"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 26254adac7..d4ab3c1110 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.12",
+  version: "4.6.15-beta.13",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 692219e45b..87c1cc467a 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.12"
+  version: "1.2.10-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 58ef927c42..af6fed20e1 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.12'
+  version: '1.0.9-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 234fa52d90..c386d05965 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-beta.12'
+  version: '1.0.13-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 814bedc7b3..234c586ea5 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-beta.12",
+  version: "1.0.13-beta.13",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 31ca47fa58..5867bd59a8 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-beta.12'
+  version: '1.0.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index b8541c67f0..f74f000187 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.12"
+  version: "1.1.9-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 9ff3a256dc..79584baf13 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.12"
+  version: "1.1.15-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 1ca8929116..7588674b32 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.12'
+  version: '1.2.10-beta.13'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 488091eb8a..cdeb4ba774 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-beta.12'
+  version: '1.0.9-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index c7791ebcef..6511530138 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-beta.12'
+  version: '1.11.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index c33f4aa6db..88ee6d006d 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-beta.12',
+  version: '1.1.7-beta.13',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index 49426b4eba..44fc56fc7b 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-beta.12"
+  version: "1.0.10-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 0f21dabcb8..889049fd96 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-beta.12'
+  version: '1.1.0-beta.13'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 37e328b65a..c6bd9f39d2 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.12',
+  version: '2.7.6-beta.13',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 93b2538196..f0db7e8cd8 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-beta.12"
+  version: "1.0.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index f1e9f4dd79..3b0bb78fc3 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.12'
+  version: '1.1.16-beta.13'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index bfe57ff266..0992041816 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-beta.12'
+  version: '2.0.7-beta.13'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 035133d81c..88090c6928 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index cdd3515353..5794a729ad 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.12"
+  version: "1.6.5-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 120a503bf1..1dace0d20b 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.12"
+  version: "1.1.10-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index d25a0489ca..84d0959e3a 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.12'
+  version: '1.4.2-beta.13'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 18c2839871..1f85ba1412 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.12'
+  version: '1.2.18-beta.13'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index e5fd61f471..d44492ac4e 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.12"
+  version: "1.2.15-beta.13"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 5a49d7a7ee..7626e436df 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.12"
+  version: "1.2.15-beta.13"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 2da2163936..d085c97a64 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-beta.12'
+  version: '1.0.18-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index b8a0f8a350..966c3f4253 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-beta.12"
+  version: "1.0.13-beta.13"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 25852fd48b..b25872ec3f 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.12",
+  version: "0.7.7-beta.13",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 7c15b0f17e..79ba86c4fe 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.12",
+  version: "0.7.7-beta.13",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 31685f9101..8a544bca6b 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-beta.12',
+  version: '1.0.6-beta.13',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index b78f650b22..6d1178f09b 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-6-beta.12'
+  version: '1.1.12-6-beta.13'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 8616a899f0..40f9a09e0f 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.12",
+  version: "0.9.2-beta.13",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index a2af170503..383c7d6e2f 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10-2-beta.12',
+  version: '2.2.10-2-beta.13',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index ff5316b02b..83dd589c5a 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-beta.12'
+  version: '1.2.1-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 3988ee7a9b..4a10eea82a 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-beta.12"
+  version: "1.1.12-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 6fc66dab0a..aafdb11858 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-beta.12"
+  version: "1.1.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index 3ffaa5280f..ad3f305bf8 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-beta.12"
+  version: "1.1.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index e073f68a8f..f1a4995d76 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-beta.12"
+  version: "1.0.14-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 81fa427257..5af13c37a0 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-beta.12',
+  version: '1.0.9-beta.13',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 56005c625b..6f3a76e752 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-beta.12"
+  version: "3.0.10-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 2b20f03394..1e80185c02 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 2fa1a00100..35ca7d2a1f 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.12",
+  version: "0.8.8-beta.13",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 40b635d98f..a27669baf6 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-beta.12',
+  version: '1.0.6-beta.13',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 3dcd04e1b7..8f873f8bd3 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-beta.12'
+  version: '1.0.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index e2a1a04612..e6779bbf23 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-beta.12'
+  version: '1.0.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 40e46e4c7e..883b2fed9a 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-beta.12'
+  version: '1.1.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 98015eeab1..4914d90893 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-beta.12'
+  version: '1.0.9-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index abcb20a1d4..990c7fc14d 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-beta.12'
+  version: '1.0.12-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 7e73e4fb73..d2a575eee0 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 0ac899a4c6..9bacab7f44 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-beta.12'
+  version: '1.1.7-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index a1b3e3dabe..d27911b107 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-beta.12',
+  version: '1.0.9-beta.13',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index bd1908633c..b6761dcc32 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-beta.12"
+  version: "1.0.10-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 76f7c3427f..970ca19d16 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-beta.12',
+  version: '1.2.1-beta.13',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index f939a83a5b..55595f2237 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.12"
+  version: "2.513.6-beta.13"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 71da388bf3..777a405fac 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-beta.12'
+  version: '1.0.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 1ab0acaf53..d6698c1a95 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.12',
+  version: '1.0.13-beta.13',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 50e660ebca..24722fc5a0 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-beta.12'
+  version: '1.0.13-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 3dc7a4f953..56b5d7c4df 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-beta.12'
+  version: '1.0.11-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 7958b61056..1dc47b6a4a 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-beta.12'
+  version: '1.0.12-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 8478e6d473..23f0af2b9e 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-beta.12'
+  version: '1.1.1-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 629e4035e0..536a72faf5 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.12'
+  version: '1.1.13-beta.13'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 15fc8c1a28..2cbd623fc4 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-beta.12'
+  version: '1.0.10-beta.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 34ee2354fa..18f6cd49df 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-beta.12"
+  version: "1.0.11-beta.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 60fa90c65c..39fd1cc088 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.12'
+  version: '1.3.12-beta.13'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 8bd16b9ae9..de91313b65 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.12'
+  version: '1.1.9-beta.13'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index db8fd7f8c9..0572276f17 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.12'
+  version: '2.5.15-beta.13'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 66662db4e8..fefb3db96e 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.12",
+ "version": "1.4.2-beta.13",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 30aec9f3458bf54492a0a39e8c062c4c0b5b2777 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 13:38:19 -0400
Subject: [PATCH 389/688] Report an error when HTTP request body is incomplete.

When a download aborts prematurely, the status code is often 200 OK, even
though we probably should not proceed with any further processing of the
downloaded information.

This silent failure leads to problems like the dreaded "Error: ENOENT: no
such file or directory, open... os.json" (#7806 and others), which were
hard to diagnose properly because the failure occurred only later, when
extracting a buffer that downloaded incompletely.

The getUrlWithResuming helper should be able to retry after this error is
thrown, which will result in a more helpful warning, even if in the most
common case, i.e. MaxCDN failure, it will never actually succeed.

Note that this change will not help until Meteor 1.4.2 is officially
released and becomes the implementation used to download later releases.

Mitigates #7806.
---
 History.md                  |  5 +++++
 tools/utils/http-helpers.js | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index eab5fad65a..eef27dd584 100644
--- a/History.md
+++ b/History.md
@@ -78,6 +78,11 @@
   engine, instead of failing to start Mongo.
   [#7840](https://github.com/meteor/meteor/pull/7840).
 
+* Incomplete package downloads will now fail (and be retried several
+  times) instead of silently succeeding, which was the cause of the
+  dreaded `Error: ENOENT: no such file or directory, open... os.json`
+  error. [#7806](https://github.com/meteor/meteor/issues/7806)
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index 673da536b7..c8c9b49942 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -299,7 +299,15 @@ _.extend(exports, {
     // require it until we definitely need it.
     Console.debug("Doing HTTP request: ", options.method || 'GET', options.url);
     var request = require('request');
-    var req = request(options, callback);
+    var req = request(options, function (error, response, body) {
+      const contentLength = Number(response.headers["content-length"]);
+      if (contentLength > 0 && body.length < contentLength) {
+        error = new Error(
+          "Expected " + contentLength + " bytes in request body " +
+            "but received only " + body.length);
+      }
+      return callback.call(this, error, response, body);
+    });
 
     if (_.isFunction(onRequest)) {
       onRequest(req);

From 90ece32013c3892a27006a0eaaee44af399703d2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 15:12:02 -0400
Subject: [PATCH 390/688] Fix problems in request callback that broke
 getUrlWithResuming tests.

---
 tools/utils/http-helpers.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index c8c9b49942..2dda4548e6 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -37,6 +37,14 @@ class ConcatStream extends Writable {
 
     return this.chunks[0];
   }
+
+  end(force = false) {
+    // Override the Writable#end method to ignore any .end() calls for
+    // this stream, since we likely want to resume the download later.
+    if (force === true) {
+      super.end();
+    }
+  }
 }
 
 // Helper that tracks bytes written to a writable
@@ -300,11 +308,13 @@ _.extend(exports, {
     Console.debug("Doing HTTP request: ", options.method || 'GET', options.url);
     var request = require('request');
     var req = request(options, function (error, response, body) {
-      const contentLength = Number(response.headers["content-length"]);
-      if (contentLength > 0 && body.length < contentLength) {
-        error = new Error(
-          "Expected " + contentLength + " bytes in request body " +
-            "but received only " + body.length);
+      if (! error && response && body) {
+        const contentLength = Number(response.headers["content-length"]);
+        if (contentLength > 0 && body.length < contentLength) {
+          error = new Error(
+            "Expected " + contentLength + " bytes in request body " +
+              "but received only " + body.length);
+        }
       }
       return callback.call(this, error, response, body);
     });
@@ -478,7 +488,6 @@ _.extend(exports, {
       }
     }
 
-
     const result = attempt().await();
     const response = result.response
     if (response.statusCode >= 400 && response.statusCode < 600) {
@@ -486,6 +495,9 @@ _.extend(exports, {
       throw Error(`Could not get ${href}; server returned [${response.statusCode}]`);
     }
 
+    // Really end the stream if we got this far.
+    outputStream.end(true);
+
     return outputStream.getBuffer();
   }
 });

From b69716d77856fb3473eb7ef54fbbec730b0edbca Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 21:20:53 -0400
Subject: [PATCH 391/688] Use files.* methods instead of optimistic functions
 in meteor-npm.js.

This fixes a bug that prevents fourseven:scss from properly rebuilding,
because the new .../node_modules/node-sass/vendor/<platform>/binding.node
file is not found by Builder#copyDirectory, because the cached results of
optimisticReaddir are the same as before the rebuild.

Unfortunately, this change introduces a small performance regression
(hundreds of milliseconds at worst), because these files.* methods are
called many times.

I think we can continue using optimistic functions here if we are more
careful about invalidating their results, especially after calling
meteorNpm.rebuildIfNonPortable, but I'll save that for a future commit.
---
 tools/isobuild/meteor-npm.js | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index f67247f112..fbebefde5c 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -22,13 +22,6 @@ import {
   convert as convertColonsInPath
 } from "../utils/colon-converter.js";
 
-import {
-  optimisticLStat,
-  optimisticStatOrNull,
-  optimisticReadFile,
-  optimisticReaddir,
-} from "../fs/optimistic.js";
-
 var meteorNpm = exports;
 
 // if a user exits meteor while we're trying to create a .npm
@@ -140,11 +133,11 @@ export function getProdPackageNames(nodeModulesDir) {
   // Returns true iff dir is a package directory.
   function walk(dir) {
     const packageJsonPath = files.pathJoin(dir, "package.json");
-    const packageJsonStat = optimisticStatOrNull(packageJsonPath);
+    const packageJsonStat = files.statOrNull(packageJsonPath);
 
     if (packageJsonStat &&
         packageJsonStat.isFile()) {
-      const pkg = JSON.parse(optimisticReadFile(packageJsonPath));
+      const pkg = JSON.parse(files.readFile(packageJsonPath));
       const nodeModulesDir = files.pathJoin(dir, "node_modules");
       nodeModulesDirStack.push(nodeModulesDir);
 
@@ -194,7 +187,7 @@ export function getProdPackageNames(nodeModulesDir) {
     for (let i = nodeModulesDirStack.length - 1; i >= 0; --i) {
       const nodeModulesDir = nodeModulesDirStack[i];
       const candidate = files.pathJoin(nodeModulesDir, name);
-      const stat = optimisticStatOrNull(candidate);
+      const stat = files.statOrNull(candidate);
       if (stat && stat.isDirectory()) {
         return candidate;
       }
@@ -437,13 +430,13 @@ function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
 }
 
 const isPortable = Profile("meteorNpm.isPortable", dir => {
-  const lstat = optimisticLStat(dir);
+  const lstat = files.lstat(dir);
   if (! lstat.isDirectory()) {
     // Non-directory files are portable unless they end with .node.
     return ! dir.endsWith(".node");
   }
 
-  const pkgJsonStat = optimisticStatOrNull(files.pathJoin(dir, "package.json"));
+  const pkgJsonStat = files.statOrNull(files.pathJoin(dir, "package.json"));
   const canCache = pkgJsonStat && pkgJsonStat.isFile();
   const portableFile = files.pathJoin(dir, ".meteor-portable");
 
@@ -455,7 +448,7 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
     try {
-      return JSON.parse(optimisticReadFile(portableFile));
+      return JSON.parse(files.readFile(portableFile));
     } catch (e) {
       if (! (e instanceof SyntaxError ||
              e.code === "ENOENT")) {
@@ -468,7 +461,7 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     fs.unlink(portableFile, error => {});
   }
 
-  const result = optimisticReaddir(dir).every(
+  const result = files.readdir(dir).every(
     // Ignore files that start with a ".", such as .bin directories.
     itemName => itemName.startsWith(".") ||
       isPortable(files.pathJoin(dir, itemName)));

From 30d9a57f0d0cfd8d8a49f99e7add57c2c229b24b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 13:00:05 -0400
Subject: [PATCH 392/688] Allow dirtying optimistic functions by npm package
 name or path.

---
 tools/fs/optimistic.js | 67 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index daecd077de..f49c2593af 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -13,7 +13,13 @@ import {
 } from "./files.js";
 
 function makeOptimistic(name, fn) {
-  const wrapper = wrap(fn, {
+  const wrapper = wrap(function (...args) {
+    const packageName = getNpmPackageName(args[0]);
+    if (packageName) {
+      dependOnNpmPackage(packageName);
+    }
+    return fn.apply(this, args);
+  }, {
     makeCacheKey(...args) {
       const path = args[0];
       if (! pathIsAbsolute(path)) {
@@ -41,11 +47,12 @@ function makeOptimistic(name, fn) {
       const path = args[0];
       assert.ok(pathIsAbsolute(path));
 
-      // Only start a watcher for files not in node_modules directories.
-      // This results in caching the result until the server is fully
-      // restarted, which isn't ideal, but it's better than wasting
-      // thousands of watchers on rarely-changing node_modules files.
-      if (path.split(pathSep).indexOf("node_modules") >= 0) {
+      // Only start watchers for files not in node_modules directories.
+      // This means caching the result until the server is restarted, or
+      // until we call dirtyNpmPackageBy{Path,Name} explicitly, but that's
+      // better than wasting thousands of watchers on rarely-changing
+      // node_modules files.
+      if (getNpmPackageName(path)) {
         return;
       }
 
@@ -63,6 +70,54 @@ function makeOptimistic(name, fn) {
   return Profile("optimistic " + name, wrapper);
 }
 
+// Return the name of the subdirectory just after the last node_modules
+// directory in the given path, if possible; else return undefined.
+function getNpmPackageName(path) {
+  if (typeof path === "string") {
+    const parts = path.split(pathSep);
+
+    // In case the path ends with node_modules, look for the previous
+    // node_modules directory.
+    const lastAcceptableIndex = parts.length - 2;
+    const index = parts.lastIndexOf("node_modules", lastAcceptableIndex);
+
+    if (index >= 0) {
+      return parts[index + 1] || void 0;
+    }
+  }
+}
+
+// See comment in dependOnNpmPackage.
+let npmDepCount = 0;
+
+// Called by any optimistic function that receives a */node_modules/* path
+// as its first argument, so that we can later bulk-invalidate the results
+// of those calls when/if the package (or, more precisely, any package of
+// the same name) changes.
+const dependOnNpmPackage = wrap(packageName => {
+  // Always return something different to prevent optimism from
+  // second-guessing the dirtiness of this function.
+  return ++npmDepCount;
+});
+
+// Invalidate all optimistic results derived from paths involving npm
+// packages with the given packageName. If there are multiple copies of
+// the package installed, they all get invalidated, because that's a small
+// price to pay for the comfort of not having to keep the copies straight
+// as they get copied around, deleted, et cetera.
+export function dirtyNpmPackageByName(packageName) {
+  dependOnNpmPackage.dirty(packageName);
+}
+
+// Invalidate all optimistic results derived from paths involving an npm
+// package whose name equals getNpmPackageName(path).
+export function dirtyNpmPackageByPath(path) {
+  const packageName = getNpmPackageName(path);
+  if (packageName) {
+    dirtyNpmPackageByName(packageName);
+  }
+}
+
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
 export const optimisticLStat = makeOptimistic("lstat", lstat);
 export const optimisticReadFile = makeOptimistic("readFile", readFile);

From af626a5ed6c62f7972909da7c1ff62a3c12c1b7d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 13:00:52 -0400
Subject: [PATCH 393/688] Dirty relevant optimistic functions after npm
 updates.

---
 tools/isobuild/meteor-npm.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index fbebefde5c..eb50ab7dc3 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -22,6 +22,11 @@ import {
   convert as convertColonsInPath
 } from "../utils/colon-converter.js";
 
+import {
+  dirtyNpmPackageByPath,
+  dirtyNpmPackageByName,
+} from "../fs/optimistic.js";
+
 var meteorNpm = exports;
 
 // if a user exits meteor while we're trying to create a .npm
@@ -340,6 +345,8 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
   // If the `npm rebuild` command succeeded, overwrite the original
   // package directories with the rebuilt package directories.
   dirsToRebuild.forEach(function (pkgPath) {
+    dirtyNpmPackageByPath(pkgPath);
+
     const actualNodeModulesDir =
       files.pathJoin(pkgPath, "node_modules");
 
@@ -682,6 +689,8 @@ var completeNpmDirectory = function (packageName, newPackageNpmDir,
   createReadme(newPackageNpmDir);
   createNodeVersion(newPackageNpmDir);
   files.renameDirAlmostAtomically(newPackageNpmDir, packageNpmDir);
+
+  Object.keys(npmDependencies).forEach(dirtyNpmPackageByName);
 };
 
 var createReadme = function (newPackageNpmDir) {

From 6999bdd99e48d0057c61102704154c4914770865 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 13:19:27 -0400
Subject: [PATCH 394/688] Revert "Use files.* methods instead of optimistic
 functions in meteor-npm.js."

This reverts commit b69716d77856fb3473eb7ef54fbbec730b0edbca.

Now that we have a better system for invalidating optimistic results
derived from node_modules paths, these optimizations are safe (and yes
fourseven:scss rebuilds successfully).
---
 tools/isobuild/meteor-npm.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index eb50ab7dc3..ebce33d66f 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -25,6 +25,10 @@ import {
 import {
   dirtyNpmPackageByPath,
   dirtyNpmPackageByName,
+  optimisticLStat,
+  optimisticStatOrNull,
+  optimisticReadFile,
+  optimisticReaddir,
 } from "../fs/optimistic.js";
 
 var meteorNpm = exports;
@@ -138,11 +142,11 @@ export function getProdPackageNames(nodeModulesDir) {
   // Returns true iff dir is a package directory.
   function walk(dir) {
     const packageJsonPath = files.pathJoin(dir, "package.json");
-    const packageJsonStat = files.statOrNull(packageJsonPath);
+    const packageJsonStat = optimisticStatOrNull(packageJsonPath);
 
     if (packageJsonStat &&
         packageJsonStat.isFile()) {
-      const pkg = JSON.parse(files.readFile(packageJsonPath));
+      const pkg = JSON.parse(optimisticReadFile(packageJsonPath));
       const nodeModulesDir = files.pathJoin(dir, "node_modules");
       nodeModulesDirStack.push(nodeModulesDir);
 
@@ -192,7 +196,7 @@ export function getProdPackageNames(nodeModulesDir) {
     for (let i = nodeModulesDirStack.length - 1; i >= 0; --i) {
       const nodeModulesDir = nodeModulesDirStack[i];
       const candidate = files.pathJoin(nodeModulesDir, name);
-      const stat = files.statOrNull(candidate);
+      const stat = optimisticStatOrNull(candidate);
       if (stat && stat.isDirectory()) {
         return candidate;
       }
@@ -437,13 +441,13 @@ function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
 }
 
 const isPortable = Profile("meteorNpm.isPortable", dir => {
-  const lstat = files.lstat(dir);
+  const lstat = optimisticLStat(dir);
   if (! lstat.isDirectory()) {
     // Non-directory files are portable unless they end with .node.
     return ! dir.endsWith(".node");
   }
 
-  const pkgJsonStat = files.statOrNull(files.pathJoin(dir, "package.json"));
+  const pkgJsonStat = optimisticStatOrNull(files.pathJoin(dir, "package.json"));
   const canCache = pkgJsonStat && pkgJsonStat.isFile();
   const portableFile = files.pathJoin(dir, ".meteor-portable");
 
@@ -455,7 +459,7 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
     try {
-      return JSON.parse(files.readFile(portableFile));
+      return JSON.parse(optimisticReadFile(portableFile));
     } catch (e) {
       if (! (e instanceof SyntaxError ||
              e.code === "ENOENT")) {
@@ -468,7 +472,7 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     fs.unlink(portableFile, error => {});
   }
 
-  const result = files.readdir(dir).every(
+  const result = optimisticReaddir(dir).every(
     // Ignore files that start with a ".", such as .bin directories.
     itemName => itemName.startsWith(".") ||
       isPortable(files.pathJoin(dir, itemName)));

From 320874989f7fc18b963ebfc2c955aeb623ec5acc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 13:33:24 -0400
Subject: [PATCH 395/688] Implement and use optimisticReadJsonOrNull for better
 caching.

The problem with optimisticReadFile is that it doesn't cache anything when
the file is missing, because files.readFile throws an ENOENT exception.
---
 tools/fs/optimistic.js       | 17 +++++++++++++++--
 tools/isobuild/meteor-npm.js | 26 +++++++-------------------
 tools/isobuild/resolver.js   | 21 ++-------------------
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index f49c2593af..4c16a4c03a 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -122,9 +122,9 @@ export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
 export const optimisticLStat = makeOptimistic("lstat", lstat);
 export const optimisticReadFile = makeOptimistic("readFile", readFile);
 export const optimisticReaddir = makeOptimistic("readdir", readdir);
-export const optimisticHashOrNull = makeOptimistic("hashOrNull", path => {
+export const optimisticHashOrNull = makeOptimistic("hashOrNull", (...args) => {
   try {
-    return sha1(optimisticReadFile(path));
+    return sha1(optimisticReadFile(...args));
 
   } catch (e) {
     if (e.code !== "EISDIR" &&
@@ -135,3 +135,16 @@ export const optimisticHashOrNull = makeOptimistic("hashOrNull", path => {
 
   return null;
 });
+
+export const optimisticReadJsonOrNull =
+makeOptimistic("readJsonOrNull", (...args) => {
+  try {
+    return JSON.parse(optimisticReadFile(...args));
+  } catch (e) {
+    if (! (e instanceof SyntaxError ||
+           e.code === "ENOENT")) {
+      throw e;
+    }
+  }
+  return null;
+});
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index ebce33d66f..2e97d6217b 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -27,7 +27,7 @@ import {
   dirtyNpmPackageByName,
   optimisticLStat,
   optimisticStatOrNull,
-  optimisticReadFile,
+  optimisticReadJsonOrNull,
   optimisticReaddir,
 } from "../fs/optimistic.js";
 
@@ -146,7 +146,7 @@ export function getProdPackageNames(nodeModulesDir) {
 
     if (packageJsonStat &&
         packageJsonStat.isFile()) {
-      const pkg = JSON.parse(optimisticReadFile(packageJsonPath));
+      const pkg = optimisticReadJsonOrNull(packageJsonPath);
       const nodeModulesDir = files.pathJoin(dir, "node_modules");
       nodeModulesDirStack.push(nodeModulesDir);
 
@@ -268,16 +268,8 @@ function rebuildVersionsAreCompatible(pkgPath) {
   const versionFile =
     files.pathJoin(pkgPath, lastRebuildJSONFilename);
 
-  try {
-    var versions = JSON.parse(files.readFile(versionFile));
-  } catch (e) {
-    if (! (e instanceof SyntaxError ||
-           e.code === "ENOENT")) {
-      throw e;
-    }
-  }
-
-  return versionsAreCompatible(versions);
+  return versionsAreCompatible(
+    optimisticReadJsonOrNull(versionFile));
 }
 
 // Rebuilds any binary dependencies in the given node_modules directory,
@@ -458,13 +450,9 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     // put .meteor-portable files only in the individual top-level package
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
-    try {
-      return JSON.parse(optimisticReadFile(portableFile));
-    } catch (e) {
-      if (! (e instanceof SyntaxError ||
-             e.code === "ENOENT")) {
-        throw e;
-      }
+    const result = optimisticReadJsonOrNull(portableFile);
+    if (result) {
+      return result;
     }
   } else {
     // Clean up any .meteor-portable files we mistakenly wrote in
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index a5f48a79ff..bf8d0f4176 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -21,7 +21,7 @@ import LRU from "lru-cache";
 import { wrap } from "optimism";
 import {
   optimisticStatOrNull,
-  optimisticReadFile,
+  optimisticReadJsonOrNull,
 } from "../fs/optimistic.js";
 
 const nativeModulesMap = Object.create(null);
@@ -279,26 +279,9 @@ export default class Resolver {
     return resolved || "missing";
   }
 
-  _readPkgJson(path) {
-    if (! optimisticStatOrNull(path)) {
-      return null;
-    }
-
-    try {
-      return JSON.parse(optimisticReadFile(path));
-    } catch (e) {
-      if (! (e instanceof SyntaxError ||
-             e.code === "ENOENT")) {
-        throw e;
-      }
-    }
-
-    return null;
-  }
-
   _resolvePkgJsonMain(dirPath, _seenDirPaths) {
     const pkgJsonPath = pathJoin(dirPath, "package.json");
-    const pkg = this._readPkgJson(pkgJsonPath);
+    const pkg = optimisticReadJsonOrNull(pkgJsonPath);
     if (! pkg) {
       return null;
     }

From 6c501b0148574e4a12f8848b1e59878df057675b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 14:25:07 -0400
Subject: [PATCH 396/688] Respect $METEOR_DISABLE_OPTIMISTIC_CACHING for
 debugging purposes.

---
 tools/fs/optimistic.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 4c16a4c03a..e525657b0e 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -12,6 +12,10 @@ import {
   readdir,
 } from "./files.js";
 
+// When in doubt, the optimistic caching system can be completely disabled
+// by setting this environment variable.
+const ENABLED = ! process.env.METEOR_DISABLE_OPTIMISTIC_CACHING;
+
 function makeOptimistic(name, fn) {
   const wrapper = wrap(function (...args) {
     const packageName = getNpmPackageName(args[0]);
@@ -21,6 +25,11 @@ function makeOptimistic(name, fn) {
     return fn.apply(this, args);
   }, {
     makeCacheKey(...args) {
+      if (! ENABLED) {
+        // Cache nothing when the optimistic caching system is disabled.
+        return;
+      }
+
       const path = args[0];
       if (! pathIsAbsolute(path)) {
         return;

From ccd960eeb3b1bae1df2221475f0e2c1dca6fb35c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 18 Oct 2016 14:32:13 -0400
Subject: [PATCH 397/688] Bump package versions for 1.4.2-rc.0 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 1771f19130..85e09d3296 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-beta.13"
+  version: "1.2.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index ebbe5196eb..b1da3830e9 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 6cc394fe98..205bd31d59 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index f4ed6f6b01..f280549715 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 9d0527ebea..e0816d3c46 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 91dd739629..4cf0f620cb 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 60b750ca20..edd33436a9 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-beta.13"
+  version: "1.1.14-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 2af4a21176..3c67619663 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-beta.13"
+  version: "1.3.1-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 305f12ee0b..0459601b2d 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-beta.13"
+  version: "1.1.12-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 339b62878a..f4e5dccebf 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-beta.13"
+  version: "1.1.13-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index f722ae4dea..eef5da3166 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index b76c577a43..068a024611 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-beta.13"
+  version: "1.0.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 6b22ec1ae1..f5d365e264 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-beta.13'
+  version: '1.3.12-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 02f1aa1c03..4409a93c9e 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-beta.13'
+  version: '6.13.0-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 965091edb5..71ec7b149f 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-beta.13',
+  version: '0.1.12-rc.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 9f7e4cbd26..a2f25dcc96 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-beta.13'
+  version: '1.0.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 5739d70215..6951f3dca8 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-beta.13'
+  version: '1.0.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index e0b878e303..90ca5a82d7 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-beta.13'
+  version: '1.0.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index 574be4fd78..16e0e41791 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 5e0329019a..2de60eddb6 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-beta.13"
+  version: "1.0.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index c7932ae756..17577feeb0 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-beta.13"
+  version: "1.0.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index fa2a44f480..25c6148129 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-beta.13',
+  version: '1.1.8-rc.0',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 0b6273ac02..699fd2957e 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-beta.13'
+  version: '1.0.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index c69edee61d..bd0c644c33 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-beta.13'
+  version: '1.2.4-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 507cf02644..e90d72aab8 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 7d32493e33..2fe4e80b11 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-beta.13"
+  version: "1.0.8-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 9bf231e67b..2bf822fce0 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-beta.13"
+  version: "1.11.1-2-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index c74613bc4a..12e847d20e 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-beta.13"
+  version: "1.1.1-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 5e45627b03..e8f49b18d1 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-beta.13',
+  version: '1.7.0-rc.0',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 31675a2cc0..2afed58478 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-beta.13',
+  version: '1.3.2-rc.0',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index da8327058c..36601e931b 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-beta.13',
+  version: '1.2.7-rc.0',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 1943b3ce7e..a03c81af5c 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-beta.13',
+  version: '1.0.6-rc.0',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 7d3f490d7c..78e0ec5aae 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-beta.13',
+  version: '1.3.11-rc.0',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index a2d41ba188..9d78d1cb0a 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-beta.13',
+  version: '1.0.7-rc.0',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 7dcfd62f0b..249a1a2b36 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-beta.13",
+  version: "0.3.15-rc.0",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 07e4e6f506..7aebc93ee2 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-beta.13',
+  version: '0.5.9-rc.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 73b3c875fd..4fa97acc3c 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-beta.13'
+  version: '1.0.13-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index c403bd1109..c5066128b1 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-beta.13"
+  version: "1.1.18-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index d4ab3c1110..ed66830156 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-beta.13",
+  version: "4.6.15-rc.0",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 87c1cc467a..9d558b9309 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-beta.13"
+  version: "1.2.10-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index af6fed20e1..7acf5f4f9a 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-beta.13'
+  version: '1.0.9-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index c386d05965..e0b51f203b 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-beta.13'
+  version: '1.0.13-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 234c586ea5..4596613ce9 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-beta.13",
+  version: "1.0.13-rc.0",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 5867bd59a8..a777a5440d 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-beta.13'
+  version: '1.0.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index f74f000187..34ffb730f8 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-beta.13"
+  version: "1.1.9-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 79584baf13..007250fbca 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-beta.13"
+  version: "1.1.15-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 7588674b32..4cb606d4a3 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-beta.13'
+  version: '1.2.10-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index cdeb4ba774..0873210381 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-beta.13'
+  version: '1.0.9-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 6511530138..3380b393f6 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-beta.13'
+  version: '1.11.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 88ee6d006d..79c10e53f2 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-beta.13',
+  version: '1.1.7-rc.0',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index 44fc56fc7b..97473554cc 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-beta.13"
+  version: "1.0.10-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 889049fd96..f229eaf8ee 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-beta.13'
+  version: '1.1.0-rc.0'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index c6bd9f39d2..5677790aaa 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-beta.13',
+  version: '2.7.6-rc.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index f0db7e8cd8..fcc63a4e80 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-beta.13"
+  version: "1.0.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 3b0bb78fc3..505cc70c7a 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-beta.13'
+  version: '1.1.16-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 0992041816..dba24fb212 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-beta.13'
+  version: '2.0.7-rc.0'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 88090c6928..802d2c7946 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 5794a729ad..43a8fa29c0 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-beta.13"
+  version: "1.6.5-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 1dace0d20b..c00ce38651 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-beta.13"
+  version: "1.1.10-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 84d0959e3a..e2aa9a3c06 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-beta.13'
+  version: '1.4.2-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 1f85ba1412..d2ceb8730f 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-beta.13'
+  version: '1.2.18-rc.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index d44492ac4e..c564f5e777 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-beta.13"
+  version: "1.2.15-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 7626e436df..e23d5b453a 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-beta.13"
+  version: "1.2.15-rc.0"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index d085c97a64..8fa283b456 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-beta.13'
+  version: '1.0.18-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 966c3f4253..7bf08872de 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-beta.13"
+  version: "1.0.13-rc.0"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index b25872ec3f..7d7d0cf672 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-beta.13",
+  version: "0.7.7-rc.0",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 79ba86c4fe..bc8e2d2fd8 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-beta.13",
+  version: "0.7.7-rc.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 8a544bca6b..1aebad9ad2 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-beta.13',
+  version: '1.0.6-rc.0',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 6d1178f09b..fd0952a9df 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-6-beta.13'
+  version: '1.1.12-6-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 40f9a09e0f..78d2f9f7a4 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-beta.13",
+  version: "0.9.2-rc.0",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 383c7d6e2f..ce04328f32 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10-2-beta.13',
+  version: '2.2.10-2-rc.0',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 83dd589c5a..9ece0778c1 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-beta.13'
+  version: '1.2.1-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 4a10eea82a..fb70c2d79c 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-beta.13"
+  version: "1.1.12-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index aafdb11858..0dcb53f45f 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-beta.13"
+  version: "1.1.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index ad3f305bf8..bc9687e48f 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-beta.13"
+  version: "1.1.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index f1a4995d76..767b52f524 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-beta.13"
+  version: "1.0.14-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 5af13c37a0..0c8cf47af1 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-beta.13',
+  version: '1.0.9-rc.0',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 6f3a76e752..3178ec1bde 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-beta.13"
+  version: "3.0.10-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 1e80185c02..62868bca33 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 35ca7d2a1f..d18c6ce671 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-beta.13",
+  version: "0.8.8-rc.0",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index a27669baf6..69b5d20293 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-beta.13',
+  version: '1.0.6-rc.0',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 8f873f8bd3..86e61e734d 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-beta.13'
+  version: '1.0.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index e6779bbf23..e2e14fae38 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-beta.13'
+  version: '1.0.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 883b2fed9a..c1c7b9e56d 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-beta.13'
+  version: '1.1.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 4914d90893..1043cfafa3 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-beta.13'
+  version: '1.0.9-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index 990c7fc14d..fd6e55a988 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-beta.13'
+  version: '1.0.12-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index d2a575eee0..adbbba9519 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 9bacab7f44..f229dde0f7 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-beta.13'
+  version: '1.1.7-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index d27911b107..8feba3ca5f 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-beta.13',
+  version: '1.0.9-rc.0',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index b6761dcc32..24dfb15061 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-beta.13"
+  version: "1.0.10-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 970ca19d16..60d9a3c57b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-beta.13',
+  version: '1.2.1-rc.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 55595f2237..b1244dbba9 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-beta.13"
+  version: "2.513.6-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 777a405fac..741d5d8eb3 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-beta.13'
+  version: '1.0.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index d6698c1a95..a0602ae661 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-beta.13',
+  version: '1.0.13-rc.0',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 24722fc5a0..6e20911c11 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-beta.13'
+  version: '1.0.13-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 56b5d7c4df..15b10b13c1 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-beta.13'
+  version: '1.0.11-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 1dc47b6a4a..1b461ee71c 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-beta.13'
+  version: '1.0.12-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 23f0af2b9e..431d84a15f 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-beta.13'
+  version: '1.1.1-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 536a72faf5..c44b5fdd74 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-beta.13'
+  version: '1.1.13-rc.0'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 2cbd623fc4..a5d26a7fe6 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-beta.13'
+  version: '1.0.10-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 18f6cd49df..0fe8b5b569 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-beta.13"
+  version: "1.0.11-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 39fd1cc088..111639ae17 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-beta.13'
+  version: '1.3.12-rc.0'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index de91313b65..dd63b2e0d5 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-beta.13'
+  version: '1.1.9-rc.0'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 0572276f17..026886710c 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-beta.13'
+  version: '2.5.15-rc.0'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index fefb3db96e..8692d705f0 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-beta.13",
+ "version": "1.4.2-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From a171938daf454fa988f5697ad892311c8bfbe72e Mon Sep 17 00:00:00 2001
From: Christian Klaussner <developer@klaussner.me>
Date: Tue, 18 Oct 2016 22:31:45 +0200
Subject: [PATCH 398/688] Update links to MongoDB driver docs

---
 packages/mongo/collection.js         | 4 ++--
 packages/mongo/connection_options.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js
index d28cf4bc05..8e7d505a99 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection.js
@@ -704,7 +704,7 @@ Mongo.Collection.prototype._createCappedCollection = function (byteSize, maxDocu
 };
 
 /**
- * @summary Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/1.4/api-generated/collection.html) object corresponding to this collection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+ * @summary Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html) object corresponding to this collection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
  * @locus Server
  */
 Mongo.Collection.prototype.rawCollection = function () {
@@ -716,7 +716,7 @@ Mongo.Collection.prototype.rawCollection = function () {
 };
 
 /**
- * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/1.4/api-generated/db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+ * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
  * @locus Server
  */
 Mongo.Collection.prototype.rawDatabase = function () {
diff --git a/packages/mongo/connection_options.js b/packages/mongo/connection_options.js
index c061513e0f..a5e746c4ca 100644
--- a/packages/mongo/connection_options.js
+++ b/packages/mongo/connection_options.js
@@ -1,6 +1,6 @@
 /**
  * @summary Allows for user specified connection options
- * @example http://mongodb.github.io/node-mongodb-native/2.1/reference/connecting/connection-settings/
+ * @example http://mongodb.github.io/node-mongodb-native/2.2/reference/connecting/connection-settings/
  * @locus Server
  * @param {Object} options User specified Mongo connection options
  */

From eef23a30b4eda0b17467fd3b4eb7a1e9106aa43e Mon Sep 17 00:00:00 2001
From: Ramez Rafla <ramez@zegenie.com>
Date: Tue, 18 Oct 2016 16:01:02 -0400
Subject: [PATCH 399/688] Adding gap: into CSP

In UIWebView on iOS10 we get CSP failure to load gap://ready, this resolves it on both simulator and device
---
 packages/boilerplate-generator/boilerplate_web.cordova.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/boilerplate-generator/boilerplate_web.cordova.html b/packages/boilerplate-generator/boilerplate_web.cordova.html
index 9c4f7fac4c..5cb90f70f9 100644
--- a/packages/boilerplate-generator/boilerplate_web.cordova.html
+++ b/packages/boilerplate-generator/boilerplate_web.cordova.html
@@ -4,7 +4,7 @@
   <meta name="format-detection" content="telephone=no">
   <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height">
   <meta name="msapplication-tap-highlight" content="no">
-  <meta http-equiv="Content-Security-Policy" content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval' ws: wss:;">
+  <meta http-equiv="Content-Security-Policy" content="default-src * gap: data: blob: 'unsafe-inline' 'unsafe-eval' ws: wss:;">
 
 {{! We are explicitly not using bundledJsCssUrlRewriteHook: in cordova we serve assets up directly from disk, so rewriting the URL does not make sense }}
 

From b69069f21a33df29f9c8d02baacbce74dd192461 Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Sun, 2 Oct 2016 11:39:01 +0200
Subject: [PATCH 400/688] Implement $min, $max, $currentDate modifiers

---
 packages/minimongo/minimongo_tests.js | 54 ++++++++++++++++++++++++++-
 packages/minimongo/modify.js          | 34 +++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 5a77df7652..b1bf42d5ae 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2086,7 +2086,12 @@ Tinytest.add("minimongo - modify", function (test) {
     coll.update(query, mod);
     var actual = coll.findOne();
     delete actual._id;  // added by insert
-    test.equal(actual, expected, EJSON.stringify({input: doc, mod: mod}));
+
+    if(typeof expected === "function"){
+      expected(actual, EJSON.stringify({input: doc, mod: mod}));
+    }else{
+      test.equal(actual, expected, EJSON.stringify({input: doc, mod: mod}));
+    }
   };
   var modify = function (doc, mod, expected) {
     modifyWithQuery(doc, {}, mod, expected);
@@ -2235,6 +2240,53 @@ Tinytest.add("minimongo - modify", function (test) {
   modify({a: {b: 2}}, {$inc: {'a.c': 10}}, {a: {b: 2, c: 10}});
   exception({}, {$inc: {_id: 1}});
 
+  // $currentDate
+  modify({}, {$currentDate: {a: true}}, (result, msg) => { test.instanceOf(result.a,Date,msg) });
+  modify({}, {$currentDate: {a: {$type: "date"}}}, (result, msg) => { test.instanceOf(result.a,Date,msg) });
+  exception({}, {$currentDate: {a: false}});
+  exception({}, {$currentDate: {a: {}}});
+  exception({}, {$currentDate: {a: {$type: "timestamp"}}});
+
+  // $min
+  modify({a: 1, b: 2}, {$min: {b: 1}}, {a: 1, b: 1});
+  modify({a: 1, b: 2}, {$min: {b: 3}}, {a: 1, b: 2});
+  modify({a: 1, b: 2}, {$min: {c: 10}}, {a: 1, b: 2, c: 10});
+  exception({a: 1}, {$min: {a: '10'}});
+  exception({a: 1}, {$min: {a: true}});
+  exception({a: 1}, {$min: {a: [10]}});
+  exception({a: '1'}, {$min: {a: 10}});
+  exception({a: [1]}, {$min: {a: 10}});
+  exception({a: {}}, {$min: {a: 10}});
+  exception({a: false}, {$min: {a: 10}});
+  exception({a: null}, {$min: {a: 10}});
+  modify({a: [1, 2]}, {$min: {'a.1': 1}}, {a: [1, 1]});
+  modify({a: [1, 2]}, {$min: {'a.1': 3}}, {a: [1, 2]});
+  modify({a: [1, 2]}, {$min: {'a.2': 10}}, {a: [1, 2, 10]});
+  modify({a: [1, 2]}, {$min: {'a.3': 10}}, {a: [1, 2, null, 10]});
+  modify({a: {b: 2}}, {$min: {'a.b': 1}}, {a: {b: 1}});
+  modify({a: {b: 2}}, {$min: {'a.c': 10}}, {a: {b: 2, c: 10}});
+  exception({}, {$min: {_id: 1}});
+
+  // $max
+  modify({a: 1, b: 2}, {$max: {b: 1}}, {a: 1, b: 2});
+  modify({a: 1, b: 2}, {$max: {b: 3}}, {a: 1, b: 3});
+  modify({a: 1, b: 2}, {$max: {c: 10}}, {a: 1, b: 2, c: 10});
+  exception({a: 1}, {$max: {a: '10'}});
+  exception({a: 1}, {$max: {a: true}});
+  exception({a: 1}, {$max: {a: [10]}});
+  exception({a: '1'}, {$max: {a: 10}});
+  exception({a: [1]}, {$max: {a: 10}});
+  exception({a: {}}, {$max: {a: 10}});
+  exception({a: false}, {$max: {a: 10}});
+  exception({a: null}, {$max: {a: 10}});
+  modify({a: [1, 2]}, {$max: {'a.1': 3}}, {a: [1, 3]});
+  modify({a: [1, 2]}, {$max: {'a.1': 1}}, {a: [1, 2]});
+  modify({a: [1, 2]}, {$max: {'a.2': 10}}, {a: [1, 2, 10]});
+  modify({a: [1, 2]}, {$max: {'a.3': 10}}, {a: [1, 2, null, 10]});
+  modify({a: {b: 2}}, {$max: {'a.b': 3}}, {a: {b: 3}});
+  modify({a: {b: 2}}, {$max: {'a.c': 10}}, {a: {b: 2, c: 10}});
+  exception({}, {$max: {_id: 1}});
+
   // $set
   modify({a: 1, b: 2}, {$set: {a: 10}}, {a: 10, b: 2});
   modify({a: 1, b: 2}, {$set: {c: 10}}, {a: 1, b: 2, c: 10});
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 348e31a51e..dd28f0cf60 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -182,6 +182,40 @@ var NO_CREATE_MODIFIERS = {
 };
 
 var MODIFIERS = {
+  $currentDate: function(target, field, arg){
+    if(typeof arg === "object" && arg.hasOwnProperty("$type")){
+       if(arg.$type !== "date"){
+        throw MinimongoError("Minimongo does currently only support the date type in $currentDate modifiers");
+       }
+    }else if(arg !== true){
+      throw MinimongoError("Invalid $currentDate modifier");
+    }
+    target[field] = new Date();
+  },
+  $min: function(target, field, arg){
+    if (typeof arg !== "number")
+      throw MinimongoError("Modifier $min allowed for numbers only");
+    if (field in target) {
+      if (typeof target[field] !== "number")
+        throw MinimongoError("Cannot apply $min modifier to non-number");
+      if(target[field] > arg)
+        target[field] = arg;
+    } else {
+      target[field] = arg;
+    }
+  },
+  $max: function(target, field, arg){
+    if (typeof arg !== "number")
+      throw MinimongoError("Modifier $max allowed for numbers only");
+    if (field in target) {
+      if (typeof target[field] !== "number")
+        throw MinimongoError("Cannot apply $max modifier to non-number");
+      if(target[field] < arg)
+        target[field] = arg;
+    } else {
+      target[field] = arg;
+    }
+  },
   $inc: function (target, field, arg) {
     if (typeof arg !== "number")
       throw MinimongoError("Modifier $inc allowed for numbers only");

From acd7916b596b173a384100c4b6acbd0114543a9e Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Tue, 4 Oct 2016 21:41:08 +0200
Subject: [PATCH 401/688] styling

---
 packages/minimongo/minimongo_tests.js |  4 ++--
 packages/minimongo/modify.js          | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index b1bf42d5ae..2898156114 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2087,9 +2087,9 @@ Tinytest.add("minimongo - modify", function (test) {
     var actual = coll.findOne();
     delete actual._id;  // added by insert
 
-    if(typeof expected === "function"){
+    if (typeof expected === "function") {
       expected(actual, EJSON.stringify({input: doc, mod: mod}));
-    }else{
+    } else {
       test.equal(actual, expected, EJSON.stringify({input: doc, mod: mod}));
     }
   };
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index dd28f0cf60..17bd4ee17d 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -182,35 +182,34 @@ var NO_CREATE_MODIFIERS = {
 };
 
 var MODIFIERS = {
-  $currentDate: function(target, field, arg){
-    if(typeof arg === "object" && arg.hasOwnProperty("$type")){
-       if(arg.$type !== "date"){
-        throw MinimongoError("Minimongo does currently only support the date type in $currentDate modifiers");
-       }
-    }else if(arg !== true){
+  $currentDate: function (target, field, arg) {
+    if (typeof arg === "object" && arg.hasOwnProperty("$type")) {
+       if (arg.$type !== "date")
+         throw MinimongoError("Minimongo does currently only support the date type in $currentDate modifiers");
+    } else if(arg !== true) {
       throw MinimongoError("Invalid $currentDate modifier");
     }
     target[field] = new Date();
   },
-  $min: function(target, field, arg){
+  $min: function (target, field, arg) {
     if (typeof arg !== "number")
       throw MinimongoError("Modifier $min allowed for numbers only");
     if (field in target) {
       if (typeof target[field] !== "number")
         throw MinimongoError("Cannot apply $min modifier to non-number");
-      if(target[field] > arg)
+      if (target[field] > arg)
         target[field] = arg;
     } else {
       target[field] = arg;
     }
   },
-  $max: function(target, field, arg){
+  $max: function (target, field, arg) {
     if (typeof arg !== "number")
       throw MinimongoError("Modifier $max allowed for numbers only");
     if (field in target) {
       if (typeof target[field] !== "number")
         throw MinimongoError("Cannot apply $max modifier to non-number");
-      if(target[field] < arg)
+      if (target[field] < arg)
         target[field] = arg;
     } else {
       target[field] = arg;

From 3c3352be129158e2fff25e8bb7faaaf262d66860 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 12 Oct 2016 10:21:32 +0300
Subject: [PATCH 402/688] Don't lower `ulimit` max open files if it's already
 higher than desired

Previously, if the default ulimit was set to a value higher than 16384, it was lowering it.  While this doesn't do much for users with default OS settings, those that have modified their ulimit settings will have their settings maintained.
---
 meteor | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meteor b/meteor
index 86f47df4e7..2c2a757958 100755
--- a/meteor
+++ b/meteor
@@ -114,10 +114,8 @@ DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
 METEOR="$SCRIPT_DIR/tools/index.js"
 
 
-# Bump our file descriptor ulimit as high as it will go. This is a
-# temporary workaround for dependancy watching holding open too many
-# files: https://app.asana.com/0/364581412985/472479912325
-if [ "$(ulimit -n)" != "unlimited" ] ; then
+# Try higher ulimit maxfiles settings until permitted by the kernel
+if [ "$(ulimit -n)" != "unlimited" ] && ! [ "$(ulimit -n)" -gt 16384 ] ; then
     ulimit -n 16384 > /dev/null 2>&1 || \
     ulimit -n 8192 > /dev/null 2>&1 || \
     ulimit -n 4096 > /dev/null 2>&1 || \

From fb5ceb62ff3bdd52de01407f87306eb90aa0f79b Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 12 Oct 2016 10:52:46 +0300
Subject: [PATCH 403/688] Increase the value of the first `ulimit` max open
 files change attempt

Make the first attempt 32768 instead of 16384 since some users have large numbers of files or node_modules trees (meteor/meteor#6952).  This hasn't been raised since Meteor started watching many more files nor since the addition of native NPM.
---
 meteor | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 2c2a757958..f399fbd52d 100755
--- a/meteor
+++ b/meteor
@@ -115,7 +115,8 @@ METEOR="$SCRIPT_DIR/tools/index.js"
 
 
 # Try higher ulimit maxfiles settings until permitted by the kernel
-if [ "$(ulimit -n)" != "unlimited" ] && ! [ "$(ulimit -n)" -gt 16384 ] ; then
+if [ "$(ulimit -n)" != "unlimited" ] && ! [ "$(ulimit -n)" -gt 32768 ] ; then
+    ulimit -n 32768 > /dev/null 2>&1 || \
     ulimit -n 16384 > /dev/null 2>&1 || \
     ulimit -n 8192 > /dev/null 2>&1 || \
     ulimit -n 4096 > /dev/null 2>&1 || \

From 36f0eb667d91a8751ffef40a0df9454087cb89da Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 19 Oct 2016 20:38:23 +0300
Subject: [PATCH 404/688] Raise ulimit for nofile to the system maximum

This should permit watching as many files as the system permits.  Previously, if the default ulimit was set to a value higher than 16384, it was lowered and if the user had configured their system to have a higher ulimit, Meteor wouldn't have take advantage of it.
---
 meteor | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/meteor b/meteor
index f399fbd52d..b373c41c52 100755
--- a/meteor
+++ b/meteor
@@ -113,16 +113,24 @@ fi
 DEV_BUNDLE="$SCRIPT_DIR/dev_bundle"
 METEOR="$SCRIPT_DIR/tools/index.js"
 
+# Set the nofile ulimit as high as permitted by the hard-limit/kernel
+if [ "$(ulimit -Sn)" != "unlimited" ]; then
+    if [ "$(uname -s)" = "Darwin" ]; then
+        maxfilesuse="$(sysctl -n kern.maxfilesperproc)"
+    else
+        maxfilesuse="$(ulimit -Hn)"
+    fi
 
-# Try higher ulimit maxfiles settings until permitted by the kernel
-if [ "$(ulimit -n)" != "unlimited" ] && ! [ "$(ulimit -n)" -gt 32768 ] ; then
-    ulimit -n 32768 > /dev/null 2>&1 || \
-    ulimit -n 16384 > /dev/null 2>&1 || \
-    ulimit -n 8192 > /dev/null 2>&1 || \
-    ulimit -n 4096 > /dev/null 2>&1 || \
-    ulimit -n 2048 > /dev/null 2>&1 || \
-    ulimit -n 1024 > /dev/null 2>&1 || \
-    ulimit -n 512 > /dev/null 2>&1
+    if [ -n "${maxfilesuse}" ] && [ "${maxfilesuse}" != "unlimited" ]; then
+        if ! ulimit -Sn ${maxfilesuse} > /dev/null 2>&1; then
+            echo "Warning: Meteor was unable to raise the limit for number of open files"
+            echo "for the current user.  Please consider filing an issue at:"
+            echo ""
+            echo "  https://github.com/meteor/meteor/issues"
+            echo ""
+            echo "Please include the output of 'uname -a', 'ulimit -H' and 'ulimit -S'"
+        fi
+    fi
 fi
 
 # We used to set $NODE_PATH here to include the node_modules from the dev

From 90f65cdac77f3b421e731f5110ec913917da7bfe Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 19 Oct 2016 20:58:32 +0300
Subject: [PATCH 405/688] Remove message about filing an issue if nofile ulimit
 can't be raised

While this seems like a good idea to find any edge-cases I wasn't thinking of, I'm afraid this would be be displayed frequently for users that set their `ulimit -n` higher in their shell profile since `ulimit -n` can only be lowered once explicitly set in a particular session.
---
 meteor | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meteor b/meteor
index b373c41c52..f9419c26db 100755
--- a/meteor
+++ b/meteor
@@ -122,14 +122,7 @@ if [ "$(ulimit -Sn)" != "unlimited" ]; then
     fi
 
     if [ -n "${maxfilesuse}" ] && [ "${maxfilesuse}" != "unlimited" ]; then
-        if ! ulimit -Sn ${maxfilesuse} > /dev/null 2>&1; then
-            echo "Warning: Meteor was unable to raise the limit for number of open files"
-            echo "for the current user.  Please consider filing an issue at:"
-            echo ""
-            echo "  https://github.com/meteor/meteor/issues"
-            echo ""
-            echo "Please include the output of 'uname -a', 'ulimit -H' and 'ulimit -S'"
-        fi
+        ulimit -Sn ${maxfilesuse} > /dev/null 2>&1
     fi
 fi
 

From 3e1a449f5eba7adf17b1073a89e3890d65391397 Mon Sep 17 00:00:00 2001
From: dhrubins <dan@legalrobot.com>
Date: Tue, 11 Oct 2016 12:35:27 -0700
Subject: [PATCH 406/688] Fix CSP2 script digests in browser policy (#7911).

---
 .../browser-policy-content.js                 | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
index 78738313e4..49fb21ff3a 100644
--- a/packages/browser-policy-content/browser-policy-content.js
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -102,19 +102,26 @@ var addSourceForDirective = function (directive, src) {
   if (_.contains(_.values(keywords), src)) {
     cspSrcs[directive].push(src);
   } else {
-    src = src.toLowerCase();
-
-    // Trim trailing slashes.
-    src = src.replace(/\/+$/, '');
-
     var toAdd = [];
-    // If there is no protocol, add both http:// and https://.
-    if (! /^([a-z0-9.+-]+:)/.test(src)) {
-      toAdd.push("http://" + src);
-      toAdd.push("https://" + src);
+
+    //Only add single quotes to CSP2 script digests
+    if (/^(sha(256|384|512)-)/i.test(src)) {
+      toAdd.push("'" + src + "'");
     } else {
-      toAdd.push(src);
+      src = src.toLowerCase();
+
+      // Trim trailing slashes.
+      src = src.replace(/\/+$/, '');
+
+      // If there is no protocol, add both http:// and https://.
+      if (! /^([a-z0-9.+-]+:)/.test(src)) {
+        toAdd.push("http://" + src);
+        toAdd.push("https://" + src);
+      } else {
+        toAdd.push(src);
+      }
     }
+
     _.each(toAdd, function (s) {
       cspSrcs[directive].push(s);
     });

From c67f782743f72fdf4bfb6a38b5123884d7bcc3f6 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Tue, 18 Oct 2016 12:21:30 +0300
Subject: [PATCH 407/688] Support additional params on oAuth1 authorize URL

Using a the previously-supported ability to pass a function (versus a string) for an oAuth1 URL, this commit implements (and relocates) a function which safely applies whitelisted params to that URL.

This introduces a twitter_common.js file shared between server and client which indicates which Twitter-supported params are permitted on the authorize step.  The two params which Twitter supports right now are `force_login` and `screen_name`.  (See: https://dev.twitter.com/oauth/reference/get/oauth/authenticate)

This commit removes the non-functional implementation of `force_login` introduced by meteor/meteor#6987 and implements it via the aforementioned method.

As a precaution (and since neither `ecmascript` nor `es5-shim` are used by this package), I stuck with JS ES3.

Closes meteor/meteor#7584
---
 packages/oauth1/oauth1_server.js   | 43 ++++++++++++++++++++++--------
 packages/twitter/package.js        |  2 ++
 packages/twitter/twitter_client.js | 11 ++++----
 packages/twitter/twitter_common.js |  6 +++++
 packages/twitter/twitter_server.js | 12 ++++++---
 5 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 packages/twitter/twitter_common.js

diff --git a/packages/oauth1/oauth1_server.js b/packages/oauth1/oauth1_server.js
index 2d4794c7be..8aee39fce5 100644
--- a/packages/oauth1/oauth1_server.js
+++ b/packages/oauth1/oauth1_server.js
@@ -1,5 +1,26 @@
 var url = Npm.require("url");
 
+OAuth._queryParamsWithAuthTokenUrl = function (authUrl, oauthBinding, params, whitelistedQueryParams) {
+  params = params || {};
+  var redirectUrlObj = url.parse(authUrl, true);
+
+  _.extend(
+    redirectUrlObj.query,
+    _.pick(params.query, whitelistedQueryParams),
+    {
+      oauth_token: oauthBinding.requestToken,
+    }
+  );
+
+  // Clear the `search` so it is rebuilt by Node's `url` from the `query` above.
+  // Using previous versions of the Node `url` module, this was just set to ""
+  // However, Node 6 docs seem to indicate that this should be `undefined`.
+  delete redirectUrlObj.search;
+
+  // Reconstruct the URL back with provided query parameters merged with oauth_token
+  return url.format(redirectUrlObj);
+};
+
 // connect middleware
 OAuth._requestHandlers['1'] = function (service, query, res) {
   var config = ServiceConfiguration.configurations.findOne({service: service.serviceName});
@@ -30,19 +51,19 @@ OAuth._requestHandlers['1'] = function (service, query, res) {
       oauthBinding.requestTokenSecret);
 
     // support for scope/name parameters
-    var redirectUrl = undefined;
+    var redirectUrl;
+    var authParams = {
+      query: query
+    };
+
     if(typeof urls.authenticate === "function") {
-      redirectUrl = urls.authenticate(oauthBinding, {
-        query: query
-      });
+      redirectUrl = urls.authenticate(oauthBinding, authParams);
     } else {
-      // Parse the URL to support additional query parameters in urls.authenticate
-      var redirectUrlObj = url.parse(urls.authenticate, true);
-      redirectUrlObj.query = redirectUrlObj.query || {};
-      redirectUrlObj.query.oauth_token = oauthBinding.requestToken;
-      redirectUrlObj.search = '';
-      // Reconstruct the URL back with provided query parameters merged with oauth_token
-      redirectUrl = url.format(redirectUrlObj);
+      redirectUrl = OAuth._queryParamsWithAuthTokenUrl(
+        urls.authenticate,
+        oauthBinding,
+        authParams
+      );
     }
 
     // redirect to provider login, which will redirect back to "step 2" below
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index c44b5fdd74..e790c4e12f 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -18,6 +18,8 @@ Package.onUse(function(api) {
     ['twitter_configure.html', 'twitter_configure.js'],
     'client');
 
+  api.addFiles('twitter_common.js', ['server', 'client']);
+
   api.addFiles('twitter_server.js', 'server');
   api.addFiles('twitter_client.js', 'client');
 });
diff --git a/packages/twitter/twitter_client.js b/packages/twitter/twitter_client.js
index be8e64bd9c..f15c9afca1 100644
--- a/packages/twitter/twitter_client.js
+++ b/packages/twitter/twitter_client.js
@@ -1,5 +1,3 @@
-Twitter = {};
-
 // Request Twitter credentials for the user
 // @param options {optional}  XXX support options.requestPermissions
 // @param credentialRequestCompleteCallback {Function} Callback function to call on
@@ -38,9 +36,12 @@ Twitter.requestCredential = function (options, credentialRequestCompleteCallback
     }
   }
 
-  // Handle force login (request the user to enter their credentials)
-  if (options && options.force_login) {
-    loginPath += "&force_login=true";
+  // Support additional, permitted parameters
+  var addlParams = Twitter.validParamsAuthenticate;
+  for (var i = 0, len = addlParams.length; i < len; i++) {
+    if (options && options[addlParams[i]]) {
+      loginPath += "&" + addlParams[i] + "=" + encodeURIComponent(options[addlParams[i]]);
+    }
   }
 
   var loginUrl = Meteor.absoluteUrl(loginPath);
diff --git a/packages/twitter/twitter_common.js b/packages/twitter/twitter_common.js
new file mode 100644
index 0000000000..6d6d79e177
--- /dev/null
+++ b/packages/twitter/twitter_common.js
@@ -0,0 +1,6 @@
+Twitter = {};
+
+Twitter.validParamsAuthenticate = [
+  'force_login',
+  'screen_name'
+];
diff --git a/packages/twitter/twitter_server.js b/packages/twitter/twitter_server.js
index efbb6e88a3..d597f0db1e 100644
--- a/packages/twitter/twitter_server.js
+++ b/packages/twitter/twitter_server.js
@@ -1,13 +1,17 @@
-Twitter = {};
-
 var urls = {
   requestToken: "https://api.twitter.com/oauth/request_token",
   authorize: "https://api.twitter.com/oauth/authorize",
   accessToken: "https://api.twitter.com/oauth/access_token",
-  authenticate: "https://api.twitter.com/oauth/authenticate"
+  authenticate: function (oauthBinding, params) {
+    return OAuth._queryParamsWithAuthTokenUrl(
+      "https://api.twitter.com/oauth/authenticate",
+      oauthBinding,
+      params,
+      Twitter.validParamsAuthenticate
+    );
+  }
 };
 
-
 // https://dev.twitter.com/docs/api/1.1/get/account/verify_credentials
 Twitter.whitelistedFields = ['profile_image_url', 'profile_image_url_https', 'lang', 'email'];
 

From fec8303c214e3dc2ea4940d6158a37a5433050fd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Oct 2016 15:01:38 -0400
Subject: [PATCH 408/688] Use Array#forEach in twitter_client.js.

---
 packages/twitter/twitter_client.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/twitter/twitter_client.js b/packages/twitter/twitter_client.js
index f15c9afca1..b42e775364 100644
--- a/packages/twitter/twitter_client.js
+++ b/packages/twitter/twitter_client.js
@@ -37,11 +37,13 @@ Twitter.requestCredential = function (options, credentialRequestCompleteCallback
   }
 
   // Support additional, permitted parameters
-  var addlParams = Twitter.validParamsAuthenticate;
-  for (var i = 0, len = addlParams.length; i < len; i++) {
-    if (options && options[addlParams[i]]) {
-      loginPath += "&" + addlParams[i] + "=" + encodeURIComponent(options[addlParams[i]]);
-    }
+  if (options) {
+    var hasOwn = Object.prototype.hasOwnProperty;
+    Twitter.validParamsAuthenticate.forEach(function (param) {
+      if (hasOwn.call(options, param)) {
+        loginPath += "&" + param + "=" + encodeURIComponent(options[param]);
+      }
+    });
   }
 
   var loginUrl = Meteor.absoluteUrl(loginPath);

From 6af6eee022d7bb78da0b2b19c778676e647ddf4b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Oct 2016 17:26:00 -0400
Subject: [PATCH 409/688] Update Node to version 4.6.1.

https://nodejs.org/en/blog/release/v4.6.1/
---
 History.md                         | 3 +++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index eef27dd584..def1eb4838 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,9 @@
   much more quickly, especially if you have many `node_modules` files.
   See https://github.com/meteor/meteor/pull/7668 for more details.
 
+* Node has been updated to version 4.6.1:
+  https://nodejs.org/en/blog/release/v4.6.1/
+
 * The `cordova-lib` npm package has been updated to 6.3.1, along with
   cordova-android (5.2.2) and cordova-ios (4.2.1), and various plugins.
 
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index b0807c45fb..4eee6f85d1 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.6.0
+NODE_VERSION=4.6.1
 NPM_VERSION=3.10.8
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7b9823ef84..20da753f62 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.6.0"
+$NODE_VERSION = "4.6.1"
 $NPM_VERSION = "3.10.8"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 

From 04b5227d43dc35863549424bdc982a4c82e729d4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Oct 2016 17:26:26 -0400
Subject: [PATCH 410/688] Bump $BUNDLE_VERSION to 4.3.7 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index f9419c26db..e865c4703a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.6
+BUNDLE_VERSION=4.3.7
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 04056db28f4af8c91728eb3b4c08b1bb1e2de310 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Oct 2016 18:12:27 -0400
Subject: [PATCH 411/688] Bump package versions for 1.4.2-rc.1 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 85e09d3296..24c259d657 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.12-rc.0"
+  version: "1.2.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index b1da3830e9..f109dc8681 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 205bd31d59..860e044354 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index f280549715..571e77ca5b 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index e0816d3c46..15b172e1b5 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 4cf0f620cb..9854006ac3 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index edd33436a9..716c9ae58b 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-rc.0"
+  version: "1.1.14-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 3c67619663..eebb8af475 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-rc.0"
+  version: "1.3.1-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 0459601b2d..2ef2b479ac 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-rc.0"
+  version: "1.1.12-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index f4e5dccebf..97e0c09402 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-rc.0"
+  version: "1.1.13-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index eef5da3166..b48305924b 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 068a024611..501c1271b8 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-rc.0"
+  version: "1.0.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index f5d365e264..bac8bad071 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-rc.0'
+  version: '1.3.12-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 4409a93c9e..8f99de5e88 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-rc.0'
+  version: '6.13.0-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 71ec7b149f..4fa3cbf51b 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-rc.0',
+  version: '0.1.12-rc.1',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index a2f25dcc96..53a20ad9a7 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-rc.0'
+  version: '1.0.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 6951f3dca8..8241ce1160 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-rc.0'
+  version: '1.0.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 90ca5a82d7..50f417d756 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-rc.0'
+  version: '1.0.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index 16e0e41791..61ef99ae1b 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 2de60eddb6..5ee984e0e5 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-rc.0"
+  version: "1.0.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 17577feeb0..58a6ac04c7 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-rc.0"
+  version: "1.0.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 25c6148129..6033372619 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-rc.0',
+  version: '1.1.8-rc.1',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 699fd2957e..46832b2660 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-rc.0'
+  version: '1.0.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index bd0c644c33..b60540e66a 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-rc.0'
+  version: '1.2.4-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index e90d72aab8..ff9dd72adb 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 2fe4e80b11..de070c13c0 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-rc.0"
+  version: "1.0.8-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 2bf822fce0..c4a403368f 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-rc.0"
+  version: "1.11.1-2-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index 12e847d20e..f6333b39ed 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-rc.0"
+  version: "1.1.1-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index e8f49b18d1..7e9853684b 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-rc.0',
+  version: '1.7.0-rc.1',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 2afed58478..5ac0e1f7ae 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-rc.0',
+  version: '1.3.2-rc.1',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 36601e931b..c36ccb91be 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-rc.0',
+  version: '1.2.7-rc.1',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index a03c81af5c..e4db8017df 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-rc.0',
+  version: '1.0.6-rc.1',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 78e0ec5aae..3339ce0021 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-rc.0',
+  version: '1.3.11-rc.1',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index 9d78d1cb0a..c4872d3326 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-rc.0',
+  version: '1.0.7-rc.1',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 249a1a2b36..a0801a571d 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-rc.0",
+  version: "0.3.15-rc.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 7aebc93ee2..15f9eb635f 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-rc.0',
+  version: '0.5.9-rc.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 4fa97acc3c..1768cb85d5 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-rc.0'
+  version: '1.0.13-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index c5066128b1..1ccbe0d2dc 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-rc.0"
+  version: "1.1.18-rc.1"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index ed66830156..8d6e7f1286 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-rc.0",
+  version: "4.6.15-rc.1",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 9d558b9309..4aa548a786 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-rc.0"
+  version: "1.2.10-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 7acf5f4f9a..0d6f80812d 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-rc.0'
+  version: '1.0.9-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index e0b51f203b..b1617fdc3e 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-rc.0'
+  version: '1.0.13-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 4596613ce9..3c404980d0 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-rc.0",
+  version: "1.0.13-rc.1",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index a777a5440d..93518eb6a7 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-rc.0'
+  version: '1.0.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 34ffb730f8..7e69c1fef4 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-rc.0"
+  version: "1.1.9-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 007250fbca..d2614655ed 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-rc.0"
+  version: "1.1.15-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 4cb606d4a3..3adbb1e555 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-rc.0'
+  version: '1.2.10-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 0873210381..391fde4b04 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-rc.0'
+  version: '1.0.9-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 3380b393f6..d40c110a6e 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-rc.0'
+  version: '1.11.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 79c10e53f2..1727773781 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-rc.0',
+  version: '1.1.7-rc.1',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index 97473554cc..8e5dda1554 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-rc.0"
+  version: "1.0.10-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index f229eaf8ee..260e82244b 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-rc.0'
+  version: '1.1.0-rc.1'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 5677790aaa..4ed0829355 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-rc.0',
+  version: '2.7.6-rc.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index fcc63a4e80..71eb8481c3 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-rc.0"
+  version: "1.0.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 505cc70c7a..58a782b553 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-rc.0'
+  version: '1.1.16-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index dba24fb212..0365dfff9b 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-rc.0'
+  version: '2.0.7-rc.1'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 802d2c7946..79790aebba 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 43a8fa29c0..5db15620ad 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-rc.0"
+  version: "1.6.5-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index c00ce38651..0126925db9 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-rc.0"
+  version: "1.1.10-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e2aa9a3c06..c39e9fa33a 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-rc.0'
+  version: '1.4.2-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index d2ceb8730f..12335158a7 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.2.18-rc.0'
+  version: '1.6.0-rc.1'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index c564f5e777..9fae27a120 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-rc.0"
+  version: "1.2.15-rc.1"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index e23d5b453a..d121d6a1f7 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-rc.0"
+  version: "1.2.15-rc.1"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 8fa283b456..6c8f5f2a46 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-rc.0'
+  version: '1.0.18-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 7bf08872de..8d6f22d828 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-rc.0"
+  version: "1.0.13-rc.1"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 7d7d0cf672..f8109ac89d 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-rc.0",
+  version: "0.7.7-rc.1",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index bc8e2d2fd8..a61319a454 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-rc.0",
+  version: "0.7.7-rc.1",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 1aebad9ad2..944d2402a6 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-rc.0',
+  version: '1.0.6-rc.1',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index fd0952a9df..8dbfe99d8e 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-6-rc.0'
+  version: '1.1.12-6-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 78d2f9f7a4..418401812a 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-rc.0",
+  version: "0.9.2-rc.1",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index ce04328f32..ab0633d86a 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10-2-rc.0',
+  version: '2.2.10-2-rc.1',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 9ece0778c1..14ef2c1434 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-rc.0'
+  version: '1.2.1-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index fb70c2d79c..2c0e3a1750 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-rc.0"
+  version: "1.1.12-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 0dcb53f45f..3cba6e3a2f 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-rc.0"
+  version: "1.1.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index bc9687e48f..6cb003f87d 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-rc.0"
+  version: "1.1.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 767b52f524..625acf1a6a 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-rc.0"
+  version: "1.0.14-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 0c8cf47af1..f2bc2f8ad5 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-rc.0',
+  version: '1.0.9-rc.1',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 3178ec1bde..b843e9bf40 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-rc.0"
+  version: "3.0.10-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 62868bca33..81450f5ffb 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index d18c6ce671..4fadca7bc1 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-rc.0",
+  version: "0.8.8-rc.1",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 69b5d20293..fee1753c2b 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-rc.0',
+  version: '1.0.6-rc.1',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 86e61e734d..14a51d065d 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-rc.0'
+  version: '1.0.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index e2e14fae38..9820d0883c 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-rc.0'
+  version: '1.0.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index c1c7b9e56d..100e073520 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-rc.0'
+  version: '1.1.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 1043cfafa3..23dd0f08d1 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-rc.0'
+  version: '1.0.9-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index fd6e55a988..ab9f1d900b 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-rc.0'
+  version: '1.0.12-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index adbbba9519..496c918586 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index f229dde0f7..e057a12608 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-rc.0'
+  version: '1.1.7-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index 8feba3ca5f..f56b5493b3 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-rc.0',
+  version: '1.0.9-rc.1',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 24dfb15061..d11022098b 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-rc.0"
+  version: "1.0.10-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 60d9a3c57b..b49eb6db2b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-rc.0',
+  version: '1.2.1-rc.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index b1244dbba9..2c45659fde 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-rc.0"
+  version: "2.513.6-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 741d5d8eb3..3290ea780d 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-rc.0'
+  version: '1.0.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index a0602ae661..ecdd82c271 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-rc.0',
+  version: '1.0.13-rc.1',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 6e20911c11..a3ab04dc27 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-rc.0'
+  version: '1.0.13-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 15b10b13c1..3762c50348 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-rc.0'
+  version: '1.0.11-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 1b461ee71c..053a18a5e5 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-rc.0'
+  version: '1.0.12-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 431d84a15f..936fb3bfa8 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-rc.0'
+  version: '1.1.1-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index e790c4e12f..cbb6dceef9 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-rc.0'
+  version: '1.1.13-rc.1'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index a5d26a7fe6..161521e741 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-rc.0'
+  version: '1.0.10-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 0fe8b5b569..6dd4f35730 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-rc.0"
+  version: "1.0.11-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 111639ae17..7961400cc9 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-rc.0'
+  version: '1.3.12-rc.1'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index dd63b2e0d5..9ae35dc3c5 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-rc.0'
+  version: '1.1.9-rc.1'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 026886710c..e581429603 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-rc.0'
+  version: '2.5.15-rc.1'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8692d705f0..df0b2237e3 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-rc.0",
+ "version": "1.4.2-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From ba7f0169f7ba76bbce82bba2b0a44bd0b5dbd775 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:19:55 -0400
Subject: [PATCH 412/688] Upgrade the `fibers` npm package to version 1.0.15.

This should hopefully improve performance in the rare event that a large
number of fibers get created simultaneously.
---
 History.md                           | 4 ++++
 scripts/dev-bundle-server-package.js | 2 +-
 scripts/dev-bundle-tool-package.js   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index ed93c7f288..65b08e71ba 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 ## v.NEXT
 
+## v1.4.1.3
+
+* The `fibers` npm package has been upgraded to version 1.0.15.
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 6c03d52c98..508c62607e 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   version: "0.0.0",
   dependencies: {
     "meteor-promise": "0.7.2",
-    fibers: "1.0.13",
+    fibers: "1.0.15",
     promise: "7.1.1",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
     // in the package too) because we should consider using lodash instead
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 2156c75fa0..1ee18b4e78 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -16,7 +16,7 @@ var packageJson = {
     "node-pre-gyp": "0.6.29",
     "meteor-babel": "0.12.0",
     "meteor-promise": "0.7.2",
-    fibers: "1.0.13",
+    fibers: "1.0.15",
     promise: "7.1.1",
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.
     "babel-runtime": "6.9.2",

From 0168065d1733a8bd6fa5fd7c0aee78483a90497c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:36:03 -0400
Subject: [PATCH 413/688] Fix shrink_fibers function in generate-dev-bundle.sh.

This logic needs to agree with the following expression:
https://github.com/laverdet/node-fibers/blob/8d7e4ffeb5151ade/build.js#L31
---
 scripts/generate-dev-bundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index d37a3e1f04..5ac6911a3d 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -75,7 +75,7 @@ mv package.json npm-shrinkwrap.json "${DIR}/etc/"
 # bloats our dev bundle. Remove all the ones other than our
 # architecture. (Expression based on build.js in fibers source.)
 shrink_fibers () {
-    FIBERS_ARCH=$(node -p -e 'process.platform + "-" + process.arch + "-v8-" + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0]')
+    FIBERS_ARCH=$(node -p -e 'process.platform + "-" + process.arch + "-" + process.versions.modules')
     mv $FIBERS_ARCH ..
     rm -rf *
     mv ../$FIBERS_ARCH .

From 982853e7277160d3cdd9b179ad07cf08cdbf4349 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Oct 2016 17:26:00 -0400
Subject: [PATCH 414/688] Update Node to version 4.6.1.

https://nodejs.org/en/blog/release/v4.6.1/
---
 History.md                         | 3 +++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index 65b08e71ba..1f41a3e68a 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,9 @@
 
 ## v1.4.1.3
 
+* Node has been updated to version 4.6.1:
+  https://nodejs.org/en/blog/release/v4.6.1/
+
 * The `fibers` npm package has been upgraded to version 1.0.15.
 
 ## v1.4.1.2
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index b0807c45fb..4eee6f85d1 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.6.0
+NODE_VERSION=4.6.1
 NPM_VERSION=3.10.8
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7b9823ef84..20da753f62 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.6.0"
+$NODE_VERSION = "4.6.1"
 $NPM_VERSION = "3.10.8"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 

From cfb8a572c830cf1cdb782bc093a6f01689547649 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:22:46 -0400
Subject: [PATCH 415/688] Bump $BUNDLE_VERSION to 4.4.1 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index f7e92d6cd0..d95dba19ce 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.0
+BUNDLE_VERSION=4.4.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 0f7d725ebe3290b9099f8464ae2cfc13126f64e8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:56:00 -0400
Subject: [PATCH 416/688] Bump package versions for 1.4.1.3-rc.0 release.

---
 packages/meteor-tool/package.js                | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 764cc54fe4..8921af018b 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1_2'
+  version: '1.4.1-3-rc.0'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 934f0fb5e1..78fc0eb719 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1.2-rc.0",
+ "version": "1.4.1.3-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From cca97e2784831b4cd966a688842a892d7749d029 Mon Sep 17 00:00:00 2001
From: Christian Klaussner <klaussner@users.noreply.github.com>
Date: Thu, 20 Oct 2016 20:11:59 +0200
Subject: [PATCH 417/688] Fix link to Google documentation (#7942)

---
 packages/accounts-oauth/oauth_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js
index a419b2003a..7290158083 100644
--- a/packages/accounts-oauth/oauth_client.js
+++ b/packages/accounts-oauth/oauth_client.js
@@ -9,7 +9,7 @@
  * @param {Object} [options]
  * @param {String[]} options.requestPermissions A list of permissions to request from the user.
  * @param {Boolean} options.requestOfflineToken If true, asks the user for permission to act on their behalf when offline. This stores an additional offline token in the `services` field of the user document. Currently only supported with Google.
- * @param {Object} options.loginUrlParameters Provide additional parameters to the authentication uri. Currently only supported with Google {@url https://developers.google.com/identity/protocols/OpenIDConnect#authenticationuriparameters}.
+ * @param {Object} options.loginUrlParameters Provide additional parameters to the authentication URI. Currently only supported with Google. See [Google Identity Platform documentation](https://developers.google.com/identity/protocols/OpenIDConnect#authenticationuriparameters).
  * @param {String} options.loginHint An email address that the external service will use to pre-fill the login prompt. Currently only supported with Meteor developer accounts and Google accounts. If used with Google, the Google User ID can also be passed.
  * @param {String} options.loginStyle Login style ("popup" or "redirect", defaults to the login service configuration).  The "popup" style opens the login page in a separate popup window, which is generally preferred because the Meteor application doesn't need to be reloaded.  The "redirect" style redirects the Meteor application's window to the login page, and the login service provider redirects back to the Meteor application which is then reloaded.  The "redirect" style can be used in situations where a popup window can't be opened, such as in a mobile UIWebView.  The "redirect" style however relies on session storage which isn't available in Safari private mode, so the "popup" style will be forced if session storage can't be used.
  * @param {String} options.redirectUrl If using "redirect" login style, the user will be returned to this URL after authorisation has been completed.

From 6b06f440f1719be6e8c7e9a00e0b4ed1393964fa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:19:55 -0400
Subject: [PATCH 418/688] Upgrade the `fibers` npm package to version 1.0.15.

This should hopefully improve performance in the rare event that a large
number of fibers get created simultaneously.
---
 History.md                           | 6 ++++--
 scripts/dev-bundle-server-package.js | 2 +-
 scripts/dev-bundle-tool-package.js   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index def1eb4838..2b9917d4fb 100644
--- a/History.md
+++ b/History.md
@@ -15,8 +15,6 @@
 
 * The `node-pre-gyp` npm package has been updated to 0.6.30.
 
-* The `fibers` npm package has been updated to 1.0.14.
-
 * The `lru-cache` npm package has been updated to 4.0.1.
 
 * The `mongodb` npm package used by the `npm-mongo` Meteor package has
@@ -86,6 +84,10 @@
   dreaded `Error: ENOENT: no such file or directory, open... os.json`
   error. [#7806](https://github.com/meteor/meteor/issues/7806)
 
+## v1.4.1.3
+
+* The `fibers` npm package has been upgraded to version 1.0.15.
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 8f9213308a..508c62607e 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -10,7 +10,7 @@ var packageJson = {
   version: "0.0.0",
   dependencies: {
     "meteor-promise": "0.7.2",
-    fibers: "1.0.14",
+    fibers: "1.0.15",
     promise: "7.1.1",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
     // in the package too) because we should consider using lodash instead
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index a9045e86d6..c839167b3c 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -16,7 +16,7 @@ var packageJson = {
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.13.0",
     "meteor-promise": "0.7.2",
-    fibers: "1.0.14",
+    fibers: "1.0.15",
     promise: "7.1.1",
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.
     "babel-runtime": "6.9.2",

From 73519c2b792f584493e19057bae28bf93b455265 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:36:03 -0400
Subject: [PATCH 419/688] Fix shrink_fibers function in generate-dev-bundle.sh.

This logic needs to agree with the following expression:
https://github.com/laverdet/node-fibers/blob/8d7e4ffeb5151ade/build.js#L31
---
 scripts/generate-dev-bundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index fbc8d0756d..2ef74cf726 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -75,7 +75,7 @@ mv package.json npm-shrinkwrap.json "${DIR}/etc/"
 # bloats our dev bundle. Remove all the ones other than our
 # architecture. (Expression based on build.js in fibers source.)
 shrink_fibers () {
-    FIBERS_ARCH=$(node -p -e 'process.platform + "-" + process.arch + "-v8-" + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0]')
+    FIBERS_ARCH=$(node -p -e 'process.platform + "-" + process.arch + "-" + process.versions.modules')
     mv $FIBERS_ARCH ..
     rm -rf *
     mv ../$FIBERS_ARCH .

From 9ff66d11c7a3eb68376f8679a706742d618f6ae9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 17:37:21 -0400
Subject: [PATCH 420/688] Ugrade the `meteor-promise` npm package to version
 0.8.0.

Most notably, this update provides error stack traces that include context
from Promise.await calls and await expressions, so (for example) you can
tell where a certain yielding files.* method was originally called,
instead of only getting a useless native stack trace.
---
 History.md                                        |  3 +++
 packages/promise/.npm/package/npm-shrinkwrap.json | 10 +++++-----
 packages/promise/package.js                       |  2 +-
 scripts/dev-bundle-server-package.js              |  2 +-
 scripts/dev-bundle-tool-package.js                |  2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 2b9917d4fb..8a03bafc42 100644
--- a/History.md
+++ b/History.md
@@ -17,6 +17,9 @@
 
 * The `lru-cache` npm package has been updated to 4.0.1.
 
+* The `meteor-promise` npm package has been updated to 0.8.0 for better
+  asynchronous stack traces.
+
 * The `mongodb` npm package used by the `npm-mongo` Meteor package has
   been updated to version 2.2.10.
   [#7780](https://github.com/meteor/meteor/pull/7780)
diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
index a55c02a3fa..469b5f6bbe 100644
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ b/packages/promise/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "asap": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
       "from": "asap@>=2.0.3 <2.1.0"
     },
     "meteor-promise": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.7.4.tgz",
-      "from": "meteor-promise@0.7.4"
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.0.tgz",
+      "from": "meteor-promise@0.8.0"
     },
     "promise": {
       "version": "7.1.1",
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 4fadca7bc1..4d4766a672 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "meteor-promise": "0.7.4",
+  "meteor-promise": "0.8.0",
   "promise": "7.1.1"
 });
 
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 508c62607e..123ca8df95 100644
--- a/scripts/dev-bundle-server-package.js
+++ b/scripts/dev-bundle-server-package.js
@@ -9,7 +9,7 @@ var packageJson = {
   // Version is not important but is needed to prevent warnings.
   version: "0.0.0",
   dependencies: {
-    "meteor-promise": "0.7.2",
+    "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",
     // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index c839167b3c..603e4739cd 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.13.0",
-    "meteor-promise": "0.7.2",
+    "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.

From 94754ca9e9ee8bdf553101f9e71619b6962400eb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 13:23:12 -0400
Subject: [PATCH 421/688] Bump $BUNDLE_VERSION to 4.6.0 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index e865c4703a..dc1bb2e810 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.3.7
+BUNDLE_VERSION=4.6.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 61d647f9f72e07927376d336b44aba15202e0455 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 22 Aug 2016 16:50:06 -0400
Subject: [PATCH 422/688] Don't try to use native tar command on Windows.

Fixes #7689.
---
 tools/fs/files.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index ae83d5e3ab..ff3198512c 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -717,13 +717,10 @@ files.extractTarGz = function (buffer, destPath, options) {
   }
 
   const startTime = +new Date;
-  let promise = tryExtractWithNativeTar(buffer, tempDir, options);
 
-  if (process.platform === "win32") {
-    promise = promise.catch(
-      error => tryExtractWithNative7z(buffer, tempDir, options)
-    );
-  }
+  let promise = process.platform === "win32"
+    ? tryExtractWithNative7z(buffer, tempDir, options)
+    : tryExtractWithNativeTar(buffer, tempDir, options)
 
   promise = promise.catch(
     error => tryExtractWithNpmTar(buffer, tempDir, options)

From b8d872fa77e4c0d8828d0f177b26defc56da0d30 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 28 Sep 2016 16:57:52 -0400
Subject: [PATCH 423/688] Automatically reconfigure Mongo replication set when
 --port differs.

Fixes #7563.
---
 History.md                                    |  5 ++
 tools/runners/run-mongo.js                    | 30 +++++++++--
 .../mongo-sanity/.meteor/.finished-upgraders  | 15 ++++++
 .../apps/mongo-sanity/.meteor/.gitignore      |  1 +
 tools/tests/apps/mongo-sanity/.meteor/.id     |  7 +++
 .../tests/apps/mongo-sanity/.meteor/packages  | 12 +++++
 .../tests/apps/mongo-sanity/.meteor/platforms |  2 +
 tools/tests/apps/mongo-sanity/.meteor/release |  1 +
 .../tests/apps/mongo-sanity/.meteor/versions  | 54 +++++++++++++++++++
 tools/tests/apps/mongo-sanity/server/main.js  | 18 +++++++
 tools/tests/mongo.js                          | 29 ++++++++++
 11 files changed, 170 insertions(+), 4 deletions(-)
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.gitignore
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/.id
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/packages
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/platforms
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/release
 create mode 100644 tools/tests/apps/mongo-sanity/.meteor/versions
 create mode 100644 tools/tests/apps/mongo-sanity/server/main.js

diff --git a/History.md b/History.md
index 1f41a3e68a..da28774daf 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,11 @@
 
 * The `fibers` npm package has been upgraded to version 1.0.15.
 
+* Running Meteor with a different `--port` will now automatically
+  reconfigure the Mongo replica set when using the WiredTiger storage
+  engine, instead of failing to start Mongo.
+  [#7840](https://github.com/meteor/meteor/pull/7840).
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index 9f9b692a20..d308a8066c 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -532,7 +532,8 @@ var launchMongo = function (options) {
     var stdoutOnData = fiberHelpers.bindEnvironment(function (data) {
       // note: don't use "else ifs" in this, because 'data' can have multiple
       // lines
-      if (/\[initandlisten\] Did not find local replica set configuration document at startup/.test(data)) {
+      if (/\[initandlisten\] Did not find local replica set configuration document at startup/.test(data) ||
+          /\[ReplicationExecutor\] Locally stored replica set configuration does not have a valid entry for the current node/.test(data)) {
         replSetReadyToBeInitiated = true;
         maybeReadyToTalk();
       }
@@ -596,10 +597,25 @@ var launchMongo = function (options) {
       if (stopped) {
         return;
       }
+
       var configuration = {
         _id: replSetName,
+        version: 1,
         members: [{_id: 0, host: '127.0.0.1:' + options.port, priority: 100}]
       };
+
+      try {
+        const config = yieldingMethod(db.admin(), "command", {
+          replSetGetConfig: 1,
+        }).config;
+
+        // If a replication set configuration already exists, it's
+        // important that the new version number is greater than the old.
+        if (config && _.has(config, "version")) {
+          configuration.version = config.version + 1;
+        }
+      } catch (e) {}
+
       if (options.multiple) {
         // Add two more members: one of which should start as secondary but
         // could in theory become primary, and one of which can never be
@@ -613,10 +629,16 @@ var launchMongo = function (options) {
       }
 
       try {
-        var initiateResult = yieldingMethod(
-          db.admin(), 'command', {replSetInitiate: configuration});
+        yieldingMethod(db.admin(), 'command', {
+          replSetInitiate: configuration,
+        });
       } catch (e) {
-        if (e.message !== 'already initialized') {
+        if (e.message === 'already initialized') {
+          yieldingMethod(db.admin(), 'command', {
+            replSetReconfig: configuration,
+            force: true,
+          });
+        } else {
           throw Error("rs.initiate error: " + e.message);
         }
       }
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders b/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..aa607041da
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.finished-upgraders
@@ -0,0 +1,15 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.gitignore b/tools/tests/apps/mongo-sanity/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/mongo-sanity/.meteor/.id b/tools/tests/apps/mongo-sanity/.meteor/.id
new file mode 100644
index 0000000000..789b92d073
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+fgbyyt1b3uxw5u734ug
diff --git a/tools/tests/apps/mongo-sanity/.meteor/packages b/tools/tests/apps/mongo-sanity/.meteor/packages
new file mode 100644
index 0000000000..6205c4c08c
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/packages
@@ -0,0 +1,12 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mongo                   # The database Meteor supports right now
+
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+
diff --git a/tools/tests/apps/mongo-sanity/.meteor/platforms b/tools/tests/apps/mongo-sanity/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/mongo-sanity/.meteor/release b/tools/tests/apps/mongo-sanity/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/mongo-sanity/.meteor/versions b/tools/tests/apps/mongo-sanity/.meteor/versions
new file mode 100644
index 0000000000..e675491585
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/.meteor/versions
@@ -0,0 +1,54 @@
+allow-deny@1.0.5
+autoupdate@1.3.11
+babel-compiler@6.9.2-beta.5
+babel-runtime@0.1.12-beta.5
+base64@1.0.9
+binary-heap@1.0.9
+blaze@2.1.8
+blaze-tools@1.0.9
+boilerplate-generator@1.0.10
+callback-hook@1.0.9
+check@1.2.3
+ddp@1.2.5
+ddp-client@1.3.2-beta.5
+ddp-common@1.2.6
+ddp-server@1.3.11-beta.5
+deps@1.0.12
+diff-sequence@1.0.6
+ecmascript@0.5.9-beta.5
+ecmascript-runtime@0.3.15-beta.5
+ejson@1.0.12
+geojson-utils@1.0.9
+hot-code-push@1.0.4
+html-tools@1.0.10
+htmljs@1.0.10
+http@1.2.10-beta.5
+id-map@1.0.8
+jquery@1.11.9
+livedata@1.0.18
+logging@1.1.16-beta.5
+meteor@1.2.18-beta.5
+meteor-base@1.0.4
+minimongo@1.0.17
+modules@0.7.7-beta.5
+modules-runtime@0.7.7-beta.5
+mongo@1.1.13-beta.5
+mongo-id@1.0.5
+npm-mongo@1.5.51-beta.5
+observe-sequence@1.0.12
+ordered-dict@1.0.8
+promise@0.8.8-beta.5
+random@1.0.10
+reactive-var@1.0.10
+reload@1.1.10
+retry@1.0.8
+routepolicy@1.0.11
+shell-server@0.2.1
+spacebars@1.0.12
+spacebars-compiler@1.0.12
+tracker@1.1.0
+ui@1.0.11
+underscore@1.0.9
+url@1.0.10
+webapp@1.3.12-beta.5
+webapp-hashing@1.0.9
diff --git a/tools/tests/apps/mongo-sanity/server/main.js b/tools/tests/apps/mongo-sanity/server/main.js
new file mode 100644
index 0000000000..45aa6e530a
--- /dev/null
+++ b/tools/tests/apps/mongo-sanity/server/main.js
@@ -0,0 +1,18 @@
+import { Mongo } from 'meteor/mongo';
+
+const collection = new Mongo.Collection("sanity");
+
+Meteor.startup(() => {
+  let doc = collection.findOne();
+
+  if (! doc) {
+    collection.insert({ count: 0 });
+    doc = collection.findOne();
+  }
+
+  collection.update(doc._id, {
+    $inc: { count: 1 }
+  });
+
+  console.log("count: " + collection.findOne().count);
+});
diff --git a/tools/tests/mongo.js b/tools/tests/mongo.js
index eafc5fecd3..eb9794a446 100644
--- a/tools/tests/mongo.js
+++ b/tools/tests/mongo.js
@@ -56,3 +56,32 @@ selftest.define("meteor mongo", function () {
 selftest.define("meteor mongo in unicode dir", function () {
   testMeteorMongo('asdf\u0442asdf');
 });
+
+selftest.define("mongo with multiple --port numbers (#7563)", function () {
+  var s = new Sandbox();
+  s.createApp("mongo-multiple-ports", "mongo-sanity");
+  s.cd("mongo-multiple-ports");
+
+  function check(args, matches) {
+    const run = s.run(...args);
+    run.waitSecs(30);
+    matches.forEach(m => {
+      run.waitSecs(10);
+      run.match(m);
+    });
+    run.stop();
+  }
+
+  // Make absolutely sure we're creating the database for the first time.
+  check(["reset"], ["Project reset."]);
+
+  let count = 0;
+  function next() {
+    return ["Started MongoDB", "count: " + (++count)];
+  }
+
+  check(["run"], next());
+  check(["--port", "4321"], next());
+  check(["--port", "4123"], next());
+  check([], next());
+});

From c20609022f40d83965e8083444b7801cf5a7126b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 09:42:54 -0400
Subject: [PATCH 424/688] Kill mongo when server process exits.

We try to kill any mongod processes before starting new ones, but this
change kills it when the development server shuts down, too.

Killing mongo on shutdown is particularly important for tests that run
meteor multiple times in a row, and for whatever reason fail to find and
kill running mongod processes on startup, e.g. because the --port has
changed (#7563).

This comment by @glasser seems to suggest this is a reasonable idea:
https://github.com/meteor/meteor/issues/2182#issuecomment-45685614

Fixes #2182 and possibly other related bugs.
---
 tools/runners/run-mongo.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js
index d308a8066c..551d36d63b 100644
--- a/tools/runners/run-mongo.js
+++ b/tools/runners/run-mongo.js
@@ -482,15 +482,15 @@ var launchMongo = function (options) {
 
     proc = spawnMongod(mongod_path, port, dbPath, replSetName);
 
-    subHandles.push({
-      stop: function () {
-        if (proc) {
-          proc.removeListener('exit', procExitHandler);
-          proc.kill('SIGINT');
-          proc = null;
-        }
+    function stop() {
+      if (proc) {
+        proc.removeListener('exit', procExitHandler);
+        proc.kill('SIGINT');
+        proc = null;
       }
-    });
+    }
+    require("../tool-env/cleanup.js").onExit(stop);
+    subHandles.push({ stop });
 
     var procExitHandler = fiberHelpers.bindEnvironment(function (code, signal) {
       // Defang subHandle.stop().

From 738f7560b4f859dff877c14d140d911c41844be9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 29 Sep 2016 19:27:11 -0400
Subject: [PATCH 425/688] Add note about killing mongod on shutdown to
 History.md.

---
 History.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/History.md b/History.md
index da28774daf..591b9a54ee 100644
--- a/History.md
+++ b/History.md
@@ -12,6 +12,11 @@
   engine, instead of failing to start Mongo.
   [#7840](https://github.com/meteor/meteor/pull/7840).
 
+* When the Meteor development server shuts down, it now attempts to kill
+  the `mongod` process it spawned, in addition to killing any running
+  `mongod` processes when the server first starts up.
+  https://github.com/meteor/meteor/pull/7668/commits/295d3d5678228f06ee0ab6c0d60139849a0ea192
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:

From 554eb628eb61dd44324c13e8213cded456a0a6aa Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@percolatestudio.com>
Date: Sat, 8 Oct 2016 06:47:35 +1100
Subject: [PATCH 426/688] Reconnect to mongo indefinitely. (#7880)

* Reconnect to mongo indefinitely.

A fix for https://github.com/meteor/meteor/issues/7822

It seems the driver now always autoReconnects, but only for 30s.

To get the old (sensible) behavior of endlessly reconnecting, we set `reconnectTries` to 0.

* Releasing an rc of mongo package
---
 packages/mongo/mongo_driver.js | 18 +++++++++---------
 packages/mongo/package.js      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 567c349e4c..5d5ecbdcb8 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -130,15 +130,15 @@ MongoConnection = function (url, options) {
   self._observeMultiplexers = {};
   self._onFailoverHook = new Hook;
 
-  var mongoOptions = _.extend({db: {safe: true}, server: {}, replSet: {}},
-                               Mongo._connectionOptions);
-
-  // Set autoReconnect to true, unless passed on the URL. Why someone
-  // would want to set autoReconnect to false, I'm not really sure, but
-  // keeping this for backwards compatibility for now.
-  if (!(/[\?&]auto_?[rR]econnect=/.test(url))) {
-    mongoOptions.server.auto_reconnect = true;
-  }
+  var mongoOptions = _.extend({
+      db: { safe: true },
+      // Set reconnectTries to 0 which means keep trying to reconnect forever,
+      // rather than the default of losing the connection permanently after 30
+      // retries (separated by 1000ms).
+      server: { reconnectTries: 0 },
+      replSet: {}
+    },
+    Mongo._connectionOptions);
 
   // Disable the native parser by default, unless specifically enabled
   // in the mongo URL.
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 5af9494d1f..c22cca55f2 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_1'
+  version: '1.1.12-2-rc.0'
 });
 
 Npm.depends({

From ef4f547a944eba7faf689c76dbd3752f140019a3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 13:55:58 -0400
Subject: [PATCH 427/688] Make npm-mongo package version match npm mongodb
 package.

---
 packages/npm-mongo/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 33c34710c2..9bb7b46691 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '1.5.48_1',
+  version: '2.2.10_1',
   documentation: null
 });
 

From 037e9b8820159f6ac04bc7715a51f514fa3becaa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 13:57:58 -0400
Subject: [PATCH 428/688] Use npm-mongo@2.2.10_1 in mongo@1.1.12_4.

---
 packages/mongo/.npm/package/npm-shrinkwrap.json | 2 +-
 packages/mongo/package.js                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json
index c5840f7d36..61615e3eb5 100644
--- a/packages/mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/mongo/.npm/package/npm-shrinkwrap.json
@@ -3,7 +3,7 @@
     "mongodb-uri": {
       "version": "0.9.7",
       "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "from": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz"
+      "from": "mongodb-uri@0.9.7"
     }
   }
 }
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index c22cca55f2..263dbb8e89 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12-2-rc.0'
+  version: '1.1.12_4'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@1.5.48-1-rc.0', 'server');
+  api.use('npm-mongo@2.2.10_1', 'server');
   api.use('allow-deny');
 
   api.use([

From 0344f58b06c51b18dbda542c1a3f818420277a08 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 14:34:27 -0400
Subject: [PATCH 429/688] Set mongoOptions.server.reconnectTries = Infinity.

Setting mongoOptions.server.auto_reconnect was removed by #7880 via commit
0ffb9ac8247c53b9ab5658d75139b64771fd4de3, though it seems the Server
options still respect autoReconnect, even in version 2.2 of the driver:
http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html

That said, having inspected the code of the `mongodb` package, I do not
believe this change is really critical, since the default value for
autoReconnect appears to be true.

More importantly, I can't find any support in the code of the `mongodb`
npm package or its dependencies for the claim that setting
mongoOptions.server.reconnectTries to 0 is the same as making it infinite,
so this commit sets it to Infinity.
---
 packages/mongo/mongo_driver.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 5d5ecbdcb8..77eabdc3b6 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -131,14 +131,17 @@ MongoConnection = function (url, options) {
   self._onFailoverHook = new Hook;
 
   var mongoOptions = _.extend({
-      db: { safe: true },
-      // Set reconnectTries to 0 which means keep trying to reconnect forever,
-      // rather than the default of losing the connection permanently after 30
-      // retries (separated by 1000ms).
-      server: { reconnectTries: 0 },
-      replSet: {}
+    db: { safe: true },
+    // http://mongodb.github.io/node-mongodb-native/2.2/api/Server.html
+    server: {
+      // Reconnect on error.
+      autoReconnect: true,
+      // Try to reconnect forever, instead of stopping after 30 tries (the
+      // default), with each attempt separated by 1000ms.
+      reconnectTries: Infinity
     },
-    Mongo._connectionOptions);
+    replSet: {}
+  }, Mongo._connectionOptions);
 
   // Disable the native parser by default, unless specifically enabled
   // in the mongo URL.

From 5d3e2bd884d7c161f3b567d7d37ae27e8ee28be1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 8 Oct 2016 14:58:45 -0400
Subject: [PATCH 430/688] Bump mongo package version to 1.1.12_5.

---
 packages/mongo/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 263dbb8e89..6ee25d9354 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_4'
+  version: '1.1.12_5'
 });
 
 Npm.depends({

From c167309e7f6f74e5fa69eec69c7776b46e13d6aa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 12 Oct 2016 11:41:35 -0400
Subject: [PATCH 431/688] Support `meteor <command>` for any
 dev_bundle/bin/<command> executable.

This will make it easier to use tools like https://yarnpkg.com/ with the
right version of Node, etc.

With this commit, here's all you have to do:

  meteor npm install -g yarnpkg

Then test that it works:

  meteor yarn info

Note that any commands registered by Meteor itself will not be honored.
---
 History.md                           |  3 ++
 tools/cli/dev-bundle-bin-commands.js | 17 ++++-----
 tools/cli/dev-bundle-bin-helpers.js  | 53 ++++++++++++++++++++++++++++
 tools/cli/main.js                    | 22 ++++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index 591b9a54ee..0b145d7b89 100644
--- a/History.md
+++ b/History.md
@@ -17,6 +17,9 @@
   `mongod` processes when the server first starts up.
   https://github.com/meteor/meteor/pull/7668/commits/295d3d5678228f06ee0ab6c0d60139849a0ea192
 
+* The `meteor <command> ...` syntax will now work for any command
+  installed in `dev_bundle/bin`, except for Meteor's own commands.
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/tools/cli/dev-bundle-bin-commands.js b/tools/cli/dev-bundle-bin-commands.js
index 5988abe27d..c9325b9799 100644
--- a/tools/cli/dev-bundle-bin-commands.js
+++ b/tools/cli/dev-bundle-bin-commands.js
@@ -1,11 +1,8 @@
 // Note that this file is required before we install our Babel hooks in
 // ../tool-env/install-babel.js, so we can't use ES2015+ syntax here.
 
+var fs = require("fs");
 var path = require("path");
-var win32Extensions = {
-  node: ".exe",
-  npm: ".cmd"
-};
 
 // The dev_bundle/bin command has to come immediately after the meteor
 // command, as in `meteor npm` or `meteor node`, because we don't want to
@@ -14,22 +11,22 @@ var devBundleBinCommand = process.argv[2];
 var args = process.argv.slice(3);
 
 function getChildProcess() {
-  if (! win32Extensions.hasOwnProperty(devBundleBinCommand)) {
+  if (typeof devBundleBinCommand !== "string") {
     return Promise.resolve(null);
   }
 
   var helpers = require("./dev-bundle-bin-helpers.js");
 
-  if (process.platform === "win32") {
-    devBundleBinCommand += win32Extensions[devBundleBinCommand];
-  }
-
   return Promise.all([
     helpers.getDevBundle(),
     helpers.getEnv()
   ]).then(function (devBundleAndEnv) {
     var devBundleDir = devBundleAndEnv[0];
-    var cmd = path.join(devBundleDir, "bin", devBundleBinCommand);
+    var cmd = helpers.getCommand(devBundleBinCommand, devBundleDir);
+    if (! cmd) {
+      return null;
+    }
+
     var env = devBundleAndEnv[1];
     var child = require("child_process").spawn(cmd, args, {
       stdio: "inherit",
diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 873fa30e60..5babb9cd6b 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -1,12 +1,65 @@
 var fs = require("fs");
 var path = require("path");
 var files = require("../fs/mini-files.js");
+var isWindows = process.platform === "win32";
+var extensions = isWindows ? [".cmd", ".exe"] : [""];
+var hasOwn = Object.prototype.hasOwnProperty;
 
 function getDevBundle() {
   return require("./dev-bundle.js");
 }
 exports.getDevBundle = getDevBundle;
 
+exports.getCommand = function (name, devBundleDir) {
+  var result = null;
+
+  // Strip leading and/or trailing whitespace.
+  name = name.replace(/^\s+|\s+$/g, "");
+
+  if (! isValidCommand(name, devBundleDir)) {
+    return result;
+  }
+
+  extensions.some(function (ext) {
+    var cmd = path.join(devBundleDir, "bin", name + ext);
+    try {
+      if (fs.statSync(cmd).isFile()) {
+        result = cmd;
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
+  });
+
+  return result;
+};
+
+function isValidCommand(name, devBundleDir) {
+  if (name === "node" ||
+      name === "npm") {
+    return true;
+  }
+
+  if (! name || name.charAt(0) === ".") {
+    // Disallow empty commands and commands that start with a period.
+    return false;
+  }
+
+  var meteorCommandsJsonPath =
+    path.join(devBundleDir, "bin", ".meteor-commands.json");
+
+  try {
+    var meteorCommands = require(meteorCommandsJsonPath);
+  } catch (e) {
+    return false;
+  }
+
+  // If `meteor <name>` is already a Meteor command, don't let anything in
+  // dev_bundle/bin override it.
+  return ! hasOwn.call(meteorCommands, name);
+}
+
 exports.getEnv = function (options) {
   var devBundle = options && options.devBundle;
   var devBundlePromise = typeof devBundle === "string"
diff --git a/tools/cli/main.js b/tools/cli/main.js
index e5ab1f1d06..ebfd4a69ee 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -291,6 +291,28 @@ require('./commands-packages-query.js');
 require('./commands-cordova.js');
 require('./commands-aliases.js');
 
+///////////////////////////////////////////////////////////////////////////////
+// Record all the top-level commands as JSON
+///////////////////////////////////////////////////////////////////////////////
+
+export const meteorCommandsJsonPath = files.pathJoin(
+  files.getDevBundle(), "bin", ".meteor-commands.json"
+);
+
+export function dumpMeteorCommands() {
+  const all = Object.create(null);
+  Object.keys(commands).forEach(name => all[name] = true);
+  const json = JSON.stringify(all, null, 2);
+  files.writeFile(meteorCommandsJsonPath, json + "\n");
+  return all;
+}
+
+if (files.inCheckout()) {
+  // If we're running Meteor from a checkout, dump the commands every
+  // time, so that the file remains up to date.
+  dumpMeteorCommands();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Long-form help
 ///////////////////////////////////////////////////////////////////////////////

From aa6806044581284e0b72be0a951f6403d74e7f50 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Wed, 28 Sep 2016 19:54:10 -0400
Subject: [PATCH 432/688] Protect against null return values from
 getDevBundleForRelease. (#7841)

Fixes #7838.
---
 tools/cli/dev-bundle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cli/dev-bundle.js b/tools/cli/dev-bundle.js
index 6e032527fe..31439eb03e 100644
--- a/tools/cli/dev-bundle.js
+++ b/tools/cli/dev-bundle.js
@@ -52,7 +52,9 @@ function getDevBundleDir() {
     return defaultDevBundlePromise;
   }
 
-  return getDevBundleForRelease(release).then(function (devBundleDir) {
+  return Promise.resolve(
+    getDevBundleForRelease(release)
+  ).then(function (devBundleDir) {
     if (devBundleDir) {
       links.makeLink(devBundleDir, devBundleLink);
       return devBundleDir;

From 545493b34a7d4e00ec1418b69a3f17b385d158fa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 13:38:19 -0400
Subject: [PATCH 433/688] Report an error when HTTP request body is incomplete.

When a download aborts prematurely, the status code is often 200 OK, even
though we probably should not proceed with any further processing of the
downloaded information.

This silent failure leads to problems like the dreaded "Error: ENOENT: no
such file or directory, open... os.json" (#7806 and others), which were
hard to diagnose properly because the failure occurred only later, when
extracting a buffer that downloaded incompletely.

The getUrlWithResuming helper should be able to retry after this error is
thrown, which will result in a more helpful warning, even if in the most
common case, i.e. MaxCDN failure, it will never actually succeed.

Note that this change will not help until Meteor 1.4.2 is officially
released and becomes the implementation used to download later releases.

Mitigates #7806.
---
 History.md                  |  5 +++++
 tools/utils/http-helpers.js | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 0b145d7b89..5d63c9dc9d 100644
--- a/History.md
+++ b/History.md
@@ -20,6 +20,11 @@
 * The `meteor <command> ...` syntax will now work for any command
   installed in `dev_bundle/bin`, except for Meteor's own commands.
 
+* Incomplete package downloads will now fail (and be retried several
+  times) instead of silently succeeding, which was the cause of the
+  dreaded `Error: ENOENT: no such file or directory, open... os.json`
+  error. [#7806](https://github.com/meteor/meteor/issues/7806)
+
 ## v1.4.1.2
 
 * Node has been upgraded to version 4.6.0, a recommended security release:
diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index 673da536b7..c8c9b49942 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -299,7 +299,15 @@ _.extend(exports, {
     // require it until we definitely need it.
     Console.debug("Doing HTTP request: ", options.method || 'GET', options.url);
     var request = require('request');
-    var req = request(options, callback);
+    var req = request(options, function (error, response, body) {
+      const contentLength = Number(response.headers["content-length"]);
+      if (contentLength > 0 && body.length < contentLength) {
+        error = new Error(
+          "Expected " + contentLength + " bytes in request body " +
+            "but received only " + body.length);
+      }
+      return callback.call(this, error, response, body);
+    });
 
     if (_.isFunction(onRequest)) {
       onRequest(req);

From 47d3546b3ac3c85840727885d0c37fd215054caf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Oct 2016 15:12:02 -0400
Subject: [PATCH 434/688] Fix problems in request callback that broke
 getUrlWithResuming tests.

---
 tools/utils/http-helpers.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index c8c9b49942..2dda4548e6 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -37,6 +37,14 @@ class ConcatStream extends Writable {
 
     return this.chunks[0];
   }
+
+  end(force = false) {
+    // Override the Writable#end method to ignore any .end() calls for
+    // this stream, since we likely want to resume the download later.
+    if (force === true) {
+      super.end();
+    }
+  }
 }
 
 // Helper that tracks bytes written to a writable
@@ -300,11 +308,13 @@ _.extend(exports, {
     Console.debug("Doing HTTP request: ", options.method || 'GET', options.url);
     var request = require('request');
     var req = request(options, function (error, response, body) {
-      const contentLength = Number(response.headers["content-length"]);
-      if (contentLength > 0 && body.length < contentLength) {
-        error = new Error(
-          "Expected " + contentLength + " bytes in request body " +
-            "but received only " + body.length);
+      if (! error && response && body) {
+        const contentLength = Number(response.headers["content-length"]);
+        if (contentLength > 0 && body.length < contentLength) {
+          error = new Error(
+            "Expected " + contentLength + " bytes in request body " +
+              "but received only " + body.length);
+        }
       }
       return callback.call(this, error, response, body);
     });
@@ -478,7 +488,6 @@ _.extend(exports, {
       }
     }
 
-
     const result = attempt().await();
     const response = result.response
     if (response.statusCode >= 400 && response.statusCode < 600) {
@@ -486,6 +495,9 @@ _.extend(exports, {
       throw Error(`Could not get ${href}; server returned [${response.statusCode}]`);
     }
 
+    // Really end the stream if we got this far.
+    outputStream.end(true);
+
     return outputStream.getBuffer();
   }
 });

From f9b0f2f60d4a854d54f168f58e7f9d9c83dcaf7a Mon Sep 17 00:00:00 2001
From: Christian Klaussner <developer@klaussner.me>
Date: Tue, 18 Oct 2016 22:31:45 +0200
Subject: [PATCH 435/688] Update links to MongoDB driver docs

---
 packages/mongo/collection.js         | 4 ++--
 packages/mongo/connection_options.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js
index 68192fefc5..0b3200508a 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection.js
@@ -704,7 +704,7 @@ Mongo.Collection.prototype._createCappedCollection = function (byteSize, maxDocu
 };
 
 /**
- * @summary Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/1.4/api-generated/collection.html) object corresponding to this collection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+ * @summary Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html) object corresponding to this collection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
  * @locus Server
  */
 Mongo.Collection.prototype.rawCollection = function () {
@@ -716,7 +716,7 @@ Mongo.Collection.prototype.rawCollection = function () {
 };
 
 /**
- * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/1.4/api-generated/db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+ * @summary Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html) object corresponding to this collection's database connection from the [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
  * @locus Server
  */
 Mongo.Collection.prototype.rawDatabase = function () {
diff --git a/packages/mongo/connection_options.js b/packages/mongo/connection_options.js
index c061513e0f..a5e746c4ca 100644
--- a/packages/mongo/connection_options.js
+++ b/packages/mongo/connection_options.js
@@ -1,6 +1,6 @@
 /**
  * @summary Allows for user specified connection options
- * @example http://mongodb.github.io/node-mongodb-native/2.1/reference/connecting/connection-settings/
+ * @example http://mongodb.github.io/node-mongodb-native/2.2/reference/connecting/connection-settings/
  * @locus Server
  * @param {Object} options User specified Mongo connection options
  */

From dc91fee73feac0ee72218a44c2cdf0df1b1c195e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 12:21:55 -0400
Subject: [PATCH 436/688] Remove version constraints from
 packages/accounts-base/package.js.

Version constraints are unnecessary when publishing a release, and tend to
complicate things when the constraints are out of date with packages that
are updated by the release.
---
 packages/accounts-base/package.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index e162820f3e..d6c88e221b 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -4,36 +4,36 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
-  api.use('underscore@1.0.9', ['client', 'server']);
-  api.use('ecmascript@0.5.7', ['client', 'server']);
-  api.use('ddp-rate-limiter@1.0.5');
-  api.use('localstorage@1.0.11', 'client');
-  api.use('tracker@1.1.0', 'client');
-  api.use('check@1.2.3', 'server');
-  api.use('random@1.0.10', ['client', 'server']);
-  api.use('ejson@1.0.12', 'server');
-  api.use('callback-hook@1.0.9', ['client', 'server']);
+  api.use('underscore', ['client', 'server']);
+  api.use('ecmascript', ['client', 'server']);
+  api.use('ddp-rate-limiter');
+  api.use('localstorage', 'client');
+  api.use('tracker', 'client');
+  api.use('check', 'server');
+  api.use('random', ['client', 'server']);
+  api.use('ejson', 'server');
+  api.use('callback-hook', ['client', 'server']);
 
   // use unordered to work around a circular dependency
   // (service-configuration needs Accounts.connection)
-  api.use('service-configuration@1.0.10', ['client', 'server'], { unordered: true });
+  api.use('service-configuration', ['client', 'server'], { unordered: true });
 
   // needed for getting the currently logged-in user
-  api.use('ddp@1.2.5', ['client', 'server']);
+  api.use('ddp', ['client', 'server']);
 
   // need this because of the Meteor.users collection but in the future
   // we'd probably want to abstract this away
-  api.use('mongo@1.1.10', ['client', 'server']);
+  api.use('mongo', ['client', 'server']);
 
   // If the 'blaze' package is loaded, we'll define some helpers like
   // {{currentUser}}.  If not, no biggie.
-  api.use('blaze@2.1.8', 'client', {weak: true});
+  api.use('blaze', 'client', {weak: true});
 
   // Allow us to detect 'autopublish', and publish some Meteor.users fields if
   // it's loaded.
-  api.use('autopublish@1.0.7', 'server', {weak: true});
+  api.use('autopublish', 'server', {weak: true});
 
-  api.use('oauth-encryption@1.2.0', 'server', {weak: true});
+  api.use('oauth-encryption', 'server', {weak: true});
 
   // Though this "Accounts" symbol is the only official Package export for
   // the accounts-base package, modules that import accounts-base will

From c6975d8eb7acb75123cb3be517b97dc7a7c7c537 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 12:24:14 -0400
Subject: [PATCH 437/688] Upgrade `mongodb` npm package to version 2.2.11.

---
 History.md                                    |  2 ++
 .../.npm/package/npm-shrinkwrap.json          | 22 +++++++++----------
 packages/npm-mongo/package.js                 |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/History.md b/History.md
index 5d63c9dc9d..557d193240 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,8 @@
 * Node has been updated to version 4.6.1:
   https://nodejs.org/en/blog/release/v4.6.1/
 
+* The `mongodb` npm package has been upgraded to version 2.2.11.
+
 * The `fibers` npm package has been upgraded to version 1.0.15.
 
 * Running Meteor with a different `--port` will now automatically
diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
index 50563e4ea7..4493b91832 100644
--- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
+++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "bson": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.4.tgz",
-      "from": "bson@>=0.5.4 <0.6.0"
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.6.tgz",
+      "from": "bson@>=0.5.6 <0.6.0"
     },
     "buffer-shims": {
       "version": "1.0.0",
@@ -21,8 +21,8 @@
       "from": "es6-promise@3.2.1"
     },
     "inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "from": "inherits@>=2.0.1 <2.1.0"
     },
     "isarray": {
@@ -31,14 +31,14 @@
       "from": "isarray@>=1.0.0 <1.1.0"
     },
     "mongodb": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.8.tgz",
-      "from": "mongodb@2.2.8"
+      "version": "2.2.11",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.11.tgz",
+      "from": "mongodb@2.2.11"
     },
     "mongodb-core": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.10.tgz",
-      "from": "mongodb-core@2.0.10"
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.13.tgz",
+      "from": "mongodb-core@2.0.13"
     },
     "process-nextick-args": {
       "version": "1.0.7",
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 9bb7b46691..a7c08abadb 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -8,7 +8,7 @@ Package.describe({
 });
 
 Npm.depends({
-  mongodb: "2.2.8"
+  mongodb: "2.2.11"
 });
 
 Package.onUse(function (api) {

From 247fa7b8ae2e4a6b50de146c0da061c5e5d157cc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 11:28:23 -0400
Subject: [PATCH 438/688] Bump package versions for 1.4.1.3-rc.1 release.

---
 packages/accounts-base/package.js              | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/mongo/package.js                      | 4 ++--
 packages/npm-mongo/package.js                  | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index d6c88e221b..418053c8ae 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.11"
+  version: "1.2.13-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 8921af018b..1b837bc9b4 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-3-rc.0'
+  version: '1.4.1-3-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 6ee25d9354..1fbc6b6a77 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.12_5'
+  version: '1.1.13-rc.1'
 });
 
 Npm.depends({
@@ -21,7 +21,7 @@ Npm.strip({
 });
 
 Package.onUse(function (api) {
-  api.use('npm-mongo@2.2.10_1', 'server');
+  api.use('npm-mongo', 'server');
   api.use('allow-deny');
 
   api.use([
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index a7c08abadb..dd1fef9e0b 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.10_1',
+  version: '2.2.11-rc.1',
   documentation: null
 });
 
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 78fc0eb719..bc1105d8e3 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.1.3-rc.0",
+ "version": "1.4.1.3-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e50d9167096f121fb51aa8dc68a4edd12f67686f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 18:47:40 -0400
Subject: [PATCH 439/688] Don't swallow JSON.parse SyntaxErrors in
 optimisticReadJsonOrNull.

---
 tools/fs/optimistic.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index e525657b0e..57de8afa86 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -148,12 +148,12 @@ export const optimisticHashOrNull = makeOptimistic("hashOrNull", (...args) => {
 export const optimisticReadJsonOrNull =
 makeOptimistic("readJsonOrNull", (...args) => {
   try {
-    return JSON.parse(optimisticReadFile(...args));
+    var buffer = optimisticReadFile(...args);
   } catch (e) {
-    if (! (e instanceof SyntaxError ||
-           e.code === "ENOENT")) {
+    if (e.code !== "ENOENT") {
       throw e;
     }
+    return null;
   }
-  return null;
+  return JSON.parse(buffer);
 });

From 42a9d37326ae49752e3f2cbc36b51764626b74a5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Oct 2016 18:48:32 -0400
Subject: [PATCH 440/688] Tolerate missing files in ImportScanner#_readModule.

---
 tools/isobuild/import-scanner.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 2fd905aad6..02e64d2a9f 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -581,7 +581,13 @@ export default class ImportScanner {
   }
 
   _readModule(absPath) {
-    const info = this._readFile(absPath);
+    try {
+      var info = this._readFile(absPath);
+    } catch (e) {
+      if (e.code !== "ENOENT") throw e;
+      return null;
+    }
+
     const dataString = info.dataString;
 
     // Same logic/comment as stripBOM in node/lib/module.js:

From 5df8f89f7b736661755fe34ef584457a1d781838 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 15:32:28 -0400
Subject: [PATCH 441/688] Warn about babel-runtime helpers not provided by the
 Meteor package.

---
 tools/isobuild/compiler-plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 24d859d06c..635db78b76 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1202,7 +1202,7 @@ export class PackageSourceBatch {
           return;
         }
 
-        if (packageDir === "babel-runtime") {
+        if (checkBabelRuntimeHelper(id)) {
           // Don't print warnings for babel-runtime/helpers/* modules,
           // since we provide most of those.
           return;

From 48a2ccbde7782e6b985a7b37b2064ce3c0963a2b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 18:58:42 -0400
Subject: [PATCH 442/688] Dirty optimistic functions when node_modules
 directories change.

This is a bit different from the previous strategy of invalidating
optimistic functions for specific npm package names.

Now, whenever we make changes to the contents of a specific node_modules
directory, or whenever the developer independently modifies an app's
node_modules directory, all optimistic results derived from paths
contained within that node_modules directory will be marked as dirty, and
thus may need to be recomputed.

This strategy prioritizes starting fewer watchers (just one per
node_modules directory) while still allowing npm packages to be added or
removed while the app is running:

  https://github.com/meteor/meteor/pull/7668#issuecomment-255120373

The drawback is that changes within subdirectories of node_modules will
not be detected until the server is fully restarted, but that seems like
an acceptable tradeoff, since npm packages change much less often than
application code.
---
 tools/fs/optimistic.js       | 98 +++++++++++++++++++-----------------
 tools/isobuild/meteor-npm.js | 22 ++++----
 2 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 57de8afa86..ba5f75b037 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -17,13 +17,10 @@ import {
 const ENABLED = ! process.env.METEOR_DISABLE_OPTIMISTIC_CACHING;
 
 function makeOptimistic(name, fn) {
-  const wrapper = wrap(function (...args) {
-    const packageName = getNpmPackageName(args[0]);
-    if (packageName) {
-      dependOnNpmPackage(packageName);
-    }
+  const wrapper = wrap(ENABLED ? function (...args) {
+    maybeDependOnNodeModules(args[0]);
     return fn.apply(this, args);
-  }, {
+  } : fn, {
     makeCacheKey(...args) {
       if (! ENABLED) {
         // Cache nothing when the optimistic caching system is disabled.
@@ -54,18 +51,20 @@ function makeOptimistic(name, fn) {
 
     subscribe(...args) {
       const path = args[0];
-      assert.ok(pathIsAbsolute(path));
 
-      // Only start watchers for files not in node_modules directories.
-      // This means caching the result until the server is restarted, or
-      // until we call dirtyNpmPackageBy{Path,Name} explicitly, but that's
-      // better than wasting thousands of watchers on rarely-changing
-      // node_modules files.
-      if (getNpmPackageName(path)) {
+      // Starting a watcher for every single file contained within a
+      // node_modules directory would be prohibitively expensive, so
+      // instead we rely on dependOnNodeModules to tell us when files in
+      // node_modules directories might have changed.
+      if (path.split(pathSep).indexOf("node_modules") >= 0) {
         return;
       }
 
-      var watcher = watch(path, () => wrapper.dirty(...args));
+      assert.ok(pathIsAbsolute(path));
+
+      let watcher = watch(path, () => {
+        wrapper.dirty(...args);
+      });
 
       return () => {
         if (watcher) {
@@ -79,52 +78,61 @@ function makeOptimistic(name, fn) {
   return Profile("optimistic " + name, wrapper);
 }
 
-// Return the name of the subdirectory just after the last node_modules
-// directory in the given path, if possible; else return undefined.
-function getNpmPackageName(path) {
-  if (typeof path === "string") {
-    const parts = path.split(pathSep);
+function maybeDependOnNodeModules(path) {
+  if (typeof path !== "string") {
+    return;
+  }
 
-    // In case the path ends with node_modules, look for the previous
-    // node_modules directory.
-    const lastAcceptableIndex = parts.length - 2;
-    const index = parts.lastIndexOf("node_modules", lastAcceptableIndex);
+  const parts = path.split(pathSep);
 
-    if (index >= 0) {
-      return parts[index + 1] || void 0;
+  while (true) {
+    const index = parts.lastIndexOf("node_modules");
+    if (index < 0) {
+      return;
     }
+
+    parts.length = index + 1;
+    dependOnNodeModules(parts.join(pathSep));
+    assert.strictEqual(parts.pop(), "node_modules");
   }
 }
 
-// See comment in dependOnNpmPackage.
 let npmDepCount = 0;
 
 // Called by any optimistic function that receives a */node_modules/* path
 // as its first argument, so that we can later bulk-invalidate the results
-// of those calls when/if the package (or, more precisely, any package of
-// the same name) changes.
-const dependOnNpmPackage = wrap(packageName => {
+// of those calls if the contents of the node_modules directory change.
+// Note that this strategy will not detect changes within subdirectories
+// of this node_modules directory, but that's ok because the use case we
+// care about is adding or removing npm packages.
+const dependOnNodeModules = wrap(nodeModulesDir => {
+  assert(pathIsAbsolute(nodeModulesDir));
+  assert(nodeModulesDir.endsWith(pathSep + "node_modules"));
+
   // Always return something different to prevent optimism from
   // second-guessing the dirtiness of this function.
   return ++npmDepCount;
+
+}, {
+  subscribe(nodeModulesDir) {
+    let watcher = watch(
+      nodeModulesDir,
+      () => dependOnNodeModules.dirty(nodeModulesDir),
+    );
+
+    return function () {
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+    };
+  }
 });
 
-// Invalidate all optimistic results derived from paths involving npm
-// packages with the given packageName. If there are multiple copies of
-// the package installed, they all get invalidated, because that's a small
-// price to pay for the comfort of not having to keep the copies straight
-// as they get copied around, deleted, et cetera.
-export function dirtyNpmPackageByName(packageName) {
-  dependOnNpmPackage.dirty(packageName);
-}
-
-// Invalidate all optimistic results derived from paths involving an npm
-// package whose name equals getNpmPackageName(path).
-export function dirtyNpmPackageByPath(path) {
-  const packageName = getNpmPackageName(path);
-  if (packageName) {
-    dirtyNpmPackageByName(packageName);
-  }
+// Invalidate all optimistic results derived from paths involving the
+// given node_modules directory.
+export function dirtyNodeModulesDirectory(nodeModulesDir) {
+  dependOnNodeModules.dirty(nodeModulesDir);
 }
 
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 2e97d6217b..8c971680ab 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -23,8 +23,7 @@ import {
 } from "../utils/colon-converter.js";
 
 import {
-  dirtyNpmPackageByPath,
-  dirtyNpmPackageByName,
+  dirtyNodeModulesDirectory,
   optimisticLStat,
   optimisticStatOrNull,
   optimisticReadJsonOrNull,
@@ -338,11 +337,11 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) {
     return false;
   }
 
+  dirtyNodeModulesDirectory(nodeModulesDir);
+
   // If the `npm rebuild` command succeeded, overwrite the original
   // package directories with the rebuilt package directories.
   dirsToRebuild.forEach(function (pkgPath) {
-    dirtyNpmPackageByPath(pkgPath);
-
     const actualNodeModulesDir =
       files.pathJoin(pkgPath, "node_modules");
 
@@ -668,22 +667,27 @@ var createFreshNpmDirectory = function (packageName, newPackageNpmDir,
 };
 
 // Shared code for updateExistingNpmDirectory and createFreshNpmDirectory.
-var completeNpmDirectory = function (packageName, newPackageNpmDir,
-                                     packageNpmDir, npmDependencies) {
+function completeNpmDirectory(
+  packageName,
+  newPackageNpmDir,
+  packageNpmDir,
+  npmDependencies,
+) {
   // Create a shrinkwrap file.
   shrinkwrap(newPackageNpmDir);
 
   // And stow a copy of npm-shrinkwrap too.
   files.copyFile(
     files.pathJoin(newPackageNpmDir, 'npm-shrinkwrap.json'),
-    files.pathJoin(newPackageNpmDir, 'node_modules', '.npm-shrinkwrap.json'));
+    files.pathJoin(newPackageNpmDir, 'node_modules', '.npm-shrinkwrap.json')
+  );
 
   createReadme(newPackageNpmDir);
   createNodeVersion(newPackageNpmDir);
   files.renameDirAlmostAtomically(newPackageNpmDir, packageNpmDir);
 
-  Object.keys(npmDependencies).forEach(dirtyNpmPackageByName);
-};
+  dirtyNodeModulesDirectory(files.pathJoin(packageNpmDir, "node_modules"));
+}
 
 var createReadme = function (newPackageNpmDir) {
   // This file gets checked in to version control by users, so resist the

From f419899ce779155e3f383e0b19843d81a278b272 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 20:15:28 -0400
Subject: [PATCH 443/688] Bump package versions for the official 1.4.1.3
 release.

---
 packages/accounts-base/package.js          | 2 +-
 packages/meteor-tool/package.js            | 2 +-
 packages/mongo/package.js                  | 2 +-
 packages/npm-mongo/package.js              | 2 +-
 scripts/admin/meteor-release-official.json | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 418053c8ae..07b53618a7 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.13-rc.1"
+  version: "1.2.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 1b837bc9b4..58ff1e3f88 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.1-3-rc.1'
+  version: '1.4.1_3'
 });
 
 Package.includeTool();
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 1fbc6b6a77..6fac92bf19 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.13-rc.1'
+  version: '1.1.13'
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index dd1fef9e0b..bc70c84ffd 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.11-rc.1',
+  version: '2.2.11_1',
   documentation: null
 });
 
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 34188e3837..f44dc66103 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,8 +1,8 @@
 {
   "track": "METEOR",
-  "version": "1.4.1.2",
+  "version": "1.4.1.3",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution",
-  "patchFrom": ["1.4.1.1"]
+  "patchFrom": ["1.4.1.2"]
 }

From 35da19ab4e2c3ca297c7e6aae55a68fc079900a8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 21:08:01 -0400
Subject: [PATCH 444/688] Avoid "The handle(...) returned by watching..."
 errors on Linux.

It's a shame that Pathwatcher issues this warning using console.error,
without taking any verbosity options into account:
https://github.com/atom/node-pathwatcher/blob/7ef76e5dfd/src/main.coffee#L53

Fortunately, I believe I've identified the underlying reason why this
happens, which may help resolve the following issue:
https://github.com/atom/node-pathwatcher/issues/98

If all goes well, I'll submit an upstream pull request.

I've also reinstated an old file watching test that I mistakenly removed
when I attempted to switch to chokidar instead of pathwatcher.
---
 tools/fs/safe-watcher.js | 44 ++++++++++++++++++++++++++++------------
 tools/tests/old.js       | 16 +++++++++++++++
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index 16d91705e3..d3df4b3c3a 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -1,6 +1,7 @@
 import * as watchLibrary from "pathwatcher";
 import { Profile } from "../tool-env/profile.js";
 import {
+  statOrNull,
   pathDirname,
   convertToOSPath,
   convertToStandardPath,
@@ -28,6 +29,11 @@ const WATCHER_CLEANUP_DELAY_MS = 30000;
 
 const watchers = Object.create(null);
 
+// Pathwatcher complains (using console.error, ugh) if you try to watch
+// two files with the same stat.ino number but different paths, so we have
+// to deduplicate files by ino.
+const watchersByIno = new Map;
+
 function acquireWatcher(absPath, callback) {
   const entry = watchers[absPath] || (
     watchers[absPath] = startNewWatcher(absPath));
@@ -45,6 +51,22 @@ function acquireWatcher(absPath, callback) {
 }
 
 function startNewWatcher(absPath) {
+  const stat = statOrNull(absPath);
+  const ino = stat && stat.ino;
+  if (ino > 0 && watchersByIno.has(ino)) {
+    return watchersByIno.get(ino);
+  }
+
+  function safeUnwatch() {
+    if (watcher) {
+      watcher.close();
+      watcher = null;
+      if (ino > 0) {
+        watchersByIno.delete(ino);
+      }
+    }
+  }
+
   let lastWatcherEventTime = +new Date;
   const callbacks = new Set;
   let watcherCleanupTimer = null;
@@ -53,15 +75,12 @@ function startNewWatcher(absPath) {
 
   function fire(event) {
     if (event !== "change") {
-      if (watcher) {
-        // When we receive a "delete" or "rename" event, the watcher is
-        // probably not going to generate any more notifications for this
-        // file, so we close and nullify the watcher to ensure that
-        // entry.rewatch() will attempt to reestablish the watcher the
-        // next time we call safeWatcher.watch.
-        watcher.close();
-        watcher = null;
-      }
+      // When we receive a "delete" or "rename" event, the watcher is
+      // probably not going to generate any more notifications for this
+      // file, so we close and nullify the watcher to ensure that
+      // entry.rewatch() will attempt to reestablish the watcher the next
+      // time we call safeWatcher.watch.
+      safeUnwatch();
 
       // Make sure we don't throttle the watchFile callback after a
       // "delete" or "rename" event, since it is now our only reliable
@@ -166,15 +185,14 @@ function startNewWatcher(absPath) {
         watcherCleanupTimer = null;
       }
 
-      if (watcher) {
-        watcher.close();
-        watcher = null;
-      }
+      safeUnwatch();
 
       unwatchFile(absPath, watchFileWrapper);
     }
   };
 
+  watchersByIno.set(ino, entry);
+
   return entry;
 }
 
diff --git a/tools/tests/old.js b/tools/tests/old.js
index 5abe06f96c..670c0d7436 100644
--- a/tools/tests/old.js
+++ b/tools/tests/old.js
@@ -51,6 +51,22 @@ var runOldTest = function (filename, extraEnv) {
 // will take another look at them later, but it is not worth that much more time
 // before 0.9.0.
 //
+selftest.define("watch", ["slow"], function () {
+  var runFuture = runOldTest.future();
+  var futures = [
+    // Run with pathwatcher (if possible)
+    runFuture('test-watch.js'),
+    // Run with fs.watchFile fallback
+    runFuture('test-watch.js', {
+      METEOR_WATCH_FORCE_POLLING: 1
+    })
+  ];
+  Future.wait(futures);
+  // Throw if any threw.
+  _.each(futures, function (f) {
+    f.get();
+  });
+});
 
 selftest.define("bundler-assets", ["checkout"], function () {
   runOldTest('test-bundler-assets.js');

From 0d3c74d11c84794338ac61bb323771b051378c7f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 21:39:32 -0400
Subject: [PATCH 445/688] Only call watchersByIno.set(ino, entry) if ino > 0.

---
 tools/fs/safe-watcher.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/fs/safe-watcher.js b/tools/fs/safe-watcher.js
index d3df4b3c3a..7bd6e8a3d4 100644
--- a/tools/fs/safe-watcher.js
+++ b/tools/fs/safe-watcher.js
@@ -191,7 +191,9 @@ function startNewWatcher(absPath) {
     }
   };
 
-  watchersByIno.set(ino, entry);
+  if (ino > 0) {
+    watchersByIno.set(ino, entry);
+  }
 
   return entry;
 }

From e2be0bbc8a25d6ed571dd9572ac2766d050bf3f9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 22:15:11 -0400
Subject: [PATCH 446/688] Upgrade the `npm` npm package to version 3.10.9.

---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index ad51364ed5..5bc6a3982d 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,8 @@
   much more quickly, especially if you have many `node_modules` files.
   See https://github.com/meteor/meteor/pull/7668 for more details.
 
+* `npm` has been upgraded to version 3.10.9.
+
 * The `cordova-lib` npm package has been updated to 6.3.1, along with
   cordova-android (5.2.2) and cordova-ios (4.2.1), and various plugins.
 
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 4eee6f85d1..ee5e35a744 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -7,7 +7,7 @@ UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
 NODE_VERSION=4.6.1
-NPM_VERSION=3.10.8
+NPM_VERSION=3.10.9
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 603e4739cd..c56c79b768 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.8",
+    npm: "3.10.9",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.13.0",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 20da753f62..af4c09369c 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -3,7 +3,7 @@
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.6.1"
-$NPM_VERSION = "3.10.8"
+$NPM_VERSION = "3.10.9"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists

From 4ecfaad4b15ec2974008507a47e8a8f8fced861c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 22:05:05 -0400
Subject: [PATCH 447/688] Bump $BUNDLE_VERSION to 4.6.1 before rebuilding dev
 bundle.

For once, this version coincides exactly with the Node version!
---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index dc1bb2e810..dc0a2b1afc 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.6.0
+BUNDLE_VERSION=4.6.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From b938e089e69f223697aec26a0c21a26a345c9adc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Oct 2016 21:41:21 -0400
Subject: [PATCH 448/688] Bump package versions for 1.4.2-rc.2 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 105 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 07b53618a7..0807aaef24 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.13"
+  version: "1.2.14-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index f109dc8681..461b0ca2f9 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 860e044354..f51fb41338 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 571e77ca5b..2d6b0a115f 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 15b172e1b5..076b96fe8e 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 9854006ac3..858cca3064 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 716c9ae58b..9b9b99d7d2 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-rc.1"
+  version: "1.1.14-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index eebb8af475..c39745b02e 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-rc.1"
+  version: "1.3.1-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 2ef2b479ac..67a9142d84 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-rc.1"
+  version: "1.1.12-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 97e0c09402..5186028d77 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-rc.1"
+  version: "1.1.13-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index b48305924b..bfb8438ff7 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 501c1271b8..0cd5db5e0d 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-rc.1"
+  version: "1.0.12-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index bac8bad071..70a0e21924 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-rc.1'
+  version: '1.3.12-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 8f99de5e88..d22eb8630b 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-rc.1'
+  version: '6.13.0-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 4fa3cbf51b..bb1bc9a05d 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-rc.1',
+  version: '0.1.12-rc.2',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 53a20ad9a7..4548d124f8 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-rc.1'
+  version: '1.0.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 8241ce1160..2e944f84f2 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-rc.1'
+  version: '1.0.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 50f417d756..fff1fe41d6 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-rc.1'
+  version: '1.0.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index 61ef99ae1b..ab0e5e397b 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 5ee984e0e5..7c6ce008c6 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-rc.1"
+  version: "1.0.12-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 58a6ac04c7..4882888677 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-rc.1"
+  version: "1.0.12-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 6033372619..a70a141e5c 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-rc.1',
+  version: '1.1.8-rc.2',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 46832b2660..f9c87fc283 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-rc.1'
+  version: '1.0.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index b60540e66a..83af2c52f2 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-rc.1'
+  version: '1.2.4-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index ff9dd72adb..9d75a26f8b 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index de070c13c0..7ee8137281 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-rc.1"
+  version: "1.0.8-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c4a403368f..a80bc74c9a 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-rc.1"
+  version: "1.11.1-2-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index f6333b39ed..81aacfc815 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-rc.1"
+  version: "1.1.1-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 7e9853684b..77beb28e2c 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-rc.1',
+  version: '1.7.0-rc.2',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 5ac0e1f7ae..87872d2ca1 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-rc.1',
+  version: '1.3.2-rc.2',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index c36ccb91be..91e974b445 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-rc.1',
+  version: '1.2.7-rc.2',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index e4db8017df..9c6db5f677 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-rc.1',
+  version: '1.0.6-rc.2',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 3339ce0021..5f59529af0 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-rc.1',
+  version: '1.3.11-rc.2',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index c4872d3326..d0687b886a 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-rc.1',
+  version: '1.0.7-rc.2',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index a0801a571d..ef3b8b1fef 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-rc.1",
+  version: "0.3.15-rc.2",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 15f9eb635f..d70ae82d91 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-rc.1',
+  version: '0.5.9-rc.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 1768cb85d5..69c9d4d2a5 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-rc.1'
+  version: '1.0.13-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index 1ccbe0d2dc..a08c273773 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-rc.1"
+  version: "1.1.18-rc.2"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 8d6e7f1286..391f2bbc70 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-rc.1",
+  version: "4.6.15-rc.2",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 4aa548a786..b20a0f9984 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-rc.1"
+  version: "1.2.10-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 0d6f80812d..16ae442bcd 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-rc.1'
+  version: '1.0.9-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index b1617fdc3e..401d0b5531 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-rc.1'
+  version: '1.0.13-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 3c404980d0..f594861649 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-rc.1",
+  version: "1.0.13-rc.2",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 93518eb6a7..0fff917a6c 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-rc.1'
+  version: '1.0.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 7e69c1fef4..8c0fcda8f3 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-rc.1"
+  version: "1.1.9-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index d2614655ed..f2c5f7a367 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-rc.1"
+  version: "1.1.15-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 3adbb1e555..6c5ef61ba8 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-rc.1'
+  version: '1.2.10-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 391fde4b04..ba61ce7ac3 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-rc.1'
+  version: '1.0.9-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index d40c110a6e..b65b8f4597 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-rc.1'
+  version: '1.11.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 1727773781..93e88edb2a 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-rc.1',
+  version: '1.1.7-rc.2',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index 8e5dda1554..bb9818b12a 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-rc.1"
+  version: "1.0.10-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 260e82244b..115faf0765 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-rc.1'
+  version: '1.1.0-rc.2'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 4ed0829355..5daf17549a 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-rc.1',
+  version: '2.7.6-rc.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 71eb8481c3..fcaad84d8a 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-rc.1"
+  version: "1.0.12-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 58a782b553..220caa62a8 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-rc.1'
+  version: '1.1.16-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 0365dfff9b..f2d905766d 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-rc.1'
+  version: '2.0.7-rc.2'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 79790aebba..69fdc9d88f 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index 5db15620ad..e2c578e659 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-rc.1"
+  version: "1.6.5-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 0126925db9..f80b67a088 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-rc.1"
+  version: "1.1.10-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index c39e9fa33a..042e251ce4 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-rc.1'
+  version: '1.4.2-rc.2'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 12335158a7..4d351cf781 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.6.0-rc.1'
+  version: '1.6.0-rc.2'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 9fae27a120..31de5188e6 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-rc.1"
+  version: "1.2.15-rc.2"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index d121d6a1f7..1dcf7273fb 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-rc.1"
+  version: "1.2.15-rc.2"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 6c8f5f2a46..89945954e8 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-rc.1'
+  version: '1.0.18-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 8d6f22d828..0a63caf5c0 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-rc.1"
+  version: "1.0.13-rc.2"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index f8109ac89d..2ba8d41f41 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-rc.1",
+  version: "0.7.7-rc.2",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index a61319a454..112a3431c5 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-rc.1",
+  version: "0.7.7-rc.2",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 944d2402a6..226c6141d5 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-rc.1',
+  version: '1.0.6-rc.2',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 6fac92bf19..16c471bc73 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.13'
+  version: '1.1.14-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 418401812a..393f3d3071 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-rc.1",
+  version: "0.9.2-rc.2",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index bc70c84ffd..83aaf2b551 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.11_1',
+  version: '2.2.11-2-rc.2',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 14ef2c1434..1db2c208cc 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-rc.1'
+  version: '1.2.1-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 2c0e3a1750..d04c28c24a 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-rc.1"
+  version: "1.1.12-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 3cba6e3a2f..65fab9a84e 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-rc.1"
+  version: "1.1.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index 6cb003f87d..28cddf4f5c 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-rc.1"
+  version: "1.1.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 625acf1a6a..b33f3aca53 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-rc.1"
+  version: "1.0.14-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index f2bc2f8ad5..2e6f8d1b55 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-rc.1',
+  version: '1.0.9-rc.2',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index b843e9bf40..e1cb117693 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-rc.1"
+  version: "3.0.10-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 81450f5ffb..bcac6f058f 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 4d4766a672..cf654a050f 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-rc.1",
+  version: "0.8.8-rc.2",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index fee1753c2b..48ded85b31 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-rc.1',
+  version: '1.0.6-rc.2',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 14a51d065d..48cae25d40 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-rc.1'
+  version: '1.0.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index 9820d0883c..1e559f3ae3 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-rc.1'
+  version: '1.0.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 100e073520..6911efb7ca 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-rc.1'
+  version: '1.1.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 23dd0f08d1..f0ab768463 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-rc.1'
+  version: '1.0.9-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index ab9f1d900b..7f9938554c 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-rc.1'
+  version: '1.0.12-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 496c918586..4338dbefb2 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index e057a12608..85c0671930 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-rc.1'
+  version: '1.1.7-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index f56b5493b3..9ea691890a 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-rc.1',
+  version: '1.0.9-rc.2',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index d11022098b..0a3ba3e3c0 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-rc.1"
+  version: "1.0.10-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index b49eb6db2b..77f5220a5b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-rc.1',
+  version: '1.2.1-rc.2',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 2c45659fde..050b6ccb53 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-rc.1"
+  version: "2.513.6-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 3290ea780d..fb60bf4e0a 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-rc.1'
+  version: '1.0.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index ecdd82c271..ca0adc6d01 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-rc.1',
+  version: '1.0.13-rc.2',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index a3ab04dc27..6639225f46 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-rc.1'
+  version: '1.0.13-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index 3762c50348..cde478c00d 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-rc.1'
+  version: '1.0.11-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 053a18a5e5..b197697346 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-rc.1'
+  version: '1.0.12-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 936fb3bfa8..1252a8c70d 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-rc.1'
+  version: '1.1.1-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index cbb6dceef9..78ee79aa64 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-rc.1'
+  version: '1.1.13-rc.2'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 161521e741..5f292ce0ce 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-rc.1'
+  version: '1.0.10-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 6dd4f35730..cb1b32cfa1 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-rc.1"
+  version: "1.0.11-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 7961400cc9..92c4928771 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-rc.1'
+  version: '1.3.12-rc.2'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 9ae35dc3c5..f13129c3c4 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-rc.1'
+  version: '1.1.9-rc.2'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index e581429603..04cc6ce880 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-rc.1'
+  version: '2.5.15-rc.2'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index df0b2237e3..c604006a1e 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-rc.1",
+ "version": "1.4.2-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 0492b2133371ab609269dc4bf61fd6c58f8632e8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 22 Oct 2016 11:59:45 -0400
Subject: [PATCH 449/688] Attempt to fix hot-code-push test by adding
 additional timeout.

---
 tools/tests/hot-code-push.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/tests/hot-code-push.js b/tools/tests/hot-code-push.js
index 1a6f192571..6b587f7fd0 100644
--- a/tools/tests/hot-code-push.js
+++ b/tools/tests/hot-code-push.js
@@ -223,6 +223,7 @@ appcache`);
     run.match("jsVar: undefined");
 
     s.write("client/test.js", "jsVar = 'bar'");
+    run.waitSecs(20);
     run.match("client connected: 1");
     run.match("jsVar: bar");
 

From 5ae7a0954dcb2086ce0086ddccc614affdab2dfe Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 22 Oct 2016 13:56:00 -0400
Subject: [PATCH 450/688] Mark JS hot-code-push test "slow" so CircleCI will
 skip it.

This test has been the primary source of test suite unreliability in
recent weeks. By marking it "slow" I'm effectively disabling it on
CircleCI, which I think is acceptable because (1) it is, in fact, quite
slow; (2) it passes locally on Linux; and (3) it depends on the timing of
file change notifications, which is a recipe for test flakiness due to the
general non-determinism of file watching, but not necessarily a sign of a
broken developer experience.

Like other "slow" tests, I will keep running this test locally via

  meteor self-test --slow 'javascript hot code push'

as part of the manual QA testing that we do.
---
 tools/tests/hot-code-push.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/hot-code-push.js b/tools/tests/hot-code-push.js
index 6b587f7fd0..f64d98860f 100644
--- a/tools/tests/hot-code-push.js
+++ b/tools/tests/hot-code-push.js
@@ -116,7 +116,7 @@ selftest.define("versioning hot code push", function (options) {
   });
 });
 
-selftest.define("javascript hot code push", function (options) {
+selftest.define("javascript hot code push", ["slow"], function (options) {
   var s = new Sandbox({
     clients: options.clients
   });

From 548a288c613cfa9a32475304fab22da08cd080dc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 22 Oct 2016 19:14:08 -0400
Subject: [PATCH 451/688] Call Npm.require("meteor-babel") only when needed.

In practice, the non-isopacket version of meteor-babel is only used by the
shell-server package, so this saves ~200ms of reload time.
---
 packages/babel-compiler/babel.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/babel-compiler/babel.js b/packages/babel-compiler/babel.js
index 8212945501..fc20af1d6e 100644
--- a/packages/babel-compiler/babel.js
+++ b/packages/babel-compiler/babel.js
@@ -1,9 +1,9 @@
-var meteorBabel = Npm.require('meteor-babel');
-
 /**
  * Returns a new object containing default options appropriate for
  */
 function getDefaultOptions(extraFeatures) {
+  var meteorBabel = Npm.require('meteor-babel');
+
   // See https://github.com/meteor/babel/blob/master/options.js for more
   // information about what the default options are.
   var options = meteorBabel.getDefaultOptions(extraFeatures);
@@ -22,11 +22,12 @@ Babel = {
   validateExtraFeatures: Function.prototype,
 
   compile: function (source, options) {
+    var meteorBabel = Npm.require('meteor-babel');
     options = options || getDefaultOptions();
     return meteorBabel.compile(source, options);
   },
 
   setCacheDir: function (cacheDir) {
-    meteorBabel.setCacheDir(cacheDir);
+    Npm.require('meteor-babel').setCacheDir(cacheDir);
   }
 };

From 8e9896cfcf7d2c609866beb5e3c7b4b890cdda26 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 15:16:20 -0400
Subject: [PATCH 452/688] Include server startup timings in METEOR_PROFILE
 output.

Meteor 1.4.2 has been mostly focused on improving rebuild times, but what
ultimately matters is the time from changing a file to being able to make
requests against the restarted server, and any code that runs before
server startup should be considered part of that critical path.

If you have a lot of packages, and they do non-trivial work on startup,
this commit should give you much better insight into where time is spent.

Credit to @stubailo for pushing me to provide Meteor developers with
better profiling tools, and thanks to @veered for this specific idea.

Note: because tools/tool-env/profile.js is now loaded as-is by boot.js,
certain ECMAScript features are off-limits, e.g. ...rest params.
---
 packages/meteor/startup_server.js  | 17 ++++++++++++++++-
 tools/isobuild/bundler.js          |  9 ++++++++-
 tools/static-assets/server/boot.js | 23 ++++++++++++++++++-----
 tools/tool-env/profile.js          | 11 ++++++-----
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/packages/meteor/startup_server.js b/packages/meteor/startup_server.js
index 2a08396ac1..7d60372b5b 100644
--- a/packages/meteor/startup_server.js
+++ b/packages/meteor/startup_server.js
@@ -1,4 +1,19 @@
-Meteor.startup = function (callback) {
+Meteor.startup = function startup(callback) {
+  if (process.env.METEOR_PROFILE) {
+    // Create a temporary error to capture the current stack trace.
+    var error = new Error("Meteor.startup");
+
+    // Capture the stack trace of the Meteor.startup call, excluding the
+    // startup stack frame itself.
+    Error.captureStackTrace(error, startup);
+
+    callback.stack = error.stack
+      .split(/\n\s*/) // Split lines and remove leading whitespace.
+      .slice(0, 2) // Only include the call site.
+      .join(" ") // Collapse to one line.
+      .replace(/^Error: /, ""); // Not really an Error per se.
+  }
+
   if (__meteor_bootstrap__.startupHooks) {
     __meteor_bootstrap__.startupHooks.push(callback);
   } else {
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 93368cde88..9e9479fa8c 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -2213,6 +2213,13 @@ class ServerTarget extends JsImageTarget {
     var jsImage = self.toJsImage();
     jsImage.write(builder, { includeNodeModules: options.includeNodeModules });
 
+    const toolsDir = files.pathDirname(
+      files.convertToStandardPath(__dirname));
+
+    builder.write("profile.js", {
+      file: files.pathJoin(toolsDir, "tool-env", "profile.js"),
+    });
+
     // Server bootstrap
     _.each([
       "boot.js",
@@ -2225,7 +2232,7 @@ class ServerTarget extends JsImageTarget {
     ], function (filename) {
       builder.write(filename, {
         file: files.pathJoin(
-          files.pathDirname(files.convertToStandardPath(__dirname)),
+          toolsDir,
           'static-assets',
           'server',
           filename
diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 5dd474e375..c828d69df9 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -8,6 +8,7 @@ var sourcemap_support = require('source-map-support');
 var bootUtils = require('./boot-utils.js');
 var files = require('./mini-files.js');
 var npmRequire = require('./npm-require.js').require;
+var Profile = require('./profile.js').Profile;
 
 // This code is duplicated in tools/main.js.
 var MIN_NODE_VERSION = 'v0.10.41';
@@ -123,8 +124,7 @@ var startCheckForLiveParent = function (parentPid) {
   }
 };
 
-
-Fiber(function () {
+var loadServerBundles = Profile("Load server bundles", function () {
   _.each(serverJson.load, function (fileInfo) {
     var code = fs.readFileSync(path.resolve(serverDir, fileInfo.path));
     var nonLocalNodeModulesPaths = [];
@@ -289,18 +289,23 @@ Fiber(function () {
     if (isModulesRuntime) {
       args.push(npmRequire);
     }
-    func.apply(global, args);
-  });
 
+    Profile(fileInfo.path, func).apply(global, args);
+  });
+});
+
+var callStartupHooks = Profile("Call Meteor.startup hooks", function () {
   // run the user startup hooks.  other calls to startup() during this can still
   // add hooks to the end.
   while (__meteor_bootstrap__.startupHooks.length) {
     var hook = __meteor_bootstrap__.startupHooks.shift();
-    hook();
+    Profile.time(hook.stack || "(unknown)", hook);
   }
   // Setting this to null tells Meteor.startup to call hooks immediately.
   __meteor_bootstrap__.startupHooks = null;
+});
 
+var runMain = Profile("Run main()", function () {
   // find and run main()
   // XXX hack. we should know the package that contains main.
   var mains = [];
@@ -330,4 +335,12 @@ Fiber(function () {
   if (process.env.METEOR_PARENT_PID) {
     startCheckForLiveParent(process.env.METEOR_PARENT_PID);
   }
+});
+
+Fiber(function () {
+  Profile.run("Server startup", function () {
+    loadServerBundles();
+    callStartupHooks();
+    runMain();
+  });
 }).run();
diff --git a/tools/tool-env/profile.js b/tools/tool-env/profile.js
index 6c24782adf..d5d94f7b9c 100644
--- a/tools/tool-env/profile.js
+++ b/tools/tool-env/profile.js
@@ -255,14 +255,14 @@ var Profile = function (bucketName, f) {
     return f;
   }
 
-  return function (...args) {
+  return function () {
     if (! running) {
-      return f.apply(this, args);
+      return f.apply(this, arguments);
     }
 
     var name;
     if (_.isFunction(bucketName)) {
-      name = bucketName.apply(this, args);
+      name = bucketName.apply(this, arguments);
     } else {
       name = bucketName;
     }
@@ -280,7 +280,7 @@ var Profile = function (bucketName, f) {
     var start = process.hrtime();
     var err = null;
     try {
-      return f.apply(this, args);
+      return f.apply(this, arguments);
     }
     catch (e) {
       err = e;
@@ -386,7 +386,8 @@ var injectOtherTime = function (entry) {
   entries.push(other);
 };
 
-var reportOn = function (entry, isLastLeafStack = []) {
+var reportOn = function (entry, isLastLeafStack) {
+  isLastLeafStack = isLastLeafStack || [];
   var stats = entryStats(entry);
   var isParent = hasSignificantChildren(entry);
   var name = entryName(entry);

From bdee913b1b4d9589f9026fd450deb8a43e9af11f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 17:30:10 -0400
Subject: [PATCH 453/688] Support npm packages with native .node "main"
 modules.

Note that the value of the "main" property must include the ".node"
extension explicitly, because I have yet to encounter an npm package with
a native "main" module that omits the ".node" extension, and I am loathe
to start calling files.stat(id + ".node") uselessly for every single
missing module.

Fixes #7947.
---
 tools/isobuild/import-scanner.js        | 16 +++++++++++++++-
 tools/tests/apps/modules/package.json   |  1 +
 tools/tests/apps/modules/server/only.js |  5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 02e64d2a9f..1649e37567 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -581,6 +581,21 @@ export default class ImportScanner {
   }
 
   _readModule(absPath) {
+    let ext = pathExtname(absPath).toLowerCase();
+
+    if (ext === ".node") {
+      const dataString = "throw new Error(" + JSON.stringify(
+        this.isWeb()
+          ? "cannot load native .node modules on the client"
+          : "module.useNode() must succeed for native .node modules"
+      ) + ");\n";
+
+      const data = new Buffer(dataString, "utf8");
+      const hash = sha1(data);
+
+      return { data, dataString, hash };
+    }
+
     try {
       var info = this._readFile(absPath);
     } catch (e) {
@@ -598,7 +613,6 @@ export default class ImportScanner {
       info.dataString = info.dataString.slice(1);
     }
 
-    let ext = pathExtname(absPath).toLowerCase();
     if (! has(defaultExtensionHandlers, ext)) {
       if (canBeParsedAsPlainJS(dataString)) {
         ext = ".js";
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 88fe339525..a12454d9ab 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "aws-sdk": "^2.2.41",
     "github": "^0.2.4",
+    "idle-gc": "^1.0.1",
     "meteor-node-stubs": "^0.2.0",
     "moment": "2.11.1",
     "mssql": "^3.1.1",
diff --git a/tools/tests/apps/modules/server/only.js b/tools/tests/apps/modules/server/only.js
index cba3ee2a8b..f56c293a19 100644
--- a/tools/tests/apps/modules/server/only.js
+++ b/tools/tests/apps/modules/server/only.js
@@ -6,6 +6,11 @@ import "stripe";
 import "winston";
 import "mssql";
 
+// This package has a native .node module as the "main" property of its
+// package.json file. (#7947)
+import { start } from "idle-gc";
+assert.strictEqual(typeof start, "function");
+
 assert.strictEqual(Meteor.isServer, true);
 assert.strictEqual(Meteor.isClient, false);
 

From 38de7373f125b2d2904facd675ff95060c8def81 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 17:45:48 -0400
Subject: [PATCH 454/688] Remove version constraints from
 packages/accounts-password/package.js.

Version constraints are unnecessary when publishing a release, and tend to
complicate things when the constraints are out of date with packages that
are updated by the release.

https://github.com/meteor/meteor/issues/7951#issuecomment-255615050
---
 packages/accounts-password/package.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index c39745b02e..74d003baaa 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -4,24 +4,24 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-  api.use('npm-bcrypt@0.9.0', 'server');
+  api.use('npm-bcrypt', 'server');
 
   api.use([
-    'accounts-base@1.2.10',
-    'srp@1.0.9',
-    'sha@1.0.8',
-    'ejson@1.0.12',
-    'ddp@1.2.5'
+    'accounts-base',
+    'srp',
+    'sha',
+    'ejson',
+    'ddp'
   ], ['client', 'server']);
 
   // Export Accounts (etc) to packages using this one.
-  api.imply('accounts-base@1.2.10', ['client', 'server']);
+  api.imply('accounts-base', ['client', 'server']);
 
-  api.use('email@1.1.16', ['server']);
-  api.use('random@1.0.10', ['server']);
-  api.use('check@1.2.3');
-  api.use('underscore@1.0.9');
-  api.use('ecmascript@0.5.7');
+  api.use('email', ['server']);
+  api.use('random', ['server']);
+  api.use('check');
+  api.use('underscore');
+  api.use('ecmascript');
 
   api.addFiles('email_templates.js', 'server');
   api.addFiles('password_server.js', 'server');

From 64e40df9c39eb713f8b637b0b7d256ed38d86dec Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 18:08:32 -0400
Subject: [PATCH 455/688] Add note to History.md about METEOR_PROFILE server
 startup data.

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index 5bc6a3982d..3938c4cf0d 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,12 @@
   much more quickly, especially if you have many `node_modules` files.
   See https://github.com/meteor/meteor/pull/7668 for more details.
 
+> Note: the `METEOR_PROFILE` environment variable now provides data for
+  server startup time as well as build time, which should make it easier
+  to tell which of your packages are responsible for slow startup times.
+  Please include the output of `METEOR_PROFILE=10 meteor run` with any
+  GitHub issue about rebuild performance.
+
 * `npm` has been upgraded to version 3.10.9.
 
 * The `cordova-lib` npm package has been updated to 6.3.1, along with

From 739890d95531d22f7d7d761d527dfc1201080a06 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 18:17:13 -0400
Subject: [PATCH 456/688] Bump compiler.BUILT_BY and LINKER_CACHE_SALT.

---
 tools/isobuild/compiler-plugin.js | 2 +-
 tools/isobuild/compiler.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 635db78b76..2fe35344ca 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -62,7 +62,7 @@ import { isTestFilePath } from './test-files.js';
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 10; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 11; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index eeb1643166..23afa1417e 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -34,7 +34,7 @@ var compiler = exports;
 // dependencies. (At least for now, packages only used in target creation (eg
 // minifiers) don't require you to update BUILT_BY, though you will need to quit
 // and rerun "meteor run".)
-compiler.BUILT_BY = 'meteor/23';
+compiler.BUILT_BY = 'meteor/24';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From dbf8471c1fe139d207e3597cee334ddedae434ce Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 23 Oct 2016 18:12:27 -0400
Subject: [PATCH 457/688] Bump package versions for 1.4.2-rc.3 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-css/package.js             | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 106 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 0807aaef24..0d3c18bfa4 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.14-rc.2"
+  version: "1.2.14-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 461b0ca2f9..5577351458 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index f51fb41338..1be15f9aa1 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 2d6b0a115f..a688fb87b9 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 076b96fe8e..6936c57761 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 858cca3064..4f371bd3ad 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 9b9b99d7d2..fbb63e4973 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-rc.2"
+  version: "1.1.14-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 74d003baaa..fbf5340f1e 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-rc.2"
+  version: "1.3.1-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 67a9142d84..8254330b7c 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-rc.2"
+  version: "1.1.12-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 5186028d77..c7a9f7b397 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-rc.2"
+  version: "1.1.13-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index bfb8438ff7..939be4d2ff 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 0cd5db5e0d..16237cead3 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-rc.2"
+  version: "1.0.12-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 70a0e21924..0ca4f2eb7d 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-rc.2'
+  version: '1.3.12-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index d22eb8630b..8d82581e77 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-rc.2'
+  version: '6.13.0-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index bb1bc9a05d..dcb681c83f 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-rc.2',
+  version: '0.1.12-rc.3',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 4548d124f8..3fe17747ab 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-rc.2'
+  version: '1.0.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 2e944f84f2..4edbf75be4 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-rc.2'
+  version: '1.0.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index fff1fe41d6..c0384cbbbe 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-rc.2'
+  version: '1.0.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index ab0e5e397b..ac803228ee 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 7c6ce008c6..3b681dc11c 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-rc.2"
+  version: "1.0.12-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 4882888677..1ce1dc5a80 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-rc.2"
+  version: "1.0.12-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index a70a141e5c..129a7db6ad 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-rc.2',
+  version: '1.1.8-rc.3',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index f9c87fc283..827f7d87f9 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-rc.2'
+  version: '1.0.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index 83af2c52f2..d37facc657 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-rc.2'
+  version: '1.2.4-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 9d75a26f8b..84f2f30327 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 7ee8137281..555a35d3cd 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-rc.2"
+  version: "1.0.8-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index a80bc74c9a..67c32f2a02 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-rc.2"
+  version: "1.11.1-2-rc.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index 81aacfc815..845ac0cbd1 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-rc.2"
+  version: "1.1.1-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 77beb28e2c..ded7232a38 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-rc.2',
+  version: '1.7.0-rc.3',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 87872d2ca1..7a698f472a 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-rc.2',
+  version: '1.3.2-rc.3',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 91e974b445..cc7f930e88 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-rc.2',
+  version: '1.2.7-rc.3',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 9c6db5f677..0895763df3 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-rc.2',
+  version: '1.0.6-rc.3',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 5f59529af0..d91630dce7 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-rc.2',
+  version: '1.3.11-rc.3',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index d0687b886a..e3ae276616 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-rc.2',
+  version: '1.0.7-rc.3',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index ef3b8b1fef..fa5de3252a 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-rc.2",
+  version: "0.3.15-rc.3",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index d70ae82d91..36bb4bb343 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-rc.2',
+  version: '0.5.9-rc.3',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 69c9d4d2a5..58c47f4e04 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-rc.2'
+  version: '1.0.13-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index a08c273773..14c6329d29 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-rc.2"
+  version: "1.1.18-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 391f2bbc70..2c8c8c681e 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-rc.2",
+  version: "4.6.15-rc.3",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index b20a0f9984..3a3ddf5481 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-rc.2"
+  version: "1.2.10-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 16ae442bcd..d365766475 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-rc.2'
+  version: '1.0.9-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 401d0b5531..77001cbb22 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-rc.2'
+  version: '1.0.13-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index f594861649..a4e08f45a6 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-rc.2",
+  version: "1.0.13-rc.3",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 0fff917a6c..f8ec955b51 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-rc.2'
+  version: '1.0.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 8c0fcda8f3..f9fdefc739 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-rc.2"
+  version: "1.1.9-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index f2c5f7a367..2da331f4b9 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-rc.2"
+  version: "1.1.15-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 6c5ef61ba8..7b36d5eb27 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-rc.2'
+  version: '1.2.10-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index ba61ce7ac3..f85a438dbd 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-rc.2'
+  version: '1.0.9-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index b65b8f4597..2ec91b69d7 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-rc.2'
+  version: '1.11.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 93e88edb2a..8e0cb7548f 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-rc.2',
+  version: '1.1.7-rc.3',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index bb9818b12a..50d8d88dd1 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-rc.2"
+  version: "1.0.10-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index 115faf0765..b3df71f1e6 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-rc.2'
+  version: '1.1.0-rc.3'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 5daf17549a..450017f64a 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-rc.2',
+  version: '2.7.6-rc.3',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index fcaad84d8a..711a970bbd 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-rc.2"
+  version: "1.0.12-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index 220caa62a8..cf1d239707 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-rc.2'
+  version: '1.1.16-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index f2d905766d..532f9e6d53 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-rc.2'
+  version: '2.0.7-rc.3'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 69fdc9d88f..160c01488d 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index e2c578e659..bfbe5c981d 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-rc.2"
+  version: "1.6.5-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index f80b67a088..5920355e62 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-rc.2"
+  version: "1.1.10-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 042e251ce4..5335a0a5ba 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-rc.2'
+  version: '1.4.2-rc.3'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 4d351cf781..6ae8a9c4d3 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.6.0-rc.2'
+  version: '1.6.0-rc.3'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 31de5188e6..6d51f073a9 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-rc.2"
+  version: "1.2.15-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 1dcf7273fb..8defc47882 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-rc.2"
+  version: "1.2.15-rc.3"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 89945954e8..1b700ddacb 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-rc.2'
+  version: '1.0.18-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 0a63caf5c0..751f1e3936 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-rc.2"
+  version: "1.0.13-rc.3"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 2ba8d41f41..b8ca90a110 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-rc.2",
+  version: "0.7.7-rc.3",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 112a3431c5..1193fddf84 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-rc.2",
+  version: "0.7.7-rc.3",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index 226c6141d5..eb2d30f3a0 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-rc.2',
+  version: '1.0.6-rc.3',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 16c471bc73..5a59a9cc8d 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.14-rc.2'
+  version: '1.1.14-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 393f3d3071..5ddf8e2215 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-rc.2",
+  version: "0.9.2-rc.3",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 83aaf2b551..4268287440 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.11-2-rc.2',
+  version: '2.2.11-2-rc.3',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 1db2c208cc..51bd3b6752 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-rc.2'
+  version: '1.2.1-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index d04c28c24a..08133c35bb 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-rc.2"
+  version: "1.1.12-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 65fab9a84e..b08b371f59 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-rc.2"
+  version: "1.1.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index 28cddf4f5c..f7ab579371 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-rc.2"
+  version: "1.1.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index b33f3aca53..5d9956706d 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-rc.2"
+  version: "1.0.14-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 2e6f8d1b55..2eb10325ce 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-rc.2',
+  version: '1.0.9-rc.3',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index e1cb117693..4f509fcf05 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-rc.2"
+  version: "3.0.10-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index bcac6f058f..f8aaa53ea1 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index cf654a050f..2ef944b2b7 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-rc.2",
+  version: "0.8.8-rc.3",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 48ded85b31..594fe38bca 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-rc.2',
+  version: '1.0.6-rc.3',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 48cae25d40..630b5fc845 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-rc.2'
+  version: '1.0.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index 1e559f3ae3..5aca4bb382 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-rc.2'
+  version: '1.0.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index 6911efb7ca..f5251134af 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-rc.2'
+  version: '1.1.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index f0ab768463..5816d1dc4d 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-rc.2'
+  version: '1.0.9-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index 7f9938554c..20467086df 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-rc.2'
+  version: '1.0.12-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 4338dbefb2..e02c6c855e 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 85c0671930..2041141ad4 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-rc.2'
+  version: '1.1.7-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index 9ea691890a..901a12578b 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-rc.2',
+  version: '1.0.9-rc.3',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 0a3ba3e3c0..cee9b5ccf3 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-rc.2"
+  version: "1.0.10-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 07fd802d14..9bded57de8 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.3.1',
+  version: '1.3.2-rc.3',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 77f5220a5b..3674cb020a 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-rc.2',
+  version: '1.2.1-rc.3',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 050b6ccb53..55179cb567 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-rc.2"
+  version: "2.513.6-rc.3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index fb60bf4e0a..c957ae5d47 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-rc.2'
+  version: '1.0.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index ca0adc6d01..e8b54a2f99 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-rc.2',
+  version: '1.0.13-rc.3',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 6639225f46..4306b40f69 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-rc.2'
+  version: '1.0.13-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index cde478c00d..e6b36af6eb 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-rc.2'
+  version: '1.0.11-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index b197697346..0d350d2854 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-rc.2'
+  version: '1.0.12-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index 1252a8c70d..d83be50326 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-rc.2'
+  version: '1.1.1-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 78ee79aa64..087656a124 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-rc.2'
+  version: '1.1.13-rc.3'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 5f292ce0ce..17e3f31fbd 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-rc.2'
+  version: '1.0.10-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index cb1b32cfa1..60aefd4670 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-rc.2"
+  version: "1.0.11-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 92c4928771..3536627671 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-rc.2'
+  version: '1.3.12-rc.3'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index f13129c3c4..508a9f0de0 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-rc.2'
+  version: '1.1.9-rc.3'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 04cc6ce880..077903a60e 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-rc.2'
+  version: '2.5.15-rc.3'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index c604006a1e..8ecf08f787 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-rc.2",
+ "version": "1.4.2-rc.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 0993eb664ad7c3744f40e128e39deae4acde90df Mon Sep 17 00:00:00 2001
From: Ben Newman <bn@cs.stanford.edu>
Date: Mon, 24 Oct 2016 16:24:45 -0700
Subject: [PATCH 458/688] Preserve own properties from Profile-wrapped
 functions.

---
 tools/tool-env/profile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/tool-env/profile.js b/tools/tool-env/profile.js
index d5d94f7b9c..15b5939d0d 100644
--- a/tools/tool-env/profile.js
+++ b/tools/tool-env/profile.js
@@ -255,7 +255,7 @@ var Profile = function (bucketName, f) {
     return f;
   }
 
-  return function () {
+  return Object.assign(function profileWrapper() {
     if (! running) {
       return f.apply(this, arguments);
     }
@@ -298,7 +298,7 @@ var Profile = function (bucketName, f) {
     if (err) {
       throw err;
     }
-  };
+  }, f);
 };
 
 var time = function (bucket, f) {

From 33964e966107d1569d3f65d5b810555305578039 Mon Sep 17 00:00:00 2001
From: Ben Newman <bn@cs.stanford.edu>
Date: Mon, 24 Oct 2016 15:21:06 -0700
Subject: [PATCH 459/688] Add profiling for Npm.require calls during server
 startup.

---
 tools/isobuild/bundler.js          | 6 ++++--
 tools/static-assets/server/boot.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 9e9479fa8c..4016ded29f 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1639,7 +1639,9 @@ class JsImage {
       var env = _.extend({
         Package: ret,
         Npm: {
-          require: function (name) {
+          require: Profile(function (name) {
+            return "Npm.require(" + JSON.stringify(name) + ")";
+          }, function (name) {
             let fullPath;
 
             _.some(item.nodeModulesDirectories, nmd => {
@@ -1673,7 +1675,7 @@ class JsImage {
                   item.targetPath + ". Check your Npm.depends().");
               return undefined;
             }
-          }
+          })
         },
 
         /**
diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index c828d69df9..5c95c7ad3f 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -161,7 +161,9 @@ var loadServerBundles = Profile("Load server bundles", function () {
        * @locus Server
        * @memberOf Npm
        */
-      require: function (name) {
+      require: Profile(function getBucketName(name) {
+        return "Npm.require(" + JSON.stringify(name) + ")";
+      }, function (name) {
         if (nonLocalNodeModulesPaths.length === 0) {
           return require(name);
         }
@@ -200,7 +202,7 @@ var loadServerBundles = Profile("Load server bundles", function () {
               "'. Did you forget to call 'Npm.depends' in package.js " +
               "within the '" + packageName + "' package?");
           }
-      }
+      })
     };
     var getAsset = function (assetPath, encoding, callback) {
       var fut;

From 7bcc50c84220b576c408dc2f60d28b384ba390c5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 24 Oct 2016 16:26:14 -0700
Subject: [PATCH 460/688] Add profiling for meteorInstall-based require calls.

The options.wrapRequire API is new in install@0.8.2.
---
 .../modules-runtime/.npm/package/npm-shrinkwrap.json     | 6 +++---
 packages/modules-runtime/modules-runtime.js              | 9 +++++++++
 packages/modules-runtime/package.js                      | 2 +-
 tools/isobuild/bundler.js                                | 1 +
 tools/static-assets/server/boot.js                       | 4 ++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index 3d95f909ec..ceac639e6f 100644
--- a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "install": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.1.tgz",
-      "from": "install@0.8.1"
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.8.2.tgz",
+      "from": "install@0.8.2"
     }
   }
 }
diff --git a/packages/modules-runtime/modules-runtime.js b/packages/modules-runtime/modules-runtime.js
index b5f95185bc..30403e3fbc 100644
--- a/packages/modules-runtime/modules-runtime.js
+++ b/packages/modules-runtime/modules-runtime.js
@@ -4,6 +4,15 @@ var hasOwn = options.hasOwnProperty;
 // RegExp matching strings that don't start with a `.` or a `/`.
 var topLevelIdPattern = /^[^./]/;
 
+if (typeof Profile === "function" &&
+    process.env.METEOR_PROFILE) {
+  options.wrapRequire = function (require) {
+    return Profile(function (id) {
+      return "require(" + JSON.stringify(id) + ")";
+    }, require);
+  };
+}
+
 // This function will be called whenever a module identifier that hasn't
 // been installed is required. For backwards compatibility, and so that we
 // can require binary dependencies on the server, we implement the
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index b8ca90a110..cc2b4a2fc0 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.8.1"
+  install: "0.8.2"
 });
 
 Package.onUse(function(api) {
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 4016ded29f..65a695735e 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1711,6 +1711,7 @@ class JsImage {
 
       if (item.targetPath === "packages/modules-runtime.js") {
         env.npmRequire = self._makeNpmRequire(nodeModulesDirsByPackageName);
+        env.Profile = Profile;
       }
 
       try {
diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 5c95c7ad3f..8e58b9e3b4 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -266,7 +266,7 @@ var loadServerBundles = Profile("Load server bundles", function () {
 
     var wrapParts = ["(function(Npm,Assets"];
     if (isModulesRuntime) {
-      wrapParts.push(",npmRequire");
+      wrapParts.push(",npmRequire,Profile");
     }
     // \n is necessary in case final line is a //-comment
     wrapParts.push("){", code, "\n})");
@@ -289,7 +289,7 @@ var loadServerBundles = Profile("Load server bundles", function () {
     var func = require('vm').runInThisContext(wrapped, scriptPath, true);
     var args = [Npm, Assets];
     if (isModulesRuntime) {
-      args.push(npmRequire);
+      args.push(npmRequire, Profile);
     }
 
     Profile(fileInfo.path, func).apply(global, args);

From 03e798abc95f4edf4e0eceea7bfe036f73b27080 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 24 Oct 2016 22:10:02 -0700
Subject: [PATCH 461/688] Only strip devDependencies when buildMode ===
 "production".

Fixes #7953.
---
 tools/isobuild/bundler.js | 74 ++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 65a695735e..85fdee6996 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1811,18 +1811,17 @@ class JsImage {
 
   // Write this image out to disk
   //
-  // options:
-  // - includeNodeModules: falsy or 'symlink', documented on
-  //   exports.bundle.
-  //
   // Returns an object with the following keys:
   // - controlFile: the path (relative to 'builder') of the control file for
   // the image
   // - nodePath: an array of paths required to be set in the NODE_PATH
   // environment variable.
-  write(builder, options) {
+  write(builder, {
+    buildMode,
+    // falsy or 'symlink', documented on exports.bundle
+    includeNodeModules,
+  } = {}) {
     var self = this;
-    options = options || {};
 
     builder.reserve("program.json");
 
@@ -1834,15 +1833,15 @@ class JsImage {
       // We need to find the actual file system location for the node modules
       // this JS Image uses, so that we can add it to nodeModulesDirectories
       var modulesPhysicalLocation;
-      if (! options.includeNodeModules ||
-          options.includeNodeModules === 'symlink') {
+      if (! includeNodeModules ||
+          includeNodeModules === 'symlink') {
         modulesPhysicalLocation = nmd.getPreferredBundlePath("bundle");
       } else {
         // This is some option we didn't expect - someone has added another case
         // to the includeNodeModules option but didn't update this if block.
         // Fail hard.
         throw new Error("Option includeNodeModules wasn't falsy or 'symlink'. " +
-                        "It was: " + options.includeNodeModules);
+                        "It was: " + includeNodeModules);
       }
 
       nmd = nmd.copy();
@@ -1969,10 +1968,11 @@ class JsImage {
           from: nmd.sourcePath,
           to: nmd.preferredBundlePath,
           npmDiscards: nmd.npmDiscards,
-          symlink: (options.includeNodeModules === 'symlink')
+          symlink: includeNodeModules === 'symlink'
         };
 
         const prodPackagePredicate =
+          buildMode === "production" &&
           nmd.local && // Only filter local node_modules directories.
           nmd.getProdPackagePredicate();
 
@@ -2139,17 +2139,19 @@ class ServerTarget extends JsImageTarget {
   }
 
   // Output the finished target to disk
-  // options:
-  // - includeNodeModules: falsy or 'symlink', documented in
-  //   exports.bundle.
-  // - getRelativeTargetPath: a function that takes {forTarget:
-  //   Target, relativeTo: Target} and return the path of one target
-  //   in the bundle relative to another. hack to get the path of the
-  //   client target.. we'll find a better solution here eventually
   //
   // Returns the path (relative to 'builder') of the control file for
   // the plugin and the required NODE_PATH.
-  write(builder, options) {
+  write(builder, {
+    buildMode,
+    // falsy or 'symlink', documented in exports.bundle
+    includeNodeModules,
+    // a function that takes {forTarget: Target, relativeTo: Target} and
+    // return the path of one target in the bundle relative to another. hack
+    // to get the path of the client target.. we'll find a better solution
+    // here eventually
+    getRelativeTargetPath,
+  }) {
     var self = this;
     var nodePath = [];
 
@@ -2161,8 +2163,10 @@ class ServerTarget extends JsImageTarget {
     var clientTargetPaths = {};
     if (self.clientTargets) {
       _.each(self.clientTargets, function (target) {
-        clientTargetPaths[target.arch] = files.pathJoin(options.getRelativeTargetPath({
-          forTarget: target, relativeTo: self}), 'program.json');
+        clientTargetPaths[target.arch] = files.pathJoin(getRelativeTargetPath({
+          forTarget: target,
+          relativeTo: self,
+        }), 'program.json');
       });
     }
 
@@ -2200,11 +2204,11 @@ class ServerTarget extends JsImageTarget {
     // This is a hack to make 'meteor run' faster (so you don't have to run 'npm
     // install' using the above package.json and npm-shrinkwrap.json on every
     // rebuild).
-    if (options.includeNodeModules === 'symlink') {
+    if (includeNodeModules === 'symlink') {
       builder.write('node_modules', {
         symlink: files.pathJoin(files.getDevBundle(), 'server-lib', 'node_modules')
       });
-    } else if (options.includeNodeModules) {
+    } else if (includeNodeModules) {
       // This is some option we didn't expect - someone has added another case
       // to the includeNodeModules option but didn't update this if block. Fail
       // hard.
@@ -2214,7 +2218,10 @@ class ServerTarget extends JsImageTarget {
     // Linked JavaScript image (including static assets, assuming that there are
     // any JS files at all)
     var jsImage = self.toJsImage();
-    jsImage.write(builder, { includeNodeModules: options.includeNodeModules });
+    jsImage.write(builder, {
+      buildMode,
+      includeNodeModules,
+    });
 
     const toolsDir = files.pathDirname(
       files.convertToStandardPath(__dirname));
@@ -2298,15 +2305,20 @@ var writeTargetToPath = Profile(
     includeNodeModules,
     getRelativeTargetPath,
     previousBuilder,
-    minifyMode
+    buildMode,
+    minifyMode,
   }) {
     var builder = new Builder({
       outputPath: files.pathJoin(outputPath, 'programs', name),
       previousBuilder
     });
 
-    var targetBuild = target.write(
-      builder, {includeNodeModules, getRelativeTargetPath, minifyMode});
+    var targetBuild = target.write(builder, {
+      includeNodeModules,
+      getRelativeTargetPath,
+      buildMode,
+      minifyMode,
+    });
 
     builder.complete();
 
@@ -2354,6 +2366,7 @@ var writeSiteArchive = Profile("bundler writeSiteArchive", function (
     releaseName,
     getRelativeTargetPath,
     previousBuilders,
+    buildMode,
     minifyMode
   }) {
 
@@ -2439,6 +2452,7 @@ Find out more about Meteor at meteor.com.
           releaseName,
           getRelativeTargetPath,
           previousBuilder,
+          buildMode,
           minifyMode
         });
 
@@ -2754,7 +2768,9 @@ function bundle({
           const previousBuilder = previousBuilders && previousBuilders[name];
           var targetBuild = writeTargetToPath(
             name, target, outputPath,
-            _.extend({}, writeOptions, {previousBuilder})
+            _.extend({
+              buildMode: buildOptions.buildMode,
+            }, writeOptions, {previousBuilder})
          );
           nodePath = nodePath.concat(targetBuild.nodePath);
           clientWatchSet.merge(target.getWatchSet());
@@ -2764,7 +2780,9 @@ function bundle({
         starResult = writeSiteArchive(
           targets,
           outputPath,
-          _.extend({}, writeOptions, {previousBuilders})
+          _.extend({
+            buildMode: buildOptions.buildMode,
+          }, writeOptions, {previousBuilders})
         );
 
         nodePath = nodePath.concat(starResult.nodePath);

From b40df12129fa6b3545f89394723fcf044b47f78d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 24 Oct 2016 22:44:11 -0700
Subject: [PATCH 462/688] Bump package versions for 1.4.2-rc.4 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-css/package.js             | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 2 +-
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-experimental.json        | 2 +-
 106 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 0d3c18bfa4..30b93fec3f 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.14-rc.3"
+  version: "1.2.14-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 5577351458..72919de52d 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 1be15f9aa1..a50eab6f32 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index a688fb87b9..55482b4796 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index 6936c57761..d3b166742e 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index 4f371bd3ad..d59d3c1add 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index fbb63e4973..f7126da87c 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-rc.3"
+  version: "1.1.14-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index fbf5340f1e..e0ba13108c 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-rc.3"
+  version: "1.3.1-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 8254330b7c..8b3f550989 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-rc.3"
+  version: "1.1.12-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index c7a9f7b397..f69b5f2d91 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-rc.3"
+  version: "1.1.13-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 939be4d2ff..137fcced17 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 16237cead3..fb4a4a114e 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-rc.3"
+  version: "1.0.12-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index 0ca4f2eb7d..a57ddae5c8 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-rc.3'
+  version: '1.3.12-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 8d82581e77..9dba1da9fc 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-rc.3'
+  version: '6.13.0-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index dcb681c83f..6a242bd516 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-rc.3',
+  version: '0.1.12-rc.4',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 3fe17747ab..8cebfc2cb8 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-rc.3'
+  version: '1.0.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 4edbf75be4..2939b81359 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-rc.3'
+  version: '1.0.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index c0384cbbbe..9c2475faca 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-rc.3'
+  version: '1.0.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index ac803228ee..d7774c5952 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 3b681dc11c..e764b780ef 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-rc.3"
+  version: "1.0.12-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 1ce1dc5a80..4bec63d159 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-rc.3"
+  version: "1.0.12-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 129a7db6ad..c7f5908306 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-rc.3',
+  version: '1.1.8-rc.4',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index 827f7d87f9..eac7c599de 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-rc.3'
+  version: '1.0.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index d37facc657..1e852d906c 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-rc.3'
+  version: '1.2.4-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 84f2f30327..49208e58ba 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index 555a35d3cd..ebf91ffd1b 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-rc.3"
+  version: "1.0.8-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 67c32f2a02..cf1e178623 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-rc.3"
+  version: "1.11.1-2-rc.4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index 845ac0cbd1..d96aff9051 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-rc.3"
+  version: "1.1.1-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index ded7232a38..509c41d000 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-rc.3',
+  version: '1.7.0-rc.4',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 7a698f472a..acff5176d1 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-rc.3',
+  version: '1.3.2-rc.4',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index cc7f930e88..e6531963df 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-rc.3',
+  version: '1.2.7-rc.4',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index 0895763df3..c8bad1cc63 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-rc.3',
+  version: '1.0.6-rc.4',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index d91630dce7..3c2fe6f3af 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-rc.3',
+  version: '1.3.11-rc.4',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index e3ae276616..758b5b4de9 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-rc.3',
+  version: '1.0.7-rc.4',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index fa5de3252a..e1288e4deb 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-rc.3",
+  version: "0.3.15-rc.4",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 36bb4bb343..53cb96bb58 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-rc.3',
+  version: '0.5.9-rc.4',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 58c47f4e04..8a029baf79 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-rc.3'
+  version: '1.0.13-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index 14c6329d29..d1618e7bff 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-rc.3"
+  version: "1.1.18-rc.4"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index 2c8c8c681e..a92e6662f2 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-rc.3",
+  version: "4.6.15-rc.4",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 3a3ddf5481..38c5c81a95 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-rc.3"
+  version: "1.2.10-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index d365766475..22980cb788 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-rc.3'
+  version: '1.0.9-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 77001cbb22..8ecf86ef83 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-rc.3'
+  version: '1.0.13-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index a4e08f45a6..5710844a6e 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-rc.3",
+  version: "1.0.13-rc.4",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index f8ec955b51..be77003e87 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-rc.3'
+  version: '1.0.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index f9fdefc739..961c8cffd9 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-rc.3"
+  version: "1.1.9-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index 2da331f4b9..c79b726e24 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-rc.3"
+  version: "1.1.15-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index 7b36d5eb27..bacf030641 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-rc.3'
+  version: '1.2.10-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index f85a438dbd..150612a27e 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-rc.3'
+  version: '1.0.9-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 2ec91b69d7..842f652e91 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-rc.3'
+  version: '1.11.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index 8e0cb7548f..d95eb23e69 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-rc.3',
+  version: '1.1.7-rc.4',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index 50d8d88dd1..ba5ec1a377 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-rc.3"
+  version: "1.0.10-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index b3df71f1e6..a80d0e5237 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-rc.3'
+  version: '1.1.0-rc.4'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 450017f64a..5fb80c3d43 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-rc.3',
+  version: '2.7.6-rc.4',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 711a970bbd..52ea89e550 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-rc.3"
+  version: "1.0.12-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index cf1d239707..a951706a43 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-rc.3'
+  version: '1.1.16-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 532f9e6d53..83152ef999 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-rc.3'
+  version: '2.0.7-rc.4'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 160c01488d..012053a6c5 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index bfbe5c981d..cea5ec5995 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-rc.3"
+  version: "1.6.5-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 5920355e62..06b2ab8be6 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-rc.3"
+  version: "1.1.10-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 5335a0a5ba..4614facf7c 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-rc.3'
+  version: '1.4.2-rc.4'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index 6ae8a9c4d3..ecdfcd96c7 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.6.0-rc.3'
+  version: '1.6.0-rc.4'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 6d51f073a9..e0e1df21b4 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-rc.3"
+  version: "1.2.15-rc.4"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 8defc47882..414c6c3570 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-rc.3"
+  version: "1.2.15-rc.4"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 1b700ddacb..ed87de1b55 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-rc.3'
+  version: '1.0.18-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index 751f1e3936..d4398eceac 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-rc.3"
+  version: "1.0.13-rc.4"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index cc2b4a2fc0..c39d167d2a 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-rc.3",
+  version: "0.7.7-rc.4",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 1193fddf84..934022a3eb 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-rc.3",
+  version: "0.7.7-rc.4",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index eb2d30f3a0..f4db40034c 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-rc.3',
+  version: '1.0.6-rc.4',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 5a59a9cc8d..d49c85f0b0 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.14-rc.3'
+  version: '1.1.14-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index 5ddf8e2215..fe4c5c7ae2 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-rc.3",
+  version: "0.9.2-rc.4",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 4268287440..59917aa633 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.11-2-rc.3',
+  version: '2.2.11-2-rc.4',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 51bd3b6752..3f472e71a8 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-rc.3'
+  version: '1.2.1-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index 08133c35bb..cf8d701dab 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-rc.3"
+  version: "1.1.12-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index b08b371f59..49615b8839 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-rc.3"
+  version: "1.1.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index f7ab579371..82d3d29ccd 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-rc.3"
+  version: "1.1.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index 5d9956706d..bd62ab54cd 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-rc.3"
+  version: "1.0.14-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index 2eb10325ce..e4ea86e23b 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-rc.3',
+  version: '1.0.9-rc.4',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 4f509fcf05..7fc9ee05fa 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-rc.3"
+  version: "3.0.10-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index f8aaa53ea1..90a91608b2 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 2ef944b2b7..0b807e56fb 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-rc.3",
+  version: "0.8.8-rc.4",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index 594fe38bca..dbf722527b 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-rc.3',
+  version: '1.0.6-rc.4',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 630b5fc845..35b088bb1b 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-rc.3'
+  version: '1.0.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index 5aca4bb382..a559fdca16 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-rc.3'
+  version: '1.0.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index f5251134af..aeb0297d6a 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-rc.3'
+  version: '1.1.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 5816d1dc4d..4a50a458db 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-rc.3'
+  version: '1.0.9-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index 20467086df..cb0fff9bfb 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-rc.3'
+  version: '1.0.12-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index e02c6c855e..85d1ec349c 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index 2041141ad4..d00c3f8c62 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-rc.3'
+  version: '1.1.7-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index 901a12578b..a2007bf198 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-rc.3',
+  version: '1.0.9-rc.4',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index cee9b5ccf3..9d006cf869 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-rc.3"
+  version: "1.0.10-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 9bded57de8..49fd04bc1f 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.3.2-rc.3',
+  version: '1.3.2-rc.4',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 3674cb020a..f69c7e6189 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-rc.3',
+  version: '1.2.1-rc.4',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 55179cb567..30b17fd291 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-rc.3"
+  version: "2.513.6-rc.4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index c957ae5d47..7ae5c7d37f 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-rc.3'
+  version: '1.0.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index e8b54a2f99..5bfb58fd17 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-rc.3',
+  version: '1.0.13-rc.4',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 4306b40f69..1dbc999af2 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-rc.3'
+  version: '1.0.13-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index e6b36af6eb..f17fcf043b 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-rc.3'
+  version: '1.0.11-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 0d350d2854..0dc4a267a4 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-rc.3'
+  version: '1.0.12-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index d83be50326..b52c340f37 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-rc.3'
+  version: '1.1.1-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 087656a124..740d4f484d 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-rc.3'
+  version: '1.1.13-rc.4'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 17e3f31fbd..eb4a2db6e9 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-rc.3'
+  version: '1.0.10-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 60aefd4670..16cbbe4baf 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-rc.3"
+  version: "1.0.11-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 3536627671..d90111e2ba 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-rc.3'
+  version: '1.3.12-rc.4'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index 508a9f0de0..eb6cc0c56c 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-rc.3'
+  version: '1.1.9-rc.4'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index 077903a60e..d0417c2399 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-rc.3'
+  version: '2.5.15-rc.4'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8ecf08f787..d1f42bbdc7 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-rc.3",
+ "version": "1.4.2-rc.4",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From cadf113e6c279116e23d18d224e3c6db64516791 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Oct 2016 08:46:26 -0700
Subject: [PATCH 463/688] Only strip devDependencies when buildMode !== "test".

Follow-up to #7953.
---
 tools/isobuild/bundler.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 85fdee6996..022550d6c9 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1972,7 +1972,13 @@ class JsImage {
         };
 
         const prodPackagePredicate =
-          buildMode === "production" &&
+          // This condition essentially means we don't strip devDependencies
+          // when running tests, which is important for use cases like the one
+          // described in #7953. Note that devDependencies can still be used
+          // when buildMode === "development" because the app has access to
+          // the original node_modules.
+          (buildMode === "production" ||
+           buildMode === "development") &&
           nmd.local && // Only filter local node_modules directories.
           nmd.getProdPackagePredicate();
 

From 45626b699b86658e6779c2b614c7495b87d0886e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Oct 2016 10:07:42 -0700
Subject: [PATCH 464/688] Support METEOR_DISABLE_FS_FIBERS to help @veered
 debug fiber storms.

---
 tools/fs/files.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 9af4a79c78..82aba433b3 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -1451,6 +1451,9 @@ files.readLinkToMeteorScript = function (linkLocation, platform) {
 //   A helpful file to import for this purpose is colon-converter.js, which also
 //   knows how to convert various configuration file formats.
 
+// If this environment variable is set, fs.*Sync methods will always be used
+// by wrapFsFunc instead of yielding wrappers for asynchronous fs.* methods.
+const YIELD_ALLOWED = ! process.env.METEOR_DISABLE_FS_FIBERS;
 
 files.fsFixPath = {};
 /**
@@ -1485,7 +1488,11 @@ function wrapFsFunc(fsFuncName, pathArgIndices, options) {
         args[i] = files.convertToOSPath(args[i]);
       }
 
-      const canYield = Fiber.current && Fiber.yield && ! Fiber.yield.disallowed;
+      const canYield = YIELD_ALLOWED &&
+        Fiber.current &&
+        Fiber.yield &&
+        ! Fiber.yield.disallowed;
+
       const shouldBeSync = alwaysSync || sync;
       // There's some overhead in awaiting a Promise of an async call,
       // vs just doing the sync call, which for a call like "stat"

From f39812bd4bc024734dd48b77c97930f9ba07f3c9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Oct 2016 10:14:33 -0700
Subject: [PATCH 465/688] Bump package versions for the official 1.4.2 release.

---
 packages/accounts-base/package.js                     | 2 +-
 packages/accounts-facebook/package.js                 | 2 +-
 packages/accounts-github/package.js                   | 2 +-
 packages/accounts-google/package.js                   | 2 +-
 packages/accounts-meetup/package.js                   | 2 +-
 packages/accounts-meteor-developer/package.js         | 2 +-
 packages/accounts-oauth/package.js                    | 2 +-
 packages/accounts-password/package.js                 | 2 +-
 packages/accounts-twitter/package.js                  | 2 +-
 packages/accounts-ui-unstyled/package.js              | 2 +-
 packages/accounts-weibo/package.js                    | 2 +-
 packages/appcache/package.js                          | 2 +-
 packages/autoupdate/package.js                        | 2 +-
 packages/babel-compiler/package.js                    | 2 +-
 packages/babel-runtime/package.js                     | 2 +-
 packages/base64/package.js                            | 2 +-
 packages/binary-heap/package.js                       | 2 +-
 packages/boilerplate-generator/package.js             | 2 +-
 packages/browser-policy-common/package.js             | 2 +-
 packages/browser-policy-content/package.js            | 2 +-
 packages/browser-policy-framing/package.js            | 2 +-
 packages/caching-compiler/package.js                  | 2 +-
 packages/callback-hook/package.js                     | 2 +-
 packages/check/package.js                             | 2 +-
 packages/code-prettify/package.js                     | 2 +-
 packages/coffeescript-test-helper/package.js          | 2 +-
 packages/coffeescript/package.js                      | 2 +-
 packages/constraint-solver/package.js                 | 2 +-
 packages/crosswalk/package.js                         | 2 +-
 packages/ddp-client/package.js                        | 2 +-
 packages/ddp-common/package.js                        | 2 +-
 packages/ddp-rate-limiter/package.js                  | 2 +-
 packages/ddp-server/package.js                        | 2 +-
 packages/diff-sequence/package.js                     | 2 +-
 packages/ecmascript-runtime/package.js                | 2 +-
 packages/ecmascript/package.js                        | 2 +-
 packages/ejson/package.js                             | 2 +-
 packages/email/package.js                             | 2 +-
 packages/es5-shim/package.js                          | 2 +-
 packages/facebook/package.js                          | 2 +-
 packages/facts/package.js                             | 2 +-
 packages/fastclick/package.js                         | 2 +-
 packages/force-ssl/package.js                         | 2 +-
 packages/geojson-utils/package.js                     | 2 +-
 packages/github/package.js                            | 2 +-
 packages/google/package.js                            | 2 +-
 packages/http/package.js                              | 2 +-
 packages/id-map/package.js                            | 2 +-
 packages/jquery/package.js                            | 2 +-
 packages/jshint/package.js                            | 2 +-
 packages/jsparse/package.js                           | 2 +-
 packages/launch-screen/package.js                     | 2 +-
 packages/less/package.js                              | 2 +-
 packages/localstorage/package.js                      | 2 +-
 packages/logging/package.js                           | 2 +-
 packages/logic-solver/package.js                      | 2 +-
 packages/markdown/package.js                          | 2 +-
 packages/meetup/package.js                            | 2 +-
 packages/meteor-developer/package.js                  | 2 +-
 packages/meteor-tool/package.js                       | 2 +-
 packages/meteor/package.js                            | 2 +-
 packages/minifier-css/package.js                      | 2 +-
 packages/minifier-js/package.js                       | 2 +-
 packages/minimongo/package.js                         | 2 +-
 packages/mobile-status-bar/package.js                 | 2 +-
 packages/modules-runtime/package.js                   | 2 +-
 packages/modules/package.js                           | 2 +-
 packages/mongo-id/package.js                          | 2 +-
 packages/mongo/package.js                             | 2 +-
 packages/npm-bcrypt/package.js                        | 2 +-
 packages/npm-mongo/package.js                         | 2 +-
 packages/oauth-encryption/package.js                  | 2 +-
 packages/oauth/package.js                             | 2 +-
 packages/oauth1/package.js                            | 2 +-
 packages/oauth2/package.js                            | 2 +-
 packages/observe-sequence/package.js                  | 2 +-
 packages/ordered-dict/package.js                      | 2 +-
 packages/package-version-parser/package.js            | 2 +-
 packages/preserve-inputs/package.js                   | 2 +-
 packages/promise/package.js                           | 2 +-
 packages/rate-limit/package.js                        | 2 +-
 packages/reactive-var/package.js                      | 2 +-
 packages/reload-safetybelt/package.js                 | 2 +-
 packages/reload/package.js                            | 2 +-
 packages/retry/package.js                             | 2 +-
 packages/routepolicy/package.js                       | 2 +-
 packages/service-configuration/package.js             | 2 +-
 packages/session/package.js                           | 2 +-
 packages/sha/package.js                               | 2 +-
 packages/srp/package.js                               | 2 +-
 packages/standard-minifier-css/package.js             | 2 +-
 packages/standard-minifier-js/package.js              | 2 +-
 packages/stylus/package.js                            | 2 +-
 packages/test-helpers/package.js                      | 2 +-
 packages/test-in-browser/package.js                   | 2 +-
 packages/test-in-console/package.js                   | 3 +--
 packages/test-server-tests-in-console-once/package.js | 2 +-
 packages/tinytest/package.js                          | 2 +-
 packages/tracker/package.js                           | 2 +-
 packages/twitter/package.js                           | 2 +-
 packages/underscore/package.js                        | 2 +-
 packages/url/package.js                               | 2 +-
 packages/webapp/package.js                            | 2 +-
 packages/weibo/package.js                             | 2 +-
 packages/xmlbuilder/package.js                        | 2 +-
 scripts/admin/meteor-release-official.json            | 5 ++---
 106 files changed, 107 insertions(+), 109 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 30b93fec3f..5f33d2e408 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.2.14-rc.4"
+  version: "1.2.14"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 72919de52d..c323e43ebb 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index a50eab6f32..7646ea1108 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Github accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index 55482b4796..1f71d41315 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Google accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js
index d3b166742e..637ab50659 100644
--- a/packages/accounts-meetup/package.js
+++ b/packages/accounts-meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meetup accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js
index d59d3c1add..d15392912e 100644
--- a/packages/accounts-meteor-developer/package.js
+++ b/packages/accounts-meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Meteor developer accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index f7126da87c..ca6ba361c6 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14-rc.4"
+  version: "1.1.14"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index e0ba13108c..430906f856 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1-rc.4"
+  version: "1.3.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index 8b3f550989..82ca9e64c8 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Twitter accounts",
-  version: "1.1.12-rc.4"
+  version: "1.1.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index f69b5f2d91..89de1e7976 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13-rc.4"
+  version: "1.1.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index 137fcced17..830c9a5748 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Sina Weibo accounts",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index fb4a4a114e..78c0652a10 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Enable the application cache in the browser",
-  version: "1.0.12-rc.4"
+  version: "1.0.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js
index a57ddae5c8..642f3c2c1c 100644
--- a/packages/autoupdate/package.js
+++ b/packages/autoupdate/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Update the client when new client code is available",
-  version: '1.3.12-rc.4'
+  version: '1.3.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 9dba1da9fc..24bff99a4d 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0-rc.4'
+  version: '6.13.0'
 });
 
 Npm.depends({
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 6a242bd516..41a4e9224c 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12-rc.4',
+  version: '0.1.12',
   documentation: 'README.md'
 });
 
diff --git a/packages/base64/package.js b/packages/base64/package.js
index 8cebfc2cb8..7d4742aea2 100644
--- a/packages/base64/package.js
+++ b/packages/base64/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Base64 encoding and decoding",
-  version: '1.0.10-rc.4'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js
index 2939b81359..262bb06acd 100644
--- a/packages/binary-heap/package.js
+++ b/packages/binary-heap/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Binary Heap datastructure implementation",
-  version: '1.0.10-rc.4'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 9c2475faca..357701a5a2 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11-rc.4'
+  version: '1.0.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
index d7774c5952..85c2554c3e 100644
--- a/packages/browser-policy-common/package.js
+++ b/packages/browser-policy-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for browser-policy packages",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index e764b780ef..4abffcb51e 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12-rc.4"
+  version: "1.0.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
index 4bec63d159..a9ebddde15 100644
--- a/packages/browser-policy-framing/package.js
+++ b/packages/browser-policy-framing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Restrict which websites can frame your app",
-  version: "1.0.12-rc.4"
+  version: "1.0.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index c7f5908306..88795d4906 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8-rc.4',
+  version: '1.1.8',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
index eac7c599de..ece4b39e27 100644
--- a/packages/callback-hook/package.js
+++ b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.0.10-rc.4'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/check/package.js b/packages/check/package.js
index 1e852d906c..f279ac070f 100644
--- a/packages/check/package.js
+++ b/packages/check/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Check whether a value matches a pattern",
-  version: '1.2.4-rc.4'
+  version: '1.2.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js
index 49208e58ba..abe0277061 100644
--- a/packages/code-prettify/package.js
+++ b/packages/code-prettify/package.js
@@ -8,7 +8,7 @@ var path = Npm.require('path');
 
 Package.describe({
   summary: "Syntax highlighting of code, from Google",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 // XXX this code dumps symbols into the global namespace (directly
diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js
index ebf91ffd1b..b79b10367e 100644
--- a/packages/coffeescript-test-helper/package.js
+++ b/packages/coffeescript-test-helper/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Used by the coffeescript package's tests",
-  version: "1.0.8-rc.4"
+  version: "1.0.8"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index cf1e178623..10a14b4c3f 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-2-rc.4"
+  version: "1.11.1_2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js
index d96aff9051..5f8f368bc9 100644
--- a/packages/constraint-solver/package.js
+++ b/packages/constraint-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Given the set of the constraints, picks a satisfying configuration",
-  version: "1.1.1-rc.4"
+  version: "1.1.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/crosswalk/package.js b/packages/crosswalk/package.js
index 509c41d000..ea2a82118b 100644
--- a/packages/crosswalk/package.js
+++ b/packages/crosswalk/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Makes your Cordova application use the Crosswalk WebView \
 instead of the System WebView on Android",
-  version: '1.7.0-rc.4',
+  version: '1.7.0',
   documentation: null
 });
 
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index acff5176d1..7816884263 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '1.3.2-rc.4',
+  version: '1.3.2',
   documentation: null
 });
 
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index e6531963df..341bca27ad 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7-rc.4',
+  version: '1.2.7',
   documentation: null
 });
 
diff --git a/packages/ddp-rate-limiter/package.js b/packages/ddp-rate-limiter/package.js
index c8bad1cc63..c442b116f9 100644
--- a/packages/ddp-rate-limiter/package.js
+++ b/packages/ddp-rate-limiter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ddp-rate-limiter',
-  version: '1.0.6-rc.4',
+  version: '1.0.6',
   // Brief, one-line summary of the package.
   summary: 'The DDPRateLimiter allows users to add rate limits to DDP' +
   ' methods and subscriptions.',
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 3c2fe6f3af..46975fff25 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11-rc.4',
+  version: '1.3.11',
   documentation: null
 });
 
diff --git a/packages/diff-sequence/package.js b/packages/diff-sequence/package.js
index 758b5b4de9..0725708bdc 100644
--- a/packages/diff-sequence/package.js
+++ b/packages/diff-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An implementation of a diff algorithm on arrays and objects.",
-  version: '1.0.7-rc.4',
+  version: '1.0.7',
   documentation: null
 });
 
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index e1288e4deb..78b193e14e 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15-rc.4",
+  version: "0.3.15",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/ecmascript-runtime",
   documentation: "README.md"
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 53cb96bb58..1678e3063f 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9-rc.4',
+  version: '0.5.9',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 8a029baf79..27c712f5a3 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Extended and Extensible JSON library",
-  version: '1.0.13-rc.4'
+  version: '1.0.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/email/package.js b/packages/email/package.js
index d1618e7bff..dad8b2d8b3 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Send email messages",
-  version: "1.1.18-rc.4"
+  version: "1.1.18"
 });
 
 Npm.depends({
diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js
index a92e6662f2..e114a1b51a 100644
--- a/packages/es5-shim/package.js
+++ b/packages/es5-shim/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "es5-shim",
-  version: "4.6.15-rc.4",
+  version: "4.6.15",
   summary: "Shims and polyfills to improve ECMAScript 5 support",
   documentation: "README.md"
 });
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 38c5c81a95..1d8cbc7539 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10-rc.4"
+  version: "1.2.10"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facts/package.js b/packages/facts/package.js
index 22980cb788..1c73053180 100644
--- a/packages/facts/package.js
+++ b/packages/facts/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Publish internal app statistics",
-  version: '1.0.9-rc.4'
+  version: '1.0.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js
index 8ecf86ef83..bef7ca2e6e 100755
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Faster touch events on mobile",
-  version: '1.0.13-rc.4'
+  version: '1.0.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 5710844a6e..76f2e6a095 100644
--- a/packages/force-ssl/package.js
+++ b/packages/force-ssl/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Require this application to use HTTPS",
-  version: "1.0.13-rc.4",
+  version: "1.0.13",
   prodOnly: true
 });
 
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index be77003e87..5ae045b046 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
-  version: '1.0.10-rc.4'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/github/package.js b/packages/github/package.js
index 961c8cffd9..4481a19963 100644
--- a/packages/github/package.js
+++ b/packages/github/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Github OAuth flow",
-  version: "1.1.9-rc.4"
+  version: "1.1.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/google/package.js b/packages/google/package.js
index c79b726e24..ef74f1aee7 100644
--- a/packages/google/package.js
+++ b/packages/google/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.1.15-rc.4"
+  version: "1.1.15"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/http/package.js b/packages/http/package.js
index bacf030641..1f84883aa1 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '1.2.10-rc.4'
+  version: '1.2.10'
 });
 
 Npm.depends({
diff --git a/packages/id-map/package.js b/packages/id-map/package.js
index 150612a27e..a1931eb94f 100644
--- a/packages/id-map/package.js
+++ b/packages/id-map/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dictionary data structure allowing non-string keys",
-  version: '1.0.9-rc.4'
+  version: '1.0.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jquery/package.js b/packages/jquery/package.js
index 842f652e91..30fc96b32b 100644
--- a/packages/jquery/package.js
+++ b/packages/jquery/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // patch number instead of the wrap number, we're higher than that.
   // In fairness, there's no way to make an RC of a new version without
   // bumping the patch number.
-  version: '1.11.10-rc.4'
+  version: '1.11.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/jshint/package.js b/packages/jshint/package.js
index d95eb23e69..431da88126 100644
--- a/packages/jshint/package.js
+++ b/packages/jshint/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'jshint',
-  version: '1.1.7-rc.4',
+  version: '1.1.7',
   summary: 'Lint all your JavaScript files with JSHint.',
   documentation: 'README.md'
 });
diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
index ba5ec1a377..5e3f58d85e 100644
--- a/packages/jsparse/package.js
+++ b/packages/jsparse/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Full-featured JavaScript parser",
-  version: "1.0.10-rc.4"
+  version: "1.0.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/launch-screen/package.js b/packages/launch-screen/package.js
index a80d0e5237..9184130ea7 100644
--- a/packages/launch-screen/package.js
+++ b/packages/launch-screen/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // between such packages and the build tool.
   name: 'launch-screen',
   summary: 'Default and customizable launch screen on mobile.',
-  version: '1.1.0-rc.4'
+  version: '1.1.0'
 });
 
 Cordova.depends({
diff --git a/packages/less/package.js b/packages/less/package.js
index 5fb80c3d43..e3c89499e6 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6-rc.4',
+  version: '2.7.6',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 52ea89e550..3b4cc80c50 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12-rc.4"
+  version: "1.0.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/logging/package.js b/packages/logging/package.js
index a951706a43..deef99b0ca 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Logging facility.",
-  version: '1.1.16-rc.4'
+  version: '1.1.16'
 });
 
 Npm.depends({
diff --git a/packages/logic-solver/package.js b/packages/logic-solver/package.js
index 83152ef999..f173dd5633 100644
--- a/packages/logic-solver/package.js
+++ b/packages/logic-solver/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "General satisfiability solver for logic problems",
-  version: '2.0.7-rc.4'
+  version: '2.0.7'
 });
 
 Package.on_use(function (api) {
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index 012053a6c5..0c97f5126a 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Markdown-to-HTML processor",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meetup/package.js b/packages/meetup/package.js
index cea5ec5995..ef51925996 100644
--- a/packages/meetup/package.js
+++ b/packages/meetup/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meetup OAuth flow",
-  version: "1.6.5-rc.4"
+  version: "1.6.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js
index 06b2ab8be6..1453ce78b1 100644
--- a/packages/meteor-developer/package.js
+++ b/packages/meteor-developer/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor developer accounts OAuth flow",
-  version: "1.1.10-rc.4"
+  version: "1.1.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 4614facf7c..8c64e92fd7 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-rc.4'
+  version: '1.4.2'
 });
 
 Package.includeTool();
diff --git a/packages/meteor/package.js b/packages/meteor/package.js
index ecdfcd96c7..2753bc79a1 100644
--- a/packages/meteor/package.js
+++ b/packages/meteor/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: "Core Meteor environment",
-  version: '1.6.0-rc.4'
+  version: '1.6.0'
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index e0e1df21b4..b27a0d395a 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15-rc.4"
+  version: "1.2.15"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 414c6c3570..831c952eb2 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15-rc.4"
+  version: "1.2.15"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index ed87de1b55..8ae9f077c1 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18-rc.4'
+  version: '1.0.18'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js
index d4398eceac..48f264f1b1 100644
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Good defaults for the mobile status bar",
-  version: "1.0.13-rc.4"
+  version: "1.0.13"
 });
 
 Cordova.depends({
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index c39d167d2a..2cf3791782 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.7.7-rc.4",
+  version: "0.7.7",
   summary: "CommonJS module system",
   git: "https://github.com/benjamn/install",
   documentation: "README.md"
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 934022a3eb..3b458fbb37 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7-rc.4",
+  version: "0.7.7",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo-id/package.js b/packages/mongo-id/package.js
index f4db40034c..a3fc9342e3 100644
--- a/packages/mongo-id/package.js
+++ b/packages/mongo-id/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JS simulation of MongoDB ObjectIDs",
-  version: '1.0.6-rc.4',
+  version: '1.0.6',
   documentation: null
 });
 
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index d49c85f0b0..f03f3ac16a 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.14-rc.4'
+  version: '1.1.14'
 });
 
 Npm.depends({
diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js
index fe4c5c7ae2..b070cc4a05 100644
--- a/packages/npm-bcrypt/package.js
+++ b/packages/npm-bcrypt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Wrapper around the bcrypt npm package",
-  version: "0.9.2-rc.4",
+  version: "0.9.2",
   documentation: null
 });
 
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index 59917aa633..8a21cb4846 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: '2.2.11-2-rc.4',
+  version: '2.2.11_2',
   documentation: null
 });
 
diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js
index 3f472e71a8..9b622c4683 100644
--- a/packages/oauth-encryption/package.js
+++ b/packages/oauth-encryption/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Encrypt account secrets stored in the database",
-  version: '1.2.1-rc.4'
+  version: '1.2.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth/package.js b/packages/oauth/package.js
index cf8d701dab..ed85871925 100644
--- a/packages/oauth/package.js
+++ b/packages/oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based services",
-  version: "1.1.12-rc.4"
+  version: "1.1.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js
index 49615b8839..f86a19cab9 100644
--- a/packages/oauth1/package.js
+++ b/packages/oauth1/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth1-based login services",
-  version: "1.1.11-rc.4"
+  version: "1.1.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js
index 82d3d29ccd..c73f05e6de 100644
--- a/packages/oauth2/package.js
+++ b/packages/oauth2/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth2-based login services",
-  version: "1.1.11-rc.4"
+  version: "1.1.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js
index bd62ab54cd..4a18677f95 100644
--- a/packages/observe-sequence/package.js
+++ b/packages/observe-sequence/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Observe changes to various sequence types such as arrays, cursors and objects",
-  version: "1.0.14-rc.4"
+  version: "1.0.14"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js
index e4ea86e23b..3e9af08368 100644
--- a/packages/ordered-dict/package.js
+++ b/packages/ordered-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Ordered traversable dictionary with a mutable ordering",
-  version: '1.0.9-rc.4',
+  version: '1.0.9',
   documentation: null
 });
 
diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js
index 7fc9ee05fa..601910f00f 100644
--- a/packages/package-version-parser/package.js
+++ b/packages/package-version-parser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Parses Meteor Smart Package version strings",
-  version: "3.0.10-rc.4"
+  version: "3.0.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js
index 90a91608b2..aade8591ae 100644
--- a/packages/preserve-inputs/package.js
+++ b/packages/preserve-inputs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Deprecated package (now empty)",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 0b807e56fb..b4049ed53a 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8-rc.4",
+  version: "0.8.8",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/rate-limit/package.js b/packages/rate-limit/package.js
index dbf722527b..06f92b3e2a 100644
--- a/packages/rate-limit/package.js
+++ b/packages/rate-limit/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'rate-limit',
-  version: '1.0.6-rc.4',
+  version: '1.0.6',
   // Brief, one-line summary of the package.
   summary: 'An algorithm for rate limiting anything',
   // URL to the Git repository containing the source code for this package.
diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js
index 35b088bb1b..029608a876 100644
--- a/packages/reactive-var/package.js
+++ b/packages/reactive-var/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive variable",
-  version: '1.0.11-rc.4'
+  version: '1.0.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js
index a559fdca16..153ed5268a 100644
--- a/packages/reload-safetybelt/package.js
+++ b/packages/reload-safetybelt/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload safety belt for multi-server deployments",
-  version: '1.0.11-rc.4'
+  version: '1.0.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/reload/package.js b/packages/reload/package.js
index aeb0297d6a..b1d955764f 100644
--- a/packages/reload/package.js
+++ b/packages/reload/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reload the page while preserving application state.",
-  version: '1.1.11-rc.4'
+  version: '1.1.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/retry/package.js b/packages/retry/package.js
index 4a50a458db..dfb443fe47 100644
--- a/packages/retry/package.js
+++ b/packages/retry/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Retry logic with exponential backoff",
-  version: '1.0.9-rc.4'
+  version: '1.0.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js
index cb0fff9bfb..b443732575 100644
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "route policy declarations",
-  version: '1.0.12-rc.4'
+  version: '1.0.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js
index 85d1ec349c..5dc8795b9a 100644
--- a/packages/service-configuration/package.js
+++ b/packages/service-configuration/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Manage the configuration for third-party services",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/session/package.js b/packages/session/package.js
index d00c3f8c62..aaf70597e5 100644
--- a/packages/session/package.js
+++ b/packages/session/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Session variable",
-  version: '1.1.7-rc.4'
+  version: '1.1.7'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/sha/package.js b/packages/sha/package.js
index a2007bf198..5d77ef40a4 100644
--- a/packages/sha/package.js
+++ b/packages/sha/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.9-rc.4',
+  version: '1.0.9',
   summary: 'SHA256 implementation',
   git: 'https://github.com/meteor/meteor'
 });
diff --git a/packages/srp/package.js b/packages/srp/package.js
index 9d006cf869..b30f47df87 100644
--- a/packages/srp/package.js
+++ b/packages/srp/package.js
@@ -5,7 +5,7 @@
 
 Package.describe({
   summary: "Library for Secure Remote Password (SRP) exchanges",
-  version: "1.0.10-rc.4"
+  version: "1.0.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 49fd04bc1f..08c4d4cd11 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.3.2-rc.4',
+  version: '1.3.2',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index f69c7e6189..3393ed9d29 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1-rc.4',
+  version: '1.2.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 30b17fd291..4c60e880f3 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6-rc.4"
+  version: "2.513.6"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 7ae5c7d37f..5875b895fb 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility functions for tests",
-  version: '1.0.11-rc.4'
+  version: '1.0.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js
index 5bfb58fd17..36cba98c44 100644
--- a/packages/test-in-browser/package.js
+++ b/packages/test-in-browser/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests interactively in the browser",
-  version: '1.0.13-rc.4',
+  version: '1.0.13',
   documentation: null
 });
 
diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index 1dbc999af2..50efe81ea0 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,10 +1,9 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13-rc.4'
+  version: '1.0.14'
 });
 
 Package.onUse(function (api) {
-
   api.use(['tinytest', 'underscore', 'random', 'ejson', 'check']);
   api.use('http', 'server');
 
diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js
index f17fcf043b..a6278134f9 100644
--- a/packages/test-server-tests-in-console-once/package.js
+++ b/packages/test-server-tests-in-console-once/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run server tests noninteractively, with results going to the console.",
-  version: '1.0.11-rc.4'
+  version: '1.0.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js
index 0dc4a267a4..7f9bd5eddd 100644
--- a/packages/tinytest/package.js
+++ b/packages/tinytest/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Tiny testing framework",
-  version: '1.0.12-rc.4'
+  version: '1.0.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/tracker/package.js b/packages/tracker/package.js
index b52c340f37..b3b886327f 100644
--- a/packages/tracker/package.js
+++ b/packages/tracker/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Dependency tracker to allow reactive callbacks",
-  version: '1.1.1-rc.4'
+  version: '1.1.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 740d4f484d..6ecc3df7db 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13-rc.4'
+  version: '1.1.13'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index eb4a2db6e9..483509a727 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Collection of small helpers: _.map, _.each, ...",
-  version: '1.0.10-rc.4'
+  version: '1.0.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/url/package.js b/packages/url/package.js
index 16cbbe4baf..7e507f83a0 100644
--- a/packages/url/package.js
+++ b/packages/url/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Utility code for constructing URLs",
-  version: "1.0.11-rc.4"
+  version: "1.0.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index d90111e2ba..1be1c8129a 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Serves a Meteor app over HTTP",
-  version: '1.3.12-rc.4'
+  version: '1.3.12'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/weibo/package.js b/packages/weibo/package.js
index eb6cc0c56c..071153c0b6 100644
--- a/packages/weibo/package.js
+++ b/packages/weibo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Weibo OAuth flow",
-  version: '1.1.9-rc.4'
+  version: '1.1.9'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js
index d0417c2399..305539606e 100644
--- a/packages/xmlbuilder/package.js
+++ b/packages/xmlbuilder/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "An XML builder for node.js similar to java-xmlbuilder.",
-  version: '2.5.15-rc.4'
+  version: '2.5.15'
 });
 
 Npm.depends({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index f44dc66103..71219f1d08 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,8 +1,7 @@
 {
   "track": "METEOR",
-  "version": "1.4.1.3",
+  "version": "1.4.2",
   "recommended": false,
   "official": true,
-  "description": "The Official Meteor Distribution",
-  "patchFrom": ["1.4.1.2"]
+  "description": "The Official Meteor Distribution"
 }

From 926ad28fadc0f48f290322b5fc4898e19d1a7dc6 Mon Sep 17 00:00:00 2001
From: Thea Lamkin <thea.lamkin@gmail.com>
Date: Tue, 25 Oct 2016 14:12:40 -0700
Subject: [PATCH 466/688] Add project overview section to Contributing.md

Expanding on ways to contribute and project roles
---
 Contributing.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 78 insertions(+), 4 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 7bca90b0d9..629dc853af 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -1,10 +1,84 @@
 # Contributing to Meteor
 
-Thank you for contributing to the Meteor project! Please read the guidelines below or it might be
-hard for the community to help you with your issue or pull request.
+We are excited to have your help building Meteor &mdash; both the platform and the community behind it. Please read the project overview and guidelines for contributing bug reports and new code, or it might be hard for the community to help you with your issue or pull request.
 
-We are excited to have your help building Meteor &mdash; both the platform and the
-community behind it. Here's how you can help with bug reports and new code.
+<h2 id="project-overview">Project overview</h2>
+
+Before we jump into detailed guidelines for opening and triaging issues and submitting pull requests, here is some information about how our project is structured and resources you should refer to as you start contributing. 
+
+### Ways to contribute
+
+There are many ways to contribute to the Meteor Project. Here’s a list of technical contributions with increasing levels of involvement and required knowledge of Meteor’s code and operations.  
+- [Reporting a bug](https://github.com/meteor/meteor/blob/devel/Contributing.md#reporting-a-bug-in-meteor)
+- [Triaging issues](https://github.com/meteor/meteor/blob/devel/IssueTriage.md)
+- [Contributing to documentation](https://github.com/meteor/docs/blob/master/Contributing.md) 
+- [Submitting pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#making-changes-to-meteor-core) 
+- Reviewing pull requests 
+- Maintaining a community package
+
+There are also several ways to contribute to the Meteor Project outside of GitHub, like organizing or speaking at [Meetups](https://www.meetup.com/topics/meteor/) and events and helping to moderate our [forums](https://forums.meteor.com/). Stay tuned for more documentation around non-code contributions. 
+
+If you can think of any changes to the project or documentation that would improve the contributor experience, let us know by opening an issue!
+
+### Project roles
+
+We’ve just begun to create more defined project roles for Meteor. Here are descriptions of the existing project roles, along with the current contributors taking on those roles today. 
+
+#### Issue Triager 
+
+Issue Triagers are members of the community that meet with us weekly to help triage Meteor’s open issues and bug reports. Once you’ve begun triaging issues regularly on your own, we will invite you to join our dedicated Slack channel to participate in these regular coordination sessions. 
+
+Current Issue Triagers: 
+- [@hwillson](https://github.com/hwillson)
+- [@laosb](https://github.com/laosb)
+- [@abernix](https://github.com/abernix)
+- [@lorensr](https://github.com/lorensr)
+
+#### Reviewer
+
+Our most regular and experienced Issue Triagers sometimes move on to doing code reviews for pull requests, and have input into which pull requests should be merged. 
+
+Current Reviewers:
+- [@lorensr](https://github.com/lorensr)
+- [@abernix](https://github.com/abernix)
+
+#### Core Committer 
+
+For now, the only contributors with commit access to meteor/meteor are employees of Meteor Development Group, the company that sponsors the Meteor project. We're actively exploring adding non-MDG core committers who have distinguished themselves in other contribution areas.  
+
+Project Lead: [@benjamn](https://github.com/benjamn)
+
+Current Core Committers: 
+- [@tmeasday](https://github.com/tmeasday)
+- [@zol](https://github.com/zol)
+- [@glasser](https://github.com/glasser)
+- [@stubailo](https://github.com/stubailo)
+
+#### Documentation Maintainer
+
+Documentation Maintainers are regular documentation contributors that have been given the ability to merge docs changes on [meteor/docs](https://github.com/meteor/docs). 
+
+Current Documentation Maintainers:
+- [@tmeasday](https://github.com/tmeasday)
+- [@lorensr](https://github.com/lorensr)
+
+#### Community Package Maintainer:
+
+Community package maintainers are community members who maintain packages outside of Meteor core. This requires code to be extracted from meteor/meteor, and entails a high level of responsibility. For this reason, community maintainers generally (and currently) must first become an advanced contributor to Meteor core and have 4-5 non-trivial pull requests merged that went through the proper contribution workflow. At that point, core contributors may make the case for breaking out a particular core package, and assist in the technical process around doing so. 
+
+Current Community Package Maintainers: 
+- @mitar for [Blaze](https://github.com/meteor/blaze) 
+
+#### Community Manager
+
+The community manager helps to coordinate resources, documentation, events, and other supportive work needed to ensure the health of the Meteor project.
+
+Current Community Manager:
+- @theadactyl
+
+### Tracking project work
+
+Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests from the community with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
 
 <h2 id="reporting-bug">Reporting a bug in Meteor</h2>
 

From 209dec52e4e0fc2847e1d68b52a0fa1920e62015 Mon Sep 17 00:00:00 2001
From: Thea Lamkin <thea.lamkin@gmail.com>
Date: Tue, 25 Oct 2016 14:15:50 -0700
Subject: [PATCH 467/688] Update Contribute.md

adding links, minor edits
---
 Contributing.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 629dc853af..254a72e72f 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -13,8 +13,8 @@ There are many ways to contribute to the Meteor Project. Here’s a list of tech
 - [Triaging issues](https://github.com/meteor/meteor/blob/devel/IssueTriage.md)
 - [Contributing to documentation](https://github.com/meteor/docs/blob/master/Contributing.md) 
 - [Submitting pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#making-changes-to-meteor-core) 
-- Reviewing pull requests 
-- Maintaining a community package
+- [Reviewing pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#reviewer) 
+- [Maintaining a community package](https://github.com/meteor/meteor/blob/devel/Contributing.md#community-package-maintainer)
 
 There are also several ways to contribute to the Meteor Project outside of GitHub, like organizing or speaking at [Meetups](https://www.meetup.com/topics/meteor/) and events and helping to moderate our [forums](https://forums.meteor.com/). Stay tuned for more documentation around non-code contributions. 
 
@@ -67,18 +67,18 @@ Current Documentation Maintainers:
 Community package maintainers are community members who maintain packages outside of Meteor core. This requires code to be extracted from meteor/meteor, and entails a high level of responsibility. For this reason, community maintainers generally (and currently) must first become an advanced contributor to Meteor core and have 4-5 non-trivial pull requests merged that went through the proper contribution workflow. At that point, core contributors may make the case for breaking out a particular core package, and assist in the technical process around doing so. 
 
 Current Community Package Maintainers: 
-- @mitar for [Blaze](https://github.com/meteor/blaze) 
+- [@mitar](https://github.com/mitar) for [Blaze](https://github.com/meteor/blaze) 
 
 #### Community Manager
 
 The community manager helps to coordinate resources, documentation, events, and other supportive work needed to ensure the health of the Meteor project.
 
 Current Community Manager:
-- @theadactyl
+- [@theadactyl](https://github.com/theadactyl)
 
 ### Tracking project work
 
-Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests from the community with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
+Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests for community contributors with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
 
 <h2 id="reporting-bug">Reporting a bug in Meteor</h2>
 

From f7271e214a689f5f6ae071faaecf581104ec0bed Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Oct 2016 15:00:25 -0700
Subject: [PATCH 468/688] Update modules test app to Meteor 1.4.2.

---
 tools/tests/apps/modules/.meteor/packages |  20 ++--
 tools/tests/apps/modules/.meteor/release  |   2 +-
 tools/tests/apps/modules/.meteor/versions | 120 +++++++++++-----------
 3 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index e31a9d935f..19ae02786c 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -6,20 +6,20 @@
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
 mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.11                   # The database Meteor supports right now
+mongo@1.1.14                   # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
-session@1.1.6                 # Client-side reactive dictionary for your app
-jquery@1.11.9                  # Helpful client-side library
-tracker@1.1.0                 # Meteor's client-side reactive programming library
+session@1.1.7                 # Client-side reactive dictionary for your app
+jquery@1.11.10                  # Helpful client-side library
+tracker@1.1.1                 # Meteor's client-side reactive programming library
 
-es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript@1.2.4
+coffeescript@1.11.1_2
 modules-test-package
 avital:mocha
-standard-minifier-css@1.2.0
-standard-minifier-js@1.2.0
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
 client-only-ecmascript
 modules-test-plugin
-shell-server
+shell-server@0.2.1
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index 30b2c590e3..c26084673d 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.1
+METEOR@1.4.2
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 3a2911a046..1735eab3e0 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -1,80 +1,82 @@
 allow-deny@1.0.5
-autoupdate@1.3.11
+autoupdate@1.3.12
 avital:mocha@2.1.0_10
-babel-compiler@6.9.1
-babel-runtime@0.1.11
-base64@1.0.9
-binary-heap@1.0.9
-blaze@2.1.8
-blaze-html-templates@1.0.4
-blaze-tools@1.0.9
-boilerplate-generator@1.0.9
-caching-compiler@1.1.7
-caching-html-compiler@1.0.6
-callback-hook@1.0.9
-check@1.2.3
+babel-compiler@6.13.0
+babel-runtime@0.1.12
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.1.9
+blaze-html-templates@1.0.5
+blaze-tools@1.0.10
+boilerplate-generator@1.0.11
+caching-compiler@1.1.8
+caching-html-compiler@1.0.7
+callback-hook@1.0.10
+check@1.2.4
 client-only-ecmascript@0.0.1
-coffeescript@1.2.4
+coffeescript@1.11.1_2
 ddp@1.2.5
-ddp-client@1.3.1
-ddp-common@1.2.6
-ddp-server@1.3.10
+ddp-client@1.3.2
+ddp-common@1.2.7
+ddp-server@1.3.11
 deps@1.0.12
-diff-sequence@1.0.6
-ecmascript@0.5.8
-ecmascript-runtime@0.3.14
-ejson@1.0.12
-es5-shim@4.6.14
-fastclick@1.0.12
-geojson-utils@1.0.9
+diff-sequence@1.0.7
+ecmascript@0.5.9
+ecmascript-runtime@0.3.15
+ejson@1.0.13
+es5-shim@4.6.15
+fastclick@1.0.13
+geojson-utils@1.0.10
 hot-code-push@1.0.4
-html-tools@1.0.10
-htmljs@1.0.10
-http@1.2.9
-id-map@1.0.8
-jquery@1.11.9
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.2.10
+id-map@1.0.9
+jquery@1.11.10
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.1.15
-meteor@1.2.17
+logging@1.1.16
+meteor@1.6.0
 meteor-base@1.0.4
-minifier-css@1.2.14
-minifier-js@1.2.14
-minimongo@1.0.17
+minifier-css@1.2.15
+minifier-js@1.2.15
+minimongo@1.0.18
 mobile-experience@1.0.4
-mobile-status-bar@1.0.12
-modules@0.7.6
-modules-runtime@0.7.6
+mobile-status-bar@1.0.13
+modules@0.7.7
+modules-runtime@0.7.7
 modules-test-package@0.0.1
 modules-test-plugin@0.0.1
-mongo@1.1.11
-mongo-id@1.0.5
-npm-mongo@1.5.46
-observe-sequence@1.0.12
-ordered-dict@1.0.8
+mongo@1.1.14
+mongo-id@1.0.6
+npm-mongo@2.2.11_2
+observe-sequence@1.0.14
+ordered-dict@1.0.9
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
 practicalmeteor:mocha-core@0.1.4
 practicalmeteor:sinon@1.14.1_2
-promise@0.8.4
+promise@0.8.8
 random@1.0.10
 reactive-dict@1.1.8
-reactive-var@1.0.10
-reload@1.1.10
-retry@1.0.8
-routepolicy@1.0.11
-session@1.1.6
+reactive-var@1.0.11
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
+session@1.1.7
 shell-server@0.2.1
-spacebars@1.0.12
-spacebars-compiler@1.0.12
-standard-minifier-css@1.2.0
-standard-minifier-js@1.2.0
-templating@1.2.14
-templating-tools@1.0.4
+spacebars@1.0.13
+spacebars-compiler@1.0.13
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
+templating@1.2.15
+templating-compiler@1.2.15
+templating-runtime@1.2.15
+templating-tools@1.0.5
 tmeasday:test-reporter-helpers@0.2.1
-tracker@1.1.0
-ui@1.0.11
-underscore@1.0.9
-url@1.0.10
-webapp@1.3.11
+tracker@1.1.1
+ui@1.0.12
+underscore@1.0.10
+url@1.0.11
+webapp@1.3.12
 webapp-hashing@1.0.9

From 68a07c5d3b2088a80bd9084b9bf3ba60fad67080 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Tue, 25 Oct 2016 21:20:23 -0400
Subject: [PATCH 469/688] When the program.json is loaded use the Unicode
 Normalization Form of the loaded JSON string.

---
 tools/static-assets/server/server-json.js     |  4 ++-
 .../apps/unicode-asset-app/.meteor/.gitignore |  1 +
 .../apps/unicode-asset-app/.meteor/packages   |  7 ++++++
 .../apps/unicode-asset-app/.meteor/release    |  1 +
 tools/tests/apps/unicode-asset-app/index.js   |  3 +++
 .../unicode-asset-app/private/maça verde.txt  |  1 +
 tools/tests/assets.js                         | 25 +++++++++++++++++++
 7 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/.gitignore
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/packages
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/release
 create mode 100644 tools/tests/apps/unicode-asset-app/index.js
 create mode 100644 tools/tests/apps/unicode-asset-app/private/maça verde.txt
 create mode 100644 tools/tests/assets.js

diff --git a/tools/static-assets/server/server-json.js b/tools/static-assets/server/server-json.js
index 1711bb2415..a3d2069730 100644
--- a/tools/static-assets/server/server-json.js
+++ b/tools/static-assets/server/server-json.js
@@ -1,4 +1,6 @@
 var fs = require("fs");
 var path = require("path");
 var serverJsonPath = path.resolve(process.argv[2]);
-module.exports = JSON.parse(fs.readFileSync(serverJsonPath, 'utf8'));
+module.exports = JSON.parse(
+  fs.readFileSync(serverJsonPath, 'utf8').normalize('NFC')
+);
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/.gitignore b/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/packages b/tools/tests/apps/unicode-asset-app/.meteor/packages
new file mode 100644
index 0000000000..356aa29878
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/packages
@@ -0,0 +1,7 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/release b/tools/tests/apps/unicode-asset-app/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/unicode-asset-app/index.js b/tools/tests/apps/unicode-asset-app/index.js
new file mode 100644
index 0000000000..bb4d1ddb8d
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/index.js
@@ -0,0 +1,3 @@
+if (Meteor.isServer) {
+  console.log(Assets.getText('maça verde.txt'));
+}
diff --git a/tools/tests/apps/unicode-asset-app/private/maça verde.txt b/tools/tests/apps/unicode-asset-app/private/maça verde.txt
new file mode 100644
index 0000000000..cd0875583a
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/private/maça verde.txt	
@@ -0,0 +1 @@
+Hello world!
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
new file mode 100644
index 0000000000..3ed52ba136
--- /dev/null
+++ b/tools/tests/assets.js
@@ -0,0 +1,25 @@
+var selftest = require('../tool-testing/selftest.js');
+
+var Sandbox = selftest.Sandbox;
+
+var MONGO_LISTENING =
+  { stdout: " [initandlisten] waiting for connections on port" };
+
+function startRun(sandbox) {
+  var run = sandbox.run();
+  run.match("myapp");
+  run.match("proxy");
+  run.tellMongo(MONGO_LISTENING);
+  run.match("MongoDB");
+  return run;
+};
+
+// Test that an app can properly read assets with unicode based filenames
+selftest.define("assets - unicode asset names are allowed", () => {
+  const s = new Sandbox({ fakeMongo: true });
+  s.createApp('myapp', 'unicode-asset-app');
+  s.cd('myapp');
+  const run = startRun(s);
+  run.match('Hello world!');
+  run.stop();
+});

From f143683493d3f53cd773abe953b7a4385286cd9a Mon Sep 17 00:00:00 2001
From: Lucas Hansen <lucashansen@gmail.com>
Date: Tue, 25 Oct 2016 21:06:17 -0700
Subject: [PATCH 470/688] Replace forkJoin with enterJob to avoid fiber issues

---
 tools/packaging/catalog/catalog-local.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index c4add4ba05..3a1ba50150 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -404,15 +404,11 @@ _.extend(LocalCatalog.prototype, {
 
     // Load the package sources for packages and their tests into
     // self.packages.
-    //
-    // XXX We should make this work with parallel: true; right now it seems to
-    // hit node problems.
-    buildmessage.forkJoin(
-      { 'title': 'initializing packages', parallel: false },
-      self.effectiveLocalPackageDirs,
-      function (dir) {
+    buildmessage.enterJob('initializing packages', function() {
+      _.each(self.effectiveLocalPackageDirs, function (dir) {
         initSourceFromDir(dir);
       });
+    });
   },
 
   getPackageSource: function (name) {

From 0b2c4d2dbfe962dc23a05b6d36b9354c36bb6b45 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 26 Oct 2016 09:29:11 -0400
Subject: [PATCH 471/688] Preventing undefined callback from being passed into
 the forgotPassword Method, which in turn prevents unnecessary
 audit-argument-checks warnings.

---
 packages/accounts-password/password_client.js |  6 ++-
 packages/accounts-password/password_tests.js  | 39 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index bc1478507f..1a5bcd468c 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -220,7 +220,11 @@ Accounts.forgotPassword = function(options, callback) {
   if (!options.email) {
     return reportError(new Meteor.Error(400, "Must pass options.email"), callback);
   }
-  Accounts.connection.call("forgotPassword", options, callback);
+  if (callback) {
+    Accounts.connection.call("forgotPassword", options, callback);
+  } else {
+    Accounts.connection.call("forgotPassword", options);
+  }
 };
 
 // Resets a password based on a token originally created by
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 1d9467d6b5..ceb980c920 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -2,7 +2,7 @@ Accounts._noConnectionCloseDelayForTest = true;
 
 if (Meteor.isServer) {
   Accounts.removeDefaultRateLimit();
-  
+
   Meteor.methods({
     getResetToken: function () {
       var token = Meteor.users.findOne(this.userId).services.password.reset;
@@ -557,8 +557,8 @@ if (Meteor.isClient) (function () {
       }, 10 * 1000, 100);
     }
   ]);
-  
-  
+
+
   testAsyncMulti("passwords - forgotPassword client return error when empty email", [
     function (test, expect) {
       // setup
@@ -578,7 +578,36 @@ if (Meteor.isClient) (function () {
       }, /Must pass options\.email/);
     },
   ]);
- 
+
+  Tinytest.add(
+    'passwords - forgotPassword only passes callback value to forgotPassword '
+    + 'Method if callback is defined',
+    function (test) {
+      let methodCallArgumentCount = 0;
+      const originalMethodCall = Accounts.connection.call;
+      const stubMethodCall = (...args) => {
+        methodCallArgumentCount = args.length;
+      }
+      Accounts.connection.call = stubMethodCall;
+
+      Accounts.forgotPassword({ email: 'test@meteor.com' });
+      test.equal(
+        methodCallArgumentCount,
+        2,
+        'Method call should have 2 arguments since no callback is passed in'
+      );
+
+      Accounts.forgotPassword({ email: 'test@meteor.com' }, () => {});
+      test.equal(
+        methodCallArgumentCount,
+        3,
+        'Method call should have 3 arguments since a callback is passed in'
+      );
+
+      Accounts.connection.call = originalMethodCall;
+    }
+  );
+
   testAsyncMulti("passwords - verifyEmail client return error when empty token", [
     function (test, expect) {
       // setup
@@ -598,7 +627,7 @@ if (Meteor.isClient) (function () {
       }, /Need to pass token/);
     },
   ]);
- 
+
   testAsyncMulti("passwords - resetPassword errors", [
     function (test, expect) {
       // setup

From 2afc4bfd535ae197663354f391b9d574a0701ecd Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 26 Oct 2016 11:59:44 -0400
Subject: [PATCH 472/688] Minor formatting adjustment to force CI rebuild.

---
 packages/accounts-password/password_client.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index 1a5bcd468c..28e2787c4f 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -220,6 +220,7 @@ Accounts.forgotPassword = function(options, callback) {
   if (!options.email) {
     return reportError(new Meteor.Error(400, "Must pass options.email"), callback);
   }
+
   if (callback) {
     Accounts.connection.call("forgotPassword", options, callback);
   } else {

From 937f7269fc2517fc7a245132d91ceac789572622 Mon Sep 17 00:00:00 2001
From: Michael Oberegger <michaelo@iouconcepts.com>
Date: Wed, 26 Oct 2016 12:30:50 -0400
Subject: [PATCH 473/688] Added support for frame-ancestors CSP in
 browser-policy package.

---
 .../browser-policy-content.js                 | 96 ++++++++++---------
 packages/browser-policy-content/package.js    |  2 +-
 .../browser-policy/browser-policy-test.js     |  7 ++
 packages/browser-policy/package.js            |  2 +-
 4 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
index 49fb21ff3a..958fd18f7b 100644
--- a/packages/browser-policy-content/browser-policy-content.js
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -17,7 +17,7 @@
 // disallowEval()
 //
 // For each type of content (script, object, image, media, font, connect,
-// style), there are the following functions:
+// style, frame, frame-ancestors), there are the following functions:
 // allow<content type>Origin(origin): allows the type of content to be loaded
 // from the given origin
 // allow<content type>DataUrl(): allows the content to be loaded from data: URLs
@@ -248,53 +248,55 @@ _.extend(BrowserPolicy.content, {
 
 // allow<Resource>Origin, allow<Resource>Data, allow<Resource>self, and
 // disallow<Resource> methods for each type of resource.
-_.each(["script", "object", "img", "media",
-        "font", "connect", "style", "frame"],
-       function (resource) {
-         var directive = resource + "-src";
-         var methodResource;
-         if (resource !== "img") {
-           methodResource = resource.charAt(0).toUpperCase() +
-             resource.slice(1);
-         } else {
-           methodResource = "Image";
-         }
-         var allowMethodName = "allow" + methodResource + "Origin";
-         var disallowMethodName = "disallow" + methodResource;
-         var allowDataMethodName = "allow" + methodResource + "DataUrl";
-         var allowBlobMethodName = "allow" + methodResource + "BlobUrl";
-         var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
+var resources = [
+  { methodResource: "Script", directive: "script-src" },
+  { methodResource: "Object", directive: "object-src" },
+  { methodResource: "Image", directive: "img-src" },
+  { methodResource: "Media", directive: "media-src" },
+  { methodResource: "Font", directive: "font-src" },
+  { methodResource: "Connect", directive: "connect-src" },
+  { methodResource: "Style", directive: "style-src" },
+  { methodResource: "Frame", directive: "frame-src" },
+  { methodResource: "FrameAncestors", directive: "frame-ancestors" }
+];
+_.each(resources,
 function (resource) {
+  var directive = resource.directive;

+  var methodResource = resource.methodResource;

+  var allowMethodName = "allow" + methodResource + "Origin";
+  var disallowMethodName = "disallow" + methodResource;
+  var allowDataMethodName = "allow" + methodResource + "DataUrl";

+  var allowBlobMethodName = "allow" + methodResource + "BlobUrl";
+  var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
 
-         var disallow = function () {
-           cachedCsp = null;
-           cspSrcs[directive] = [];
-         };
-
-         BrowserPolicy.content[allowMethodName] = function (src) {
-           prepareForCspDirective(directive);
-           addSourceForDirective(directive, src);
-         };
-         if (resource === "script") {
-           BrowserPolicy.content[disallowMethodName] = function () {
-             disallow();
-             setWebAppInlineScripts(false);
-           };
-         } else {
-           BrowserPolicy.content[disallowMethodName] = disallow;
-         }
-         BrowserPolicy.content[allowDataMethodName] = function () {
-           prepareForCspDirective(directive);
-           cspSrcs[directive].push("data:");
-         };
-         BrowserPolicy.content[allowBlobMethodName] = function () {
-           prepareForCspDirective(directive);
-           cspSrcs[directive].push("blob:");
-         };
-         BrowserPolicy.content[allowSelfMethodName] = function () {
-           prepareForCspDirective(directive);
-           cspSrcs[directive].push(keywords.self);
-         };
-       });
+  var disallow = function () {
+    cachedCsp = null;
+    cspSrcs[directive] = [];
+  };
 
+  BrowserPolicy.content[allowMethodName] = function (src) {
+    prepareForCspDirective(directive);
+    addSourceForDirective(directive, src);
+  };
+  if (resource === "script") {
+    BrowserPolicy.content[disallowMethodName] = function () {
+      disallow();
+      setWebAppInlineScripts(false);
+    };
+  } else {
+    BrowserPolicy.content[disallowMethodName] = disallow;
+  }
+  BrowserPolicy.content[allowDataMethodName] = function () {
+    prepareForCspDirective(directive);
+    cspSrcs[directive].push("data:");
+  };
+  BrowserPolicy.content[allowBlobMethodName] = function () {
+    prepareForCspDirective(directive);
+    cspSrcs[directive].push("blob:");
+  };
+  BrowserPolicy.content[allowSelfMethodName] = function () {
+    prepareForCspDirective(directive);
+    cspSrcs[directive].push(keywords.self);
+  };
+});
 
 setDefaultPolicy();
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 4abffcb51e..a626f9ba88 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.12"
+  version: "1.0.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy/browser-policy-test.js b/packages/browser-policy/browser-policy-test.js
index 1a2ed512bd..19ca95c292 100644
--- a/packages/browser-policy/browser-policy-test.js
+++ b/packages/browser-policy/browser-policy-test.js
@@ -136,6 +136,13 @@ Tinytest.add("browser-policy - csp", function (test) {
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'none'; frame-src https://foo.com; " +
                         "object-src http://foo.com https://foo.com;"));
+
+  // Check that frame-ancestors property is set correctly.

+  BrowserPolicy.content.allowFrameAncestorsOrigin("https://foo.com/");

+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),

+                        "default-src 'none'; frame-src https://foo.com; " +

+                        "object-src http://foo.com https://foo.com; " +

+                        "frame-ancestors https://foo.com;"));
 });
 
 Tinytest.add("browser-policy - x-frame-options", function (test) {
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
index 87e01b6e21..bada8728f1 100644
--- a/packages/browser-policy/package.js
+++ b/packages/browser-policy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure security policies enforced by the browser",
-  version: "1.0.9"
+  version: "1.0.10"
 });
 
 Package.onUse(function (api) {

From 6c3a67518fe05d603790b5ac21e09316c0679135 Mon Sep 17 00:00:00 2001
From: Michael Oberegger <michaelo@iouconcepts.com>
Date: Wed, 26 Oct 2016 12:37:56 -0400
Subject: [PATCH 474/688] Updated documentation to make not of new
 frame-ancestors CSP option.

---
 packages/browser-policy/README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/browser-policy/README.md b/packages/browser-policy/README.md
index 45c59c9654..53cb941e32 100644
--- a/packages/browser-policy/README.md
+++ b/packages/browser-policy/README.md
@@ -66,7 +66,10 @@ that are allowed to frame your app. (This is a limitation of the
 X-Frame-Options header.) Example values of <code>origin</code> include
 "http://example.com" and "https://foo.example.com". <b>This value of
 the X-Frame-Options header is not yet supported in Chrome or Safari
-and will be ignored in those browsers.</b>
+and will be ignored in those browsers. If you need Chrome and/or Safari
+support, or need to allow multiple domains to frame your application,
+you can use the frame-ancestors CSP option via the
+BrowserPolicy.content.allowFrameAncestorsOrigin() function </b>
 </dd>
 
 
@@ -126,7 +129,7 @@ Disallows inline CSS.
 
 Finally, you can configure a whitelist of allowed requests that various types of
 content can make. The following functions are defined for the content types
-script, object, image, media, font, frame, style, and connect.
+script, object, image, media, font, frame, frame-ancestors, style, and connect.
 
 <dl>
 

From 04f401c7119d727b19823004baa75afa209040d6 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Thu, 27 Oct 2016 14:55:56 -0700
Subject: [PATCH 475/688] JSdoc refactoring to make API boxes work again.

---
 packages/ddp-common/method_invocation.js |  4 ++--
 packages/ddp-server/livedata_server.js   |  1 +
 tools/isobuild/package-api.js            |  1 +
 tools/isobuild/package-cordova.js        |  9 ++++++---
 tools/isobuild/package-namespace.js      | 13 +++++++------
 tools/isobuild/package-npm.js            | 13 ++++++++-----
 6 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/ddp-common/method_invocation.js b/packages/ddp-common/method_invocation.js
index 4ec21dde09..d2b8cd510e 100644
--- a/packages/ddp-common/method_invocation.js
+++ b/packages/ddp-common/method_invocation.js
@@ -5,6 +5,7 @@
  * inside a method definition.
  * @param {Object} options
  * @instanceName this
+ * @showInstanceName true
  */
 DDPCommon.MethodInvocation = function (options) {
   var self = this;
@@ -51,7 +52,7 @@ DDPCommon.MethodInvocation = function (options) {
   // On the server, the connection this method call came in on.
 
   /**
-   * @summary Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call. Calls to methods made from a server method which was in turn initiated from the client share the same `connection`. 
+   * @summary Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call. Calls to methods made from a server method which was in turn initiated from the client share the same `connection`.
    * @locus Server
    * @name  connection
    * @memberOf DDPCommon.MethodInvocation
@@ -94,4 +95,3 @@ _.extend(DDPCommon.MethodInvocation.prototype, {
     self._setUserId(userId);
   }
 });
-
diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index 2ac3aebea1..fcd2bf84e3 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -937,6 +937,7 @@ _.extend(Session.prototype, {
  * @summary The server's side of a subscription
  * @class Subscription
  * @instanceName this
+ * @showInstanceName true
  */
 var Subscription = function (
     session, handler, subscriptionId, params, name) {
diff --git a/tools/isobuild/package-api.js b/tools/isobuild/package-api.js
index d204d278c7..0fde64b4ff 100644
--- a/tools/isobuild/package-api.js
+++ b/tools/isobuild/package-api.js
@@ -74,6 +74,7 @@ function forAllMatchingArchs (archs, f) {
  * @name  PackageAPI
  * @class PackageAPI
  * @instanceName api
+ * @showInstanceName true
  * @global
  * @summary Type of the API object passed into the `Package.onUse` function.
  */
diff --git a/tools/isobuild/package-cordova.js b/tools/isobuild/package-cordova.js
index 7ea3fb3aec..32850e56b0 100644
--- a/tools/isobuild/package-cordova.js
+++ b/tools/isobuild/package-cordova.js
@@ -1,9 +1,13 @@
 import { ensureOnlyValidVersions } from "../utils/utils.js";
 import buildmessage from "../utils/buildmessage.js";
 
-// == Class of the `Cordova` object visible in package.js ==
-
 export class PackageCordova {
+  /**
+   * @summary Class of the 'Cordova' object visible in package.js
+   * @locus package.js
+   * @instanceName Cordova
+   * @showInstanceName true
+   */
   constructor() {
     this._dependencies = null;
   }
@@ -39,7 +43,6 @@ export class PackageCordova {
    * ```
    *
    * @locus package.js
-   * @memberOf  Cordova
    */
   depends(dependencies) {
     // XXX make cordovaDependencies be separate between use and test, so that
diff --git a/tools/isobuild/package-namespace.js b/tools/isobuild/package-namespace.js
index 89124655b4..094979b926 100644
--- a/tools/isobuild/package-namespace.js
+++ b/tools/isobuild/package-namespace.js
@@ -3,9 +3,13 @@ import { inCheckout } from "../fs/files.js";
 import buildmessage from "../utils/buildmessage.js";
 import packageVersionParser from "../packaging/package-version-parser.js";
 
-// == Class of the 'Package' object visible in package.js ==
-
 export class PackageNamespace {
+  /**
+   * @summary Class of the 'Package' object visible in package.js
+   * @locus package.js
+   * @instanceName Package
+   * @showInstanceName true
+   */
   constructor(packageSource) {
     this._packageSource = packageSource;
     this._fileAndDepLoader = null;
@@ -22,7 +26,7 @@ export class PackageNamespace {
   /**
    * @summary Provide basic package information.
    * @locus package.js
-   * @memberOf Package
+   * @memberOf PackageNamespace
    * @param {Object} options
    * @param {String} options.summary A concise 1-2 sentence description of
    * the package, required for publication.
@@ -149,7 +153,6 @@ export class PackageNamespace {
   /**
    * @summary Define package dependencies and expose package methods.
    * @locus package.js
-   * @memberOf Package
    * @param {Function} func A function that takes in the package control `api` object, which keeps track of dependencies and exports.
    */
   onUse(f) {
@@ -175,7 +178,6 @@ export class PackageNamespace {
   /**
    * @summary Define dependencies and expose package methods for unit tests.
    * @locus package.js
-   * @memberOf Package
    * @param {Function} func A function that takes in the package control 'api' object, which keeps track of dependencies and exports.
    */
   onTest(f) {
@@ -245,7 +247,6 @@ export class PackageNamespace {
    * @param {Object} options.npmDependencies An object where the keys
    * are NPM package names, and the values are the version numbers of
    * required NPM packages, just like in [Npm.depends](#Npm-depends).
-   * @memberOf Package
    * @locus package.js
    */
   registerBuildPlugin(options) {
diff --git a/tools/isobuild/package-npm.js b/tools/isobuild/package-npm.js
index 0a0476e49d..243c965d37 100644
--- a/tools/isobuild/package-npm.js
+++ b/tools/isobuild/package-npm.js
@@ -4,9 +4,13 @@ import NpmDiscards from "./npm-discards.js";
 
 const nodeRequire = require;
 
-// == Class of the `Npm` object visible in package.js ==
-
 export class PackageNpm {
+  /**
+   * @summary Class of the 'Npm' object visible in package.js
+   * @locus package.js
+   * @instanceName Npm
+   * @showInstanceName true
+   */
   constructor() {
     // Files to be stripped from the installed NPM dependency tree. See
     // the Npm.strip comment below for further usage information.
@@ -15,12 +19,12 @@ export class PackageNpm {
   }
 
   /**
-   * @summary Specify which [NPM](https://www.npmjs.org/) packages
+  * @summary Specify which [NPM](https://www.npmjs.org/) packages
    * your Meteor package depends on.
    * @param  {Object} dependencies An object where the keys are package
    * names and the values are one of:
    *   1. Version numbers in string form
-   *   2. Http(s) URLs to a git commit by SHA.   
+   *   2. Http(s) URLs to a git commit by SHA.
    *   3. Git URLs in the format described [here](https://docs.npmjs.com/files/package.json#git-urls-as-dependencies)
    *
    * Https URL example:
@@ -41,7 +45,6 @@ export class PackageNpm {
    * });
    * ```
    * @locus package.js
-   * @memberOf  Npm
    */
   depends(dependencies) {
     // XXX make dependencies be separate between use and test, so that

From 6c1b0976fddfda6a31911d2fd7b20f28b64f8849 Mon Sep 17 00:00:00 2001
From: Devin Bayer <dev@doubly.so>
Date: Fri, 28 Oct 2016 15:04:52 +0200
Subject: [PATCH 476/688] add onMessage hook

---
 packages/ddp-server/livedata_server.js       | 22 +++++++++++++++++++
 packages/ddp-server/livedata_server_tests.js | 23 +++++++++++++++++++-
 packages/ddp-server/server_convenience.js    |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index 2ac3aebea1..f714e6e0de 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -547,6 +547,11 @@ _.extend(Session.prototype, {
           processNext();
         };
 
+        self.server.onMessageHook.each(function (callback) {
+          callback(msg, self);
+          return true;
+        });
+
         if (_.has(self.protocol_handlers, msg.msg))
           self.protocol_handlers[msg.msg].call(self, msg, unblock);
         else
@@ -1320,6 +1325,11 @@ Server = function (options) {
     debugPrintExceptions: "onConnection callback"
   });
 
+  // Map of callbacks to call when a new message comes in.
+  self.onMessageHook = new Hook({
+    debugPrintExceptions: "onMessage callback"
+  });
+
   self.publish_handlers = {};
   self.universal_publish_handlers = [];
 
@@ -1403,6 +1413,18 @@ _.extend(Server.prototype, {
     return self.onConnectionHook.register(fn);
   },
 
+  /**
+   * @summary Register a callback to be called when a new DDP message is received.
+   * @locus Server
+   * @param {function} callback The function to call when a new DDP message is received.
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   */
+  onMessage: function (fn) {
+    var self = this;
+    return self.onMessageHook.register(fn);
+  },
+
   _handleConnect: function (socket, msg) {
     var self = this;
 
diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js
index 10203f319b..d24cfb0d06 100644
--- a/packages/ddp-server/livedata_server_tests.js
+++ b/packages/ddp-server/livedata_server_tests.js
@@ -82,7 +82,6 @@ testAsyncMulti(
   }]
 );
 
-
 Meteor.methods({
   livedata_server_test_inner: function () {
     return this.connection.id;
@@ -94,6 +93,28 @@ Meteor.methods({
 });
 
 
+Tinytest.addAsync(
+    "livedata server - onMessage hook",
+    function (test, onComplete) {
+
+        var cb = Meteor.onMessage(function (msg, session) {
+            test.equal(msg.method, 'livedata_server_test_inner');
+            cb.stop();
+            onComplete();
+        });
+
+        makeTestConnection(
+            test,
+            function (clientConn, serverConn) {
+                clientConn.call('livedata_server_test_inner');
+                clientConn.disconnect();
+            },
+            onComplete
+        );
+    }
+);
+
+
 Tinytest.addAsync(
   "livedata server - connection in method invocation",
   function (test, onComplete) {
diff --git a/packages/ddp-server/server_convenience.js b/packages/ddp-server/server_convenience.js
index 62384353fa..28fca40b2b 100755
--- a/packages/ddp-server/server_convenience.js
+++ b/packages/ddp-server/server_convenience.js
@@ -11,7 +11,7 @@ Meteor.refresh = function (notification) {
 
 // Proxy the public methods of Meteor.server so they can
 // be called directly on Meteor.
-_.each(['publish', 'methods', 'call', 'apply', 'onConnection'],
+_.each(['publish', 'methods', 'call', 'apply', 'onConnection', 'onMessage'],
        function (name) {
          Meteor[name] = _.bind(Meteor.server[name], Meteor.server);
        });

From a0561eef8180576d76cef917be5a7737f0091a0a Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 28 Oct 2016 13:08:01 +0300
Subject: [PATCH 477/688] Fully implement `--no-release-check` for `meteor
 test`

I accidentally a line when I committed/submitted meteor/meteor#7799, as reported in this comment:

https://github.com/meteor/meteor/issues/7026#issuecomment-256728729

The `METEOR_NO_RELEASE_CHECK` environment variable did/does work properly, but both were meant to work.
---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 51d8789917..4aa28ad11f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1441,6 +1441,7 @@ testCommandOptions = {
     // XXX COMPAT WITH 0.9.2.2
     'mobile-port': { type: String },
     'debug-port': { type: String },
+    'no-release-check': { type: Boolean },
     deploy: { type: String },
     production: { type: Boolean },
     settings: { type: String, short: 's' },

From 8d5bfd8ae91f3c3c003da6c841abd31a1d02a743 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Fri, 28 Oct 2016 14:49:46 -0400
Subject: [PATCH 478/688] Trivial: fix comment indentation.

---
 tools/isobuild/package-npm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/package-npm.js b/tools/isobuild/package-npm.js
index 243c965d37..816383d70e 100644
--- a/tools/isobuild/package-npm.js
+++ b/tools/isobuild/package-npm.js
@@ -19,7 +19,7 @@ export class PackageNpm {
   }
 
   /**
-  * @summary Specify which [NPM](https://www.npmjs.org/) packages
+   * @summary Specify which [NPM](https://www.npmjs.org/) packages
    * your Meteor package depends on.
    * @param  {Object} dependencies An object where the keys are package
    * names and the values are one of:

From c38abe8d513790a773484fb72ee76cb000272fe5 Mon Sep 17 00:00:00 2001
From: Christian Klaussner <klaussner@users.noreply.github.com>
Date: Thu, 20 Oct 2016 20:11:59 +0200
Subject: [PATCH 479/688] Fix link to Google documentation (#7942)

---
 packages/accounts-oauth/oauth_client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-oauth/oauth_client.js b/packages/accounts-oauth/oauth_client.js
index a419b2003a..7290158083 100644
--- a/packages/accounts-oauth/oauth_client.js
+++ b/packages/accounts-oauth/oauth_client.js
@@ -9,7 +9,7 @@
  * @param {Object} [options]
  * @param {String[]} options.requestPermissions A list of permissions to request from the user.
  * @param {Boolean} options.requestOfflineToken If true, asks the user for permission to act on their behalf when offline. This stores an additional offline token in the `services` field of the user document. Currently only supported with Google.
- * @param {Object} options.loginUrlParameters Provide additional parameters to the authentication uri. Currently only supported with Google {@url https://developers.google.com/identity/protocols/OpenIDConnect#authenticationuriparameters}.
+ * @param {Object} options.loginUrlParameters Provide additional parameters to the authentication URI. Currently only supported with Google. See [Google Identity Platform documentation](https://developers.google.com/identity/protocols/OpenIDConnect#authenticationuriparameters).
  * @param {String} options.loginHint An email address that the external service will use to pre-fill the login prompt. Currently only supported with Meteor developer accounts and Google accounts. If used with Google, the Google User ID can also be passed.
  * @param {String} options.loginStyle Login style ("popup" or "redirect", defaults to the login service configuration).  The "popup" style opens the login page in a separate popup window, which is generally preferred because the Meteor application doesn't need to be reloaded.  The "redirect" style redirects the Meteor application's window to the login page, and the login service provider redirects back to the Meteor application which is then reloaded.  The "redirect" style can be used in situations where a popup window can't be opened, such as in a mobile UIWebView.  The "redirect" style however relies on session storage which isn't available in Safari private mode, so the "popup" style will be forced if session storage can't be used.
  * @param {String} options.redirectUrl If using "redirect" login style, the user will be returned to this URL after authorisation has been completed.

From 5c41afb95040aa667299b23deca3af05f1ec7efd Mon Sep 17 00:00:00 2001
From: Thea Lamkin <thea.lamkin@gmail.com>
Date: Tue, 25 Oct 2016 14:12:40 -0700
Subject: [PATCH 480/688] Add project overview section to Contributing.md

Expanding on ways to contribute and project roles
---
 Contributing.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 78 insertions(+), 4 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 7bca90b0d9..629dc853af 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -1,10 +1,84 @@
 # Contributing to Meteor
 
-Thank you for contributing to the Meteor project! Please read the guidelines below or it might be
-hard for the community to help you with your issue or pull request.
+We are excited to have your help building Meteor &mdash; both the platform and the community behind it. Please read the project overview and guidelines for contributing bug reports and new code, or it might be hard for the community to help you with your issue or pull request.
 
-We are excited to have your help building Meteor &mdash; both the platform and the
-community behind it. Here's how you can help with bug reports and new code.
+<h2 id="project-overview">Project overview</h2>
+
+Before we jump into detailed guidelines for opening and triaging issues and submitting pull requests, here is some information about how our project is structured and resources you should refer to as you start contributing. 
+
+### Ways to contribute
+
+There are many ways to contribute to the Meteor Project. Here’s a list of technical contributions with increasing levels of involvement and required knowledge of Meteor’s code and operations.  
+- [Reporting a bug](https://github.com/meteor/meteor/blob/devel/Contributing.md#reporting-a-bug-in-meteor)
+- [Triaging issues](https://github.com/meteor/meteor/blob/devel/IssueTriage.md)
+- [Contributing to documentation](https://github.com/meteor/docs/blob/master/Contributing.md) 
+- [Submitting pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#making-changes-to-meteor-core) 
+- Reviewing pull requests 
+- Maintaining a community package
+
+There are also several ways to contribute to the Meteor Project outside of GitHub, like organizing or speaking at [Meetups](https://www.meetup.com/topics/meteor/) and events and helping to moderate our [forums](https://forums.meteor.com/). Stay tuned for more documentation around non-code contributions. 
+
+If you can think of any changes to the project or documentation that would improve the contributor experience, let us know by opening an issue!
+
+### Project roles
+
+We’ve just begun to create more defined project roles for Meteor. Here are descriptions of the existing project roles, along with the current contributors taking on those roles today. 
+
+#### Issue Triager 
+
+Issue Triagers are members of the community that meet with us weekly to help triage Meteor’s open issues and bug reports. Once you’ve begun triaging issues regularly on your own, we will invite you to join our dedicated Slack channel to participate in these regular coordination sessions. 
+
+Current Issue Triagers: 
+- [@hwillson](https://github.com/hwillson)
+- [@laosb](https://github.com/laosb)
+- [@abernix](https://github.com/abernix)
+- [@lorensr](https://github.com/lorensr)
+
+#### Reviewer
+
+Our most regular and experienced Issue Triagers sometimes move on to doing code reviews for pull requests, and have input into which pull requests should be merged. 
+
+Current Reviewers:
+- [@lorensr](https://github.com/lorensr)
+- [@abernix](https://github.com/abernix)
+
+#### Core Committer 
+
+For now, the only contributors with commit access to meteor/meteor are employees of Meteor Development Group, the company that sponsors the Meteor project. We're actively exploring adding non-MDG core committers who have distinguished themselves in other contribution areas.  
+
+Project Lead: [@benjamn](https://github.com/benjamn)
+
+Current Core Committers: 
+- [@tmeasday](https://github.com/tmeasday)
+- [@zol](https://github.com/zol)
+- [@glasser](https://github.com/glasser)
+- [@stubailo](https://github.com/stubailo)
+
+#### Documentation Maintainer
+
+Documentation Maintainers are regular documentation contributors that have been given the ability to merge docs changes on [meteor/docs](https://github.com/meteor/docs). 
+
+Current Documentation Maintainers:
+- [@tmeasday](https://github.com/tmeasday)
+- [@lorensr](https://github.com/lorensr)
+
+#### Community Package Maintainer:
+
+Community package maintainers are community members who maintain packages outside of Meteor core. This requires code to be extracted from meteor/meteor, and entails a high level of responsibility. For this reason, community maintainers generally (and currently) must first become an advanced contributor to Meteor core and have 4-5 non-trivial pull requests merged that went through the proper contribution workflow. At that point, core contributors may make the case for breaking out a particular core package, and assist in the technical process around doing so. 
+
+Current Community Package Maintainers: 
+- @mitar for [Blaze](https://github.com/meteor/blaze) 
+
+#### Community Manager
+
+The community manager helps to coordinate resources, documentation, events, and other supportive work needed to ensure the health of the Meteor project.
+
+Current Community Manager:
+- @theadactyl
+
+### Tracking project work
+
+Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests from the community with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
 
 <h2 id="reporting-bug">Reporting a bug in Meteor</h2>
 

From ee881d16d27db7fa3573b81585bcb0aac1dc19a8 Mon Sep 17 00:00:00 2001
From: Thea Lamkin <thea.lamkin@gmail.com>
Date: Tue, 25 Oct 2016 14:15:50 -0700
Subject: [PATCH 481/688] Update Contribute.md

adding links, minor edits
---
 Contributing.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Contributing.md b/Contributing.md
index 629dc853af..c5b9d175b2 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -13,8 +13,8 @@ There are many ways to contribute to the Meteor Project. Here’s a list of tech
 - [Triaging issues](https://github.com/meteor/meteor/blob/devel/IssueTriage.md)
 - [Contributing to documentation](https://github.com/meteor/docs/blob/master/Contributing.md) 
 - [Submitting pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#making-changes-to-meteor-core) 
-- Reviewing pull requests 
-- Maintaining a community package
+- [Reviewing pull requests](https://github.com/meteor/meteor/blob/devel/Contributing.md#reviewer) 
+- [Maintaining a community package](https://github.com/meteor/meteor/blob/devel/Contributing.md#community-package-maintainer)
 
 There are also several ways to contribute to the Meteor Project outside of GitHub, like organizing or speaking at [Meetups](https://www.meetup.com/topics/meteor/) and events and helping to moderate our [forums](https://forums.meteor.com/). Stay tuned for more documentation around non-code contributions. 
 
@@ -67,18 +67,18 @@ Current Documentation Maintainers:
 Community package maintainers are community members who maintain packages outside of Meteor core. This requires code to be extracted from meteor/meteor, and entails a high level of responsibility. For this reason, community maintainers generally (and currently) must first become an advanced contributor to Meteor core and have 4-5 non-trivial pull requests merged that went through the proper contribution workflow. At that point, core contributors may make the case for breaking out a particular core package, and assist in the technical process around doing so. 
 
 Current Community Package Maintainers: 
-- @mitar for [Blaze](https://github.com/meteor/blaze) 
+- [@mitar](https://github.com/mitar) for [Blaze](https://github.com/meteor/blaze)
 
 #### Community Manager
 
 The community manager helps to coordinate resources, documentation, events, and other supportive work needed to ensure the health of the Meteor project.
 
 Current Community Manager:
-- @theadactyl
+- [@theadactyl](https://github.com/theadactyl)
 
 ### Tracking project work
 
-Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests from the community with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
+Right now, the best place to track the work being done on Meteor is to take a look at the latest release milestone [here](https://github.com/meteor/meteor/milestones). We also curate specific issues that would make great pull requests for community contributors with the [pull requests encouraged tag](https://github.com/meteor/meteor/issues?q=is%3Aopen+is%3Aissue+label%3Apull-requests-encouraged).
 
 <h2 id="reporting-bug">Reporting a bug in Meteor</h2>
 

From 5bc9bb49821396f1571bc4da3d1ed0cea93b1cb4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Oct 2016 15:00:25 -0700
Subject: [PATCH 482/688] Update modules test app to Meteor 1.4.2.

---
 tools/tests/apps/modules/.meteor/packages |  20 ++--
 tools/tests/apps/modules/.meteor/release  |   2 +-
 tools/tests/apps/modules/.meteor/versions | 120 +++++++++++-----------
 3 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index e31a9d935f..19ae02786c 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -6,20 +6,20 @@
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
 mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.11                   # The database Meteor supports right now
+mongo@1.1.14                   # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
-session@1.1.6                 # Client-side reactive dictionary for your app
-jquery@1.11.9                  # Helpful client-side library
-tracker@1.1.0                 # Meteor's client-side reactive programming library
+session@1.1.7                 # Client-side reactive dictionary for your app
+jquery@1.11.10                  # Helpful client-side library
+tracker@1.1.1                 # Meteor's client-side reactive programming library
 
-es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
+es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript@1.2.4
+coffeescript@1.11.1_2
 modules-test-package
 avital:mocha
-standard-minifier-css@1.2.0
-standard-minifier-js@1.2.0
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
 client-only-ecmascript
 modules-test-plugin
-shell-server
+shell-server@0.2.1
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index 30b2c590e3..c26084673d 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.1
+METEOR@1.4.2
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 3a2911a046..1735eab3e0 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -1,80 +1,82 @@
 allow-deny@1.0.5
-autoupdate@1.3.11
+autoupdate@1.3.12
 avital:mocha@2.1.0_10
-babel-compiler@6.9.1
-babel-runtime@0.1.11
-base64@1.0.9
-binary-heap@1.0.9
-blaze@2.1.8
-blaze-html-templates@1.0.4
-blaze-tools@1.0.9
-boilerplate-generator@1.0.9
-caching-compiler@1.1.7
-caching-html-compiler@1.0.6
-callback-hook@1.0.9
-check@1.2.3
+babel-compiler@6.13.0
+babel-runtime@0.1.12
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.1.9
+blaze-html-templates@1.0.5
+blaze-tools@1.0.10
+boilerplate-generator@1.0.11
+caching-compiler@1.1.8
+caching-html-compiler@1.0.7
+callback-hook@1.0.10
+check@1.2.4
 client-only-ecmascript@0.0.1
-coffeescript@1.2.4
+coffeescript@1.11.1_2
 ddp@1.2.5
-ddp-client@1.3.1
-ddp-common@1.2.6
-ddp-server@1.3.10
+ddp-client@1.3.2
+ddp-common@1.2.7
+ddp-server@1.3.11
 deps@1.0.12
-diff-sequence@1.0.6
-ecmascript@0.5.8
-ecmascript-runtime@0.3.14
-ejson@1.0.12
-es5-shim@4.6.14
-fastclick@1.0.12
-geojson-utils@1.0.9
+diff-sequence@1.0.7
+ecmascript@0.5.9
+ecmascript-runtime@0.3.15
+ejson@1.0.13
+es5-shim@4.6.15
+fastclick@1.0.13
+geojson-utils@1.0.10
 hot-code-push@1.0.4
-html-tools@1.0.10
-htmljs@1.0.10
-http@1.2.9
-id-map@1.0.8
-jquery@1.11.9
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.2.10
+id-map@1.0.9
+jquery@1.11.10
 launch-screen@1.0.12
 livedata@1.0.18
-logging@1.1.15
-meteor@1.2.17
+logging@1.1.16
+meteor@1.6.0
 meteor-base@1.0.4
-minifier-css@1.2.14
-minifier-js@1.2.14
-minimongo@1.0.17
+minifier-css@1.2.15
+minifier-js@1.2.15
+minimongo@1.0.18
 mobile-experience@1.0.4
-mobile-status-bar@1.0.12
-modules@0.7.6
-modules-runtime@0.7.6
+mobile-status-bar@1.0.13
+modules@0.7.7
+modules-runtime@0.7.7
 modules-test-package@0.0.1
 modules-test-plugin@0.0.1
-mongo@1.1.11
-mongo-id@1.0.5
-npm-mongo@1.5.46
-observe-sequence@1.0.12
-ordered-dict@1.0.8
+mongo@1.1.14
+mongo-id@1.0.6
+npm-mongo@2.2.11_2
+observe-sequence@1.0.14
+ordered-dict@1.0.9
 practicalmeteor:chai@2.1.0_1
 practicalmeteor:loglevel@1.2.0_2
 practicalmeteor:mocha-core@0.1.4
 practicalmeteor:sinon@1.14.1_2
-promise@0.8.4
+promise@0.8.8
 random@1.0.10
 reactive-dict@1.1.8
-reactive-var@1.0.10
-reload@1.1.10
-retry@1.0.8
-routepolicy@1.0.11
-session@1.1.6
+reactive-var@1.0.11
+reload@1.1.11
+retry@1.0.9
+routepolicy@1.0.12
+session@1.1.7
 shell-server@0.2.1
-spacebars@1.0.12
-spacebars-compiler@1.0.12
-standard-minifier-css@1.2.0
-standard-minifier-js@1.2.0
-templating@1.2.14
-templating-tools@1.0.4
+spacebars@1.0.13
+spacebars-compiler@1.0.13
+standard-minifier-css@1.3.2
+standard-minifier-js@1.2.1
+templating@1.2.15
+templating-compiler@1.2.15
+templating-runtime@1.2.15
+templating-tools@1.0.5
 tmeasday:test-reporter-helpers@0.2.1
-tracker@1.1.0
-ui@1.0.11
-underscore@1.0.9
-url@1.0.10
-webapp@1.3.11
+tracker@1.1.1
+ui@1.0.12
+underscore@1.0.10
+url@1.0.11
+webapp@1.3.12
 webapp-hashing@1.0.9

From 2d9a67e60951999f86d55b13c8b93c7a8404014b Mon Sep 17 00:00:00 2001
From: Lucas Hansen <lucashansen@gmail.com>
Date: Tue, 25 Oct 2016 21:06:17 -0700
Subject: [PATCH 483/688] Replace forkJoin with enterJob to avoid fiber issues

---
 tools/packaging/catalog/catalog-local.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/packaging/catalog/catalog-local.js b/tools/packaging/catalog/catalog-local.js
index c4add4ba05..3a1ba50150 100644
--- a/tools/packaging/catalog/catalog-local.js
+++ b/tools/packaging/catalog/catalog-local.js
@@ -404,15 +404,11 @@ _.extend(LocalCatalog.prototype, {
 
     // Load the package sources for packages and their tests into
     // self.packages.
-    //
-    // XXX We should make this work with parallel: true; right now it seems to
-    // hit node problems.
-    buildmessage.forkJoin(
-      { 'title': 'initializing packages', parallel: false },
-      self.effectiveLocalPackageDirs,
-      function (dir) {
+    buildmessage.enterJob('initializing packages', function() {
+      _.each(self.effectiveLocalPackageDirs, function (dir) {
         initSourceFromDir(dir);
       });
+    });
   },
 
   getPackageSource: function (name) {

From 1b3edb2300e16177d8ad9b4fb387eb1246ea57aa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 26 Oct 2016 15:58:07 -0700
Subject: [PATCH 484/688] Write files with appropriate mode in
 Builder#copyDirectory.

Fixes #7974.
---
 tools/isobuild/builder.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index dd97da33f9..a864ba6f9f 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -500,8 +500,17 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           // the file into memory to calculate the hash.
           files.writeFile(
             files.pathResolve(this.buildPath, thisRelTo),
+            // The reason we call files.writeFile here instead of
+            // files.copyFile is so that we can read the file using
+            // optimisticReadFile instead of files.createReadStream.
             optimisticReadFile(thisAbsFrom),
-            { mode: fileStatus.mode },
+            // Logic borrowed from files.copyFile: "Create the file as
+            // readable and writable by everyone, and executable by everyone
+            // if the original file is executably by owner. (This mode will be
+            // modified by umask.) We don't copy the mode *directly* because
+            // this function is used by 'meteor create' which is copying from
+            // the read-only tools tree into a writable app."
+            { mode: (fileStatus.mode & 0o100) ? 0o777 : 0o666 },
           );
 
           this.usedAsFile[thisRelTo] = true;

From e4acc36f63f98243237b5e6b3e46b083822b95fd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 26 Oct 2016 11:43:35 -0700
Subject: [PATCH 485/688] Respect METEOR_UNSAFE_PERM in addition to
 --unsafe-perm.

This is important for `meteor npm`, since we don't parse or pass through
Meteor-specific command-line arguments when running `meteor npm`.

When METEOR_UNSAFE_PERM is set, its value is now propagated to any npm
commands via the NPM_CONFIG_UNSAFE_PERM variable.

Helps with #7959.
Follow-up to #7821.
---
 tools/cli/dev-bundle-bin-helpers.js |  4 ++
 tools/cli/main.js                   | 59 ++++++++++++++++-------------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 665b34702a..0880f2d9b0 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -82,6 +82,10 @@ exports.getEnv = function (options) {
       env.NPM_CONFIG_CACHE = path.join(devBundleDir, ".npm");
     }
 
+    if (env.METEOR_UNSAFE_PERM) {
+      env.NPM_CONFIG_UNSAFE_PERM = env.METEOR_UNSAFE_PERM;
+    }
+
     // This allows node-gyp to find Node headers and libraries in
     // dev_bundle/.node-gyp.
     env.USERPROFILE = devBundleDir;
diff --git a/tools/cli/main.js b/tools/cli/main.js
index 611d4a7f78..f20a353353 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -768,33 +768,40 @@ Fiber(function () {
     rawArgs.push(term);
   }
 
-  // Prevent running meteor as root
-  if (process.getuid) {
-    // On UNIX platforms.
-    if (process.getuid() === 0){
-      if (_.has(rawOptions, '--unsafe-perm')) {
-        // Meteor is running as root and has the --unsafe-perm flag, just notice.
-        Console.info("");
-        Console.info("You have run Meteor as root.",
-        "Your permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as your non-root user.",
-        "You probably didn't want this, but you can fix it by running the following from the root of your project:");
-        Console.info("");
-        Console.info("sudo chown -Rh <username> .meteor/local");
-        Console.info("");
-        // Fix issue when running `sudo meteor --unsafe-perm`, --unsafe-perm: unknown option.
-        delete rawOptions['--unsafe-perm'];
-      }
-      else {
-        // Meteor is running as root without the --unsafe-perm flag, notice and stop.
-        Console.error("");
-        Console.error("You are attempting to run Meteor as the \"root\" user.",
-        "If you are developing, this is almost certainly *not* what you want to do and will likely result in incorrect file permissions.",
-        "However, if you are running this in a build process (CI, etc.) or you are absolutely sure you know what you are doing,",
-        "add the `--unsafe-perm` flag to this command to proceed.");
-        Console.error("");
+  if (_.has(rawOptions, "--unsafe-perm")) {
+    process.env.METEOR_UNSAFE_PERM = "true";
+    delete rawOptions["--unsafe-perm"];
+  }
 
-        process.exit(1);
-      }
+  // Prevent running meteor as root on UNIX platforms.
+  if (process.getuid &&
+      process.getuid() === 0) {
+    const unsafePerm = !! (
+      process.env.METEOR_UNSAFE_PERM &&
+      JSON.parse(process.env.METEOR_UNSAFE_PERM));
+
+    if (! unsafePerm) {
+      // Meteor is running as root without $METEOR_UNSAFE_PERM, notice and stop.
+      Console.error("");
+      Console.error(
+        "You are attempting to run Meteor as the root user.",
+        "If you are developing, this is almost certainly *not* what you want to do and will likely result in incorrect file permissions.",
+        "However, if you are running this command in a build process (CI, etc.), or you are absolutely sure you know what you are doing,",
+        "set the $METEOR_UNSAFE_PERM environment variable to proceed."
+      );
+    }
+
+    Console.info("");
+    Console.info(
+      "Even with $METEOR_UNSAFE_PERM or --unsafe-perm, permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as a non-root user.",
+      "If you need to fix your permissions, run the following command from the root of your project:"
+    );
+    Console.info("");
+    Console.info(Console.command("  sudo chown -Rh <username> .meteor/local"));
+    Console.info("");
+
+    if (! unsafePerm) {
+      process.exit(1);
     }
   }
 

From 50528819cffbbd126ec55ec42a023f4b653cf962 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Oct 2016 10:06:07 -0700
Subject: [PATCH 486/688] Change terminology from METEOR_UNSAFE_PERM to
 METEOR_ALLOW_SUPERUSER.

The --unsafe-perm option is still supported but no longer advertised.
---
 tools/cli/dev-bundle-bin-helpers.js |  6 ++++--
 tools/cli/main.js                   | 24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index 0880f2d9b0..f81f704745 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -82,8 +82,10 @@ exports.getEnv = function (options) {
       env.NPM_CONFIG_CACHE = path.join(devBundleDir, ".npm");
     }
 
-    if (env.METEOR_UNSAFE_PERM) {
-      env.NPM_CONFIG_UNSAFE_PERM = env.METEOR_UNSAFE_PERM;
+    if (env.METEOR_ALLOW_SUPERUSER) {
+      // Note that env.METEOR_ALLOW_SUPERUSER could be "0" or "false", which
+      // should propagate falsy semantics to NPM_CONFIG_UNSAFE_PERM.
+      env.NPM_CONFIG_UNSAFE_PERM = env.METEOR_ALLOW_SUPERUSER;
     }
 
     // This allows node-gyp to find Node headers and libraries in
diff --git a/tools/cli/main.js b/tools/cli/main.js
index f20a353353..0b64a950fb 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -768,39 +768,41 @@ Fiber(function () {
     rawArgs.push(term);
   }
 
-  if (_.has(rawOptions, "--unsafe-perm")) {
-    process.env.METEOR_UNSAFE_PERM = "true";
+  if (_.has(rawOptions, "--allow-superuser") ||
+      _.has(rawOptions, "--unsafe-perm")) {
+    process.env.METEOR_ALLOW_SUPERUSER = "true";
+    delete rawOptions["--allow-superuser"];
     delete rawOptions["--unsafe-perm"];
   }
 
   // Prevent running meteor as root on UNIX platforms.
   if (process.getuid &&
       process.getuid() === 0) {
-    const unsafePerm = !! (
-      process.env.METEOR_UNSAFE_PERM &&
-      JSON.parse(process.env.METEOR_UNSAFE_PERM));
+    const allowSuperuser = !! (
+      process.env.METEOR_ALLOW_SUPERUSER &&
+      JSON.parse(process.env.METEOR_ALLOW_SUPERUSER));
 
-    if (! unsafePerm) {
-      // Meteor is running as root without $METEOR_UNSAFE_PERM, notice and stop.
+    if (! allowSuperuser) {
+      // Meteor is running as root without METEOR_ALLOW_SUPERUSER, notice and stop.
       Console.error("");
       Console.error(
-        "You are attempting to run Meteor as the root user.",
+        "You are attempting to run Meteor as the 'root' superuser.",
         "If you are developing, this is almost certainly *not* what you want to do and will likely result in incorrect file permissions.",
         "However, if you are running this command in a build process (CI, etc.), or you are absolutely sure you know what you are doing,",
-        "set the $METEOR_UNSAFE_PERM environment variable to proceed."
+        "set the METEOR_ALLOW_SUPERUSER environment variable or pass --allow-superuser to proceed."
       );
     }
 
     Console.info("");
     Console.info(
-      "Even with $METEOR_UNSAFE_PERM or --unsafe-perm, permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as a non-root user.",
+      "Even with METEOR_ALLOW_SUPERUSER or --allow-superuser, permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as a normal user.",
       "If you need to fix your permissions, run the following command from the root of your project:"
     );
     Console.info("");
     Console.info(Console.command("  sudo chown -Rh <username> .meteor/local"));
     Console.info("");
 
-    if (! unsafePerm) {
+    if (! allowSuperuser) {
       process.exit(1);
     }
   }

From a2eb0072429bc73e7930c27a2c0674f7ddcb20ef Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Oct 2016 11:20:41 -0700
Subject: [PATCH 487/688] Make Meteor babel-runtime/helpers/inherits match npm
 implementation.

https://github.com/meteor/meteor/issues/7956#issuecomment-256724898

Fixes #7956.
---
 packages/babel-runtime/babel-runtime.js | 44 ++++---------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/packages/babel-runtime/babel-runtime.js b/packages/babel-runtime/babel-runtime.js
index adaa0377b8..cfb609e644 100644
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -86,7 +86,7 @@ var BabelRuntime = {
     if (superClass) {
       if (Object.create) {
         // All but IE 8
-        subClass.prototype = Object.create(superClass.prototype, {
+        subClass.prototype = Object.create(superClass && superClass.prototype, {
           constructor: {
             value: subClass,
             enumerable: false,
@@ -105,45 +105,15 @@ var BabelRuntime = {
         var F = function () {
           this.constructor = subClass;
         };
-        F.prototype = superClass.prototype;
+        F.prototype = superClass && superClass.prototype;
         subClass.prototype = new F();
       }
 
-      // For modern browsers, this would be `subClass.__proto__ = superClass`,
-      // but IE <=10 don't support `__proto__`, and in this case the difference
-      // would be detectable; code that works in modern browsers could easily
-      // fail on IE 8 if we ever used the `__proto__` trick.
-      //
-      // There's no perfect way to make static methods inherited if they are
-      // assigned after declaration of the classes.  The best we can do is
-      // to copy them.  In other words, when you write `class Foo
-      // extends Bar`, we copy the static methods from Bar onto Foo, but future
-      // ones are not copied.
-      //
-      // For correctness when writing code, don't add static methods to a class
-      // after you subclass it.
-
-      // The ecmascript-runtime package provides adequate polyfills for
-      // all of these Object.* functions (and Array#forEach), and anyone
-      // using babel-runtime is almost certainly using it because of the
-      // ecmascript package, which also implies ecmascript-runtime.
-      Object.getOwnPropertyNames(superClass).forEach(function (k) {
-        // This property descriptor dance preserves getter/setter behavior
-        // in browsers that support accessor properties (all except
-        // IE8). In IE8, the superClass can't have accessor properties
-        // anyway, so this code is still safe.
-        var descriptor = Object.getOwnPropertyDescriptor(superClass, k);
-        if (descriptor && typeof descriptor === "object") {
-          if (Object.getOwnPropertyDescriptor(subClass, k)) {
-            // If subClass already has a property by this name, then it
-            // would not be inherited, so it should not be copied. This
-            // notably excludes properties like .prototype and .name.
-            return;
-          }
-
-          Object.defineProperty(subClass, k, descriptor);
-        }
-      });
+      if (Object.setPrototypeOf) {
+        Object.setPrototypeOf(subClass, superClass);
+      } else {
+        subClass.__proto__ = superClass;
+      }
     }
   },
 

From 3ee8c252bb32ed2319a7357cf5782f7b12e498cc Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 28 Oct 2016 13:08:01 +0300
Subject: [PATCH 488/688] Fully implement `--no-release-check` for `meteor
 test`

I accidentally a line when I committed/submitted meteor/meteor#7799, as reported in this comment:

https://github.com/meteor/meteor/issues/7026#issuecomment-256728729

The `METEOR_NO_RELEASE_CHECK` environment variable did/does work properly, but both were meant to work.
---
 tools/cli/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 51d8789917..4aa28ad11f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1441,6 +1441,7 @@ testCommandOptions = {
     // XXX COMPAT WITH 0.9.2.2
     'mobile-port': { type: String },
     'debug-port': { type: String },
+    'no-release-check': { type: Boolean },
     deploy: { type: String },
     production: { type: Boolean },
     settings: { type: String, short: 's' },

From 4b618ac28970e9a9afef86f4021fe10665ec6d37 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 28 Oct 2016 13:31:10 -0400
Subject: [PATCH 489/688] Download Python from S3 when building Windows
 dev_bundle.

Should fix #7960.
---
 scripts/generate-dev-bundle.ps1 | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index af4c09369c..7112d2b0ed 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -52,16 +52,18 @@ $webclient.DownloadFile($node_link, "$DIR\bin\node.exe")
 
 # On Windows we provide a reliable version of python.exe for use by
 # node-gyp (the tool that rebuilds binary node modules). #WinPy
-$py_msi_link = "http://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}.msi"
-$py_msi = "${DIR}\python.msi"
-$webclient.DownloadFile($py_msi_link, $py_msi)
-$py_dir = "${DIR}\python"
-msiexec /i "$py_msi" TARGETDIR="$py_dir" /quiet /qn /norestart
-$env:PATH = "${py_dir};${env:PATH}"
+
+cd "$DIR"
+$py_s3_url = "https://s3.amazonaws.com/com.meteor.static/windows-python/python-${PYTHON_VERSION}.7z"
+$py_archive = "${DIR}\python.7z"
+$webclient.DownloadFile($py_s3_url, $py_archive)
+& "$DIR\bin\7z.exe" x "$py_archive"
+rm -Recurse -Force "$py_archive"
+$env:PATH = "${DIR}\python;${env:PATH}"
+python --version
 
 # download initial version of npm
 $npm_zip = "$DIR\bin\npm.zip"
-
 # These dist/npm archives were only published for 1.x versions of npm, and
 # this is the most recent one.
 $npm_link = "https://nodejs.org/dist/npm/npm-1.4.12.zip"
@@ -156,9 +158,6 @@ cp "$DIR\mongodb\$mongo_name\bin\mongo.exe" $DIR\mongodb\bin
 rm -Recurse -Force $mongo_zip
 rm -Recurse -Force "$DIR\mongodb\$mongo_name"
 
-rm -Recurse -Force "$py_msi"
-python --version
-
 cd $DIR
 
 # mark the version

From c7bdc707928aa56063db07416ebeb8eec609d341 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 28 Oct 2016 13:35:00 -0400
Subject: [PATCH 490/688] Bump $BUNDLE_VERSION to 4.6.2 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index dc0a2b1afc..90fdaaa918 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.6.1
+BUNDLE_VERSION=4.6.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 45bb2898fa7a45b15dc39ef0c4eb68c3b6650696 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 28 Oct 2016 17:55:58 -0400
Subject: [PATCH 491/688] Watch all paths in linked npm packages.

Fixes #7978.
---
 tools/fs/optimistic.js | 61 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index ba5f75b037..7bbd7d85ac 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -52,11 +52,7 @@ function makeOptimistic(name, fn) {
     subscribe(...args) {
       const path = args[0];
 
-      // Starting a watcher for every single file contained within a
-      // node_modules directory would be prohibitively expensive, so
-      // instead we rely on dependOnNodeModules to tell us when files in
-      // node_modules directories might have changed.
-      if (path.split(pathSep).indexOf("node_modules") >= 0) {
+      if (! shouldWatch(name, path)) {
         return;
       }
 
@@ -78,6 +74,48 @@ function makeOptimistic(name, fn) {
   return Profile("optimistic " + name, wrapper);
 }
 
+function shouldWatch(functionName, path) {
+  if (functionName === "isSymbolicLink") {
+    // It's important that we don't call optimisticIsSymbolicLink
+    // recursively (see below), so instead we watch every path passed to
+    // optimisticIsSymbolicLink. This makes optimisticIsSymbolicLink more
+    // costly than other optimistic functions, which is why we don't
+    // export it from this module.
+    return true;
+  }
+
+  const parts = path.split(pathSep);
+  const nmi = parts.indexOf("node_modules");
+
+  if (nmi < 0) {
+    // Watch everything not in a node_modules directory.
+    return true;
+  }
+
+  if (nmi < parts.length - 1) {
+    const nmi2 = parts.indexOf("node_modules", nmi + 1);
+    if (nmi2 > nmi) {
+      // If this path is nested inside more than one node_modules
+      // directory, then it isn't part of a linked npm package, so we
+      // should not watch it.
+      return false;
+    }
+
+    const packageDir = parts.slice(0, nmi + 2).join(pathSep);
+    if (optimisticIsSymbolicLink(packageDir)) {
+      // If this path is in a linked npm package, then it might be under
+      // active development, so we should watch it.
+      return true;
+    }
+  }
+
+  // Starting a watcher for every single file contained within a
+  // node_modules directory would be prohibitively expensive, so
+  // instead we rely on dependOnNodeModules to tell us when files in
+  // node_modules directories might have changed.
+  return false;
+}
+
 function maybeDependOnNodeModules(path) {
   if (typeof path !== "string") {
     return;
@@ -165,3 +203,16 @@ makeOptimistic("readJsonOrNull", (...args) => {
   }
   return JSON.parse(buffer);
 });
+
+// Not exported because shouldWatch watches any path passed to this
+// function, which makes optimisticIsSymbolicLink somewhat more costly
+// than other optimistic functions.
+const optimisticIsSymbolicLink =
+makeOptimistic("isSymbolicLink", path => {
+  try {
+    return lstat(path).isSymbolicLink();
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
+    return false;
+  }
+});

From bf5f635ac791ea206cb5b2803884241773e5439e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 28 Oct 2016 18:11:12 -0400
Subject: [PATCH 492/688] Remove optimisticIsSymbolicLink-specific logic from
 shouldWatch.

---
 tools/fs/optimistic.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 7bbd7d85ac..249fb7d6cd 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -52,7 +52,7 @@ function makeOptimistic(name, fn) {
     subscribe(...args) {
       const path = args[0];
 
-      if (! shouldWatch(name, path)) {
+      if (! shouldWatch(path)) {
         return;
       }
 
@@ -74,16 +74,7 @@ function makeOptimistic(name, fn) {
   return Profile("optimistic " + name, wrapper);
 }
 
-function shouldWatch(functionName, path) {
-  if (functionName === "isSymbolicLink") {
-    // It's important that we don't call optimisticIsSymbolicLink
-    // recursively (see below), so instead we watch every path passed to
-    // optimisticIsSymbolicLink. This makes optimisticIsSymbolicLink more
-    // costly than other optimistic functions, which is why we don't
-    // export it from this module.
-    return true;
-  }
-
+function shouldWatch(path) {
   const parts = path.split(pathSep);
   const nmi = parts.indexOf("node_modules");
 
@@ -204,15 +195,24 @@ makeOptimistic("readJsonOrNull", (...args) => {
   return JSON.parse(buffer);
 });
 
-// Not exported because shouldWatch watches any path passed to this
-// function, which makes optimisticIsSymbolicLink somewhat more costly
-// than other optimistic functions.
-const optimisticIsSymbolicLink =
-makeOptimistic("isSymbolicLink", path => {
+const optimisticIsSymbolicLink = wrap(path => {
   try {
     return lstat(path).isSymbolicLink();
   } catch (e) {
     if (e.code !== "ENOENT") throw e;
     return false;
   }
+}, {
+  subscribe(path) {
+    let watcher = watch(path, () => {
+      optimisticIsSymbolicLink.dirty(path);
+    });
+
+    return function () {
+      if (watcher) {
+        watcher.close();
+        watcher = null;
+      }
+    };
+  }
 });

From 69e190076b6d31049ca316a31201161ed773a714 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 28 Oct 2016 18:01:02 -0400
Subject: [PATCH 493/688] Bump package versions for 1.4.2.1-beta.0 release.

---
 packages/accounts-oauth/package.js             | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-common/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index ca6ba361c6..e79118b29d 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.14"
+  version: "1.1.15-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 41a4e9224c..9c9f51dc96 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12',
+  version: '0.1.13-beta.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 10a14b4c3f..35c4c5cace 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1_2"
+  version: "1.11.1-3-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 341bca27ad..0fe78c20e4 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.7',
+  version: '1.2.8-beta.0',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 46975fff25..280546576c 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.11',
+  version: '1.3.12-beta.0',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index e3c89499e6..0fe2df8fc4 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.6',
+  version: '2.7.7-beta.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 8c64e92fd7..68a0b284da 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2'
+  version: '1.4.2-1-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 4c60e880f3..3b7d1aed8d 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.6"
+  version: "2.513.7-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index d1f42bbdc7..4b6491b2ad 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2-rc.4",
+ "version": "1.4.2.1-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From f5c61de2fa4ba1af22a7251abb8e80aab2e468e4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 12:38:59 -0400
Subject: [PATCH 494/688] Fix watching of @scoped, linked npm packages.

https://github.com/meteor/meteor/issues/7978#issuecomment-257056243

Part of #7978.
---
 tools/fs/optimistic.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 249fb7d6cd..a73d2cb23a 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -92,7 +92,15 @@ function shouldWatch(path) {
       return false;
     }
 
-    const packageDir = parts.slice(0, nmi + 2).join(pathSep);
+    const packageDirParts = parts.slice(0, nmi + 2);
+
+    if (parts[nmi + 1].startsWith("@")) {
+      // For linked @scoped npm packages, the symlink is nested inside the
+      // @scoped directory (which is a child of node_modules).
+      packageDirParts.push(parts[nmi + 2]);
+    }
+
+    const packageDir = packageDirParts.join(pathSep);
     if (optimisticIsSymbolicLink(packageDir)) {
       // If this path is in a linked npm package, then it might be under
       // active development, so we should watch it.

From 74afdd5dafc3131de0f15d1a8fa3283685b2abd0 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 26 Oct 2016 18:08:04 +0300
Subject: [PATCH 495/688] Don't pass --allow-superuser flags to a springboarded
 version of Meteor

By removing the `--allow-superuser` and `--unsafe-perm` arguments before springboarding, it prevents older versions of Meteor from objecting to its use.  Catching it at the highest level should be sufficient to discourage root usage as intended in meteor/meteor#7821

Intended to fix...  meteor/meteor#7959
---
 tools/cli/main.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index 0b64a950fb..f7bed12be3 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -497,6 +497,12 @@ var springboard = function (rel, options) {
   // appropriate tools's meteor shell script.
   var newArgv = process.argv.slice(2);
 
+  // Don't pass the allow-superuser flags to springboarded versions since they
+  // may not know how to use them. See meteor/meteor#7959
+  newArgv = newArgv.filter(function (arg) {
+    return arg !== "--unsafe-perm" && arg !== "--allow-superuser";
+  });
+
   if (_.has(options, 'releaseOverride')) {
     // We used to just append --release=<releaseOverride> to the arguments, and
     // though that's probably safe in practice, it makes us worry about things
@@ -616,7 +622,11 @@ Fiber(function () {
   // tight timetable for 1.0 and there is no advantage to doing it now
   // rather than later. #ImprovingCrossVersionOptionParsing
 
-  var isBoolean = { "--help": true, "--unsafe-perm": true };
+  var isBoolean = {
+    "--help": true,
+    "--unsafe-perm": true,
+    "--allow-superuser": true,
+  };
   var walkCommands = function (node) {
     _.each(node, function (value, key) {
       if (value instanceof Command) {

From 8fe91e22e756fed7dd12a96f5bd2aae783b6dabf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 13:43:36 -0400
Subject: [PATCH 496/688] Set METEOR_ALLOW_SUPERUSER if necessary when
 springboarding.

Part of #7959.
---
 tools/cli/main.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/cli/main.js b/tools/cli/main.js
index f7bed12be3..7434ac66d0 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -495,13 +495,23 @@ var springboard = function (rel, options) {
 
   // Strip off the "node" and "meteor.js" from argv and replace it with the
   // appropriate tools's meteor shell script.
-  var newArgv = process.argv.slice(2);
-
-  // Don't pass the allow-superuser flags to springboarded versions since they
-  // may not know how to use them. See meteor/meteor#7959
-  newArgv = newArgv.filter(function (arg) {
-    return arg !== "--unsafe-perm" && arg !== "--allow-superuser";
-  });
+  var newArgv = [];
+  const argc = process.argv.length;
+  for (var i = 2; i < argc; ++i) {
+    const arg = process.argv[i];
+    if (arg === "--unsafe-perm" ||
+        arg === "--allow-superuser") {
+      // Don't pass the --unsafe-perm or --allow-superuser flags to
+      // springboarded versions since they may not know how to use them,
+      // but set the METEOR_ALLOW_SUPERUSER environment variable in case
+      // the springboarded version needs it. See meteor/meteor#7959.
+      if (! _.has(process.env, "METEOR_ALLOW_SUPERUSER")) {
+        process.env.METEOR_ALLOW_SUPERUSER = "true";
+      }
+      continue;
+    }
+    newArgv.push(arg);
+  }
 
   if (_.has(options, 'releaseOverride')) {
     // We used to just append --release=<releaseOverride> to the arguments, and

From 9dfcc38abafe674df27e296262bc5c9f9b060005 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Oct 2016 11:20:41 -0700
Subject: [PATCH 497/688] Make Meteor babel-runtime/helpers/inherits match npm
 implementation.

https://github.com/meteor/meteor/issues/7956#issuecomment-256724898

Fixes #7956.
---
 packages/babel-runtime/babel-runtime.js | 44 ++++---------------------
 packages/babel-runtime/package.js       |  2 +-
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/packages/babel-runtime/babel-runtime.js b/packages/babel-runtime/babel-runtime.js
index adaa0377b8..cfb609e644 100644
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -86,7 +86,7 @@ var BabelRuntime = {
     if (superClass) {
       if (Object.create) {
         // All but IE 8
-        subClass.prototype = Object.create(superClass.prototype, {
+        subClass.prototype = Object.create(superClass && superClass.prototype, {
           constructor: {
             value: subClass,
             enumerable: false,
@@ -105,45 +105,15 @@ var BabelRuntime = {
         var F = function () {
           this.constructor = subClass;
         };
-        F.prototype = superClass.prototype;
+        F.prototype = superClass && superClass.prototype;
         subClass.prototype = new F();
       }
 
-      // For modern browsers, this would be `subClass.__proto__ = superClass`,
-      // but IE <=10 don't support `__proto__`, and in this case the difference
-      // would be detectable; code that works in modern browsers could easily
-      // fail on IE 8 if we ever used the `__proto__` trick.
-      //
-      // There's no perfect way to make static methods inherited if they are
-      // assigned after declaration of the classes.  The best we can do is
-      // to copy them.  In other words, when you write `class Foo
-      // extends Bar`, we copy the static methods from Bar onto Foo, but future
-      // ones are not copied.
-      //
-      // For correctness when writing code, don't add static methods to a class
-      // after you subclass it.
-
-      // The ecmascript-runtime package provides adequate polyfills for
-      // all of these Object.* functions (and Array#forEach), and anyone
-      // using babel-runtime is almost certainly using it because of the
-      // ecmascript package, which also implies ecmascript-runtime.
-      Object.getOwnPropertyNames(superClass).forEach(function (k) {
-        // This property descriptor dance preserves getter/setter behavior
-        // in browsers that support accessor properties (all except
-        // IE8). In IE8, the superClass can't have accessor properties
-        // anyway, so this code is still safe.
-        var descriptor = Object.getOwnPropertyDescriptor(superClass, k);
-        if (descriptor && typeof descriptor === "object") {
-          if (Object.getOwnPropertyDescriptor(subClass, k)) {
-            // If subClass already has a property by this name, then it
-            // would not be inherited, so it should not be copied. This
-            // notably excludes properties like .prototype and .name.
-            return;
-          }
-
-          Object.defineProperty(subClass, k, descriptor);
-        }
-      });
+      if (Object.setPrototypeOf) {
+        Object.setPrototypeOf(subClass, superClass);
+      } else {
+        subClass.__proto__ = superClass;
+      }
     }
   },
 
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 41a4e9224c..9d22865ba8 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.12',
+  version: '0.1.13',
   documentation: 'README.md'
 });
 

From ca4baed90ae0675e55c93976411d4ed91f12dd63 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 21:29:55 -0400
Subject: [PATCH 498/688] Disable yielding for files.* operations unless
 explicitly un-disabled.

Set METEOR_DISABLE_FS_FIBERS=false to un-disable files.* fibers if you
suspect this commit has introduced a problematic difference in behavior.

cc @veered
---
 tools/fs/files.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 82aba433b3..15bc88c0e2 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -1451,9 +1451,11 @@ files.readLinkToMeteorScript = function (linkLocation, platform) {
 //   A helpful file to import for this purpose is colon-converter.js, which also
 //   knows how to convert various configuration file formats.
 
-// If this environment variable is set, fs.*Sync methods will always be used
-// by wrapFsFunc instead of yielding wrappers for asynchronous fs.* methods.
-const YIELD_ALLOWED = ! process.env.METEOR_DISABLE_FS_FIBERS;
+// Fibers are disabled by default for files.* operations unless
+// process.env.METEOR_DISABLE_FS_FIBERS parses to a falsy value.
+const YIELD_ALLOWED = !! (
+  _.has(process.env, "METEOR_DISABLE_FS_FIBERS") &&
+  ! JSON.parse(process.env.METEOR_DISABLE_FS_FIBERS));
 
 files.fsFixPath = {};
 /**

From 16641e56c6871d3d077c54cb08f7a6e15d80f41a Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <Denis_Davidyuk@hotmail.com>
Date: Tue, 1 Nov 2016 21:46:19 +1000
Subject: [PATCH 499/688] Refactor template of `resetPassword` email

---
 packages/accounts-password/email_templates.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/accounts-password/email_templates.js b/packages/accounts-password/email_templates.js
index ce517c38d3..a2116998c8 100644
--- a/packages/accounts-password/email_templates.js
+++ b/packages/accounts-password/email_templates.js
@@ -26,18 +26,7 @@ Accounts.emailTemplates = {
     subject: function(user) {
       return "How to reset your password on " + Accounts.emailTemplates.siteName;
     },
-    text: function(user, url) {
-      var greeting = (user.profile && user.profile.name) ?
-            ("Hello " + user.profile.name + ",") : "Hello,";
-      return `${greeting}
-
-To reset your password, simply click the link below.
-
-${url}
-
-Thanks.
-`;
-    }
+    text: greet("To reset your password")
   },
   verifyEmail: {
     subject: function(user) {

From 73541c38387f8888cf37c1eb1b071c37fb057097 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Tue, 1 Nov 2016 10:04:50 -0400
Subject: [PATCH 500/688] Updated test description to include the issue # being
 resolved (#5676).

---
 packages/accounts-password/password_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index ceb980c920..3a3e564f21 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -581,7 +581,7 @@ if (Meteor.isClient) (function () {
 
   Tinytest.add(
     'passwords - forgotPassword only passes callback value to forgotPassword '
-    + 'Method if callback is defined',
+    + 'Method if callback is defined (to address issue #5676)',
     function (test) {
       let methodCallArgumentCount = 0;
       const originalMethodCall = Accounts.connection.call;

From b23d832cf616e214aa3b70c6ee7ee228a63487e8 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Tue, 1 Nov 2016 17:30:04 +0200
Subject: [PATCH 501/688] Clarify mis-leading wording the `stylus` README

Make it clear that all files with the `.styl` extension are processed and not just `.main.styl` files.

Fixes meteor/meteor#6337
---
 packages/stylus/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/stylus/README.md b/packages/stylus/README.md
index 8ee851e391..b2e6866c50 100644
--- a/packages/stylus/README.md
+++ b/packages/stylus/README.md
@@ -6,12 +6,12 @@
 simple syntax and expressive dynamic behavior. It allows for more compact
 stylesheets and helps reduce code duplication in CSS files.
 
-With the `stylus` package installed, `.main.styl` files in your application are
-automatically compiled to CSS and the results are included in the client CSS
-bundle.
+With the `stylus` package installed, files with the `.styl` extension are sent
+through the `stylus` CSS pre-processor and the results are included in the
+client CSS bundle.
 
-The `stylus` package also includes `nib` support. Add `@import 'nib'` to your
-`.main.styl` files to enable cross-browser mixins such as `linear-gradient` and
+The `stylus` package also includes `nib` support. Add `@import 'nib'` to any
+`*.styl` file to enable cross-browser mixins such as `linear-gradient` and
 `border-radius`.
 
 If you want to `@import` a file, give it the extension `.import.styl`

From dd012bf6e5ac9a0d2286499aca13559d40b1ae1f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 1 Nov 2016 17:20:47 -0400
Subject: [PATCH 502/688] Tolerate " => awaited here:" in parseStackFrames.

https://github.com/meteor/promise/commit/da826064bc250d688a839108298b61cc719959c0
---
 tools/utils/parse-stack.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/utils/parse-stack.js b/tools/utils/parse-stack.js
index f39ce9160c..57e7f13200 100644
--- a/tools/utils/parse-stack.js
+++ b/tools/utils/parse-stack.js
@@ -83,9 +83,9 @@ export function markTop(f) {
 function parseStackFrames(frames) {
   let stop = false;
   let ret = [];
-  frames.forEach((frame) => {
+  frames.some(frame => {
     if (stop) {
-      return;
+      return true;
     }
 
     let m;
@@ -109,8 +109,7 @@ function parseStackFrames(frames) {
         return;
       }
       if (m[1].match(/(?:^|\.)__bottom_mark__$/)) {
-        stop = true;
-        return;
+        return stop = true;
       }
       ret.push({
         func: m[1],
@@ -134,8 +133,13 @@ function parseStackFrames(frames) {
 
     if (m = frame.match(/^\s*-\s*-\s*-\s*-\s*-\s*$/)) {
       // Stop parsing if we reach a stack split from a Future
-      stop = true;
-      return;
+      return stop = true;
+    }
+
+    if (frame.startsWith(" => awaited here:")) {
+      // The meteor-promise library inserts " => awaited here:" lines to
+      // indicate async boundaries.
+      return stop = true;
     }
 
     if (_.isEmpty(ret)) {

From 51819a6cb3e244bb16769eccf65f31037ba2a750 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 1 Nov 2016 11:36:39 -0400
Subject: [PATCH 503/688] Implement Run#matchBeforeExit(pattern) for
 order-insensitive matching.

---
 tools/tool-testing/selftest.js | 165 ++++++++++++++++++++++++---------
 1 file changed, 119 insertions(+), 46 deletions(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 790d65aeb0..9631356e00 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -243,57 +243,116 @@ var newSelfTestCatalog = function () {
 var Matcher = function (run) {
   var self = this;
   self.buf = "";
+  self.fullBuffer = "";
   self.ended = false;
-  self.matchPattern = null;
-  self.matchPromise = null;
-  self.matchStrict = null;
+  self.resetMatch();
   self.run = run; // used only to set a field on exceptions
+  self.endPromise = new Promise(resolve => {
+    self.resolveEndPromise = resolve;
+  });
 };
 
 _.extend(Matcher.prototype, {
   write: function (data) {
     var self = this;
     self.buf += data;
+    self.fullBuffer += data;
     self._tryMatch();
   },
 
-  match: function (pattern, timeout, strict) {
+  resetMatch() {
+    const mp = this.matchPromise;
+
+    this.matchPattern = null;
+    this.matchPromise = null;
+    this.matchStrict = null;
+    this.matchFullBuffer = false;
+
+    return mp;
+  },
+
+  rejectMatch(error) {
+    const mp = this.resetMatch();
+    if (mp) {
+      mp.reject(error);
+    } else {
+      // If this.matchPromise was not defined, we should not swallow this
+      // error, so we must throw it instead.
+      throw error;
+    }
+  },
+
+  resolveMatch(value) {
+    const mp = this.resetMatch();
+    if (mp) {
+      mp.resolve(value);
+    }
+  },
+
+  match(pattern, timeout, strict) {
+    return this.matchAsync(pattern, { timeout, strict }).await();
+  },
+
+  // Like match, but returns a Promise without calling .await().
+  matchAsync(pattern, {
+    timeout = null,
+    strict = false,
+    matchFullBuffer = false,
+  }) {
     var self = this;
     if (self.matchPromise) {
-      throw new Error("already have a match pending?");
+      return Promise.reject(new Error("already have a match pending?"));
     }
     self.matchPattern = pattern;
     self.matchStrict = strict;
+    self.matchFullBuffer = matchFullBuffer;
     var mp = self.matchPromise = fiberHelpers.makeFulfillablePromise();
     self._tryMatch(); // could clear self.matchPromise
 
     var timer = null;
     if (timeout) {
       timer = setTimeout(function () {
-        var pattern = self.matchPattern;
-        self.matchPattern = null;
-        self.matchStrict = null;
-        self.matchPromise = null;
-        mp.reject(new TestFailure('match-timeout', {
+        self.rejectMatch(new TestFailure('match-timeout', {
           run: self.run,
-          pattern: pattern
+          pattern: self.matchPattern
         }));
       }, timeout * 1000);
+    } else {
+      return mp;
     }
 
-    try {
-      return mp.await();
-    } finally {
-      if (timer) {
-        clearTimeout(timer);
-      }
-    }
+    return mp.then(result => {
+      clearTimeout(timer);
+      return result;
+    }, error => {
+      clearTimeout(timer);
+      throw error;
+    });
   },
 
-  end: function () {
+  matchBeforeEnd(pattern, timeout) {
+    return this._beforeEnd(() => this.matchAsync(pattern, {
+      timeout: timeout || 15,
+      matchFullBuffer: true,
+    }));
+  },
+
+  _beforeEnd(promiseCallback) {
+    return this.endPromise = this.endPromise.then(promiseCallback);
+  },
+
+  end() {
+    return this.endAsync().await();
+  },
+
+  endAsync() {
     var self = this;
-    self.ended = true;
-    self._tryMatch();
+    self.resolveEndPromise();
+    return self._beforeEnd(() => {
+      self.ended = true;
+      self._tryMatch();
+      return self.matchPromise;
+    });
   },
 
   matchEmpty: function () {
@@ -315,36 +374,37 @@ _.extend(Matcher.prototype, {
 
     var ret = null;
 
-    if (self.matchPattern instanceof RegExp) {
+    if (self.matchFullBuffer) {
+      // Note: self.matchStrict is ignored if self.matchFullBuffer truthy.
+      if (self.matchPattern instanceof RegExp) {
+        ret = self.fullBuffer.match(self.matchPattern);
+      } else if (self.fullBuffer.indexOf(self.matchPattern) >= 0) {
+        ret = self.matchPattern;
+      }
+
+    } else if (self.matchPattern instanceof RegExp) {
       var m = self.buf.match(self.matchPattern);
       if (m) {
         if (self.matchStrict && m.index !== 0) {
-          self.matchPromise = null;
-          self.matchStrict = null;
-          self.matchPattern = null;
           Console.info("Extra junk is: ", self.buf.substr(0, m.index));
-          mp.reject(new TestFailure('junk-before', {
+          return self.rejectMatch(new TestFailure('junk-before', {
             run: self.run,
             pattern: self.matchPattern
           }));
-          return;
         }
         ret = m;
         self.buf = self.buf.slice(m.index + m[0].length);
       }
+
     } else {
       var i = self.buf.indexOf(self.matchPattern);
       if (i !== -1) {
         if (self.matchStrict && i !== 0) {
-          self.matchPromise = null;
-          self.matchStrict = null;
-          self.matchPattern = null;
           Console.info("Extra junk is: ", self.buf.substr(0, i));
-          mp.reject(new TestFailure('junk-before', {
+          return self.rejectMatch(new TestFailure('junk-before', {
             run: self.run,
             pattern: self.matchPattern
           }));
-          return;
         }
         ret = self.matchPattern;
         self.buf = self.buf.slice(i + self.matchPattern.length);
@@ -352,21 +412,14 @@ _.extend(Matcher.prototype, {
     }
 
     if (ret !== null) {
-      self.matchPromise = null;
-      self.matchStrict = null;
-      self.matchPattern = null;
-      mp.resolve(ret);
-      return;
+      return self.resolveMatch(ret);
     }
 
     if (self.ended) {
-      var failure = new TestFailure('no-match', { run: self.run,
-                                                  pattern: self.matchPattern });
-      self.matchPromise = null;
-      self.matchStrict = null;
-      self.matchPattern = null;
-      mp.reject(failure);
-      return;
+      return self.rejectMatch(new TestFailure('no-match', {
+        run: self.run,
+        pattern: self.matchPattern
+      }));
     }
   }
 });
@@ -1183,6 +1236,8 @@ var Run = function (execPath, options) {
   self.stderrMatcher = new Matcher(self);
   self.outputLog = new OutputLog(self);
 
+  self.matcherEndPromise = null;
+
   self.exitStatus = undefined; // 'null' means failed rather than exited
   self.exitPromiseResolvers = [];
   var opts = options.args || [];
@@ -1238,6 +1293,15 @@ _.extend(Run.prototype, {
     self.client.connect();
   },
 
+  // Useful for matching one-time patterns not sensitive to ordering.
+  matchBeforeExit: markStack(function (pattern) {
+    return this.stdoutMatcher.matchBeforeEnd(pattern);
+  }),
+
+  matchErrBeforeExit: markStack(function (pattern) {
+    return this.stderrMatcher.matchBeforeEnd(pattern);
+  }),
+
   _exited: function (status) {
     var self = this;
 
@@ -1254,8 +1318,15 @@ _.extend(Run.prototype, {
       resolve();
     });
 
-    self.stdoutMatcher.end();
-    self.stderrMatcher.end();
+    self._endMatchers();
+  },
+
+  _endMatchers() {
+    return this.matcherEndPromise =
+      this.matcherEndPromise || Promise.all([
+        this.stdoutMatcher.endAsync(),
+        this.stderrMatcher.endAsync()
+      ]);
   },
 
   _ensureStarted: function () {
@@ -1396,6 +1467,8 @@ _.extend(Run.prototype, {
     var self = this;
     self._ensureStarted();
 
+    self._endMatchers().await();
+
     if (self.exitStatus === undefined) {
       var timeout = self.baseTimeout + self.extraTime;
       timeout *= utils.timeoutScaleFactor;

From 0beee5961990e7d0c7209f23b9a615e7905f231e Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Wed, 2 Nov 2016 00:07:56 +0100
Subject: [PATCH 504/688] More styling

---
 packages/minimongo/modify.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 17bd4ee17d..bb140d23e9 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -184,33 +184,40 @@ var NO_CREATE_MODIFIERS = {
 var MODIFIERS = {
   $currentDate: function (target, field, arg) {
     if (typeof arg === "object" && arg.hasOwnProperty("$type")) {
-       if (arg.$type !== "date")
+       if (arg.$type !== "date") {
          throw MinimongoError("Minimongo does currently only support the date type in $currentDate modifiers");
-    } else if(arg !== true) {
+       }
+    } else if (arg !== true) {
       throw MinimongoError("Invalid $currentDate modifier");
     }
     target[field] = new Date();
   },
   $min: function (target, field, arg) {
-    if (typeof arg !== "number")
+    if (typeof arg !== "number") {
       throw MinimongoError("Modifier $min allowed for numbers only");
+    }
     if (field in target) {
-      if (typeof target[field] !== "number")
+      if (typeof target[field] !== "number") {
         throw MinimongoError("Cannot apply $min modifier to non-number");
-      if (target[field] > arg)
+      }
+      if (target[field] > arg) {
         target[field] = arg;
+      }
     } else {
       target[field] = arg;
     }
   },
   $max: function (target, field, arg) {
-    if (typeof arg !== "number")
+    if (typeof arg !== "number") {
       throw MinimongoError("Modifier $max allowed for numbers only");
+    }
     if (field in target) {
-      if (typeof target[field] !== "number")
+      if (typeof target[field] !== "number") {
         throw MinimongoError("Cannot apply $max modifier to non-number");
-      if (target[field] < arg)
-        target[field] = arg;
+      }
+      if (target[field] < arg) {
+         target[field] = arg;
+      }
     } else {
       target[field] = arg;
     }

From d8c0739a13fc154f43257515bd63bd591296ea0b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 1 Nov 2016 11:36:53 -0400
Subject: [PATCH 505/688] Make some matches in compiler-plugins.js test
 order-insensitive.

Also increased various timeouts to make tests more reliable.
---
 tools/tests/compiler-plugins.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/tests/compiler-plugins.js b/tools/tests/compiler-plugins.js
index 7c8b178c30..c4c8edcba6 100644
--- a/tools/tests/compiler-plugins.js
+++ b/tools/tests/compiler-plugins.js
@@ -12,9 +12,10 @@ var MONGO_LISTENING =
 function startRun(sandbox) {
   var run = sandbox.run();
   run.match("myapp");
-  run.match("proxy");
+  run.matchBeforeExit("Started proxy");
   run.tellMongo(MONGO_LISTENING);
-  run.match("MongoDB");
+  run.matchBeforeExit("Started MongoDB");
+  run.waitSecs(15);
   return run;
 };
 
@@ -114,6 +115,7 @@ selftest.define("compiler plugin caching - coffee", () => {
     // archMatching:'web'.  We'll see this more clearly when the next call later
     // is "#2" --- we didn't miss a call!
     // App prints this:
+    run.waitSecs(15);
     run.match("Hello world");
 
     // Check that the CSS is what we expect.
@@ -142,6 +144,7 @@ selftest.define("compiler plugin caching - coffee", () => {
     // preprocessor file in it. This should not require us to render anything.
     s.append("packages/local-pack/package.js", "\n// foo\n");
     cacheMatch('Ran (#2) on: []');
+    run.waitSecs(15);
     run.match("Hello world");
 
     function setVariable(variableName, value) {
@@ -204,6 +207,7 @@ selftest.define("compiler plugin caching - coffee", () => {
     cacheMatch('Loaded {}/top.' + extension);
     cacheMatch('Loaded {}/yet-another-root.' + extension);
     cacheMatch(`Ran (#1) on: ["/top.${ extension }"]`);
+    run.waitSecs(15);
     run.match('Hello world');
     checkCSS(expectedBorderStyles);
 

From 488631ad257c62de4b07e43d2911564672e28e0c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 1 Nov 2016 19:24:31 -0400
Subject: [PATCH 506/688] Write caching-compiler cache files synchronously when
 testing.

Setting METEOR_DISABLE_FS_FIBERS broke these tests because
CachingCompiler#_writeFileAsync was still asynchronous, whereas other FS
operations became synchronous.
---
 packages/caching-compiler/caching-compiler.js | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/caching-compiler/caching-compiler.js b/packages/caching-compiler/caching-compiler.js
index 2149ddcea1..c200944091 100644
--- a/packages/caching-compiler/caching-compiler.js
+++ b/packages/caching-compiler/caching-compiler.js
@@ -163,15 +163,22 @@ CachingCompilerBase = class CachingCompilerBase {
   // processing on the file write.
   _writeFileAsync(filename, contents) {
     const tempFilename = filename + '.tmp.' + Random.id();
-    fs.writeFile(tempFilename, contents, (err) => {
-      // ignore errors, it's just a cache
-      if (err) {
-        return;
+    if (this._cacheDebugEnabled) {
+      // Write cache file synchronously when cache debugging enabled.
+      try {
+        fs.writeFileSync(tempFilename, contents);
+        fs.renameSync(tempFilename, filename);
+      } catch (e) {
+        // ignore errors, it's just a cache
       }
-      fs.rename(tempFilename, filename, (err) => {
-        // ignore this error too.
+    } else {
+      fs.writeFile(tempFilename, contents, err => {
+        // ignore errors, it's just a cache
+        if (! err) {
+          fs.rename(tempFilename, filename, err => {});
+        }
       });
-    });
+    }
   }
 
   // Helper function. Returns the body of the file as a string, or null if it

From 24489295f2cde1dcf52bddf5fcbdcb789333a630 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 18:01:24 -0400
Subject: [PATCH 507/688] Add babel-runtime to the default new-app package.json
 file.

In light of issues like #7956, I would very much like for app developers
to be responsible for providing node_modules/babel-runtime, and for the
Meteor babel-runtime package to stop attempting to implement a subset of
the helpers.
---
 tools/static-assets/skel/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/static-assets/skel/package.json b/tools/static-assets/skel/package.json
index 509ac7e54f..c56bdcbd4d 100644
--- a/tools/static-assets/skel/package.json
+++ b/tools/static-assets/skel/package.json
@@ -5,6 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "meteor-node-stubs": "~0.2.0"
+    "meteor-node-stubs": "~0.2.0",
+    "babel-runtime": "6.18.0"
   }
 }

From b3746d8879a7b00e93ecff3b20ec031af130f64b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 18:05:35 -0400
Subject: [PATCH 508/688] Install basic npm dependencies when running
 test-packages.

At this point, the only dependencies installed in this way are
babel-runtime and meteor-node-stubs, but that set of packages will
expand in the future as we move more dependencies to npm.
---
 tools/cli/commands.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 4aa28ad11f..b92600fccf 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1566,6 +1566,11 @@ function doTestCommand(options) {
     projectContextOptions.projectDir = testRunnerAppDir;
     projectContextOptions.projectDirForLocalPackages = options.appDir;
 
+    installDefaultNpmDepsForTestPackages(testRunnerAppDir);
+    if (buildmessage.jobHasMessages()) {
+      return;
+    }
+
     // Find any packages mentioned by a path instead of a package name. We will
     // load them explicitly into the catalog.
     var packagesByPath = _.filter(options.args, function (p) {
@@ -1712,6 +1717,38 @@ function doTestCommand(options) {
   ));
 }
 
+function installDefaultNpmDepsForTestPackages(testRunnerAppDir) {
+  const testAppPkgJsonPath =
+    files.pathJoin(testRunnerAppDir, "package.json");
+
+  if (files.statOrNull(testAppPkgJsonPath)) {
+    // Do nothing if the test directory already has a package.json file,
+    // likely because the developer passed a custom --test-dir-path.
+    return;
+  }
+
+  const jobMessage = "installing test npm dependencies";
+  buildmessage.enterJob(jobMessage, function () {
+    const { dependencies } = require("../static-assets/skel/package.json");
+    const { runNpmCommand } = require("../isobuild/meteor-npm.js");
+
+    // Write a minimial package.json with the same dependencies as the
+    // default new-app package.json file.
+    files.writeFile(
+      testAppPkgJsonPath,
+      JSON.stringify({ dependencies }, null, 2) + "\n",
+      "utf8",
+    );
+
+    const installResult = runNpmCommand(["install"], testRunnerAppDir);
+    if (! installResult.success) {
+      buildmessage.error(
+        "Could not install npm dependencies for test-packages: " +
+          installResult.error);
+    }
+  });
+}
+
 // Returns the "local-test:*" package names for the given package names (or for
 // all local packages if packageNames is empty/unspecified).
 var getTestPackageNames = function (projectContext, packageNames) {

From 4ce343f56cba3d3cc63b5430d312c59efd611864 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 18:28:46 -0400
Subject: [PATCH 509/688] Simplify Meteor babel-runtime package by relying on
 npm version.

Though this may seem like a significant change, this package will still
work for older apps as long as the developer follows the instructions
about installing the babel-runtime npm package.

Helps with #7956.
---
 .../.npm/package/npm-shrinkwrap.json          |   7 +-
 packages/babel-runtime/babel-runtime.js       | 408 +-----------------
 packages/babel-runtime/package.js             |   3 +-
 3 files changed, 25 insertions(+), 393 deletions(-)

diff --git a/packages/babel-runtime/.npm/package/npm-shrinkwrap.json b/packages/babel-runtime/.npm/package/npm-shrinkwrap.json
index f37acb615f..bfa3d317c7 100644
--- a/packages/babel-runtime/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-runtime/.npm/package/npm-shrinkwrap.json
@@ -3,12 +3,7 @@
     "meteor-babel-helpers": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/meteor-babel-helpers/-/meteor-babel-helpers-0.0.3.tgz",
-      "from": "https://registry.npmjs.org/meteor-babel-helpers/-/meteor-babel-helpers-0.0.3.tgz"
-    },
-    "regenerator-runtime": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz",
-      "from": "regenerator-runtime@0.9.5"
+      "from": "meteor-babel-helpers@0.0.3"
     }
   }
 }
diff --git a/packages/babel-runtime/babel-runtime.js b/packages/babel-runtime/babel-runtime.js
index cfb609e644..d1e41db490 100644
--- a/packages/babel-runtime/babel-runtime.js
+++ b/packages/babel-runtime/babel-runtime.js
@@ -1,396 +1,34 @@
-var hasOwn = Object.prototype.hasOwnProperty;
-var S = typeof Symbol === "function" ? Symbol : {};
-var iteratorSymbol = S.iterator || "@@iterator";
-
-var hasDefineProperty = false;
-try {
-  // IE 8 has a broken Object.defineProperty, so feature-test by
-  // trying to call it.
-  Object.defineProperty({}, 'x', {});
-  hasDefineProperty = true;
-} catch (e) {}
-
-function defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
 exports.meteorBabelHelpers = require("meteor-babel-helpers");
 
 // Returns true if a given absolute identifier will be provided at runtime
 // by the babel-runtime package.
 exports.checkHelper = function checkHelper(id) {
-  var parts = id.split("/");
-  var index = 0;
-
-  // Skip over leading / and node_modules.
-  if (parts[index] === "") ++index;
-  if (parts[index] === "node_modules") ++index;
-
-  if (parts[index] !== "babel-runtime") {
-    return false;
-  }
-
-  // Skip over babel-runtime.
-  ++index;
-
-  if (parts.length - index === 2) {
-    return parts[index] === "helpers" &&
-      hasOwn.call(BabelRuntime, stripDotJS(parts[index + 1]));
-  }
-
-  if (parts.length - index === 1) {
-    return stripDotJS(parts[index]) === "regenerator";
-  }
-
+  // There used to be more complicated logic here, when the babel-runtime
+  // package provided helper implementations of its own, but now this
+  // function exists just for backwards compatibility.
   return false;
 };
 
-function stripDotJS(name) {
-  return name.replace(/\.js$/, "");
+try {
+  var regeneratorRuntime = require("babel-runtime/regenerator");
+} catch (e) {
+  throw new Error([
+    "The babel-runtime npm package could not be found in your node_modules ",
+    "directory. Please run the following command to install it:",
+    "",
+    "  meteor npm install --save babel-runtime",
+    ""
+  ].join("\n"));
 }
 
-var BabelRuntime = {
-  // es6.templateLiterals
-  // Constructs the object passed to the tag function in a tagged
-  // template literal.
-  taggedTemplateLiteralLoose: function (strings, raw) {
-    // Babel's own version of this calls Object.freeze on `strings` and
-    // `strings.raw`, but it doesn't seem worth the compatibility and
-    // performance concerns.  If you're writing code against this helper,
-    // don't add properties to these objects.
-    strings.raw = raw;
-    return strings;
-  },
-
-  // es6.classes
-  // Checks that a class constructor is being called with `new`, and throws
-  // an error if it is not.
-  classCallCheck: function (instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  },
-
-  // es6.classes
-  inherits: function (subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
-    }
-
-    if (superClass) {
-      if (Object.create) {
-        // All but IE 8
-        subClass.prototype = Object.create(superClass && superClass.prototype, {
-          constructor: {
-            value: subClass,
-            enumerable: false,
-            writable: true,
-            configurable: true
-          }
-        });
-      } else {
-        // IE 8 path.  Slightly worse for modern browsers, because `constructor`
-        // is enumerable and shows up in the inspector unnecessarily.
-        // It's not an "own" property of any instance though.
-        //
-        // For correctness when writing code,
-        // don't enumerate all the own-and-inherited properties of an instance
-        // of a class and expect not to find `constructor` (but who does that?).
-        var F = function () {
-          this.constructor = subClass;
-        };
-        F.prototype = superClass && superClass.prototype;
-        subClass.prototype = new F();
-      }
-
-      if (Object.setPrototypeOf) {
-        Object.setPrototypeOf(subClass, superClass);
-      } else {
-        subClass.__proto__ = superClass;
-      }
-    }
-  },
-
-  defineProperty: function (obj, key, value) {
-    if (hasDefineProperty && (key in obj)) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
-  },
-
-  createClass: function (Constructor, protoProps, staticProps) {
-    if (! hasDefineProperty) {
-      // e.g. `class Foo { get bar() {} }`.  If you try to use getters and
-      // setters in IE 8, you will get a big nasty error, with or without
-      // Babel.  I don't know of any other syntax features besides getters
-      // and setters that will trigger this error.
-      throw new Error(
-        "Your browser does not support this type of class property.  " +
-          "For example, Internet Explorer 8 does not support getters and " +
-          "setters.");
-    }
-
-    if (protoProps) defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) defineProperties(Constructor, staticProps);
-    return Constructor;
-  },
-
-  "typeof": function (obj) {
-    return obj && obj.constructor === Symbol ? "symbol" : typeof obj;
-  },
-
-  possibleConstructorReturn: function (self, call) {
-    if (! self) {
-      throw new ReferenceError(
-        "this hasn't been initialised - super() hasn't been called"
-      );
-    }
-
-    var callType = typeof call;
-    if (call &&
-        callType === "function" ||
-        callType === "object") {
-      return call;
-    }
-
-    return self;
-  },
-
-  interopRequireDefault: function (obj) {
-    return obj && obj.__esModule ? obj : { 'default': obj };
-  },
-
-  interopRequireWildcard: function (obj) {
-    if (obj && obj.__esModule) {
-      return obj;
-    }
-
-    var newObj = {};
-
-    if (obj != null) {
-      for (var key in obj) {
-        if (hasOwn.call(obj, key)) {
-          newObj[key] = obj[key];
-        }
-      }
-    }
-
-    newObj["default"] = obj;
-    return newObj;
-  },
-
-  interopExportWildcard: function (obj, defaults) {
-    var newObj = defaults({}, obj);
-    delete newObj["default"];
-    return newObj;
-  },
-
-  defaults: function (obj, defaults) {
-    Object.getOwnPropertyNames(defaults).forEach(function (key) {
-      var desc = Object.getOwnPropertyDescriptor(defaults, key);
-      if (desc && desc.configurable && typeof obj[key] === "undefined") {
-        Object.defineProperty(obj, key, desc);
-      }
-    });
-
-    return obj;
-  },
-
-  // es7.objectRestSpread and react (JSX)
-  "extends": Object.assign || (function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (hasOwn.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-    return target;
-  }),
-
-  // es6.destructuring
-  objectWithoutProperties: function (obj, keys) {
-    var target = {};
-    outer: for (var i in obj) {
-      if (! hasOwn.call(obj, i)) continue;
-      for (var j = 0; j < keys.length; j++) {
-        if (keys[j] === i) continue outer;
-      }
-      target[i] = obj[i];
-    }
-    return target;
-  },
-
-  // es6.destructuring
-  objectDestructuringEmpty: function (obj) {
-    if (obj == null) throw new TypeError("Cannot destructure undefined");
-  },
-
-  // es6.spread
-  bind: Function.prototype.bind || (function () {
-    var isCallable = function (value) { return typeof value === 'function'; };
-    var $Object = Object;
-    var to_string = Object.prototype.toString;
-    var array_slice = Array.prototype.slice;
-    var array_concat = Array.prototype.concat;
-    var array_push = Array.prototype.push;
-    var max = Math.max;
-    var Empty = function Empty() {};
-
-    // Copied from es5-shim.js (3ac7942).  See original for more comments.
-    return function bind(that) {
-      var target = this;
-      if (!isCallable(target)) {
-        throw new TypeError('Function.prototype.bind called on incompatible ' + target);
-      }
-
-      var args = array_slice.call(arguments, 1);
-
-      var bound;
-      var binder = function () {
-
-        if (this instanceof bound) {
-          var result = target.apply(
-            this,
-            array_concat.call(args, array_slice.call(arguments))
-          );
-          if ($Object(result) === result) {
-            return result;
-          }
-          return this;
-        } else {
-          return target.apply(
-            that,
-            array_concat.call(args, array_slice.call(arguments))
-          );
-        }
-      };
-
-      var boundLength = max(0, target.length - args.length);
-
-      var boundArgs = [];
-      for (var i = 0; i < boundLength; i++) {
-        array_push.call(boundArgs, '$' + i);
-      }
-
-      // Create a Function from source code so that it has the right `.length`.
-      // Probably not important for Babel.  This code violates CSPs that ban
-      // `eval`, but the browsers that need this polyfill don't have CSP!
-      bound = Function('binder', 'return function (' + boundArgs.join(',') + '){ return binder.apply(this, arguments); }')(binder);
-
-      if (target.prototype) {
-        Empty.prototype = target.prototype;
-        bound.prototype = new Empty();
-        Empty.prototype = null;
-      }
-
-      return bound;
-    };
-
-  })(),
-
-  toConsumableArray: function (arr) {
-    if (Array.isArray(arr)) {
-      for (var i = arr.length - 1, arr2 = Array(i + 1); i >= 0; --i) {
-        arr2[i] = arr[i];
-      }
-
-      return arr2;
-    }
-
-    return Array.from(arr);
-  },
-
-  toArray: function (arr) {
-    return Array.isArray(arr) ? arr : Array.from(arr);
-  },
-
-  slicedToArray: function (iterable, limit) {
-    if (Array.isArray(iterable)) {
-      return iterable;
-    }
-
-    if (iterable) {
-      var it = iterable[iteratorSymbol]();
-      var result = [];
-      var info;
-
-      if (typeof limit !== "number") {
-        limit = Infinity;
-      }
-
-      while (result.length < limit &&
-             ! (info = it.next()).done) {
-        result.push(info.value);
-      }
-
-      return result;
-    }
-
-    throw new TypeError(
-      "Invalid attempt to destructure non-iterable instance"
-    );
-  },
-
-  slice: Array.prototype.slice
-};
-
-// Use meteorInstall to install all of the above helper functions within
-// node_modules/babel-runtime/helpers.
-Object.keys(BabelRuntime).forEach(function (helperName) {
-  var helpers = {};
-
-  helpers[helperName + ".js"] = function (require, exports, module) {
-    module.exports = BabelRuntime[helperName];
+if (regeneratorRuntime &&
+    typeof Promise === "function" &&
+    typeof Promise.asyncApply === "function") {
+  // If Promise.asyncApply is defined, use it to wrap calls to
+  // runtime.async so that the entire async function will run in its own
+  // Fiber, not just the code that comes after the first await.
+  var realAsync = regeneratorRuntime.async;
+  regeneratorRuntime.async = function () {
+    return Promise.asyncApply(realAsync, regeneratorRuntime, arguments);
   };
-
-  meteorInstall({
-    node_modules: {
-      "babel-runtime": {
-        helpers: helpers
-      }
-    }
-  });
-});
-
-// Use meteorInstall to install the regenerator runtime at
-// node_modules/babel-runtime/regenerator.
-meteorInstall({
-  node_modules: {
-    "babel-runtime": {
-      "regenerator.js": function (r, e, module) {
-        // Note that we use the require function provided to the
-        // babel-runtime.js file, not the one named 'r' above.
-        var runtime = require("regenerator-runtime");
-
-        // If Promise.asyncApply is defined, use it to wrap calls to
-        // runtime.async so that the entire async function will run in its
-        // own Fiber, not just the code that comes after the first await.
-        if (typeof Promise === "function" &&
-            typeof Promise.asyncApply === "function") {
-          var realAsync = runtime.async;
-          runtime.async = function () {
-            return Promise.asyncApply(realAsync, runtime, arguments);
-          };
-        }
-
-        module.exports = runtime;
-      }
-    }
-  }
-});
+}
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 9c9f51dc96..46086e30a4 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,12 +1,11 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '0.1.13-beta.0',
+  version: '1.0.0-beta.0',
   documentation: 'README.md'
 });
 
 Npm.depends({
-  "regenerator-runtime": "0.9.5",
   "meteor-babel-helpers": "0.0.3"
 });
 

From f0355276a5ff51c235dc5416d1452e0f9e3337ac Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 18:43:02 -0400
Subject: [PATCH 510/688] Remove babel-runtime-specific logic from
 compiler-plugin.js.

---
 tools/isobuild/compiler-plugin.js | 35 -------------------------------
 tools/tool-env/isopackets.js      |  1 -
 2 files changed, 36 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 2fe35344ca..c13be9eca7 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -771,15 +771,6 @@ class ResourceSlot {
   }
 }
 
-let babelRuntime;
-function checkBabelRuntimeHelper(id) {
-  if (! babelRuntime) {
-    babelRuntime = require("../tool-env/isopackets.js")
-      .load("runtime")["babel-runtime"];
-  }
-  return babelRuntime.checkHelper(id);
-}
-
 export class PackageSourceBatch {
   constructor(unibuild, processor, {
     sourceRoot,
@@ -1097,11 +1088,8 @@ export class PackageSourceBatch {
 
     this._warnAboutMissingModules(allMissingNodeModules);
 
-    const meteorProvidesBabelRuntime = map.has("babel-runtime");
-
     scannerMap.forEach((scanner, name) => {
       const isApp = ! name;
-      const isWeb = scanner.isWeb();
       const outputFiles = scanner.getOutputFiles();
 
       if (isApp) {
@@ -1109,23 +1097,6 @@ export class PackageSourceBatch {
 
         outputFiles.forEach(file => {
           const parts = file.installPath.split("/");
-
-          if (meteorProvidesBabelRuntime || ! isWeb) {
-            // If the Meteor babel-runtime package is installed, it will
-            // provide implementations for babel-runtime/helpers/* and
-            // babel-runtime/regenerator at runtime, so we should filter
-            // out any node_modules/babel-runtime/* modules from the app.
-            // If the Meteor babel-runtime package is not installed, then
-            // we should rely on node_modules/babel-runtime/* instead. On
-            // the server that still means removing bundled files here and
-            // relying on programs/server/npm/node_modules/babel-runtime,
-            // but on the web these bundled files are all we have, so we'd
-            // better not remove them.
-            if (checkBabelRuntimeHelper(file.installPath)) {
-              return;
-            }
-          }
-
           const nodeModulesIndex = parts.indexOf("node_modules");
 
           if (nodeModulesIndex === -1 || (nodeModulesIndex === 0 &&
@@ -1202,12 +1173,6 @@ export class PackageSourceBatch {
           return;
         }
 
-        if (checkBabelRuntimeHelper(id)) {
-          // Don't print warnings for babel-runtime/helpers/* modules,
-          // since we provide most of those.
-          return;
-        }
-
         if (! _.has(topLevelMissingIDs, packageDir)) {
           // This information will be used to recommend installing npm
           // packages below.
diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js
index c097a78bea..0631237436 100644
--- a/tools/tool-env/isopackets.js
+++ b/tools/tool-env/isopackets.js
@@ -57,7 +57,6 @@ export const ISOPACKETS = {
   'cordova-support': ['boilerplate-generator', 'logging', 'webapp-hashing',
                       'xmlbuilder'],
   'logging': ['logging'],
-  'runtime': ['babel-runtime'],
 };
 
 // Caches isopackets in memory (each isopacket only needs to be loaded

From 10f997ae0e887e04de43af4af4e4886cb2959e28 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 20:32:01 -0400
Subject: [PATCH 511/688] Make --prepare-app install default npm deps to fix
 self-tests.

Tests were broken by the new dependency on the babel-runtime npm
package, but fortunately all those tests run `meteor --prepare-app`
whenever an app is created by a self-test, so this change should fix
most of the breakages.
---
 tools/cli/commands-packages.js | 4 ++++
 tools/cli/commands.js          | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 4f3a74316c..cdbd3b3810 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -140,13 +140,17 @@ main.registerCommand({
     'allow-incompatible-update': { type: Boolean }
   }
 }, function (options) {
+  require("./commands.js").installDefaultNpmDeps(options.appDir);
+
   var projectContext = new projectContextModule.ProjectContext({
     projectDir: options.appDir,
     allowIncompatibleUpdate: options['allow-incompatible-update']
   });
+
   main.captureAndExit("=> Errors while initializing project:", function () {
     projectContext.prepareProjectForBuild();
   });
+
   projectContext.packageMapDelta.displayOnConsole();
 });
 
diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index b92600fccf..2048030537 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1566,7 +1566,7 @@ function doTestCommand(options) {
     projectContextOptions.projectDir = testRunnerAppDir;
     projectContextOptions.projectDirForLocalPackages = options.appDir;
 
-    installDefaultNpmDepsForTestPackages(testRunnerAppDir);
+    installDefaultNpmDeps(testRunnerAppDir);
     if (buildmessage.jobHasMessages()) {
       return;
     }
@@ -1717,9 +1717,9 @@ function doTestCommand(options) {
   ));
 }
 
-function installDefaultNpmDepsForTestPackages(testRunnerAppDir) {
+export function installDefaultNpmDeps(appDir) {
   const testAppPkgJsonPath =
-    files.pathJoin(testRunnerAppDir, "package.json");
+    files.pathJoin(appDir, "package.json");
 
   if (files.statOrNull(testAppPkgJsonPath)) {
     // Do nothing if the test directory already has a package.json file,
@@ -1740,7 +1740,7 @@ function installDefaultNpmDepsForTestPackages(testRunnerAppDir) {
       "utf8",
     );
 
-    const installResult = runNpmCommand(["install"], testRunnerAppDir);
+    const installResult = runNpmCommand(["install"], appDir);
     if (! installResult.success) {
       buildmessage.error(
         "Could not install npm dependencies for test-packages: " +

From 6dcd8b78f2c28c57023abf90467d97d156d068bd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 31 Oct 2016 21:13:44 -0400
Subject: [PATCH 512/688] Run installDefaultNpmDeps whenever creating self-test
 apps.

Some tests disable the --prepare-app step, but still need babel-runtime
to be installed.
---
 tools/cli/commands-packages.js | 2 --
 tools/tests/npm.js             | 2 +-
 tools/tool-testing/selftest.js | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index cdbd3b3810..baf35ca5a4 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -140,8 +140,6 @@ main.registerCommand({
     'allow-incompatible-update': { type: Boolean }
   }
 }, function (options) {
-  require("./commands.js").installDefaultNpmDeps(options.appDir);
-
   var projectContext = new projectContextModule.ProjectContext({
     projectDir: options.appDir,
     allowIncompatibleUpdate: options['allow-incompatible-update']
diff --git a/tools/tests/npm.js b/tools/tests/npm.js
index 0dc511b308..3a633b3248 100644
--- a/tools/tests/npm.js
+++ b/tools/tests/npm.js
@@ -20,7 +20,7 @@ selftest.define("npm", ["net"], function () {
     run = s.run("--once", "--raw-logs");
     run.tellMongo(MONGO_LISTENING);
     if (i === 0) {
-      run.waitSecs(2);
+      run.waitSecs(30);
       // use match instead of read because on a built release we can
       // also get an update message here.
       run.match(
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 9631356e00..771b20d1a9 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -703,6 +703,8 @@ _.extend(Sandbox.prototype, {
       upgradersFile.appendUpgraders(upgraders.allUpgraders());
     }
 
+    require("../cli/commands.js").installDefaultNpmDeps(absoluteTo);
+
     if (options.dontPrepareApp) {
       return;
     }

From 270b5cc8ef399b30799e2b0f277350f2baf7426c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 1 Nov 2016 11:38:35 -0400
Subject: [PATCH 513/688] Run `meteor npm install` as part of `meteor create`
 tests.

---
 tools/tests/create.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/tests/create.js b/tools/tests/create.js
index 270112ef30..ef72d6fb7a 100644
--- a/tools/tests/create.js
+++ b/tools/tests/create.js
@@ -20,6 +20,10 @@ selftest.define("create", function () {
     selftest.fail("Failed to add a version specifier to `meteor-base` package");
   }
 
+  // Install basic packages like babel-runtime and meteor-node-stubs from
+  // package.json.
+  s.run("npm install").waitSecs(15);
+
   // Now, can we run it?
   run = s.run();
   run.waitSecs(15);

From 6b6a71b073ca2a05ce87de6e4f17e332b493319a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 12:47:01 -0400
Subject: [PATCH 514/688] Fix and improve app creation tests.

---
 tools/tests/create.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/tests/create.js b/tools/tests/create.js
index ef72d6fb7a..48f5a4270c 100644
--- a/tools/tests/create.js
+++ b/tools/tests/create.js
@@ -20,17 +20,26 @@ selftest.define("create", function () {
     selftest.fail("Failed to add a version specifier to `meteor-base` package");
   }
 
+  const packageJson = JSON.parse(s.read("package.json"));
+  if (! packageJson.dependencies.hasOwnProperty("babel-runtime")) {
+    selftest.fail("New app package.json does not depend on babel-runtime");
+  }
+
   // Install basic packages like babel-runtime and meteor-node-stubs from
   // package.json.
-  s.run("npm install").waitSecs(15);
+  run = s.run("npm", "install");
+  run.waitSecs(15);
+  run.expectExit(0);
 
   // Now, can we run it?
   run = s.run();
-  run.waitSecs(15);
+  run.waitSecs(60);
   run.match("foobar");
   run.match("proxy.");
   // Do not print out the changes to the versions file!
+  run.waitSecs(15);
   run.read("\n=>");
+  run.waitSecs(5);
   run.match("MongoDB");
   run.waitSecs(5);
   run.match("your app");

From 909419b36e59fb34c8f5a6e7af81b1981e66d7f5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 12:59:54 -0400
Subject: [PATCH 515/688] Optionally tolerate SyntaxError in
 optimisticReadJsonOrNull.

---
 tools/fs/optimistic.js       | 18 ++++++++++++------
 tools/isobuild/meteor-npm.js |  7 ++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index a73d2cb23a..687016366f 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -191,16 +191,22 @@ export const optimisticHashOrNull = makeOptimistic("hashOrNull", (...args) => {
 });
 
 export const optimisticReadJsonOrNull =
-makeOptimistic("readJsonOrNull", (...args) => {
+makeOptimistic("readJsonOrNull", (path, options) => {
   try {
-    var buffer = optimisticReadFile(...args);
+    return JSON.parse(optimisticReadFile(path, options));
+
   } catch (e) {
-    if (e.code !== "ENOENT") {
-      throw e;
+    if (e.code === "ENOENT") {
+      return null;
     }
-    return null;
+
+    if (e instanceof SyntaxError &&
+        options && options.allowSyntaxError) {
+      return null;
+    }
+
+    throw e;
   }
-  return JSON.parse(buffer);
 });
 
 const optimisticIsSymbolicLink = wrap(path => {
diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 8c971680ab..0fe19deafa 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -449,7 +449,12 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     // put .meteor-portable files only in the individual top-level package
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
-    const result = optimisticReadJsonOrNull(portableFile);
+    const result = optimisticReadJsonOrNull(portableFile, {
+      // Make optimisticReadJsonOrNull return null if there's a
+      // SyntaxError when parsing the .meteor-portable file.
+      allowSyntaxError: true
+    });
+
     if (result) {
       return result;
     }

From 8bc4fe20c6c09c5ce4157566c372c66e217f506d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 13:15:13 -0400
Subject: [PATCH 516/688] Cache .meteor-portable values temporarily in memory.

This is another way to fix the bug I previously fixed by passing
options.allowSyntaxError to optimisticReadJsonOrNull.

To reproduce the bug (and/or verify that it is fixed), run the following
commands in a terminal:

  rm -rf meteor/packages/npm-mongo/.npm
  meteor/meteor --get-ready

Before these two commits, optimisticReadJsonOrNull would throw a
SyntaxError when reading one of the .meteor-portable files because an
asynchronous write to the same file had not yet finished.
---
 tools/isobuild/meteor-npm.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 0fe19deafa..71451e0a1c 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -431,6 +431,8 @@ function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
   });
 }
 
+const portableCache = Object.create(null);
+
 const isPortable = Profile("meteorNpm.isPortable", dir => {
   const lstat = optimisticLStat(dir);
   if (! lstat.isDirectory()) {
@@ -449,15 +451,18 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     // put .meteor-portable files only in the individual top-level package
     // directories, so that they will get cleared away the next time those
     // packages are (re)installed.
-    const result = optimisticReadJsonOrNull(portableFile, {
-      // Make optimisticReadJsonOrNull return null if there's a
-      // SyntaxError when parsing the .meteor-portable file.
-      allowSyntaxError: true
-    });
+    const result = _.has(portableCache, portableFile)
+      ? portableCache[portableFile]
+      : optimisticReadJsonOrNull(portableFile, {
+          // Make optimisticReadJsonOrNull return null if there's a
+          // SyntaxError when parsing the .meteor-portable file.
+          allowSyntaxError: true
+        });
 
     if (result) {
       return result;
     }
+
   } else {
     // Clean up any .meteor-portable files we mistakenly wrote in
     // directories that do not contain package.json files. #7296
@@ -476,8 +481,16 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     fs.writeFile(
       portableFile,
       JSON.stringify(result) + "\n",
-      error => {},
+      error => {
+        // Once the asynchronous write finishes (successful or not), we no
+        // longer need to cache the written value in memory.
+        delete portableCache[portableFile];
+      },
     );
+
+    // Cache the result immediately in memory so that the asynchronous
+    // write won't confuse synchronous optimisticReadJsonOrNull calls.
+    portableCache[portableFile] = result;
   }
 
   return result;

From 5dc2eaa0f71a21a6e1dbc929636e9ad8715fe376 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 13:32:01 -0400
Subject: [PATCH 517/688] Add babel-runtime to test app package.json files.

---
 tools/tests/apps/dev-bundle-bin-commands/package.json | 1 +
 tools/tests/apps/modules/package.json                 | 1 +
 tools/tests/apps/shell/package.json                   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/tests/apps/dev-bundle-bin-commands/package.json b/tools/tests/apps/dev-bundle-bin-commands/package.json
index ac77436ea2..7bb9203fa2 100644
--- a/tools/tests/apps/dev-bundle-bin-commands/package.json
+++ b/tools/tests/apps/dev-bundle-bin-commands/package.json
@@ -7,6 +7,7 @@
     "exit-normally": "echo \"This script will exit normally\" && exit 0"
   },
   "dependencies": {
+    "babel-runtime": "^6.18.0",
     "meteor-node-stubs": "~0.2.0"
   }
 }
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index a12454d9ab..48935553db 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -5,6 +5,7 @@
   "private": true,
   "dependencies": {
     "aws-sdk": "^2.2.41",
+    "babel-runtime": "^6.18.0",
     "github": "^0.2.4",
     "idle-gc": "^1.0.1",
     "meteor-node-stubs": "^0.2.0",
diff --git a/tools/tests/apps/shell/package.json b/tools/tests/apps/shell/package.json
index eaa0f0bc14..9ec558d397 100644
--- a/tools/tests/apps/shell/package.json
+++ b/tools/tests/apps/shell/package.json
@@ -5,6 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
+    "babel-runtime": "^6.18.0",
     "meteor-node-stubs": "~0.2.0"
   }
 }

From a90011b885fb669f5b56ebf9b98409534fffe82f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 13:32:21 -0400
Subject: [PATCH 518/688] Improve `meteor shell` self-test.

---
 tools/tests/shell-tests.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js
index c7f26e6b4f..e9484ccb0d 100644
--- a/tools/tests/shell-tests.js
+++ b/tools/tests/shell-tests.js
@@ -6,31 +6,41 @@ selftest.define("meteor shell", function () {
   s.createApp("meteor-shell-test", "shell");
   s.cd("meteor-shell-test");
 
-  var server = s.run("run", "--once");
-  server.waitSecs(45);
+  var server = s.run();
+  server.waitSecs(60);
   server.match("App running at");
 
   var shell = s.run("shell");
   // First try a simple one-line expression.
   shell.write("{server:Meteor.isServer}\n");
   shell.proc.stdin.end();
+  shell.waitSecs(10);
   shell.match('{"server":true}');
+  shell.expectExit(0);
 
   shell = s.run("shell");
   // Now try with a bunch of newlines in the input.
   shell.write("500+\n4000\n+60\n\n+\n7\n");
   shell.proc.stdin.end();
+  shell.waitSecs(10);
   shell.match("4567");
+  shell.expectExit(0);
 
   shell = s.run("shell");
   // Now use the shell to make the server output something.
   shell.write('console.log("oyez")\n');
   shell.proc.stdin.end();
+  shell.waitSecs(10);
   server.match("oyez");
+  shell.expectExit(0);
 
   shell = s.run("shell");
   // Now check something set by the test app.
   shell.write('Meteor.checkMeFromShell\n');
   shell.proc.stdin.end();
+  shell.waitSecs(10);
   shell.match("oky dok");
+  shell.expectExit(0);
+
+  server.stop();
 });

From 5f0ffc5217a6562288d939bd86ee28feb6afae11 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 13:48:59 -0400
Subject: [PATCH 519/688] Remove coffeescript version constraint in modules
 test app.

---
 tools/tests/apps/modules/.meteor/packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 19ae02786c..1df4bfa370 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -15,7 +15,7 @@ tracker@1.1.1                 # Meteor's client-side reactive programming librar
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
 ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript@1.11.1_2
+coffeescript
 modules-test-package
 avital:mocha
 standard-minifier-css@1.3.2

From fd57b8612556d4fd20daf6b93def01cb53d1792b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 13:59:03 -0400
Subject: [PATCH 520/688] Run `npm install` in test apps even if package.json
 exists.

---
 tools/cli/commands.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 2048030537..e048049370 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1721,16 +1721,8 @@ export function installDefaultNpmDeps(appDir) {
   const testAppPkgJsonPath =
     files.pathJoin(appDir, "package.json");
 
-  if (files.statOrNull(testAppPkgJsonPath)) {
-    // Do nothing if the test directory already has a package.json file,
-    // likely because the developer passed a custom --test-dir-path.
-    return;
-  }
-
-  const jobMessage = "installing test npm dependencies";
-  buildmessage.enterJob(jobMessage, function () {
+  if (! files.statOrNull(testAppPkgJsonPath)) {
     const { dependencies } = require("../static-assets/skel/package.json");
-    const { runNpmCommand } = require("../isobuild/meteor-npm.js");
 
     // Write a minimial package.json with the same dependencies as the
     // default new-app package.json file.
@@ -1739,7 +1731,11 @@ export function installDefaultNpmDeps(appDir) {
       JSON.stringify({ dependencies }, null, 2) + "\n",
       "utf8",
     );
+  }
 
+  const jobMessage = "installing dependencies from package.json";
+  buildmessage.enterJob(jobMessage, function () {
+    const { runNpmCommand } = require("../isobuild/meteor-npm.js");
     const installResult = runNpmCommand(["install"], appDir);
     if (! installResult.success) {
       buildmessage.error(

From 4bf69409fad6f96f1a47dc04f6d5291e501bbe6e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 15:15:14 -0400
Subject: [PATCH 521/688] Call installDefaultNpmDeps in old bundler-assets
 test.

---
 tools/tests/old/test-bundler-assets.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 953ab0b9e1..6e3d8a48be 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -18,12 +18,19 @@ var tmpDir = function () {
 };
 
 var makeProjectContext = function (appName) {
+  var testAppDir = files.pathJoin(
+    files.convertToStandardPath(__dirname), appName);
+
   var projectDir = files.mkdtemp("test-bundler-assets");
-  files.cp_r(files.pathJoin(files.convertToStandardPath(__dirname), appName),
-    projectDir);
+
+  files.cp_r(testAppDir, projectDir);
+
+  require("../../cli/commands.js").installDefaultNpmDeps(projectDir);
+
   var projectContext = new projectContextModule.ProjectContext({
     projectDir: projectDir
   });
+
   doOrThrow(function () {
     projectContext.prepareProjectForBuild();
   });

From 643a9f12da263044829f90ea06cbb1d6c1afe91e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 15:26:10 -0400
Subject: [PATCH 522/688] Move default npm deps install function into own
 module.

This extraction was necessary because importing tools/cli/commands.js is
not entirely side-effect-free, and was interfering with older tests.
---
 tools/cli/commands.js                  | 30 +-------------------
 tools/cli/default-npm-deps.js          | 39 ++++++++++++++++++++++++++
 tools/tests/old/test-bundler-assets.js |  2 +-
 tools/tool-testing/selftest.js         |  2 +-
 4 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 tools/cli/default-npm-deps.js

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index e048049370..2484b36fa1 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1566,7 +1566,7 @@ function doTestCommand(options) {
     projectContextOptions.projectDir = testRunnerAppDir;
     projectContextOptions.projectDirForLocalPackages = options.appDir;
 
-    installDefaultNpmDeps(testRunnerAppDir);
+    require("./default-npm-deps.js").install(testRunnerAppDir);
     if (buildmessage.jobHasMessages()) {
       return;
     }
@@ -1717,34 +1717,6 @@ function doTestCommand(options) {
   ));
 }
 
-export function installDefaultNpmDeps(appDir) {
-  const testAppPkgJsonPath =
-    files.pathJoin(appDir, "package.json");
-
-  if (! files.statOrNull(testAppPkgJsonPath)) {
-    const { dependencies } = require("../static-assets/skel/package.json");
-
-    // Write a minimial package.json with the same dependencies as the
-    // default new-app package.json file.
-    files.writeFile(
-      testAppPkgJsonPath,
-      JSON.stringify({ dependencies }, null, 2) + "\n",
-      "utf8",
-    );
-  }
-
-  const jobMessage = "installing dependencies from package.json";
-  buildmessage.enterJob(jobMessage, function () {
-    const { runNpmCommand } = require("../isobuild/meteor-npm.js");
-    const installResult = runNpmCommand(["install"], appDir);
-    if (! installResult.success) {
-      buildmessage.error(
-        "Could not install npm dependencies for test-packages: " +
-          installResult.error);
-    }
-  });
-}
-
 // Returns the "local-test:*" package names for the given package names (or for
 // all local packages if packageNames is empty/unspecified).
 var getTestPackageNames = function (projectContext, packageNames) {
diff --git a/tools/cli/default-npm-deps.js b/tools/cli/default-npm-deps.js
new file mode 100644
index 0000000000..59d315fe3c
--- /dev/null
+++ b/tools/cli/default-npm-deps.js
@@ -0,0 +1,39 @@
+import buildmessage from "../utils/buildmessage.js";
+import {
+  pathJoin,
+  statOrNull,
+  writeFile,
+} from "../fs/files.js";
+
+const INSTALL_JOB_MESSAGE = "installing dependencies from package.json";
+
+export function install(appDir) {
+  const testAppPkgJsonPath = pathJoin(appDir, "package.json");
+
+  if (! statOrNull(testAppPkgJsonPath)) {
+    const { dependencies } = require("../static-assets/skel/package.json");
+
+    // Write a minimial package.json with the same dependencies as the
+    // default new-app package.json file.
+    writeFile(
+      testAppPkgJsonPath,
+      JSON.stringify({ dependencies }, null, 2) + "\n",
+      "utf8",
+    );
+  }
+
+  return buildmessage.enterJob(INSTALL_JOB_MESSAGE, function () {
+    const { runNpmCommand } = require("../isobuild/meteor-npm.js");
+
+    const installResult = runNpmCommand(["install"], appDir);
+    if (! installResult.success) {
+      buildmessage.error(
+        "Could not install npm dependencies for test-packages: " +
+          installResult.error);
+
+      return false;
+    }
+
+    return true;
+  });
+}
diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js
index 6e3d8a48be..5107c00813 100644
--- a/tools/tests/old/test-bundler-assets.js
+++ b/tools/tests/old/test-bundler-assets.js
@@ -25,7 +25,7 @@ var makeProjectContext = function (appName) {
 
   files.cp_r(testAppDir, projectDir);
 
-  require("../../cli/commands.js").installDefaultNpmDeps(projectDir);
+  require("../../cli/default-npm-deps.js").install(projectDir);
 
   var projectContext = new projectContextModule.ProjectContext({
     projectDir: projectDir
diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 771b20d1a9..492d7fbdce 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -703,7 +703,7 @@ _.extend(Sandbox.prototype, {
       upgradersFile.appendUpgraders(upgraders.allUpgraders());
     }
 
-    require("../cli/commands.js").installDefaultNpmDeps(absoluteTo);
+    require("../cli/default-npm-deps.js").install(absoluteTo);
 
     if (options.dontPrepareApp) {
       return;

From 31e7b8bb48546efcc05bebd4f24f0405b9eeb5ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 15:45:04 -0400
Subject: [PATCH 523/688] Clean up temporary package.json files.

---
 tools/cli/default-npm-deps.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/cli/default-npm-deps.js b/tools/cli/default-npm-deps.js
index 59d315fe3c..73baf9c6a7 100644
--- a/tools/cli/default-npm-deps.js
+++ b/tools/cli/default-npm-deps.js
@@ -3,26 +3,28 @@ import {
   pathJoin,
   statOrNull,
   writeFile,
+  unlink,
 } from "../fs/files.js";
 
 const INSTALL_JOB_MESSAGE = "installing dependencies from package.json";
 
 export function install(appDir) {
-  const testAppPkgJsonPath = pathJoin(appDir, "package.json");
+  const packageJsonPath = pathJoin(appDir, "package.json");
+  const needTempPackageJson = ! statOrNull(packageJsonPath);
 
-  if (! statOrNull(testAppPkgJsonPath)) {
+  if (needTempPackageJson) {
     const { dependencies } = require("../static-assets/skel/package.json");
 
     // Write a minimial package.json with the same dependencies as the
     // default new-app package.json file.
     writeFile(
-      testAppPkgJsonPath,
+      packageJsonPath,
       JSON.stringify({ dependencies }, null, 2) + "\n",
       "utf8",
     );
   }
 
-  return buildmessage.enterJob(INSTALL_JOB_MESSAGE, function () {
+  const ok = buildmessage.enterJob(INSTALL_JOB_MESSAGE, function () {
     const { runNpmCommand } = require("../isobuild/meteor-npm.js");
 
     const installResult = runNpmCommand(["install"], appDir);
@@ -36,4 +38,11 @@ export function install(appDir) {
 
     return true;
   });
+
+  if (needTempPackageJson) {
+    // Clean up the temporary package.json file created above.
+    unlink(packageJsonPath);
+  }
+
+  return ok;
 }

From 476d6bf7b33a0640ee5bdd7a48154d3bf69fcca7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 16:24:24 -0400
Subject: [PATCH 524/688] Attempt to fix "run --once" test by giving Mongo a
 chance to exit.

This test has been failing intermittently on Circle CI.
---
 tools/tests/run.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/tests/run.js b/tools/tests/run.js
index 3be4636150..e329512278 100644
--- a/tools/tests/run.js
+++ b/tools/tests/run.js
@@ -175,6 +175,9 @@ selftest.define("run --once", ["yet-unsolved-windows-failure"], function () {
   s.unlink('empty.js');
   s.write('.meteor/release', originalRelease);
 
+  // Wait for Mongo to exit after Meteor exits.
+  utils.sleepMs(2000);
+
   // Try it with a real Mongo. Make sure that it actually starts one.
   s = new Sandbox;
   s.createApp("onceapp", "once");

From e345fc2d2717b2ef75bd28a5e545dd5239c8e1bf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 17:07:50 -0400
Subject: [PATCH 525/688] Separate failing part of "run --once" test into own
 test.

---
 tools/tests/run.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/tests/run.js b/tools/tests/run.js
index e329512278..e9cf8ec9cb 100644
--- a/tools/tests/run.js
+++ b/tools/tests/run.js
@@ -174,16 +174,14 @@ selftest.define("run --once", ["yet-unsolved-windows-failure"], function () {
   run.forbidAll("updated");
   s.unlink('empty.js');
   s.write('.meteor/release', originalRelease);
+});
 
-  // Wait for Mongo to exit after Meteor exits.
-  utils.sleepMs(2000);
-
-  // Try it with a real Mongo. Make sure that it actually starts one.
-  s = new Sandbox;
+selftest.define("run --once with real Mongo", function () {
+  var s = new Sandbox;
   s.createApp("onceapp", "once");
   s.cd("onceapp");
   s.set("RUN_ONCE_OUTCOME", "mongo");
-  run = s.run("--once");
+  var run = s.run("--once");
   run.waitSecs(30);
   run.expectExit(86);
 });

From cfc167a67b1b5ef26d6cd6d525357619ac99136b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 17:25:26 -0400
Subject: [PATCH 526/688] Make test more reliable by calling insert in
 Meteor.startup.

---
 tools/tests/apps/once/once.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/tests/apps/once/once.js b/tools/tests/apps/once/once.js
index dcc357aca0..2eb842d08a 100644
--- a/tools/tests/apps/once/once.js
+++ b/tools/tests/apps/once/once.js
@@ -14,6 +14,8 @@ if (process.env.RUN_ONCE_OUTCOME === "hang") {
 
 if (process.env.RUN_ONCE_OUTCOME === "mongo") {
   var test = new Mongo.Collection('test');
-  test.insert({ value: 86 });
-  process.exit(test.findOne().value);
+  Meteor.startup(function () {
+    test.insert({ value: 86 });
+    process.exit(test.findOne().value);
+  });
 }

From 11c7b2aee2920708a4458996b1a96c2fbddcc96e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 17:55:38 -0400
Subject: [PATCH 527/688] Bump package versions for 1.4.2.1-beta.1 release.

---
 packages/accounts-oauth/package.js             | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 8 +++++---
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-common/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 11 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index e79118b29d..edb1bd4d0c 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.15-beta.0"
+  version: "1.1.15-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 430906f856..9633f271ae 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.1"
+  version: "1.3.2-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 46086e30a4..22fbccf0e5 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0-beta.0',
+  version: '1.0.0-beta.1',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 88795d4906..42369609d7 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,12 +1,14 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.8',
+  version: '1.1.9-beta.1',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
 
-Npm.depends({'lru-cache': '2.6.4',
-             'async': '1.4.0'});
+Npm.depends({
+  'lru-cache': '2.6.4',
+  'async': '1.4.0'
+});
 
 Package.onUse(function(api) {
   api.use(['ecmascript', 'random']);
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 35c4c5cace..a6a51caa95 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-3-beta.0"
+  version: "1.11.1-3-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 0fe78c20e4..adbc5f0229 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.8-beta.0',
+  version: '1.2.8-beta.1',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 280546576c..28eb5c260a 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12-beta.0',
+  version: '1.3.12-beta.1',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index 0fe2df8fc4..361c70c421 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7-beta.0',
+  version: '2.7.7-beta.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 68a0b284da..5c202b9f03 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-1-beta.0'
+  version: '1.4.2-1-beta.1'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 3b7d1aed8d..226bd12d4c 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7-beta.0"
+  version: "2.513.7-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4b6491b2ad..36bcc5df36 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.1-beta.0",
+ "version": "1.4.2.1-beta.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From acc98c7c15ae7dc68d635fd21c08fa220d821b1a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 2 Nov 2016 19:23:09 -0400
Subject: [PATCH 528/688] Set NPM_CONFIG_PREFIX to dev_bundle by default.

---
 tools/cli/dev-bundle-bin-helpers.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js
index f81f704745..3f90762bdf 100644
--- a/tools/cli/dev-bundle-bin-helpers.js
+++ b/tools/cli/dev-bundle-bin-helpers.js
@@ -77,9 +77,17 @@ exports.getEnv = function (options) {
 
     var env = Object.create(process.env);
 
+    // Make sure `meteor npm install --global ...` installs into
+    // dev_bundle/lib/node_modules by default.
+    if (! env.NPM_CONFIG_PREFIX) {
+      env.NPM_CONFIG_PREFIX = devBundleDir;
+    }
+
     // Make sure we don't try to use the global ~/.npm cache accidentally.
     if (! env.NPM_CONFIG_CACHE) {
-      env.NPM_CONFIG_CACHE = path.join(devBundleDir, ".npm");
+      env.NPM_CONFIG_CACHE = path.join(
+        // If the user set NPM_CONFIG_PREFIX, respect that.
+        env.NPM_CONFIG_PREFIX, ".npm");
     }
 
     if (env.METEOR_ALLOW_SUPERUSER) {

From d74c7b68ce94d22563253ad04a3c22ed650af6d7 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Thu, 3 Nov 2016 07:44:12 -0400
Subject: [PATCH 529/688] Updated the Assets API to make sure assetPath strings
 are normalized (to address issue #5626).

---
 tools/static-assets/server/boot.js          |  8 ++++++++
 tools/tests/apps/unicode-asset-app/index.js | 21 ++++++++++++++++++++-
 tools/tests/assets.js                       |  7 ++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 8e58b9e3b4..16b882d11e 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -227,6 +227,10 @@ var loadServerBundles = Profile("Load server bundles", function () {
       // written on Windows.
       assetPath = files.convertToStandardPath(assetPath);
 
+      // Normalize the asset path to prevent Unicode string mismatches when
+      // using this string elsewhere.
+      assetPath = assetPath.normalize('NFC');
+
       if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
         _callback(new Error("Unknown asset: " + assetPath));
       } else {
@@ -251,6 +255,10 @@ var loadServerBundles = Profile("Load server bundles", function () {
        * @param {String} assetPath The path of the asset, relative to the application's `private` subdirectory.
        */
       absoluteFilePath: function (assetPath) {
+        // Normalize the asset path to prevent Unicode string mismatches when
+        // using this string elsewhere.
+        assetPath = assetPath.normalize('NFC');
+
         if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
           throw new Error("Unknown asset: " + assetPath);
         }
diff --git a/tools/tests/apps/unicode-asset-app/index.js b/tools/tests/apps/unicode-asset-app/index.js
index bb4d1ddb8d..0d414d7ee4 100644
--- a/tools/tests/apps/unicode-asset-app/index.js
+++ b/tools/tests/apps/unicode-asset-app/index.js
@@ -1,3 +1,22 @@
+'use strict';
+
 if (Meteor.isServer) {
-  console.log(Assets.getText('maça verde.txt'));
+  // c\u0327 = 2 code points: U+0063 LATIN SMALL LETTER C and U+0327 COMBINING
+  //           CEDILLA
+  // \xE7 = 1 code point: U+00E7 LATIN SMALL LETTER C WITH CEDILLA
+  const filenames = [
+    'maça verde.txt',
+    'mac\u0327a verde.txt',
+    'ma\xE7a verde.txt',
+  ];
+
+  for (let i = 0; i < filenames.length; i++) {
+    console.log(`${i + 1} - getText: ${Assets.getText(filenames[i])}`);
+  }
+
+  for (let i = 0; i < filenames.length; i++) {
+    console.log(
+      `${i + 1} - absoluteFilePath: ${Assets.absoluteFilePath(filenames[i])}`
+    );
+  }
 }
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
index 3ed52ba136..4cbf081804 100644
--- a/tools/tests/assets.js
+++ b/tools/tests/assets.js
@@ -20,6 +20,11 @@ selftest.define("assets - unicode asset names are allowed", () => {
   s.createApp('myapp', 'unicode-asset-app');
   s.cd('myapp');
   const run = startRun(s);
-  run.match('Hello world!');
+  run.match('1 - getText: Hello world!');
+  run.match('2 - getText: Hello world!');
+  run.match('3 - getText: Hello world!');
+  run.match(/1 - absoluteFilePath:(.*)macaverde.txt/);
+  run.match(/2 - absoluteFilePath:(.*)macaverde.txt/);
+  run.match(/3 - absoluteFilePath:(.*)macaverde.txt/);
   run.stop();
 });

From 19fdc5c65faa28834f26403fb6ad2d7984e2c1f4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 3 Nov 2016 10:25:48 -0400
Subject: [PATCH 530/688] Make npm-rebuild.js more Windows-friendly.

Fixes #8007.
---
 tools/static-assets/server/npm-rebuild.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tools/static-assets/server/npm-rebuild.js b/tools/static-assets/server/npm-rebuild.js
index 50a4ec89bd..a55e7a92be 100644
--- a/tools/static-assets/server/npm-rebuild.js
+++ b/tools/static-assets/server/npm-rebuild.js
@@ -5,6 +5,7 @@ if (process.env.METEOR_SKIP_NPM_REBUILD) {
   process.exit(0);
 }
 
+var fs = require("fs");
 var path = require("path");
 var spawn = require("child_process").spawn;
 var rebuildArgs = require("./npm-rebuild-args.js").get();
@@ -23,17 +24,26 @@ try {
 }
 
 // Make sure the npm finds this exact version of node in its $PATH.
-var PATH = path.dirname(process.execPath) + ":" + process.env.PATH;
+var binDir = path.dirname(process.execPath);
+var PATH = binDir + path.delimiter + process.env.PATH;
 var env = Object.create(process.env, {
   PATH: { value: PATH }
 });
 
+var npmCmd = "npm";
+if (process.platform === "win32") {
+  var npmCmdPath = path.join(binDir, "npm.cmd");
+  if (fs.existsSync(npmCmdPath)) {
+    npmCmd = npmCmdPath;
+  }
+}
+
 function rebuild(i) {
   var dir = rebuilds && rebuilds[i];
 
   if (! dir) {
     // Print Node/V8/etc. versions for diagnostic purposes.
-    spawn("npm", ["version", "--json"], {
+    spawn(npmCmd, ["version", "--json"], {
       stdio: "inherit",
       env: env
     });
@@ -41,7 +51,7 @@ function rebuild(i) {
     return;
   }
 
-  spawn("npm", rebuildArgs, {
+  spawn(npmCmd, rebuildArgs, {
     cwd: path.join(__dirname, dir),
     stdio: "inherit",
     env: env

From f290abc72eef3a72f8a607782f0309b1410394cb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 3 Nov 2016 11:48:02 -0400
Subject: [PATCH 531/688] Another attempt to make "run --once" test more
 reliable.

---
 tools/tests/apps/once/once.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/tests/apps/once/once.js b/tools/tests/apps/once/once.js
index 2eb842d08a..57dbcefbcd 100644
--- a/tools/tests/apps/once/once.js
+++ b/tools/tests/apps/once/once.js
@@ -14,8 +14,23 @@ if (process.env.RUN_ONCE_OUTCOME === "hang") {
 
 if (process.env.RUN_ONCE_OUTCOME === "mongo") {
   var test = new Mongo.Collection('test');
-  Meteor.startup(function () {
-    test.insert({ value: 86 });
+  var triesLeft = 10;
+
+  function tryInsert() {
+    try {
+      test.insert({ value: 86 });
+    } catch (e) {
+      if (--triesLeft <= 0) {
+        throw e;
+      }
+
+      console.log("insert failed; retrying:", String(e.stack || e));
+      setTimeout(tryInsert, 1000);
+      return;
+    }
+
     process.exit(test.findOne().value);
-  });
+  }
+
+  Meteor.startup(tryInsert);
 }

From 57fe26161d7af3f85d6bf3a009d8a915cdae6690 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 3 Nov 2016 12:18:21 -0400
Subject: [PATCH 532/688] Use Meteor.setTimeout to re-run tryInsert function.

---
 tools/tests/apps/once/once.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tests/apps/once/once.js b/tools/tests/apps/once/once.js
index 57dbcefbcd..3bd8d6f10f 100644
--- a/tools/tests/apps/once/once.js
+++ b/tools/tests/apps/once/once.js
@@ -25,7 +25,7 @@ if (process.env.RUN_ONCE_OUTCOME === "mongo") {
       }
 
       console.log("insert failed; retrying:", String(e.stack || e));
-      setTimeout(tryInsert, 1000);
+      Meteor.setTimeout(tryInsert, 1000);
       return;
     }
 

From e7a8320ef9526e5e2de842c7902b08158760c772 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 3 Nov 2016 12:12:05 -0400
Subject: [PATCH 533/688] Update History.md with changes in Meteor 1.4.2.1.

---
 History.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/History.md b/History.md
index 3938c4cf0d..5cca124c04 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,43 @@
 ## v.NEXT
 
+## v1.4.2.1
+
+* Installing the `babel-runtime` npm package in your application
+  `node_modules` directory is now required for most Babel-transformed code
+  to work, as the Meteor `babel-runtime` package no longer attempts to
+  provide custom implementations of Babel helper functions. To install
+  the `babel-runtime` package, simply run the command
+  ```sh
+  meteor npm install --save babel-runtime
+  ```
+  in any Meteor application directory. The Meteor `babel-runtime` package
+  version has been bumped to 1.0.0 to reflect this major change.
+  [#7995](https://github.com/meteor/meteor/pull/7995)
+
+* File system operations performed by the command-line tool no longer use
+  fibers unless the `METEOR_DISABLE_FS_FIBERS` environment variable is
+  explicitly set to a falsy value. For larger apps, this change results in
+  significant build performance improvements due to the creation of fewer
+  fibers and the avoidance of unnecessary asyncronous delays.
+  https://github.com/meteor/meteor/pull/7975/commits/ca4baed90ae0675e55c93976411d4ed91f12dd63
+
+* Running Meteor as `root` is still discouraged, and results in a fatal
+  error by default, but the `--allow-superuser` flag now works as claimed.
+  [#7959](https://github.com/meteor/meteor/issues/7959)
+
+* The `dev_bundle\python\python.exe` executable has been restored to the
+  Windows dev bundle, which may help with `meteor npm rebuild` commands.
+  [#7960](https://github.com/meteor/meteor/issues/7960)
+
+* Changes within linked npm packages now trigger a partial rebuild,
+  whereas previously (in 1.4.2) they were ignored.
+  [#7978](https://github.com/meteor/meteor/issues/7978)
+
+* Miscellaneous fixed bugs:
+  [#7974](https://github.com/meteor/meteor/issues/7974)
+  [#7956](https://github.com/meteor/meteor/issues/7956)
+  [#8007](https://github.com/meteor/meteor/issues/8007)
+
 ## v1.4.2
 
 * This release implements a number of rebuild performance optimizations.

From 2e00dc3663eb09c920f2e7fbd0a7972a46526ff3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 3 Nov 2016 12:19:56 -0400
Subject: [PATCH 534/688] Bump package versions for 1.4.2.1-rc.0 release.

---
 packages/accounts-oauth/package.js             | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-common/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index edb1bd4d0c..184ecb8a8b 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.15-beta.1"
+  version: "1.1.15-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 9633f271ae..9a4f9a593b 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.2-beta.1"
+  version: "1.3.2-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 22fbccf0e5..31df3ec5e3 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0-beta.1',
+  version: '1.0.0-rc.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 42369609d7..78abb3c474 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.9-beta.1',
+  version: '1.1.9-rc.0',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index a6a51caa95..c4c6a4f7a2 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-3-beta.1"
+  version: "1.11.1-3-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index adbc5f0229..d167e4c623 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.8-beta.1',
+  version: '1.2.8-rc.0',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 28eb5c260a..40e65bb6bb 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12-beta.1',
+  version: '1.3.12-rc.0',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index 361c70c421..f12e82dbee 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7-beta.1',
+  version: '2.7.7-rc.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 5c202b9f03..071a89cffd 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-1-beta.1'
+  version: '1.4.2-1-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 226bd12d4c..a5d296621f 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7-beta.1"
+  version: "2.513.7-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 36bcc5df36..895b657dd8 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.1-beta.1",
+ "version": "1.4.2.1-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 9d7cf49511d55579e836f9d4adc4ee18bc4d3ff8 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 3 Nov 2016 14:26:17 +0200
Subject: [PATCH 535/688] Support SAVE_DEV_BUNDLE_TARBALL caching on Windows
 dev_bundle install

The SAVE_DEV_BUNDLE_TARBALL environment variable is already supported in the Unix version and this mimics that functionality in the Windows script.  Use of this flag makes debugging much less painful, especially when switching branches (for example, during a `git bisect`) as the dev_bundle can be cached locally.

I also replaced a couple un-related uses of `echo` with `Write-Host` which is the preferred way to output messages in PowerShell as it supports more options.

Fixes: developer experience
---
 scripts/windows/download-dev-bundle.ps1 | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/scripts/windows/download-dev-bundle.ps1 b/scripts/windows/download-dev-bundle.ps1
index 485585f77f..290e5dd5b8 100644
--- a/scripts/windows/download-dev-bundle.ps1
+++ b/scripts/windows/download-dev-bundle.ps1
@@ -9,11 +9,10 @@ $CHECKOUT_DIR = split-path -parent $scripts_path
 $BUNDLE_VERSION = select-string -Path ($CHECKOUT_DIR + "\meteor") -Pattern 'BUNDLE_VERSION=(\S+)'  | % { $_.Matches[0].Groups[1].Value } | select-object -First 1
 $BUNDLE_VERSION = $BUNDLE_VERSION.Trim()
 
-echo "Will get you a dev_bundle for $PLATFORM version $BUNDLE_VERSION"
+Write-Host "Will get you a dev_bundle for $PLATFORM version $BUNDLE_VERSION"
 
 $TARBALL="dev_bundle_${PLATFORM}_${BUNDLE_VERSION}.tar.gz"
 
-echo "Going to download the dependency kit from the Internet"
 $ErrorActionPreference = "Stop"
 
 # duplicated in top-level meteor script:
@@ -29,10 +28,18 @@ if ("$env:USE_TEST_DEV_BUNDLE_SERVER" -ne "") {
 $devbundle_link = $DEV_BUNDLE_URL_ROOT + $TARBALL
 $devbundle_zip = $CHECKOUT_DIR + "\" + $TARBALL
 
-$webclient = New-Object System.Net.WebClient
-$webclient.DownloadFile($devbundle_link, $devbundle_zip)
+if (Test-Path $devbundle_zip) {
+  Write-Host "Skipping download and installing kit from $devbundle_zip"
+} else {
+  Write-Host "Going to download the dependency kit from the Internet"
 
-echo "... downloaded"
+  $webclient = New-Object System.Net.WebClient
+  $webclient.DownloadFile($devbundle_link, $devbundle_zip)
+
+  Write-Host "... downloaded"
+}
+
+Write-Host "Extracting $TARBALL to the dev_bundle directory"
 
 cmd /C "7z.exe x $devbundle_zip -so | 7z.exe x -aoa -si -ttar -o$CHECKOUT_DIR\dev_bundle_XXX" | out-null
 
@@ -42,5 +49,14 @@ $target_path = $CHECKOUT_DIR + "\dev_bundle"
 Move-Item  $downloaded_path $target_path
 
 Remove-Item -Recurse -Force $downloaded_tmp
-Remove-Item -Force $devbundle_zip
 
+if ("$env:SAVE_DEV_BUNDLE_TARBALL" -ne "") {
+  Write-Host "Saving the dev_bundle tarball since " -NoNewLine
+  Write-Host "'SAVE_DEV_BUNDLE_TARBALL' is set in your environment. " -NoNewLine
+  Write-Host "Remember, these can get quite large!"
+} else {
+  Write-Host "Removing dev_bundle tarball. You can preserve this in " -NoNewLine
+  Write-Host "the future by setting 'SAVE_DEV_BUNDLE_TARBALL' in " -NoNewLine
+  Write-Host "your environment."
+  Remove-Item -Force $devbundle_zip
+}

From c93756a710c010f976cdb1b49e874b61691a5ad1 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Thu, 3 Nov 2016 13:57:17 -0400
Subject: [PATCH 536/688] Moved common normalize code into mini-files.js;
 Added/adjusted tests.

---
 tools/static-assets/server/boot.js          |  8 +++----
 tools/static-assets/server/mini-files.js    |  6 ++++++
 tools/tests/apps/unicode-asset-app/index.js | 12 +++++------
 tools/tests/assets.js                       | 24 +++++++++++++++++++++
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 16b882d11e..4abc6dc05f 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -227,9 +227,9 @@ var loadServerBundles = Profile("Load server bundles", function () {
       // written on Windows.
       assetPath = files.convertToStandardPath(assetPath);
 
-      // Normalize the asset path to prevent Unicode string mismatches when
+      // Unicode normalize the asset path to prevent string mismatches when
       // using this string elsewhere.
-      assetPath = assetPath.normalize('NFC');
+      assetPath = files.unicodeNormalizePath(assetPath);
 
       if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
         _callback(new Error("Unknown asset: " + assetPath));
@@ -255,9 +255,9 @@ var loadServerBundles = Profile("Load server bundles", function () {
        * @param {String} assetPath The path of the asset, relative to the application's `private` subdirectory.
        */
       absoluteFilePath: function (assetPath) {
-        // Normalize the asset path to prevent Unicode string mismatches when
+        // Unicode normalize the asset path to prevent string mismatches when
         // using this string elsewhere.
-        assetPath = assetPath.normalize('NFC');
+        assetPath = files.unicodeNormalizePath(assetPath);
 
         if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
           throw new Error("Unknown asset: " + assetPath);
diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js
index 3d29cc5549..2946f00a01 100644
--- a/tools/static-assets/server/mini-files.js
+++ b/tools/static-assets/server/mini-files.js
@@ -69,6 +69,11 @@ var convertToStandardLineEndings = function (fileContents) {
                      .replace(new RegExp("\r", "g"), "\n");
 };
 
+// Return the Unicode Normalization Form of the passed in path string, using
+// "Normalization Form Canonical Composition"
+const unicodeNormalizePath = (path) => {
+  return (path) ? path.normalize('NFC') : path;
+};
 
 // wrappings for path functions that always run as they were on unix (using
 // forward slashes)
@@ -117,3 +122,4 @@ files.convertToPosixPath = toPosixPath;
 
 files.convertToStandardLineEndings = convertToStandardLineEndings;
 files.convertToOSLineEndings = convertToOSLineEndings;
+files.unicodeNormalizePath = unicodeNormalizePath;
diff --git a/tools/tests/apps/unicode-asset-app/index.js b/tools/tests/apps/unicode-asset-app/index.js
index 0d414d7ee4..1eba400fb4 100644
--- a/tools/tests/apps/unicode-asset-app/index.js
+++ b/tools/tests/apps/unicode-asset-app/index.js
@@ -10,13 +10,13 @@ if (Meteor.isServer) {
     'ma\xE7a verde.txt',
   ];
 
-  for (let i = 0; i < filenames.length; i++) {
-    console.log(`${i + 1} - getText: ${Assets.getText(filenames[i])}`);
-  }
+  filenames.forEach((filename, index) => {
+    console.log(`${index + 1} - getText: ${Assets.getText(filename)}`);
+  });
 
-  for (let i = 0; i < filenames.length; i++) {
+  filenames.forEach((filename, index) => {
     console.log(
-      `${i + 1} - absoluteFilePath: ${Assets.absoluteFilePath(filenames[i])}`
+      `${index + 1} - absoluteFilePath: ${Assets.absoluteFilePath(filename)}`
     );
-  }
+  });
 }
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
index 4cbf081804..fd35fe8116 100644
--- a/tools/tests/assets.js
+++ b/tools/tests/assets.js
@@ -28,3 +28,27 @@ selftest.define("assets - unicode asset names are allowed", () => {
   run.match(/3 - absoluteFilePath:(.*)macaverde.txt/);
   run.stop();
 });
+
+// Verify path strings can be Unicode normalized through the
+// tools/static-assets/server/mini-files.js#unicodeNormalizePath helper
+selftest.define(
+  "assets - helper exists to unicode normalize path strings",
+  () => {
+    const files = require('../static-assets/server/mini-files.js');
+
+    selftest.expectEqual(null, files.unicodeNormalizePath(null));
+
+    const unicodeNormalizedPath = '/path/maça verde.txt'.normalize('NFC');
+    const testPaths = [
+      '/path/maça verde.txt',
+      '/path/mac\u0327a verde.txt',
+      '/path/ma\xE7a verde.txt',
+    ];
+    testPaths.forEach((path) => {
+      selftest.expectEqual(
+        unicodeNormalizedPath,
+        files.unicodeNormalizePath(path)
+      );
+    });
+  }
+);

From 1aae7100603ed6c3688dc65e2ed3ca24a2be5651 Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Fri, 4 Nov 2016 14:24:20 +0100
Subject: [PATCH 537/688] Link directly to target.

---
 Contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Contributing.md b/Contributing.md
index 7bca90b0d9..d5c73922f4 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -156,7 +156,7 @@ these guidelines:
  * Include tests that prove your code works.
 
  * Follow the
-   [MDG style guide](https://github.com/meteor/meteor/wiki/Meteor-Style-Guide)
+   [MDG style guide](https://guide.meteor.com/code-style.html#javascript)
    for code and commit messages.
 
  * Be sure your author field in git is properly filled out with your full name

From af51b8160ce443e0bf46b9a801cb2068eaf85a21 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 4 Nov 2016 16:34:51 -0400
Subject: [PATCH 538/688] Use absolute paths for external symlinks in
 Builder#copyDirectory.

Thanks to @worldsayshi for reporting this issue with a reproduction.

Fixes #8005.
Fixes #2876.
Fixes #7154.
---
 tools/isobuild/builder.js | 63 +++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index a864ba6f9f..df753e93b0 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -1,3 +1,4 @@
+import assert from "assert";
 import {WatchSet, readAndWatchFile, sha1} from '../fs/watch.js';
 import files from '../fs/files.js';
 import NpmDiscards from './npm-discards.js';
@@ -65,6 +66,8 @@ export default class Builder {
     this.writtenHashes = {};
     this.previousWrittenHashes = {};
 
+    this._realpathCache = Object.create(null);
+
     // foo/bar => foo/.build1234.bar
     // Should we include a random number? The advantage is that multiple
     // builds can run in parallel. The disadvantage is that stale build
@@ -443,7 +446,11 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
       });
     }
 
-    let walk = (absFrom, relTo) => {
+    const walk = (
+      absFrom,
+      relTo,
+      _currentRealRootDir = absFrom
+    ) => {
       if (symlink && ! (relTo in this.usedAsFile)) {
         this._ensureDirectory(files.pathDirname(relTo));
         const absTo = files.pathResolve(this.buildPath, relTo);
@@ -454,14 +461,55 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
       this._ensureDirectory(relTo);
 
       optimisticReaddir(absFrom).forEach(item => {
-        const thisAbsFrom = files.pathResolve(absFrom, item);
+        let thisAbsFrom = files.pathResolve(absFrom, item);
         const thisRelTo = files.pathJoin(relTo, item);
 
         if (specificPaths && !(thisRelTo in specificPaths)) {
           return;
         }
 
-        const fileStatus = optimisticLStat(thisAbsFrom);
+        // Returns files.realpath(thisAbsFrom), iff it is external to
+        // _currentRealRootDir, using caching because this function might
+        // be called more than once.
+        let cachedExternalPath;
+        const getExternalPath = () => {
+          if (typeof cachedExternalPath !== "undefined") {
+            return cachedExternalPath;
+          }
+
+          const real = files.realpath(thisAbsFrom, this._realpathCache);
+          const isExternal =
+            files.pathRelative(_currentRealRootDir, real).startsWith("..");
+
+          // Now cachedExternalPath is either a string or false.
+          return cachedExternalPath = isExternal && real;
+        };
+
+        let fileStatus = optimisticLStat(thisAbsFrom);
+
+        if (! symlink && fileStatus.isSymbolicLink()) {
+          // If copyDirectory is not allowed to create symbolic links to
+          // external files, and this file is a symbolic link that points
+          // to an external file, update fileStatus so that we copy this
+          // file as a normal file rather than as a symbolic link.
+
+          const externalPath = getExternalPath();
+          if (externalPath) {
+            // Copy from the real path rather than the link path.
+            thisAbsFrom = externalPath;
+
+            // Update fileStatus to match the actual file rather than the
+            // symbolic link, thus forcing the file to be copied below.
+            fileStatus = optimisticLStat(externalPath);
+
+            if (fileStatus.isDirectory()) {
+              // Update _currentRealRootDir so that we can judge
+              // isExternal relative to this new root directory when
+              // traversing nested directories.
+              _currentRealRootDir = externalPath;
+            }
+          }
+        }
 
         let itemForMatch = item;
         const isDirectory = fileStatus.isDirectory();
@@ -482,12 +530,15 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
         if (isDirectory) {
           if (typeof directoryFilter !== "function" ||
               directoryFilter(thisAbsFrom)) {
-            walk(thisAbsFrom, thisRelTo);
+            walk(thisAbsFrom, thisRelTo, _currentRealRootDir);
           }
 
         } else if (fileStatus.isSymbolicLink()) {
           symlinkWithOverwrite(
-            files.readlink(thisAbsFrom),
+            // Symbolic links pointing to relative external paths are less
+            // portable than absolute links, so getExternalPath() is
+            // preferred if it returns a path.
+            getExternalPath() || files.readlink(thisAbsFrom),
             files.pathResolve(this.buildPath, thisRelTo)
           );
 
@@ -518,7 +569,7 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
       });
     };
 
-    walk(from, to);
+    walk(files.realpath(from, this._realpathCache), to);
   }
 
   // Returns a new Builder-compatible object that works just like a

From 7f35e947134f89f6fcaed9c2dab091bdb57339d2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 4 Nov 2016 18:14:09 -0400
Subject: [PATCH 539/688] Tolerate files.realpath throwing ENOENT exceptions.

---
 tools/isobuild/builder.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index df753e93b0..33c16bb8e9 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -477,7 +477,16 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
             return cachedExternalPath;
           }
 
-          const real = files.realpath(thisAbsFrom, this._realpathCache);
+          try {
+            var real = files.realpath(
+              thisAbsFrom,
+              this._realpathCache
+            );
+          } catch (e) {
+            if (e.code !== "ENOENT") throw e;
+            return cachedExternalPath = false;
+          }
+
           const isExternal =
             files.pathRelative(_currentRealRootDir, real).startsWith("..");
 

From 52697c71676356c7b2aac898721839c99ec3444d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 4 Nov 2016 18:25:00 -0400
Subject: [PATCH 540/688] Cache getProdPackageNames optimistically.

---
 tools/isobuild/meteor-npm.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 71451e0a1c..90bd3ef028 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -22,6 +22,7 @@ import {
   convert as convertColonsInPath
 } from "../utils/colon-converter.js";
 
+import { wrap as wrapOptimistic } from "optimism";
 import {
   dirtyNodeModulesDirectory,
   optimisticLStat,
@@ -133,7 +134,7 @@ meteorNpm.updateDependencies = function (packageName,
 
 // Returns a flattened dictionary of npm package names used in production,
 // or false if there is no package.json file in the parent directory.
-export function getProdPackageNames(nodeModulesDir) {
+export const getProdPackageNames = wrapOptimistic(nodeModulesDir => {
   const names = Object.create(null);
   const dirs = Object.create(null);
   const nodeModulesDirStack = [];
@@ -208,7 +209,7 @@ export function getProdPackageNames(nodeModulesDir) {
   // Concretely, this means your app needs to have a package.json file if
   // you want any npm packages to be excluded in production.
   return walk(files.pathDirname(nodeModulesDir)) && names;
-}
+});
 
 const lastRebuildJSONFilename = ".meteor-last-rebuild-version.json";
 

From ad460e0d7d3cd0ad43075fefcc4f542af069b198 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 4 Nov 2016 18:45:29 -0400
Subject: [PATCH 541/688] Tolerate files.realpath throwing ELOOP exceptions.

---
 tools/isobuild/builder.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 33c16bb8e9..8136e3d2fd 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -483,7 +483,10 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
               this._realpathCache
             );
           } catch (e) {
-            if (e.code !== "ENOENT") throw e;
+            if (e.code !== "ENOENT" &&
+                e.code !== "ELOOP") {
+              throw e;
+            }
             return cachedExternalPath = false;
           }
 

From 6ce7891d9bed3badd82c3a8c5a8515a800a82eff Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 4 Nov 2016 18:41:01 -0400
Subject: [PATCH 542/688] Bump package versions for 1.4.2.1-rc.1 release.

---
 packages/accounts-oauth/package.js             | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-common/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 184ecb8a8b..140ce0a4cd 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.15-rc.0"
+  version: "1.1.15-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 9a4f9a593b..bf2ac35c63 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.2-rc.0"
+  version: "1.3.2-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 31df3ec5e3..d58d1c4c6b 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0-rc.0',
+  version: '1.0.0-rc.1',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 78abb3c474..2cf9ddc115 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.9-rc.0',
+  version: '1.1.9-rc.1',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c4c6a4f7a2..dbbd90b258 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-3-rc.0"
+  version: "1.11.1-3-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index d167e4c623..1e711aea8f 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.8-rc.0',
+  version: '1.2.8-rc.1',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 40e65bb6bb..35c691e56a 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12-rc.0',
+  version: '1.3.12-rc.1',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index f12e82dbee..168aaa2448 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7-rc.0',
+  version: '2.7.7-rc.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 071a89cffd..8fa61dfc30 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-1-rc.0'
+  version: '1.4.2-1-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index a5d296621f..33176db063 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7-rc.0"
+  version: "2.513.7-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 895b657dd8..d95555ff74 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.1-rc.0",
+ "version": "1.4.2.1-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4c59a18b7cbe702fc38e199dd67c6083767c6f9e Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Mon, 29 Aug 2016 15:37:59 +0800
Subject: [PATCH 543/688] Reorganized accounts-facebook.

---
 .../facebook_client.js                        |  0
 .../facebook_server.js                        |  0
 packages/accounts-facebook/package.js         |  7 ++--
 .../README.md                                 |  3 ++
 .../facebook_configure.html                   | 38 +++++++++++++++++++
 .../facebook_configure.js                     | 12 ++++++
 .../facebook_login_button.css                 |  0
 .../package.js                                | 17 +++++++++
 packages/facebook/README.md                   |  4 +-
 packages/facebook/deprecation_notice.js       |  9 +++++
 packages/facebook/package.js                  |  9 +++--
 11 files changed, 91 insertions(+), 8 deletions(-)
 rename packages/{facebook => accounts-facebook}/facebook_client.js (100%)
 rename packages/{facebook => accounts-facebook}/facebook_server.js (100%)
 create mode 100644 packages/blaze-accounts-config-ui-facebook/README.md
 create mode 100644 packages/blaze-accounts-config-ui-facebook/facebook_configure.html
 create mode 100644 packages/blaze-accounts-config-ui-facebook/facebook_configure.js
 rename packages/{accounts-facebook => blaze-accounts-config-ui-facebook}/facebook_login_button.css (100%)
 create mode 100644 packages/blaze-accounts-config-ui-facebook/package.js
 create mode 100644 packages/facebook/deprecation_notice.js

diff --git a/packages/facebook/facebook_client.js b/packages/accounts-facebook/facebook_client.js
similarity index 100%
rename from packages/facebook/facebook_client.js
rename to packages/accounts-facebook/facebook_client.js
diff --git a/packages/facebook/facebook_server.js b/packages/accounts-facebook/facebook_server.js
similarity index 100%
rename from packages/facebook/facebook_server.js
rename to packages/accounts-facebook/facebook_server.js
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index c323e43ebb..2652572813 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.0.11"
+  version: "1.1.0"
 });
 
 Package.onUse(function(api) {
@@ -8,9 +8,10 @@ Package.onUse(function(api) {
   // Export Accounts (etc) to packages using this one.
   api.imply('accounts-base', ['client', 'server']);
   api.use('accounts-oauth', ['client', 'server']);
-  api.use('facebook', ['client', 'server']);
+  api.addFiles('facebook_client.js', 'client');
+  api.addFiles('facebook_server.js', 'server');
 
-  api.addFiles('facebook_login_button.css', 'client');
+  api.export('Facebook');
 
   api.addFiles("facebook.js");
 });
diff --git a/packages/blaze-accounts-config-ui-facebook/README.md b/packages/blaze-accounts-config-ui-facebook/README.md
new file mode 100644
index 0000000000..47505bd6ea
--- /dev/null
+++ b/packages/blaze-accounts-config-ui-facebook/README.md
@@ -0,0 +1,3 @@
+#blaze-accounts-config-ui-facebook
+
+This package contains Blaze configuration UI templates for Facebook OAuth.
diff --git a/packages/blaze-accounts-config-ui-facebook/facebook_configure.html b/packages/blaze-accounts-config-ui-facebook/facebook_configure.html
new file mode 100644
index 0000000000..18ddeeb990
--- /dev/null
+++ b/packages/blaze-accounts-config-ui-facebook/facebook_configure.html
@@ -0,0 +1,38 @@
+<template name="configureLoginServiceDialogForFacebook">
+  <p>
+    First, you'll need to register your app on Facebook. Follow these steps:
+  </p>
+  <ol>
+    <li>
+      Visit <a href="https://developers.facebook.com/apps" target="_blank">https://developers.facebook.com/apps</a>
+    </li>
+    <li>
+      Click "Add a New App".
+    </li>
+    <li>
+      Select "Website" and type a name for your app.
+    </li>
+    <li>
+      Click "Create New Facebook App ID".
+    </li>
+    <li>
+      Select a category in the dropdown and click "Create App ID".
+    </li>
+    <li>
+      Under "Tell us about your website", set Site URL to: <span class="url">{{siteUrl}}</span> and click "Next".
+    </li>
+    <li>
+      Click "Skip to Developer Dashboard".
+    </li>
+    <li>
+      Go to the "Settings" tab and add an email address under "Contact Email". Click "Save Changes".
+    </li>
+    <li>
+      Go to the "Status & Review" tab and select Yes for "Do you want to make this app and
+      all its live features available to the general public?". Click "Confirm".
+    </li>
+    <li>
+      Go back to the Dashboard tab.
+    </li>
+  </ol>
+</template>
diff --git a/packages/blaze-accounts-config-ui-facebook/facebook_configure.js b/packages/blaze-accounts-config-ui-facebook/facebook_configure.js
new file mode 100644
index 0000000000..412ee50575
--- /dev/null
+++ b/packages/blaze-accounts-config-ui-facebook/facebook_configure.js
@@ -0,0 +1,12 @@
+Template.configureLoginServiceDialogForFacebook.helpers({
+  siteUrl: function () {
+    return Meteor.absoluteUrl();
+  }
+});
+
+Template.configureLoginServiceDialogForFacebook.fields = function () {
+  return [
+    {property: 'appId', label: 'App ID'},
+    {property: 'secret', label: 'App Secret'}
+  ];
+};
diff --git a/packages/accounts-facebook/facebook_login_button.css b/packages/blaze-accounts-config-ui-facebook/facebook_login_button.css
similarity index 100%
rename from packages/accounts-facebook/facebook_login_button.css
rename to packages/blaze-accounts-config-ui-facebook/facebook_login_button.css
diff --git a/packages/blaze-accounts-config-ui-facebook/package.js b/packages/blaze-accounts-config-ui-facebook/package.js
new file mode 100644
index 0000000000..6e002c5c42
--- /dev/null
+++ b/packages/blaze-accounts-config-ui-facebook/package.js
@@ -0,0 +1,17 @@
+Package.describe({
+  summary: "Blaze configuration templates for Facebook OAuth.",
+  version: "1.0.0"
+});
+
+Package.onUse(function(api) {
+  api.use('templating@1.2.13', 'client');
+  api.use('accounts-facebook@1.1.0');
+
+  api.imply('accounts-facebook');
+
+  api.addFiles('facebook_login_button.css', 'client');
+
+  api.addFiles(
+    ['facebook_configure.html', 'facebook_configure.js'],
+    'client');
+});
diff --git a/packages/facebook/README.md b/packages/facebook/README.md
index 33316ea3b4..0d9e2705b8 100644
--- a/packages/facebook/README.md
+++ b/packages/facebook/README.md
@@ -2,4 +2,6 @@
 [Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facebook)
 ***
 
-An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
\ No newline at end of file
+** Deprecated **
+
+An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
diff --git a/packages/facebook/deprecation_notice.js b/packages/facebook/deprecation_notice.js
new file mode 100644
index 0000000000..a56418fc0e
--- /dev/null
+++ b/packages/facebook/deprecation_notice.js
@@ -0,0 +1,9 @@
+console.warn();
+console.warn('This package (facebook) has been deprecated.');
+console.warn("You should not use this anymore.");
+console.warn(
+    "If you need the export Facebook, you can now simply use accounts-facebook" +
+    "and import from it. If you need the Blaze OAuth configuration UI, add the " +
+    "blaze-accounts-config-ui-facebook."
+);
+console.warn();
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 1d8cbc7539..0c8e71f60e 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,6 +1,7 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.2.10"
+  summary: "DEPRECATED - Facebook OAuth flow",
+  version: "1.3.0"
 });
 
 Package.onUse(function(api) {
@@ -11,13 +12,13 @@ Package.onUse(function(api) {
   api.use('underscore', 'server');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
+  api.use('accounts-facebook');
 
-  api.export('Facebook');
+  api.imply('accounts-facebook');
 
   api.addFiles(
     ['facebook_configure.html', 'facebook_configure.js'],
     'client');
 
-  api.addFiles('facebook_server.js', 'server');
-  api.addFiles('facebook_client.js', 'client');
+  api.addFiles('deprecation_notice.js');
 });

From 7e049cdadbfc821f73fa3abfce0296fa5f817921 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Mon, 29 Aug 2016 15:39:50 +0800
Subject: [PATCH 544/688] Make `facebook` use the UI package.

---
 packages/facebook/facebook_configure.html | 38 -----------------------
 packages/facebook/facebook_configure.js   | 12 -------
 packages/facebook/package.js              |  7 ++---
 3 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 packages/facebook/facebook_configure.html
 delete mode 100644 packages/facebook/facebook_configure.js

diff --git a/packages/facebook/facebook_configure.html b/packages/facebook/facebook_configure.html
deleted file mode 100644
index 18ddeeb990..0000000000
--- a/packages/facebook/facebook_configure.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<template name="configureLoginServiceDialogForFacebook">
-  <p>
-    First, you'll need to register your app on Facebook. Follow these steps:
-  </p>
-  <ol>
-    <li>
-      Visit <a href="https://developers.facebook.com/apps" target="_blank">https://developers.facebook.com/apps</a>
-    </li>
-    <li>
-      Click "Add a New App".
-    </li>
-    <li>
-      Select "Website" and type a name for your app.
-    </li>
-    <li>
-      Click "Create New Facebook App ID".
-    </li>
-    <li>
-      Select a category in the dropdown and click "Create App ID".
-    </li>
-    <li>
-      Under "Tell us about your website", set Site URL to: <span class="url">{{siteUrl}}</span> and click "Next".
-    </li>
-    <li>
-      Click "Skip to Developer Dashboard".
-    </li>
-    <li>
-      Go to the "Settings" tab and add an email address under "Contact Email". Click "Save Changes".
-    </li>
-    <li>
-      Go to the "Status & Review" tab and select Yes for "Do you want to make this app and
-      all its live features available to the general public?". Click "Confirm".
-    </li>
-    <li>
-      Go back to the Dashboard tab.
-    </li>
-  </ol>
-</template>
diff --git a/packages/facebook/facebook_configure.js b/packages/facebook/facebook_configure.js
deleted file mode 100644
index 412ee50575..0000000000
--- a/packages/facebook/facebook_configure.js
+++ /dev/null
@@ -1,12 +0,0 @@
-Template.configureLoginServiceDialogForFacebook.helpers({
-  siteUrl: function () {
-    return Meteor.absoluteUrl();
-  }
-});
-
-Template.configureLoginServiceDialogForFacebook.fields = function () {
-  return [
-    {property: 'appId', label: 'App ID'},
-    {property: 'secret', label: 'App Secret'}
-  ];
-};
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 0c8e71f60e..57237de264 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -12,13 +12,10 @@ Package.onUse(function(api) {
   api.use('underscore', 'server');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
-  api.use('accounts-facebook');
+  api.use('accounts-facebook@1.1.0');
+  api.use('blaze-accounts-config-ui-facebook', 'client');
 
   api.imply('accounts-facebook');
 
-  api.addFiles(
-    ['facebook_configure.html', 'facebook_configure.js'],
-    'client');
-
   api.addFiles('deprecation_notice.js');
 });

From e41f95ce375d782cdbd40c071ab9e7bdc34e5a7b Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Sat, 10 Sep 2016 14:29:45 +0800
Subject: [PATCH 545/688] Rename blaze-accounts-config-ui-facebook to
 facebook-config-ui.

---
 .../README.md                                                  | 2 +-
 .../facebook_configure.html                                    | 0
 .../facebook_configure.js                                      | 0
 .../facebook_login_button.css                                  | 0
 .../package.js                                                 | 3 ---
 5 files changed, 1 insertion(+), 4 deletions(-)
 rename packages/{blaze-accounts-config-ui-facebook => facebook-config-ui}/README.md (68%)
 rename packages/{blaze-accounts-config-ui-facebook => facebook-config-ui}/facebook_configure.html (100%)
 rename packages/{blaze-accounts-config-ui-facebook => facebook-config-ui}/facebook_configure.js (100%)
 rename packages/{blaze-accounts-config-ui-facebook => facebook-config-ui}/facebook_login_button.css (100%)
 rename packages/{blaze-accounts-config-ui-facebook => facebook-config-ui}/package.js (91%)

diff --git a/packages/blaze-accounts-config-ui-facebook/README.md b/packages/facebook-config-ui/README.md
similarity index 68%
rename from packages/blaze-accounts-config-ui-facebook/README.md
rename to packages/facebook-config-ui/README.md
index 47505bd6ea..11efb78d44 100644
--- a/packages/blaze-accounts-config-ui-facebook/README.md
+++ b/packages/facebook-config-ui/README.md
@@ -1,3 +1,3 @@
-#blaze-accounts-config-ui-facebook
+#facebook-config-ui
 
 This package contains Blaze configuration UI templates for Facebook OAuth.
diff --git a/packages/blaze-accounts-config-ui-facebook/facebook_configure.html b/packages/facebook-config-ui/facebook_configure.html
similarity index 100%
rename from packages/blaze-accounts-config-ui-facebook/facebook_configure.html
rename to packages/facebook-config-ui/facebook_configure.html
diff --git a/packages/blaze-accounts-config-ui-facebook/facebook_configure.js b/packages/facebook-config-ui/facebook_configure.js
similarity index 100%
rename from packages/blaze-accounts-config-ui-facebook/facebook_configure.js
rename to packages/facebook-config-ui/facebook_configure.js
diff --git a/packages/blaze-accounts-config-ui-facebook/facebook_login_button.css b/packages/facebook-config-ui/facebook_login_button.css
similarity index 100%
rename from packages/blaze-accounts-config-ui-facebook/facebook_login_button.css
rename to packages/facebook-config-ui/facebook_login_button.css
diff --git a/packages/blaze-accounts-config-ui-facebook/package.js b/packages/facebook-config-ui/package.js
similarity index 91%
rename from packages/blaze-accounts-config-ui-facebook/package.js
rename to packages/facebook-config-ui/package.js
index 6e002c5c42..44dc19a44b 100644
--- a/packages/blaze-accounts-config-ui-facebook/package.js
+++ b/packages/facebook-config-ui/package.js
@@ -7,10 +7,7 @@ Package.onUse(function(api) {
   api.use('templating@1.2.13', 'client');
   api.use('accounts-facebook@1.1.0');
 
-  api.imply('accounts-facebook');
-
   api.addFiles('facebook_login_button.css', 'client');
-
   api.addFiles(
     ['facebook_configure.html', 'facebook_configure.js'],
     'client');

From 730228da0aecb21d872a40695ffb166a49e83fb8 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Sat, 10 Sep 2016 14:33:29 +0800
Subject: [PATCH 546/688] Created facebook-oauth.

---
 packages/facebook-oauth/.gitignore               |  1 +
 packages/facebook-oauth/README.md                |  3 +++
 .../facebook_client.js                           |  0
 .../facebook_server.js                           |  0
 packages/facebook-oauth/package.js               | 16 ++++++++++++++++
 5 files changed, 20 insertions(+)
 create mode 100644 packages/facebook-oauth/.gitignore
 create mode 100644 packages/facebook-oauth/README.md
 rename packages/{accounts-facebook => facebook-oauth}/facebook_client.js (100%)
 rename packages/{accounts-facebook => facebook-oauth}/facebook_server.js (100%)
 create mode 100644 packages/facebook-oauth/package.js

diff --git a/packages/facebook-oauth/.gitignore b/packages/facebook-oauth/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/facebook-oauth/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/facebook-oauth/README.md b/packages/facebook-oauth/README.md
new file mode 100644
index 0000000000..fbef81d34a
--- /dev/null
+++ b/packages/facebook-oauth/README.md
@@ -0,0 +1,3 @@
+# facebook-oauth
+
+An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
diff --git a/packages/accounts-facebook/facebook_client.js b/packages/facebook-oauth/facebook_client.js
similarity index 100%
rename from packages/accounts-facebook/facebook_client.js
rename to packages/facebook-oauth/facebook_client.js
diff --git a/packages/accounts-facebook/facebook_server.js b/packages/facebook-oauth/facebook_server.js
similarity index 100%
rename from packages/accounts-facebook/facebook_server.js
rename to packages/facebook-oauth/facebook_server.js
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
new file mode 100644
index 0000000000..b2b4aaf7c4
--- /dev/null
+++ b/packages/facebook-oauth/package.js
@@ -0,0 +1,16 @@
+Package.describe({
+  summary: "Facebook OAuth flow",
+  version: "1.3.0"
+});
+
+Package.onUse(function(api) {
+  api.use('oauth2', ['client', 'server']);
+  api.use('oauth', ['client', 'server']);
+  api.use('http', ['server']);
+  api.use('underscore', 'server');
+  api.use('random', 'client');
+  api.use('service-configuration', ['client', 'server']);
+
+  api.addFiles('facebook_client.js', 'client');
+  api.addFiles('facebook_server.js', 'server');
+});

From 6aba0d8797611efef4e464ecc61a2df8751d7c5f Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Sat, 10 Sep 2016 14:36:06 +0800
Subject: [PATCH 547/688] Updated facebook.

---
 packages/facebook/deprecation_notice.js | 4 ++--
 packages/facebook/package.js            | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/facebook/deprecation_notice.js b/packages/facebook/deprecation_notice.js
index a56418fc0e..01a7d9ae7b 100644
--- a/packages/facebook/deprecation_notice.js
+++ b/packages/facebook/deprecation_notice.js
@@ -2,8 +2,8 @@ console.warn();
 console.warn('This package (facebook) has been deprecated.');
 console.warn("You should not use this anymore.");
 console.warn(
-    "If you need the export Facebook, you can now simply use accounts-facebook" +
+    "If you need the export Facebook, you can now simply use facebook-oauth" +
     "and import from it. If you need the Blaze OAuth configuration UI, add the " +
-    "blaze-accounts-config-ui-facebook."
+    "facebook-config-ui along with accounts-ui."
 );
 console.warn();
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 57237de264..7860d07e8a 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -13,9 +13,10 @@ Package.onUse(function(api) {
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
   api.use('accounts-facebook@1.1.0');
-  api.use('blaze-accounts-config-ui-facebook', 'client');
+  api.use('facebook-oauth');
+  api.use('facebook-config-ui', 'client');
 
-  api.imply('accounts-facebook');
+  api.imply('facebook-oauth');
 
   api.addFiles('deprecation_notice.js');
 });

From e3a20dac55f65cf01a1401b9c2ba131134a2b2e0 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Sat, 10 Sep 2016 14:48:16 +0800
Subject: [PATCH 548/688] Update accounts-facebook.

---
 packages/accounts-facebook/notice.js  | 5 +++++
 packages/accounts-facebook/package.js | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 packages/accounts-facebook/notice.js

diff --git a/packages/accounts-facebook/notice.js b/packages/accounts-facebook/notice.js
new file mode 100644
index 0000000000..94ddbc3e32
--- /dev/null
+++ b/packages/accounts-facebook/notice.js
@@ -0,0 +1,5 @@
+if (Package['accounts-ui'] && (typeof Package['facebook-config-ui'] === undefined)) {
+    console.info("You're using accounts-ui and accounts-facebook, but didn't",
+        "install the configuration UI for Facebook OAuth. You can do it by",
+        "adding facebook-config-ui.");
+}
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 2652572813..fadb87c5c7 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -8,10 +8,12 @@ Package.onUse(function(api) {
   // Export Accounts (etc) to packages using this one.
   api.imply('accounts-base', ['client', 'server']);
   api.use('accounts-oauth', ['client', 'server']);
-  api.addFiles('facebook_client.js', 'client');
-  api.addFiles('facebook_server.js', 'server');
+  api.use('facebook-oauth');
+  api.imply('facebook-oauth');
 
-  api.export('Facebook');
+  // If users use accounts-ui but not facebook-config-ui, give them a tip.
+  api.use(['accounts-ui', 'facebook-config-ui'], 'client', { weak: true });
+  api.addFiles("notice.js");
 
   api.addFiles("facebook.js");
 });

From c78c0d2d2f7396766e9ca89a0b74872142d0ce4e Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Thu, 22 Sep 2016 06:21:33 +0800
Subject: [PATCH 549/688] Update package.js

---
 packages/facebook-oauth/package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index b2b4aaf7c4..8487560a83 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -9,7 +9,6 @@ Package.onUse(function(api) {
   api.use('http', ['server']);
   api.use('underscore', 'server');
   api.use('random', 'client');
-  api.use('service-configuration', ['client', 'server']);
 
   api.addFiles('facebook_client.js', 'client');
   api.addFiles('facebook_server.js', 'server');

From d01d4cd459cd1355126d9100757d5873a6e00617 Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Thu, 22 Sep 2016 06:23:10 +0800
Subject: [PATCH 550/688] Update package.js

---
 packages/facebook/package.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 7860d07e8a..03eb05c6cd 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -5,14 +5,6 @@ Package.describe({
 });
 
 Package.onUse(function(api) {
-  api.use('oauth2', ['client', 'server']);
-  api.use('oauth', ['client', 'server']);
-  api.use('http', ['server']);
-  api.use('templating@1.2.13', 'client');
-  api.use('underscore', 'server');
-  api.use('random', 'client');
-  api.use('service-configuration', ['client', 'server']);
-  api.use('accounts-facebook@1.1.0');
   api.use('facebook-oauth');
   api.use('facebook-config-ui', 'client');
 

From f0460dd301c3f433e07a2435e0fee7a5ba0c45ec Mon Sep 17 00:00:00 2001
From: Wexpo Lyu <laosb@lns.unihubs.com>
Date: Thu, 22 Sep 2016 06:24:42 +0800
Subject: [PATCH 551/688] Update package.js

---
 packages/facebook-config-ui/package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/facebook-config-ui/package.js b/packages/facebook-config-ui/package.js
index 44dc19a44b..b056ecdca5 100644
--- a/packages/facebook-config-ui/package.js
+++ b/packages/facebook-config-ui/package.js
@@ -5,7 +5,6 @@ Package.describe({
 
 Package.onUse(function(api) {
   api.use('templating@1.2.13', 'client');
-  api.use('accounts-facebook@1.1.0');
 
   api.addFiles('facebook_login_button.css', 'client');
   api.addFiles(

From 69ac1765446dc5f2b09f26f92910f5c45cfebbb9 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Sat, 24 Sep 2016 17:37:55 +0800
Subject: [PATCH 552/688] Fix the notice.

---
 packages/accounts-facebook/notice.js  | 2 +-
 packages/accounts-facebook/package.js | 2 +-
 packages/facebook/package.js          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/accounts-facebook/notice.js b/packages/accounts-facebook/notice.js
index 94ddbc3e32..094428dfd6 100644
--- a/packages/accounts-facebook/notice.js
+++ b/packages/accounts-facebook/notice.js
@@ -1,4 +1,4 @@
-if (Package['accounts-ui'] && (typeof Package['facebook-config-ui'] === undefined)) {
+if (Package['accounts-ui'] && (Package['facebook-config-ui'] === undefined)) {
     console.info("You're using accounts-ui and accounts-facebook, but didn't",
         "install the configuration UI for Facebook OAuth. You can do it by",
         "adding facebook-config-ui.");
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index fadb87c5c7..2836d483bc 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -12,7 +12,7 @@ Package.onUse(function(api) {
   api.imply('facebook-oauth');
 
   // If users use accounts-ui but not facebook-config-ui, give them a tip.
-  api.use(['accounts-ui', 'facebook-config-ui'], 'client', { weak: true });
+  api.use(['accounts-ui', 'facebook-config-ui'], ['client', 'server'], { weak: true });
   api.addFiles("notice.js");
 
   api.addFiles("facebook.js");
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 03eb05c6cd..7f1c3b06ba 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,5 +1,4 @@
 Package.describe({
-  summary: "Facebook OAuth flow",
   summary: "DEPRECATED - Facebook OAuth flow",
   version: "1.3.0"
 });

From 428d09e45f35a660455ed68ad894dda9a49c74e6 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Fri, 30 Sep 2016 16:55:07 +0800
Subject: [PATCH 553/688] Hint users to use facebook-oauth.

---
 packages/facebook/README.md  | 2 +-
 packages/facebook/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/facebook/README.md b/packages/facebook/README.md
index 0d9e2705b8..ad16f40317 100644
--- a/packages/facebook/README.md
+++ b/packages/facebook/README.md
@@ -2,6 +2,6 @@
 [Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facebook)
 ***
 
-** Deprecated **
+** Deprecated, use facebook-oauth instead**
 
 An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
diff --git a/packages/facebook/package.js b/packages/facebook/package.js
index 7f1c3b06ba..6eeda137a4 100644
--- a/packages/facebook/package.js
+++ b/packages/facebook/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "DEPRECATED - Facebook OAuth flow",
+  summary: "DEPRECATED - Use facebook-oauth instead - Facebook OAuth flow",
   version: "1.3.0"
 });
 

From 30f612fa908f1aff9023dfe1e81c9dda4001d898 Mon Sep 17 00:00:00 2001
From: laosb <laosb@lasteam.net>
Date: Fri, 30 Sep 2016 16:57:01 +0800
Subject: [PATCH 554/688] Updated the notice.

---
 packages/accounts-facebook/notice.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-facebook/notice.js b/packages/accounts-facebook/notice.js
index 094428dfd6..0c82cae9f2 100644
--- a/packages/accounts-facebook/notice.js
+++ b/packages/accounts-facebook/notice.js
@@ -1,5 +1,5 @@
 if (Package['accounts-ui'] && (Package['facebook-config-ui'] === undefined)) {
     console.info("You're using accounts-ui and accounts-facebook, but didn't",
-        "install the configuration UI for Facebook OAuth. You can do it by",
-        "adding facebook-config-ui.");
+        "install the configuration UI for Facebook OAuth.");
+    console.info("You can install it with `meteor add facebook-config-ui`.");
 }

From 800903ff0edccfe3eccc81b32864265c0068b321 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 5 Oct 2016 14:26:27 +1100
Subject: [PATCH 555/688] We need to export the Facebook symbol

---
 packages/facebook-oauth/package.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 8487560a83..0202dc4663 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -9,7 +9,10 @@ Package.onUse(function(api) {
   api.use('http', ['server']);
   api.use('underscore', 'server');
   api.use('random', 'client');
+  api.use('service-configuration', 'client');
 
   api.addFiles('facebook_client.js', 'client');
   api.addFiles('facebook_server.js', 'server');
+
+  api.export('Facebook');
 });

From d9a80665dd1311b6ab768a0ddfe8cd3df220b94d Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 5 Oct 2016 14:26:33 +1100
Subject: [PATCH 556/688] Change the wording a little

---
 packages/facebook/deprecation_notice.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/facebook/deprecation_notice.js b/packages/facebook/deprecation_notice.js
index 01a7d9ae7b..8370a533f1 100644
--- a/packages/facebook/deprecation_notice.js
+++ b/packages/facebook/deprecation_notice.js
@@ -1,9 +1,11 @@
 console.warn();
 console.warn('This package (facebook) has been deprecated.');
-console.warn("You should not use this anymore.");
 console.warn(
-    "If you need the export Facebook, you can now simply use facebook-oauth" +
-    "and import from it. If you need the Blaze OAuth configuration UI, add the " +
-    "facebook-config-ui along with accounts-ui."
+  "To use the `Facebook` symbol, use the `facebook-oauth` package " +
+  "and import from it."
+);
+console.warn(
+    "If you need the Blaze OAuth configuration UI, add " +
+    "`facebook-config-ui` alongside `accounts-ui`."
 );
 console.warn();

From 9a21e1b6ab8ab803371b04e1e412d9c45563ccff Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 5 Oct 2016 14:26:48 +1100
Subject: [PATCH 557/688] Show a useful message if you aren't using the
 config-ui

---
 .../accounts-ui-unstyled/login_buttons_dialogs.js |  8 ++++----
 .../login_buttons_single.html                     | 13 ++++++++-----
 .../accounts-ui-unstyled/login_buttons_single.js  | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/accounts-ui-unstyled/login_buttons_dialogs.js b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
index 9f6de4261a..d1c5473c3d 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dialogs.js
+++ b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
@@ -237,8 +237,8 @@ var updateSaveDisabled = function () {
 
 // Returns the appropriate template for this login service.  This
 // template should be defined in the service's package
-var configureLoginServiceDialogTemplateForService = function () {
-  var serviceName = loginButtonsSession.get('configureLoginServiceDialogServiceName');
+Template._configureLoginServiceDialog.templateForService = function(serviceName) {
+  serviceName = serviceName || loginButtonsSession.get('configureLoginServiceDialogServiceName');
   // XXX Service providers should be able to specify their configuration
   // template name.
   return Template['configureLoginServiceDialogFor' +
@@ -248,7 +248,7 @@ var configureLoginServiceDialogTemplateForService = function () {
 };
 
 var configurationFields = function () {
-  var template = configureLoginServiceDialogTemplateForService();
+  var template = Template._configureLoginServiceDialog.templateForService();
   return template.fields();
 };
 
@@ -261,7 +261,7 @@ Template._configureLoginServiceDialog.helpers({
   },
   configurationSteps: function () {
     // renders the appropriate template
-    return configureLoginServiceDialogTemplateForService();
+    return Template._configureLoginServiceDialog.templateForService();
   },
   saveDisabled: function () {
     return loginButtonsSession.get('configureLoginServiceDialogSaveDisabled');
diff --git a/packages/accounts-ui-unstyled/login_buttons_single.html b/packages/accounts-ui-unstyled/login_buttons_single.html
index e83d484116..d3a13d5236 100644
--- a/packages/accounts-ui-unstyled/login_buttons_single.html
+++ b/packages/accounts-ui-unstyled/login_buttons_single.html
@@ -2,11 +2,15 @@
   <div class="login-text-and-button">
     <div class="login-button single-login-button {{#unless configured}}configure-button{{/unless}}"
          id="login-buttons-{{name}}">
-      <div class="login-image" id="login-buttons-image-{{name}}"></div>
-      {{#if configured}}
-        <span class="text-besides-image sign-in-text-{{name}}">Sign in with {{capitalizedName}}</span>
+      {{#if cannotConfigure}}
+        <span class="">{{capitalizedName}} not configured</span>
       {{else}}
-        <span class="text-besides-image configure-text-{{name}}">Configure {{capitalizedName}} Login</span>
+        <div class="login-image" id="login-buttons-image-{{name}}"></div>
+        {{#if configured}}
+          <span class="text-besides-image sign-in-text-{{name}}">Sign in with {{capitalizedName}}</span>
+        {{else}}
+            <span class="text-besides-image configure-text-{{name}}">Configure {{capitalizedName}} Login</span>
+        {{/if}}
       {{/if}}
     </div>
   </div>
@@ -26,4 +30,3 @@
     <div class="login-button single-login-button" id="login-buttons-logout">Sign Out</div>
   </div>
 </template>
-
diff --git a/packages/accounts-ui-unstyled/login_buttons_single.js b/packages/accounts-ui-unstyled/login_buttons_single.js
index e7a97d36f3..3749a8f3c4 100644
--- a/packages/accounts-ui-unstyled/login_buttons_single.js
+++ b/packages/accounts-ui-unstyled/login_buttons_single.js
@@ -8,7 +8,15 @@ var loginResultCallback = function (serviceName, err) {
   } else if (err instanceof Accounts.LoginCancelledError) {
     // do nothing
   } else if (err instanceof ServiceConfiguration.ConfigError) {
-    loginButtonsSession.configureService(serviceName);
+    if (Template._configureLoginServiceDialog.templateForService(serviceName)) {
+      loginButtonsSession.configureService(serviceName);
+    } else {
+      loginButtonsSession.errorMessage(
+        "No configuration for " + capitalize(serviceName) + ".\n" +
+        "Use `ServiceConfiguration` to configure it or " +
+        "install the `" +serviceName + "-config-ui` package."
+      );
+    }
   } else {
     loginButtonsSession.errorMessage(err.reason || "Unknown error");
   }
@@ -55,6 +63,11 @@ Template._loginButtonsLoggedOutSingleLoginButton.events({
 });
 
 Template._loginButtonsLoggedOutSingleLoginButton.helpers({
+  // not configured and has no config UI
+  cannotConfigure: function() {
+    return !ServiceConfiguration.configurations.findOne({service: this.name})
+      && !Template._configureLoginServiceDialog.templateForService(this.name);
+  },
   configured: function () {
     return !!ServiceConfiguration.configurations.findOne({service: this.name});
   },

From 2576bf7e890fd9220405fd68ce749d610c5ebe75 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 5 Oct 2016 14:33:41 +1100
Subject: [PATCH 558/688] Rebase

---
 History.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/History.md b/History.md
index 5cca124c04..5e3f6ced7f 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,18 @@
 ## v.NEXT
 
+* The `facebook` package has been split into:
+  - `facebook-oauth` (the part that allows oauth w/ FB directly) and
+  - `facebook-config-ui` (the Blaze configuration templates for accounts-ui)
+
+  This means you can now use `[accounts-]facebook` without needing Blaze.
+
+  If you are using `accounts-ui` and `accounts-facebook`, you will probably
+  need to install the `facebook-config-ui` package if you want to configure it
+  using the Accounts UI.
+
+  [Issue #7715](https://github.com/meteor/meteor/issues/7715)
+  [PR #7728](https://github.com/meteor/meteor/pull/7728)
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application

From 9f3f6bce6b754f3a6668c073591dc0a03d540f0b Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Fri, 21 Oct 2016 16:19:31 +1100
Subject: [PATCH 559/688] Small updates as per @abernix

---
 packages/accounts-facebook/notice.js | 6 +++---
 packages/facebook-oauth/README.md    | 2 +-
 packages/facebook-oauth/package.js   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/accounts-facebook/notice.js b/packages/accounts-facebook/notice.js
index 0c82cae9f2..7532f84619 100644
--- a/packages/accounts-facebook/notice.js
+++ b/packages/accounts-facebook/notice.js
@@ -1,5 +1,5 @@
 if (Package['accounts-ui'] && (Package['facebook-config-ui'] === undefined)) {
-    console.info("You're using accounts-ui and accounts-facebook, but didn't",
-        "install the configuration UI for Facebook OAuth.");
-    console.info("You can install it with `meteor add facebook-config-ui`.");
+  console.warn("Note: You're using accounts-ui and accounts-facebook, but didn't");
+  console.warn("install the configuration UI for Facebook OAuth.");
+  console.warn("You can install it with `meteor add facebook-config-ui`.");
 }
diff --git a/packages/facebook-oauth/README.md b/packages/facebook-oauth/README.md
index fbef81d34a..de82a5e426 100644
--- a/packages/facebook-oauth/README.md
+++ b/packages/facebook-oauth/README.md
@@ -1,3 +1,3 @@
 # facebook-oauth
 
-An implementation of the Facebook OAuth flow. See the [project page](https://www.meteor.com/accounts) on Meteor Accounts for more details. XXX link
+An implementation of the Facebook OAuth flow. See the [Meteor Guide](https://guide.meteor.com/accounts) for more details.
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 0202dc4663..e6acd883db 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -9,7 +9,7 @@ Package.onUse(function(api) {
   api.use('http', ['server']);
   api.use('underscore', 'server');
   api.use('random', 'client');
-  api.use('service-configuration', 'client');
+  api.use('service-configuration', ['client', 'server']);
 
   api.addFiles('facebook_client.js', 'client');
   api.addFiles('facebook_server.js', 'server');

From a4dad54a097f3630a1e583865044be5823e13621 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 2 Nov 2016 11:03:24 +0200
Subject: [PATCH 560/688] Add .html extension to accounts link on
 facebook-oauth README

Without the extension, the link just goes to the Guide homepage.
---
 packages/facebook-oauth/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/facebook-oauth/README.md b/packages/facebook-oauth/README.md
index de82a5e426..4070b88bc1 100644
--- a/packages/facebook-oauth/README.md
+++ b/packages/facebook-oauth/README.md
@@ -1,3 +1,3 @@
 # facebook-oauth
 
-An implementation of the Facebook OAuth flow. See the [Meteor Guide](https://guide.meteor.com/accounts) for more details.
+An implementation of the Facebook OAuth flow. See the [Meteor Guide](https://guide.meteor.com/accounts.html) for more details.

From a7ac32e00a87384956fdf65dfdf2198c98d73d6f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 13:33:20 -0500
Subject: [PATCH 561/688] Tolerate ENOENT errors in Builder#copyDirectory.

---
 tools/fs/optimistic.js    |  8 ++++++++
 tools/isobuild/builder.js | 17 ++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 687016366f..74290628a2 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -174,6 +174,14 @@ export function dirtyNodeModulesDirectory(nodeModulesDir) {
 
 export const optimisticStatOrNull = makeOptimistic("statOrNull", statOrNull);
 export const optimisticLStat = makeOptimistic("lstat", lstat);
+export const optimisticLStatOrNull = makeOptimistic("lstatOrNull", path => {
+  try {
+    return optimisticLStat(path);
+  } catch (e) {
+    if (e.code !== "ENOENT") throw e;
+    return null;
+  }
+});
 export const optimisticReadFile = makeOptimistic("readFile", readFile);
 export const optimisticReaddir = makeOptimistic("readdir", readdir);
 export const optimisticHashOrNull = makeOptimistic("hashOrNull", (...args) => {
diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index 8136e3d2fd..f964f2a671 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -6,7 +6,7 @@ import {Profile} from '../tool-env/profile.js';
 import {
   optimisticReadFile,
   optimisticReaddir,
-  optimisticLStat,
+  optimisticLStatOrNull,
 } from "../fs/optimistic.js";
 
 // Builder is in charge of writing "bundles" to disk, which are
@@ -497,9 +497,11 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           return cachedExternalPath = isExternal && real;
         };
 
-        let fileStatus = optimisticLStat(thisAbsFrom);
+        let fileStatus = optimisticLStatOrNull(thisAbsFrom);
 
-        if (! symlink && fileStatus.isSymbolicLink()) {
+        if (! symlink &&
+            fileStatus &&
+            fileStatus.isSymbolicLink()) {
           // If copyDirectory is not allowed to create symbolic links to
           // external files, and this file is a symbolic link that points
           // to an external file, update fileStatus so that we copy this
@@ -512,9 +514,9 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
 
             // Update fileStatus to match the actual file rather than the
             // symbolic link, thus forcing the file to be copied below.
-            fileStatus = optimisticLStat(externalPath);
+            fileStatus = optimisticLStatOrNull(externalPath);
 
-            if (fileStatus.isDirectory()) {
+            if (fileStatus && fileStatus.isDirectory()) {
               // Update _currentRealRootDir so that we can judge
               // isExternal relative to this new root directory when
               // traversing nested directories.
@@ -523,6 +525,11 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           }
         }
 
+        if (! fileStatus) {
+          // If the file did not exist, skip it.
+          return;
+        }
+
         let itemForMatch = item;
         const isDirectory = fileStatus.isDirectory();
         if (isDirectory) {

From a43d66991bb6c52e83dacf894a0eea8f26af8ea4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 13:48:23 -0500
Subject: [PATCH 562/688] Allow watch.sha1 to accept multiple arguments.

---
 tools/fs/watch.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/fs/watch.js b/tools/fs/watch.js
index ded8d3c21e..0a930c545e 100644
--- a/tools/fs/watch.js
+++ b/tools/fs/watch.js
@@ -257,10 +257,10 @@ export function readFile(absPath) {
   }
 };
 
-export function sha1(contents) {
+export function sha1(...args) {
   return Profile("sha1", function () {
     var hash = createHash('sha1');
-    hash.update(contents);
+    args.forEach(arg => hash.update(arg));
     return hash.digest('hex');
   })();
 }

From 940cc4f4d63524bda6d591e2ec76f5d9cfbe4839 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 13:48:48 -0500
Subject: [PATCH 563/688] Add salt to File#hash in bundler.js.

This is what determines, among other things, source map URL names of the
form <hash>.map, so this may help to avoid #7977.
---
 tools/isobuild/bundler.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 022550d6c9..d393918bd2 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -560,9 +560,17 @@ class File {
     return `File: [info=${this.info}]`;
   }
 
+  static _salt() {
+    // Increment this number to force rehashing.
+    return 1;
+  }
+
   hash() {
     if (! this._hash) {
-      this._hash = watch.sha1(this.contents());
+      this._hash = watch.sha1(
+        String(File._salt()),
+        this.contents(),
+      );
     }
     return this._hash;
   }

From 4ada5c8a17a6b4f36c4fb47158ea006e1d5dcb77 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 13:50:26 -0500
Subject: [PATCH 564/688] Bump LINKER_CACHE_SALT and compiler.BUILT_BY for good
 measure.

This will trigger recompilation and relinking, which should help prevent
various stale caching issues, e.g. #7977.
---
 tools/isobuild/compiler-plugin.js | 2 +-
 tools/isobuild/compiler.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index c13be9eca7..8e493a3d22 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -62,7 +62,7 @@ import { isTestFilePath } from './test-files.js';
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 11; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 12; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 23afa1417e..3006b93896 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -34,7 +34,7 @@ var compiler = exports;
 // dependencies. (At least for now, packages only used in target creation (eg
 // minifiers) don't require you to update BUILT_BY, though you will need to quit
 // and rerun "meteor run".)
-compiler.BUILT_BY = 'meteor/24';
+compiler.BUILT_BY = 'meteor/25';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From 932115120fb98cfe86a83647c5dc65af37614266 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 14:06:33 -0500
Subject: [PATCH 565/688] Don't let options.hash override File#hash() salting.

---
 tools/isobuild/bundler.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index d393918bd2..218de26b6e 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -553,7 +553,8 @@ class File {
     this.assets = null;
 
     this._contents = options.data || null; // contents, if known, as a Buffer
-    this._hash = options.hash || null; // hash, if known, as a hex string
+    this._hashOfContents = options.hash || null;
+    this._hash = null;
   }
 
   toString() {
@@ -567,11 +568,16 @@ class File {
 
   hash() {
     if (! this._hash) {
+      if (! this._hashOfContents) {
+        this._hashOfContents = watch.sha1(this.contents());
+      }
+
       this._hash = watch.sha1(
         String(File._salt()),
-        this.contents(),
+        this._hashOfContents,
       );
     }
+
     return this._hash;
   }
 
@@ -595,7 +601,7 @@ class File {
     }
     this._contents = b;
     // Un-cache hash.
-    this._hash = null;
+    this._hashOfContents = this._hash = null;
   }
 
   size() {

From 7abaa56b1a17f114129d3d600b8ecc9676618948 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 13:57:42 -0500
Subject: [PATCH 566/688] Bump package versions for 1.4.2.1-rc.2 release.

---
 packages/accounts-oauth/package.js             | 2 +-
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/caching-compiler/package.js           | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-common/package.js                 | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index 140ce0a4cd..fced2af9f4 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.15-rc.1"
+  version: "1.1.15-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index bf2ac35c63..1eb3f415e8 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.2-rc.1"
+  version: "1.3.2-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index d58d1c4c6b..e416285c72 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0-rc.1',
+  version: '1.0.0-rc.2',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index 2cf9ddc115..cd65338167 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.9-rc.1',
+  version: '1.1.9-rc.2',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index dbbd90b258..2e547a5658 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-3-rc.1"
+  version: "1.11.1-3-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 1e711aea8f..6f4a8ddeac 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.8-rc.1',
+  version: '1.2.8-rc.2',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 35c691e56a..c0d6948a2d 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12-rc.1',
+  version: '1.3.12-rc.2',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index 168aaa2448..ed13590342 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7-rc.1',
+  version: '2.7.7-rc.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 8fa61dfc30..97686a5f37 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-1-rc.1'
+  version: '1.4.2-1-rc.2'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 33176db063..38ad22140f 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7-rc.1"
+  version: "2.513.7-rc.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index d95555ff74..2f1bc59a03 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.1-rc.1",
+ "version": "1.4.2.1-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e1e3c89c6a940859a1dc1428f863a982dff2697b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 14:32:29 -0500
Subject: [PATCH 567/688] Link to a few more fixed bugs in History.md.

---
 History.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 5cca124c04..d2e4046baf 100644
--- a/History.md
+++ b/History.md
@@ -34,8 +34,11 @@
   [#7978](https://github.com/meteor/meteor/issues/7978)
 
 * Miscellaneous fixed bugs:
-  [#7974](https://github.com/meteor/meteor/issues/7974)
+  [#2876](https://github.com/meteor/meteor/issues/2876)
+  [#7154](https://github.com/meteor/meteor/issues/7154)
   [#7956](https://github.com/meteor/meteor/issues/7956)
+  [#7974](https://github.com/meteor/meteor/issues/7974)
+  [#8005](https://github.com/meteor/meteor/issues/8005)
   [#8007](https://github.com/meteor/meteor/issues/8007)
 
 ## v1.4.2

From 8f07a87bd554ad01aea7cd903d68a5216c7a3a27 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 15:22:43 -0500
Subject: [PATCH 568/688] Give package test modules access to Npm.depends
 dependencies.

Similar in spirit to bbac2725302cf820eddbfea8e3c550a42bdfcf89.

Fixes #7999.
---
 History.md                                             |  1 +
 tools/isobuild/import-scanner.js                       |  7 ++++++-
 tools/tests/apps/modules/package.json                  |  3 ++-
 .../modules/packages/modules-test-package/package.js   | 10 +++++++++-
 .../modules/packages/modules-test-package/tests.js     |  9 +++++++++
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 tools/tests/apps/modules/packages/modules-test-package/tests.js

diff --git a/History.md b/History.md
index d2e4046baf..b7472a6474 100644
--- a/History.md
+++ b/History.md
@@ -38,6 +38,7 @@
   [#7154](https://github.com/meteor/meteor/issues/7154)
   [#7956](https://github.com/meteor/meteor/issues/7956)
   [#7974](https://github.com/meteor/meteor/issues/7974)
+  [#7999](https://github.com/meteor/meteor/issues/7999)
   [#8005](https://github.com/meteor/meteor/issues/8005)
   [#8007](https://github.com/meteor/meteor/issues/8007)
 
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 1649e37567..9f49737b27 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -648,7 +648,12 @@ export default class ImportScanner {
     if (this.name) {
       // If we're bundling a package, prefix path with
       // node_modules/<package name>/.
-      path = pathJoin("node_modules", "meteor", this.name, path);
+      path = pathJoin(
+        "node_modules",
+        "meteor",
+        this.name.replace(/^local-test[:_]/, ""),
+        path,
+      );
     }
 
     // Install paths should always be delimited by /.
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 48935553db..8d2f07e96d 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -16,6 +16,7 @@
     "winston": "^2.2.0"
   },
   "scripts": {
-    "test": "METEOR_PROFILE=100 ../../../../meteor test --full-app --driver-package avital:mocha"
+    "test": "METEOR_PROFILE=100 ../../../../meteor test --full-app --driver-package avital:mocha",
+    "test-packages": "../../../../meteor test-packages --driver-package avital:mocha packages/modules-test-package"
   }
 }
diff --git a/tools/tests/apps/modules/packages/modules-test-package/package.js b/tools/tests/apps/modules/packages/modules-test-package/package.js
index efb8aba134..3e708129ad 100644
--- a/tools/tests/apps/modules/packages/modules-test-package/package.js
+++ b/tools/tests/apps/modules/packages/modules-test-package/package.js
@@ -7,7 +7,8 @@ Package.describe({
 
 Npm.depends({
   "os-browserify": "0.2.0",
-  "assert": "1.3.0"
+  "assert": "1.3.0",
+  "cheerio": "0.22.0"
 });
 
 Package.onUse(function(api) {
@@ -17,3 +18,10 @@ Package.onUse(function(api) {
   api.mainModule("server.js", "server");
   api.export("ModulesTestPackage");
 });
+
+Package.onTest(function (api) {
+  api.use("ecmascript");
+  api.use("tinytest");
+  api.use("modules-test-package");
+  api.mainModule("tests.js");
+});
diff --git a/tools/tests/apps/modules/packages/modules-test-package/tests.js b/tools/tests/apps/modules/packages/modules-test-package/tests.js
new file mode 100644
index 0000000000..67378a6352
--- /dev/null
+++ b/tools/tests/apps/modules/packages/modules-test-package/tests.js
@@ -0,0 +1,9 @@
+import assert from "assert";
+
+describe("cheerio", () => {
+  it("should be importable", () => {
+    import cheerio from "cheerio";
+    assert.strictEqual(typeof cheerio, "object");
+    assert.deepEqual(Object.keys(cheerio), ["cheerio"]);
+  });
+});

From 45b01ba8093ca207fe546a5db26f942cc3c5c188 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 15:42:56 -0500
Subject: [PATCH 569/688] Bump package versions for the official 1.4.2.1
 release.

---
 packages/accounts-oauth/package.js         | 2 +-
 packages/accounts-password/package.js      | 2 +-
 packages/babel-runtime/package.js          | 2 +-
 packages/caching-compiler/package.js       | 2 +-
 packages/coffeescript/package.js           | 2 +-
 packages/ddp-common/package.js             | 2 +-
 packages/ddp-server/package.js             | 2 +-
 packages/less/package.js                   | 2 +-
 packages/meteor-tool/package.js            | 2 +-
 packages/stylus/package.js                 | 2 +-
 scripts/admin/meteor-release-official.json | 3 ++-
 11 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js
index fced2af9f4..41e5f9d9e4 100644
--- a/packages/accounts-oauth/package.js
+++ b/packages/accounts-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Common code for OAuth-based login services",
-  version: "1.1.15-rc.2"
+  version: "1.1.15"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 1eb3f415e8..42bf1c7298 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.2-rc.2"
+  version: "1.3.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index e416285c72..54b3b2db82 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0-rc.2',
+  version: '1.0.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js
index cd65338167..470e4d04be 100644
--- a/packages/caching-compiler/package.js
+++ b/packages/caching-compiler/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'caching-compiler',
-  version: '1.1.9-rc.2',
+  version: '1.1.9',
   summary: 'An easy way to make compiler plugins cache',
   documentation: 'README.md'
 });
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 2e547a5658..22828ffe22 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-3-rc.2"
+  version: "1.11.1_3"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-common/package.js b/packages/ddp-common/package.js
index 6f4a8ddeac..42a831899b 100644
--- a/packages/ddp-common/package.js
+++ b/packages/ddp-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Code shared beween ddp-client and ddp-server",
-  version: '1.2.8-rc.2',
+  version: '1.2.8',
   documentation: null
 });
 
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index c0d6948a2d..99e29c6daf 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12-rc.2',
+  version: '1.3.12',
   documentation: null
 });
 
diff --git a/packages/less/package.js b/packages/less/package.js
index ed13590342..3111131fb2 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7-rc.2',
+  version: '2.7.7',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 97686a5f37..4ab26584dd 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-1-rc.2'
+  version: '1.4.2_1'
 });
 
 Package.includeTool();
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 38ad22140f..89e0ed22a5 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7-rc.2"
+  version: "2.513.7"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 71219f1d08..0a21c31d02 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,7 @@
 {
   "track": "METEOR",
-  "version": "1.4.2",
+  "version": "1.4.2.1",
+  "patchFrom": ["1.4.2"],
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

From 51bb575e0055205a4cd3ffd51afe2b4c558a7565 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 17:38:18 -0500
Subject: [PATCH 570/688] Bump ecmascript version to 0.6.0 to republish.

Temporarily adding version constraints so that we can publish
independently from the Meteor release.
---
 packages/ecmascript/package.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1678e3063f..c6cb515e41 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.5.9',
+  version: '0.6.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
@@ -13,14 +13,14 @@ Package.registerBuildPlugin({
 
 Package.onUse(function (api) {
   api.use('isobuild:compiler-plugin@1.0.0');
-  api.use('babel-compiler');
+  api.use('babel-compiler@6.13.0');
 
   // The following api.imply calls should match those in
   // ../coffeescript/package.js.
-  api.imply('modules');
-  api.imply('ecmascript-runtime');
-  api.imply('babel-runtime');
-  api.imply('promise');
+  api.imply('modules@0.7.7');
+  api.imply('ecmascript-runtime@0.3.15');
+  api.imply('babel-runtime@1.0.0');
+  api.imply('promise@0.8.8');
 
   api.addFiles("ecmascript.js", "server");
   api.export("ECMAScript", "server");

From 2d8f187cc92d152a010a7862dc5fa2a677a6b5ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 8 Nov 2016 17:38:51 -0500
Subject: [PATCH 571/688] Remove version constraints from
 ecmascript/package.js.

These constraints are only helpful when publishing the package apart
from a Meteor release, and are hard to maintain otherwise.
---
 packages/ecmascript/package.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index c6cb515e41..4b4f0cdd87 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -13,14 +13,14 @@ Package.registerBuildPlugin({
 
 Package.onUse(function (api) {
   api.use('isobuild:compiler-plugin@1.0.0');
-  api.use('babel-compiler@6.13.0');
+  api.use('babel-compiler');
 
   // The following api.imply calls should match those in
   // ../coffeescript/package.js.
-  api.imply('modules@0.7.7');
-  api.imply('ecmascript-runtime@0.3.15');
-  api.imply('babel-runtime@1.0.0');
-  api.imply('promise@0.8.8');
+  api.imply('modules');
+  api.imply('ecmascript-runtime');
+  api.imply('babel-runtime');
+  api.imply('promise');
 
   api.addFiles("ecmascript.js", "server");
   api.export("ECMAScript", "server");

From fbd4b06085fca1fb7c48eca9680f2eee68c9a34c Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:47:57 +1100
Subject: [PATCH 572/688] Add changelog entry for #7807

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index 5e3f6ced7f..ab21bcdcb3 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,12 @@
   [Issue #7715](https://github.com/meteor/meteor/issues/7715)
   [PR #7728](https://github.com/meteor/meteor/pull/7728)
 
+* `meteor create` now has a new `--full` option, which generates an larger app,
+  demonstrating development techniques highlighted in the
+  [Meteor Guide](http://guide.meteor.com)
+
+  [PR #7807](https://github.com/meteor/meteor/pull/7807)
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application

From 472a46b42a09684c4c9129a1d937f88c161fe163 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:52:21 +1100
Subject: [PATCH 573/688] Changelog entry for #7858

---
 History.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/History.md b/History.md
index ab21bcdcb3..08c6f18c1d 100644
--- a/History.md
+++ b/History.md
@@ -17,8 +17,16 @@
   demonstrating development techniques highlighted in the
   [Meteor Guide](http://guide.meteor.com)
 
+  [Issue #6974](https://github.com/meteor/meteor/issues/6974)
   [PR #7807](https://github.com/meteor/meteor/pull/7807)
 
+* Minimongo now supports `$min`, `$max` and partially supports `$currentDate`.
+
+  [Issue #7857](https://github.com/meteor/meteor/issues/7857)
+  [PR #7858](https://github.com/meteor/meteor/pull/7858)
+
+
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application

From 7bd2c57b1dd35f92284c59cc9300f65c3c0cbf4a Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:58:13 +1100
Subject: [PATCH 574/688] Changelog for 7968

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 08c6f18c1d..e0e4cbb4db 100644
--- a/History.md
+++ b/History.md
@@ -25,6 +25,9 @@
   [Issue #7857](https://github.com/meteor/meteor/issues/7857)
   [PR #7858](https://github.com/meteor/meteor/pull/7858)
 
+* Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
+  [PR #7968](https://github.com/meteor/meteor/pull/7968)
+
 
 
 ## v1.4.2.1

From 274a1f65661b6c92d36056cb17a71787de266908 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 9 Nov 2016 01:52:15 -0500
Subject: [PATCH 575/688] Upgrade modules test app to Meteor 1.4.2.1.

---
 tools/tests/apps/modules/.meteor/packages | 2 +-
 tools/tests/apps/modules/.meteor/release  | 2 +-
 tools/tests/apps/modules/.meteor/versions | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 1df4bfa370..9a351d5ba1 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -15,7 +15,7 @@ tracker@1.1.1                 # Meteor's client-side reactive programming librar
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
 ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript
+coffeescript@1.11.1_3
 modules-test-package
 avital:mocha
 standard-minifier-css@1.3.2
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index c26084673d..65e8c3928f 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.2
+METEOR@1.4.2.1
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 1735eab3e0..9d2e8a48e8 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -2,26 +2,26 @@ allow-deny@1.0.5
 autoupdate@1.3.12
 avital:mocha@2.1.0_10
 babel-compiler@6.13.0
-babel-runtime@0.1.12
+babel-runtime@1.0.0
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.1.9
 blaze-html-templates@1.0.5
 blaze-tools@1.0.10
 boilerplate-generator@1.0.11
-caching-compiler@1.1.8
+caching-compiler@1.1.9
 caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
 client-only-ecmascript@0.0.1
-coffeescript@1.11.1_2
+coffeescript@1.11.1_3
 ddp@1.2.5
 ddp-client@1.3.2
 ddp-common@1.2.7
 ddp-server@1.3.11
 deps@1.0.12
 diff-sequence@1.0.7
-ecmascript@0.5.9
+ecmascript@0.6.0
 ecmascript-runtime@0.3.15
 ejson@1.0.13
 es5-shim@4.6.15

From 483914a5a6f2795e1c8861b09e068b1a1f7c8e25 Mon Sep 17 00:00:00 2001
From: Joshua Byrd <phocks@gmail.com>
Date: Wed, 9 Nov 2016 23:08:53 +1000
Subject: [PATCH 576/688] Twitter changed this

---
 packages/twitter/twitter_configure.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/twitter/twitter_configure.html b/packages/twitter/twitter_configure.html
index 8c99dfa4b5..0a98c7b3fb 100644
--- a/packages/twitter/twitter_configure.html
+++ b/packages/twitter/twitter_configure.html
@@ -4,7 +4,7 @@
   </p>
   <ol>
     <li>
-      Visit <a href="https://dev.twitter.com/apps/new" target="_blank">https://dev.twitter.com/apps/new</a>
+      Visit <a href="https://apps.twitter.com/app/new" target="_blank">https://dev.twitter.com/apps/new</a>
     </li>
     <li>
       Set Website to: <span class="url">{{siteUrl}}</span>

From 478217f1b007601f725e04edc7d3d6ed3dee5b81 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 9 Nov 2016 16:41:50 -0500
Subject: [PATCH 577/688] Add banner for Meteor 1.4.2.1.

---
 scripts/admin/banners.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json
index ee01f430be..6c87531529 100644
--- a/scripts/admin/banners.json
+++ b/scripts/admin/banners.json
@@ -14,5 +14,10 @@
     "banner": {
       "text": "=> Meteor 1.3.4: npm@3.9.6, .babelrc support, improved import declarations,\n   DDP update batching, and more: https://github.com/meteor/meteor/blob/master/History.md#v134\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.3.4 by running 'meteor update'."
     }
+  }, {
+    "versions": ["1.4.2"],
+    "banner": {
+      "text": "=> Meteor 1.4.2.1: An important patch release for Meteor 1.4.2:\n   https://forums.meteor.com/t/meteor-1-4-2-1-is-an-important-patch-for-1-4-2-users"
+    }
   }]
 }

From 3ee60f57e57b56b56b36e8c8cdbdbb79c9b55e25 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 9 Nov 2016 22:53:28 -0800
Subject: [PATCH 578/688] Allow global headless setting.

---
 tools/console/console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index 93cff6700f..0c405a1e35 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -309,7 +309,7 @@ var ProgressDisplayFull = function (console) {
   self._progressBarRenderer = new ProgressBarRenderer(PROGRESS_BAR_FORMAT, options);
   self._progressBarRenderer.start = new Date();
 
-  self._headless = false;
+  self._headless = !!(process.env.METEOR_HEADLESS && process.env.METEOR_HEADLESS != '0');
 
   self._spinnerRenderer = new SpinnerRenderer();
 

From f99d6e000ec3782097572c4130b6c94d1b3106ac Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Fri, 4 Nov 2016 14:24:20 +0100
Subject: [PATCH 579/688] Link directly to target.

---
 Contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Contributing.md b/Contributing.md
index c5b9d175b2..38fa0880ad 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -230,7 +230,7 @@ these guidelines:
  * Include tests that prove your code works.
 
  * Follow the
-   [MDG style guide](https://github.com/meteor/meteor/wiki/Meteor-Style-Guide)
+   [MDG style guide](https://guide.meteor.com/code-style.html#javascript)
    for code and commit messages.
 
  * Be sure your author field in git is properly filled out with your full name

From 7abd832f750a8bb7231022b79092ff6fe96f3286 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 9 Nov 2016 01:52:15 -0500
Subject: [PATCH 580/688] Upgrade modules test app to Meteor 1.4.2.1.

---
 tools/tests/apps/modules/.meteor/packages | 2 +-
 tools/tests/apps/modules/.meteor/release  | 2 +-
 tools/tests/apps/modules/.meteor/versions | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 1df4bfa370..9a351d5ba1 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -15,7 +15,7 @@ tracker@1.1.1                 # Meteor's client-side reactive programming librar
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
 ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript
+coffeescript@1.11.1_3
 modules-test-package
 avital:mocha
 standard-minifier-css@1.3.2
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index c26084673d..65e8c3928f 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.2
+METEOR@1.4.2.1
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 1735eab3e0..9d2e8a48e8 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -2,26 +2,26 @@ allow-deny@1.0.5
 autoupdate@1.3.12
 avital:mocha@2.1.0_10
 babel-compiler@6.13.0
-babel-runtime@0.1.12
+babel-runtime@1.0.0
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.1.9
 blaze-html-templates@1.0.5
 blaze-tools@1.0.10
 boilerplate-generator@1.0.11
-caching-compiler@1.1.8
+caching-compiler@1.1.9
 caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
 client-only-ecmascript@0.0.1
-coffeescript@1.11.1_2
+coffeescript@1.11.1_3
 ddp@1.2.5
 ddp-client@1.3.2
 ddp-common@1.2.7
 ddp-server@1.3.11
 deps@1.0.12
 diff-sequence@1.0.7
-ecmascript@0.5.9
+ecmascript@0.6.0
 ecmascript-runtime@0.3.15
 ejson@1.0.13
 es5-shim@4.6.15

From 5e9076f46359c71e45bd4f92c8777f022a740053 Mon Sep 17 00:00:00 2001
From: Joshua Byrd <phocks@gmail.com>
Date: Wed, 9 Nov 2016 23:08:53 +1000
Subject: [PATCH 581/688] Twitter changed this

---
 packages/twitter/twitter_configure.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/twitter/twitter_configure.html b/packages/twitter/twitter_configure.html
index 8c99dfa4b5..0a98c7b3fb 100644
--- a/packages/twitter/twitter_configure.html
+++ b/packages/twitter/twitter_configure.html
@@ -4,7 +4,7 @@
   </p>
   <ol>
     <li>
-      Visit <a href="https://dev.twitter.com/apps/new" target="_blank">https://dev.twitter.com/apps/new</a>
+      Visit <a href="https://apps.twitter.com/app/new" target="_blank">https://dev.twitter.com/apps/new</a>
     </li>
     <li>
       Set Website to: <span class="url">{{siteUrl}}</span>

From e44e9bb87685787bb038bae6b30b7871dd564374 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 9 Nov 2016 16:41:50 -0500
Subject: [PATCH 582/688] Add banner for Meteor 1.4.2.1.

---
 scripts/admin/banners.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json
index ee01f430be..6c87531529 100644
--- a/scripts/admin/banners.json
+++ b/scripts/admin/banners.json
@@ -14,5 +14,10 @@
     "banner": {
       "text": "=> Meteor 1.3.4: npm@3.9.6, .babelrc support, improved import declarations,\n   DDP update batching, and more: https://github.com/meteor/meteor/blob/master/History.md#v134\n\n   This release is being downloaded in the background. Update your app to\n   Meteor 1.3.4 by running 'meteor update'."
     }
+  }, {
+    "versions": ["1.4.2"],
+    "banner": {
+      "text": "=> Meteor 1.4.2.1: An important patch release for Meteor 1.4.2:\n   https://forums.meteor.com/t/meteor-1-4-2-1-is-an-important-patch-for-1-4-2-users"
+    }
   }]
 }

From 61ada2d27ba2d8c222d8bc2d7243713dc36b843b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 10 Nov 2016 17:03:14 -0500
Subject: [PATCH 583/688] Update statOrNull method of cached Resolver objects.

This solves a problem that sometimes occurs when new modules are added
to an app but the cached Resolver object cannot find them because its
statOrNull method is still using a previous instance of the
corresponding ImportScanner.

Related issues and comments:

https://forums.meteor.com/t/meteor-not-detecting-new-files/31151
https://github.com/Akryum/meteor-vue-component/issues/80
https://github.com/meteor/meteor/pull/7975#issuecomment-259263650
https://github.com/meteor/meteor/issues/8008
---
 tools/isobuild/import-scanner.js | 28 +++++++++++++++++-----------
 tools/isobuild/resolver.js       |  3 +--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 9f49737b27..351dd345db 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -108,7 +108,6 @@ export default class ImportScanner {
     nodeModulesPaths = [],
     watchSet,
   }) {
-    const scanner = this;
     assert.ok(isString(sourceRoot));
 
     this.name = name;
@@ -122,21 +121,28 @@ export default class ImportScanner {
 
     this.resolver = Resolver.getOrCreate({
       caller: "ImportScanner#constructor",
-
       sourceRoot,
       targetArch: bundleArch,
       extensions,
       nodeModulesPaths,
-
-      statOrNull(absPath) {
-        const file = scanner._getFile(absPath);
-        if (file) {
-          return fakeFileStat;
-        }
-
-        return optimisticStatOrNull(absPath);
-      }
     });
+
+    // Since Resolver.getOrCreate may have returned a cached Resolver
+    // instance, it's important to update its statOrNull method so that it
+    // is bound to this ImportScanner object rather than the previous one.
+    this.resolver.statOrNull = (absPath) => {
+      const stat = optimisticStatOrNull(absPath);
+      if (stat) {
+        return stat;
+      }
+
+      const file = this._getFile(absPath);
+      if (file) {
+        return fakeFileStat;
+      }
+
+      return null;
+    };
   }
 
   _getFile(absPath) {
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index bf8d0f4176..ac00eb2ce0 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -64,13 +64,12 @@ export default class Resolver {
     targetArch,
     extensions = [".js", ".json"],
     nodeModulesPaths = [],
-    statOrNull = optimisticStatOrNull,
   }) {
     this.sourceRoot = sourceRoot;
     this.extensions = extensions;
     this.targetArch = targetArch;
     this.nodeModulesPaths = nodeModulesPaths;
-    this.statOrNull = statOrNull;
+    this.statOrNull = optimisticStatOrNull;
 
     this.resolve = wrap((id, absParentPath) => {
       return this._resolve(id, absParentPath);

From 35a19eb1fd266d285794786f8d26a8130ecc6012 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 10 Nov 2016 17:41:38 -0500
Subject: [PATCH 584/688] Bump package versions for 1.4.2.2-beta.0 release.

---
 packages/ecmascript/package.js                 | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/twitter/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 4b4f0cdd87..80d13f20f8 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.0',
+  version: '0.6.1-beta.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 4ab26584dd..bf67789df3 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2_1'
+  version: '1.4.2-2-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 6ecc3df7db..a837a6adc7 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.13'
+  version: '1.1.14-beta.0'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 2f1bc59a03..7381df9b75 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.1-rc.2",
+ "version": "1.4.2.2-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 0466fdd37f757efea0e70a970b4ad5f2071d9d00 Mon Sep 17 00:00:00 2001
From: Mehdi AHRAOUI <benabed.mehdi@gmail.com>
Date: Sun, 28 Aug 2016 22:01:21 +0100
Subject: [PATCH 585/688] Scaffold an official project structure

Scaffold an official project structure
Add --bare option to meteor create

Notice scaffold options on meteor create

add full skeleton

add spaces

remove shell-server package from skew-full + add description of new packages

Add --bare option to meteor create

Notice scaffold options on meteor create

add full skeleton

add spaces

remove shell-server package from skew-full + add description of new packages

improve PR

resolve conflict

Fix rebase

fix static-assets readme

Fix tipo

Remove insecure and auto publish packages

Remove useraccounts-configuration.js

add tests

fix PR
---
 tools/cli/commands.js                         |  38 ++++--
 tools/cli/help.txt                            |   7 +-
 tools/static-assets/README.md                 |   8 ++
 tools/static-assets/skel-bare/.gitignore      |   1 +
 .../skel-bare/.meteor/.gitignore              |   1 +
 .../static-assets/skel-bare/.meteor/packages  |  22 ++++
 .../static-assets/skel-bare/.meteor/platforms |   2 +
 tools/static-assets/skel-bare/package.json    |  10 ++
 tools/static-assets/skel-full/.gitignore      |   1 +
 .../skel-full/.meteor/.gitignore              |   1 +
 .../static-assets/skel-full/.meteor/packages  |  26 ++++
 .../static-assets/skel-full/.meteor/platforms |   2 +
 .../static-assets/skel-full/client/head.html  |   3 +
 tools/static-assets/skel-full/client/main.js  |   4 +
 .../static-assets/skel-full/client/main.less  |   1 +
 .../skel-full/imports/api/links/links.js      |   5 +
 .../imports/api/links/links.tests.js          |  21 ++++
 .../skel-full/imports/api/links/methods.js    |  19 +++
 .../imports/api/links/methods.tests.js        |  51 ++++++++
 .../imports/api/links/server/publications.js  |  10 ++
 .../api/links/server/publications.tests.js    |  27 +++++
 .../skel-full/imports/startup/both/index.js   |   1 +
 .../skel-full/imports/startup/client/index.js |   3 +
 .../imports/startup/client/routes.js          |  21 ++++
 .../imports/startup/server/fixtures.js        |  37 ++++++
 .../skel-full/imports/startup/server/index.js |   4 +
 .../imports/startup/server/register-api.js    |   4 +
 .../imports/ui/components/hello/hello.html    |   4 +
 .../imports/ui/components/hello/hello.js      |  19 +++
 .../imports/ui/components/info/info.html      |  15 +++
 .../imports/ui/components/info/info.js        |  33 +++++
 .../imports/ui/layouts/body/body.html         |   3 +
 .../skel-full/imports/ui/layouts/body/body.js |   1 +
 .../skel-full/imports/ui/pages/home/home.html |   4 +
 .../skel-full/imports/ui/pages/home/home.js   |   4 +
 .../imports/ui/pages/not-found/not-found.html |  12 ++
 .../imports/ui/pages/not-found/not-found.js   |   1 +
 .../imports/ui/stylesheets/not-found.less     |  35 ++++++
 tools/static-assets/skel-full/package.json    |  10 ++
 .../static-assets/skel-full/private/README.md |   3 +
 .../skel-full/public/img/404.svg              | 113 ++++++++++++++++++
 .../skel-full/public/img/bg-footer.svg        |  12 ++
 tools/static-assets/skel-full/server/main.js  |   4 +
 43 files changed, 592 insertions(+), 11 deletions(-)
 create mode 100644 tools/static-assets/skel-bare/.gitignore
 create mode 100644 tools/static-assets/skel-bare/.meteor/.gitignore
 create mode 100644 tools/static-assets/skel-bare/.meteor/packages
 create mode 100644 tools/static-assets/skel-bare/.meteor/platforms
 create mode 100644 tools/static-assets/skel-bare/package.json
 create mode 100644 tools/static-assets/skel-full/.gitignore
 create mode 100644 tools/static-assets/skel-full/.meteor/.gitignore
 create mode 100644 tools/static-assets/skel-full/.meteor/packages
 create mode 100644 tools/static-assets/skel-full/.meteor/platforms
 create mode 100644 tools/static-assets/skel-full/client/head.html
 create mode 100644 tools/static-assets/skel-full/client/main.js
 create mode 100644 tools/static-assets/skel-full/client/main.less
 create mode 100644 tools/static-assets/skel-full/imports/api/links/links.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/links.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/methods.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/methods.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/server/publications.js
 create mode 100644 tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/both/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/client/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/client/routes.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/fixtures.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/index.js
 create mode 100644 tools/static-assets/skel-full/imports/startup/server/register-api.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/hello/hello.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/hello/hello.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/info/info.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/components/info/info.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/layouts/body/body.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/layouts/body/body.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/home/home.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/home/home.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
 create mode 100644 tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
 create mode 100644 tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
 create mode 100644 tools/static-assets/skel-full/package.json
 create mode 100644 tools/static-assets/skel-full/private/README.md
 create mode 100644 tools/static-assets/skel-full/public/img/404.svg
 create mode 100644 tools/static-assets/skel-full/public/img/bg-footer.svg
 create mode 100644 tools/static-assets/skel-full/server/main.js

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 2484b36fa1..5db685e182 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -329,7 +329,7 @@ function doRunCommand(options) {
   if (options.production) {
     Console.warn(
       "Warning: The --production flag should only be used to simulate production " +
-      "bundling for testing purposes. Use meteor build to create a bundle for " + 
+      "bundling for testing purposes. Use meteor build to create a bundle for " +
       "production deployment. See: https://guide.meteor.com/deployment.html"
     );
   }
@@ -433,7 +433,9 @@ main.registerCommand({
   options: {
     list: { type: Boolean },
     example: { type: String },
-    package: { type: Boolean }
+    package: { type: Boolean },
+    full: { type: Boolean },
+    bare: { type: Boolean }
   },
   catalogRefresh: new catalog.Refresh.Never()
 }, function (options) {
@@ -576,7 +578,7 @@ main.registerCommand({
 
     Console.info();
     Console.info("To create an example, simply", Console.command("git clone"),
-      "the relevant repository and branch (run", 
+      "the relevant repository and branch (run",
       Console.command("'meteor create --example <name>'"),
       " to see the full command).");
     return 0;
@@ -676,7 +678,16 @@ main.registerCommand({
     toIgnore.push(/(\.html|\.js|\.css)/)
   }
 
-  files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', 'skel'), appPath, {
+  let skelName = 'skel';
+
+  if(options.bare){
+    skelName += '-bare';
+  }
+  else if(options.full){
+    skelName += '-full';
+  }
+
+  files.cp_r(files.pathJoin(__dirnameConverted, '..', 'static-assets', skelName), appPath, {
     transformFilename: function (f) {
       return transform(f);
     },
@@ -767,6 +778,15 @@ main.registerCommand({
     Console.url("https://www.meteor.com/learn"),
       Console.options({ indent: 2 }));
 
+  if (!options.full && !options.bare){
+    // Notice people about --bare and --full
+    const bareOptionNotice = 'meteor create --bare to create an empty app.';
+    const fullOptionNotice = 'meteor create --full to create a scaffolded app.';
+
+    Console.info("");
+    Console.info(bareOptionNotice + '\n' + fullOptionNotice);
+  }
+
   Console.info("");
 });
 
@@ -983,7 +1003,7 @@ ${Console.command("meteor build ../output")}`,
           { title: `building Cordova app for \
 ${cordova.displayNameForPlatform(platform)}` }, () => {
             let buildOptions = { release: !options.debug };
-            
+
             const buildPath = files.pathJoin(
               projectContext.getProjectLocalDirectory('cordova-build'),
               'platforms', platform);
@@ -1208,7 +1228,7 @@ main.registerCommand({
       Console.command("meteor deploy appname"), Console.options({ indent: 2 }));
     return 1;
   }
-  
+
   if (process.env.MONGO_URL) {
     Console.info("As a precaution, meteor reset only clears the local database that is " +
                  "provided by meteor run for development. The database specified with " +
@@ -1645,7 +1665,7 @@ function doTestCommand(options) {
 
     global.testCommandMetadata.isAppTest = options['full-app'];
     global.testCommandMetadata.isTest = !global.testCommandMetadata.isAppTest;
-    
+
     projectContextOptions.projectDir = options.appDir;
     projectContextOptions.projectLocalDir = files.pathJoin(testRunnerAppDir, '.meteor', 'local');
 
@@ -1675,7 +1695,7 @@ function doTestCommand(options) {
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'isopacks');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'plugin-cache');
     copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'shell');
-    
+
     projectContext = new projectContextModule.ProjectContext(projectContextOptions);
 
     main.captureAndExit("=> Errors while setting up tests:", function () {
@@ -1777,7 +1797,7 @@ var runTestAppForPackages = function (projectContext, options) {
     minifyMode: options.production ? 'production' : 'development'
   };
   buildOptions.buildMode = "test";
-  
+
   if (options.deploy) {
     // Run the constraint solver and build local packages.
     main.captureAndExit("=> Errors while initializing project:", function () {
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index 44334da3ad..99543e5144 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -89,14 +89,15 @@ Options:
 
 >>> create
 Create a new project.
-Usage: meteor create [--release <release>] <path>
+Usage: meteor create [--release <release>] [--bare|--full] <path>
        meteor create [--release <release>] --example <example_name> [<path>]
        meteor create --list
        meteor create --package [<package_name>]
 
 Make a subdirectory named <path> if it doesn't exist and create a new Meteor app
 there. You can pass an absolute path, relative path, or '.' for the current
-directory.
+directory. Use the --bare option to create an empty app. To scaffold the app
+use the --full option.
 
 With the --package option, creates a Meteor package instead of an app. If you're
 in an app, the package will go in the app's top-level 'packages' directory;
@@ -115,6 +116,8 @@ Options:
   --package  Create a new meteor package instead of an app.
   --example  Example template to use.
   --list     Show list of available examples.
+  --bare     Create an empty app.
+  --full     Create a scaffolded app.
 
 
 >>> update
diff --git a/tools/static-assets/README.md b/tools/static-assets/README.md
index ddc7166572..43fa20da30 100644
--- a/tools/static-assets/README.md
+++ b/tools/static-assets/README.md
@@ -12,6 +12,14 @@ Sometimes, for code sharing, the JS files can be imported by parts of the tool
 destination on `meteor create` command. The important part of the skeleton is
 the packages it includes by default.
 
+## skel-bare - Empty App Skeleton
+
+Similar to `skel`, `skel-bare` is copied on `meteor create --bare` command.
+
+## skel-full - Scaffold App Skeleton
+
+Similar to `skel`, `skel-full` is copied on `meteor create --full` command.
+
 ## skel-pack - Package Skeleton
 
 Similar to `skel`, `skel-pack` is copied on `meteor create --package` command.
diff --git a/tools/static-assets/skel-bare/.gitignore b/tools/static-assets/skel-bare/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/static-assets/skel-bare/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/static-assets/skel-bare/.meteor/.gitignore b/tools/static-assets/skel-bare/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/static-assets/skel-bare/.meteor/packages b/tools/static-assets/skel-bare/.meteor/packages
new file mode 100644
index 0000000000..1615051104
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/packages
@@ -0,0 +1,22 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+reactive-var            # Reactive variable for tracker
+jquery                  # Helpful client-side library
+tracker                 # Meteor's client-side reactive programming library
+
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers.
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+shell-server            # Server-side component of the `meteor shell` command
+
+autopublish             # Publish all data to the clients (for prototyping)
+insecure                # Allow all DB writes from clients (for prototyping)
diff --git a/tools/static-assets/skel-bare/.meteor/platforms b/tools/static-assets/skel-bare/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/static-assets/skel-bare/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/static-assets/skel-bare/package.json b/tools/static-assets/skel-bare/package.json
new file mode 100644
index 0000000000..509ac7e54f
--- /dev/null
+++ b/tools/static-assets/skel-bare/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "~name~",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "meteor-node-stubs": "~0.2.0"
+  }
+}
diff --git a/tools/static-assets/skel-full/.gitignore b/tools/static-assets/skel-full/.gitignore
new file mode 100644
index 0000000000..40b878db5b
--- /dev/null
+++ b/tools/static-assets/skel-full/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/tools/static-assets/skel-full/.meteor/.gitignore b/tools/static-assets/skel-full/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages
new file mode 100644
index 0000000000..1920d7a37f
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/packages
@@ -0,0 +1,26 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base             # Packages every Meteor app needs to have
+mobile-experience       # Packages for a great mobile UX
+mongo                   # The database Meteor supports right now
+blaze-html-templates    # Compile .html files into Meteor Blaze views
+reactive-var            # Reactive variable for tracker
+jquery                  # Helpful client-side library
+tracker                 # Meteor's client-side reactive programming library
+
+standard-minifier-css   # CSS minifier run for production mode
+standard-minifier-js    # JS minifier run for production mode
+es5-shim                # ECMAScript 5 compatibility for older browsers.
+ecmascript              # Enable ECMAScript2015+ syntax in app code
+
+kadira:flow-router      # FlowRouter is a very simple router for Meteor
+kadira:blaze-layout     # Layout manager for blaze (works well with FlowRouter)
+less                    # Leaner CSS language
+
+
+practicalmeteor:mocha             # A package for writing and running your meteor app and package tests with mocha
+johanbrook:publication-collector  # Test a Meteor publication by collecting its output
diff --git a/tools/static-assets/skel-full/.meteor/platforms b/tools/static-assets/skel-full/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/static-assets/skel-full/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/static-assets/skel-full/client/head.html b/tools/static-assets/skel-full/client/head.html
new file mode 100644
index 0000000000..4ca4a25383
--- /dev/null
+++ b/tools/static-assets/skel-full/client/head.html
@@ -0,0 +1,3 @@
+<head>
+  <title>~name~</title>
+</head>
diff --git a/tools/static-assets/skel-full/client/main.js b/tools/static-assets/skel-full/client/main.js
new file mode 100644
index 0000000000..f5384b43a6
--- /dev/null
+++ b/tools/static-assets/skel-full/client/main.js
@@ -0,0 +1,4 @@
+// Client entry point, imports all client code
+
+import '/imports/startup/client';
+import '/imports/startup/both';
diff --git a/tools/static-assets/skel-full/client/main.less b/tools/static-assets/skel-full/client/main.less
new file mode 100644
index 0000000000..bca7b340a3
--- /dev/null
+++ b/tools/static-assets/skel-full/client/main.less
@@ -0,0 +1 @@
+@import "{}/imports/ui/stylesheets/not-found.less";
diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
new file mode 100644
index 0000000000..7c700cf2c6
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -0,0 +1,5 @@
+// Definition of the links collection
+
+import { Mongo } from 'meteor/mongo';
+
+export const Links = new Mongo.Collection('links');
diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
new file mode 100644
index 0000000000..f5dadd915d
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -0,0 +1,21 @@
+// Tests for the behavior of the links collection
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { assert } from 'meteor/practicalmeteor:chai';
+import { Links } from './links.js';
+
+if (Meteor.isServer) {
+  describe('links collection', function () {
+    it('insert correctly', function () {
+      const link = Links.insert({ title:'meteor homepage', url: 'https://www.meteor.com'});
+      const added = Links.find({_id: link});
+      const collectionName = added._getCollectionName();
+      const count = added.count();
+
+      assert.equal(collectionName, 'links');
+      assert.equal(count, 1);
+    })
+  })
+}
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
new file mode 100644
index 0000000000..7d5cace149
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -0,0 +1,19 @@
+// Methods related to links
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from './links.js';
+import { check } from 'meteor/check';
+
+Meteor.methods({
+  'links.insert'(title, url) {
+    check(url, String);
+    check(title, String);
+
+    // Check if this is a valid url
+    if (!url.match(/((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g)){
+      throw new Meteor.Error('Bad url. I.e https://www.meteor.com');
+    }
+
+    return Links.insert({url, title, createdAt: new Date()});
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
new file mode 100644
index 0000000000..3403e4e912
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -0,0 +1,51 @@
+// Tests for links methods
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { chai, assert } from 'meteor/practicalmeteor:chai';
+import { Links } from './links.js';
+import './methods.js';
+
+if (Meteor.isServer) {
+  describe('links methods', function () {
+
+    beforeEach(() => {
+      Links.remove({});
+    })
+
+    it('can add new link', function () {
+      const addLink = Meteor.server.method_handlers['links.insert'];
+
+      addLink.apply({}, ['meteor.com', 'https://www.meteor.com']);
+
+      assert.equal(Links.find().count(), 1);
+    })
+    it('insert link method validation', function () {
+      const addLink = Meteor.server.method_handlers['links.insert'];
+
+      let errors = 0;
+
+      // Check url is String
+      try {
+        addLink.apply({}, ['meteor.com', 2]);
+      } catch (e) {
+        errors++;
+      }
+      // Check title is String
+      try {
+        addLink.apply({}, [1, 'meteor.com']);
+      } catch (e) {
+        errors++;
+      }
+      // Check url is valid
+      try {
+        addLink.apply({}, ['meteor.com', 'meteor.com']);
+      } catch (e) {
+        errors++;
+      }
+
+      assert.equal(errors, 3);
+    })
+  })
+}
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
new file mode 100644
index 0000000000..62dd32ae1e
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -0,0 +1,10 @@
+//All links-related publications
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from '../links.js';
+
+Meteor.publish({
+  'links.all': function () {
+    return Links.find({});
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
new file mode 100644
index 0000000000..7b29ab376b
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -0,0 +1,27 @@
+// Tests for the links publications
+//
+// https://guide.meteor.com/testing.html
+
+import { Meteor } from 'meteor/meteor';
+import { assert } from 'meteor/practicalmeteor:chai';
+import { Links } from '../links.js';
+import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
+import './publications.js';
+
+describe('links publications', function () {
+
+  beforeEach(() => {
+    Links.remove({});
+    Links.insert({ title: 'meteor homepage', url: 'https://www.meteor.com'});
+  })
+
+  describe('links.all', function () {
+    it('sends all links', function (done) {
+      const collector = new PublicationCollector();
+      collector.collect('links.all', (collections) => {
+        assert.equal(collections.links.length, 1);
+        done();
+      });
+    });
+  });
+})
diff --git a/tools/static-assets/skel-full/imports/startup/both/index.js b/tools/static-assets/skel-full/imports/startup/both/index.js
new file mode 100644
index 0000000000..22b9c1af13
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/both/index.js
@@ -0,0 +1 @@
+// Import modules used by both client and server through a single index entry point (i.e. useraccounts configuration file).
diff --git a/tools/static-assets/skel-full/imports/startup/client/index.js b/tools/static-assets/skel-full/imports/startup/client/index.js
new file mode 100644
index 0000000000..fd8ca6b7bd
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/client/index.js
@@ -0,0 +1,3 @@
+// Import client startup through a single index entry point
+
+import './routes.js';
diff --git a/tools/static-assets/skel-full/imports/startup/client/routes.js b/tools/static-assets/skel-full/imports/startup/client/routes.js
new file mode 100644
index 0000000000..df5f472d6d
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/client/routes.js
@@ -0,0 +1,21 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
+// Import needed templates
+import '../../ui/layouts/body/body.js';
+import '../../ui/pages/home/home.js';
+import '../../ui/pages/not-found/not-found.js';
+
+// Set up all routes in the app
+FlowRouter.route('/', {
+  name: 'App.home',
+  action() {
+    BlazeLayout.render('App_body', { main: 'App_home' });
+  },
+});
+
+FlowRouter.notFound = {
+  action() {
+    BlazeLayout.render('App_body', { main: 'App_notFound' });
+  },
+};
diff --git a/tools/static-assets/skel-full/imports/startup/server/fixtures.js b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
new file mode 100644
index 0000000000..c60a6960c1
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
@@ -0,0 +1,37 @@
+// Fill the DB with example data on startup
+
+import { Meteor } from 'meteor/meteor';
+import { Links } from '../../api/links/links.js';
+
+Meteor.startup(() => {
+
+  // if the Links collection is empty
+  if (Links.find().count() === 0) {
+    const data = [
+      {
+        'title': 'Do the Tutorial',
+        'url': 'https://www.meteor.com/try',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Follow the Guide',
+        'url': 'http://guide.meteor.com',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Read the Docs',
+        'url': 'https://docs.meteor.com',
+        'createdAt': new Date()
+      },
+      {
+        'title': 'Discussions',
+        'url': 'https://forums.meteor.com',
+        'createdAt': new Date()
+      },
+    ];
+
+    data.forEach((link) => {
+      Links.insert(link);
+    });
+  }
+});
diff --git a/tools/static-assets/skel-full/imports/startup/server/index.js b/tools/static-assets/skel-full/imports/startup/server/index.js
new file mode 100644
index 0000000000..4b8e0a0865
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/index.js
@@ -0,0 +1,4 @@
+// Import server startup through a single index entry point
+
+import './fixtures.js';
+import './register-api.js';
diff --git a/tools/static-assets/skel-full/imports/startup/server/register-api.js b/tools/static-assets/skel-full/imports/startup/server/register-api.js
new file mode 100644
index 0000000000..79e834f4ac
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/startup/server/register-api.js
@@ -0,0 +1,4 @@
+// Register your apis here
+
+import '../../api/links/methods.js';
+import '../../api/links/server/publications.js';
diff --git a/tools/static-assets/skel-full/imports/ui/components/hello/hello.html b/tools/static-assets/skel-full/imports/ui/components/hello/hello.html
new file mode 100644
index 0000000000..58bd0b35d6
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/hello/hello.html
@@ -0,0 +1,4 @@
+<template name="hello">
+  <button>Click Me</button>
+  <p>You've pressed the button {{counter}} times.</p>
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/hello/hello.js b/tools/static-assets/skel-full/imports/ui/components/hello/hello.js
new file mode 100644
index 0000000000..e4aff73a79
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/hello/hello.js
@@ -0,0 +1,19 @@
+import './hello.html';
+
+Template.hello.onCreated(function helloOnCreated() {
+  // counter starts at 0
+  this.counter = new ReactiveVar(0);
+});
+
+Template.hello.helpers({
+  counter() {
+    return Template.instance().counter.get();
+  },
+});
+
+Template.hello.events({
+  'click button'(event, instance) {
+    // increment the counter when button is clicked
+    instance.counter.set(instance.counter.get() + 1);
+  },
+});
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.html b/tools/static-assets/skel-full/imports/ui/components/info/info.html
new file mode 100644
index 0000000000..6c2a10a61b
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.html
@@ -0,0 +1,15 @@
+<template name="info">
+  <h2>Learn Meteor!</h2>
+  <ul>
+    <li>
+      <form class="info-link-add">
+        <input type="text" name="title" placeholder="Title" required>
+        <input type="url" name="url" placeholder="Url" required>
+        <input type="submit" name="submit" value="Add new link">
+      </form>
+    </li>
+  {{#each links}}
+    <li><a href="{{url}}" target="_blank">{{title}}</a></li>
+  {{/each}}
+  </ul>
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
new file mode 100644
index 0000000000..de5ce70014
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -0,0 +1,33 @@
+import './info.html';
+import { Links } from '/imports/api/links/links.js'
+import { Meteor } from 'meteor/meteor'
+
+Template.info.onCreated(function infoOnCreated() {
+  Meteor.subscribe('links.all');
+});
+
+Template.info.helpers({
+  links() {
+    return Links.find({});
+  },
+});
+
+Template.info.events({
+  'submit .info-link-add': function (e){
+    e.preventDefault();
+
+    const target = e.target;
+    const title = target.title;
+    const url = target.url;
+
+    Meteor.call('links.insert', title.value, url.value, function (error) {
+      if(error){
+        alert(error.error);
+      }
+      else{
+        title.value = '';
+        url.value = '';
+      }
+    });
+  }
+})
diff --git a/tools/static-assets/skel-full/imports/ui/layouts/body/body.html b/tools/static-assets/skel-full/imports/ui/layouts/body/body.html
new file mode 100644
index 0000000000..4a8480d6c3
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/layouts/body/body.html
@@ -0,0 +1,3 @@
+<template name="App_body">
+  {{> Template.dynamic template=main}}
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/layouts/body/body.js b/tools/static-assets/skel-full/imports/ui/layouts/body/body.js
new file mode 100644
index 0000000000..2da6810f1f
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/layouts/body/body.js
@@ -0,0 +1 @@
+import './body.html';
diff --git a/tools/static-assets/skel-full/imports/ui/pages/home/home.html b/tools/static-assets/skel-full/imports/ui/pages/home/home.html
new file mode 100644
index 0000000000..8b2e47142f
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/home/home.html
@@ -0,0 +1,4 @@
+<template name="App_home">
+  {{> hello}}
+  {{> info}}
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/pages/home/home.js b/tools/static-assets/skel-full/imports/ui/pages/home/home.js
new file mode 100644
index 0000000000..f97ae7b7ec
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/home/home.js
@@ -0,0 +1,4 @@
+import './home.html';
+
+import '../../components/hello/hello.js';
+import '../../components/info/info.js';
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
new file mode 100644
index 0000000000..4bfc6fe2a8
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
@@ -0,0 +1,12 @@
+<template name="App_notFound">
+  <div id="not-found">
+    <div class="not-found-image">
+      <img src="/img/404.svg" alt="" />
+    </div>
+    <div class="not-found-title">
+      <h1>Sorry, that page doesn't exist</h1>
+      <a href="/" class="gotohomepage">Go to home</a>
+    </div>
+  </div>
+
+</template>
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
new file mode 100644
index 0000000000..f252259132
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.js
@@ -0,0 +1 @@
+import './not-found.html';
diff --git a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
new file mode 100644
index 0000000000..12e840d5b8
--- /dev/null
+++ b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
@@ -0,0 +1,35 @@
+#not-found{
+  width: 700px;
+  margin: 0 auto;
+  .not-found-image{
+    width: 25%;
+    float: left;
+  }
+  .not-found-title{
+    width: 70%;
+    float: right;
+    background: url(/img/bg-footer.svg);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;
+    min-height: 400px;
+    h1{
+      font-size: 30px;
+      color: #1f2128;
+      margin-bottom: 20px;
+      margin-top: 155px;
+    }
+    a.gotohomepage{
+      background-color: #de4f4f;
+      color: #fff;
+      width: 180px;
+      line-height: 40px;
+      display: block;
+      text-align: center;
+      font-size: 14px;
+      text-decoration: none;
+      text-transform: uppercase;
+      height: 40px;
+    }
+  }
+}
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
new file mode 100644
index 0000000000..509ac7e54f
--- /dev/null
+++ b/tools/static-assets/skel-full/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "~name~",
+  "private": true,
+  "scripts": {
+    "start": "meteor run"
+  },
+  "dependencies": {
+    "meteor-node-stubs": "~0.2.0"
+  }
+}
diff --git a/tools/static-assets/skel-full/private/README.md b/tools/static-assets/skel-full/private/README.md
new file mode 100644
index 0000000000..2071259f55
--- /dev/null
+++ b/tools/static-assets/skel-full/private/README.md
@@ -0,0 +1,3 @@
+**private folder**
+
+All files inside a top-level directory called `private/` are only accessible from server code and can be loaded via the [`Assets`](http://docs.meteor.com/#/full/assets_getText) API. This can be used for private data files and any files that are in your project directory that you don't want to be accessible from the outside.
diff --git a/tools/static-assets/skel-full/public/img/404.svg b/tools/static-assets/skel-full/public/img/404.svg
new file mode 100644
index 0000000000..53fa7e7bf9
--- /dev/null
+++ b/tools/static-assets/skel-full/public/img/404.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 213.4 496.9" style="enable-background:new 0 0 213.4 496.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#576492;}
+	.st1{fill:#697089;}
+	.st2{font-family:'ProximaNova-Light';}
+	.st3{font-size:16.6919px;}
+	.st4{font-size:47px;}
+	.st5{fill:none;stroke:#576492;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<g id="XMLID_20_">
+	<g id="XMLID_18_">
+		<path id="XMLID_19_" class="st0" d="M117.8,456.3l-7.8-20l-32.3,12.6l-1.3-3.4l13.8-57.2l4.3-1.7l17.6,45.3l10.4-4l1.2,3.1
+			l-10.4,4l7.8,20L117.8,456.3z M92.7,391.6l-12.5,52.8l28.7-11.2L92.7,391.6z"/>
+	</g>
+	<g id="XMLID_14_">
+		<path id="XMLID_15_" class="st0" d="M98.7,282l7.6-20.1l-32.4-12.2l1.3-3.4l48.4-33.4l4.3,1.6l-17.1,45.5l10.4,3.9l-1.2,3.1
+			l-10.4-3.9l-7.6,20.1L98.7,282z M123.1,217l-44.6,31l28.8,10.8L123.1,217z"/>
+	</g>
+	<g id="XMLID_25_">
+		<text id="XMLID_70_" transform="matrix(1.1336 0 0 1 43.3333 248.7083)" class="st1 st2 st3">+</text>
+		<text id="XMLID_102_" transform="matrix(1.1336 0 0 1 12.8275 227.8912)" class="st1 st2 st3">+</text>
+		<text id="XMLID_105_" transform="matrix(1.1336 0 0 1 -1.831055e-04 151.8095)" class="st1 st2 st3">+</text>
+		<text id="XMLID_103_" transform="matrix(1.1336 0 0 1 191.9995 71.0848)" class="st1 st2 st3">+</text>
+		<text id="XMLID_104_" transform="matrix(1.1336 0 0 1 191.9999 228.4598)" class="st1 st2 st3">+</text>
+		<text id="XMLID_101_" transform="matrix(1 0 0 1 65.7456 228.4598)" class="st1 st2 st4">.</text>
+		<text id="XMLID_108_" transform="matrix(1 0 0 1 8.4122 170.9184)" class="st1 st2 st4">.</text>
+		<text id="XMLID_109_" transform="matrix(1 0 0 1 177.2454 223.6633)" class="st1 st2 st4">.</text>
+		<text id="XMLID_110_" transform="matrix(1 0 0 1 203.079 207.7512)" class="st1 st2 st4">.</text>
+		<text id="XMLID_106_" transform="matrix(1.1336 0 0 1 48.1553 408.8952)" class="st1 st2 st3">+</text>
+		<text id="XMLID_118_" transform="matrix(1.1336 0 0 1 68.7441 292.113)" class="st1 st2 st3">+</text>
+		<text id="XMLID_100_" transform="matrix(1 0 0 1 66.4658 394.8952)" class="st1 st2 st4">.</text>
+		<text id="XMLID_99_" transform="matrix(1 0 0 1 49.9659 298.7329)" class="st1 st2 st4">.</text>
+		<text id="XMLID_117_" transform="matrix(1.1336 0 0 1 140.082 372.895)" class="st1 st2 st3">+</text>
+		<text id="XMLID_116_" transform="matrix(1 0 0 1 125.3273 388.8376)" class="st1 st2 st4">.</text>
+		<text id="XMLID_115_" transform="matrix(1 0 0 1 160.0616 383.28)" class="st1 st2 st4">.</text>
+		<text id="XMLID_114_" transform="matrix(1.1336 0 0 1 17.7247 59.883)" class="st1 st2 st3">+</text>
+		<text id="XMLID_113_" transform="matrix(1 0 0 1 2.9702 55.0865)" class="st1 st2 st4">.</text>
+		<text id="XMLID_107_" transform="matrix(1 0 0 1 28.8038 39.1744)" class="st1 st2 st4">.</text>
+		<text id="XMLID_111_" transform="matrix(1 0 0 1 179.2975 90.645)" class="st1 st2 st4">.</text>
+		<text id="XMLID_112_" transform="matrix(1 0 0 1 145.079 261.77)" class="st1 st2 st4">.</text>
+		<g id="XMLID_26_">
+			<path id="XMLID_56_" class="st0" d="M169.5,120h-143v-1c0-39.4,32.1-71.5,71.5-71.5s71.5,32.1,71.5,71.5V120z M28.5,118h139
+				C166.9,80.2,136,49.5,98,49.5S29,80.2,28.5,118z"/>
+			<path id="XMLID_29_" class="st0" d="M185,127.8H11v-1c0-48,39-87,87-87s87,39,87,87V127.8z M13,125.8h170
+				c-0.5-46.4-38.5-84-85-84S13.5,79.4,13,125.8z"/>
+			<path id="XMLID_30_" class="st0" d="M170.3,161.5H25.7c-7.1,0-12.8-5.8-12.8-12.8c0-7.1,5.8-12.8,12.8-12.8h144.7
+				c7.1,0,12.8,5.8,12.8,12.8C183.2,155.8,177.4,161.5,170.3,161.5z M25.7,137.9c-6,0-10.8,4.9-10.8,10.8s4.9,10.8,10.8,10.8h144.7
+				c6,0,10.8-4.9,10.8-10.8s-4.9-10.8-10.8-10.8H25.7z"/>
+			<path id="XMLID_32_" class="st0" d="M19.1,139.3c-6.9-5.2-8-12.1-8.1-12.4l2-0.3c0,0.1,1.1,6.4,7.3,11.1L19.1,139.3z"/>
+			<path id="XMLID_34_" class="st0" d="M176.9,139.3l-1.2-1.6c6.2-4.7,7.3-11,7.3-11.1l2,0.3C184.9,127.2,183.8,134.1,176.9,139.3z"
+				/>
+			<path id="XMLID_35_" class="st0" d="M108.2,172.6H86.1c-6.7,0-12.1-5.4-12.1-12.1v-1h46.3v1C120.3,167.2,114.9,172.6,108.2,172.6
+				z M76,161.5c0.5,5.1,4.8,9.1,10,9.1h22.2c5.2,0,9.5-4,10-9.1H76z"/>
+			
+				<rect id="XMLID_36_" x="36.4" y="157.5" transform="matrix(0.8275 0.5614 -0.5614 0.8275 104.7897 9.2067)" class="st0" width="2" height="35.3"/>
+			
+				<rect id="XMLID_37_" x="140" y="174.2" transform="matrix(0.5651 0.825 -0.825 0.5651 213.0817 -53.9113)" class="st0" width="35.4" height="2"/>
+			<path id="XMLID_72_" class="st0" d="M98,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C103.3,151.6,100.9,154,98,154z M98,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S99.8,145.4,98,145.4z"/>
+			<path id="XMLID_71_" class="st0" d="M78.3,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C83.7,151.6,81.3,154,78.3,154z M78.3,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S80.2,145.4,78.3,145.4z"/>
+			<path id="XMLID_73_" class="st0" d="M116,154c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+				C121.3,151.6,118.9,154,116,154z M116,145.4c-1.8,0-3.3,1.5-3.3,3.3s1.5,3.3,3.3,3.3s3.3-1.5,3.3-3.3S117.8,145.4,116,145.4z"/>
+			<rect id="XMLID_80_" x="56" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_134_" x="35.4" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_81_" x="125.5" y="147.7" class="st0" width="12.8" height="2"/>
+			<rect id="XMLID_126_" x="143.3" y="147.7" class="st0" width="12.8" height="2"/>
+			
+				<rect id="XMLID_57_" x="69.7" y="166.9" transform="matrix(0.8603 0.5097 -0.5097 0.8603 110.3682 -8.4804)" class="st0" width="2" height="60.5"/>
+			
+				<rect id="XMLID_82_" x="93.5" y="196.2" transform="matrix(0.51 0.8602 -0.8602 0.51 230.2202 -9.8254)" class="st0" width="60.5" height="2"/>
+			<path id="XMLID_127_" class="st0" d="M164.2,44.8c-4.7,0-9.4-1.8-13-5.4c-7.2-7.2-7.2-18.8,0-26l0.7-0.7l26,26l-0.7,0.7
+				C173.7,43,168.9,44.8,164.2,44.8z M152,15.6c-5.7,6.4-5.5,16.3,0.7,22.5c6.2,6.2,16,6.4,22.5,0.7L152,15.6z"/>
+			<path id="XMLID_128_" class="st0" d="M170.1,33.7L157,20.6l0.7-0.7c3.6-3.6,9.5-3.6,13.1,0c3.6,3.6,3.6,9.5,0,13.1L170.1,33.7z
+				 M159.9,20.7L170,30.8c2.1-2.8,1.9-6.9-0.7-9.5S162.7,18.5,159.9,20.7z"/>
+			<polygon id="XMLID_129_" class="st0" points="144.5,54.3 142.5,54.3 142.5,43.3 151.4,37.9 152.4,39.6 144.5,44.4 			"/>
+			<path id="XMLID_135_" class="st5" d="M152,33.7c-1.3-2.1-2.1-4.6-2.1-7.3c0-2,0.4-3.9,1.2-5.5"/>
+			<path id="XMLID_136_" class="st5" d="M142.8,70.4c0.5,0.5,1.1,1,1.6,1.6c2.4,2.4,4.6,5,6.5,7.7"/>
+			<path id="XMLID_31_" class="st5" d="M98,52.6c13.9,0,26.7,4.3,37.3,11.7c1.8,1.3,3.5,2.6,5.2,4"/>
+			<path id="XMLID_33_" class="st0" d="M24.5,209.2c-5.9,0-10.7-4.8-10.7-10.7c0-5.9,4.8-10.7,10.7-10.7c5.9,0,10.7,4.8,10.7,10.7
+				C35.2,204.4,30.4,209.2,24.5,209.2z M24.5,189.8c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7s8.7-3.9,8.7-8.7S29.3,189.8,24.5,189.8z
+				"/>
+			<path id="XMLID_64_" class="st0" d="M171.5,209.2c-5.9,0-10.7-4.8-10.7-10.7c0-5.9,4.8-10.7,10.7-10.7c5.9,0,10.7,4.8,10.7,10.7
+				C182.2,204.4,177.4,209.2,171.5,209.2z M171.5,189.8c-4.8,0-8.7,3.9-8.7,8.7s3.9,8.7,8.7,8.7s8.7-3.9,8.7-8.7
+				S176.3,189.8,171.5,189.8z"/>
+		</g>
+		<g id="XMLID_27_">
+			<path id="XMLID_83_" class="st0" d="M111.4,311.1c-1.3,0-2.6-0.1-3.9-0.4c-2.7-0.6-5.1-1.7-6.8-3.1c-1.9-1.6-2.7-3.3-2.4-5
+				c0.4-1.7,1.9-3,4.2-3.6c2.1-0.6,4.8-0.6,7.4,0c5.8,1.3,9.8,4.8,9.1,8.1c-0.4,1.7-1.9,3-4.2,3.6
+				C113.8,310.9,112.6,311.1,111.4,311.1z M106.1,300.5c-1.1,0-2.1,0.1-3,0.4c-1.6,0.4-2.6,1.2-2.8,2.1s0.4,2,1.7,3.1
+				c1.5,1.2,3.6,2.1,5.9,2.7c2.4,0.5,4.7,0.5,6.5,0c1.6-0.4,2.6-1.2,2.8-2.1l0,0c0.4-1.8-2.6-4.7-7.6-5.7
+				C108.4,300.6,107.2,300.5,106.1,300.5z"/>
+			<path id="XMLID_85_" class="st0" d="M92.5,369.7c-5.2,0-9.5-4.3-9.5-9.5s4.3-9.5,9.5-9.5s9.5,4.3,9.5,9.5S97.7,369.7,92.5,369.7z
+				 M92.5,352.7c-4.1,0-7.5,3.4-7.5,7.5s3.4,7.5,7.5,7.5s7.5-3.4,7.5-7.5S96.6,352.7,92.5,352.7z"/>
+			<path id="XMLID_84_" class="st0" d="M121.4,341.9c-2.9,0-5.2-2.4-5.2-5.2c0-2.9,2.4-5.2,5.2-5.2s5.2,2.4,5.2,5.2
+				C126.7,339.6,124.3,341.9,121.4,341.9z M121.4,333.4c-1.8,0-3.2,1.5-3.2,3.2s1.5,3.2,3.2,3.2c1.8,0,3.2-1.5,3.2-3.2
+				S123.2,333.4,121.4,333.4z"/>
+			<path id="XMLID_87_" class="st0" d="M69.2,329.9c-0.7,0-1.4-0.2-2-0.5c-3.1-1.6-3.6-6.4-1.3-11l0,0c2.3-4.6,6.6-7,9.6-5.5
+				c3.1,1.6,3.6,6.4,1.3,11C75,327.6,71.9,329.9,69.2,329.9z M73.5,314.5c-1.9,0-4.4,1.9-5.8,4.9l0,0c-1.8,3.5-1.6,7.3,0.4,8.3
+				c2,1,5.2-1.1,7-4.6c1.8-3.5,1.6-7.3-0.4-8.3C74.3,314.6,73.9,314.5,73.5,314.5z"/>
+			<path id="XMLID_86_" class="st0" d="M98,383.3c-16.5,0-31.4-8.4-39.9-22.5l-0.5-0.8l0.8-0.5c1.9-1.2,3.1-3.3,3.1-5.6
+				c0-3.7-3-6.6-6.6-6.6c-0.4,0-0.8,0-1.2,0.1l-1,0.2l-0.2-1c-0.7-3.2-1.1-6.6-1.1-9.8c0-25.7,20.9-46.6,46.6-46.6
+				c19.5,0,37.1,12.3,43.8,30.6l0.4,1.2L141,322c-2.9,0.4-4.8,4.2-4.2,8.5c0.6,4.3,3.4,7.5,6.4,7.1l0.2-0.1l1.2-0.3l-0.1,1.3
+				C143.5,363.6,123.1,383.3,98,383.3z M60.3,360.5c8.2,13,22.3,20.8,37.7,20.8c23.6,0,43-18.2,44.5-41.6c-3.7-0.1-7.1-3.8-7.7-8.8
+				c-0.7-4.8,1.4-9.2,4.8-10.5c-6.7-16.9-23.2-28.2-41.5-28.2c-24.6,0-44.6,20-44.6,44.6c0,2.8,0.3,5.7,0.8,8.5
+				c5.1-0.4,9.3,3.6,9.3,8.6C63.5,356.4,62.3,358.9,60.3,360.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/tools/static-assets/skel-full/public/img/bg-footer.svg b/tools/static-assets/skel-full/public/img/bg-footer.svg
new file mode 100644
index 0000000000..9169356de7
--- /dev/null
+++ b/tools/static-assets/skel-full/public/img/bg-footer.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid" width="1524" height="942" viewBox="0 0 1524 942">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #a9a8c3;
+        opacity: 0.2;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path d="M1523.556,541.539 C1522.707,543.791 1520.194,544.931 1517.935,544.074 C1517.924,544.070 1517.914,544.066 1517.904,544.062 C1515.658,543.210 1514.544,540.696 1515.378,538.470 C1516.238,536.204 1518.753,535.064 1521.020,535.924 C1521.020,535.924 1521.034,535.929 1521.041,535.931 C1523.280,536.781 1524.407,539.295 1523.556,541.539 ZM1509.627,429.311 C1507.382,428.459 1506.245,425.948 1507.098,423.699 C1507.956,421.438 1510.462,420.297 1512.721,421.154 C1514.972,422.007 1516.117,424.519 1515.259,426.781 C1514.414,429.035 1511.892,430.170 1509.627,429.311 ZM1317.983,624.824 C1315.719,623.965 1314.580,621.455 1315.439,619.192 C1316.291,616.944 1318.801,615.816 1321.059,616.658 C1323.312,617.513 1324.453,620.025 1323.609,622.279 C1322.757,624.541 1320.234,625.678 1317.983,624.824 ZM1379.476,494.094 C1379.469,494.091 1379.464,494.089 1379.457,494.087 C1377.216,493.237 1376.077,490.718 1376.928,488.473 C1377.785,486.213 1380.294,485.086 1382.558,485.931 C1384.809,486.785 1385.936,489.305 1385.096,491.540 C1384.237,493.805 1381.729,494.948 1379.476,494.094 ZM1389.501,573.661 C1388.657,575.900 1386.144,577.038 1383.886,576.181 C1383.876,576.178 1383.865,576.174 1383.855,576.170 C1381.624,575.323 1380.485,572.803 1381.335,570.563 C1382.186,568.319 1384.712,567.177 1386.961,568.030 C1389.214,568.884 1390.359,571.399 1389.501,573.661 ZM1438.188,747.839 C1436.593,747.234 1435.561,745.796 1435.388,744.211 L1323.511,755.123 C1323.518,755.646 1323.429,756.180 1323.234,756.700 C1322.437,758.802 1320.209,759.923 1318.093,759.384 L1258.839,929.054 L1259.208,931.875 C1260.513,933.041 1261.036,934.928 1260.381,936.670 C1260.265,936.976 1260.118,937.263 1259.945,937.526 L1262.344,955.899 C1263.011,955.910 1263.687,956.035 1264.347,956.286 C1267.418,957.450 1268.961,960.880 1267.799,963.944 C1266.635,967.012 1263.207,968.552 1260.136,967.387 C1258.938,966.932 1257.972,966.132 1257.308,965.142 L1213.334,988.325 L1160.343,1053.171 L1160.211,1053.341 L1106.384,1044.709 L963.297,1120.145 C964.341,1119.636 965.587,1119.543 966.761,1119.988 C969.019,1120.844 970.156,1123.355 969.303,1125.603 C968.457,1127.860 965.933,1129.000 963.680,1128.154 C963.676,1128.152 963.673,1128.151 963.669,1128.149 C961.415,1127.294 960.278,1124.780 961.135,1122.520 C961.505,1121.533 962.197,1120.761 963.049,1120.276 L916.216,1144.966 C916.833,1146.507 916.894,1148.273 916.260,1149.946 C914.912,1153.500 910.944,1155.285 907.387,1153.936 C906.753,1153.695 906.177,1153.373 905.664,1152.984 L724.719,1343.803 C726.156,1345.638 726.630,1348.155 725.744,1350.489 C724.399,1354.035 720.415,1355.817 716.858,1354.468 C713.301,1353.119 711.517,1349.149 712.862,1345.603 C712.900,1345.503 712.940,1345.404 712.981,1345.307 L617.154,1264.137 L552.637,1310.656 C553.291,1311.757 553.456,1313.133 552.967,1314.423 C552.111,1316.679 549.595,1317.811 547.338,1316.964 L547.329,1316.960 C545.075,1316.105 543.941,1313.592 544.795,1311.340 C545.001,1310.796 545.302,1310.317 545.673,1309.914 L369.406,1114.144 C368.252,1115.004 366.695,1115.275 365.250,1114.726 C362.997,1113.872 361.852,1111.368 362.713,1109.099 C363.562,1106.859 366.077,1105.722 368.329,1106.577 L368.337,1106.580 C368.350,1106.584 368.362,1106.589 368.373,1106.593 L427.439,988.118 C427.110,987.916 426.815,987.674 426.558,987.402 L345.993,1050.727 C346.726,1051.855 346.934,1053.306 346.422,1054.655 C345.569,1056.904 343.058,1058.037 340.791,1057.187 L340.780,1057.182 C338.531,1056.329 337.409,1053.818 338.245,1051.562 C338.648,1050.498 339.424,1049.681 340.370,1049.208 L290.884,923.521 L203.162,898.883 C202.312,901.124 199.794,902.254 197.547,901.402 C197.547,901.402 197.531,901.396 197.523,901.393 C195.269,900.538 194.154,898.028 194.987,895.779 C195.793,893.654 198.091,892.521 200.241,893.115 L238.339,792.205 C236.328,791.236 235.370,788.860 236.165,786.733 C236.191,786.663 236.219,786.592 236.250,786.524 L105.271,714.442 C104.094,715.562 102.334,715.983 100.705,715.365 C98.454,714.511 97.325,711.995 98.168,709.735 C98.819,708.021 100.435,706.952 102.169,706.921 L112.208,593.076 C111.974,593.030 111.740,592.964 111.509,592.877 C109.258,592.023 108.130,589.506 108.970,587.257 C109.826,585.000 112.338,583.865 114.591,584.720 C114.594,584.721 114.598,584.723 114.598,584.723 C115.939,585.231 116.884,586.324 117.250,587.599 L246.130,556.008 C246.021,555.295 246.088,554.545 246.362,553.823 C247.206,551.558 249.730,550.429 251.998,551.282 C253.657,551.911 254.714,553.439 254.813,555.106 L263.517,555.373 L260.619,491.881 C260.380,491.822 260.141,491.748 259.906,491.659 C256.823,490.490 255.278,487.063 256.441,483.996 C257.605,480.927 261.034,479.388 264.117,480.557 C264.574,480.731 264.999,480.955 265.385,481.221 L771.964,149.543 C771.229,148.103 771.082,146.371 771.701,144.740 C772.864,141.672 776.294,140.130 779.367,141.296 C782.432,142.458 783.977,145.887 782.813,148.955 C782.377,150.105 781.623,151.039 780.690,151.699 L861.240,311.716 C862.422,311.383 863.719,311.413 864.958,311.883 C868.030,313.048 869.576,316.476 868.412,319.543 C867.894,320.911 866.918,321.978 865.720,322.634 L900.241,432.882 L952.362,396.866 C951.744,395.778 951.594,394.432 952.072,393.167 C952.910,390.932 955.448,389.781 957.698,390.634 C957.922,390.719 958.135,390.821 958.337,390.937 L1059.222,248.007 C1057.957,246.833 1057.456,244.976 1058.106,243.264 C1058.957,241.019 1061.481,239.880 1063.731,240.734 C1065.985,241.589 1067.135,244.103 1066.282,246.351 C1066.073,246.903 1065.765,247.387 1065.388,247.791 L1169.330,359.105 C1170.490,358.205 1172.077,357.913 1173.547,358.470 C1173.795,358.565 1174.028,358.679 1174.248,358.810 L1203.473,318.850 L1394.136,434.286 C1395.251,433.588 1396.667,433.405 1397.997,433.909 C1398.006,433.913 1398.017,433.917 1398.026,433.920 C1400.267,434.771 1401.396,437.277 1400.547,439.530 C1399.697,441.772 1397.176,442.903 1394.923,442.060 C1394.350,441.843 1393.848,441.517 1393.432,441.116 L1274.883,574.446 L1274.753,574.597 L1188.483,567.100 C1188.435,567.359 1188.364,567.618 1188.267,567.873 C1187.428,570.130 1184.896,571.266 1182.645,570.412 C1181.812,570.096 1181.131,569.553 1180.646,568.880 L1167.908,576.405 L1207.736,588.137 C1208.986,585.234 1212.323,583.807 1215.313,584.941 C1218.375,586.102 1219.919,589.531 1218.756,592.600 C1218.136,594.234 1216.872,595.435 1215.363,596.025 L1226.767,683.382 L1370.869,675.355 C1370.905,674.972 1370.990,674.588 1371.133,674.212 C1371.979,671.961 1374.510,670.822 1376.780,671.669 C1379.017,672.517 1380.164,675.046 1379.311,677.295 C1379.091,677.877 1378.759,678.383 1378.352,678.801 L1437.297,740.124 C1438.430,739.368 1439.898,739.150 1441.269,739.670 C1443.528,740.527 1444.667,743.038 1443.820,745.291 C1442.962,747.552 1440.445,748.695 1438.188,747.839 ZM1317.343,759.121 C1315.260,758.169 1314.239,755.770 1315.052,753.610 C1315.148,753.359 1315.265,753.121 1315.399,752.898 L1227.431,688.466 L1258.607,927.278 L1317.343,759.121 ZM1260.825,956.070 L1258.576,938.846 C1257.468,939.518 1256.069,939.693 1254.757,939.195 L1254.746,939.191 C1254.427,939.070 1254.131,938.916 1253.859,938.733 L1244.709,949.932 L1257.763,957.934 C1258.572,957.006 1259.648,956.361 1260.825,956.070 ZM766.756,530.020 C766.261,530.027 765.758,529.950 765.265,529.780 L747.308,569.905 L770.252,561.239 L766.755,530.020 C766.755,530.020 766.756,530.020 766.756,530.020 ZM772.756,411.000 C772.167,412.554 770.779,413.580 769.233,413.781 L769.123,419.442 L858.638,321.617 C858.354,321.331 858.102,321.017 857.884,320.683 L790.357,348.409 L799.218,375.558 L772.006,406.629 C772.995,407.803 773.338,409.467 772.756,411.000 ZM770.222,405.365 C770.678,405.538 771.090,405.781 771.447,406.077 L798.318,375.371 L789.619,348.712 L733.643,371.695 L742.935,381.512 L766.074,405.948 C767.226,405.095 768.779,404.831 770.222,405.365 ZM267.801,487.411 L565.703,634.127 C566.926,632.122 569.230,631.033 571.544,631.339 L579.781,600.708 L557.166,489.709 C556.504,489.782 555.816,489.704 555.150,489.452 C552.884,488.592 551.760,486.067 552.595,483.830 C553.453,481.569 555.963,480.442 558.223,481.279 C558.517,481.391 558.790,481.530 559.045,481.692 L608.428,418.160 L267.709,484.446 C267.984,485.390 268.028,486.406 267.801,487.411 ZM407.743,764.699 C406.888,766.953 404.375,768.090 402.123,767.236 L402.114,767.233 C401.101,766.848 400.314,766.131 399.831,765.254 L351.339,801.257 L357.564,819.124 C358.243,819.041 358.951,819.117 359.635,819.377 C359.641,819.380 359.646,819.382 359.652,819.383 C360.802,819.820 361.658,820.684 362.109,821.726 L429.375,811.301 C429.335,810.700 429.418,810.080 429.642,809.478 C430.496,807.227 433.024,806.101 435.274,806.946 C436.392,807.370 437.238,808.203 437.702,809.208 L575.339,760.688 L570.183,643.139 C569.677,643.088 569.169,642.969 568.671,642.780 C567.865,642.475 567.165,642.013 566.591,641.443 L406.775,760.099 C407.927,761.272 408.359,763.053 407.743,764.699 ZM365.656,703.249 C366.454,701.179 368.653,700.047 370.757,700.552 L411.926,616.560 L362.680,559.210 L265.087,556.205 L267.483,608.663 L277.520,640.867 L288.727,676.806 C289.519,676.636 290.369,676.686 291.188,676.994 C293.443,677.849 294.583,680.366 293.729,682.617 C293.405,683.469 292.844,684.160 292.149,684.645 L337.012,762.610 C338.034,762.140 339.236,762.063 340.373,762.494 C340.380,762.497 340.386,762.499 340.393,762.502 L367.010,708.196 C365.586,707.048 364.979,705.062 365.656,703.249 ZM334.754,765.028 C335.074,764.184 335.629,763.496 336.316,763.011 L291.463,685.035 C290.466,685.491 289.297,685.572 288.187,685.178 C288.187,685.178 288.184,685.178 288.182,685.177 C288.184,685.178 288.185,685.178 288.185,685.178 L273.590,716.856 L272.528,719.163 L275.313,780.144 L334.501,767.117 C334.416,766.435 334.492,765.720 334.754,765.028 ZM271.134,722.191 L242.433,784.500 C243.398,785.051 244.088,785.935 244.413,786.944 L273.794,780.478 L271.134,722.191 ZM272.448,717.420 L287.454,684.843 C285.633,683.798 284.785,681.554 285.552,679.532 C285.996,678.361 286.887,677.492 287.957,677.046 L279.501,649.914 L267.626,611.819 L272.448,717.420 ZM339.886,770.809 C339.054,771.014 338.153,770.976 337.292,770.649 C337.292,770.649 337.280,770.646 337.275,770.644 C335.986,770.154 335.063,769.120 334.674,767.900 L275.350,780.960 L278.427,848.351 C279.190,848.325 279.969,848.446 280.726,848.734 C281.576,849.056 282.309,849.549 282.901,850.158 L350.134,800.239 L339.886,770.809 ZM283.820,851.387 C284.300,852.239 284.569,853.204 284.585,854.194 L332.905,860.069 L355.216,826.729 C353.889,825.564 353.351,823.660 354.015,821.910 C354.507,820.613 355.548,819.687 356.773,819.297 L350.664,801.759 L283.820,851.387 ZM434.080,984.790 L523.928,1001.140 L578.388,896.070 C576.591,895.030 575.498,893.125 575.437,891.103 L432.690,873.749 L430.239,980.071 C430.584,980.112 430.931,980.196 431.270,980.324 C431.270,980.324 431.278,980.327 431.282,980.329 C433.158,981.040 434.252,982.894 434.080,984.790 ZM695.233,1202.861 C695.234,1202.857 695.236,1202.853 695.236,1202.853 C695.714,1201.586 696.726,1200.675 697.922,1200.274 L657.862,1030.137 C657.161,1030.235 656.429,1030.164 655.724,1029.896 C654.265,1029.343 653.271,1028.095 652.980,1026.675 L464.915,1126.374 C465.501,1127.897 465.550,1129.630 464.927,1131.274 C464.746,1131.752 464.517,1132.198 464.247,1132.610 L473.294,1140.272 L695.237,1202.849 C695.237,1202.849 695.234,1202.857 695.233,1202.861 ZM732.180,1152.561 C733.081,1150.184 735.159,1148.599 737.500,1148.214 L754.122,978.156 C753.782,978.083 753.443,977.984 753.109,977.857 C751.741,977.338 750.635,976.433 749.870,975.311 L660.372,1022.756 C661.530,1023.932 661.970,1025.714 661.349,1027.365 C660.866,1028.640 659.846,1029.557 658.641,1029.956 L698.699,1200.091 C699.404,1199.990 700.144,1200.061 700.858,1200.330 C701.495,1200.571 702.045,1200.947 702.484,1201.412 L734.779,1176.050 L736.206,1161.447 C736.198,1161.444 736.189,1161.440 736.180,1161.436 C732.623,1160.087 730.835,1156.107 732.180,1152.561 ZM824.848,1101.072 C825.232,1100.053 825.960,1099.263 826.851,1098.784 L788.875,1010.608 L759.485,977.077 C758.367,977.851 757.032,978.287 755.652,978.306 L739.052,1148.137 C739.722,1148.180 740.398,1148.323 741.059,1148.573 C743.375,1149.452 744.944,1151.446 745.385,1153.710 L764.255,1152.904 L825.270,1104.992 C824.544,1103.866 824.342,1102.424 824.848,1101.072 ZM836.263,1064.670 L790.573,1012.546 L827.578,1098.474 C828.160,1098.286 828.786,1098.218 829.413,1098.290 C829.413,1098.290 829.416,1098.290 829.417,1098.290 C829.416,1098.290 829.414,1098.289 829.414,1098.289 L829.413,1098.290 L836.263,1064.670 ZM1007.104,1027.499 C1007.627,1026.110 1008.785,1025.148 1010.126,1024.813 L1006.719,1002.811 L996.720,938.300 C996.720,938.300 996.728,938.300 996.732,938.299 C996.728,938.300 996.724,938.300 996.724,938.300 C996.122,938.337 995.508,938.250 994.910,938.025 C992.927,937.273 991.802,935.233 992.149,933.215 C992.149,933.215 992.149,933.213 992.149,933.212 L874.262,901.759 C874.262,901.759 874.254,901.779 874.250,901.789 C873.533,903.698 871.625,904.802 869.686,904.582 L864.975,927.699 L837.306,1063.534 L860.150,1089.594 L1007.007,1030.304 C1006.738,1029.415 1006.749,1028.435 1007.104,1027.499 ZM1036.878,798.788 C1036.884,798.773 1036.890,798.756 1036.896,798.740 C1036.898,798.737 1036.899,798.734 1036.899,798.734 C1036.998,798.483 1037.114,798.249 1037.249,798.030 C1037.114,798.249 1036.998,798.483 1036.900,798.731 C1036.900,798.731 1036.898,798.737 1036.896,798.740 L994.205,777.485 L984.921,785.334 C985.905,786.863 986.178,788.823 985.483,790.655 C985.443,790.761 985.400,790.865 985.354,790.968 L1033.764,820.640 L1039.200,804.313 C1037.089,803.381 1036.055,800.958 1036.878,798.788 ZM854.007,641.686 C854.250,641.037 854.632,640.482 855.108,640.040 L847.969,630.859 L798.076,714.883 C799.921,716.390 800.732,718.916 799.976,721.282 L808.934,724.590 L824.353,698.829 L855.513,646.758 C853.962,645.627 853.292,643.570 854.007,641.686 ZM738.111,445.477 L636.855,415.491 C635.758,418.096 632.963,419.543 630.242,419.012 L609.763,495.138 L686.402,509.845 L740.220,451.030 C738.592,449.703 737.767,447.582 738.111,445.477 ZM641.938,502.134 L609.552,495.922 L580.925,602.341 L584.720,620.967 L685.762,510.542 L641.938,502.134 ZM437.823,812.562 C437.199,814.209 435.688,815.259 434.036,815.373 L432.726,872.203 L575.593,889.571 C575.652,889.320 575.728,889.069 575.822,888.821 C576.648,886.646 578.621,885.234 580.791,885.015 L575.375,761.521 L437.968,809.953 C438.182,810.788 438.152,811.695 437.823,812.562 ZM866.082,898.709 C866.670,897.140 868.075,896.110 869.639,895.921 C869.639,895.921 869.647,895.921 869.651,895.920 C869.647,895.921 869.642,895.921 869.642,895.921 L869.639,895.921 L869.194,879.793 L768.685,961.718 L788.605,1007.974 L836.648,1062.782 L847.246,1010.759 L868.906,904.421 C868.811,904.391 868.714,904.358 868.618,904.322 C868.615,904.321 868.613,904.320 868.613,904.320 L868.610,904.318 C866.360,903.465 865.228,900.960 866.082,898.709 ZM874.469,900.989 L992.358,932.438 C992.363,932.426 992.367,932.415 992.371,932.404 C993.154,930.339 995.343,929.207 997.447,929.704 C997.450,929.705 997.453,929.706 997.453,929.706 C997.638,929.750 997.819,929.805 997.997,929.872 C997.819,929.805 997.638,929.750 997.457,929.706 C997.457,929.706 997.450,929.705 997.447,929.704 L1009.984,892.078 L1033.263,822.147 L984.545,792.288 C982.974,794.226 980.278,795.031 977.818,794.098 C977.062,793.812 976.398,793.386 975.843,792.864 L869.979,879.153 L870.442,895.900 C870.865,895.927 871.291,896.018 871.708,896.176 L871.723,896.181 C873.701,896.932 874.814,898.977 874.469,900.989 ZM974.870,791.669 C974.690,791.380 974.536,791.077 974.409,790.761 L871.749,817.208 C871.083,818.568 869.774,819.450 868.334,819.619 L869.925,877.208 L974.870,791.669 ZM946.673,777.094 L808.895,726.218 L794.745,749.862 C796.294,750.994 796.963,753.058 796.250,754.937 C796.129,755.260 795.973,755.559 795.788,755.833 L864.708,812.231 C865.881,811.039 867.692,810.578 869.360,811.210 C869.365,811.213 869.371,811.215 869.371,811.215 C870.331,811.579 871.081,812.239 871.566,813.049 C871.567,813.052 871.568,813.053 871.568,813.053 C871.705,813.282 871.820,813.521 871.912,813.769 C872.117,814.317 872.213,814.910 872.184,815.509 L974.023,789.275 C973.940,788.605 973.970,787.915 974.126,787.231 L947.720,777.480 L919.953,790.769 L871.912,813.769 C871.820,813.521 871.705,813.282 871.570,813.055 C871.570,813.055 871.567,813.052 871.566,813.049 L946.673,777.094 ZM790.259,757.313 C788.251,756.338 787.281,753.979 788.078,751.852 C788.089,751.825 788.098,751.800 788.108,751.773 L692.052,702.995 C690.977,704.716 688.792,705.501 686.814,704.751 C686.011,704.446 685.349,703.931 684.868,703.291 L625.662,739.795 L614.265,746.823 C614.788,747.872 614.889,749.127 614.441,750.309 C614.231,750.863 613.919,751.350 613.536,751.757 L617.898,756.677 L707.638,857.900 L757.095,845.158 L790.267,757.315 C790.267,757.315 790.265,757.315 790.265,757.314 L757.095,845.158 L790.259,757.313 ZM743.176,895.527 C742.789,896.548 742.061,897.339 741.169,897.820 L768.051,960.244 L869.141,877.847 L867.537,819.640 C867.115,819.611 866.690,819.522 866.274,819.364 C865.930,819.234 865.613,819.065 865.324,818.863 L860.861,820.013 L783.960,867.019 L743.001,892.058 C743.516,893.104 743.616,894.353 743.176,895.527 ZM742.586,891.379 L858.200,820.699 L757.374,846.674 L740.991,890.059 C741.639,890.372 742.178,890.831 742.586,891.379 ZM756.432,846.916 L708.784,859.191 L736.501,890.456 C737.555,889.689 738.929,889.405 740.247,889.776 L756.432,846.916 ZM734.988,892.441 C735.198,891.886 735.509,891.400 735.891,890.994 L707.902,859.419 L587.300,890.488 C587.354,891.210 587.277,891.952 587.052,892.678 L705.447,947.414 L736.449,897.464 C734.943,896.326 734.301,894.291 734.988,892.441 ZM706.757,858.126 L612.940,752.283 C611.789,753.126 610.250,753.390 608.817,752.851 C607.700,752.427 606.857,751.593 606.395,750.587 L576.881,760.990 L582.326,885.062 C582.711,885.125 583.096,885.228 583.475,885.372 C585.188,886.021 586.426,887.377 586.985,888.982 L706.757,858.126 ZM611.900,744.686 C611.903,744.687 611.906,744.688 611.906,744.688 C612.711,744.993 613.371,745.509 613.851,746.150 C613.852,746.151 613.852,746.153 613.852,746.153 C614.010,746.364 614.148,746.587 614.265,746.822 C614.148,746.587 614.010,746.364 613.853,746.154 C613.853,746.154 613.852,746.151 613.851,746.150 L640.002,730.023 L684.446,702.607 C683.926,701.562 683.826,700.313 684.273,699.134 C685.103,696.909 687.561,695.769 689.766,696.534 L695.260,684.256 L589.673,645.267 L609.882,744.431 C610.545,744.359 611.234,744.435 611.900,744.686 ZM758.037,844.916 L862.686,817.956 L863.904,817.211 C863.390,816.169 863.293,814.924 863.738,813.751 C863.860,813.426 864.018,813.124 864.203,812.847 L795.283,756.453 C795.284,756.453 795.285,756.450 795.285,756.450 L864.206,812.843 L795.287,756.449 C795.287,756.449 795.284,756.453 795.283,756.453 C794.198,757.554 792.568,758.029 791.009,757.596 L758.037,844.916 ZM768.045,962.239 L761.336,967.707 C762.479,969.479 762.795,971.750 761.992,973.868 C761.674,974.706 761.210,975.446 760.638,976.069 L786.907,1006.037 L768.045,962.239 ZM767.410,960.766 L740.436,898.134 C739.527,898.429 738.514,898.430 737.547,898.068 L737.534,898.063 C737.396,898.010 737.262,897.952 737.132,897.887 C737.132,897.887 737.128,897.886 737.126,897.884 C737.128,897.886 737.130,897.886 737.130,897.886 L706.181,947.753 L749.664,967.856 C751.348,965.074 754.829,963.802 757.986,964.999 C758.903,965.347 759.703,965.868 760.361,966.512 L767.410,960.766 ZM749.018,969.257 L705.363,949.071 L660.880,1020.739 L749.147,973.947 C748.574,972.493 748.491,970.841 749.018,969.257 ZM704.629,948.732 L586.417,894.072 C585.046,896.275 582.360,897.359 579.812,896.664 L525.510,1001.429 L653.049,1024.640 C653.084,1024.515 653.125,1024.391 653.170,1024.268 C654.026,1022.014 656.542,1020.883 658.803,1021.734 C658.842,1021.749 658.880,1021.763 658.917,1021.778 L659.471,1021.485 L704.629,948.732 ZM576.844,760.157 L606.128,749.833 C605.915,748.996 605.948,748.091 606.276,747.228 C606.766,745.904 607.839,744.968 609.097,744.590 L588.795,644.942 L575.932,640.193 C575.023,641.777 573.448,642.821 571.706,643.096 L576.844,760.157 ZM574.250,632.409 L584.056,621.692 L580.463,604.056 L573.018,631.730 C573.463,631.912 573.875,632.140 574.250,632.409 ZM608.039,495.631 L560.880,486.587 C560.847,486.697 560.810,486.809 560.768,486.918 C560.269,488.235 559.196,489.174 557.940,489.551 L580.242,598.992 L608.039,495.631 ZM584.439,623.572 L575.380,633.472 C575.660,633.814 575.900,634.185 576.096,634.577 L585.926,630.865 L584.439,623.572 ZM576.601,636.031 C576.785,636.917 576.768,637.853 576.519,638.774 L588.433,643.173 L586.236,632.391 L576.601,636.031 ZM589.312,643.497 L695.890,682.850 L745.368,572.282 L586.991,632.107 L589.312,643.497 ZM696.640,683.127 L787.664,716.736 L785.277,695.420 L770.428,562.815 L746.423,571.885 L696.640,683.127 ZM696.011,684.533 L690.494,696.863 C692.350,697.910 693.212,700.168 692.435,702.218 C692.427,702.239 692.418,702.262 692.409,702.283 L708.545,710.478 L788.471,751.060 C788.469,751.062 788.467,751.066 788.467,751.066 L788.465,751.069 C788.465,751.069 788.469,751.062 788.471,751.060 C789.114,750.039 790.144,749.349 791.288,749.113 L787.856,718.448 L696.011,684.533 ZM792.075,749.023 C792.618,749.012 793.172,749.100 793.711,749.303 C793.829,749.348 793.943,749.397 794.054,749.449 L808.129,725.934 L799.321,722.682 C797.838,725.003 794.887,726.047 792.211,725.033 C790.816,724.503 789.736,723.507 789.081,722.289 L792.075,749.023 ZM844.062,667.451 L809.699,724.873 L948.613,776.166 L967.327,767.206 C966.975,766.254 966.951,765.176 967.336,764.155 C967.533,763.632 967.819,763.169 968.171,762.777 C968.171,762.777 968.175,762.772 968.178,762.769 C968.175,762.772 968.173,762.774 968.173,762.774 L968.171,762.777 L860.744,646.693 C859.585,647.583 858.010,647.871 856.544,647.315 C856.427,647.270 856.312,647.221 856.201,647.168 L844.062,667.451 ZM924.047,713.925 L968.757,762.234 C969.716,761.498 970.965,761.173 972.202,761.395 L973.003,758.524 L945.819,625.462 L874.120,640.314 L862.428,642.736 C862.507,643.402 862.430,644.095 862.176,644.765 C861.976,645.292 861.687,645.759 861.330,646.153 L924.047,713.925 ZM972.968,761.604 C973.230,761.704 973.476,761.827 973.707,761.969 L973.351,760.229 L972.968,761.604 ZM973.908,755.278 L1013.067,614.888 C1011.756,614.386 1010.826,613.322 1010.445,612.075 L947.324,625.150 L973.908,755.278 ZM969.877,769.771 C969.877,769.771 969.864,769.767 969.857,769.764 C968.907,769.404 968.157,768.743 967.674,767.931 L949.661,776.552 L974.659,785.783 C975.381,784.405 976.591,783.408 977.989,782.929 L974.985,768.225 C973.860,769.799 971.770,770.490 969.877,769.771 ZM979.495,782.622 C980.330,782.562 981.194,782.678 982.030,782.995 C982.752,783.269 983.390,783.669 983.929,784.160 L992.708,776.739 L976.660,768.748 L979.495,782.622 ZM1025.242,848.780 L998.202,929.956 C1000.316,930.872 1001.360,933.307 1000.536,935.494 C1000.009,936.884 998.850,937.846 997.511,938.179 L1010.916,1024.691 C1011.515,1024.654 1012.132,1024.741 1012.731,1024.964 C1012.807,1024.993 1012.882,1025.024 1012.956,1025.057 L1102.576,864.627 L1033.969,822.579 L1025.242,848.780 ZM836.922,1065.423 L830.194,1098.453 C830.288,1098.480 830.380,1098.512 830.472,1098.547 L830.483,1098.551 C831.531,1098.949 832.339,1099.707 832.816,1100.630 L858.643,1090.203 L836.922,1065.423 ZM745.506,1155.246 C745.482,1155.980 745.338,1156.723 745.063,1157.447 C743.909,1160.490 740.813,1162.240 737.713,1161.825 L736.451,1174.739 L762.181,1154.533 L745.506,1155.246 ZM652.254,1025.311 L525.125,1002.173 L462.404,1123.181 C463.122,1123.677 463.727,1124.298 464.201,1125.000 L652.254,1025.311 ZM433.231,815.354 C432.880,815.313 432.528,815.229 432.182,815.098 C430.795,814.572 429.832,813.414 429.497,812.073 L362.361,822.495 C362.542,823.298 362.499,824.164 362.189,824.996 C361.333,827.250 358.812,828.372 356.554,827.532 C356.308,827.439 356.077,827.327 355.859,827.196 L347.003,840.433 L333.794,860.177 L431.921,872.106 L433.231,815.354 ZM559.663,482.173 C560.650,483.091 561.168,484.426 561.035,485.787 L608.250,494.846 L628.775,418.523 C627.213,417.762 626.115,416.385 625.662,414.807 L609.610,417.930 L559.663,482.173 ZM625.432,413.281 C625.418,412.547 625.542,411.800 625.816,411.075 C626.980,408.008 630.407,406.467 633.481,407.632 C634.713,408.100 635.700,408.934 636.365,409.962 L731.725,370.816 L730.971,370.019 L727.945,366.822 C726.783,367.731 725.186,368.031 723.698,367.466 C722.207,366.901 721.204,365.610 720.943,364.152 L651.060,370.044 C650.111,372.097 647.717,373.108 645.561,372.291 C645.440,372.245 645.324,372.195 645.210,372.140 L611.049,416.079 L625.432,413.281 ZM729.329,364.937 C729.136,365.445 728.859,365.897 728.519,366.281 L732.507,370.495 L789.141,347.246 L784.752,333.795 C783.899,334.024 782.970,333.996 782.078,333.657 C780.408,333.024 779.345,331.468 779.263,329.781 L739.225,327.449 L727.143,359.461 C729.161,360.433 730.137,362.807 729.329,364.937 ZM767.137,413.533 C767.130,413.530 767.123,413.527 767.123,413.527 L767.114,413.524 C764.878,412.676 763.744,410.161 764.596,407.916 C764.800,407.368 765.102,406.887 765.475,406.484 L732.861,372.016 L637.031,411.362 C637.304,412.204 637.391,413.109 637.263,414.014 L738.557,443.997 C739.833,441.147 743.127,439.757 746.082,440.878 C746.916,441.195 747.638,441.680 748.225,442.282 L768.321,420.320 L768.447,413.811 C768.010,413.787 767.568,413.696 767.137,413.533 ZM749.164,443.542 C749.989,445.018 750.181,446.834 749.535,448.539 C748.371,451.607 744.930,453.141 741.870,451.981 C741.764,451.941 741.661,451.898 741.558,451.853 L688.185,510.187 L762.490,524.446 C762.489,524.449 762.488,524.451 762.488,524.451 L688.177,510.194 L762.488,524.454 C762.413,524.710 762.364,524.969 762.338,525.227 C762.338,525.227 762.337,525.232 762.337,525.234 L687.547,510.885 L585.104,622.846 L586.680,630.580 L746.254,570.304 L764.535,529.454 C763.021,528.605 762.169,526.933 762.337,525.234 C762.337,525.232 762.338,525.230 762.338,525.230 C762.364,524.969 762.413,524.710 762.488,524.454 C762.488,524.454 762.489,524.449 762.490,524.446 C762.522,524.337 762.558,524.226 762.599,524.117 C763.209,522.473 764.722,521.425 766.368,521.309 L768.276,422.654 L749.164,443.542 ZM771.022,560.948 L788.480,554.354 L769.027,529.340 C768.577,529.626 768.076,529.828 767.551,529.934 C767.551,529.934 767.549,529.935 767.548,529.935 L771.022,560.948 ZM771.199,562.525 L784.640,682.630 L788.493,717.043 L788.838,717.170 C790.072,714.238 793.422,712.791 796.423,713.930 C796.540,713.974 796.655,714.023 796.768,714.074 L846.954,629.554 L801.878,571.583 L789.468,555.624 L771.199,562.525 ZM791.751,557.275 L847.387,628.823 L851.578,621.765 C851.476,621.062 851.546,620.325 851.816,619.614 C852.276,618.384 853.230,617.493 854.368,617.069 L918.197,509.569 C917.520,509.031 916.978,508.357 916.596,507.604 L790.241,555.332 L791.751,557.275 ZM856.311,616.811 C856.690,616.846 857.072,616.931 857.446,617.071 C859.695,617.924 860.841,620.437 859.983,622.698 C859.130,624.948 856.618,626.086 854.357,625.228 C853.481,624.896 852.773,624.313 852.285,623.590 L848.403,630.128 L855.734,639.556 C856.853,638.847 858.283,638.657 859.618,639.164 C859.618,639.164 859.635,639.169 859.643,639.172 C860.952,639.668 861.883,640.725 862.265,641.963 L945.659,624.681 L944.870,620.820 C943.888,622.810 941.536,623.774 939.420,622.971 C939.413,622.969 939.405,622.966 939.405,622.966 L939.398,622.963 C937.150,622.110 936.020,619.594 936.861,617.350 C937.714,615.099 940.236,613.964 942.487,614.818 C942.497,614.822 942.508,614.826 942.519,614.830 C943.002,615.013 943.432,615.274 943.803,615.593 L922.401,510.836 C921.539,510.910 920.649,510.798 919.786,510.471 C919.696,510.437 919.606,510.400 919.518,510.362 L856.311,616.811 ZM947.165,624.370 L1010.282,611.289 C1010.206,610.623 1010.283,609.929 1010.533,609.259 C1010.996,608.032 1011.956,607.132 1013.100,606.705 L991.262,525.978 L927.396,507.164 C926.739,508.775 925.440,509.952 923.903,510.505 L947.165,624.370 ZM1011.975,599.508 L1013.866,606.495 C1014.613,606.362 1015.405,606.422 1016.166,606.710 C1017.821,607.338 1018.870,608.864 1018.979,610.519 L1059.155,611.594 L1100.216,612.686 C1100.253,612.316 1100.339,611.944 1100.478,611.579 C1101.335,609.318 1103.846,608.173 1106.105,609.030 C1107.009,609.373 1107.734,609.980 1108.222,610.732 L1165.049,577.176 L992.157,526.242 L1011.975,599.508 ZM1103.023,617.198 C1101.399,616.582 1100.350,615.105 1100.211,613.484 L1087.168,613.135 L1018.959,611.305 C1018.959,611.305 1018.958,611.307 1018.958,611.308 L1087.168,613.135 L1018.957,611.316 C1018.916,611.659 1018.832,612.002 1018.705,612.339 C1017.946,614.339 1015.873,615.466 1013.836,615.100 L974.861,754.817 L974.257,756.983 L974.257,756.984 L976.457,767.756 L993.371,776.178 L1131.178,659.683 L1106.546,617.007 C1105.490,617.543 1104.219,617.652 1103.023,617.198 ZM994.869,776.923 L1037.251,798.027 C1038.325,796.282 1040.516,795.498 1042.502,796.235 C1043.456,796.597 1044.210,797.258 1044.697,798.070 L1171.201,736.843 C1170.839,735.884 1170.810,734.795 1171.198,733.762 C1171.516,732.911 1172.075,732.221 1172.769,731.736 L1131.959,661.035 L994.869,776.923 ZM1171.547,737.557 L1045.043,798.786 C1045.405,799.745 1045.432,800.834 1045.042,801.865 C1044.263,803.935 1042.069,805.066 1039.967,804.571 L1034.470,821.073 L1103.330,863.278 L1172.813,738.897 C1172.292,738.541 1171.863,738.081 1171.547,737.557 ZM1104.009,863.694 L1244.020,949.510 L1253.237,938.229 C1252.042,937.057 1251.581,935.250 1252.211,933.587 C1252.609,932.530 1253.368,931.720 1254.294,931.244 L1187.566,766.670 L1176.541,739.481 C1175.656,739.747 1174.678,739.734 1173.746,739.380 C1173.739,739.377 1173.733,739.375 1173.726,739.372 C1173.653,739.345 1173.581,739.315 1173.511,739.284 L1104.009,863.694 ZM1256.627,963.773 C1256.189,962.505 1256.175,961.083 1256.688,959.730 C1256.755,959.553 1256.829,959.382 1256.911,959.216 L1243.725,951.134 L1215.817,985.287 L1256.627,963.773 ZM1159.880,1052.495 L1211.530,989.277 L1107.545,1044.097 L1159.880,1052.495 ZM1214.013,986.239 L1243.037,950.714 L1103.255,865.043 L1062.597,937.823 L1013.651,1025.444 C1014.928,1026.317 1015.645,1027.805 1015.545,1029.334 L1105.027,1043.693 L1214.013,986.239 ZM905.938,1141.829 C907.731,1140.607 910.073,1140.251 912.263,1141.082 C913.623,1141.597 914.725,1142.498 915.491,1143.611 L1103.865,1044.305 L1015.420,1030.124 C1015.380,1030.278 1015.333,1030.431 1015.275,1030.582 C1014.418,1032.843 1011.905,1033.969 1009.646,1033.123 L1009.637,1033.119 C1008.589,1032.722 1007.781,1031.963 1007.305,1031.039 L860.700,1090.221 L905.938,1141.829 ZM859.192,1090.830 L833.113,1101.358 C833.386,1102.245 833.378,1103.224 833.026,1104.158 C832.167,1106.422 829.649,1107.560 827.394,1106.705 C826.754,1106.462 826.206,1106.087 825.765,1105.622 L765.619,1152.846 L803.616,1151.222 C803.195,1150.229 803.139,1149.079 803.550,1147.991 C804.405,1145.735 806.923,1144.603 809.177,1145.449 L809.193,1145.456 C811.381,1146.285 812.503,1148.677 811.785,1150.875 L902.962,1146.979 C903.011,1146.339 903.151,1145.696 903.391,1145.065 C903.714,1144.212 904.190,1143.462 904.774,1142.832 L859.192,1090.830 ZM721.734,1341.612 C722.442,1341.881 723.081,1342.252 723.639,1342.705 L904.550,1151.923 C903.736,1150.952 903.204,1149.770 903.017,1148.517 L810.881,1152.454 C809.719,1153.746 807.831,1154.263 806.091,1153.603 C805.546,1153.396 805.066,1153.092 804.663,1152.719 L763.544,1154.476 L736.344,1175.832 L720.176,1341.219 C720.698,1341.287 721.220,1341.417 721.734,1341.612 ZM713.760,1343.952 C714.928,1342.370 716.715,1341.377 718.639,1341.193 L734.673,1177.144 L702.973,1202.033 C703.705,1203.159 703.911,1204.603 703.399,1205.953 C702.548,1208.198 700.030,1209.346 697.779,1208.492 C697.774,1208.490 697.769,1208.488 697.769,1208.488 L697.762,1208.486 C697.065,1208.221 696.476,1207.798 696.019,1207.271 L618.436,1263.212 L713.760,1343.952 ZM617.819,1262.688 L695.560,1206.634 C695.033,1205.746 694.825,1204.677 695.021,1203.620 L474.755,1141.510 L617.819,1262.688 ZM546.261,1309.384 C547.413,1308.520 548.969,1308.248 550.418,1308.798 C551.121,1309.064 551.715,1309.491 552.175,1310.019 L616.536,1263.613 L471.198,1140.507 L370.863,1112.214 C370.659,1112.749 370.360,1113.221 369.992,1113.618 L546.261,1309.384 ZM369.077,1106.942 C370.617,1107.884 371.417,1109.683 371.082,1111.449 L455.056,1135.130 L469.737,1139.269 L463.269,1133.791 C461.411,1135.575 458.624,1136.239 456.052,1135.263 C452.493,1133.913 450.711,1129.947 452.059,1126.393 C453.404,1122.846 457.369,1121.059 460.928,1122.409 C460.968,1122.424 461.009,1122.439 461.048,1122.455 L523.542,1001.885 L433.934,985.575 C433.900,985.700 433.859,985.824 433.812,985.946 C432.970,988.200 430.442,989.339 428.189,988.485 C428.183,988.482 428.178,988.480 428.172,988.478 C428.163,988.474 428.154,988.471 428.145,988.468 L369.077,1106.942 ZM341.110,1048.917 C341.989,1048.663 342.957,1048.679 343.886,1049.027 C344.523,1049.269 345.072,1049.647 345.511,1050.114 L426.070,986.779 C425.343,985.654 425.139,984.210 425.648,982.868 C426.265,981.214 427.782,980.162 429.433,980.051 L431.886,873.651 L332.835,861.609 L291.611,923.233 L341.110,1048.917 ZM200.991,893.397 C200.877,893.342 200.759,893.292 200.638,893.246 C200.638,893.246 200.637,893.246 200.637,893.246 C200.760,893.293 200.878,893.343 200.991,893.397 C202.777,894.257 203.738,896.205 203.379,898.116 L290.978,922.724 L331.947,861.501 L284.410,855.723 C284.354,855.946 284.284,856.170 284.200,856.392 C283.037,859.459 279.604,861.008 276.515,859.837 C273.460,858.677 271.919,855.242 273.082,852.174 C273.760,850.389 275.208,849.121 276.905,848.605 L273.831,781.293 L244.588,787.731 C244.674,788.414 244.599,789.128 244.338,789.817 C243.531,791.945 241.246,793.081 239.088,792.486 L200.991,893.397 ZM251.359,559.630 C250.572,559.797 249.729,559.747 248.921,559.441 C247.653,558.960 246.735,557.961 246.322,556.780 L117.397,588.375 C117.461,589.020 117.379,589.688 117.134,590.336 C116.479,592.101 114.789,593.177 113.003,593.159 L102.962,706.979 C103.242,707.025 103.522,707.101 103.799,707.207 L103.811,707.211 C106.061,708.064 107.191,710.586 106.341,712.827 C106.203,713.192 106.021,713.526 105.804,713.829 L236.629,785.837 C237.718,784.224 239.799,783.492 241.703,784.166 L271.054,720.447 L265.831,606.060 L251.359,559.630 C251.619,559.575 251.872,559.496 252.118,559.395 L252.118,559.395 C251.871,559.496 251.618,559.576 251.359,559.630 ZM254.787,555.889 C254.745,556.231 254.662,556.574 254.534,556.911 C254.090,558.080 253.197,558.949 252.125,559.392 L265.688,602.905 L263.553,556.159 L254.787,555.889 ZM262.157,492.044 L265.052,555.419 L362.887,558.420 L363.054,558.436 L412.861,616.442 L371.507,700.805 C373.627,701.732 374.657,704.157 373.832,706.332 C372.992,708.595 370.478,709.738 368.196,708.872 C368.196,708.872 368.190,708.870 368.187,708.869 C368.007,708.800 367.834,708.721 367.669,708.632 L341.094,762.845 C342.867,763.917 343.670,766.124 342.923,768.120 C342.496,769.246 341.655,770.090 340.639,770.548 L350.810,799.738 L399.326,763.716 C399.235,763.026 399.309,762.304 399.572,761.608 C400.426,759.358 402.940,758.217 405.204,759.076 L405.214,759.080 C405.291,759.109 405.367,759.141 405.442,759.175 L565.647,640.226 C564.839,638.846 564.594,637.155 565.078,635.532 L267.265,488.866 C266.251,490.805 264.268,491.990 262.157,492.044 ZM779.330,152.414 C778.030,152.898 776.555,152.930 775.155,152.400 C774.237,152.051 773.454,151.501 772.841,150.818 L266.555,482.287 C266.747,482.516 266.921,482.759 267.074,483.011 L609.867,416.310 L644.520,371.726 C642.972,370.595 642.307,368.544 643.008,366.670 C643.866,364.408 646.386,363.287 648.639,364.142 C650.716,364.929 651.849,367.125 651.345,369.226 L720.875,363.355 C720.879,362.854 720.969,362.346 721.157,361.851 C721.962,359.730 724.245,358.595 726.403,359.185 L738.694,326.626 L779.297,328.989 C779.341,328.665 779.422,328.341 779.543,328.023 C780.389,325.791 782.904,324.653 785.174,325.495 C787.428,326.350 788.552,328.875 787.718,331.112 C787.299,332.215 786.485,333.053 785.499,333.520 L789.879,346.943 L857.216,319.300 C856.797,318.048 856.792,316.650 857.295,315.326 C857.791,314.016 858.701,312.985 859.821,312.323 L779.330,152.414 ZM864.291,323.194 C863.155,323.479 861.924,323.432 860.747,322.985 C860.434,322.867 860.137,322.725 859.857,322.561 L769.078,421.777 L767.150,521.325 C767.506,521.365 767.864,521.450 768.214,521.582 C768.942,521.859 769.553,522.308 770.018,522.866 L898.919,433.796 L864.291,323.194 ZM899.165,434.583 L770.470,523.520 C771.083,524.606 771.227,525.947 770.758,527.211 C770.512,527.860 770.130,528.415 769.655,528.855 L789.253,554.062 L916.082,506.155 C915.848,505.073 915.913,503.916 916.333,502.811 C916.920,501.263 918.083,500.105 919.485,499.486 L899.165,434.583 ZM954.618,398.797 C953.889,398.521 953.276,398.071 952.810,397.512 L900.488,433.669 L920.961,499.051 C921.951,498.896 922.993,498.987 923.997,499.368 C926.622,500.364 928.132,503.011 927.790,505.675 L990.788,524.232 L975.064,466.108 L956.908,399.010 C956.163,399.141 955.375,399.080 954.618,398.797 ZM1064.807,248.312 C1063.655,249.170 1062.106,249.438 1060.661,248.898 C1060.371,248.788 1060.099,248.651 1059.848,248.490 L958.988,391.397 C959.687,391.998 960.175,392.803 960.394,393.683 C960.394,393.683 960.395,393.690 960.396,393.694 C960.395,393.690 960.394,393.686 960.394,393.686 L1093.636,373.831 C1093.122,373.831 1092.599,373.739 1092.091,373.546 C1092.084,373.544 1092.076,373.541 1092.069,373.538 C1089.820,372.685 1088.701,370.168 1089.540,367.928 C1090.393,365.678 1092.919,364.536 1095.167,365.389 C1097.427,366.246 1098.564,368.763 1097.718,371.010 C1097.223,372.326 1096.153,373.263 1094.900,373.643 L1167.648,362.804 C1167.648,362.804 1167.649,362.810 1167.649,362.812 C1167.649,362.810 1167.649,362.806 1167.649,362.806 C1167.615,362.213 1167.701,361.607 1167.924,361.018 C1168.118,360.500 1168.402,360.040 1168.747,359.650 L1064.807,248.312 ZM1185.726,562.244 C1187.469,562.905 1188.546,564.552 1188.553,566.308 L1274.421,573.775 L1392.913,440.513 C1392.091,439.364 1391.840,437.844 1392.372,436.443 C1392.616,435.799 1392.994,435.247 1393.462,434.806 L1203.681,319.912 L1174.883,359.275 C1176.208,360.440 1176.752,362.347 1176.087,364.101 C1175.511,365.629 1174.164,366.641 1172.657,366.869 C1172.657,366.869 1172.656,366.869 1172.655,366.870 L1184.336,561.970 C1184.799,561.985 1185.269,562.074 1185.726,562.244 ZM1180.245,568.202 C1179.754,567.171 1179.666,565.949 1180.103,564.797 C1180.679,563.259 1182.026,562.245 1183.538,562.017 L1171.863,366.916 C1171.397,366.901 1170.927,366.809 1170.469,366.635 C1169.066,366.103 1168.096,364.935 1167.766,363.589 L1025.567,384.771 L960.515,394.467 C960.552,395.059 960.469,395.667 960.248,396.253 C959.783,397.486 958.825,398.377 957.683,398.800 L991.684,524.496 L1166.872,576.100 L1180.245,568.202 ZM1207.312,589.627 L1166.086,577.482 L1108.597,611.442 C1109.008,612.432 1109.056,613.577 1108.649,614.667 C1108.350,615.454 1107.847,616.105 1107.222,616.582 L1131.796,659.160 L1208.594,594.240 C1207.557,592.968 1207.068,591.295 1207.312,589.627 ZM1213.863,596.396 C1212.956,596.497 1212.011,596.390 1211.100,596.045 C1210.598,595.854 1210.135,595.603 1209.720,595.302 L1132.578,660.513 L1173.457,731.342 C1174.483,730.873 1175.689,730.799 1176.824,731.229 C1177.223,731.380 1177.588,731.585 1177.913,731.829 L1218.858,686.983 C1217.779,685.804 1217.386,684.078 1217.994,682.491 C1218.841,680.239 1221.354,679.102 1223.612,679.958 C1224.082,680.136 1224.503,680.387 1224.869,680.691 L1213.863,596.396 ZM1225.721,687.214 L1225.343,686.937 C1225.343,686.937 1225.348,686.931 1225.350,686.929 C1225.348,686.931 1225.345,686.934 1225.345,686.934 C1224.179,688.245 1222.278,688.782 1220.539,688.122 C1220.136,687.969 1219.769,687.764 1219.441,687.516 L1178.501,732.364 C1179.573,733.538 1179.963,735.255 1179.367,736.839 C1178.966,737.896 1178.206,738.705 1177.282,739.182 C1177.282,739.182 1177.278,739.183 1177.276,739.185 C1177.278,739.183 1177.280,739.183 1177.280,739.183 L1255.034,930.945 C1255.768,930.724 1256.563,930.694 1257.346,930.891 L1257.485,930.491 L1225.721,687.214 ZM1370.871,676.147 L1226.870,684.171 L1227.286,687.362 L1315.873,752.256 C1317.041,750.945 1318.940,750.418 1320.684,751.079 C1320.899,751.161 1321.105,751.257 1321.299,751.369 L1371.987,678.677 C1371.353,677.978 1370.959,677.086 1370.871,676.147 ZM1377.739,679.320 C1376.597,680.121 1375.095,680.361 1373.695,679.829 C1373.684,679.825 1373.673,679.822 1373.662,679.817 C1373.267,679.667 1372.906,679.466 1372.585,679.223 L1344.150,719.993 L1321.953,751.825 C1322.723,752.473 1323.241,753.367 1323.431,754.338 L1435.374,743.428 C1435.403,743.018 1435.492,742.606 1435.642,742.202 C1435.874,741.593 1436.229,741.064 1436.668,740.634 L1377.739,679.320 ZM1142.031,664.347 C1139.781,663.493 1138.642,660.981 1139.495,658.732 C1140.347,656.469 1142.856,655.342 1145.106,656.195 C1145.117,656.199 1145.127,656.203 1145.137,656.207 C1147.391,657.062 1148.506,659.575 1147.664,661.817 C1146.813,664.061 1144.295,665.206 1142.031,664.347 ZM1140.308,451.506 C1140.302,451.504 1140.295,451.501 1140.289,451.499 C1138.039,450.646 1136.914,448.133 1137.766,445.888 C1138.613,443.636 1141.134,442.502 1143.393,443.359 C1143.405,443.364 1143.416,443.368 1143.428,443.372 C1145.661,444.219 1146.783,446.737 1145.935,448.974 C1145.083,451.238 1142.567,452.363 1140.308,451.506 ZM1068.205,482.221 C1065.953,481.366 1064.807,478.853 1065.664,476.591 C1066.517,474.344 1069.033,473.204 1071.290,474.060 C1073.550,474.917 1074.680,477.424 1073.831,479.689 C1072.982,481.940 1070.465,483.078 1068.205,482.221 ZM1337.212,464.492 C1339.471,465.349 1340.606,467.872 1339.758,470.124 C1338.913,472.378 1336.395,473.501 1334.133,472.657 C1331.883,471.803 1330.737,469.288 1331.587,467.024 C1332.440,464.775 1334.962,463.639 1337.212,464.492 ZM978.653,494.305 C977.795,496.567 975.286,497.694 973.023,496.849 C970.779,495.998 969.627,493.482 970.485,491.221 C971.338,488.971 973.851,487.832 976.111,488.689 C978.362,489.543 979.500,492.054 978.653,494.305 ZM804.614,521.687 C804.603,521.683 804.593,521.679 804.581,521.675 C802.344,520.826 801.219,518.308 802.065,516.076 C802.919,513.825 805.434,512.680 807.687,513.535 C807.695,513.538 807.702,513.541 807.709,513.543 C809.963,514.398 811.097,516.915 810.246,519.158 C809.393,521.408 806.880,522.547 804.614,521.687 ZM842.289,444.107 C844.553,444.965 845.684,447.471 844.850,449.723 C843.997,451.970 841.481,453.117 839.216,452.258 C839.209,452.256 839.202,452.253 839.202,452.253 L839.196,452.251 C836.952,451.399 835.818,448.883 836.669,446.640 C837.523,444.390 840.036,443.252 842.289,444.107 ZM774.005,318.024 C773.998,318.021 773.991,318.018 773.984,318.016 C771.729,317.160 770.614,314.649 771.464,312.406 C772.300,310.151 774.831,309.019 777.085,309.874 C777.095,309.878 777.105,309.882 777.116,309.885 C779.348,310.732 780.475,313.250 779.628,315.483 C778.775,317.732 776.258,318.878 774.005,318.024 ZM722.637,271.233 C720.384,270.378 719.240,267.867 720.087,265.600 C720.940,263.352 723.467,262.211 725.721,263.066 C727.968,263.919 729.113,266.439 728.275,268.686 C727.417,270.947 724.889,272.087 722.637,271.233 ZM604.852,308.971 C602.588,308.112 601.444,305.587 602.294,303.348 C603.151,301.087 605.665,299.949 607.934,300.810 C610.181,301.662 611.312,304.169 610.473,306.438 C609.619,308.688 607.105,309.826 604.852,308.971 ZM451.278,715.730 C453.531,716.584 454.670,719.106 453.818,721.353 C452.962,723.609 450.450,724.744 448.197,723.889 C448.193,723.887 448.189,723.886 448.185,723.884 C445.926,723.028 444.793,720.512 445.646,718.263 C446.499,716.015 449.011,714.880 451.278,715.730 ZM166.777,587.626 C164.507,586.765 163.368,584.245 164.222,581.995 C165.074,579.748 167.600,578.611 169.855,579.460 C169.861,579.462 169.867,579.465 169.873,579.467 C172.118,580.318 173.247,582.833 172.394,585.081 C171.538,587.337 169.028,588.470 166.777,587.626 ZM592.190,1236.074 C593.046,1233.818 595.568,1232.686 597.832,1233.545 L597.841,1233.548 C600.081,1234.398 601.214,1236.913 600.363,1239.157 C599.507,1241.414 596.988,1242.554 594.743,1241.702 L594.734,1241.699 C592.476,1240.842 591.341,1238.329 592.190,1236.074 ZM723.633,1194.514 C723.633,1194.514 723.645,1194.518 723.650,1194.520 C725.894,1195.371 727.017,1197.892 726.167,1200.134 C725.324,1202.385 722.800,1203.522 720.551,1202.668 C718.292,1201.811 717.152,1199.301 718.004,1197.055 C718.854,1194.798 721.375,1193.657 723.633,1194.514 ZM863.018,1134.416 C860.758,1133.559 859.612,1131.045 860.464,1128.799 C861.319,1126.543 863.832,1125.407 866.093,1126.259 C868.352,1127.115 869.482,1129.624 868.644,1131.876 C867.789,1134.131 865.275,1135.272 863.018,1134.416 ZM1027.156,1054.850 C1029.408,1055.704 1030.551,1058.226 1029.700,1060.484 C1028.848,1062.730 1026.324,1063.869 1024.074,1063.015 C1024.069,1063.014 1024.064,1063.011 1024.060,1063.010 C1021.807,1062.155 1020.673,1059.639 1021.526,1057.390 C1022.382,1055.135 1024.894,1054.003 1027.156,1054.850 ZM1065.312,835.762 C1065.302,835.758 1065.291,835.755 1065.281,835.751 C1063.044,834.902 1061.920,832.384 1062.761,830.141 C1063.606,827.895 1066.131,826.753 1068.399,827.602 C1070.649,828.455 1071.791,830.981 1070.938,833.230 C1070.085,835.479 1067.570,836.618 1065.312,835.762 ZM795.553,692.578 C797.808,693.433 798.946,695.964 798.093,698.214 C797.247,700.459 794.725,701.601 792.472,700.747 C792.464,700.745 792.457,700.742 792.457,700.742 L792.450,700.740 C790.203,699.886 789.066,697.368 789.917,695.125 C790.774,692.864 793.290,691.740 795.553,692.578 ZM654.826,380.390 C654.826,380.390 654.840,380.396 654.848,380.399 C657.090,381.249 658.224,383.766 657.373,386.009 C656.532,388.261 654.000,389.395 651.752,388.543 C649.500,387.689 648.351,385.194 649.209,382.931 C650.046,380.677 652.577,379.538 654.826,380.390 ZM410.107,837.139 C410.111,837.140 410.115,837.142 410.115,837.142 C412.349,837.989 413.500,840.509 412.646,842.759 C411.790,845.016 409.279,846.152 407.012,845.298 C404.760,844.444 403.632,841.928 404.485,839.680 C405.327,837.420 407.839,836.288 410.107,837.139 ZM1046.039,954.192 C1045.185,956.444 1042.661,957.582 1040.397,956.723 C1038.153,955.872 1037.007,953.359 1037.863,951.103 C1038.714,948.859 1041.225,947.713 1043.483,948.570 C1043.483,948.570 1043.490,948.572 1043.493,948.573 C1045.747,949.428 1046.885,951.943 1046.039,954.192 ZM936.339,745.749 C938.600,746.606 939.736,749.114 938.892,751.366 C938.041,753.630 935.516,754.751 933.263,753.909 C931.003,753.052 929.869,750.531 930.715,748.277 C931.561,746.026 934.088,744.895 936.339,745.749 ZM682.130,634.797 C679.878,633.942 678.748,631.435 679.589,629.181 C680.447,626.920 682.962,625.775 685.214,626.629 C687.462,627.481 688.610,629.995 687.763,632.262 C686.910,634.510 684.383,635.651 682.130,634.797 ZM791.092,874.200 C791.097,874.202 791.103,874.205 791.108,874.206 C793.352,875.058 794.488,877.573 793.637,879.817 C792.787,882.075 790.264,883.213 788.014,882.360 C788.009,882.357 788.004,882.356 787.999,882.354 C785.749,881.500 784.618,878.986 785.464,876.735 C786.312,874.484 788.834,873.344 791.092,874.200 ZM742.874,796.242 C745.126,797.096 746.271,799.609 745.419,801.856 C744.568,804.113 742.041,805.243 739.791,804.397 C737.531,803.540 736.392,801.030 737.238,798.780 C738.093,796.524 740.614,795.385 742.874,796.242 ZM649.511,478.396 C647.259,477.542 646.112,475.027 646.969,472.767 C647.810,470.512 650.354,469.384 652.606,470.238 C654.852,471.090 656.001,473.604 655.148,475.854 C654.290,478.115 651.762,479.236 649.511,478.396 ZM850.499,1058.853 C848.246,1057.999 847.112,1055.483 847.957,1053.230 C848.811,1050.978 851.326,1049.836 853.579,1050.691 C855.837,1051.547 856.982,1054.059 856.126,1056.316 C855.280,1058.566 852.759,1059.703 850.499,1058.853 ZM527.460,927.559 C529.711,928.413 530.850,930.933 530.013,933.196 C529.161,935.441 526.631,936.573 524.381,935.728 C522.128,934.873 520.982,932.356 521.834,930.110 C522.693,927.847 525.210,926.714 527.460,927.559 ZM567.602,717.846 C569.867,718.705 570.997,721.212 570.145,723.460 C569.308,725.715 566.780,726.843 564.523,725.995 C564.523,725.995 564.516,725.992 564.512,725.991 C562.252,725.133 561.130,722.624 561.970,720.373 C562.824,718.121 565.346,716.995 567.602,717.846 ZM436.336,528.436 C436.347,528.441 436.357,528.445 436.368,528.449 C438.606,529.297 439.727,531.814 438.878,534.052 C438.045,536.304 435.507,537.453 433.241,536.594 C431.006,535.745 429.863,533.220 430.704,530.966 C431.558,528.716 434.084,527.582 436.336,528.436 ZM1244.057,793.922 C1241.808,793.069 1240.662,790.556 1241.509,788.304 C1242.363,786.053 1244.881,784.918 1247.135,785.773 C1247.142,785.775 1247.150,785.778 1247.158,785.781 C1249.396,786.631 1250.532,789.149 1249.683,791.390 C1248.839,793.643 1246.315,794.779 1244.057,793.922 ZM1368.738,403.221 C1366.478,402.363 1365.341,399.853 1366.186,397.599 C1367.043,395.339 1369.553,394.212 1371.806,395.067 C1371.814,395.070 1371.822,395.072 1371.830,395.075 C1374.084,395.930 1375.207,398.444 1374.363,400.690 C1373.510,402.940 1370.996,404.077 1368.738,403.221 ZM1144.772,269.901 C1142.515,269.045 1141.361,266.528 1142.214,264.279 C1143.072,262.018 1145.590,260.895 1147.856,261.733 C1150.108,262.587 1151.250,265.106 1150.392,267.368 C1149.550,269.614 1147.025,270.756 1144.772,269.901 ZM973.963,237.288 C971.693,236.427 970.557,233.918 971.410,231.668 C972.260,229.404 974.785,228.262 977.043,229.119 C979.295,229.973 980.425,232.487 979.573,234.750 C978.729,236.996 976.213,238.142 973.963,237.288 ZM899.598,191.568 C897.345,190.713 896.198,188.199 897.056,185.937 C897.909,183.689 900.429,182.553 902.674,183.405 C904.928,184.260 906.088,186.777 905.234,189.027 C904.376,191.289 901.850,192.408 899.598,191.568 ZM835.497,187.306 C833.243,186.451 832.101,183.939 832.959,181.678 C833.796,179.422 836.312,178.277 838.576,179.136 C840.829,179.990 841.958,182.504 841.107,184.749 C840.266,187.017 837.757,188.143 835.497,187.306 ZM782.214,53.867 C779.950,53.008 778.813,50.498 779.667,48.248 C780.512,45.982 783.040,44.862 785.292,45.696 C787.546,46.551 788.689,49.064 787.828,51.332 C786.995,53.582 784.461,54.719 782.214,53.867 ZM714.187,118.239 C711.940,117.387 710.809,114.864 711.655,112.599 C712.502,110.366 715.017,109.222 717.282,110.081 C717.282,110.081 717.296,110.086 717.303,110.089 C719.536,110.936 720.663,113.451 719.813,115.693 C718.970,117.948 716.455,119.085 714.187,118.239 ZM583.040,49.983 C583.030,49.980 583.020,49.976 583.009,49.972 C580.771,49.123 579.647,46.607 580.484,44.349 C581.330,42.118 583.851,40.960 586.117,41.819 C588.370,42.674 589.517,45.188 588.663,47.438 C587.805,49.699 585.292,50.838 583.040,49.983 ZM476.152,96.793 C476.141,96.789 476.129,96.784 476.118,96.780 C473.882,95.932 472.762,93.415 473.615,91.166 C474.468,88.916 476.977,87.789 479.229,88.631 C481.480,89.484 482.626,92.011 481.772,94.260 C480.919,96.510 478.405,97.648 476.152,96.793 ZM462.501,8.934 C460.249,8.080 459.109,5.562 459.967,3.300 C460.802,1.050 463.333,-0.088 465.587,0.767 C467.833,1.619 468.994,4.138 468.137,6.399 C467.283,8.649 464.757,9.790 462.501,8.934 ZM400.877,320.939 C400.870,320.936 400.863,320.933 400.856,320.931 C398.599,320.075 397.467,317.560 398.317,315.317 C399.164,313.085 401.684,311.929 403.948,312.788 C406.190,313.639 407.326,316.167 406.479,318.399 C405.637,320.653 403.112,321.787 400.877,320.939 ZM391.620,126.244 C389.366,125.389 388.213,122.887 389.071,120.626 C389.925,118.375 392.444,117.239 394.709,118.099 C394.718,118.102 394.725,118.105 394.725,118.105 C396.973,118.958 398.089,121.469 397.251,123.714 C396.398,125.964 393.871,127.098 391.620,126.244 ZM392.472,207.940 C394.719,208.792 395.866,211.306 395.015,213.550 C394.156,215.817 391.642,216.955 389.378,216.096 C387.125,215.242 385.977,212.729 386.835,210.467 C387.688,208.218 390.219,207.085 392.472,207.940 ZM344.718,46.672 C342.454,45.814 341.312,43.282 342.158,41.050 C343.016,38.789 345.531,37.650 347.794,38.508 C350.048,39.363 351.192,41.890 350.339,44.139 C349.488,46.383 346.971,47.527 344.718,46.672 ZM301.704,315.928 C299.451,315.074 298.321,312.566 299.178,310.305 C300.032,308.056 302.541,306.929 304.798,307.770 C307.061,308.629 308.193,311.137 307.335,313.399 C306.482,315.647 303.967,316.786 301.704,315.928 ZM283.094,430.526 C280.831,429.667 279.700,427.159 280.554,424.909 C281.393,422.662 283.912,421.505 286.178,422.365 C288.442,423.223 289.573,425.730 288.715,427.993 C287.862,430.240 285.348,431.381 283.094,430.526 ZM206.532,330.559 C204.280,329.705 203.131,327.190 203.989,324.930 C204.842,322.680 207.352,321.554 209.626,322.402 C211.874,323.255 213.001,325.775 212.147,328.025 C211.312,330.280 208.802,331.408 206.532,330.559 ZM172.919,456.679 C172.910,456.676 172.903,456.673 172.903,456.673 L172.895,456.670 C170.651,455.819 169.526,453.303 170.376,451.063 C171.229,448.814 173.744,447.674 175.997,448.528 C176.007,448.533 176.019,448.537 176.030,448.541 C178.279,449.394 179.387,451.907 178.534,454.158 C177.699,456.392 175.171,457.533 172.919,456.679 ZM99.576,978.057 C101.823,978.909 102.955,981.422 102.104,983.665 C101.269,985.922 98.740,987.049 96.488,986.194 C96.483,986.193 96.478,986.191 96.478,986.191 L96.473,986.189 C94.226,985.336 93.080,982.825 93.931,980.581 C94.786,978.326 97.298,977.193 99.562,978.052 L99.576,978.057 ZM94.162,1192.278 C93.307,1194.533 90.803,1195.680 88.527,1194.816 L88.518,1194.813 C86.281,1193.964 85.146,1191.447 85.999,1189.198 C86.853,1186.948 89.367,1185.806 91.620,1186.661 C91.620,1186.661 91.626,1186.663 91.630,1186.664 C93.890,1187.522 95.015,1190.030 94.162,1192.278 ZM56.342,1195.931 C54.089,1195.077 52.942,1192.563 53.796,1190.314 C54.641,1188.048 57.170,1186.921 59.420,1187.765 C59.423,1187.766 59.426,1187.767 59.426,1187.767 C61.678,1188.621 62.814,1191.134 61.974,1193.403 C61.122,1195.650 58.592,1196.779 56.342,1195.931 ZM3.426,916.475 C1.159,915.615 0.033,913.097 0.869,910.841 C1.721,908.595 4.238,907.446 6.505,908.298 C8.758,909.152 9.901,911.681 9.049,913.930 C8.196,916.179 5.690,917.334 3.426,916.475 ZM-19.841,984.093 C-22.105,983.234 -23.254,980.721 -22.398,978.466 C-21.546,976.220 -19.027,975.078 -16.762,975.937 C-14.508,976.792 -13.365,979.305 -14.222,981.562 C-15.077,983.817 -17.586,984.945 -19.841,984.093 ZM-61.017,1105.510 C-63.281,1104.651 -64.407,1102.134 -63.556,1099.888 C-62.712,1097.628 -60.198,1096.487 -57.933,1097.346 C-57.933,1097.346 -57.926,1097.348 -57.922,1097.350 C-55.680,1098.201 -54.539,1100.716 -55.393,1102.967 C-56.249,1105.223 -58.760,1106.356 -61.017,1105.510 ZM-65.915,1027.439 L-65.933,1027.433 C-68.190,1026.578 -69.320,1024.063 -68.467,1021.813 C-67.611,1019.558 -65.100,1018.424 -62.836,1019.283 L-62.821,1019.289 C-60.575,1020.141 -59.453,1022.651 -60.304,1024.894 C-61.159,1027.148 -63.661,1028.294 -65.915,1027.439 ZM124.279,798.732 C124.284,798.735 124.288,798.736 124.292,798.738 C126.520,799.583 127.658,802.108 126.810,804.343 C125.955,806.599 123.437,807.731 121.185,806.887 C118.933,806.033 117.794,803.512 118.647,801.263 C119.480,799.015 122.014,797.873 124.279,798.732 ZM156.653,1014.366 C158.935,1015.231 160.062,1017.747 159.210,1019.995 C158.357,1022.243 155.840,1023.391 153.570,1022.530 C153.567,1022.528 153.563,1022.527 153.559,1022.526 C151.328,1021.679 150.197,1019.158 151.048,1016.915 C151.883,1014.659 154.416,1013.523 156.653,1014.366 ZM340.535,1186.588 C342.790,1187.443 343.928,1189.964 343.076,1192.211 C342.221,1194.466 339.708,1195.602 337.457,1194.755 C335.206,1193.901 334.057,1191.387 334.915,1189.125 C335.757,1186.871 338.281,1185.739 340.535,1186.588 ZM631.418,1370.827 C631.418,1370.827 631.429,1370.831 631.435,1370.834 C633.677,1371.684 634.811,1374.199 633.968,1376.443 C633.115,1378.692 630.596,1379.821 628.349,1378.980 C626.083,1378.121 624.945,1375.610 625.798,1373.360 C626.645,1371.112 629.159,1369.970 631.418,1370.827 ZM754.053,1381.720 C756.302,1382.573 757.448,1385.086 756.597,1387.355 C755.744,1389.602 753.222,1390.740 750.972,1389.887 C750.972,1389.887 750.962,1389.883 750.956,1389.881 C748.706,1389.026 747.570,1386.511 748.424,1384.260 C749.270,1382.001 751.798,1380.875 754.053,1381.720 ZM830.999,1243.945 C833.251,1244.800 834.396,1247.314 833.547,1249.570 C832.699,1251.824 830.172,1252.960 827.912,1252.109 C825.659,1251.254 824.517,1248.732 825.369,1246.485 C826.219,1244.229 828.749,1243.092 830.999,1243.945 ZM925.528,1347.233 C927.777,1348.086 928.914,1350.607 928.065,1352.865 C927.218,1355.112 924.700,1356.248 922.439,1355.396 C920.179,1354.539 919.042,1352.030 919.891,1349.770 C920.746,1347.516 923.269,1346.376 925.528,1347.233 ZM940.197,1285.168 C942.449,1286.022 943.600,1288.545 942.745,1290.800 C941.891,1293.050 939.370,1294.190 937.115,1293.340 C934.864,1292.486 933.712,1289.964 934.560,1287.712 C935.418,1285.451 937.940,1284.318 940.197,1285.168 ZM994.380,1434.600 C996.632,1435.454 997.778,1437.967 996.928,1440.226 C996.077,1442.482 993.550,1443.613 991.298,1442.766 C989.049,1441.913 987.895,1439.396 988.744,1437.137 C989.600,1434.882 992.126,1433.751 994.380,1434.600 ZM994.580,1295.526 L994.569,1295.522 C992.315,1294.667 991.183,1292.154 992.031,1289.902 C992.885,1287.652 995.407,1286.506 997.661,1287.361 C999.916,1288.216 1001.053,1290.733 1000.198,1292.989 C999.344,1295.238 996.834,1296.372 994.580,1295.526 ZM1051.960,1410.223 L1051.973,1410.228 C1054.227,1411.083 1055.353,1413.594 1054.509,1415.849 C1053.653,1418.105 1051.136,1419.240 1048.872,1418.381 C1048.872,1418.381 1048.864,1418.378 1048.861,1418.376 C1046.617,1417.525 1045.488,1415.020 1046.336,1412.766 C1047.187,1410.508 1049.708,1409.369 1051.960,1410.223 ZM1083.208,1238.305 L1083.218,1238.308 C1085.471,1239.163 1086.594,1241.680 1085.750,1243.920 C1084.903,1246.180 1082.382,1247.309 1080.121,1246.460 C1077.871,1245.607 1076.729,1243.086 1077.579,1240.845 C1078.435,1238.589 1080.950,1237.458 1083.208,1238.305 ZM1096.016,1142.219 C1098.265,1143.072 1099.404,1145.586 1098.553,1147.851 C1097.708,1150.100 1095.181,1151.231 1092.928,1150.383 C1090.675,1149.529 1089.531,1147.016 1090.381,1144.758 C1091.236,1142.502 1093.762,1141.374 1096.016,1142.219 ZM1105.025,1336.792 C1107.274,1337.645 1108.427,1340.168 1107.572,1342.422 C1106.723,1344.675 1104.194,1345.810 1101.945,1344.956 C1101.942,1344.955 1101.937,1344.953 1101.937,1344.953 L1101.933,1344.952 C1099.680,1344.098 1098.547,1341.585 1099.399,1339.339 C1100.249,1337.082 1102.773,1335.944 1105.025,1336.792 ZM1124.488,1562.513 C1124.493,1562.515 1124.498,1562.516 1124.502,1562.518 C1126.749,1563.370 1127.875,1565.884 1127.035,1568.126 C1126.181,1570.378 1123.661,1571.505 1121.407,1570.661 L1121.393,1570.656 C1119.143,1569.802 1118.019,1567.293 1118.863,1565.045 C1119.709,1562.796 1122.224,1561.654 1124.488,1562.513 ZM1124.527,1151.713 C1122.274,1150.858 1121.133,1148.334 1121.985,1146.089 C1122.841,1143.832 1125.351,1142.688 1127.609,1143.544 C1129.868,1144.401 1131.004,1146.911 1130.157,1149.170 C1129.305,1151.417 1126.787,1152.557 1124.527,1151.713 ZM1140.123,1219.114 C1142.381,1219.970 1143.512,1222.479 1142.666,1224.736 C1141.813,1226.984 1139.296,1228.126 1137.046,1227.273 C1134.786,1226.416 1133.642,1223.900 1134.494,1221.654 C1135.350,1219.397 1137.864,1218.257 1140.123,1219.114 ZM1139.881,1080.680 C1140.734,1078.431 1143.249,1077.289 1145.508,1078.146 L1145.517,1078.149 C1147.762,1079.001 1148.910,1081.520 1148.056,1083.771 C1147.207,1086.022 1144.680,1087.161 1142.421,1086.309 C1140.168,1085.455 1139.025,1082.936 1139.881,1080.680 ZM1153.587,1117.840 C1153.587,1117.840 1153.594,1117.842 1153.598,1117.844 C1155.851,1118.698 1156.987,1121.223 1156.141,1123.477 C1155.289,1125.724 1152.774,1126.859 1150.501,1126.003 C1148.257,1125.151 1147.118,1122.641 1147.968,1120.384 C1148.823,1118.128 1151.335,1116.995 1153.587,1117.840 ZM1214.228,1378.022 C1216.481,1378.877 1217.623,1381.400 1216.768,1383.655 C1215.926,1385.906 1213.401,1387.045 1211.147,1386.190 C1208.887,1385.336 1207.736,1382.816 1208.589,1380.567 C1209.447,1378.305 1211.973,1377.167 1214.228,1378.022 ZM1230.471,1152.982 C1232.724,1153.837 1233.852,1156.349 1233.004,1158.602 C1232.149,1160.858 1229.638,1161.989 1227.394,1161.138 C1227.394,1161.138 1227.382,1161.134 1227.376,1161.131 C1225.120,1160.276 1223.991,1157.762 1224.840,1155.511 C1225.691,1153.265 1228.205,1152.123 1230.471,1152.982 ZM1254.237,1228.523 C1256.488,1229.376 1257.634,1231.891 1256.784,1234.148 C1255.928,1236.403 1253.407,1237.542 1251.154,1236.688 C1248.899,1235.832 1247.754,1233.320 1248.610,1231.064 C1249.465,1228.809 1251.973,1227.664 1254.237,1228.523 ZM1288.173,1102.258 C1290.432,1103.115 1291.579,1105.640 1290.724,1107.895 C1289.879,1110.146 1287.350,1111.283 1285.091,1110.426 L1285.080,1110.421 C1282.842,1109.571 1281.696,1107.056 1282.548,1104.808 C1283.398,1102.544 1285.923,1101.417 1288.173,1102.258 ZM1355.870,936.148 C1358.123,937.002 1359.261,939.513 1358.414,941.765 C1357.562,944.028 1355.038,945.149 1352.789,944.296 C1352.777,944.293 1352.766,944.289 1352.755,944.285 C1350.513,943.433 1349.394,940.917 1350.238,938.678 C1351.089,936.433 1353.605,935.289 1355.870,936.148 Z" class="cls-1"/>
+</svg>
diff --git a/tools/static-assets/skel-full/server/main.js b/tools/static-assets/skel-full/server/main.js
new file mode 100644
index 0000000000..68cc7679b6
--- /dev/null
+++ b/tools/static-assets/skel-full/server/main.js
@@ -0,0 +1,4 @@
+// Server entry point, imports all server code
+
+import '/imports/startup/server';
+import '/imports/startup/both';

From 7d9388ee422fa573d498704b1cb0705dbcead7db Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Sun, 13 Nov 2016 21:20:34 -0500
Subject: [PATCH 586/688] Keep Hashes in URL when rewriting relative URLs

For certain use cases, like SVG filters, the url needs to have a # symbol. For example, the following css property :

```filter:url("filters.svg#lightGreen")```

In the current version of the codebase, gets rewritten to :

```filter:url("http://myapp.com/filters.svg")```

Whereas the proper behaviour should be:

```filter:url("http://myapp.com/filters.svg#lightGreen")```

This simple change will fix the issue.
---
 packages/minifier-css/minifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js
index 0994ee6fc8..5489823b5e 100644
--- a/packages/minifier-css/minifier.js
+++ b/packages/minifier-css/minifier.js
@@ -145,7 +145,7 @@ var rewriteRules = function (rules, mergedCssPath) {
         // Rewrite relative paths (that refers to the internal application tree)
         // to absolute paths (addressable from the public build).
         if (isRelative(resource.path)) {
-          absolutePath = pathJoin(basePath, resource.path);
+          absolutePath = pathJoin(basePath, resource.path + resource.hash);
         } else {
           absolutePath = resource.path;
         }

From db8cc011e76a398c6a713297e8d9f7d3d60e380e Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Sun, 13 Nov 2016 21:38:48 -0500
Subject: [PATCH 587/688] Fix case where no hash is present

---
 packages/minifier-css/minifier.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js
index 5489823b5e..ea53fb08a5 100644
--- a/packages/minifier-css/minifier.js
+++ b/packages/minifier-css/minifier.js
@@ -145,7 +145,11 @@ var rewriteRules = function (rules, mergedCssPath) {
         // Rewrite relative paths (that refers to the internal application tree)
         // to absolute paths (addressable from the public build).
         if (isRelative(resource.path)) {
-          absolutePath = pathJoin(basePath, resource.path + resource.hash);
+          if(resource.hash){
+            absolutePath = pathJoin(basePath, resource.path + resource.hash);
+          }else{
+            absolutePath = pathJoin(basePath, resource.path);
+          }
         } else {
           absolutePath = resource.path;
         }

From 237624be9f77c262f7bf37d6003c26a1b1cacde8 Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Sun, 13 Nov 2016 22:11:50 -0500
Subject: [PATCH 588/688] Apply fixed to absolute paths as well

---
 packages/minifier-css/minifier.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js
index ea53fb08a5..67196775ea 100644
--- a/packages/minifier-css/minifier.js
+++ b/packages/minifier-css/minifier.js
@@ -145,14 +145,14 @@ var rewriteRules = function (rules, mergedCssPath) {
         // Rewrite relative paths (that refers to the internal application tree)
         // to absolute paths (addressable from the public build).
         if (isRelative(resource.path)) {
-          if(resource.hash){
-            absolutePath = pathJoin(basePath, resource.path + resource.hash);
-          }else{
-            absolutePath = pathJoin(basePath, resource.path);
-          }
+          absolutePath = pathJoin(basePath, resource.path);
         } else {
           absolutePath = resource.path;
         }
+        
+        if(resource.hash){
+          absolutePath += resource.hash;
+        }
 
         // We used to finish the rewriting process at the absolute path step
         // above. But it didn't work in case the Meteor application was deployed

From 311b0953aa43a47c93f5b6b12d44dd368b137845 Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Sun, 13 Nov 2016 22:45:41 -0500
Subject: [PATCH 589/688] Fixes cases where urls start with "#"

Another issue is URLs that are only a hash (this happens with inline SVG):

filter:url("#lightGreen")

In the current version of the codebase, gets rewritten to :

filter:url("")

The pull request also fixes this issue.
---
 packages/minifier-css/minifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js
index 67196775ea..f4f2d5646e 100644
--- a/packages/minifier-css/minifier.js
+++ b/packages/minifier-css/minifier.js
@@ -138,7 +138,7 @@ var rewriteRules = function (rules, mergedCssPath) {
         // We don't rewrite URLs starting with a protocol definition such as
         // http, https, or data, or those with network-path references
         // i.e. //img.domain.com/cat.gif
-        if (resource.protocol !== null || resource.href.startsWith('//')) {
+        if (resource.protocol !== null || resource.href.startsWith('//') || resource.href.startsWith('#')) {
           continue;
         }
 

From fd7632dde0d03212d9b2f2fafdcae52fa81d5339 Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Mon, 14 Nov 2016 11:02:10 -0500
Subject: [PATCH 590/688] Add spaces before and after parenthesis

---
 packages/minifier-css/minifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js
index f4f2d5646e..ad5c202920 100644
--- a/packages/minifier-css/minifier.js
+++ b/packages/minifier-css/minifier.js
@@ -150,7 +150,7 @@ var rewriteRules = function (rules, mergedCssPath) {
           absolutePath = resource.path;
         }
         
-        if(resource.hash){
+        if (resource.hash) {
           absolutePath += resource.hash;
         }
 

From 067767d36e23c2f51aeaac0f4a6bf721c0690b93 Mon Sep 17 00:00:00 2001
From: choyweston <shawnyg@gmail.com>
Date: Mon, 14 Nov 2016 11:10:46 -0500
Subject: [PATCH 591/688] Add tests for URLs with #

First time building this type of test. Please review :)
---
 packages/minifier-css/urlrewriting-tests.js | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/packages/minifier-css/urlrewriting-tests.js b/packages/minifier-css/urlrewriting-tests.js
index 8626267909..d107db13d2 100644
--- a/packages/minifier-css/urlrewriting-tests.js
+++ b/packages/minifier-css/urlrewriting-tests.js
@@ -97,3 +97,51 @@ Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursio
   t('http://', 'http://', 'malformed URL');
 
 });
+
+Tinytest.add("minifier-css - url rewriting with hash symbols", function (test) {
+  var stylesheet = function(backgroundPath) {
+    return "body { background-image: url(" + backgroundPath + ")}"
+  };
+
+  var parseOptions = { source: null, position: true };
+
+  var t = function(relativeUrl, absoluteUrl, desc) {
+    var ast1 = CssTools.parseCss(stylesheet(relativeUrl), parseOptions);
+    var ast2 = CssTools.parseCss(stylesheet(absoluteUrl), parseOptions);
+    CssTools.rewriteCssUrls(ast1);
+
+    test.equal(CssTools.stringifyCss(ast1), CssTools.stringifyCss(ast2), desc);
+  };
+
+  parseOptions.source = 'packages/nameOfPackage/style.css';
+  t('../filters.svg#theFilterId', 'packages/filters.svg#theFilterId', 'parent directory');
+  t('./../filters.svg#theFilterId', 'packages/filters.svg#theFilterId', 'parent directory');
+  t('../nameOfPackage2/filters.svg#theFilterId', 'packages/nameOfPackage2/filters.svg#theFilterId', 'cousin directory');
+  t('../../filters.svg#theFilterId', 'filters.svg#theFilterId', 'grand parent directory');
+  t('./filters.svg#theFilterId', 'packages/nameOfPackage/filters.svg#theFilterId', 'current directory');
+  t('./child/filters.svg#theFilterId', 'packages/nameOfPackage/child/filters.svg#theFilterId', 'child directory');
+  t('child/filters.svg#theFilterId', 'packages/nameOfPackage/child/filters.svg#theFilterId', 'child directory');
+  t('/filters.svg#theFilterId', 'filters.svg#theFilterId', 'absolute url');
+  t('"/filters.svg#theFilterId"', '"filters.svg#theFilterId"', 'double quoted url');
+  t("'/filters.svg#theFilterId'", "'filters.svg#theFilterId'", 'single quoted url');
+  t('"./../filters.svg#theFilterId"', '"packages/filters.svg#theFilterId"', 'quoted parent directory');
+  t('http://i.imgur.com/filters.svg#theFilterId', 'http://i.imgur.com/filters.svg#theFilterId', 'complete URL');
+  t('"http://i.imgur.com/filters.svg#theFilterId"', '"http://i.imgur.com/filters.svg#theFilterId"', 'complete quoted URL');
+  t('data:image/png;base64,iVBORw0K=#theFilterId', 'data:image/png;base64,iVBORw0K=#theFilterId', 'data URI');
+  t('http://', 'http://', 'malformed URL');
+  t('#theFilterId', '#theFilterId', 'URL starting with a #');
+
+  parseOptions.source = 'application/client/dir/other-style.css';
+  t('./filters.svg#theFilterId', 'filters.svg#theFilterId', 'base path is root');
+  t('./child/filters.svg#theFilterId', 'child/filters.svg#theFilterId', 'child directory from root');
+  t('child/filters.svg#theFilterId', 'child/filters.svg#theFilterId', 'child directory from root');
+  t('/filters.svg#theFilterId', 'filters.svg#theFilterId', 'absolute url');
+  t('"/filters.svg#theFilterId"', '"filters.svg#theFilterId"', 'double quoted url');
+  t("'/filters.svg#theFilterId'", "'filters.svg#theFilterId'", 'single quoted url');
+  t('http://i.imgur.com/filters.svg#theFilterId', 'http://i.imgur.com/filters.svg#theFilterId', 'complete URL');
+  t('"http://i.imgur.com/filters.svg#theFilterId"', '"http://i.imgur.com/filters.svg#theFilterId"', 'complete quoted URL');
+  t('data:image/png;base64,iVBORw0K=#theFilterId', 'data:image/png;base64,iVBORw0K=#theFilterId', 'data URI');
+  t('http://', 'http://', 'malformed URL');
+  t('#theFilterId', '#theFilterId', 'URL starting with a #');
+
+});

From 212b3d0c22c47e561fba1d4f21de1df9d8088231 Mon Sep 17 00:00:00 2001
From: Seba Kerckhof <seba.kerckhof@gmail.com>
Date: Sun, 2 Oct 2016 11:39:01 +0200
Subject: [PATCH 592/688] Implement $min, $max, $currentDate modifiers

---
 packages/minimongo/minimongo_tests.js | 54 ++++++++++++++++++++++++++-
 packages/minimongo/modify.js          | 40 ++++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 5a77df7652..2898156114 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2086,7 +2086,12 @@ Tinytest.add("minimongo - modify", function (test) {
     coll.update(query, mod);
     var actual = coll.findOne();
     delete actual._id;  // added by insert
-    test.equal(actual, expected, EJSON.stringify({input: doc, mod: mod}));
+
+    if (typeof expected === "function") {
+      expected(actual, EJSON.stringify({input: doc, mod: mod}));
+    } else {
+      test.equal(actual, expected, EJSON.stringify({input: doc, mod: mod}));
+    }
   };
   var modify = function (doc, mod, expected) {
     modifyWithQuery(doc, {}, mod, expected);
@@ -2235,6 +2240,53 @@ Tinytest.add("minimongo - modify", function (test) {
   modify({a: {b: 2}}, {$inc: {'a.c': 10}}, {a: {b: 2, c: 10}});
   exception({}, {$inc: {_id: 1}});
 
+  // $currentDate
+  modify({}, {$currentDate: {a: true}}, (result, msg) => { test.instanceOf(result.a,Date,msg) });
+  modify({}, {$currentDate: {a: {$type: "date"}}}, (result, msg) => { test.instanceOf(result.a,Date,msg) });
+  exception({}, {$currentDate: {a: false}});
+  exception({}, {$currentDate: {a: {}}});
+  exception({}, {$currentDate: {a: {$type: "timestamp"}}});
+
+  // $min
+  modify({a: 1, b: 2}, {$min: {b: 1}}, {a: 1, b: 1});
+  modify({a: 1, b: 2}, {$min: {b: 3}}, {a: 1, b: 2});
+  modify({a: 1, b: 2}, {$min: {c: 10}}, {a: 1, b: 2, c: 10});
+  exception({a: 1}, {$min: {a: '10'}});
+  exception({a: 1}, {$min: {a: true}});
+  exception({a: 1}, {$min: {a: [10]}});
+  exception({a: '1'}, {$min: {a: 10}});
+  exception({a: [1]}, {$min: {a: 10}});
+  exception({a: {}}, {$min: {a: 10}});
+  exception({a: false}, {$min: {a: 10}});
+  exception({a: null}, {$min: {a: 10}});
+  modify({a: [1, 2]}, {$min: {'a.1': 1}}, {a: [1, 1]});
+  modify({a: [1, 2]}, {$min: {'a.1': 3}}, {a: [1, 2]});
+  modify({a: [1, 2]}, {$min: {'a.2': 10}}, {a: [1, 2, 10]});
+  modify({a: [1, 2]}, {$min: {'a.3': 10}}, {a: [1, 2, null, 10]});
+  modify({a: {b: 2}}, {$min: {'a.b': 1}}, {a: {b: 1}});
+  modify({a: {b: 2}}, {$min: {'a.c': 10}}, {a: {b: 2, c: 10}});
+  exception({}, {$min: {_id: 1}});
+
+  // $max
+  modify({a: 1, b: 2}, {$max: {b: 1}}, {a: 1, b: 2});
+  modify({a: 1, b: 2}, {$max: {b: 3}}, {a: 1, b: 3});
+  modify({a: 1, b: 2}, {$max: {c: 10}}, {a: 1, b: 2, c: 10});
+  exception({a: 1}, {$max: {a: '10'}});
+  exception({a: 1}, {$max: {a: true}});
+  exception({a: 1}, {$max: {a: [10]}});
+  exception({a: '1'}, {$max: {a: 10}});
+  exception({a: [1]}, {$max: {a: 10}});
+  exception({a: {}}, {$max: {a: 10}});
+  exception({a: false}, {$max: {a: 10}});
+  exception({a: null}, {$max: {a: 10}});
+  modify({a: [1, 2]}, {$max: {'a.1': 3}}, {a: [1, 3]});
+  modify({a: [1, 2]}, {$max: {'a.1': 1}}, {a: [1, 2]});
+  modify({a: [1, 2]}, {$max: {'a.2': 10}}, {a: [1, 2, 10]});
+  modify({a: [1, 2]}, {$max: {'a.3': 10}}, {a: [1, 2, null, 10]});
+  modify({a: {b: 2}}, {$max: {'a.b': 3}}, {a: {b: 3}});
+  modify({a: {b: 2}}, {$max: {'a.c': 10}}, {a: {b: 2, c: 10}});
+  exception({}, {$max: {_id: 1}});
+
   // $set
   modify({a: 1, b: 2}, {$set: {a: 10}}, {a: 10, b: 2});
   modify({a: 1, b: 2}, {$set: {c: 10}}, {a: 1, b: 2, c: 10});
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 348e31a51e..bb140d23e9 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -182,6 +182,46 @@ var NO_CREATE_MODIFIERS = {
 };
 
 var MODIFIERS = {
+  $currentDate: function (target, field, arg) {
+    if (typeof arg === "object" && arg.hasOwnProperty("$type")) {
+       if (arg.$type !== "date") {
+         throw MinimongoError("Minimongo does currently only support the date type in $currentDate modifiers");
+       }
+    } else if (arg !== true) {
+      throw MinimongoError("Invalid $currentDate modifier");
+    }
+    target[field] = new Date();
+  },
+  $min: function (target, field, arg) {
+    if (typeof arg !== "number") {
+      throw MinimongoError("Modifier $min allowed for numbers only");
+    }
+    if (field in target) {
+      if (typeof target[field] !== "number") {
+        throw MinimongoError("Cannot apply $min modifier to non-number");
+      }
+      if (target[field] > arg) {
+        target[field] = arg;
+      }
+    } else {
+      target[field] = arg;
+    }
+  },
+  $max: function (target, field, arg) {
+    if (typeof arg !== "number") {
+      throw MinimongoError("Modifier $max allowed for numbers only");
+    }
+    if (field in target) {
+      if (typeof target[field] !== "number") {
+        throw MinimongoError("Cannot apply $max modifier to non-number");
+      }
+      if (target[field] < arg) {
+         target[field] = arg;
+      }
+    } else {
+      target[field] = arg;
+    }
+  },
   $inc: function (target, field, arg) {
     if (typeof arg !== "number")
       throw MinimongoError("Modifier $inc allowed for numbers only");

From ca50223f5eed51626e98d6aa1ec09c2ddba7e345 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 26 Oct 2016 09:29:11 -0400
Subject: [PATCH 593/688] Preventing undefined callback from being passed into
 the forgotPassword Method, which in turn prevents unnecessary
 audit-argument-checks warnings.

---
 packages/accounts-password/password_client.js |  6 ++-
 packages/accounts-password/password_tests.js  | 39 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index bc1478507f..1a5bcd468c 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -220,7 +220,11 @@ Accounts.forgotPassword = function(options, callback) {
   if (!options.email) {
     return reportError(new Meteor.Error(400, "Must pass options.email"), callback);
   }
-  Accounts.connection.call("forgotPassword", options, callback);
+  if (callback) {
+    Accounts.connection.call("forgotPassword", options, callback);
+  } else {
+    Accounts.connection.call("forgotPassword", options);
+  }
 };
 
 // Resets a password based on a token originally created by
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 1d9467d6b5..ceb980c920 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -2,7 +2,7 @@ Accounts._noConnectionCloseDelayForTest = true;
 
 if (Meteor.isServer) {
   Accounts.removeDefaultRateLimit();
-  
+
   Meteor.methods({
     getResetToken: function () {
       var token = Meteor.users.findOne(this.userId).services.password.reset;
@@ -557,8 +557,8 @@ if (Meteor.isClient) (function () {
       }, 10 * 1000, 100);
     }
   ]);
-  
-  
+
+
   testAsyncMulti("passwords - forgotPassword client return error when empty email", [
     function (test, expect) {
       // setup
@@ -578,7 +578,36 @@ if (Meteor.isClient) (function () {
       }, /Must pass options\.email/);
     },
   ]);
- 
+
+  Tinytest.add(
+    'passwords - forgotPassword only passes callback value to forgotPassword '
+    + 'Method if callback is defined',
+    function (test) {
+      let methodCallArgumentCount = 0;
+      const originalMethodCall = Accounts.connection.call;
+      const stubMethodCall = (...args) => {
+        methodCallArgumentCount = args.length;
+      }
+      Accounts.connection.call = stubMethodCall;
+
+      Accounts.forgotPassword({ email: 'test@meteor.com' });
+      test.equal(
+        methodCallArgumentCount,
+        2,
+        'Method call should have 2 arguments since no callback is passed in'
+      );
+
+      Accounts.forgotPassword({ email: 'test@meteor.com' }, () => {});
+      test.equal(
+        methodCallArgumentCount,
+        3,
+        'Method call should have 3 arguments since a callback is passed in'
+      );
+
+      Accounts.connection.call = originalMethodCall;
+    }
+  );
+
   testAsyncMulti("passwords - verifyEmail client return error when empty token", [
     function (test, expect) {
       // setup
@@ -598,7 +627,7 @@ if (Meteor.isClient) (function () {
       }, /Need to pass token/);
     },
   ]);
- 
+
   testAsyncMulti("passwords - resetPassword errors", [
     function (test, expect) {
       // setup

From 307b246b6add97771fd273ea72c03a15238fadc5 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 26 Oct 2016 11:59:44 -0400
Subject: [PATCH 594/688] Minor formatting adjustment to force CI rebuild.

---
 packages/accounts-password/password_client.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index 1a5bcd468c..28e2787c4f 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -220,6 +220,7 @@ Accounts.forgotPassword = function(options, callback) {
   if (!options.email) {
     return reportError(new Meteor.Error(400, "Must pass options.email"), callback);
   }
+
   if (callback) {
     Accounts.connection.call("forgotPassword", options, callback);
   } else {

From e0b3b390a05b8dd3b583051267c503de1b0d1308 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Tue, 1 Nov 2016 10:04:50 -0400
Subject: [PATCH 595/688] Updated test description to include the issue # being
 resolved (#5676).

---
 packages/accounts-password/password_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index ceb980c920..3a3e564f21 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -581,7 +581,7 @@ if (Meteor.isClient) (function () {
 
   Tinytest.add(
     'passwords - forgotPassword only passes callback value to forgotPassword '
-    + 'Method if callback is defined',
+    + 'Method if callback is defined (to address issue #5676)',
     function (test) {
       let methodCallArgumentCount = 0;
       const originalMethodCall = Accounts.connection.call;

From 8d06a169949595ea36b4eb625db8e798cadfba80 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:47:57 +1100
Subject: [PATCH 596/688] Add changelog entry for #7807

---
 History.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/History.md b/History.md
index b7472a6474..dd7d7632c1 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,11 @@
 ## v.NEXT
 
+* `meteor create` now has a new `--full` option, which generates an larger app,
+  demonstrating development techniques highlighted in the
+  [Meteor Guide](http://guide.meteor.com)
+
+  [PR #7807](https://github.com/meteor/meteor/pull/7807)
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application

From 47255dfaa2f84d3b7d9e845c5ee7ab238a60e6bf Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:52:21 +1100
Subject: [PATCH 597/688] Changelog entry for #7858

---
 History.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/History.md b/History.md
index dd7d7632c1..09c0428989 100644
--- a/History.md
+++ b/History.md
@@ -4,8 +4,16 @@
   demonstrating development techniques highlighted in the
   [Meteor Guide](http://guide.meteor.com)
 
+  [Issue #6974](https://github.com/meteor/meteor/issues/6974)
   [PR #7807](https://github.com/meteor/meteor/pull/7807)
 
+* Minimongo now supports `$min`, `$max` and partially supports `$currentDate`.
+
+  [Issue #7857](https://github.com/meteor/meteor/issues/7857)
+  [PR #7858](https://github.com/meteor/meteor/pull/7858)
+
+
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application

From 7b8ef48db65802418c512968eee59295b3b57765 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@thesnail.org>
Date: Wed, 9 Nov 2016 10:58:13 +1100
Subject: [PATCH 598/688] Changelog for 7968

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 09c0428989..00bf70355f 100644
--- a/History.md
+++ b/History.md
@@ -12,6 +12,9 @@
   [Issue #7857](https://github.com/meteor/meteor/issues/7857)
   [PR #7858](https://github.com/meteor/meteor/pull/7858)
 
+* Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
+  [PR #7968](https://github.com/meteor/meteor/pull/7968)
+
 
 
 ## v1.4.2.1

From 4f4ab1b68f95bf07d929bec135c520dc19b25a4e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 11 Nov 2016 11:08:01 -0500
Subject: [PATCH 599/688] Ugrade Node to version 4.6.2.

---
 History.md                         | 7 ++++---
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index 00bf70355f..576678734d 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,9 @@
 ## v.NEXT
 
+## v1.4.2.2
+
+* Node has been upgraded to version 4.6.2.
+
 * `meteor create` now has a new `--full` option, which generates an larger app,
   demonstrating development techniques highlighted in the
   [Meteor Guide](http://guide.meteor.com)
@@ -8,15 +12,12 @@
   [PR #7807](https://github.com/meteor/meteor/pull/7807)
 
 * Minimongo now supports `$min`, `$max` and partially supports `$currentDate`.
-
   [Issue #7857](https://github.com/meteor/meteor/issues/7857)
   [PR #7858](https://github.com/meteor/meteor/pull/7858)
 
 * Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
   [PR #7968](https://github.com/meteor/meteor/pull/7968)
 
-
-
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index ee5e35a744..067c747d65 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -6,7 +6,7 @@ set -u
 UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
-NODE_VERSION=4.6.1
+NODE_VERSION=4.6.2
 NPM_VERSION=3.10.9
 
 if [ "$UNAME" == "Linux" ] ; then
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 7112d2b0ed..42ecbbd0ea 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -2,7 +2,7 @@
 # use 32bit by default
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
-$NODE_VERSION = "4.6.1"
+$NODE_VERSION = "4.6.2"
 $NPM_VERSION = "3.10.9"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 

From 0eb714fe215a1d6d77c296346ebb459ae12a4484 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 11 Nov 2016 11:08:30 -0500
Subject: [PATCH 600/688] Bump $BUNDLE_VERSION to 4.7.0 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 90fdaaa918..864e225165 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.6.2
+BUNDLE_VERSION=4.7.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 8d1133743d7dae431bd30d822c68ded9c69a461d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 11 Nov 2016 22:03:43 -0500
Subject: [PATCH 601/688] Fix options.transformFilename behavior in files.cp_r.

The options.transformFilename function is only supposed to transform
target file names, not the names of source files to be copied.

This behavior was broken by c5809a4a1c90a4878a6883639e2d1b6da0698aca
between Meteor 1.4.0.1 and 1.4.1. Thank goodness for `git bisect`!

The biggest symptom of this mistake was that `meteor create --package`
no longer created files based on the ~fs-name~.js and ~fs-name~-tests.js
template files.

This probably merits a 1.4.1.4 release in addition to 1.4.2.2.
---
 tools/fs/files.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/fs/files.js b/tools/fs/files.js
index 15bc88c0e2..5be613c173 100644
--- a/tools/fs/files.js
+++ b/tools/fs/files.js
@@ -479,12 +479,14 @@ files.cp_r = function(from, to, options = {}) {
         return;
       }
 
+      const fullFrom = files.pathJoin(from, f);
+
       if (options.transformFilename) {
         f = options.transformFilename(f);
       }
 
       files.cp_r(
-        files.pathJoin(from, f),
+        fullFrom,
         files.pathJoin(to, f),
         options
       );

From 911f25bbf4f1ccf4f95c60032c3cefd8eb1eb206 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 13 Nov 2016 14:59:17 -0500
Subject: [PATCH 602/688] Allow lazy api.mainModule modules.

If you call api.mainModule(path, where, { lazy: true }), that main
module will not be evaluated until other code imports it at runtime, and
won't even be bundled if no other code imports it.

Closes #6132.
---
 History.md                        | 16 ++++++++++++++++
 tools/isobuild/compiler-plugin.js | 21 +++++++++++++++++----
 tools/isobuild/package-api.js     | 26 ++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 576678734d..8381d6b51a 100644
--- a/History.md
+++ b/History.md
@@ -18,6 +18,22 @@
 * Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
   [PR #7968](https://github.com/meteor/meteor/pull/7968)
 
+* It is now possible for packages to specify a *lazy* main module:
+  ```js
+  Package.onUse(function (api) {
+    api.mainModule("client.js", "client", { lazy: true });
+  });
+  ```
+  This means the `client.js` module will not be evaluated during app
+  startup unless/until another module imports it, and will not even be
+  included in the client bundle if no importing code is found. **Note 1:**
+  packages with lazy main modules cannot use `api.export` to export global
+  symbols to other packages/apps. **Note 2:** packages with lazy main
+  modules should be restricted to Meteor 1.4.2.2 or later via
+  `api.versionsFrom("1.4.2.2")`, since older versions of Meteor cannot
+  import lazy main modules using `import "meteor/<package name>"` but must
+  explicitly name the module: `import "meteor/<package name>/client.js"`.
+
 ## v1.4.2.1
 
 * Installing the `babel-runtime` npm package in your application
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 8e493a3d22..5cd2ea45f9 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -938,6 +938,7 @@ export class PackageSourceBatch {
 
       map.set(name, {
         files: inputFiles,
+        mainModule: _.find(inputFiles, file => file.mainModule) || null,
         importExtensions: batch.importExtensions,
       });
     });
@@ -961,9 +962,8 @@ export class PackageSourceBatch {
       map.forEach((info, name) => {
         if (! name) return;
 
-        let mainModule = _.find(info.files, file => file.mainModule);
-        mainModule = mainModule ?
-          `meteor/${name}/${mainModule.targetPath}` : false;
+        const mainModule = info.mainModule &&
+          `meteor/${name}/${info.mainModule.targetPath}`;
 
         meteorPackageInstalls.push(
           "install(" + JSON.stringify(name) +
@@ -1040,11 +1040,24 @@ export class PackageSourceBatch {
         let name = null;
 
         if (parts[0] === "meteor") {
+          let found = false;
+          name = parts[1];
+
           if (parts.length > 2) {
-            name = parts[1];
             parts[1] = ".";
             id = parts.slice(1).join("/");
+            found = true;
+
           } else {
+            const entry = map.get(name);
+            const mainModule = entry && entry.mainModule;
+            if (mainModule) {
+              id = "./" + mainModule.sourcePath;
+              found = true;
+            }
+          }
+
+          if (! found) {
             return;
           }
         }
diff --git a/tools/isobuild/package-api.js b/tools/isobuild/package-api.js
index 0fde64b4ff..23324c4794 100644
--- a/tools/isobuild/package-api.js
+++ b/tools/isobuild/package-api.js
@@ -346,13 +346,15 @@ _.extend(PackageAPI.prototype, {
     this._addFiles("sources", paths, arch, fileOptions);
   },
 
-  mainModule(path, arch) {
+  mainModule(path, arch, fileOptions = {}) {
     arch = toArchArray(arch);
+
     forAllMatchingArchs(arch, a => {
       const filesForArch = this.files[a];
       const source = {
         relPath: pathRelative(".", path),
         fileOptions: {
+          ...fileOptions,
           mainModule: true
         }
       };
@@ -366,9 +368,23 @@ _.extend(PackageAPI.prototype, {
 
       filesForArch.main = source;
       filesForArch.sources.push(source);
+
+      this._forbidExportWithLazyMain(a);
     });
   },
 
+  _forbidExportWithLazyMain(arch) {
+    const filesForArch = this.files[arch];
+    if (filesForArch.main &&
+        filesForArch.main.fileOptions.lazy &&
+        this.exports[arch].length > 0) {
+      buildmessage.error(
+        "Architecture " + JSON.stringify(arch) + " cannot both " +
+          "export symbols and have a lazy main module"
+      );
+    }
+  },
+
   /**
    * @memberOf PackageAPI
    * @instance
@@ -586,8 +602,14 @@ _.extend(PackageAPI.prototype, {
         // recover by ignoring
         return;
       }
+
       forAllMatchingArchs(arch, function (w) {
-        self.exports[w].push({name: symbol, testOnly: !!options.testOnly});
+        self.exports[w].push({
+          name: symbol,
+          testOnly: !! options.testOnly,
+        });
+
+        self._forbidExportWithLazyMain(w);
       });
     });
   }

From 2437f72cd7fa482891abd99f75d6f06124761971 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 10:25:47 -0500
Subject: [PATCH 603/688] Strip unnecessary imports for packages with no
 modules.

Note that even an empty package needs to define Package[name] = {}, so
that other packages can tell at runtime whether it's installed.

Fixes #7927.
---
 tools/isobuild/linker.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 1dbd48ebc2..04d524d618 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -1002,6 +1002,21 @@ export var fullLink = Profile("linker.fullLink", function (inputFiles, {
     return [];
   }
 
+  // If none of the prelinkedFiles contain any code, then the only
+  // possible purpose of this package is to re-export imported symbols, so
+  // we filter the set of imported symbols according to declaredExports.
+  // When there are no declaredExports, this effectively slims the package
+  // bundle down to just Package[name] = {}.
+  if (prelinkedFiles.every(file => ! file.source)) {
+    const newImports = {};
+    declaredExports.forEach(name => {
+      if (_.has(imports, name)) {
+        newImports[name] = imports[name]
+      }
+    });
+    imports = newImports;
+  }
+
   // Otherwise we're making a package and we have to actually combine the files
   // into a single scope.
   var header = getHeader({

From 41713dacf732642de8e4fce27f4199e3e7847961 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 11:43:38 -0500
Subject: [PATCH 604/688] Include `meteor npm install` in new app instructions.

Thanks to @ptica for this suggestion:
https://github.com/meteor/meteor/issues/8042#issuecomment-260277876
---
 tools/cli/commands.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 5db685e182..b88977d16e 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -769,6 +769,11 @@ main.registerCommand({
         Console.options({ indent: 2 }));
   }
 
+  Console.info(
+    Console.command("meteor npm install"),
+    Console.options({ indent: 2 }),
+  );
+
   Console.info(
     Console.command("meteor"), Console.options({ indent: 2 }));
 

From 9f25353745175cae3d180f2de9e832a157611cf5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 12:57:35 -0500
Subject: [PATCH 605/688] Bump package versions for 1.4.2.2-beta.2 release.

---
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/twitter/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 42bf1c7298..844413f0d3 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.2"
+  version: "1.3.3-beta.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 54b3b2db82..669eb199f4 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.0',
+  version: '1.0.1-beta.2',
   documentation: 'README.md'
 });
 
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 22828ffe22..cad01c821b 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1_3"
+  version: "1.11.1-4-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 80d13f20f8..1f9691afd6 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.1-beta.0',
+  version: '0.6.1-beta.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 3111131fb2..3d8e3ea920 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.7',
+  version: '2.7.8-beta.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index bf67789df3..065452dd21 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-2-beta.0'
+  version: '1.4.2-2-beta.2'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 8ae9f077c1..63986557db 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.18'
+  version: '1.0.19-beta.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 89e0ed22a5..3407036a1c 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.7"
+  version: "2.513.8-beta.2"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index a837a6adc7..1e1e05f6f8 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.14-beta.0'
+  version: '1.1.14-beta.2'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 7381df9b75..61fd3d9745 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.2-beta.0",
+ "version": "1.4.2.2-beta.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e3387599a2f28e9fd08adf10e1411ee06ec95534 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 13:35:50 -0500
Subject: [PATCH 606/688] Test lazy main modules and stray imports in modules
 test app.

---
 tools/tests/apps/modules/.meteor/packages     |  2 +-
 .../packages/modules-test-package/package.js  |  6 +++--
 .../packages/modules-test-package/server.js   |  2 +-
 tools/tests/apps/modules/tests.js             | 26 ++++++++++++++++++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 9a351d5ba1..6e8353e68b 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -15,7 +15,6 @@ tracker@1.1.1                 # Meteor's client-side reactive programming librar
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
 ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
 
-coffeescript@1.11.1_3
 modules-test-package
 avital:mocha
 standard-minifier-css@1.3.2
@@ -23,3 +22,4 @@ standard-minifier-js@1.2.1
 client-only-ecmascript
 modules-test-plugin
 shell-server@0.2.1
+coffeescript
diff --git a/tools/tests/apps/modules/packages/modules-test-package/package.js b/tools/tests/apps/modules/packages/modules-test-package/package.js
index 3e708129ad..022510cd73 100644
--- a/tools/tests/apps/modules/packages/modules-test-package/package.js
+++ b/tools/tests/apps/modules/packages/modules-test-package/package.js
@@ -14,9 +14,11 @@ Npm.depends({
 Package.onUse(function(api) {
   api.use('ecmascript');
   api.use('templating');
-  api.mainModule("client.js", "client");
+  api.mainModule("client.js", "client", {
+    lazy: true
+  });
   api.mainModule("server.js", "server");
-  api.export("ModulesTestPackage");
+  api.export("ModulesTestPackage", "server");
 });
 
 Package.onTest(function (api) {
diff --git a/tools/tests/apps/modules/packages/modules-test-package/server.js b/tools/tests/apps/modules/packages/modules-test-package/server.js
index 85bb87f080..fb8294f778 100644
--- a/tools/tests/apps/modules/packages/modules-test-package/server.js
+++ b/tools/tests/apps/modules/packages/modules-test-package/server.js
@@ -3,7 +3,7 @@ import assert from "assert";
 import * as common from "./common";
 assert.strictEqual(common.ModulesTestPackage, "loaded");
 
-export {ModulesTestPackage} from "./common";
+export { ModulesTestPackage } from "./common";
 
 export const where = "server";
 
diff --git a/tools/tests/apps/modules/tests.js b/tools/tests/apps/modules/tests.js
index ae67e3b7d0..c4f0d0a9a1 100644
--- a/tools/tests/apps/modules/tests.js
+++ b/tools/tests/apps/modules/tests.js
@@ -164,6 +164,20 @@ describe("css modules", () => {
   });
 
   it("should be importable by a package", () => {
+    assert.strictEqual(
+      $(".pkg-lazy-css.imported").css("padding"),
+      "0px"
+    );
+
+    assert.strictEqual(
+      $(".pkg-lazy-css.not-imported").css("padding"),
+      "0px"
+    );
+
+    // Since client.js is a lazy main module, its side effects don't
+    // happen until we import it for the first time (here).
+    require("meteor/modules-test-package/client.js");
+
     assert.strictEqual(
       $(".pkg-lazy-css.imported").css("padding"),
       "20px"
@@ -293,8 +307,18 @@ describe("Meteor packages", () => {
   });
 
   it("can be local", () => {
-    assert.strictEqual(ModulesTestPackage, "loaded");
+    // ModulesTestPackage is only api.export-ed on the server.
+    if (Meteor.isServer) {
+      assert.strictEqual(ModulesTestPackage, "loaded");
+    }
+    if (Meteor.isClient) {
+      assert.strictEqual(typeof ModulesTestPackage, "undefined");
+    }
+
+    // But it is importable by both client and server.
     const mtp = require("meteor/modules-test-package");
+    assert.strictEqual(mtp.ModulesTestPackage, "loaded");
+
     assert.strictEqual(mtp.where, Meteor.isServer ? "server" : "client");
   });
 

From 705a0c17095c84086c35371b41729a38a8600078 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Mon, 14 Nov 2016 13:42:49 -0500
Subject: [PATCH 607/688] Very minor stylistic tweaks to css-minifier tests.

---
 packages/minifier-css/urlrewriting-tests.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/minifier-css/urlrewriting-tests.js b/packages/minifier-css/urlrewriting-tests.js
index d107db13d2..91491acdd2 100644
--- a/packages/minifier-css/urlrewriting-tests.js
+++ b/packages/minifier-css/urlrewriting-tests.js
@@ -6,13 +6,13 @@ Tinytest.add("minifier-css - url rewriting when merging", function (test) {
 
   var parseOptions = { source: null, position: true };
 
-  var t = function(relativeUrl, absoluteUrl, desc) {
+  function t(relativeUrl, absoluteUrl, desc) {
     var ast1 = CssTools.parseCss(stylesheet(relativeUrl), parseOptions);
     var ast2 = CssTools.parseCss(stylesheet(absoluteUrl), parseOptions);
     CssTools.rewriteCssUrls(ast1);
 
     test.equal(CssTools.stringifyCss(ast1), CssTools.stringifyCss(ast2), desc);
-  };
+  }
 
   parseOptions.source = 'packages/nameOfPackage/style.css';
   t('../image.png', 'packages/image.png', 'parent directory');
@@ -42,7 +42,6 @@ Tinytest.add("minifier-css - url rewriting when merging", function (test) {
   t('"http://i.imgur.com/fBcdJIh.gif"', '"http://i.imgur.com/fBcdJIh.gif"', 'complete quoted URL');
   t('data:image/png;base64,iVBORw0K=', 'data:image/png;base64,iVBORw0K=', 'data URI');
   t('http://', 'http://', 'malformed URL');
-
 });
 
 Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursion)", function (test) {

From e4c7b0890cdfaaa5d92db1cbcde39c62ccb5e12f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 14:17:20 -0500
Subject: [PATCH 608/688] Watch all imported files in linked npm packages on
 server.

---
 tools/fs/optimistic.js           |  4 ++--
 tools/isobuild/import-scanner.js | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tools/fs/optimistic.js b/tools/fs/optimistic.js
index 74290628a2..902030d11f 100644
--- a/tools/fs/optimistic.js
+++ b/tools/fs/optimistic.js
@@ -74,7 +74,7 @@ function makeOptimistic(name, fn) {
   return Profile("optimistic " + name, wrapper);
 }
 
-function shouldWatch(path) {
+export const shouldWatch = wrap(path => {
   const parts = path.split(pathSep);
   const nmi = parts.indexOf("node_modules");
 
@@ -113,7 +113,7 @@ function shouldWatch(path) {
   // instead we rely on dependOnNodeModules to tell us when files in
   // node_modules directories might have changed.
   return false;
-}
+});
 
 function maybeDependOnNodeModules(path) {
   if (typeof path !== "string") {
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 351dd345db..23c8127930 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -28,6 +28,7 @@ import {
   optimisticReadFile,
   optimisticStatOrNull,
   optimisticHashOrNull,
+  shouldWatch,
 } from "../fs/optimistic.js";
 
 import Resolver from "./resolver.js";
@@ -557,11 +558,19 @@ export default class ImportScanner {
       // Append this file to the output array and record its index.
       this._addFile(absImportedPath, depFile);
 
+      // On the server, modules in node_modules directories will be
+      // handled natively by Node, so we don't need to build a
+      // meteorInstall-style bundle beyond the entry-point module.
       if (! this.isWeb() &&
-          depFile.installPath.startsWith("node_modules/")) {
-        // On the server, modules in node_modules directories will be
-        // handled natively by Node, so we don't need to build a
-        // meteorInstall-style bundle beyond the entry-point module.
+          depFile.installPath.startsWith("node_modules/") &&
+          // If optimistic functions care about this file, e.g. because it
+          // resides in a linked npm package, then we should allow it to
+          // be watched by including it in the server bundle by not
+          // returning here. Note that inclusion in the server bundle is
+          // an unnecessary consequence of this logic, since Node will
+          // still evaluate this module natively on the server. What we
+          // really care about is watching the file for changes.
+          ! shouldWatch(absImportedPath)) {
         return;
       }
 

From 5fc1cfa2e7cf70a94c8ad301ef198c6a284e8b9a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 20:00:34 -0500
Subject: [PATCH 609/688] Bump package versions for 1.4.2.2-rc.0 release.

---
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/twitter/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 844413f0d3..551c1790ea 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.3-beta.2"
+  version: "1.3.3-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 669eb199f4..3c4d206739 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.1-beta.2',
+  version: '1.0.1-rc.0',
   documentation: 'README.md'
 });
 
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index cad01c821b..308d6ff520 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-4-beta.2"
+  version: "1.11.1-4-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1f9691afd6..00039b88e9 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.1-beta.2',
+  version: '0.6.1-rc.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 3d8e3ea920..368fd21a03 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.8-beta.2',
+  version: '2.7.8-rc.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 065452dd21..e2a828e487 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-2-beta.2'
+  version: '1.4.2-2-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 63986557db..020928e7f8 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.19-beta.2'
+  version: '1.0.19-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 3407036a1c..f2565fdbc6 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.8-beta.2"
+  version: "2.513.8-rc.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 1e1e05f6f8..677ca18af4 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.14-beta.2'
+  version: '1.1.14-rc.0'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 61fd3d9745..97ea2a629e 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.2-beta.2",
+ "version": "1.4.2.2-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 24b0ea9fdddafffcd15ef910cf0c26ddc0835a8e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 21:05:57 -0500
Subject: [PATCH 610/688] Bump compiler/linker/bundler salts to trigger fresh
 builds.

---
 tools/isobuild/bundler.js         | 2 +-
 tools/isobuild/compiler-plugin.js | 2 +-
 tools/isobuild/compiler.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 218de26b6e..3fce252f16 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -563,7 +563,7 @@ class File {
 
   static _salt() {
     // Increment this number to force rehashing.
-    return 1;
+    return 2;
   }
 
   hash() {
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 5cd2ea45f9..b9d9a453c7 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -62,7 +62,7 @@ import { isTestFilePath } from './test-files.js';
 // Cache the (slightly post-processed) results of linker.fullLink.
 const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100;
 const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG;
-const LINKER_CACHE_SALT = 12; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 13; // Increment this number to force relinking.
 const LINKER_CACHE = new LRU({
   max: CACHE_SIZE,
   // Cache is measured in bytes. We don't care about servePath.
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index 3006b93896..bca69ccf4b 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -34,7 +34,7 @@ var compiler = exports;
 // dependencies. (At least for now, packages only used in target creation (eg
 // minifiers) don't require you to update BUILT_BY, though you will need to quit
 // and rerun "meteor run".)
-compiler.BUILT_BY = 'meteor/25';
+compiler.BUILT_BY = 'meteor/26';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From 2f47f8049c0638a7738694061ba170d7c81778c9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 14 Nov 2016 21:09:18 -0500
Subject: [PATCH 611/688] Bump $BUNDLE_VERSION to 4.7.1 before rebuilding dev
 bundle.

This build includes another attempt to include python.exe reliably in
the Windows dev bundle, thanks to https://github.com/winpython/winpython.
---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 864e225165..c6cc7e2ae4 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.0
+BUNDLE_VERSION=4.7.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 824e68872f973e009c416a0473623512777de56b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 15 Nov 2016 09:40:47 -0500
Subject: [PATCH 612/688] Bump package versions for 1.4.2.2-rc.1 release.

---
 packages/accounts-password/package.js          | 2 +-
 packages/babel-runtime/package.js              | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/stylus/package.js                     | 2 +-
 packages/twitter/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 551c1790ea..31d7b0a850 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.3-rc.0"
+  version: "1.3.3-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index 3c4d206739..f1dc2162ac 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.1-rc.0',
+  version: '1.0.1-rc.1',
   documentation: 'README.md'
 });
 
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 308d6ff520..bff3ec4fa1 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-4-rc.0"
+  version: "1.11.1-4-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 00039b88e9..15c10e4700 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.1-rc.0',
+  version: '0.6.1-rc.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 368fd21a03..5db9b5c061 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.8-rc.0',
+  version: '2.7.8-rc.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e2a828e487..e7d0636d7c 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-2-rc.0'
+  version: '1.4.2-2-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 020928e7f8..5da50f5ee4 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.19-rc.0'
+  version: '1.0.19-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index f2565fdbc6..06014d14ad 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.8-rc.0"
+  version: "2.513.8-rc.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 677ca18af4..54a1688937 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.14-rc.0'
+  version: '1.1.14-rc.1'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 97ea2a629e..4a954ac2ce 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.2-rc.0",
+ "version": "1.4.2.2-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From fda40742fed13fb3a2b3dfb5721fb171a22c490a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 15 Nov 2016 19:59:10 -0500
Subject: [PATCH 613/688] Bump package versions for the official 1.4.2.2
 release.

---
 packages/accounts-password/package.js      | 2 +-
 packages/babel-runtime/package.js          | 2 +-
 packages/coffeescript/package.js           | 2 +-
 packages/ecmascript/package.js             | 2 +-
 packages/less/package.js                   | 2 +-
 packages/meteor-tool/package.js            | 2 +-
 packages/minimongo/package.js              | 2 +-
 packages/stylus/package.js                 | 2 +-
 packages/twitter/package.js                | 2 +-
 scripts/admin/meteor-release-official.json | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 31d7b0a850..d9cf68e575 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Password support for accounts",
-  version: "1.3.3-rc.1"
+  version: "1.3.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js
index f1dc2162ac..62287ce5d1 100644
--- a/packages/babel-runtime/package.js
+++ b/packages/babel-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-runtime",
   summary: "Runtime support for output of Babel transpiler",
-  version: '1.0.1-rc.1',
+  version: '1.0.1',
   documentation: 'README.md'
 });
 
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index bff3ec4fa1..c35ad69cea 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-4-rc.1"
+  version: "1.11.1_4"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 15c10e4700..5666303489 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.1-rc.1',
+  version: '0.6.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/less/package.js b/packages/less/package.js
index 5db9b5c061..45903251a8 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.8-rc.1',
+  version: '2.7.8',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e7d0636d7c..38d8e3bca0 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-2-rc.1'
+  version: '1.4.2_2'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 5da50f5ee4..acdeaf194b 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: '1.0.19-rc.1'
+  version: '1.0.19'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 06014d14ad..7a0007e3fa 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.8-rc.1"
+  version: "2.513.8"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/twitter/package.js b/packages/twitter/package.js
index 54a1688937..5990669598 100644
--- a/packages/twitter/package.js
+++ b/packages/twitter/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Twitter OAuth flow",
-  version: '1.1.14-rc.1'
+  version: '1.1.14'
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 0a21c31d02..00218a212d 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,7 +1,7 @@
 {
   "track": "METEOR",
-  "version": "1.4.2.1",
-  "patchFrom": ["1.4.2"],
+  "version": "1.4.2.2",
+  "patchFrom": ["1.4.2", "1.4.2.1"],
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

From 52b815cf33b749c63e9184a0924da9d8fc41eb27 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Fri, 11 Nov 2016 16:20:46 +1100
Subject: [PATCH 614/688] code style changes for skel-full

---
 .../skel-full/imports/api/links/links.js      |  4 ++-
 .../imports/api/links/links.tests.js          | 14 ++++++---
 .../skel-full/imports/api/links/methods.js    | 15 ++++++----
 .../imports/api/links/methods.tests.js        | 25 +++++++++-------
 .../imports/api/links/server/publications.js  | 10 +++----
 .../api/links/server/publications.tests.js    | 16 ++++++----
 .../skel-full/imports/startup/both/index.js   |  3 +-
 .../imports/startup/server/fixtures.js        | 29 +++++++++----------
 .../imports/ui/components/info/info.html      |  6 ++--
 .../imports/ui/components/info/info.js        | 25 ++++++++--------
 .../imports/ui/pages/not-found/not-found.html |  1 -
 .../imports/ui/stylesheets/not-found.less     | 10 +++----
 tools/static-assets/skel-full/package.json    |  3 +-
 13 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
index 7c700cf2c6..6b16b81871 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -2,4 +2,6 @@
 
 import { Mongo } from 'meteor/mongo';
 
-export const Links = new Mongo.Collection('links');
+const Links = new Mongo.Collection('links');
+
+export { Links };
diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
index f5dadd915d..c3871a360b 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -2,6 +2,9 @@
 //
 // https://guide.meteor.com/testing.html
 
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback, no-underscore-dangle */
+
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
@@ -9,13 +12,16 @@ import { Links } from './links.js';
 if (Meteor.isServer) {
   describe('links collection', function () {
     it('insert correctly', function () {
-      const link = Links.insert({ title:'meteor homepage', url: 'https://www.meteor.com'});
-      const added = Links.find({_id: link});
+      const linkId = Links.insert({
+        title: 'meteor homepage',
+        url: 'https://www.meteor.com',
+      });
+      const added = Links.find({ _id: linkId });
       const collectionName = added._getCollectionName();
       const count = added.count();
 
       assert.equal(collectionName, 'links');
       assert.equal(count, 1);
-    })
-  })
+    });
+  });
 }
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
index 7d5cace149..ac51e82747 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -1,8 +1,8 @@
 // Methods related to links
 
 import { Meteor } from 'meteor/meteor';
-import { Links } from './links.js';
 import { check } from 'meteor/check';
+import { Links } from './links.js';
 
 Meteor.methods({
   'links.insert'(title, url) {
@@ -10,10 +10,15 @@ Meteor.methods({
     check(title, String);
 
     // Check if this is a valid url
-    if (!url.match(/((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g)){
-      throw new Meteor.Error('Bad url. I.e https://www.meteor.com');
+    const re = /((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g;
+    if (!url.match(re)) {
+      throw new Meteor.Error('Invalid URL.');
     }
 
-    return Links.insert({url, title, createdAt: new Date()});
-  }
+    return Links.insert({
+      url,
+      title,
+      createdAt: new Date(),
+    });
+  },
 });
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 3403e4e912..4b6f7e88f4 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -2,25 +2,28 @@
 //
 // https://guide.meteor.com/testing.html
 
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback */
+
 import { Meteor } from 'meteor/meteor';
-import { chai, assert } from 'meteor/practicalmeteor:chai';
+import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
 import './methods.js';
 
 if (Meteor.isServer) {
   describe('links methods', function () {
-
-    beforeEach(() => {
+    beforeEach(function () {
       Links.remove({});
-    })
+    });
 
-    it('can add new link', function () {
+    it('can add a new link', function () {
       const addLink = Meteor.server.method_handlers['links.insert'];
 
       addLink.apply({}, ['meteor.com', 'https://www.meteor.com']);
 
       assert.equal(Links.find().count(), 1);
-    })
+    });
+
     it('insert link method validation', function () {
       const addLink = Meteor.server.method_handlers['links.insert'];
 
@@ -30,22 +33,22 @@ if (Meteor.isServer) {
       try {
         addLink.apply({}, ['meteor.com', 2]);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
       // Check title is String
       try {
         addLink.apply({}, [1, 'meteor.com']);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
       // Check url is valid
       try {
         addLink.apply({}, ['meteor.com', 'meteor.com']);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
 
       assert.equal(errors, 3);
-    })
-  })
+    });
+  });
 }
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
index 62dd32ae1e..d2785795e6 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -1,10 +1,10 @@
-//All links-related publications
+// All links-related publications
+
+/* eslint-disable func-names, prefer-arrow-callback */
 
 import { Meteor } from 'meteor/meteor';
 import { Links } from '../links.js';
 
-Meteor.publish({
-  'links.all': function () {
-    return Links.find({});
-  }
+Meteor.publish('links.all', function () {
+  return Links.find();
 });
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
index 7b29ab376b..c02e033aad 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -2,18 +2,22 @@
 //
 // https://guide.meteor.com/testing.html
 
-import { Meteor } from 'meteor/meteor';
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback */
+
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from '../links.js';
 import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
 import './publications.js';
 
 describe('links publications', function () {
-
-  beforeEach(() => {
+  beforeEach(function () {
     Links.remove({});
-    Links.insert({ title: 'meteor homepage', url: 'https://www.meteor.com'});
-  })
+    Links.insert({
+      title: 'meteor homepage',
+      url: 'https://www.meteor.com',
+    });
+  });
 
   describe('links.all', function () {
     it('sends all links', function (done) {
@@ -24,4 +28,4 @@ describe('links publications', function () {
       });
     });
   });
-})
+});
diff --git a/tools/static-assets/skel-full/imports/startup/both/index.js b/tools/static-assets/skel-full/imports/startup/both/index.js
index 22b9c1af13..7297b2916e 100644
--- a/tools/static-assets/skel-full/imports/startup/both/index.js
+++ b/tools/static-assets/skel-full/imports/startup/both/index.js
@@ -1 +1,2 @@
-// Import modules used by both client and server through a single index entry point (i.e. useraccounts configuration file).
+// Import modules used by both client and server through a single index entry point
+// e.g. useraccounts configuration file.
diff --git a/tools/static-assets/skel-full/imports/startup/server/fixtures.js b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
index c60a6960c1..d629d66f78 100644
--- a/tools/static-assets/skel-full/imports/startup/server/fixtures.js
+++ b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
@@ -4,34 +4,31 @@ import { Meteor } from 'meteor/meteor';
 import { Links } from '../../api/links/links.js';
 
 Meteor.startup(() => {
-
   // if the Links collection is empty
   if (Links.find().count() === 0) {
     const data = [
       {
-        'title': 'Do the Tutorial',
-        'url': 'https://www.meteor.com/try',
-        'createdAt': new Date()
+        title: 'Do the Tutorial',
+        url: 'https://www.meteor.com/try',
+        createdAt: new Date(),
       },
       {
-        'title': 'Follow the Guide',
-        'url': 'http://guide.meteor.com',
-        'createdAt': new Date()
+        title: 'Follow the Guide',
+        url: 'http://guide.meteor.com',
+        createdAt: new Date(),
       },
       {
-        'title': 'Read the Docs',
-        'url': 'https://docs.meteor.com',
-        'createdAt': new Date()
+        title: 'Read the Docs',
+        url: 'https://docs.meteor.com',
+        createdAt: new Date(),
       },
       {
-        'title': 'Discussions',
-        'url': 'https://forums.meteor.com',
-        'createdAt': new Date()
+        title: 'Discussions',
+        url: 'https://forums.meteor.com',
+        createdAt: new Date(),
       },
     ];
 
-    data.forEach((link) => {
-      Links.insert(link);
-    });
+    data.forEach(link => Links.insert(link));
   }
 });
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.html b/tools/static-assets/skel-full/imports/ui/components/info/info.html
index 6c2a10a61b..3045bc1068 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.html
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.html
@@ -8,8 +8,8 @@
         <input type="submit" name="submit" value="Add new link">
       </form>
     </li>
-  {{#each links}}
-    <li><a href="{{url}}" target="_blank">{{title}}</a></li>
-  {{/each}}
+    {{#each links}}
+      <li><a href="{{url}}" target="_blank">{{title}}</a></li>
+    {{/each}}
   </ul>
 </template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
index de5ce70014..81d0061b41 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.js
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -1,8 +1,10 @@
+import { Links } from '/imports/api/links/links.js';
+import { Meteor } from 'meteor/meteor';
 import './info.html';
-import { Links } from '/imports/api/links/links.js'
-import { Meteor } from 'meteor/meteor'
 
-Template.info.onCreated(function infoOnCreated() {
+/* eslint-disable func-names, prefer-arrow-callback */
+
+Template.info.onCreated(function () {
   Meteor.subscribe('links.all');
 });
 
@@ -13,21 +15,20 @@ Template.info.helpers({
 });
 
 Template.info.events({
-  'submit .info-link-add': function (e){
-    e.preventDefault();
+  'submit .info-link-add'(event) {
+    event.preventDefault();
 
-    const target = e.target;
+    const target = event.target;
     const title = target.title;
     const url = target.url;
 
-    Meteor.call('links.insert', title.value, url.value, function (error) {
-      if(error){
+    Meteor.call('links.insert', title.value, url.value, (error) => {
+      if (error) {
         alert(error.error);
-      }
-      else{
+      } else {
         title.value = '';
         url.value = '';
       }
     });
-  }
-})
+  },
+});
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
index 4bfc6fe2a8..9d685a96ec 100644
--- a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
@@ -8,5 +8,4 @@
       <a href="/" class="gotohomepage">Go to home</a>
     </div>
   </div>
-
 </template>
diff --git a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
index 12e840d5b8..e84ffe0c93 100644
--- a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
+++ b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
@@ -1,11 +1,11 @@
-#not-found{
+#not-found {
   width: 700px;
   margin: 0 auto;
-  .not-found-image{
+  .not-found-image {
     width: 25%;
     float: left;
   }
-  .not-found-title{
+  .not-found-title {
     width: 70%;
     float: right;
     background: url(/img/bg-footer.svg);
@@ -13,13 +13,13 @@
     background-position: center;
     background-size: contain;
     min-height: 400px;
-    h1{
+    h1 {
       font-size: 30px;
       color: #1f2128;
       margin-bottom: 20px;
       margin-top: 155px;
     }
-    a.gotohomepage{
+    a.gotohomepage {
       background-color: #de4f4f;
       color: #fff;
       width: 180px;
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
index 509ac7e54f..8c667e0354 100644
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -5,6 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "meteor-node-stubs": "~0.2.0"
+    "babel-runtime": "^6.18.0",
+    "meteor-node-stubs": "~0.2.3"
   }
 }

From 06fb2fbfb919ac99c6911a6600e413e38e4bc9b8 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 10:55:23 +1100
Subject: [PATCH 615/688] more concise export

---
 tools/static-assets/skel-full/imports/api/links/links.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
index 6b16b81871..7c700cf2c6 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -2,6 +2,4 @@
 
 import { Mongo } from 'meteor/mongo';
 
-const Links = new Mongo.Collection('links');
-
-export { Links };
+export const Links = new Mongo.Collection('links');

From 311efd58cb05e2e701d2a1722729f361f2758936 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 10:55:54 +1100
Subject: [PATCH 616/688] remove url validation

---
 tools/static-assets/skel-full/imports/api/links/methods.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
index ac51e82747..07ec236180 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -9,12 +9,6 @@ Meteor.methods({
     check(url, String);
     check(title, String);
 
-    // Check if this is a valid url
-    const re = /((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g;
-    if (!url.match(re)) {
-      throw new Meteor.Error('Invalid URL.');
-    }
-
     return Links.insert({
       url,
       title,

From 851b6c5ae2573b66a5bebca7fe2638a117b3fa56 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 11:02:22 +1100
Subject: [PATCH 617/688] remove validation test

---
 .../imports/api/links/methods.tests.js        | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 4b6f7e88f4..505ebe69c2 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -23,32 +23,5 @@ if (Meteor.isServer) {
 
       assert.equal(Links.find().count(), 1);
     });
-
-    it('insert link method validation', function () {
-      const addLink = Meteor.server.method_handlers['links.insert'];
-
-      let errors = 0;
-
-      // Check url is String
-      try {
-        addLink.apply({}, ['meteor.com', 2]);
-      } catch (e) {
-        errors += 1;
-      }
-      // Check title is String
-      try {
-        addLink.apply({}, [1, 'meteor.com']);
-      } catch (e) {
-        errors += 1;
-      }
-      // Check url is valid
-      try {
-        addLink.apply({}, ['meteor.com', 'meteor.com']);
-      } catch (e) {
-        errors += 1;
-      }
-
-      assert.equal(errors, 3);
-    });
   });
 }

From dc1bdc3a567f36441cdb7fe145125a6e32edf683 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Wed, 16 Nov 2016 20:18:09 +1100
Subject: [PATCH 618/688] remove inline eslint rules

---
 tools/static-assets/skel-full/imports/api/links/links.tests.js | 3 ---
 .../static-assets/skel-full/imports/api/links/methods.tests.js | 3 ---
 .../skel-full/imports/api/links/server/publications.js         | 2 --
 .../skel-full/imports/api/links/server/publications.tests.js   | 3 ---
 .../static-assets/skel-full/imports/ui/components/info/info.js | 2 --
 5 files changed, 13 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
index c3871a360b..786423b998 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback, no-underscore-dangle */
-
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 505ebe69c2..7c22fd81e3 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
index d2785795e6..327a6aee69 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -1,7 +1,5 @@
 // All links-related publications
 
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { Meteor } from 'meteor/meteor';
 import { Links } from '../links.js';
 
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
index c02e033aad..5281df275c 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from '../links.js';
 import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
index 81d0061b41..a99bb8376b 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.js
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -2,8 +2,6 @@ import { Links } from '/imports/api/links/links.js';
 import { Meteor } from 'meteor/meteor';
 import './info.html';
 
-/* eslint-disable func-names, prefer-arrow-callback */
-
 Template.info.onCreated(function () {
   Meteor.subscribe('links.all');
 });

From 7b9ae5a6ddbe190e8784e2c28da6c23360477f80 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 16 Nov 2016 17:20:04 -0500
Subject: [PATCH 619/688] Bump package versions for 1.4.2.3-rc.0 release.

---
 packages/meteor-tool/package.js                | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 38d8e3bca0..d072a303f8 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2_2'
+  version: '1.4.2-3-rc.0'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4a954ac2ce..93b32d42cd 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.2-rc.1",
+ "version": "1.4.2.3-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4cf06c37a643dd2d4659a3312702c8e1af0da110 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 17 Nov 2016 13:06:49 -0500
Subject: [PATCH 620/688] Avoid global/method name ambiguity in
 InputFile#require.

---
 tools/isobuild/compiler-plugin.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index b9d9a453c7..7289ad0a9e 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -372,6 +372,12 @@ class InputFile extends buildPluginModule.InputFile {
   }
 
   require(id, parentPath) {
+    return this._require(id, parentPath);
+  }
+
+  // This private helper method exists to prevent ambiguity between the
+  // module-global `require` function and the method name.
+  _require(id, parentPath) {
     return require(this.resolve(id, parentPath));
   }
 

From fc9c56a73e8e4d63989e3e8793aa32957ffc976a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 17 Nov 2016 13:07:26 -0500
Subject: [PATCH 621/688] Improve InputFile#resolve.

---
 tools/isobuild/compiler-plugin.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 7289ad0a9e..9adcb7c933 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -341,10 +341,8 @@ class InputFile extends buildPluginModule.InputFile {
   }
 
   resolve(id, parentPath) {
-    const batch = this._resourceSlot.packageSourceBatch;
-
     parentPath = parentPath || files.pathJoin(
-      batch.sourceRoot,
+      this.getSourceRoot(),
       this.getPathInPackage()
     );
 
@@ -353,12 +351,13 @@ class InputFile extends buildPluginModule.InputFile {
       return resId;
     }
 
-    const parentStat = files.statOrNull(parentPath);
+    const parentStat = optimisticStatOrNull(parentPath);
     if (! parentStat ||
         ! parentStat.isFile()) {
       throw new Error("Not a file: " + parentPath);
     }
 
+    const batch = this._resourceSlot.packageSourceBatch;
     const resolver = batch.getResolver();
     const resolved = resolver.resolve(id, parentPath);
 

From 1b855047aeb5d0df2439089799e5acb7a8bad691 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 17 Nov 2016 13:04:49 -0500
Subject: [PATCH 622/688] Limit InputFile#findControlFile to package source
 root directory.

This is an improvement that I noticed while investigating the
feasibility of fixing #8068.
---
 tools/isobuild/compiler-plugin.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 9adcb7c933..b93100387d 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -239,17 +239,21 @@ class InputFile extends buildPluginModule.InputFile {
     return ! this.getPackageName();
   }
 
-  getSourceRoot() {
+  getSourceRoot(tolerant = false) {
     const sourceRoot = this._resourceSlot.packageSourceBatch.sourceRoot;
 
-    if (! _.isString(sourceRoot)) {
+    if (_.isString(sourceRoot)) {
+      return sourceRoot;
+    }
+
+    if (! tolerant) {
       const name = this.getPackageName();
       throw new Error(
         "Unknown source root for " + (
           name ? "package " + name : "app"));
     }
 
-    return sourceRoot;
+    return null;
   }
 
   getPathInPackage() {
@@ -300,14 +304,16 @@ class InputFile extends buildPluginModule.InputFile {
       return absPath;
     }
 
-    const sourceRoot = this._resourceSlot.packageSourceBatch.sourceRoot;
+    const sourceRoot = this.getSourceRoot(true);
     if (! _.isString(sourceRoot)) {
       return this._controlFileCache[basename] = null;
     }
 
-    let dir = files.pathDirname(this.getPathInPackage());
+    let dir = files.pathDirname(
+      files.pathJoin(sourceRoot, this.getPathInPackage()));
+
     while (true) {
-      absPath = files.pathJoin(sourceRoot, dir, basename);
+      absPath = files.pathJoin(dir, basename);
 
       const stat = this._stat(absPath);
       if (stat && stat.isFile()) {
@@ -319,6 +325,7 @@ class InputFile extends buildPluginModule.InputFile {
         return this._controlFileCache[basename] = null;
       }
 
+      if (dir === sourceRoot) break;
       let parentDir = files.pathDirname(dir);
       if (parentDir === dir) break;
       dir = parentDir;

From 063d2513a306f90a5d17ce2a9ccd8b1786cc6ce0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 17 Nov 2016 13:43:14 -0500
Subject: [PATCH 623/688] History.md entry for 1.4.2.3.

---
 History.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/History.md b/History.md
index 8381d6b51a..bbdbf8b90f 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,16 @@
 ## v.NEXT
 
+## v1.4.2.3
+
+* Style improvements for `meteor create --full`.
+  [#8045](https://github.com/meteor/meteor/pull/8045)
+
+> Note: Meteor 1.4.2.2 was finalized before
+  [#8045](https://github.com/meteor/meteor/pull/8045) was merged, but
+  those changes were [deemed important
+  enough](https://github.com/meteor/meteor/pull/8044#issuecomment-260913739)
+  to skip recommending 1.4.2.2 and instead immediately release 1.4.2.3.
+
 ## v1.4.2.2
 
 * Node has been upgraded to version 4.6.2.

From 8d76fb01ff4f3cb251609e20003ef793c64de4c8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 17 Nov 2016 13:45:10 -0500
Subject: [PATCH 624/688] Bump package versions for the official 1.4.2.3
 release.

---
 packages/meteor-tool/package.js            | 2 +-
 scripts/admin/meteor-release-official.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index d072a303f8..4ad1200ab8 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2-3-rc.0'
+  version: '1.4.2_3'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 00218a212d..29ccd2b711 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,7 +1,7 @@
 {
   "track": "METEOR",
-  "version": "1.4.2.2",
-  "patchFrom": ["1.4.2", "1.4.2.1"],
+  "version": "1.4.2.3",
+  "patchFrom": ["1.4.2", "1.4.2.1", "1.4.2.2"],
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

From 44d3181d1cf24d37b038f4ac1ff6fa0946f4b9ae Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Fri, 11 Nov 2016 16:20:46 +1100
Subject: [PATCH 625/688] code style changes for skel-full

---
 .../skel-full/imports/api/links/links.js      |  4 ++-
 .../imports/api/links/links.tests.js          | 14 ++++++---
 .../skel-full/imports/api/links/methods.js    | 15 ++++++----
 .../imports/api/links/methods.tests.js        | 25 +++++++++-------
 .../imports/api/links/server/publications.js  | 10 +++----
 .../api/links/server/publications.tests.js    | 16 ++++++----
 .../skel-full/imports/startup/both/index.js   |  3 +-
 .../imports/startup/server/fixtures.js        | 29 +++++++++----------
 .../imports/ui/components/info/info.html      |  6 ++--
 .../imports/ui/components/info/info.js        | 25 ++++++++--------
 .../imports/ui/pages/not-found/not-found.html |  1 -
 .../imports/ui/stylesheets/not-found.less     | 10 +++----
 tools/static-assets/skel-full/package.json    |  3 +-
 13 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
index 7c700cf2c6..6b16b81871 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -2,4 +2,6 @@
 
 import { Mongo } from 'meteor/mongo';
 
-export const Links = new Mongo.Collection('links');
+const Links = new Mongo.Collection('links');
+
+export { Links };
diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
index f5dadd915d..c3871a360b 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -2,6 +2,9 @@
 //
 // https://guide.meteor.com/testing.html
 
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback, no-underscore-dangle */
+
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
@@ -9,13 +12,16 @@ import { Links } from './links.js';
 if (Meteor.isServer) {
   describe('links collection', function () {
     it('insert correctly', function () {
-      const link = Links.insert({ title:'meteor homepage', url: 'https://www.meteor.com'});
-      const added = Links.find({_id: link});
+      const linkId = Links.insert({
+        title: 'meteor homepage',
+        url: 'https://www.meteor.com',
+      });
+      const added = Links.find({ _id: linkId });
       const collectionName = added._getCollectionName();
       const count = added.count();
 
       assert.equal(collectionName, 'links');
       assert.equal(count, 1);
-    })
-  })
+    });
+  });
 }
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
index 7d5cace149..ac51e82747 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -1,8 +1,8 @@
 // Methods related to links
 
 import { Meteor } from 'meteor/meteor';
-import { Links } from './links.js';
 import { check } from 'meteor/check';
+import { Links } from './links.js';
 
 Meteor.methods({
   'links.insert'(title, url) {
@@ -10,10 +10,15 @@ Meteor.methods({
     check(title, String);
 
     // Check if this is a valid url
-    if (!url.match(/((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g)){
-      throw new Meteor.Error('Bad url. I.e https://www.meteor.com');
+    const re = /((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g;
+    if (!url.match(re)) {
+      throw new Meteor.Error('Invalid URL.');
     }
 
-    return Links.insert({url, title, createdAt: new Date()});
-  }
+    return Links.insert({
+      url,
+      title,
+      createdAt: new Date(),
+    });
+  },
 });
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 3403e4e912..4b6f7e88f4 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -2,25 +2,28 @@
 //
 // https://guide.meteor.com/testing.html
 
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback */
+
 import { Meteor } from 'meteor/meteor';
-import { chai, assert } from 'meteor/practicalmeteor:chai';
+import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
 import './methods.js';
 
 if (Meteor.isServer) {
   describe('links methods', function () {
-
-    beforeEach(() => {
+    beforeEach(function () {
       Links.remove({});
-    })
+    });
 
-    it('can add new link', function () {
+    it('can add a new link', function () {
       const addLink = Meteor.server.method_handlers['links.insert'];
 
       addLink.apply({}, ['meteor.com', 'https://www.meteor.com']);
 
       assert.equal(Links.find().count(), 1);
-    })
+    });
+
     it('insert link method validation', function () {
       const addLink = Meteor.server.method_handlers['links.insert'];
 
@@ -30,22 +33,22 @@ if (Meteor.isServer) {
       try {
         addLink.apply({}, ['meteor.com', 2]);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
       // Check title is String
       try {
         addLink.apply({}, [1, 'meteor.com']);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
       // Check url is valid
       try {
         addLink.apply({}, ['meteor.com', 'meteor.com']);
       } catch (e) {
-        errors++;
+        errors += 1;
       }
 
       assert.equal(errors, 3);
-    })
-  })
+    });
+  });
 }
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
index 62dd32ae1e..d2785795e6 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -1,10 +1,10 @@
-//All links-related publications
+// All links-related publications
+
+/* eslint-disable func-names, prefer-arrow-callback */
 
 import { Meteor } from 'meteor/meteor';
 import { Links } from '../links.js';
 
-Meteor.publish({
-  'links.all': function () {
-    return Links.find({});
-  }
+Meteor.publish('links.all', function () {
+  return Links.find();
 });
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
index 7b29ab376b..c02e033aad 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -2,18 +2,22 @@
 //
 // https://guide.meteor.com/testing.html
 
-import { Meteor } from 'meteor/meteor';
+/* eslint-env mocha */
+/* eslint-disable func-names, prefer-arrow-callback */
+
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from '../links.js';
 import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
 import './publications.js';
 
 describe('links publications', function () {
-
-  beforeEach(() => {
+  beforeEach(function () {
     Links.remove({});
-    Links.insert({ title: 'meteor homepage', url: 'https://www.meteor.com'});
-  })
+    Links.insert({
+      title: 'meteor homepage',
+      url: 'https://www.meteor.com',
+    });
+  });
 
   describe('links.all', function () {
     it('sends all links', function (done) {
@@ -24,4 +28,4 @@ describe('links publications', function () {
       });
     });
   });
-})
+});
diff --git a/tools/static-assets/skel-full/imports/startup/both/index.js b/tools/static-assets/skel-full/imports/startup/both/index.js
index 22b9c1af13..7297b2916e 100644
--- a/tools/static-assets/skel-full/imports/startup/both/index.js
+++ b/tools/static-assets/skel-full/imports/startup/both/index.js
@@ -1 +1,2 @@
-// Import modules used by both client and server through a single index entry point (i.e. useraccounts configuration file).
+// Import modules used by both client and server through a single index entry point
+// e.g. useraccounts configuration file.
diff --git a/tools/static-assets/skel-full/imports/startup/server/fixtures.js b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
index c60a6960c1..d629d66f78 100644
--- a/tools/static-assets/skel-full/imports/startup/server/fixtures.js
+++ b/tools/static-assets/skel-full/imports/startup/server/fixtures.js
@@ -4,34 +4,31 @@ import { Meteor } from 'meteor/meteor';
 import { Links } from '../../api/links/links.js';
 
 Meteor.startup(() => {
-
   // if the Links collection is empty
   if (Links.find().count() === 0) {
     const data = [
       {
-        'title': 'Do the Tutorial',
-        'url': 'https://www.meteor.com/try',
-        'createdAt': new Date()
+        title: 'Do the Tutorial',
+        url: 'https://www.meteor.com/try',
+        createdAt: new Date(),
       },
       {
-        'title': 'Follow the Guide',
-        'url': 'http://guide.meteor.com',
-        'createdAt': new Date()
+        title: 'Follow the Guide',
+        url: 'http://guide.meteor.com',
+        createdAt: new Date(),
       },
       {
-        'title': 'Read the Docs',
-        'url': 'https://docs.meteor.com',
-        'createdAt': new Date()
+        title: 'Read the Docs',
+        url: 'https://docs.meteor.com',
+        createdAt: new Date(),
       },
       {
-        'title': 'Discussions',
-        'url': 'https://forums.meteor.com',
-        'createdAt': new Date()
+        title: 'Discussions',
+        url: 'https://forums.meteor.com',
+        createdAt: new Date(),
       },
     ];
 
-    data.forEach((link) => {
-      Links.insert(link);
-    });
+    data.forEach(link => Links.insert(link));
   }
 });
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.html b/tools/static-assets/skel-full/imports/ui/components/info/info.html
index 6c2a10a61b..3045bc1068 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.html
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.html
@@ -8,8 +8,8 @@
         <input type="submit" name="submit" value="Add new link">
       </form>
     </li>
-  {{#each links}}
-    <li><a href="{{url}}" target="_blank">{{title}}</a></li>
-  {{/each}}
+    {{#each links}}
+      <li><a href="{{url}}" target="_blank">{{title}}</a></li>
+    {{/each}}
   </ul>
 </template>
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
index de5ce70014..81d0061b41 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.js
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -1,8 +1,10 @@
+import { Links } from '/imports/api/links/links.js';
+import { Meteor } from 'meteor/meteor';
 import './info.html';
-import { Links } from '/imports/api/links/links.js'
-import { Meteor } from 'meteor/meteor'
 
-Template.info.onCreated(function infoOnCreated() {
+/* eslint-disable func-names, prefer-arrow-callback */
+
+Template.info.onCreated(function () {
   Meteor.subscribe('links.all');
 });
 
@@ -13,21 +15,20 @@ Template.info.helpers({
 });
 
 Template.info.events({
-  'submit .info-link-add': function (e){
-    e.preventDefault();
+  'submit .info-link-add'(event) {
+    event.preventDefault();
 
-    const target = e.target;
+    const target = event.target;
     const title = target.title;
     const url = target.url;
 
-    Meteor.call('links.insert', title.value, url.value, function (error) {
-      if(error){
+    Meteor.call('links.insert', title.value, url.value, (error) => {
+      if (error) {
         alert(error.error);
-      }
-      else{
+      } else {
         title.value = '';
         url.value = '';
       }
     });
-  }
-})
+  },
+});
diff --git a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
index 4bfc6fe2a8..9d685a96ec 100644
--- a/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
+++ b/tools/static-assets/skel-full/imports/ui/pages/not-found/not-found.html
@@ -8,5 +8,4 @@
       <a href="/" class="gotohomepage">Go to home</a>
     </div>
   </div>
-
 </template>
diff --git a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
index 12e840d5b8..e84ffe0c93 100644
--- a/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
+++ b/tools/static-assets/skel-full/imports/ui/stylesheets/not-found.less
@@ -1,11 +1,11 @@
-#not-found{
+#not-found {
   width: 700px;
   margin: 0 auto;
-  .not-found-image{
+  .not-found-image {
     width: 25%;
     float: left;
   }
-  .not-found-title{
+  .not-found-title {
     width: 70%;
     float: right;
     background: url(/img/bg-footer.svg);
@@ -13,13 +13,13 @@
     background-position: center;
     background-size: contain;
     min-height: 400px;
-    h1{
+    h1 {
       font-size: 30px;
       color: #1f2128;
       margin-bottom: 20px;
       margin-top: 155px;
     }
-    a.gotohomepage{
+    a.gotohomepage {
       background-color: #de4f4f;
       color: #fff;
       width: 180px;
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
index 509ac7e54f..8c667e0354 100644
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -5,6 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "meteor-node-stubs": "~0.2.0"
+    "babel-runtime": "^6.18.0",
+    "meteor-node-stubs": "~0.2.3"
   }
 }

From 180ce536338909bbd7331ca4dd224f7266eb2650 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 10:55:23 +1100
Subject: [PATCH 626/688] more concise export

---
 tools/static-assets/skel-full/imports/api/links/links.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.js b/tools/static-assets/skel-full/imports/api/links/links.js
index 6b16b81871..7c700cf2c6 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.js
@@ -2,6 +2,4 @@
 
 import { Mongo } from 'meteor/mongo';
 
-const Links = new Mongo.Collection('links');
-
-export { Links };
+export const Links = new Mongo.Collection('links');

From 9ac8df351ffa138faf75bdaa51cdd579b82bd601 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 10:55:54 +1100
Subject: [PATCH 627/688] remove url validation

---
 tools/static-assets/skel-full/imports/api/links/methods.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/methods.js b/tools/static-assets/skel-full/imports/api/links/methods.js
index ac51e82747..07ec236180 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.js
@@ -9,12 +9,6 @@ Meteor.methods({
     check(url, String);
     check(title, String);
 
-    // Check if this is a valid url
-    const re = /((http|https)\:\/\/)+[a-zA-Z0-9\.\/\?\:@\-_=#]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#])*/g;
-    if (!url.match(re)) {
-      throw new Meteor.Error('Invalid URL.');
-    }
-
     return Links.insert({
       url,
       title,

From 76f85113f1528a74fd3eeb067fa3c8041b3813fa Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Sat, 12 Nov 2016 11:02:22 +1100
Subject: [PATCH 628/688] remove validation test

---
 .../imports/api/links/methods.tests.js        | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 4b6f7e88f4..505ebe69c2 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -23,32 +23,5 @@ if (Meteor.isServer) {
 
       assert.equal(Links.find().count(), 1);
     });
-
-    it('insert link method validation', function () {
-      const addLink = Meteor.server.method_handlers['links.insert'];
-
-      let errors = 0;
-
-      // Check url is String
-      try {
-        addLink.apply({}, ['meteor.com', 2]);
-      } catch (e) {
-        errors += 1;
-      }
-      // Check title is String
-      try {
-        addLink.apply({}, [1, 'meteor.com']);
-      } catch (e) {
-        errors += 1;
-      }
-      // Check url is valid
-      try {
-        addLink.apply({}, ['meteor.com', 'meteor.com']);
-      } catch (e) {
-        errors += 1;
-      }
-
-      assert.equal(errors, 3);
-    });
   });
 }

From 00c6681ae4952e62ca39131c34634ee7f489ac11 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Wed, 16 Nov 2016 20:18:09 +1100
Subject: [PATCH 629/688] remove inline eslint rules

---
 tools/static-assets/skel-full/imports/api/links/links.tests.js | 3 ---
 .../static-assets/skel-full/imports/api/links/methods.tests.js | 3 ---
 .../skel-full/imports/api/links/server/publications.js         | 2 --
 .../skel-full/imports/api/links/server/publications.tests.js   | 3 ---
 .../static-assets/skel-full/imports/ui/components/info/info.js | 2 --
 5 files changed, 13 deletions(-)

diff --git a/tools/static-assets/skel-full/imports/api/links/links.tests.js b/tools/static-assets/skel-full/imports/api/links/links.tests.js
index c3871a360b..786423b998 100644
--- a/tools/static-assets/skel-full/imports/api/links/links.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/links.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback, no-underscore-dangle */
-
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
diff --git a/tools/static-assets/skel-full/imports/api/links/methods.tests.js b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
index 505ebe69c2..7c22fd81e3 100644
--- a/tools/static-assets/skel-full/imports/api/links/methods.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/methods.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { Meteor } from 'meteor/meteor';
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from './links.js';
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.js b/tools/static-assets/skel-full/imports/api/links/server/publications.js
index d2785795e6..327a6aee69 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.js
@@ -1,7 +1,5 @@
 // All links-related publications
 
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { Meteor } from 'meteor/meteor';
 import { Links } from '../links.js';
 
diff --git a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
index c02e033aad..5281df275c 100644
--- a/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
+++ b/tools/static-assets/skel-full/imports/api/links/server/publications.tests.js
@@ -2,9 +2,6 @@
 //
 // https://guide.meteor.com/testing.html
 
-/* eslint-env mocha */
-/* eslint-disable func-names, prefer-arrow-callback */
-
 import { assert } from 'meteor/practicalmeteor:chai';
 import { Links } from '../links.js';
 import { PublicationCollector } from 'meteor/johanbrook:publication-collector';
diff --git a/tools/static-assets/skel-full/imports/ui/components/info/info.js b/tools/static-assets/skel-full/imports/ui/components/info/info.js
index 81d0061b41..a99bb8376b 100644
--- a/tools/static-assets/skel-full/imports/ui/components/info/info.js
+++ b/tools/static-assets/skel-full/imports/ui/components/info/info.js
@@ -2,8 +2,6 @@ import { Links } from '/imports/api/links/links.js';
 import { Meteor } from 'meteor/meteor';
 import './info.html';
 
-/* eslint-disable func-names, prefer-arrow-callback */
-
 Template.info.onCreated(function () {
   Meteor.subscribe('links.all');
 });

From 3120b9324d25aaa0dff538acca4ec03a2f7518e2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 18 Nov 2016 11:01:47 -0500
Subject: [PATCH 630/688] Update modules test app to Meteor 1.4.2.3.

---
 tools/tests/apps/modules/.meteor/packages |  2 +-
 tools/tests/apps/modules/.meteor/release  |  2 +-
 tools/tests/apps/modules/.meteor/versions | 12 ++++++------
 tools/tests/apps/modules/tests.js         |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/tests/apps/modules/.meteor/packages b/tools/tests/apps/modules/.meteor/packages
index 1df4bfa370..9484662fff 100644
--- a/tools/tests/apps/modules/.meteor/packages
+++ b/tools/tests/apps/modules/.meteor/packages
@@ -13,7 +13,7 @@ jquery@1.11.10                  # Helpful client-side library
 tracker@1.1.1                 # Meteor's client-side reactive programming library
 
 es5-shim@4.6.15                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.9              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.6.1              # Enable ECMAScript2015+ syntax in app code
 
 coffeescript
 modules-test-package
diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release
index 65e8c3928f..61f6c675b1 100644
--- a/tools/tests/apps/modules/.meteor/release
+++ b/tools/tests/apps/modules/.meteor/release
@@ -1 +1 @@
-METEOR@1.4.2.1
+METEOR@1.4.2.3
diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions
index 9d2e8a48e8..120fff082d 100644
--- a/tools/tests/apps/modules/.meteor/versions
+++ b/tools/tests/apps/modules/.meteor/versions
@@ -2,7 +2,7 @@ allow-deny@1.0.5
 autoupdate@1.3.12
 avital:mocha@2.1.0_10
 babel-compiler@6.13.0
-babel-runtime@1.0.0
+babel-runtime@1.0.1
 base64@1.0.10
 binary-heap@1.0.10
 blaze@2.1.9
@@ -14,14 +14,14 @@ caching-html-compiler@1.0.7
 callback-hook@1.0.10
 check@1.2.4
 client-only-ecmascript@0.0.1
-coffeescript@1.11.1_3
+coffeescript@1.11.1_4
 ddp@1.2.5
 ddp-client@1.3.2
-ddp-common@1.2.7
-ddp-server@1.3.11
+ddp-common@1.2.8
+ddp-server@1.3.12
 deps@1.0.12
 diff-sequence@1.0.7
-ecmascript@0.6.0
+ecmascript@0.6.1
 ecmascript-runtime@0.3.15
 ejson@1.0.13
 es5-shim@4.6.15
@@ -40,7 +40,7 @@ meteor@1.6.0
 meteor-base@1.0.4
 minifier-css@1.2.15
 minifier-js@1.2.15
-minimongo@1.0.18
+minimongo@1.0.19
 mobile-experience@1.0.4
 mobile-status-bar@1.0.13
 modules@0.7.7
diff --git a/tools/tests/apps/modules/tests.js b/tools/tests/apps/modules/tests.js
index c4f0d0a9a1..7d24b82e64 100644
--- a/tools/tests/apps/modules/tests.js
+++ b/tools/tests/apps/modules/tests.js
@@ -3,7 +3,7 @@ import fs from "fs";
 import path from "path";
 import moment from "moment";
 import shared from "./imports/shared";
-import {Meteor as ImportedMeteor} from "meteor/meteor";
+import { Meteor as ImportedMeteor } from "meteor/meteor";
 
 describe("app modules", () => {
   it("can be imported using absolute identifiers", () => {

From a74b0c268ee0211e650e9b8b78cfb5923fff6b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20P=C3=A1l=20Koszta?=
 <peterpal@fashionunited.com>
Date: Mon, 21 Nov 2016 10:35:35 +0100
Subject: [PATCH 631/688] Fix oauth ROOT_URL_PATH_PREFIX

---
 packages/oauth/end_of_popup_response.html    |  2 +-
 packages/oauth/end_of_redirect_response.html |  2 +-
 packages/oauth/oauth_server.js               |  5 +-
 packages/oauth/oauth_tests.js                | 48 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/packages/oauth/end_of_popup_response.html b/packages/oauth/end_of_popup_response.html
index 9812af83da..11cf6c5692 100644
--- a/packages/oauth/end_of_popup_response.html
+++ b/packages/oauth/end_of_popup_response.html
@@ -6,6 +6,6 @@
   </p>
 
   <div id="config" style="display:none;">##CONFIG##</div>
-  <script type="text/javascript" src="/packages/oauth/end_of_popup_response.js"></script>
+  <script type="text/javascript" src="##ROOT_URL_PATH_PREFIX##/packages/oauth/end_of_popup_response.js"></script>
 </body>
 </html>
diff --git a/packages/oauth/end_of_redirect_response.html b/packages/oauth/end_of_redirect_response.html
index af0e9885e5..bf53b766a5 100644
--- a/packages/oauth/end_of_redirect_response.html
+++ b/packages/oauth/end_of_redirect_response.html
@@ -1,6 +1,6 @@
 <html>
 <body>
   <div id="config" style="display:none;">##CONFIG##</div>
-  <script type="text/javascript" src="/packages/oauth/end_of_redirect_response.js"></script>
+  <script type="text/javascript" src="##ROOT_URL_PATH_PREFIX##/packages/oauth/end_of_redirect_response.js"></script>
 </body>
 </html>
diff --git a/packages/oauth/oauth_server.js b/packages/oauth/oauth_server.js
index f5cc5d592e..cca82cb2bd 100644
--- a/packages/oauth/oauth_server.js
+++ b/packages/oauth/oauth_server.js
@@ -342,7 +342,10 @@ var renderEndOfLoginResponse = function (options) {
     throw new Error('invalid loginStyle: ' + options.loginStyle);
   }
 
-  var result = template.replace(/##CONFIG##/, JSON.stringify(config));
+  var result = template.replace(/##CONFIG##/, JSON.stringify(config))
+    .replace(
+      /##ROOT_URL_PATH_PREFIX##/, __meteor_runtime_config__.ROOT_URL_PATH_PREFIX
+    );
 
   return "<!DOCTYPE html>\n" + result;
 };
diff --git a/packages/oauth/oauth_tests.js b/packages/oauth/oauth_tests.js
index dcca94ea18..a9e17aa3ef 100644
--- a/packages/oauth/oauth_tests.js
+++ b/packages/oauth/oauth_tests.js
@@ -59,3 +59,51 @@ Tinytest.add(
     test.equal(OAuth._retrievePendingCredential(key, secret), cred);
   }
 );
+
+Tinytest.add("oauth - _endOfLoginResponse with popup loginStyle supports ROOT_URL_PATH_PREFIX",
+  function (test) {
+    var rootUrlPathPrefix = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+    __meteor_runtime_config__.ROOT_URL_PATH_PREFIX = '/test-root-url-prefix';
+    var res = {
+      writeHead: function () {},
+      end: function (content) {
+        __meteor_runtime_config__.ROOT_URL_PATH_PREFIX = rootUrlPathPrefix;
+        test.matches(
+          content,
+          /\/test-root-url-prefix\/packages\/oauth\/end_of_popup_response\.js/
+        );
+      }
+    };
+    var details = {
+      credentials: {},
+      loginStyle: 'popup'
+    };
+    OAuth._endOfLoginResponse(res, details);
+  }
+);
+
+Tinytest.add("oauth - _endOfLoginResponse with redirect loginStyle supports ROOT_URL_PATH_PREFIX",
+  function (test) {
+    var rootUrlPathPrefix = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+    __meteor_runtime_config__.ROOT_URL_PATH_PREFIX = '/test-root-url-prefix';
+    var res = {
+      writeHead: function () {},
+      end: function (content) {
+        __meteor_runtime_config__.ROOT_URL_PATH_PREFIX = rootUrlPathPrefix;
+        test.matches(
+          content,
+          /\/test-root-url-prefix\/packages\/oauth\/end_of_redirect_response\.js/
+        );
+      }
+    };
+    var details = {
+      credentials: {},
+      loginStyle: 'redirect',
+      query: {
+        // {"redirectUrl": "http://localhost:3000/"}
+        state: 'eyJyZWRpcmVjdFVybCI6ICJodHRwOi8vbG9jYWxob3N0OjMwMDAvIn0='
+      }
+    };
+    OAuth._endOfLoginResponse(res, details);
+  }
+);

From dd226b8c50a21cae06abac2e6115ce5776f896c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20P=C3=A1l=20Koszta?=
 <peterpal@fashionunited.com>
Date: Mon, 21 Nov 2016 15:29:27 +0100
Subject: [PATCH 632/688] Add tests for oauth when ROOT_URL_PATH_PREFIX is not
 specified

---
 packages/oauth/oauth_tests.js | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/packages/oauth/oauth_tests.js b/packages/oauth/oauth_tests.js
index a9e17aa3ef..8036bb20ce 100644
--- a/packages/oauth/oauth_tests.js
+++ b/packages/oauth/oauth_tests.js
@@ -60,6 +60,25 @@ Tinytest.add(
   }
 );
 
+Tinytest.add("oauth - _endOfLoginResponse with popup loginStyle supports unspecified ROOT_URL_PATH_PREFIX",
+  function (test) {
+    var res = {
+      writeHead: function () {},
+      end: function (content) {
+        test.matches(
+          content,
+          /\/packages\/oauth\/end_of_popup_response\.js/
+        );
+      }
+    };
+    var details = {
+      credentials: {},
+      loginStyle: 'popup'
+    };
+    OAuth._endOfLoginResponse(res, details);
+  }
+);
+
 Tinytest.add("oauth - _endOfLoginResponse with popup loginStyle supports ROOT_URL_PATH_PREFIX",
   function (test) {
     var rootUrlPathPrefix = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
@@ -82,6 +101,30 @@ Tinytest.add("oauth - _endOfLoginResponse with popup loginStyle supports ROOT_UR
   }
 );
 
+Tinytest.add("oauth - _endOfLoginResponse with redirect loginStyle supports unspecified ROOT_URL_PATH_PREFIX",
+  function (test) {
+    var res = {
+      writeHead: function () {},
+      end: function (content) {
+        test.matches(
+          content,
+          /\/packages\/oauth\/end_of_redirect_response\.js/
+        );
+      }
+    };
+    var details = {
+      credentials: {},
+      loginStyle: 'redirect',
+      query: {
+        // {"redirectUrl": "http://localhost:3000/"}
+        state: 'eyJyZWRpcmVjdFVybCI6ICJodHRwOi8vbG9jYWxob3N0OjMwMDAvIn0='
+      }
+    };
+    OAuth._endOfLoginResponse(res, details);
+  }
+);
+
+
 Tinytest.add("oauth - _endOfLoginResponse with redirect loginStyle supports ROOT_URL_PATH_PREFIX",
   function (test) {
     var rootUrlPathPrefix = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;

From 4fb3c819365083c9d793009637b470d7bed0b04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20P=C3=A1l=20Koszta?=
 <peterpal@fashionunited.com>
Date: Mon, 21 Nov 2016 18:52:40 +0100
Subject: [PATCH 633/688] Use redirectUrl generated from ROOT_URL in oauth
 tests

---
 packages/oauth/oauth_tests.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/oauth/oauth_tests.js b/packages/oauth/oauth_tests.js
index 8036bb20ce..bbca33dfeb 100644
--- a/packages/oauth/oauth_tests.js
+++ b/packages/oauth/oauth_tests.js
@@ -116,8 +116,9 @@ Tinytest.add("oauth - _endOfLoginResponse with redirect loginStyle supports unsp
       credentials: {},
       loginStyle: 'redirect',
       query: {
-        // {"redirectUrl": "http://localhost:3000/"}
-        state: 'eyJyZWRpcmVjdFVybCI6ICJodHRwOi8vbG9jYWxob3N0OjMwMDAvIn0='
+        state: new Buffer(JSON.stringify({
+          redirectUrl: __meteor_runtime_config__.ROOT_URL
+        }), 'binary').toString('base64')
       }
     };
     OAuth._endOfLoginResponse(res, details);
@@ -143,8 +144,9 @@ Tinytest.add("oauth - _endOfLoginResponse with redirect loginStyle supports ROOT
       credentials: {},
       loginStyle: 'redirect',
       query: {
-        // {"redirectUrl": "http://localhost:3000/"}
-        state: 'eyJyZWRpcmVjdFVybCI6ICJodHRwOi8vbG9jYWxob3N0OjMwMDAvIn0='
+        state: new Buffer(JSON.stringify({
+          redirectUrl: __meteor_runtime_config__.ROOT_URL
+        }), 'binary').toString('base64')
       }
     };
     OAuth._endOfLoginResponse(res, details);

From b029732a11d63ee8bd6e1f7570f51e8f9e578981 Mon Sep 17 00:00:00 2001
From: Rhywden <JohannesHass@googlemail.com>
Date: Mon, 21 Nov 2016 20:34:11 +0100
Subject: [PATCH 634/688] Fix for console output in PowerShell on Win10

See https://github.com/meteor/meteor/issues/6785

Basically,
```
new Array(249).join('\b')
```
is not a good idea for a carriage return. Code has been tested with CMD, PowerShell and PowerShell in Legacy Mode and seems to solve the issue.
---
 tools/console/console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index 93cff6700f..aa76d70eed 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -68,7 +68,7 @@ var wordwrap = require('wordwrap');
 var PROGRESS_DEBUG = !!process.env.METEOR_PROGRESS_DEBUG;
 var FORCE_PRETTY=undefined;
 var CARRIAGE_RETURN =
-  (process.platform === 'win32' && process.stdout.isTTY ? new Array(249).join('\b') : '\r');
+  (process.platform === 'win32' && process.stdout.isTTY && process.title !== 'Windows PowerShell' ? new Array(249).join('\b') : '\r');
 
 if (process.env.METEOR_PRETTY_OUTPUT) {
   FORCE_PRETTY = process.env.METEOR_PRETTY_OUTPUT != '0';

From a4eb658f0b2f485f9e27aef5df65698de6231e11 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Mon, 29 Aug 2016 00:33:44 -0700
Subject: [PATCH 635/688] Added autoprefixer to stylus.

---
 .../compileStylusBatch/npm-shrinkwrap.json    | 89 ++++++++++++++++---
 packages/stylus/package.js                    |  3 +-
 packages/stylus/plugin/compile-stylus.js      |  9 +-
 3 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
index 08e5e9f1e1..624b44ef2e 100644
--- a/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
+++ b/packages/stylus/.npm/plugin/compileStylusBatch/npm-shrinkwrap.json
@@ -1,10 +1,20 @@
 {
   "dependencies": {
     "amdefine": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "from": "amdefine@>=0.0.4"
     },
+    "autoprefixer": {
+      "version": "6.3.7",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.7.tgz",
+      "from": "autoprefixer@6.3.7"
+    },
+    "autoprefixer-stylus": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer-stylus/-/autoprefixer-stylus-0.9.4.tgz",
+      "from": "autoprefixer-stylus@0.9.4"
+    },
     "balanced-match": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
@@ -15,6 +25,16 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
       "from": "brace-expansion@>=1.0.0 <2.0.0"
     },
+    "browserslist": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.3.6.tgz",
+      "from": "browserslist@>=1.3.4 <1.4.0"
+    },
+    "caniuse-db": {
+      "version": "1.0.30000585",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000585.tgz",
+      "from": "caniuse-db@>=1.0.30000488 <2.0.0"
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -26,8 +46,8 @@
       "from": "css-parse@>=1.7.0 <1.8.0"
     },
     "debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
       "from": "debug@*"
     },
     "fs.realpath": {
@@ -40,9 +60,14 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
       "from": "glob@>=7.0.0 <7.1.0"
     },
+    "has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "from": "has-flag@>=1.0.0 <2.0.0"
+    },
     "inflight": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "from": "inflight@>=1.0.4 <2.0.0"
     },
     "inherits": {
@@ -50,6 +75,11 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "from": "inherits@>=2.0.0 <3.0.0"
     },
+    "js-base64": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
+      "from": "js-base64@>=2.1.9 <3.0.0"
+    },
     "minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
@@ -66,25 +96,57 @@
       "from": "mkdirp@>=0.5.0 <0.6.0"
     },
     "ms": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "from": "ms@0.7.1"
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+      "from": "ms@0.7.2"
+    },
+    "multi-stage-sourcemap": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz",
+      "from": "multi-stage-sourcemap@0.2.1"
     },
     "nib": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/nib/-/nib-1.1.2.tgz",
       "from": "nib@1.1.2"
     },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "from": "normalize-range@>=0.1.2 <0.2.0"
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "from": "num2fraction@>=1.2.2 <2.0.0"
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "from": "once@>=1.3.0 <2.0.0"
     },
     "path-is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "from": "path-is-absolute@>=1.0.0 <2.0.0"
     },
+    "postcss": {
+      "version": "5.0.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.21.tgz",
+      "from": "postcss@5.0.21",
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "from": "source-map@>=0.5.5 <0.6.0"
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "from": "postcss-value-parser@>=3.2.3 <4.0.0"
+    },
     "sax": {
       "version": "0.5.8",
       "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
@@ -100,6 +162,11 @@
       "resolved": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449",
       "from": "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449"
     },
+    "supports-color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+      "from": "supports-color@>=3.1.2 <4.0.0"
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 7a0007e3fa..882897041a 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -11,7 +11,8 @@ Package.registerBuildPlugin({
   ],
   npmDependencies: {
     stylus: "https://github.com/meteor/stylus/tarball/bb47a357d132ca843718c63998eb37b90013a449", // fork of 0.54.5
-    nib: "1.1.2"
+    nib: "1.1.2",
+    "autoprefixer-stylus": "0.9.4"
   }
 });
 
diff --git a/packages/stylus/plugin/compile-stylus.js b/packages/stylus/plugin/compile-stylus.js
index cfb694912e..70f52b2220 100644
--- a/packages/stylus/plugin/compile-stylus.js
+++ b/packages/stylus/plugin/compile-stylus.js
@@ -1,5 +1,6 @@
 const stylus = Npm.require('stylus');
 const nib = Npm.require('nib');
+const autoprefixer = Npm.require('autoprefixer-stylus');
 const Future = Npm.require('fibers/future');
 const fs = Plugin.fs;
 const path = Plugin.path;
@@ -19,7 +20,10 @@ class StylusCompiler extends MultiFileCachingCompiler {
   }
 
   getCacheKey(inputFile) {
-    return inputFile.getSourceHash();
+    return [
+      inputFile.getSourceHash(),
+      inputFile.getFileOptions(),
+    ];
   }
 
   compileResultSize(compileResult) {
@@ -147,10 +151,13 @@ class StylusCompiler extends MultiFileCachingCompiler {
       return sourcemap;
     }
 
+    const fileOptions = inputFile.getFileOptions();
+
     const f = new Future;
 
     const style = stylus(inputFile.getContentsAsString())
             .use(nib())
+            .use(autoprefixer(fileOptions.autoprefixer || {}))
             .set('filename', inputFile.getPathInPackage())
             .set('sourcemap', { inline: false, comment: false })
             .set('cache', false)

From d85be5c31c23606fc3289c7fd12b76a111024748 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Tue, 22 Nov 2016 01:45:03 -0800
Subject: [PATCH 636/688] By default autoprefixer should be disabled.

---
 packages/stylus/plugin/compile-stylus.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stylus/plugin/compile-stylus.js b/packages/stylus/plugin/compile-stylus.js
index 70f52b2220..05a794d9cf 100644
--- a/packages/stylus/plugin/compile-stylus.js
+++ b/packages/stylus/plugin/compile-stylus.js
@@ -157,7 +157,7 @@ class StylusCompiler extends MultiFileCachingCompiler {
 
     const style = stylus(inputFile.getContentsAsString())
             .use(nib())
-            .use(autoprefixer(fileOptions.autoprefixer || {}))
+            .use(autoprefixer(fileOptions.autoprefixer || {browsers: []}))
             .set('filename', inputFile.getPathInPackage())
             .set('sourcemap', { inline: false, comment: false })
             .set('cache', false)

From b9f2bb255d8e9d331b845d5391a7fdd7534c4a4a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 23 Nov 2016 13:10:58 -0800
Subject: [PATCH 637/688] Don't allow websockets to indefinitely wait for DDP
 handshake

In general, we try to avoid allowing TCP connections to be open with no
traffic on it indefinitely.  We place timeouts on incoming HTTP
connections in webapp_server.js (which we adjust to longer values when
there's an HTTP request pending), and once a DDP connection is fully
established we require heartbeats.

However, if the incoming connection is a websocket, the faye-websocket
package used by SockJS calls setTimeout(0) on the underlying socket when
it initializes the WebSocket object:

https://github.com/faye/faye-websocket-node/blob/3148348a3/lib/faye/websocket/api.js#L111

So if a client does the WebSocket handshake with the server but never
sends a valid DDP connect message, the socket can be held open
indefinitely. (To add insult to injury, a 1MB Buffer object is retained
on such sockets due to something in the faye-websocket code, at least on
older versions of Node like 0.10.)

This commit restores a timeout on the socket for this in-between period.

(We actually saw this issue in production on the Meteor Developer
Accounts server --- hundreds of such broken connections would accumulate
over time.  This may be triggered by a particular setup we use involving
proxies for the accounts server, or it may be a more generally
applicable issue.)
---
 packages/ddp-server/livedata_server.js |  3 +++
 packages/ddp-server/stream_server.js   | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index fcd2bf84e3..4a03a57ab1 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -302,6 +302,9 @@ var Session = function (server, version, socket, options) {
   }).run();
 
   if (version !== 'pre1' && options.heartbeatInterval !== 0) {
+    // We no longer need the low level timeout because we have heartbeating.
+    socket.setWebsocketTimeout(0);
+
     self.heartbeat = new DDPCommon.Heartbeat({
       heartbeatInterval: options.heartbeatInterval,
       heartbeatTimeout: options.heartbeatTimeout,
diff --git a/packages/ddp-server/stream_server.js b/packages/ddp-server/stream_server.js
index e2d3771b2f..1996d9088c 100644
--- a/packages/ddp-server/stream_server.js
+++ b/packages/ddp-server/stream_server.js
@@ -86,6 +86,25 @@ StreamServer = function () {
   self._redirectWebsocketEndpoint();
 
   self.server.on('connection', function (socket) {
+    // We want to make sure that if a client connects to us and does the initial
+    // Websocket handshake but never gets to the DDP handshake, that we
+    // eventually kill the socket.  Once the DDP handshake happens, DDP
+    // heartbeating will work. And before the Websocket handshake, the timeouts
+    // we set at the server level in webapp_server.js will work. But
+    // faye-websocket calls setTimeout(0) on any socket it takes over, so there
+    // is an "in between" state where this doesn't happen.  We work around this
+    // by explicitly setting the socket timeout to a relatively large time here,
+    // and setting it back to zero when we set up the heartbeat in
+    // livedata_server.js.
+    socket.setWebsocketTimeout = function (timeout) {
+      if ((socket.protocol === 'websocket' ||
+           socket.protocol === 'websocket-raw')
+          && socket._session.recv) {
+        socket._session.recv.connection.setTimeout(timeout);
+      }
+    };
+    socket.setWebsocketTimeout(45 * 1000);
+
     socket.send = function (data) {
       socket.write(data);
     };

From 487b41fd7563e1afa623c62e248277d0d7ae25e0 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 24 Nov 2016 16:12:10 +0200
Subject: [PATCH 638/688] Improve compiler error when asset is added with empty
 contents

While not a Meteor bug, this makes the error message more helpful when a compiler tries adding an asset without data, as demonstrated in meteor/meteor#8034.

Thanks to suggestion by @sdarnell for this.

Closes meteor/meteor#8034
---
 tools/isobuild/compiler-plugin.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index b93100387d..482903b067 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -726,7 +726,8 @@ class ResourceSlot {
       if (_.isString(options.data)) {
         options.data = new Buffer(options.data);
       } else {
-        throw new Error("'data' option to addAsset must be a Buffer or String.");
+        throw new Error("'data' option to addAsset must be a Buffer or " +
+                        "String: " + self.inputResource.path);
       }
     }
 

From c83094ae2635d4584ae180677e58c815e7818374 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 7 Nov 2016 20:49:17 -0500
Subject: [PATCH 639/688] Tolerate module["import"] properties in
 findImportedModuleIdentifiers.

---
 tools/isobuild/js-analyze.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index e95b1a788b..ae1b7507af 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -186,7 +186,9 @@ function getImportedModuleId(node) {
   if (node.type === "CallExpression" &&
       node.callee.type === "MemberExpression" &&
       isIdWithName(node.callee.object, "module") &&
-      isIdWithName(node.callee.property, "import")) {
+      (isIdWithName(node.callee.property, "import") ||
+       (isStringLiteral(node.callee.property) &&
+        node.callee.property.value === "import"))) {
     const args = node.arguments;
     const argc = args.length;
     if (argc > 0) {

From bd0a7be6e2ce494147b33fb12101cbed91633ec5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 7 Nov 2016 19:30:54 -0500
Subject: [PATCH 640/688] Upgrade the `meteor-babel` npm package to version
 0.14.2.

---
 History.md                                    |   4 +
 .../.npm/package/npm-shrinkwrap.json          | 309 ++++++++----------
 packages/babel-compiler/package.js            |   4 +-
 scripts/dev-bundle-tool-package.js            |   2 +-
 4 files changed, 142 insertions(+), 177 deletions(-)

diff --git a/History.md b/History.md
index 30b3a8a95d..9ae8a4f298 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,10 @@
   [Issue #7715](https://github.com/meteor/meteor/issues/7715)
   [PR #7728](https://github.com/meteor/meteor/pull/7728)
 
+* The `meteor-babel` npm package has been upgraded to version 0.14.2,
+  fixing [#8021](https://github.com/meteor/meteor/issues/8021) and
+  [#7662](https://github.com/meteor/meteor/issues/7662).
+
 ## v1.4.2.3
 
 * Style improvements for `meteor create --full`.
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 79f5262e54..2db9e44a45 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -6,9 +6,9 @@
       "from": "acorn@>=3.3.0 <3.4.0"
     },
     "acorn-es7-plugin": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.0.18.tgz",
-      "from": "acorn-es7-plugin@>=1.0.17 <1.1.0"
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.3.tgz",
+      "from": "acorn-es7-plugin@>=1.1.0 <1.2.0"
     },
     "ansi-regex": {
       "version": "2.0.0",
@@ -21,8 +21,8 @@
       "from": "ansi-styles@>=2.2.1 <3.0.0"
     },
     "ast-types": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.0.tgz",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz",
       "from": "ast-types@>=0.9.0 <0.10.0"
     },
     "babel-code-frame": {
@@ -31,59 +31,59 @@
       "from": "babel-code-frame@>=6.16.0 <7.0.0"
     },
     "babel-core": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.17.0.tgz",
-      "from": "babel-core@>=6.17.0 <6.18.0"
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.18.2.tgz",
+      "from": "babel-core@>=6.18.2 <7.0.0"
     },
     "babel-generator": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.17.0.tgz",
-      "from": "babel-generator@>=6.17.0 <7.0.0"
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.19.0.tgz",
+      "from": "babel-generator@>=6.18.0 <7.0.0"
     },
     "babel-helper-builder-react-jsx": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.9.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.18.0.tgz",
       "from": "babel-helper-builder-react-jsx@>=6.8.0 <7.0.0"
     },
     "babel-helper-call-delegate": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.8.0.tgz",
-      "from": "babel-helper-call-delegate@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.18.0.tgz",
+      "from": "babel-helper-call-delegate@>=6.18.0 <7.0.0"
     },
     "babel-helper-define-map": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.9.0.tgz",
-      "from": "babel-helper-define-map@>=6.9.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.18.0.tgz",
+      "from": "babel-helper-define-map@>=6.18.0 <7.0.0"
     },
     "babel-helper-function-name": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.8.0.tgz",
-      "from": "babel-helper-function-name@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.18.0.tgz",
+      "from": "babel-helper-function-name@>=6.18.0 <7.0.0"
     },
     "babel-helper-get-function-arity": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.8.0.tgz",
-      "from": "babel-helper-get-function-arity@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz",
+      "from": "babel-helper-get-function-arity@>=6.18.0 <7.0.0"
     },
     "babel-helper-hoist-variables": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.8.0.tgz",
-      "from": "babel-helper-hoist-variables@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.18.0.tgz",
+      "from": "babel-helper-hoist-variables@>=6.18.0 <7.0.0"
     },
     "babel-helper-optimise-call-expression": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.8.0.tgz",
-      "from": "babel-helper-optimise-call-expression@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.18.0.tgz",
+      "from": "babel-helper-optimise-call-expression@>=6.18.0 <7.0.0"
     },
     "babel-helper-regex": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.9.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.18.0.tgz",
       "from": "babel-helper-regex@>=6.8.0 <7.0.0"
     },
     "babel-helper-replace-supers": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.16.0.tgz",
-      "from": "babel-helper-replace-supers@>=6.14.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.18.0.tgz",
+      "from": "babel-helper-replace-supers@>=6.18.0 <7.0.0"
     },
     "babel-helpers": {
       "version": "6.16.0",
@@ -111,13 +111,13 @@
       "from": "babel-plugin-syntax-async-generators@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-flow": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.13.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
       "from": "babel-plugin-syntax-flow@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-jsx": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.13.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
       "from": "babel-plugin-syntax-jsx@>=6.3.13 <7.0.0"
     },
     "babel-plugin-syntax-object-rest-spread": {
@@ -141,13 +141,13 @@
       "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.15.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-block-scoping@>=6.15.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-classes": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.14.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-classes@>=6.14.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -156,29 +156,24 @@
       "from": "babel-plugin-transform-es2015-computed-properties@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.16.0.tgz",
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.19.0.tgz",
       "from": "babel-plugin-transform-es2015-destructuring@>=6.16.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-for-of": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.8.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-for-of@>=6.8.0 <7.0.0"
     },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz",
-      "from": "babel-plugin-transform-es2015-function-name@>=6.9.0 <7.0.0"
-    },
     "babel-plugin-transform-es2015-literals": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz",
       "from": "babel-plugin-transform-es2015-literals@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.16.0.tgz",
-      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.16.0 <6.17.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.18.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.18.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.8.0",
@@ -186,13 +181,13 @@
       "from": "babel-plugin-transform-es2015-object-super@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-parameters": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.17.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-parameters@>=6.17.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.8.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-spread": {
@@ -211,8 +206,8 @@
       "from": "babel-plugin-transform-es2015-template-literals@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.8.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz",
       "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -220,24 +215,19 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz",
       "from": "babel-plugin-transform-es2015-unicode-regex@>=6.11.0 <7.0.0"
     },
-    "babel-plugin-transform-es3-member-expression-literals": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es3-member-expression-literals/-/babel-plugin-transform-es3-member-expression-literals-6.8.0.tgz",
-      "from": "babel-plugin-transform-es3-member-expression-literals@>=6.8.0 <7.0.0"
-    },
     "babel-plugin-transform-es3-property-literals": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es3-property-literals/-/babel-plugin-transform-es3-property-literals-6.8.0.tgz",
       "from": "babel-plugin-transform-es3-property-literals@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-flow-strip-types": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.14.0.tgz",
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.18.0.tgz",
       "from": "babel-plugin-transform-flow-strip-types@>=6.14.0 <7.0.0"
     },
     "babel-plugin-transform-object-rest-spread": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz",
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.19.0.tgz",
       "from": "babel-plugin-transform-object-rest-spread@>=6.16.0 <7.0.0"
     },
     "babel-plugin-transform-react-display-name": {
@@ -268,52 +258,52 @@
     "babel-plugin-transform-runtime": {
       "version": "6.15.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.15.0.tgz",
-      "from": "babel-plugin-transform-runtime@>=6.15.0 <6.16.0"
+      "from": "babel-plugin-transform-runtime@>=6.15.0 <7.0.0"
     },
     "babel-plugin-transform-strict-mode": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.11.3.tgz",
-      "from": "babel-plugin-transform-strict-mode@>=6.8.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.18.0.tgz",
+      "from": "babel-plugin-transform-strict-mode@>=6.18.0 <7.0.0"
     },
     "babel-preset-meteor": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.13.0.tgz",
-      "from": "babel-preset-meteor@6.13.0"
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.14.0.tgz",
+      "from": "babel-preset-meteor@6.14.0"
     },
     "babel-preset-react": {
       "version": "6.16.0",
       "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.16.0.tgz",
-      "from": "babel-preset-react@>=6.16.0 <6.17.0"
+      "from": "babel-preset-react@>=6.16.0 <7.0.0"
     },
     "babel-register": {
-      "version": "6.16.3",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.16.3.tgz",
-      "from": "babel-register@>=6.16.0 <7.0.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.18.0.tgz",
+      "from": "babel-register@>=6.18.0 <7.0.0"
     },
     "babel-runtime": {
-      "version": "6.11.6",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.11.6.tgz",
-      "from": "babel-runtime@>=6.11.6 <6.12.0"
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz",
+      "from": "babel-runtime@>=6.18.0 <7.0.0"
     },
     "babel-template": {
       "version": "6.16.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.16.0.tgz",
-      "from": "babel-template@>=6.16.0 <6.17.0"
+      "from": "babel-template@>=6.16.0 <7.0.0"
     },
     "babel-traverse": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.16.0.tgz",
-      "from": "babel-traverse@>=6.16.0 <6.17.0"
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.19.0.tgz",
+      "from": "babel-traverse@>=6.18.0 <7.0.0"
     },
     "babel-types": {
-      "version": "6.16.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.16.0.tgz",
-      "from": "babel-types@>=6.16.0 <6.17.0"
+      "version": "6.19.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.19.0.tgz",
+      "from": "babel-types@>=6.18.0 <7.0.0"
     },
     "babylon": {
-      "version": "6.11.6",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.11.6.tgz",
-      "from": "babylon@>=6.11.4 <6.12.0"
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.14.1.tgz",
+      "from": "babylon@>=6.13.1 <7.0.0"
     },
     "balanced-match": {
       "version": "0.4.2",
@@ -338,7 +328,7 @@
     "convert-source-map": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz",
-      "from": "convert-source-map@>=1.3.0 <1.4.0"
+      "from": "convert-source-map@>=1.3.0 <2.0.0"
     },
     "core-js": {
       "version": "2.4.1",
@@ -346,14 +336,14 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz",
-      "from": "detect-indent@>=3.0.1 <4.0.0"
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "from": "detect-indent@>=4.0.0 <5.0.0"
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -365,15 +355,10 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
       "from": "esutils@>=2.0.2 <3.0.0"
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "from": "get-stdin@>=4.0.1 <5.0.0"
-    },
     "globals": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz",
-      "from": "globals@>=8.3.0 <9.0.0"
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz",
+      "from": "globals@>=9.0.0 <10.0.0"
     },
     "has-ansi": {
       "version": "2.0.0",
@@ -381,13 +366,13 @@
       "from": "has-ansi@>=2.0.0 <3.0.0"
     },
     "home-or-tmp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-1.0.0.tgz",
-      "from": "home-or-tmp@>=1.0.0 <2.0.0"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "from": "home-or-tmp@>=2.0.0 <3.0.0"
     },
     "invariant": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.1.tgz",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
       "from": "invariant@>=2.2.0 <3.0.0"
     },
     "is-finite": {
@@ -406,26 +391,19 @@
       "from": "jsesc@>=1.3.0 <2.0.0"
     },
     "json5": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
-      "from": "json5@>=0.4.0 <0.5.0"
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz",
+      "from": "json5@>=0.5.0 <0.6.0"
     },
     "lodash": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz",
-      "from": "lodash@>=4.16.4 <4.17.0"
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
+      "from": "lodash@>=4.16.4 <5.0.0"
     },
     "loose-envify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.2.0.tgz",
-      "from": "loose-envify@>=1.0.0 <2.0.0",
-      "dependencies": {
-        "js-tokens": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz",
-          "from": "js-tokens@>=1.0.1 <2.0.0"
-        }
-      }
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz",
+      "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "magic-string": {
       "version": "0.16.0",
@@ -433,9 +411,9 @@
       "from": "magic-string@>=0.16.0 <0.17.0"
     },
     "meteor-babel": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.13.0.tgz",
-      "from": "meteor-babel@0.13.0"
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.14.2.tgz",
+      "from": "meteor-babel@0.14.2"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -448,42 +426,35 @@
       "from": "minimatch@>=3.0.2 <4.0.0"
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "from": "minimist@>=1.1.0 <2.0.0"
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "from": "minimist@0.0.8"
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "from": "mkdirp@>=0.5.1 <0.6.0",
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "from": "minimist@0.0.8"
-        }
-      }
+      "from": "mkdirp@>=0.5.1 <0.6.0"
     },
     "ms": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "from": "ms@0.7.1"
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+      "from": "ms@0.7.2"
     },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
       "from": "number-is-nan@>=1.0.0 <2.0.0"
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "from": "os-homedir@>=1.0.0 <2.0.0"
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "from": "os-tmpdir@>=1.0.1 <2.0.0"
     },
-    "path-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
-      "from": "path-exists@>=1.0.0 <2.0.0"
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -495,13 +466,13 @@
       "from": "private@>=0.1.6 <0.2.0"
     },
     "regenerate": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.1.tgz",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
       "from": "regenerate@>=1.2.1 <2.0.0"
     },
     "regenerator-runtime": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz",
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz",
       "from": "regenerator-runtime@>=0.9.5 <0.10.0"
     },
     "regexpu-core": {
@@ -527,19 +498,14 @@
       }
     },
     "reify": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.8.tgz",
-      "from": "reify@>=0.3.6 <0.4.0"
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.3.tgz",
+      "from": "reify@>=0.4.0 <0.5.0"
     },
     "repeating": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
-      "from": "repeating@>=1.1.0 <2.0.0"
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "from": "shebang-regex@>=1.0.0 <2.0.0"
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "from": "repeating@>=2.0.0 <3.0.0"
     },
     "slash": {
       "version": "1.0.0",
@@ -552,8 +518,8 @@
       "from": "source-map@>=0.5.0 <0.6.0"
     },
     "source-map-support": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.3.tgz",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz",
       "from": "source-map-support@>=0.4.2 <0.5.0"
     },
     "strip-ansi": {
@@ -571,11 +537,6 @@
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz",
       "from": "to-fast-properties@>=1.0.1 <2.0.0"
     },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "from": "user-home@>=1.1.1 <2.0.0"
-    },
     "vlq": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.1.tgz",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 24bff99a4d..2d7ada3c4e 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,11 +6,11 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.13.0'
+  version: '6.14.0'
 });
 
 Npm.depends({
-  'meteor-babel': '0.13.0'
+  'meteor-babel': '0.14.2'
 });
 
 Package.onUse(function (api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index c56c79b768..9b2dac129c 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "3.10.9",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
-    "meteor-babel": "0.13.0",
+    "meteor-babel": "0.14.2",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 39a8591fb2d09fe2aeb67a49633ceee77185ddbd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 26 Nov 2016 13:27:06 -0500
Subject: [PATCH 641/688] Upgrade `reify` npm package to version 0.4.3.

---
 .../modules/.npm/package/npm-shrinkwrap.json  | 29 +++++++++++--------
 packages/modules/package.js                   |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index c13812da88..2d253d318e 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -1,24 +1,29 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.2.0.tgz",
-      "from": "acorn@>=3.2.0 <3.3.0"
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+      "from": "acorn@>=3.3.0 <3.4.0"
+    },
+    "acorn-es7-plugin": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.3.tgz",
+      "from": "acorn-es7-plugin@>=1.1.0 <1.2.0"
     },
     "ast-types": {
-      "version": "0.8.17",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.17.tgz",
-      "from": "ast-types@>=0.8.16 <0.9.0"
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.2.tgz",
+      "from": "ast-types@>=0.9.0 <0.10.0"
     },
     "magic-string": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.2.tgz",
-      "from": "magic-string@>=0.15.0 <0.16.0"
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz",
+      "from": "magic-string@>=0.16.0 <0.17.0"
     },
     "reify": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.6.tgz",
-      "from": "reify@0.3.6"
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.3.tgz",
+      "from": "reify@0.4.3"
     },
     "vlq": {
       "version": "0.2.1",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 3b458fbb37..e190e15280 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.3.6"
+  reify: "0.4.3"
 });
 
 Package.onUse(function(api) {

From ac0b69798813d5590f0854aa0ce56d13b9888f5b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 26 Nov 2016 13:54:16 -0500
Subject: [PATCH 642/688] Remove wildcard from 7-zip path in Windows dev bundle
 script.

---
 scripts/generate-dev-bundle.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 42ecbbd0ea..815f69debc 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -41,7 +41,7 @@ $webclient.DownloadFile("http://www.7-zip.org/a/7z1602.msi", "$DIR\7z\7z.msi")
 $webclient.DownloadFile("http://www.7-zip.org/a/7z1602-extra.7z", "$DIR\7z\extra.7z")
 msiexec /i 7z.msi /quiet /qn /norestart
 ping -n 4 127.0.0.1 | out-null
-& "C:\Program Files*\7-Zip\7z.exe" x extra.7z
+& "C:\Program Files\7-Zip\7z.exe" x extra.7z
 mv 7za.exe "$DIR\bin\7z.exe"
 cd "$DIR\bin"
 
@@ -168,8 +168,8 @@ cd "$DIR\.."
 # rename the folder with the devbundle
 cmd /c rename "$DIR" "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
 
-& "C:\Program Files*\7-zip\7z.exe" a -ttar dev_bundle.tar "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
-& "C:\Program Files*\7-zip\7z.exe" a -tgzip "${CHECKOUT_DIR}\dev_bundle_${PLATFORM}_${BUNDLE_VERSION}.tar.gz" dev_bundle.tar
+& "C:\Program Files\7-zip\7z.exe" a -ttar dev_bundle.tar "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}"
+& "C:\Program Files\7-zip\7z.exe" a -tgzip "${CHECKOUT_DIR}\dev_bundle_${PLATFORM}_${BUNDLE_VERSION}.tar.gz" dev_bundle.tar
 del dev_bundle.tar
 cmd /c rmdir "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}" /s /q
 

From deabdf84880d8e4c8cf345d1cf7c0d381037d86d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 26 Nov 2016 14:06:39 -0500
Subject: [PATCH 643/688] Bump $BUNDLE_VERSION to 4.7.2 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index c6cc7e2ae4..3854803b3b 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.1
+BUNDLE_VERSION=4.7.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 293e8c59361eed7835d9d6a1feda41fae482d6d0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 27 Nov 2016 14:47:11 -0500
Subject: [PATCH 644/688] Upgrade `reify` npm package to version 0.4.4.

---
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 4 ++--
 packages/modules/.npm/package/npm-shrinkwrap.json        | 6 +++---
 packages/modules/package.js                              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 2db9e44a45..64a125f13b 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -498,8 +498,8 @@
       }
     },
     "reify": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.3.tgz",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.4.tgz",
       "from": "reify@>=0.4.0 <0.5.0"
     },
     "repeating": {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 2d253d318e..eff3d98216 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -21,9 +21,9 @@
       "from": "magic-string@>=0.16.0 <0.17.0"
     },
     "reify": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.3.tgz",
-      "from": "reify@0.4.3"
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.4.tgz",
+      "from": "reify@0.4.4"
     },
     "vlq": {
       "version": "0.2.1",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index e190e15280..ff2193e95c 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.4.3"
+  reify: "0.4.4"
 });
 
 Package.onUse(function(api) {

From 83cb162e0fbb86a8eab412257758fbcbfdcee119 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 27 Nov 2016 14:47:52 -0500
Subject: [PATCH 645/688] Bump $BUNDLE_VERSION to 4.7.3 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 3854803b3b..9c79ae6c75 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.2
+BUNDLE_VERSION=4.7.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From ac865943466f6e691ec30c816576451939b5e8ff Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 27 Nov 2016 20:19:26 -0500
Subject: [PATCH 646/688] Install npm dependencies automatically when creating
 apps.

Although I have said I do not think Meteor should run `npm install`
automatically to update application node_modules, my real concern is that
Meteor should not interfere with your preferred node_modules-related
workflow, be it npm, npm-shinkwrap.json, yarn, yarn.lock, checking your
node_modules into git/mercurial/cvs, or whatever other scheme you have.

Automatically installing node_modules from the default package.json file
when a new app is created will eliminate real confusion, and should not
interfere with any workflows, because there is no opportunity to establish
another workflow before Meteor runs `npm install` the very first time.
---
 tools/cli/commands.js         | 2 ++
 tools/cli/default-npm-deps.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index b88977d16e..3632698a2e 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -744,6 +744,8 @@ main.registerCommand({
   // the packages (or maybe an unpredictable subset based on what happens to be
   // in the template's versions file).
 
+  require("./default-npm-deps.js").install(appPath);
+
   var appNameToDisplay = appPathAsEntered === "." ?
     "current directory" : `'${appPathAsEntered}'`;
 
diff --git a/tools/cli/default-npm-deps.js b/tools/cli/default-npm-deps.js
index 73baf9c6a7..95df83b24d 100644
--- a/tools/cli/default-npm-deps.js
+++ b/tools/cli/default-npm-deps.js
@@ -6,7 +6,7 @@ import {
   unlink,
 } from "../fs/files.js";
 
-const INSTALL_JOB_MESSAGE = "installing dependencies from package.json";
+const INSTALL_JOB_MESSAGE = "installing npm dependencies";
 
 export function install(appDir) {
   const packageJsonPath = pathJoin(appDir, "package.json");

From 8e228180e66a9808f268f1de1b9ead2ec21a8751 Mon Sep 17 00:00:00 2001
From: Zoltan Olah <zol@percolatestudio.com>
Date: Tue, 29 Nov 2016 15:41:39 -0800
Subject: [PATCH 647/688] History entry for #7970

---
 History.md | 386 +----------------------------------------------------
 1 file changed, 6 insertions(+), 380 deletions(-)

diff --git a/History.md b/History.md
index 30b3a8a95d..1e37ceb125 100644
--- a/History.md
+++ b/History.md
@@ -1,382 +1,8 @@
 ## v.NEXT
 
-* The `facebook` package has been split into:
-  - `facebook-oauth` (the part that allows oauth w/ FB directly) and
-  - `facebook-config-ui` (the Blaze configuration templates for accounts-ui)
-
-  This means you can now use `[accounts-]facebook` without needing Blaze.
-
-  If you are using `accounts-ui` and `accounts-facebook`, you will probably
-  need to install the `facebook-config-ui` package if you want to configure it
-  using the Accounts UI.
-
-  [Issue #7715](https://github.com/meteor/meteor/issues/7715)
-  [PR #7728](https://github.com/meteor/meteor/pull/7728)
-
-## v1.4.2.3
-
-* Style improvements for `meteor create --full`.
-  [#8045](https://github.com/meteor/meteor/pull/8045)
-
-> Note: Meteor 1.4.2.2 was finalized before
-  [#8045](https://github.com/meteor/meteor/pull/8045) was merged, but
-  those changes were [deemed important
-  enough](https://github.com/meteor/meteor/pull/8044#issuecomment-260913739)
-  to skip recommending 1.4.2.2 and instead immediately release 1.4.2.3.
-
-## v1.4.2.2
-
-* Node has been upgraded to version 4.6.2.
-
-* `meteor create` now has a new `--full` option, which generates an larger app,
-  demonstrating development techniques highlighted in the
-  [Meteor Guide](http://guide.meteor.com)
-
-  [Issue #6974](https://github.com/meteor/meteor/issues/6974)
-  [PR #7807](https://github.com/meteor/meteor/pull/7807)
-
-* Minimongo now supports `$min`, `$max` and partially supports `$currentDate`.
-
-  [Issue #7857](https://github.com/meteor/meteor/issues/7857)
-  [PR #7858](https://github.com/meteor/meteor/pull/7858)
-
-* Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
-  [PR #7968](https://github.com/meteor/meteor/pull/7968)
-
-* It is now possible for packages to specify a *lazy* main module:
-  ```js
-  Package.onUse(function (api) {
-    api.mainModule("client.js", "client", { lazy: true });
-  });
-  ```
-  This means the `client.js` module will not be evaluated during app
-  startup unless/until another module imports it, and will not even be
-  included in the client bundle if no importing code is found. **Note 1:**
-  packages with lazy main modules cannot use `api.export` to export global
-  symbols to other packages/apps. **Note 2:** packages with lazy main
-  modules should be restricted to Meteor 1.4.2.2 or later via
-  `api.versionsFrom("1.4.2.2")`, since older versions of Meteor cannot
-  import lazy main modules using `import "meteor/<package name>"` but must
-  explicitly name the module: `import "meteor/<package name>/client.js"`.
-
-## v1.4.2.1
-
-* Installing the `babel-runtime` npm package in your application
-  `node_modules` directory is now required for most Babel-transformed code
-  to work, as the Meteor `babel-runtime` package no longer attempts to
-  provide custom implementations of Babel helper functions. To install
-  the `babel-runtime` package, simply run the command
-  ```sh
-  meteor npm install --save babel-runtime
-  ```
-  in any Meteor application directory. The Meteor `babel-runtime` package
-  version has been bumped to 1.0.0 to reflect this major change.
-  [#7995](https://github.com/meteor/meteor/pull/7995)
-
-* File system operations performed by the command-line tool no longer use
-  fibers unless the `METEOR_DISABLE_FS_FIBERS` environment variable is
-  explicitly set to a falsy value. For larger apps, this change results in
-  significant build performance improvements due to the creation of fewer
-  fibers and the avoidance of unnecessary asyncronous delays.
-  https://github.com/meteor/meteor/pull/7975/commits/ca4baed90ae0675e55c93976411d4ed91f12dd63
-
-* Running Meteor as `root` is still discouraged, and results in a fatal
-  error by default, but the `--allow-superuser` flag now works as claimed.
-  [#7959](https://github.com/meteor/meteor/issues/7959)
-
-* The `dev_bundle\python\python.exe` executable has been restored to the
-  Windows dev bundle, which may help with `meteor npm rebuild` commands.
-  [#7960](https://github.com/meteor/meteor/issues/7960)
-
-* Changes within linked npm packages now trigger a partial rebuild,
-  whereas previously (in 1.4.2) they were ignored.
-  [#7978](https://github.com/meteor/meteor/issues/7978)
-
-* Miscellaneous fixed bugs:
-  [#2876](https://github.com/meteor/meteor/issues/2876)
-  [#7154](https://github.com/meteor/meteor/issues/7154)
-  [#7956](https://github.com/meteor/meteor/issues/7956)
-  [#7974](https://github.com/meteor/meteor/issues/7974)
-  [#7999](https://github.com/meteor/meteor/issues/7999)
-  [#8005](https://github.com/meteor/meteor/issues/8005)
-  [#8007](https://github.com/meteor/meteor/issues/8007)
-
-## v1.4.2
-
-* This release implements a number of rebuild performance optimizations.
-  As you edit files in development, the server should restart and rebuild
-  much more quickly, especially if you have many `node_modules` files.
-  See https://github.com/meteor/meteor/pull/7668 for more details.
-
-> Note: the `METEOR_PROFILE` environment variable now provides data for
-  server startup time as well as build time, which should make it easier
-  to tell which of your packages are responsible for slow startup times.
-  Please include the output of `METEOR_PROFILE=10 meteor run` with any
-  GitHub issue about rebuild performance.
-
-* `npm` has been upgraded to version 3.10.9.
-
-* The `cordova-lib` npm package has been updated to 6.3.1, along with
-  cordova-android (5.2.2) and cordova-ios (4.2.1), and various plugins.
-
-* The `node-pre-gyp` npm package has been updated to 0.6.30.
-
-* The `lru-cache` npm package has been updated to 4.0.1.
-
-* The `meteor-promise` npm package has been updated to 0.8.0 for better
-  asynchronous stack traces.
-
-* The `meteor` tool is now prevented from running as `root` as this is
-  not recommended and can cause issues with permissions.  In some environments,
-  (e.g. Docker), it may still be desired to run as `root` and this can be
-  permitted by passing `--unsafe-perm` to the `meteor` command.
-  [#7821](https://github.com/meteor/meteor/pull/7821)
-
-* Blaze-related packages have been extracted to
-  [`meteor/blaze`](https://github.com/meteor/blaze), and the main
-  [`meteor/meteor`](https://github.com/meteor/meteor) repository now
-  refers to them via git submodules (see
-  [#7633](https://github.com/meteor/meteor/pull/7633)).
-  When running `meteor` from a checkout, you must now update these
-  submodules by running
-  ```sh
-  git submodule update --init --recursive
-  ```
-  in the root directory of your `meteor` checkout.
-
-* Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
-
-* The default content security policy (CSP) for Cordova now includes `ws:`
-  and `wss:` WebSocket protocols.
-  [#7774](https://github.com/meteor/meteor/pull/7774)
-
-* `meteor npm` commands are now configured to use `dev_bundle/.npm` as the
-  npm cache directory by default, which should make npm commands less
-  sensitive to non-reproducible factors in the external environment.
-  https://github.com/meteor/meteor/pull/7668/commits/3313180a6ff33ee63602f7592a9506012029e919
-
-* The `meteor test` command now supports the `--no-release-check` flag.
-  https://github.com/meteor/meteor/pull/7668/commits/7097f78926f331fb9e70a06300ce1711adae2850
-
-* JavaScript module bundles on the server no longer include transitive
-  `node_modules` dependencies, since those dependencies can be evaluated
-  directly by Node. This optimization should improve server rebuild times
-  for apps and packages with large `node_modules` directories.
-  https://github.com/meteor/meteor/pull/7668/commits/03c5346873849151cecc3e00606c6e5aa13b3bbc
-
-* The `standard-minifier-css` package now does basic caching for the
-  expensive `mergeCss` function.
-  https://github.com/meteor/meteor/pull/7668/commits/bfa67337dda1e90610830611fd99dcb1bd44846a
-
-* The `coffeescript` package now natively supports `import` and `export`
-  declarations. [#7818](https://github.com/meteor/meteor/pull/7818)
-
-## v1.4.1.3
-
-* Node has been updated to version 4.6.1:
-  https://nodejs.org/en/blog/release/v4.6.1/
-
-* The `mongodb` npm package used by the `npm-mongo` Meteor package has
-  been updated to version 2.2.11.
-  [#7780](https://github.com/meteor/meteor/pull/7780)
-
-* The `fibers` npm package has been upgraded to version 1.0.15.
-
-* Running Meteor with a different `--port` will now automatically
-  reconfigure the Mongo replica set when using the WiredTiger storage
-  engine, instead of failing to start Mongo.
-  [#7840](https://github.com/meteor/meteor/pull/7840).
-
-* When the Meteor development server shuts down, it now attempts to kill
-  the `mongod` process it spawned, in addition to killing any running
-  `mongod` processes when the server first starts up.
-  https://github.com/meteor/meteor/pull/7668/commits/295d3d5678228f06ee0ab6c0d60139849a0ea192
-
-* The `meteor <command> ...` syntax will now work for any command
-  installed in `dev_bundle/bin`, except for Meteor's own commands.
-
-* Incomplete package downloads will now fail (and be retried several
-  times) instead of silently succeeding, which was the cause of the
-  dreaded `Error: ENOENT: no such file or directory, open... os.json`
-  error. [#7806](https://github.com/meteor/meteor/issues/7806)
-
-## v1.4.1.2
-
-* Node has been upgraded to version 4.6.0, a recommended security release:
-  https://nodejs.org/en/blog/release/v4.6.0/
-
-* `npm` has been upgraded to version 3.10.8.
-
-## v1.4.1.1
-
-* Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in
-  reconnection logic, leading to some `update` and `remove` commands being
-  treated as `insert`s. [#7594](https://github.com/meteor/meteor/issues/7594)
-
-## v1.4.1
-
-* Node has been upgraded to 4.5.0.
-
-* `npm` has been upgraded to 3.10.6.
-
-* The `meteor publish-for-arch` command is no longer necessary when
-  publishing Meteor packages with binary npm dependencies. Instead, binary
-  dependencies will be rebuilt automatically on the installation side.
-  Meteor package authors are not responsible for failures due to compiler
-  toolchain misconfiguration, and any compilation problems with the
-  underlying npm packages should be taken up with the authors of those
-  packages. That said, if a Meteor package author really needs or wants to
-  continue using `meteor publish-for-arch`, she should publish her package
-  using an older release: e.g. `meteor --release 1.4 publish`.
-  [#7608](https://github.com/meteor/meteor/pull/7608)
-
-* The `.meteor-last-rebuild-version.json` files that determine if a binary
-  npm package needs to be rebuilt now include more information from the
-  `process` object, namely `process.{platform,arch,versions}` instead of
-  just `process.versions`. Note also that the comparison of versions now
-  ignores differences in patch versions, to avoid needless rebuilds.
-
-* The `npm-bcrypt` package now uses a pure-JavaScript implementation by
-  default, but will prefer the native `bcrypt` implementation if it is
-  installed in the application's `node_modules` directory. In other words,
-  run `meteor install --save bcrypt` in your application if you need or
-  want to use the native implementation of `bcrypt`.
-  [#7595](https://github.com/meteor/meteor/pull/7595)
-
-* After Meteor packages are downloaded from Atmosphere, they will now be
-  extracted using native `tar` or `7z.exe` on Windows, instead of the
-  https://www.npmjs.com/package/tar library, for a significant performance
-  improvement. [#7457](https://github.com/meteor/meteor/pull/7457)
-
-* The npm `tar` package has been upgraded to 2.2.1, though it is now only
-  used as a fallback after native `tar` and/or `7z.exe`.
-
-* The progress indicator now distinguishes between downloading,
-  extracting, and loading newly-installed Meteor packages, instead of
-  lumping all of that work into a "downloading" status message.
-
-* Background Meteor updates will no longer modify the `~/.meteor/meteor`
-  symbolic link (or `AppData\Local\.meteor\meteor.bat` on Windows).
-  Instead, developers must explicitly type `meteor update` to begin using
-  a new version of the `meteor` script.
-
-* Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
-
-* The `google` package now uses the `email` scope as a mandatory field instead
-  of the `profile` scope. The `profile` scope is still added by default if the
-  `requestPermissions` option is not specified to maintain backward
-  compatibility, but it is now possible to pass an empty array to
-  `requestPermissions` in order to only request the `email` scope, which
-  reduces the amount of permissions requested from the user in the Google
-  popup. [PR #6975](https://github.com/meteor/meteor/pull/6975)
-
-* Added `Facebook.handleAuthFromAccessToken` in the case where you get the FB
-  accessToken in some out-of-band way. [PR #7550](https://github.com/meteor/meteor/pull/7550)
-
-* `Accounts.onLogout` gets `{ user, connection }` context in a similar fashion
-  to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issues/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
-
-* The `node-gyp` and `node-pre-gyp` tools will now be installed in
-  `bundle/programs/server/node_modules`, to assist with rebuilding binary
-  npm packages when deploying an app to Galaxy or elsewhere.
-  [#7571](https://github.com/meteor/meteor/pull/7571)
-
-* The `standard-minifier-{js,css}` packages no longer minify .js or .css
-  files on the server. [#7572](https://github.com/meteor/meteor/pull/7572)
-
-* Multi-line input to `meteor shell`, which was broken by changes to the
-  `repl` module in Node 4, works again.
-  [#7562](https://github.com/meteor/meteor/pull/7562)
-
-* The implementation of the command-line `meteor` tool now forbids
-  misbehaving polyfill libraries from overwriting `global.Promise`.
-  [#7569](https://github.com/meteor/meteor/pull/7569)
-
-* The `oauth-encryption` package no longer depends on the
-  `npm-node-aes-gcm` package (or any special npm packages), because the
-  Node 4 `crypto` library natively supports the `aes-128-gcm` algorithm.
-  [#7548](https://github.com/meteor/meteor/pull/7548)
-
-* The server-side component of the `meteor shell` command has been moved
-  into a Meteor package, so that it can be developed independently from
-  the Meteor release process, thanks to version unpinning.
-  [#7624](https://github.com/meteor/meteor/pull/7624)
-
-* The `meteor shell` command now works when running `meteor test`.
-
-* The `meteor debug` command no longer pauses at the first statement
-  in the Node process, yet still reliably stops at custom breakpoints
-  it encounters later.
-
-* The `meteor-babel` package has been upgraded to 0.12.0.
-
-* The `meteor-ecmascript-runtime` package has been upgraded to 0.2.9, to
-  support several additional [stage 4
-  proposals](https://github.com/meteor/ecmascript-runtime/pull/4).
-
-* A bug that prevented @-scoped npm packages from getting bundled for
-  deployed apps has been fixed.
-  [#7609](https://github.com/meteor/meteor/pull/7609).
-
-* The `meteor update` command now supports an `--all-packages` flag to
-  update all packages (including indirect dependencies) to their latest
-  compatible versions, similar to passing the names of all your packages
-  to the `meteor update` command.
-  [#7653](https://github.com/meteor/meteor/pull/7653)
-
-* Background release updates can now be disabled by invoking either
-  `meteor --no-release-check` or `METEOR_NO_RELEASE_CHECK=1 meteor`.
-  [#7445](https://github.com/meteor/meteor/pull/7445)
-
-## v1.4.0.1
-
-* Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))
-
-* Fix issue with running in development on Linux 32bit [Issue #7511](https://github.com/meteor/meteor/issues/7511)
-
-## v1.4
-
-* Node has been upgraded to 4.4.7.
-
-* The `meteor-babel` npm package has been upgraded to 0.11.7.
-
-* The `reify` npm package has been upgraded to 0.3.6.
-
-* The `bcrypt` npm package has been upgraded to 0.8.7.
-
-* Nested `import` declarations are now enabled for package code as well as
-  application code. 699cf1f38e9b2a074169515d23983f74148c7223
-
-* Meteor has been upgraded to support Mongo 3.2 by default (the bundled version
-  used by `meteor run` has been upgraded). Internally it now uses the 2.2.4
-  version of the `mongodb` npm driver, and has been tested against at Mongo 3.2
-  server. [Issue #6957](https://github.com/meteor/meteor/issues/6957)
-
-  Mongo 3.2 defaults to the new WiredTiger storage engine. You can update your
-  database following the instructions here:
-  https://docs.mongodb.com/v3.0/release-notes/3.0-upgrade/.
-  In development, you can also just use `meteor reset` to remove your old
-  database, and Meteor will create a new WiredTiger database for you. The Mongo
-  driver will continue to work with the old MMAPv1 storage engine however.
-
-  The new version of the Mongo driver has been tested with MongoDB versions from
-  2.6 up. Mongo 2.4 has now reached end-of-life
-  (https://www.mongodb.com/support-policy), and is no longer supported.
-
-  If you are setting `MONGO_OPLOG_URL`, especially in production, ensure you are
-  passing in the `replicaSet` argument (see [#7450]
-    (https://github.com/meteor/meteor/issues/7450))
-
-* Custom Mongo options can now be specified using the
-  `Mongo.setConnectionOptions(options)` API.
-  [#7277](https://github.com/meteor/meteor/pull/7277)
-
-* On the server, cursor.count() now takes a single argument `applySkipLimit`
-  (see the corresponding [Mongo documentation]
-    (http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count))
-
+* Add support for frame-ancestors CSP option in browser-policy [#7970](https://github.com/meteor/meteor/pull/7970)
 * Fix for regression caused by #5837 which incorrectly rewrote
-  network-path references (e.g. `//domain.com/image.gif`) in CSS URLs.
+  network-path references (i.e. //domain.com/image.gif) in CSS URLs
   [#7416](https://github.com/meteor/meteor/issues/7416)
 * Added Angular2 boilerplate example [#7364](https://github.com/meteor/meteor/pull/7363)
 
@@ -384,7 +10,7 @@
 
 * This release fixed a small bug in 1.3.5 that prevented updating apps
   whose `.meteor/release` files refer to releases no longer installed in
-  `~/.meteor/packages/meteor-tool`. [576468eae8d8dd7c1fe2fa381ac51dee5cb792cd](https://github.com/meteor/meteor/commit/576468eae8d8dd7c1fe2fa381ac51dee5cb792cd)
+  `~/.meteor/packages/meteor-tool`. 576468eae8d8dd7c1fe2fa381ac51dee5cb792cd
 
 ## v1.3.5
 
@@ -395,7 +21,7 @@
 * If an app has no `package.json` file, all packages in `node_modules`
   will be built into the production bundle. In other words, make sure you
   have a `package.json` file if you want to benefit from `devDependencies`
-  pruning. [7b2193188fc9e297eefc841ce6035825164f0684](https://github.com/meteor/meteor/commit/7b2193188fc9e297eefc841ce6035825164f0684)
+  pruning. 7b2193188fc9e297eefc841ce6035825164f0684
 
 * Binary npm dependencies of compiler plugins are now automatically
   rebuilt when Node/V8 versions change.
@@ -430,7 +56,7 @@
   `Npm.depends`) has been set to "error" instead of "warn". Note that this
   change does not affect `meteor npm ...` commands, which can be easily
   configured using `.npmrc` files or command-line flags.
-  [0689cae25a3e0da3615a402cdd0bec94ce8455c8](https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8)
+  https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8
 
 ## v1.3.4.3
 
@@ -461,7 +87,7 @@
   invoke. Note that you must `meteor update` to 1.3.4.2 before this logic
   will take effect, but it will work in all app directories after
   updating, even those pinned to older versions.
-  [#7338](https://github.com/meteor/meteor/issues/7338)
+  [#7338](https://github.com/meteor/meteor/issue/7338)
 
 * The Meteor installer now has the ability to resume downloads, so
   installing Meteor on a spotty internet connection should be more

From 2d33d3828a3daeade6a5151048d19011e9919484 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 30 Nov 2016 03:16:00 -0800
Subject: [PATCH 648/688] Do not even load autoprefixer without options.

---
 packages/stylus/plugin/compile-stylus.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/stylus/plugin/compile-stylus.js b/packages/stylus/plugin/compile-stylus.js
index 05a794d9cf..21de2eda24 100644
--- a/packages/stylus/plugin/compile-stylus.js
+++ b/packages/stylus/plugin/compile-stylus.js
@@ -155,13 +155,16 @@ class StylusCompiler extends MultiFileCachingCompiler {
 
     const f = new Future;
 
-    const style = stylus(inputFile.getContentsAsString())
-            .use(nib())
-            .use(autoprefixer(fileOptions.autoprefixer || {browsers: []}))
-            .set('filename', inputFile.getPathInPackage())
-            .set('sourcemap', { inline: false, comment: false })
-            .set('cache', false)
-            .set('importer', importer);
+    let style = stylus(inputFile.getContentsAsString()).use(nib())
+
+    if (fileOptions.autoprefixer) {
+      style = style.use(autoprefixer(fileOptions.autoprefixer))
+    }
+
+    style = style.set('filename', inputFile.getPathInPackage())
+                 .set('sourcemap', { inline: false, comment: false })
+                 .set('cache', false)
+                 .set('importer', importer);
 
     style.render(f.resolver());
     let css;

From fca0dccd20fff5b6a7f485bae3d5ecf23ba27179 Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Wed, 30 Nov 2016 03:18:52 -0800
Subject: [PATCH 649/688] Parse JSON for the flag.

---
 tools/console/console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/console/console.js b/tools/console/console.js
index 0c405a1e35..dd118ca188 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -309,7 +309,7 @@ var ProgressDisplayFull = function (console) {
   self._progressBarRenderer = new ProgressBarRenderer(PROGRESS_BAR_FORMAT, options);
   self._progressBarRenderer.start = new Date();
 
-  self._headless = !!(process.env.METEOR_HEADLESS && process.env.METEOR_HEADLESS != '0');
+  self._headless = !!(process.env.METEOR_HEADLESS && JSON.parse(process.env.METEOR_HEADLESS));
 
   self._spinnerRenderer = new SpinnerRenderer();
 

From 330a5afebcf6e1e945d362b64135e7506a55c9f4 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 30 Nov 2016 14:54:59 +0200
Subject: [PATCH 650/688] Revert "History entry for #7970"

This reverts commit 8e228180e66a9808f268f1de1b9ead2ec21a8751.
---
 History.md | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 380 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 1e37ceb125..30b3a8a95d 100644
--- a/History.md
+++ b/History.md
@@ -1,8 +1,382 @@
 ## v.NEXT
 
-* Add support for frame-ancestors CSP option in browser-policy [#7970](https://github.com/meteor/meteor/pull/7970)
+* The `facebook` package has been split into:
+  - `facebook-oauth` (the part that allows oauth w/ FB directly) and
+  - `facebook-config-ui` (the Blaze configuration templates for accounts-ui)
+
+  This means you can now use `[accounts-]facebook` without needing Blaze.
+
+  If you are using `accounts-ui` and `accounts-facebook`, you will probably
+  need to install the `facebook-config-ui` package if you want to configure it
+  using the Accounts UI.
+
+  [Issue #7715](https://github.com/meteor/meteor/issues/7715)
+  [PR #7728](https://github.com/meteor/meteor/pull/7728)
+
+## v1.4.2.3
+
+* Style improvements for `meteor create --full`.
+  [#8045](https://github.com/meteor/meteor/pull/8045)
+
+> Note: Meteor 1.4.2.2 was finalized before
+  [#8045](https://github.com/meteor/meteor/pull/8045) was merged, but
+  those changes were [deemed important
+  enough](https://github.com/meteor/meteor/pull/8044#issuecomment-260913739)
+  to skip recommending 1.4.2.2 and instead immediately release 1.4.2.3.
+
+## v1.4.2.2
+
+* Node has been upgraded to version 4.6.2.
+
+* `meteor create` now has a new `--full` option, which generates an larger app,
+  demonstrating development techniques highlighted in the
+  [Meteor Guide](http://guide.meteor.com)
+
+  [Issue #6974](https://github.com/meteor/meteor/issues/6974)
+  [PR #7807](https://github.com/meteor/meteor/pull/7807)
+
+* Minimongo now supports `$min`, `$max` and partially supports `$currentDate`.
+
+  [Issue #7857](https://github.com/meteor/meteor/issues/7857)
+  [PR #7858](https://github.com/meteor/meteor/pull/7858)
+
+* Fix for [Issue #5676](https://github.com/meteor/meteor/issues/5676)
+  [PR #7968](https://github.com/meteor/meteor/pull/7968)
+
+* It is now possible for packages to specify a *lazy* main module:
+  ```js
+  Package.onUse(function (api) {
+    api.mainModule("client.js", "client", { lazy: true });
+  });
+  ```
+  This means the `client.js` module will not be evaluated during app
+  startup unless/until another module imports it, and will not even be
+  included in the client bundle if no importing code is found. **Note 1:**
+  packages with lazy main modules cannot use `api.export` to export global
+  symbols to other packages/apps. **Note 2:** packages with lazy main
+  modules should be restricted to Meteor 1.4.2.2 or later via
+  `api.versionsFrom("1.4.2.2")`, since older versions of Meteor cannot
+  import lazy main modules using `import "meteor/<package name>"` but must
+  explicitly name the module: `import "meteor/<package name>/client.js"`.
+
+## v1.4.2.1
+
+* Installing the `babel-runtime` npm package in your application
+  `node_modules` directory is now required for most Babel-transformed code
+  to work, as the Meteor `babel-runtime` package no longer attempts to
+  provide custom implementations of Babel helper functions. To install
+  the `babel-runtime` package, simply run the command
+  ```sh
+  meteor npm install --save babel-runtime
+  ```
+  in any Meteor application directory. The Meteor `babel-runtime` package
+  version has been bumped to 1.0.0 to reflect this major change.
+  [#7995](https://github.com/meteor/meteor/pull/7995)
+
+* File system operations performed by the command-line tool no longer use
+  fibers unless the `METEOR_DISABLE_FS_FIBERS` environment variable is
+  explicitly set to a falsy value. For larger apps, this change results in
+  significant build performance improvements due to the creation of fewer
+  fibers and the avoidance of unnecessary asyncronous delays.
+  https://github.com/meteor/meteor/pull/7975/commits/ca4baed90ae0675e55c93976411d4ed91f12dd63
+
+* Running Meteor as `root` is still discouraged, and results in a fatal
+  error by default, but the `--allow-superuser` flag now works as claimed.
+  [#7959](https://github.com/meteor/meteor/issues/7959)
+
+* The `dev_bundle\python\python.exe` executable has been restored to the
+  Windows dev bundle, which may help with `meteor npm rebuild` commands.
+  [#7960](https://github.com/meteor/meteor/issues/7960)
+
+* Changes within linked npm packages now trigger a partial rebuild,
+  whereas previously (in 1.4.2) they were ignored.
+  [#7978](https://github.com/meteor/meteor/issues/7978)
+
+* Miscellaneous fixed bugs:
+  [#2876](https://github.com/meteor/meteor/issues/2876)
+  [#7154](https://github.com/meteor/meteor/issues/7154)
+  [#7956](https://github.com/meteor/meteor/issues/7956)
+  [#7974](https://github.com/meteor/meteor/issues/7974)
+  [#7999](https://github.com/meteor/meteor/issues/7999)
+  [#8005](https://github.com/meteor/meteor/issues/8005)
+  [#8007](https://github.com/meteor/meteor/issues/8007)
+
+## v1.4.2
+
+* This release implements a number of rebuild performance optimizations.
+  As you edit files in development, the server should restart and rebuild
+  much more quickly, especially if you have many `node_modules` files.
+  See https://github.com/meteor/meteor/pull/7668 for more details.
+
+> Note: the `METEOR_PROFILE` environment variable now provides data for
+  server startup time as well as build time, which should make it easier
+  to tell which of your packages are responsible for slow startup times.
+  Please include the output of `METEOR_PROFILE=10 meteor run` with any
+  GitHub issue about rebuild performance.
+
+* `npm` has been upgraded to version 3.10.9.
+
+* The `cordova-lib` npm package has been updated to 6.3.1, along with
+  cordova-android (5.2.2) and cordova-ios (4.2.1), and various plugins.
+
+* The `node-pre-gyp` npm package has been updated to 0.6.30.
+
+* The `lru-cache` npm package has been updated to 4.0.1.
+
+* The `meteor-promise` npm package has been updated to 0.8.0 for better
+  asynchronous stack traces.
+
+* The `meteor` tool is now prevented from running as `root` as this is
+  not recommended and can cause issues with permissions.  In some environments,
+  (e.g. Docker), it may still be desired to run as `root` and this can be
+  permitted by passing `--unsafe-perm` to the `meteor` command.
+  [#7821](https://github.com/meteor/meteor/pull/7821)
+
+* Blaze-related packages have been extracted to
+  [`meteor/blaze`](https://github.com/meteor/blaze), and the main
+  [`meteor/meteor`](https://github.com/meteor/meteor) repository now
+  refers to them via git submodules (see
+  [#7633](https://github.com/meteor/meteor/pull/7633)).
+  When running `meteor` from a checkout, you must now update these
+  submodules by running
+  ```sh
+  git submodule update --init --recursive
+  ```
+  in the root directory of your `meteor` checkout.
+
+* Accounts.forgotPassword and .verifyEmail no longer throw errors if callback is provided. [Issue #5664](https://github.com/meteor/meteor/issues/5664) [Origin PR #5681](https://github.com/meteor/meteor/pull/5681) [Merged PR](https://github.com/meteor/meteor/pull/7117)
+
+* The default content security policy (CSP) for Cordova now includes `ws:`
+  and `wss:` WebSocket protocols.
+  [#7774](https://github.com/meteor/meteor/pull/7774)
+
+* `meteor npm` commands are now configured to use `dev_bundle/.npm` as the
+  npm cache directory by default, which should make npm commands less
+  sensitive to non-reproducible factors in the external environment.
+  https://github.com/meteor/meteor/pull/7668/commits/3313180a6ff33ee63602f7592a9506012029e919
+
+* The `meteor test` command now supports the `--no-release-check` flag.
+  https://github.com/meteor/meteor/pull/7668/commits/7097f78926f331fb9e70a06300ce1711adae2850
+
+* JavaScript module bundles on the server no longer include transitive
+  `node_modules` dependencies, since those dependencies can be evaluated
+  directly by Node. This optimization should improve server rebuild times
+  for apps and packages with large `node_modules` directories.
+  https://github.com/meteor/meteor/pull/7668/commits/03c5346873849151cecc3e00606c6e5aa13b3bbc
+
+* The `standard-minifier-css` package now does basic caching for the
+  expensive `mergeCss` function.
+  https://github.com/meteor/meteor/pull/7668/commits/bfa67337dda1e90610830611fd99dcb1bd44846a
+
+* The `coffeescript` package now natively supports `import` and `export`
+  declarations. [#7818](https://github.com/meteor/meteor/pull/7818)
+
+## v1.4.1.3
+
+* Node has been updated to version 4.6.1:
+  https://nodejs.org/en/blog/release/v4.6.1/
+
+* The `mongodb` npm package used by the `npm-mongo` Meteor package has
+  been updated to version 2.2.11.
+  [#7780](https://github.com/meteor/meteor/pull/7780)
+
+* The `fibers` npm package has been upgraded to version 1.0.15.
+
+* Running Meteor with a different `--port` will now automatically
+  reconfigure the Mongo replica set when using the WiredTiger storage
+  engine, instead of failing to start Mongo.
+  [#7840](https://github.com/meteor/meteor/pull/7840).
+
+* When the Meteor development server shuts down, it now attempts to kill
+  the `mongod` process it spawned, in addition to killing any running
+  `mongod` processes when the server first starts up.
+  https://github.com/meteor/meteor/pull/7668/commits/295d3d5678228f06ee0ab6c0d60139849a0ea192
+
+* The `meteor <command> ...` syntax will now work for any command
+  installed in `dev_bundle/bin`, except for Meteor's own commands.
+
+* Incomplete package downloads will now fail (and be retried several
+  times) instead of silently succeeding, which was the cause of the
+  dreaded `Error: ENOENT: no such file or directory, open... os.json`
+  error. [#7806](https://github.com/meteor/meteor/issues/7806)
+
+## v1.4.1.2
+
+* Node has been upgraded to version 4.6.0, a recommended security release:
+  https://nodejs.org/en/blog/release/v4.6.0/
+
+* `npm` has been upgraded to version 3.10.8.
+
+## v1.4.1.1
+
+* Update the version of our Node MongoDB driver to 2.2.8 to fix a bug in
+  reconnection logic, leading to some `update` and `remove` commands being
+  treated as `insert`s. [#7594](https://github.com/meteor/meteor/issues/7594)
+
+## v1.4.1
+
+* Node has been upgraded to 4.5.0.
+
+* `npm` has been upgraded to 3.10.6.
+
+* The `meteor publish-for-arch` command is no longer necessary when
+  publishing Meteor packages with binary npm dependencies. Instead, binary
+  dependencies will be rebuilt automatically on the installation side.
+  Meteor package authors are not responsible for failures due to compiler
+  toolchain misconfiguration, and any compilation problems with the
+  underlying npm packages should be taken up with the authors of those
+  packages. That said, if a Meteor package author really needs or wants to
+  continue using `meteor publish-for-arch`, she should publish her package
+  using an older release: e.g. `meteor --release 1.4 publish`.
+  [#7608](https://github.com/meteor/meteor/pull/7608)
+
+* The `.meteor-last-rebuild-version.json` files that determine if a binary
+  npm package needs to be rebuilt now include more information from the
+  `process` object, namely `process.{platform,arch,versions}` instead of
+  just `process.versions`. Note also that the comparison of versions now
+  ignores differences in patch versions, to avoid needless rebuilds.
+
+* The `npm-bcrypt` package now uses a pure-JavaScript implementation by
+  default, but will prefer the native `bcrypt` implementation if it is
+  installed in the application's `node_modules` directory. In other words,
+  run `meteor install --save bcrypt` in your application if you need or
+  want to use the native implementation of `bcrypt`.
+  [#7595](https://github.com/meteor/meteor/pull/7595)
+
+* After Meteor packages are downloaded from Atmosphere, they will now be
+  extracted using native `tar` or `7z.exe` on Windows, instead of the
+  https://www.npmjs.com/package/tar library, for a significant performance
+  improvement. [#7457](https://github.com/meteor/meteor/pull/7457)
+
+* The npm `tar` package has been upgraded to 2.2.1, though it is now only
+  used as a fallback after native `tar` and/or `7z.exe`.
+
+* The progress indicator now distinguishes between downloading,
+  extracting, and loading newly-installed Meteor packages, instead of
+  lumping all of that work into a "downloading" status message.
+
+* Background Meteor updates will no longer modify the `~/.meteor/meteor`
+  symbolic link (or `AppData\Local\.meteor\meteor.bat` on Windows).
+  Instead, developers must explicitly type `meteor update` to begin using
+  a new version of the `meteor` script.
+
+* Password Reset tokens now expire (after 3 days by default -- can be modified via `Accounts.config({ passwordResetTokenExpirationInDays: ...}`). [PR #7534](https://github.com/meteor/meteor/pull/7534)
+
+* The `google` package now uses the `email` scope as a mandatory field instead
+  of the `profile` scope. The `profile` scope is still added by default if the
+  `requestPermissions` option is not specified to maintain backward
+  compatibility, but it is now possible to pass an empty array to
+  `requestPermissions` in order to only request the `email` scope, which
+  reduces the amount of permissions requested from the user in the Google
+  popup. [PR #6975](https://github.com/meteor/meteor/pull/6975)
+
+* Added `Facebook.handleAuthFromAccessToken` in the case where you get the FB
+  accessToken in some out-of-band way. [PR #7550](https://github.com/meteor/meteor/pull/7550)
+
+* `Accounts.onLogout` gets `{ user, connection }` context in a similar fashion
+  to `Accounts.onLogin`. [Issue #7397](https://github.com/meteor/meteor/issues/7397) [PR #7433](https://github.com/meteor/meteor/pull/7433)
+
+* The `node-gyp` and `node-pre-gyp` tools will now be installed in
+  `bundle/programs/server/node_modules`, to assist with rebuilding binary
+  npm packages when deploying an app to Galaxy or elsewhere.
+  [#7571](https://github.com/meteor/meteor/pull/7571)
+
+* The `standard-minifier-{js,css}` packages no longer minify .js or .css
+  files on the server. [#7572](https://github.com/meteor/meteor/pull/7572)
+
+* Multi-line input to `meteor shell`, which was broken by changes to the
+  `repl` module in Node 4, works again.
+  [#7562](https://github.com/meteor/meteor/pull/7562)
+
+* The implementation of the command-line `meteor` tool now forbids
+  misbehaving polyfill libraries from overwriting `global.Promise`.
+  [#7569](https://github.com/meteor/meteor/pull/7569)
+
+* The `oauth-encryption` package no longer depends on the
+  `npm-node-aes-gcm` package (or any special npm packages), because the
+  Node 4 `crypto` library natively supports the `aes-128-gcm` algorithm.
+  [#7548](https://github.com/meteor/meteor/pull/7548)
+
+* The server-side component of the `meteor shell` command has been moved
+  into a Meteor package, so that it can be developed independently from
+  the Meteor release process, thanks to version unpinning.
+  [#7624](https://github.com/meteor/meteor/pull/7624)
+
+* The `meteor shell` command now works when running `meteor test`.
+
+* The `meteor debug` command no longer pauses at the first statement
+  in the Node process, yet still reliably stops at custom breakpoints
+  it encounters later.
+
+* The `meteor-babel` package has been upgraded to 0.12.0.
+
+* The `meteor-ecmascript-runtime` package has been upgraded to 0.2.9, to
+  support several additional [stage 4
+  proposals](https://github.com/meteor/ecmascript-runtime/pull/4).
+
+* A bug that prevented @-scoped npm packages from getting bundled for
+  deployed apps has been fixed.
+  [#7609](https://github.com/meteor/meteor/pull/7609).
+
+* The `meteor update` command now supports an `--all-packages` flag to
+  update all packages (including indirect dependencies) to their latest
+  compatible versions, similar to passing the names of all your packages
+  to the `meteor update` command.
+  [#7653](https://github.com/meteor/meteor/pull/7653)
+
+* Background release updates can now be disabled by invoking either
+  `meteor --no-release-check` or `METEOR_NO_RELEASE_CHECK=1 meteor`.
+  [#7445](https://github.com/meteor/meteor/pull/7445)
+
+## v1.4.0.1
+
+* Fix issue with the 1.4 tool springboarding to older releases (see [Issue #7491](https://github.com/meteor/meteor/issues/7491))
+
+* Fix issue with running in development on Linux 32bit [Issue #7511](https://github.com/meteor/meteor/issues/7511)
+
+## v1.4
+
+* Node has been upgraded to 4.4.7.
+
+* The `meteor-babel` npm package has been upgraded to 0.11.7.
+
+* The `reify` npm package has been upgraded to 0.3.6.
+
+* The `bcrypt` npm package has been upgraded to 0.8.7.
+
+* Nested `import` declarations are now enabled for package code as well as
+  application code. 699cf1f38e9b2a074169515d23983f74148c7223
+
+* Meteor has been upgraded to support Mongo 3.2 by default (the bundled version
+  used by `meteor run` has been upgraded). Internally it now uses the 2.2.4
+  version of the `mongodb` npm driver, and has been tested against at Mongo 3.2
+  server. [Issue #6957](https://github.com/meteor/meteor/issues/6957)
+
+  Mongo 3.2 defaults to the new WiredTiger storage engine. You can update your
+  database following the instructions here:
+  https://docs.mongodb.com/v3.0/release-notes/3.0-upgrade/.
+  In development, you can also just use `meteor reset` to remove your old
+  database, and Meteor will create a new WiredTiger database for you. The Mongo
+  driver will continue to work with the old MMAPv1 storage engine however.
+
+  The new version of the Mongo driver has been tested with MongoDB versions from
+  2.6 up. Mongo 2.4 has now reached end-of-life
+  (https://www.mongodb.com/support-policy), and is no longer supported.
+
+  If you are setting `MONGO_OPLOG_URL`, especially in production, ensure you are
+  passing in the `replicaSet` argument (see [#7450]
+    (https://github.com/meteor/meteor/issues/7450))
+
+* Custom Mongo options can now be specified using the
+  `Mongo.setConnectionOptions(options)` API.
+  [#7277](https://github.com/meteor/meteor/pull/7277)
+
+* On the server, cursor.count() now takes a single argument `applySkipLimit`
+  (see the corresponding [Mongo documentation]
+    (http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count))
+
 * Fix for regression caused by #5837 which incorrectly rewrote
-  network-path references (i.e. //domain.com/image.gif) in CSS URLs
+  network-path references (e.g. `//domain.com/image.gif`) in CSS URLs.
   [#7416](https://github.com/meteor/meteor/issues/7416)
 * Added Angular2 boilerplate example [#7364](https://github.com/meteor/meteor/pull/7363)
 
@@ -10,7 +384,7 @@
 
 * This release fixed a small bug in 1.3.5 that prevented updating apps
   whose `.meteor/release` files refer to releases no longer installed in
-  `~/.meteor/packages/meteor-tool`. 576468eae8d8dd7c1fe2fa381ac51dee5cb792cd
+  `~/.meteor/packages/meteor-tool`. [576468eae8d8dd7c1fe2fa381ac51dee5cb792cd](https://github.com/meteor/meteor/commit/576468eae8d8dd7c1fe2fa381ac51dee5cb792cd)
 
 ## v1.3.5
 
@@ -21,7 +395,7 @@
 * If an app has no `package.json` file, all packages in `node_modules`
   will be built into the production bundle. In other words, make sure you
   have a `package.json` file if you want to benefit from `devDependencies`
-  pruning. 7b2193188fc9e297eefc841ce6035825164f0684
+  pruning. [7b2193188fc9e297eefc841ce6035825164f0684](https://github.com/meteor/meteor/commit/7b2193188fc9e297eefc841ce6035825164f0684)
 
 * Binary npm dependencies of compiler plugins are now automatically
   rebuilt when Node/V8 versions change.
@@ -56,7 +430,7 @@
   `Npm.depends`) has been set to "error" instead of "warn". Note that this
   change does not affect `meteor npm ...` commands, which can be easily
   configured using `.npmrc` files or command-line flags.
-  https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8
+  [0689cae25a3e0da3615a402cdd0bec94ce8455c8](https://github.com/meteor/meteor/commit/0689cae25a3e0da3615a402cdd0bec94ce8455c8)
 
 ## v1.3.4.3
 
@@ -87,7 +461,7 @@
   invoke. Note that you must `meteor update` to 1.3.4.2 before this logic
   will take effect, but it will work in all app directories after
   updating, even those pinned to older versions.
-  [#7338](https://github.com/meteor/meteor/issue/7338)
+  [#7338](https://github.com/meteor/meteor/issues/7338)
 
 * The Meteor installer now has the ability to resume downloads, so
   installing Meteor on a spotty internet connection should be more

From 06a1805cf789511d7620c82fba0ef1f7fe5f5942 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Wed, 30 Nov 2016 14:58:37 +0200
Subject: [PATCH 651/688] Fix history and add history for #7970

As a correction to 8e228180e66a9808f268f1de1b9ead2ec21a8751 which inadvertently removed 1.4 from existence.

Good catch by @mitar.  https://github.com/meteor/meteor/commit/8e228180e66a9808f268f1de1b9ead2ec21a8751?diff=unified#commitcomment-20013960
---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index 30b3a8a95d..651d39ac86 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,8 @@
   [Issue #7715](https://github.com/meteor/meteor/issues/7715)
   [PR #7728](https://github.com/meteor/meteor/pull/7728)
 
+* Add support for frame-ancestors CSP option in browser-policy [#7970](https://github.com/meteor/meteor/pull/7970)
+
 ## v1.4.2.3
 
 * Style improvements for `meteor create --full`.

From 1f883c6f6d2493aaaf0bb2a0da2f720ed944bacc Mon Sep 17 00:00:00 2001
From: Alex Terpyakov <terpyakov@gmail.com>
Date: Wed, 30 Nov 2016 21:36:56 +0300
Subject: [PATCH 652/688] Update uglify-js (#8117)

---
 packages/minifier-js/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 831c952eb2..a155e7e013 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.15"
+  version: "1.2.16"
 });
 
 Npm.depends({
-  "uglify-js": "2.7.0"
+  "uglify-js": "2.7.5"
 });
 
 Npm.strip({

From 8577c9a23329beaca73a01d1398339e03feb8a9c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 27 Nov 2016 19:55:13 -0500
Subject: [PATCH 653/688] Upgrade the `meteor-babel` npm package to version
 0.14.3.

---
 History.md                                             |  2 +-
 .../babel-compiler/.npm/package/npm-shrinkwrap.json    | 10 +++++-----
 packages/babel-compiler/package.js                     |  2 +-
 scripts/dev-bundle-tool-package.js                     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 9ae8a4f298..39c19a1270 100644
--- a/History.md
+++ b/History.md
@@ -13,7 +13,7 @@
   [Issue #7715](https://github.com/meteor/meteor/issues/7715)
   [PR #7728](https://github.com/meteor/meteor/pull/7728)
 
-* The `meteor-babel` npm package has been upgraded to version 0.14.2,
+* The `meteor-babel` npm package has been upgraded to version 0.14.3,
   fixing [#8021](https://github.com/meteor/meteor/issues/8021) and
   [#7662](https://github.com/meteor/meteor/issues/7662).
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 64a125f13b..21ecc62663 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -391,8 +391,8 @@
       "from": "jsesc@>=1.3.0 <2.0.0"
     },
     "json5": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "from": "json5@>=0.5.0 <0.6.0"
     },
     "lodash": {
@@ -411,9 +411,9 @@
       "from": "magic-string@>=0.16.0 <0.17.0"
     },
     "meteor-babel": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.14.2.tgz",
-      "from": "meteor-babel@0.14.2"
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.14.3.tgz",
+      "from": "meteor-babel@0.14.3"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 2d7ada3c4e..071bab1123 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.14.2'
+  'meteor-babel': '0.14.3'
 });
 
 Package.onUse(function (api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 9b2dac129c..468790fe50 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "3.10.9",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
-    "meteor-babel": "0.14.2",
+    "meteor-babel": "0.14.3",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 5754f8ef3ea5222dd5ab601dd91f130d0092646e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Wed, 30 Nov 2016 19:48:19 -0500
Subject: [PATCH 654/688] Revert "Merge pull request #7963 from
 hwillson/issue-5626" (#8118)

This reverts commit 11ce2f7bbcb8aa53114f6cad9e025583608f7bbe, reversing
changes made to dfde4146f751a155fd8f07ffad78b16c76abea9c.
---
 tools/static-assets/server/boot.js            |  8 ---
 tools/static-assets/server/mini-files.js      |  6 ---
 tools/static-assets/server/server-json.js     |  4 +-
 .../apps/unicode-asset-app/.meteor/.gitignore |  1 -
 .../apps/unicode-asset-app/.meteor/packages   |  7 ---
 .../apps/unicode-asset-app/.meteor/release    |  1 -
 tools/tests/apps/unicode-asset-app/index.js   | 22 --------
 .../unicode-asset-app/private/maça verde.txt  |  1 -
 tools/tests/assets.js                         | 54 -------------------
 9 files changed, 1 insertion(+), 103 deletions(-)
 delete mode 100644 tools/tests/apps/unicode-asset-app/.meteor/.gitignore
 delete mode 100644 tools/tests/apps/unicode-asset-app/.meteor/packages
 delete mode 100644 tools/tests/apps/unicode-asset-app/.meteor/release
 delete mode 100644 tools/tests/apps/unicode-asset-app/index.js
 delete mode 100644 tools/tests/apps/unicode-asset-app/private/maça verde.txt
 delete mode 100644 tools/tests/assets.js

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 4abc6dc05f..8e58b9e3b4 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -227,10 +227,6 @@ var loadServerBundles = Profile("Load server bundles", function () {
       // written on Windows.
       assetPath = files.convertToStandardPath(assetPath);
 
-      // Unicode normalize the asset path to prevent string mismatches when
-      // using this string elsewhere.
-      assetPath = files.unicodeNormalizePath(assetPath);
-
       if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
         _callback(new Error("Unknown asset: " + assetPath));
       } else {
@@ -255,10 +251,6 @@ var loadServerBundles = Profile("Load server bundles", function () {
        * @param {String} assetPath The path of the asset, relative to the application's `private` subdirectory.
        */
       absoluteFilePath: function (assetPath) {
-        // Unicode normalize the asset path to prevent string mismatches when
-        // using this string elsewhere.
-        assetPath = files.unicodeNormalizePath(assetPath);
-
         if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
           throw new Error("Unknown asset: " + assetPath);
         }
diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js
index 2946f00a01..3d29cc5549 100644
--- a/tools/static-assets/server/mini-files.js
+++ b/tools/static-assets/server/mini-files.js
@@ -69,11 +69,6 @@ var convertToStandardLineEndings = function (fileContents) {
                      .replace(new RegExp("\r", "g"), "\n");
 };
 
-// Return the Unicode Normalization Form of the passed in path string, using
-// "Normalization Form Canonical Composition"
-const unicodeNormalizePath = (path) => {
-  return (path) ? path.normalize('NFC') : path;
-};
 
 // wrappings for path functions that always run as they were on unix (using
 // forward slashes)
@@ -122,4 +117,3 @@ files.convertToPosixPath = toPosixPath;
 
 files.convertToStandardLineEndings = convertToStandardLineEndings;
 files.convertToOSLineEndings = convertToOSLineEndings;
-files.unicodeNormalizePath = unicodeNormalizePath;
diff --git a/tools/static-assets/server/server-json.js b/tools/static-assets/server/server-json.js
index a3d2069730..1711bb2415 100644
--- a/tools/static-assets/server/server-json.js
+++ b/tools/static-assets/server/server-json.js
@@ -1,6 +1,4 @@
 var fs = require("fs");
 var path = require("path");
 var serverJsonPath = path.resolve(process.argv[2]);
-module.exports = JSON.parse(
-  fs.readFileSync(serverJsonPath, 'utf8').normalize('NFC')
-);
+module.exports = JSON.parse(fs.readFileSync(serverJsonPath, 'utf8'));
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/.gitignore b/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
deleted file mode 100644
index 4083037423..0000000000
--- a/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/packages b/tools/tests/apps/unicode-asset-app/.meteor/packages
deleted file mode 100644
index 356aa29878..0000000000
--- a/tools/tests/apps/unicode-asset-app/.meteor/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Meteor packages used by this project, one per line.
-# Check this file (and the other files in this directory) into your repository.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
-meteor-base
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/release b/tools/tests/apps/unicode-asset-app/.meteor/release
deleted file mode 100644
index 621e94f0ec..0000000000
--- a/tools/tests/apps/unicode-asset-app/.meteor/release
+++ /dev/null
@@ -1 +0,0 @@
-none
diff --git a/tools/tests/apps/unicode-asset-app/index.js b/tools/tests/apps/unicode-asset-app/index.js
deleted file mode 100644
index 1eba400fb4..0000000000
--- a/tools/tests/apps/unicode-asset-app/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-if (Meteor.isServer) {
-  // c\u0327 = 2 code points: U+0063 LATIN SMALL LETTER C and U+0327 COMBINING
-  //           CEDILLA
-  // \xE7 = 1 code point: U+00E7 LATIN SMALL LETTER C WITH CEDILLA
-  const filenames = [
-    'maça verde.txt',
-    'mac\u0327a verde.txt',
-    'ma\xE7a verde.txt',
-  ];
-
-  filenames.forEach((filename, index) => {
-    console.log(`${index + 1} - getText: ${Assets.getText(filename)}`);
-  });
-
-  filenames.forEach((filename, index) => {
-    console.log(
-      `${index + 1} - absoluteFilePath: ${Assets.absoluteFilePath(filename)}`
-    );
-  });
-}
diff --git a/tools/tests/apps/unicode-asset-app/private/maça verde.txt b/tools/tests/apps/unicode-asset-app/private/maça verde.txt
deleted file mode 100644
index cd0875583a..0000000000
--- a/tools/tests/apps/unicode-asset-app/private/maça verde.txt	
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
deleted file mode 100644
index fd35fe8116..0000000000
--- a/tools/tests/assets.js
+++ /dev/null
@@ -1,54 +0,0 @@
-var selftest = require('../tool-testing/selftest.js');
-
-var Sandbox = selftest.Sandbox;
-
-var MONGO_LISTENING =
-  { stdout: " [initandlisten] waiting for connections on port" };
-
-function startRun(sandbox) {
-  var run = sandbox.run();
-  run.match("myapp");
-  run.match("proxy");
-  run.tellMongo(MONGO_LISTENING);
-  run.match("MongoDB");
-  return run;
-};
-
-// Test that an app can properly read assets with unicode based filenames
-selftest.define("assets - unicode asset names are allowed", () => {
-  const s = new Sandbox({ fakeMongo: true });
-  s.createApp('myapp', 'unicode-asset-app');
-  s.cd('myapp');
-  const run = startRun(s);
-  run.match('1 - getText: Hello world!');
-  run.match('2 - getText: Hello world!');
-  run.match('3 - getText: Hello world!');
-  run.match(/1 - absoluteFilePath:(.*)macaverde.txt/);
-  run.match(/2 - absoluteFilePath:(.*)macaverde.txt/);
-  run.match(/3 - absoluteFilePath:(.*)macaverde.txt/);
-  run.stop();
-});
-
-// Verify path strings can be Unicode normalized through the
-// tools/static-assets/server/mini-files.js#unicodeNormalizePath helper
-selftest.define(
-  "assets - helper exists to unicode normalize path strings",
-  () => {
-    const files = require('../static-assets/server/mini-files.js');
-
-    selftest.expectEqual(null, files.unicodeNormalizePath(null));
-
-    const unicodeNormalizedPath = '/path/maça verde.txt'.normalize('NFC');
-    const testPaths = [
-      '/path/maça verde.txt',
-      '/path/mac\u0327a verde.txt',
-      '/path/ma\xE7a verde.txt',
-    ];
-    testPaths.forEach((path) => {
-      selftest.expectEqual(
-        unicodeNormalizedPath,
-        files.unicodeNormalizePath(path)
-      );
-    });
-  }
-);

From 9706be2fb3f0aa7065e323a0d41c2d6107ac498b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 30 Nov 2016 19:51:42 -0500
Subject: [PATCH 655/688] Bump $BUNDLE_VERSION to 4.7.4 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 9c79ae6c75..91a052131e 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.3
+BUNDLE_VERSION=4.7.4
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From c55d8cca764978d278e62809b7f231153d30bc8d Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 30 Nov 2016 20:28:21 -0500
Subject: [PATCH 656/688] Revert "Revert "Merge pull request #7963 from
 hwillson/issue-5626" (#8118)"

This reverts commit 5754f8ef3ea5222dd5ab601dd91f130d0092646e.
---
 tools/static-assets/server/boot.js            |  8 +++
 tools/static-assets/server/mini-files.js      |  6 +++
 tools/static-assets/server/server-json.js     |  4 +-
 .../apps/unicode-asset-app/.meteor/.gitignore |  1 +
 .../apps/unicode-asset-app/.meteor/packages   |  7 +++
 .../apps/unicode-asset-app/.meteor/release    |  1 +
 tools/tests/apps/unicode-asset-app/index.js   | 22 ++++++++
 .../unicode-asset-app/private/maça verde.txt  |  1 +
 tools/tests/assets.js                         | 54 +++++++++++++++++++
 9 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/.gitignore
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/packages
 create mode 100644 tools/tests/apps/unicode-asset-app/.meteor/release
 create mode 100644 tools/tests/apps/unicode-asset-app/index.js
 create mode 100644 tools/tests/apps/unicode-asset-app/private/maça verde.txt
 create mode 100644 tools/tests/assets.js

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 8e58b9e3b4..4abc6dc05f 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -227,6 +227,10 @@ var loadServerBundles = Profile("Load server bundles", function () {
       // written on Windows.
       assetPath = files.convertToStandardPath(assetPath);
 
+      // Unicode normalize the asset path to prevent string mismatches when
+      // using this string elsewhere.
+      assetPath = files.unicodeNormalizePath(assetPath);
+
       if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
         _callback(new Error("Unknown asset: " + assetPath));
       } else {
@@ -251,6 +255,10 @@ var loadServerBundles = Profile("Load server bundles", function () {
        * @param {String} assetPath The path of the asset, relative to the application's `private` subdirectory.
        */
       absoluteFilePath: function (assetPath) {
+        // Unicode normalize the asset path to prevent string mismatches when
+        // using this string elsewhere.
+        assetPath = files.unicodeNormalizePath(assetPath);
+
         if (!fileInfo.assets || !_.has(fileInfo.assets, assetPath)) {
           throw new Error("Unknown asset: " + assetPath);
         }
diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js
index 3d29cc5549..2946f00a01 100644
--- a/tools/static-assets/server/mini-files.js
+++ b/tools/static-assets/server/mini-files.js
@@ -69,6 +69,11 @@ var convertToStandardLineEndings = function (fileContents) {
                      .replace(new RegExp("\r", "g"), "\n");
 };
 
+// Return the Unicode Normalization Form of the passed in path string, using
+// "Normalization Form Canonical Composition"
+const unicodeNormalizePath = (path) => {
+  return (path) ? path.normalize('NFC') : path;
+};
 
 // wrappings for path functions that always run as they were on unix (using
 // forward slashes)
@@ -117,3 +122,4 @@ files.convertToPosixPath = toPosixPath;
 
 files.convertToStandardLineEndings = convertToStandardLineEndings;
 files.convertToOSLineEndings = convertToOSLineEndings;
+files.unicodeNormalizePath = unicodeNormalizePath;
diff --git a/tools/static-assets/server/server-json.js b/tools/static-assets/server/server-json.js
index 1711bb2415..a3d2069730 100644
--- a/tools/static-assets/server/server-json.js
+++ b/tools/static-assets/server/server-json.js
@@ -1,4 +1,6 @@
 var fs = require("fs");
 var path = require("path");
 var serverJsonPath = path.resolve(process.argv[2]);
-module.exports = JSON.parse(fs.readFileSync(serverJsonPath, 'utf8'));
+module.exports = JSON.parse(
+  fs.readFileSync(serverJsonPath, 'utf8').normalize('NFC')
+);
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/.gitignore b/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/packages b/tools/tests/apps/unicode-asset-app/.meteor/packages
new file mode 100644
index 0000000000..356aa29878
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/packages
@@ -0,0 +1,7 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-base
diff --git a/tools/tests/apps/unicode-asset-app/.meteor/release b/tools/tests/apps/unicode-asset-app/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/unicode-asset-app/index.js b/tools/tests/apps/unicode-asset-app/index.js
new file mode 100644
index 0000000000..1eba400fb4
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/index.js
@@ -0,0 +1,22 @@
+'use strict';
+
+if (Meteor.isServer) {
+  // c\u0327 = 2 code points: U+0063 LATIN SMALL LETTER C and U+0327 COMBINING
+  //           CEDILLA
+  // \xE7 = 1 code point: U+00E7 LATIN SMALL LETTER C WITH CEDILLA
+  const filenames = [
+    'maça verde.txt',
+    'mac\u0327a verde.txt',
+    'ma\xE7a verde.txt',
+  ];
+
+  filenames.forEach((filename, index) => {
+    console.log(`${index + 1} - getText: ${Assets.getText(filename)}`);
+  });
+
+  filenames.forEach((filename, index) => {
+    console.log(
+      `${index + 1} - absoluteFilePath: ${Assets.absoluteFilePath(filename)}`
+    );
+  });
+}
diff --git a/tools/tests/apps/unicode-asset-app/private/maça verde.txt b/tools/tests/apps/unicode-asset-app/private/maça verde.txt
new file mode 100644
index 0000000000..cd0875583a
--- /dev/null
+++ b/tools/tests/apps/unicode-asset-app/private/maça verde.txt	
@@ -0,0 +1 @@
+Hello world!
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
new file mode 100644
index 0000000000..fd35fe8116
--- /dev/null
+++ b/tools/tests/assets.js
@@ -0,0 +1,54 @@
+var selftest = require('../tool-testing/selftest.js');
+
+var Sandbox = selftest.Sandbox;
+
+var MONGO_LISTENING =
+  { stdout: " [initandlisten] waiting for connections on port" };
+
+function startRun(sandbox) {
+  var run = sandbox.run();
+  run.match("myapp");
+  run.match("proxy");
+  run.tellMongo(MONGO_LISTENING);
+  run.match("MongoDB");
+  return run;
+};
+
+// Test that an app can properly read assets with unicode based filenames
+selftest.define("assets - unicode asset names are allowed", () => {
+  const s = new Sandbox({ fakeMongo: true });
+  s.createApp('myapp', 'unicode-asset-app');
+  s.cd('myapp');
+  const run = startRun(s);
+  run.match('1 - getText: Hello world!');
+  run.match('2 - getText: Hello world!');
+  run.match('3 - getText: Hello world!');
+  run.match(/1 - absoluteFilePath:(.*)macaverde.txt/);
+  run.match(/2 - absoluteFilePath:(.*)macaverde.txt/);
+  run.match(/3 - absoluteFilePath:(.*)macaverde.txt/);
+  run.stop();
+});
+
+// Verify path strings can be Unicode normalized through the
+// tools/static-assets/server/mini-files.js#unicodeNormalizePath helper
+selftest.define(
+  "assets - helper exists to unicode normalize path strings",
+  () => {
+    const files = require('../static-assets/server/mini-files.js');
+
+    selftest.expectEqual(null, files.unicodeNormalizePath(null));
+
+    const unicodeNormalizedPath = '/path/maça verde.txt'.normalize('NFC');
+    const testPaths = [
+      '/path/maça verde.txt',
+      '/path/mac\u0327a verde.txt',
+      '/path/ma\xE7a verde.txt',
+    ];
+    testPaths.forEach((path) => {
+      selftest.expectEqual(
+        unicodeNormalizedPath,
+        files.unicodeNormalizePath(path)
+      );
+    });
+  }
+);

From 4a10a1b26b041e733b84eb72b7f9917127bb37b7 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Wed, 30 Nov 2016 20:31:37 -0500
Subject: [PATCH 657/688] Making sure asset filenames are Unicode normalized
 when loaded (to help address issue #5626).

---
 tools/isobuild/package-source.js | 5 +++--
 tools/tests/assets.js            | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js
index 41f81b46aa..cbe085d4a5 100644
--- a/tools/isobuild/package-source.js
+++ b/tools/isobuild/package-source.js
@@ -1179,9 +1179,10 @@ _.extend(PackageSource.prototype, {
             // Recurse on this directory.
             assetDirs.push(item);
           } else {
-            // This file is an asset.
+            // This file is an asset. Make sure filenames are Unicode
+            // normalized.
             assets.push({
-              relPath: item
+              relPath: item.normalize('NFC')
             });
           }
         });
diff --git a/tools/tests/assets.js b/tools/tests/assets.js
index fd35fe8116..60e37ca519 100644
--- a/tools/tests/assets.js
+++ b/tools/tests/assets.js
@@ -23,9 +23,9 @@ selftest.define("assets - unicode asset names are allowed", () => {
   run.match('1 - getText: Hello world!');
   run.match('2 - getText: Hello world!');
   run.match('3 - getText: Hello world!');
-  run.match(/1 - absoluteFilePath:(.*)macaverde.txt/);
-  run.match(/2 - absoluteFilePath:(.*)macaverde.txt/);
-  run.match(/3 - absoluteFilePath:(.*)macaverde.txt/);
+  run.match(/1 - absoluteFilePath:(.*)maaverde.txt/);
+  run.match(/2 - absoluteFilePath:(.*)maaverde.txt/);
+  run.match(/3 - absoluteFilePath:(.*)maaverde.txt/);
   run.stop();
 });
 

From 054796f35e81bafe2d7f01cefe44d50c2a3442ad Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 1 Dec 2016 16:01:25 +0200
Subject: [PATCH 658/688] Make CI test runner more defensive and a bit more
 flexible.

This changes the CI script to make sure it runs all tests, regardless of the environment configuration while still allowing flexibility in the size of the container parallelism.

While not having any effect on the Meteor configuration this will now run all 8 test groups across a fewer number of containers, if necessary.

This fixes issues where false-positives are achieved on contributor PRs, like seen on meteor/meteor#7963.  I explained here:

https://github.com/meteor/meteor/pull/7963#issuecomment-264188162

This change will also allow the script to run tests in their entirety if the parallelism configuration is missing, such as when run from a local dev box.
---
 scripts/ci.sh | 55 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 7f26543f66..71fc62fb43 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -5,6 +5,16 @@ export SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^log
 # Don't print as many progress indicators
 export EMACS=t
 
+if [ -z "$CIRCLE_NODE_TOTAL" ] || [ -z "$CIRCLE_NODE_INDEX" ]; then
+  # In the case where these aren't set, just pretend like we're a single node.
+  # This is also handy if the user is using another CI service besides CircleCI
+  CIRCLE_NODE_TOTAL=1
+  CIRCLE_NODE_INDEX=0
+
+  echo "[warn] CIRCLE_NODE_TOTAL or CIRCLE_NODE_INDEX was not defined.  \c"
+  echo "Running all tests!"
+fi
+
 # Clear dev_bundle/.npm to ensure consistent test runs.
 ./meteor npm cache clear
 
@@ -17,60 +27,69 @@ export EMACS=t
 git submodule update --init --recursive
 
 # run different jobs based on CicleCI parallel container index
-case $CIRCLE_NODE_INDEX in
-0)
+should_run_test () {
+  test $(($1 % $CIRCLE_NODE_TOTAL)) -eq $CIRCLE_NODE_INDEX
+}
+
+if should_run_test 0; then
   echo "Running warehouse self-tests"
   ./meteor self-test --headless \
       --with-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-1)
+fi
+
+if should_run_test 1; then
   echo "Running self-test (1): A-Com"
   ./meteor self-test --headless \
       --file "^[a-b]|^c[a-n]|^co[a-l]|^compiler-plugins" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-2)
+fi
+
+if should_run_test 2; then
   echo "Running self-test (2): Con-K"
   ./meteor self-test --headless \
       --file "^co[n-z]|^c[p-z]|^[d-k]" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-3)
+fi
+
+if should_run_test 3; then
   echo "Running self-test (3): L-O"
   ./meteor self-test --headless \
       --file "^[l-o]" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-4)
+fi
+
+if should_run_test 4; then
   echo "Running self-test (4): P"
   ./meteor self-test --headless \
       --file "^p" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-5)
+fi
+
+if should_run_test 5; then
   echo "Running self-test (5): Run"
   ./meteor self-test --headless \
       --file "^run" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-6)
+fi
+
+if should_run_test 6; then
   echo "Running self-test (6): R-S"
   ./meteor self-test --headless \
       --file "^r(?!un)|^s" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-7)
+fi
+
+if should_run_test 7; then
   echo "Running self-test (7): Sp-Z"
   ./meteor self-test --headless \
       --file "^[t-z]|^command-line" \
       --without-tag "custom-warehouse" \
       --exclude "$SELF_TEST_EXCLUDE"
-  ;;
-esac
+fi
\ No newline at end of file

From b0c6804b63b29861243d4902a969d282b1fdfb0d Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 1 Dec 2016 17:27:53 +0200
Subject: [PATCH 659/688] Allow changes to some CI settings which may vary by
 environment.

This permits changing TIMEOUT_SCALE_FACTOR using a variable instead of hard-coding it in the script.

Also adds ADDL_SELF_TEST_EXCLUDE to define environment specific tests which must be skipped.

For example, I run my preliminary (personal) Meteor tests on SemaphoreCI, but there is a particular test that just _will not work_.  This allows me to override particulary problematic tests without sed-ing the script.
---
 scripts/ci.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 71fc62fb43..26b14538fc 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -1,6 +1,24 @@
-export TIMEOUT_SCALE_FACTOR=15
-export TEST_PACKAGES_EXCLUDE="less"
-export SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
+#!/bin/sh
+
+#
+# Optional Environment Variables for Configuration
+#
+# - TIMEOUT_SCALE_FACTOR: (default: 15)
+#   A multiplation factor that can be used to raise the wait-time on
+#   various longer-running tests.  Useful for slower (or faster!) hardware.
+# - ADDL_SELF_TEST_EXCLUDE: (optional)
+#   A regex or list of additional regexes to skip.
+
+# Export this one so it's available in the node environment.
+export TIMEOUT_SCALE_FACTOR=${TIMEOUT_SCALE_FACTOR:-15}
+
+# Skip these tests always.  Add other tests with ADDL_SELF_TEST_EXCLUDE.
+SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
+
+# If no SELF_TEST_EXCLUDE is defined, use those defined here by default
+if ! [ -z "$ADDL_SELF_TEST_EXCLUDE" ]; then
+  SELF_TEST_EXCLUDE="${SELF_TEST_EXCLUDE}|${ADDL_SELF_TEST_EXCLUDE}"
+fi
 
 # Don't print as many progress indicators
 export EMACS=t

From 6701357c41078e1e8a90384e4fc71ba0ab3301ff Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 1 Dec 2016 17:37:48 +0200
Subject: [PATCH 660/688] Reformat the pre-defined tests to not be multiple
 lines.

This might be overboard as it adds some additional code but the regex off the screen was midly unpleasant.

One additional benefit to this is that you could have a list of excluded tests stored in a separate file and use:

```
ADDL_SELF_TEST_EXCLUDE="$(cat addl_tests.txt)"
```

(note the importance of double quotes to preserve newlines)
---
 scripts/ci.sh | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 26b14538fc..2bb65086ec 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -7,17 +7,42 @@
 #   A multiplation factor that can be used to raise the wait-time on
 #   various longer-running tests.  Useful for slower (or faster!) hardware.
 # - ADDL_SELF_TEST_EXCLUDE: (optional)
-#   A regex or list of additional regexes to skip.
+#   A list of additional regexes to skip, in addition to the defaults.
 
 # Export this one so it's available in the node environment.
 export TIMEOUT_SCALE_FACTOR=${TIMEOUT_SCALE_FACTOR:-15}
 
-# Skip these tests always.  Add other tests with ADDL_SELF_TEST_EXCLUDE.
-SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
+# Define the default tests which will be skipped.  One per line.
+test -z "$SELF_TEST_EXCLUDE" && read -r -d '' SELF_TEST_EXCLUDE <<-'EOF'
+^can't publish package with colons
+^compiler plugins - addAssets
+^logs - logged (in|out)
+^minifiers can't register non-js
+^minifiers: apps can't use
+^mongo - logged (in|out)
+^old cli tests
+EOF
 
-# If no SELF_TEST_EXCLUDE is defined, use those defined here by default
+# Helper function to join lines.
+joinLines () {
+  joined=""
+  IFS="$(printf '\n ')" && IFS="${IFS% }"
+  for add in $1
+  do
+    joined="${joined:+${joined}${2:-,}}${add}"
+  done
+  unset IFS
+  echo "$joined"
+}
+
+# Merge tests into a single, one-line regex.
+SELF_TEST_EXCLUDE=$(joinLines "$SELF_TEST_EXCLUDE" "|")
+
+# Add additional tests.
 if ! [ -z "$ADDL_SELF_TEST_EXCLUDE" ]; then
-  SELF_TEST_EXCLUDE="${SELF_TEST_EXCLUDE}|${ADDL_SELF_TEST_EXCLUDE}"
+  SELF_TEST_EXCLUDE=(
+    "${SELF_TEST_EXCLUDE}|$(joinLines "$ADDL_SELF_TEST_EXCLUDE")"
+  )
 fi
 
 # Don't print as many progress indicators

From b2e80f5cbc0819e6e31c28dc959a6409f0d6a803 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 1 Dec 2016 18:10:34 +0200
Subject: [PATCH 661/688] Revert "Reformat the pre-defined tests to not be
 multiple lines."

This reverts commit 7df3ccaa2195af2628f20752104b331997137b73 which introduced a change which required `bash`.

I don't want to force `bash` for a test runner.
---
 scripts/ci.sh | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 2bb65086ec..26b14538fc 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -7,42 +7,17 @@
 #   A multiplation factor that can be used to raise the wait-time on
 #   various longer-running tests.  Useful for slower (or faster!) hardware.
 # - ADDL_SELF_TEST_EXCLUDE: (optional)
-#   A list of additional regexes to skip, in addition to the defaults.
+#   A regex or list of additional regexes to skip.
 
 # Export this one so it's available in the node environment.
 export TIMEOUT_SCALE_FACTOR=${TIMEOUT_SCALE_FACTOR:-15}
 
-# Define the default tests which will be skipped.  One per line.
-test -z "$SELF_TEST_EXCLUDE" && read -r -d '' SELF_TEST_EXCLUDE <<-'EOF'
-^can't publish package with colons
-^compiler plugins - addAssets
-^logs - logged (in|out)
-^minifiers can't register non-js
-^minifiers: apps can't use
-^mongo - logged (in|out)
-^old cli tests
-EOF
+# Skip these tests always.  Add other tests with ADDL_SELF_TEST_EXCLUDE.
+SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
 
-# Helper function to join lines.
-joinLines () {
-  joined=""
-  IFS="$(printf '\n ')" && IFS="${IFS% }"
-  for add in $1
-  do
-    joined="${joined:+${joined}${2:-,}}${add}"
-  done
-  unset IFS
-  echo "$joined"
-}
-
-# Merge tests into a single, one-line regex.
-SELF_TEST_EXCLUDE=$(joinLines "$SELF_TEST_EXCLUDE" "|")
-
-# Add additional tests.
+# If no SELF_TEST_EXCLUDE is defined, use those defined here by default
 if ! [ -z "$ADDL_SELF_TEST_EXCLUDE" ]; then
-  SELF_TEST_EXCLUDE=(
-    "${SELF_TEST_EXCLUDE}|$(joinLines "$ADDL_SELF_TEST_EXCLUDE")"
-  )
+  SELF_TEST_EXCLUDE="${SELF_TEST_EXCLUDE}|${ADDL_SELF_TEST_EXCLUDE}"
 fi
 
 # Don't print as many progress indicators

From 8c7232c0f7770243630d35dc83286544a59fa5da Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Thu, 1 Dec 2016 19:01:02 +0200
Subject: [PATCH 662/688] Track error codes from all self-test instances and
 fail accordingly

Since multiple self-tests could run in a series now, this makes sure that when any of them fails, the error is propagated to CircleCI but still lets them all finish.
---
 scripts/ci.sh | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 26b14538fc..63793594a6 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -49,11 +49,20 @@ should_run_test () {
   test $(($1 % $CIRCLE_NODE_TOTAL)) -eq $CIRCLE_NODE_INDEX
 }
 
+# Keep track of errors, but let the tests all finish. This is necessary since
+# more than one of the following tests may be executed from a single run if
+# parallelism is lower than the number of tests.
+exit_code=0
+
+# Also, if any uncaught errors slip through, fail the build.
+set -e
+
 if should_run_test 0; then
   echo "Running warehouse self-tests"
   ./meteor self-test --headless \
       --with-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 1; then
@@ -61,7 +70,8 @@ if should_run_test 1; then
   ./meteor self-test --headless \
       --file "^[a-b]|^c[a-n]|^co[a-l]|^compiler-plugins" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 2; then
@@ -69,7 +79,8 @@ if should_run_test 2; then
   ./meteor self-test --headless \
       --file "^co[n-z]|^c[p-z]|^[d-k]" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 3; then
@@ -77,7 +88,8 @@ if should_run_test 3; then
   ./meteor self-test --headless \
       --file "^[l-o]" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 4; then
@@ -85,7 +97,8 @@ if should_run_test 4; then
   ./meteor self-test --headless \
       --file "^p" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 5; then
@@ -93,7 +106,8 @@ if should_run_test 5; then
   ./meteor self-test --headless \
       --file "^run" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 6; then
@@ -101,7 +115,8 @@ if should_run_test 6; then
   ./meteor self-test --headless \
       --file "^r(?!un)|^s" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
 fi
 
 if should_run_test 7; then
@@ -109,5 +124,8 @@ if should_run_test 7; then
   ./meteor self-test --headless \
       --file "^[t-z]|^command-line" \
       --without-tag "custom-warehouse" \
-      --exclude "$SELF_TEST_EXCLUDE"
-fi
\ No newline at end of file
+      --exclude "$SELF_TEST_EXCLUDE" \
+    || exit_code=$?
+fi
+
+exit $exit_code

From 5d9d06f3bd376a85752bf324ce98706a8cd2baa3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 1 Dec 2016 15:50:34 -0500
Subject: [PATCH 663/688] Update minifier-js shrinkwrap.

---
 .../minifier-js/.npm/package/npm-shrinkwrap.json   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index 31a74fb7c5..e5204dc869 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -31,8 +31,8 @@
       "from": "decamelize@>=1.0.0 <2.0.0"
     },
     "is-buffer": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz",
       "from": "is-buffer@>=1.0.2 <2.0.0"
     },
     "kind-of": {
@@ -51,8 +51,8 @@
       "from": "longest@>=1.0.1 <2.0.0"
     },
     "repeat-string": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "from": "repeat-string@>=1.5.2 <2.0.0"
     },
     "right-align": {
@@ -66,9 +66,9 @@
       "from": "source-map@>=0.5.1 <0.6.0"
     },
     "uglify-js": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
-      "from": "uglify-js@2.7.0"
+      "version": "2.7.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
+      "from": "uglify-js@2.7.5"
     },
     "uglify-to-browserify": {
       "version": "1.0.2",

From 134fa0d226d0bfa8d6a7712c0aa8f0e12f38ceae Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 1 Dec 2016 16:44:29 -0500
Subject: [PATCH 664/688] Move facebook package to packages/deprecated.

---
 packages/{ => deprecated}/facebook/.gitignore            | 0
 packages/{ => deprecated}/facebook/README.md             | 0
 packages/{ => deprecated}/facebook/deprecation_notice.js | 0
 packages/{ => deprecated}/facebook/package.js            | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/{ => deprecated}/facebook/.gitignore (100%)
 rename packages/{ => deprecated}/facebook/README.md (100%)
 rename packages/{ => deprecated}/facebook/deprecation_notice.js (100%)
 rename packages/{ => deprecated}/facebook/package.js (100%)

diff --git a/packages/facebook/.gitignore b/packages/deprecated/facebook/.gitignore
similarity index 100%
rename from packages/facebook/.gitignore
rename to packages/deprecated/facebook/.gitignore
diff --git a/packages/facebook/README.md b/packages/deprecated/facebook/README.md
similarity index 100%
rename from packages/facebook/README.md
rename to packages/deprecated/facebook/README.md
diff --git a/packages/facebook/deprecation_notice.js b/packages/deprecated/facebook/deprecation_notice.js
similarity index 100%
rename from packages/facebook/deprecation_notice.js
rename to packages/deprecated/facebook/deprecation_notice.js
diff --git a/packages/facebook/package.js b/packages/deprecated/facebook/package.js
similarity index 100%
rename from packages/facebook/package.js
rename to packages/deprecated/facebook/package.js

From 9ee7e46be9aeada78727c6e7dc5f27af9e0ca9b6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 1 Dec 2016 16:44:48 -0500
Subject: [PATCH 665/688] Bump package versions for 1.4.3-beta.0 release.

---
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/browser-policy-content/package.js     | 2 +-
 packages/browser-policy/package.js             | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-config-ui/package.js         | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 2836d483bc..ef269903b3 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.1.0"
+  version: "1.1.0-beta.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 89de1e7976..0e26f1fcf2 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.1.13"
+  version: "1.2.0-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 071bab1123..e4ead072e0 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.14.0'
+  version: '6.14.0-beta.0'
 });
 
 Npm.depends({
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index a626f9ba88..a9f87e6827 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.13"
+  version: "1.0.13-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
index bada8728f1..283e796c28 100644
--- a/packages/browser-policy/package.js
+++ b/packages/browser-policy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure security policies enforced by the browser",
-  version: "1.0.10"
+  version: "1.0.10-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c35ad69cea..85f622b029 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1_4"
+  version: "1.11.1-5-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 99e29c6daf..7c372119d0 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.12',
+  version: '1.3.13-beta.0',
   documentation: null
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 5666303489..90c0959fb6 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.1',
+  version: '0.6.2-beta.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-config-ui/package.js b/packages/facebook-config-ui/package.js
index b056ecdca5..0d69788e5a 100644
--- a/packages/facebook-config-ui/package.js
+++ b/packages/facebook-config-ui/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Blaze configuration templates for Facebook OAuth.",
-  version: "1.0.0"
+  version: "1.0.0-beta.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index e6acd883db..d8ada4ff3e 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.3.0"
+  version: "1.3.0-beta.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 45903251a8..17403e10bc 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.8',
+  version: '2.7.9-beta.0',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 4ad1200ab8..3b8aaee221 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2_3'
+  version: '1.4.3-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index b27a0d395a..298e16f609 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.15"
+  version: "1.2.16-beta.0"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index a155e7e013..b2c0b8aa89 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.16"
+  version: "1.2.16-beta.0"
 });
 
 Npm.depends({
diff --git a/packages/modules/package.js b/packages/modules/package.js
index ff2193e95c..beed1d3544 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.7",
+  version: "0.7.8-beta.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index f03f3ac16a..190887a9de 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.14'
+  version: '1.1.15-beta.0'
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 08c4d4cd11..6a7a6c61c0 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.3.2',
+  version: '1.3.3-beta.0',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 3393ed9d29..a0788b98c1 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.1',
+  version: '1.2.2-beta.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 7a0007e3fa..2b1f58db11 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.8"
+  version: "2.513.9-beta.0"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 93b32d42cd..2a3e64f26c 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.3-rc.0",
+ "version": "1.4.3-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From f434383c026570445b5b63f262ee85e42ff2ba90 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 1 Dec 2016 17:53:53 -0500
Subject: [PATCH 666/688] Upgrade the `npm` npm package to version 4.0.2.

---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 scripts/dev-bundle-tool-package.js | 2 +-
 scripts/generate-dev-bundle.ps1    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index 3f0aa261b5..a6d2329611 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v.NEXT
 
+* The `npm` npm package has been upgraded to version 4.0.2.
+
 * The `facebook` package has been split into:
   - `facebook-oauth` (the part that allows oauth w/ FB directly) and
   - `facebook-config-ui` (the Blaze configuration templates for accounts-ui)
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 067c747d65..ccffb78996 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -7,7 +7,7 @@ UNAME=$(uname)
 ARCH=$(uname -m)
 MONGO_VERSION=3.2.6
 NODE_VERSION=4.6.2
-NPM_VERSION=3.10.9
+NPM_VERSION=4.0.2
 
 if [ "$UNAME" == "Linux" ] ; then
     if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 468790fe50..d59281cb97 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -11,7 +11,7 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "3.10.9",
+    npm: "4.0.2",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
     "meteor-babel": "0.14.3",
diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1
index 815f69debc..b59b90ed81 100644
--- a/scripts/generate-dev-bundle.ps1
+++ b/scripts/generate-dev-bundle.ps1
@@ -3,7 +3,7 @@
 $PLATFORM = "windows_x86"
 $MONGO_VERSION = "3.2.6"
 $NODE_VERSION = "4.6.2"
-$NPM_VERSION = "3.10.9"
+$NPM_VERSION = "4.0.2"
 $PYTHON_VERSION = "2.7.12" # For node-gyp
 
 # take it form the environment if exists

From b4290d7e17596e48b7400580104ede8b70b1809d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 1 Dec 2016 17:54:13 -0500
Subject: [PATCH 667/688] Bump $BUNDLE_VERSION to 4.7.5 before rebuilding dev
 bundle.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 91a052131e..f260611874 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.4
+BUNDLE_VERSION=4.7.5
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 1c62dcc8a53434b6aa4d7b62cd0339b35c824a6a Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 2 Dec 2016 16:13:15 +0200
Subject: [PATCH 668/688] Remove skipped CI tests which don't exist anymore

Removing thest tests which aren't defined anywhere anymore but the exceptions to skip them are still in place:

* ^mongo - logged (in|out)
* ^logs - logged (in|out)
* ^can't publish package with colons
---
 scripts/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 63793594a6..b8000521d5 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -13,7 +13,7 @@
 export TIMEOUT_SCALE_FACTOR=${TIMEOUT_SCALE_FACTOR:-15}
 
 # Skip these tests always.  Add other tests with ADDL_SELF_TEST_EXCLUDE.
-SELF_TEST_EXCLUDE="^can't publish package with colons|^old cli tests|^logs - logged (in|out)|^mongo - logged (in|out)|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
+SELF_TEST_EXCLUDE="^old cli tests|^minifiers can't register non-js|^minifiers: apps can't use|^compiler plugins - addAssets"
 
 # If no SELF_TEST_EXCLUDE is defined, use those defined here by default
 if ! [ -z "$ADDL_SELF_TEST_EXCLUDE" ]; then

From 47a3dd526d264099978853980c9dd2cf489dc6af Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <github@jro.cc>
Date: Fri, 2 Dec 2016 18:10:19 +0200
Subject: [PATCH 669/688] [docs] Clarify docs for handle returned by
 Meteor.setTimeout/setInterval

The value passed into from `Meteor.clearTimeout` or `Meteor.clearInterval` is an opaque handle returned by `Meteor.setTimeout` and `Meteor.setInterval` accordingly.

That is to say, on some engines it will be a `Number` and on others an `Object` but you need not worry about the actual type.

Closes meteor/meteor#7778
---
 packages/meteor/timers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/meteor/timers.js b/packages/meteor/timers.js
index 455f48fc89..024844a2da 100644
--- a/packages/meteor/timers.js
+++ b/packages/meteor/timers.js
@@ -44,7 +44,7 @@ _.extend(Meteor, {
    * @memberOf Meteor
    * @summary Cancel a repeating function call scheduled by `Meteor.setInterval`.
    * @locus Anywhere
-   * @param {Number} id The handle returned by `Meteor.setInterval`
+   * @param {Object} id The handle returned by `Meteor.setInterval`
    */
   clearInterval: function(x) {
     return clearInterval(x);
@@ -54,7 +54,7 @@ _.extend(Meteor, {
    * @memberOf Meteor
    * @summary Cancel a function call scheduled by `Meteor.setTimeout`.
    * @locus Anywhere
-   * @param {Number} id The handle returned by `Meteor.setTimeout`
+   * @param {Object} id The handle returned by `Meteor.setTimeout`
    */
   clearTimeout: function(x) {
     return clearTimeout(x);

From f749871edc37f3026ffb527fdff3ba0fe222e99f Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Sun, 4 Dec 2016 13:56:31 -0800
Subject: [PATCH 670/688] Use CoffeeScript 1.12.0

---
 .../.npm/plugin/compileCoffeescript/npm-shrinkwrap.json     | 6 +++---
 packages/coffeescript/package.js                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
index e00e5397ac..3c9553c754 100644
--- a/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
+++ b/packages/coffeescript/.npm/plugin/compileCoffeescript/npm-shrinkwrap.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "coffee-script": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.1.tgz",
-      "from": "coffee-script@1.11.1"
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.0.tgz",
+      "from": "coffee-script@1.12.0"
     },
     "source-map": {
       "version": "0.5.6",
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index c35ad69cea..7aa305b453 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1_4"
+  version: "1.12.0_1"
 });
 
 Package.registerBuildPlugin({
@@ -8,7 +8,7 @@ Package.registerBuildPlugin({
   use: ['caching-compiler', 'ecmascript'],
   sources: ['plugin/compile-coffeescript.js'],
   npmDependencies: {
-    "coffee-script": "1.11.1",
+    "coffee-script": "1.12.0",
     "source-map": "0.5.6"
   }
 });

From f4dbab623ba45dfb903c1de3a446d79426630ecf Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Sun, 4 Dec 2016 14:20:46 -0800
Subject: [PATCH 671/688] Always pass through the coffee compiler output
 through ecmascript; the opt-in ES2015+ features are too varied to detect now
 in CoffeeScript 1.12.0+

---
 .../plugin/compile-coffeescript.js            | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 85a41c8cda..5e032f69fa 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -88,29 +88,29 @@ export class CoffeeCompiler extends CachingCompiler {
       inputFile.getDeclaredExports().map(e => e.name)
     );
 
-    if (/`|\b(?:import|export|yield)\b/.test(source)) {
-      // If source contains backticks or features that output as ES2015+,
-      // pass the coffee output through babel-compiler
-      const doubleRoastedCoffee =
-        this.babelCompiler.processOneFileForTarget(inputFile, output.js);
+    // CoffeeScript contains a handful of features that output as ES2015+,
+    // such as modules, generator functions, for…of, and tagged template
+    // literals. Because they’re too varied to detect, pass all CoffeeScript
+    // compiler output through the Babel compiler.
+    const doubleRoastedCoffee =
+      this.babelCompiler.processOneFileForTarget(inputFile, output.js);
 
-      if (doubleRoastedCoffee != null &&
-          doubleRoastedCoffee.data != null) {
-        output.js = doubleRoastedCoffee.data;
+    if (doubleRoastedCoffee != null &&
+        doubleRoastedCoffee.data != null) {
+      output.js = doubleRoastedCoffee.data;
 
-        if (doubleRoastedCoffee.sourceMap) {
-          // Combine the original CoffeeScript source map with the one
-          // produced by this.babelCompiler.processOneFileForTarget.
-          const smg = new SourceMapGenerator(
-            new SourceMapConsumer(doubleRoastedCoffee.sourceMap));
-          smg.applySourceMap(new SourceMapConsumer(sourceMap));
-          sourceMap = smg.toJSON();
-        } else {
-          // If the .coffee file is contained by a node_modules directory,
-          // then BabelCompiler will not transpile it, and there will be
-          // no sourceMap, but that's fine because the original
-          // CoffeeScript sourceMap will still be valid.
-        }
+      if (doubleRoastedCoffee.sourceMap) {
+        // Combine the original CoffeeScript source map with the one
+        // produced by this.babelCompiler.processOneFileForTarget.
+        const smg = new SourceMapGenerator(
+          new SourceMapConsumer(doubleRoastedCoffee.sourceMap));
+        smg.applySourceMap(new SourceMapConsumer(sourceMap));
+        sourceMap = smg.toJSON();
+      } else {
+        // If the .coffee file is contained by a node_modules directory,
+        // then BabelCompiler will not transpile it, and there will be
+        // no sourceMap, but that's fine because the original
+        // CoffeeScript sourceMap will still be valid.
       }
     }
 

From 3326388d487980e1e85b4e81d50cd5b804077c1a Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webmaster@geoffreybooth.com>
Date: Mon, 5 Dec 2016 18:51:35 -0800
Subject: [PATCH 672/688] Enable Babel cache for CoffeeScript compiler

---
 packages/coffeescript/plugin/compile-coffeescript.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 5e032f69fa..28dfa152ce 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -65,6 +65,10 @@ export class CoffeeCompiler extends CachingCompiler {
     ];
   }
 
+  setDiskCacheDirectory(cacheDir) {
+    this.babelCompiler.setDiskCacheDirectory(cacheDir);
+  }
+
   compileOneFile(inputFile) {
     const source = inputFile.getContentsAsString();
     const compileOptions = this._getCompileOptions(inputFile);

From f42c137f55b465bad30bdc40a585373fe6b99660 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 5 Dec 2016 22:15:08 -0500
Subject: [PATCH 673/688] Always copy node_modules/.bin into
 bundle/programs/server/npm.

Fixes #8136.
---
 tools/isobuild/builder.js | 13 ++++++++-----
 tools/isobuild/bundler.js | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/tools/isobuild/builder.js b/tools/isobuild/builder.js
index f964f2a671..2e6ebf5d0a 100644
--- a/tools/isobuild/builder.js
+++ b/tools/isobuild/builder.js
@@ -415,7 +415,8 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
     specificFiles,
     symlink,
     npmDiscards,
-    directoryFilter,
+    // Optional predicate to filter files and directories.
+    filter,
   }) {
     if (to.slice(-1) === files.pathSep) {
       to = to.slice(0, -1);
@@ -541,16 +542,18 @@ Previous builder: ${previousBuilder.outputPath}, this builder: ${outputPath}`
           return;
         }
 
+        if (typeof filter === "function" &&
+            ! filter(thisAbsFrom, isDirectory)) {
+          return;
+        }
+
         if (npmDiscards instanceof NpmDiscards &&
             npmDiscards.shouldDiscard(thisAbsFrom, isDirectory)) {
           return;
         }
 
         if (isDirectory) {
-          if (typeof directoryFilter !== "function" ||
-              directoryFilter(thisAbsFrom)) {
-            walk(thisAbsFrom, thisRelTo, _currentRealRootDir);
-          }
+          walk(thisAbsFrom, thisRelTo, _currentRealRootDir);
 
         } else if (fileStatus.isSymbolicLink()) {
           symlinkWithOverwrite(
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 3fce252f16..96799cc47d 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -458,18 +458,39 @@ export class NodeModulesDirectory {
       maxPartCount = Math.max(parts.length, maxPartCount);
     });
 
-    return this._prodPackagePredicate = function isWithinProdPackage(dir) {
-      const parts = files.pathRelative(sourcePath, dir)
+    return this._prodPackagePredicate = function isWithinProdPackage(path) {
+      const parts = files.pathRelative(sourcePath, path)
         .split(files.pathSep);
 
-      let start = parts.lastIndexOf("node_modules") + 1;
+      // Normalize away trailing files.pathSep characters.
+      while (parts[parts.length - 1] === "") {
+        parts.pop();
+      }
 
-      if (parts.length - start > maxPartCount) {
-        // We're deep enough inside node_modules that it's safe to
-        // say we should have returned false earlier.
+      const start = parts.lastIndexOf("node_modules") + 1;
+
+      if (parts[start] === ".bin") {
+        if (start === parts.length - 1) {
+          // Permit node_modules/.bin directories, so that we can filter
+          // their contents below.
+          return true;
+        }
+
+        const real = files.realpath(path);
+        if (real !== path) {
+          // If node_modules/.bin/command is a symlink, determine the
+          // answer by calling isWithinProdPackage(real).
+          return isWithinProdPackage(real);
+        }
+
+        // If node_modules/.bin/command is not a symlink, then it's hard
+        // to tell which package is responsible for it, so don't strip it.
         return true;
       }
 
+      // Strip away any parts not related to the package name.
+      parts.length = start + maxPartCount;
+
       let tree = prodPackageTree;
 
       for (let pos = start; pos < parts.length; ++pos) {
@@ -2006,8 +2027,8 @@ class JsImage {
           // "devDependencies", but it also gets listed in some other
           // package's "dependencies", then every copy of that package
           // will be copied to the destination directory. A little bit of
-          // overcopying vastly simplifies the job of directoryFilter.
-          copyOptions.directoryFilter = prodPackagePredicate;
+          // overcopying vastly simplifies the job of the filter.
+          copyOptions.filter = prodPackagePredicate;
         }
 
         builder.copyDirectory(copyOptions);

From ba5c8ff530428f6f020cb9961a85114a1ffbac90 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 6 Dec 2016 10:18:45 -0500
Subject: [PATCH 674/688] Bump package versions for 1.4.3-beta.1 release.

---
 packages/accounts-facebook/package.js          | 2 +-
 packages/accounts-ui-unstyled/package.js       | 2 +-
 packages/babel-compiler/package.js             | 2 +-
 packages/browser-policy-content/package.js     | 2 +-
 packages/browser-policy/package.js             | 2 +-
 packages/coffeescript/package.js               | 2 +-
 packages/ddp-server/package.js                 | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-config-ui/package.js         | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/less/package.js                       | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-css/package.js               | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/standard-minifier-css/package.js      | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/stylus/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index ef269903b3..2ce5d5feb2 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Login service for Facebook accounts",
-  version: "1.1.0-beta.0"
+  version: "1.1.0-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index 0e26f1fcf2..9171eb192b 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Unstyled version of login widgets",
-  version: "1.2.0-beta.0"
+  version: "1.2.0-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index e4ead072e0..7ea36403c4 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -6,7 +6,7 @@ Package.describe({
   // isn't possible because you can't publish a non-recommended
   // release with package versions that don't have a pre-release
   // identifier at the end (eg, -dev)
-  version: '6.14.0-beta.0'
+  version: '6.14.0-beta.1'
 });
 
 Npm.depends({
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index a9f87e6827..780c836df8 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure content security policies",
-  version: "1.0.13-beta.0"
+  version: "1.0.13-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
index 283e796c28..32421434c2 100644
--- a/packages/browser-policy/package.js
+++ b/packages/browser-policy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Configure security policies enforced by the browser",
-  version: "1.0.10-beta.0"
+  version: "1.0.10-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 85f622b029..b8b8978df1 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Javascript dialect with fewer braces and semicolons",
-  version: "1.11.1-5-beta.0"
+  version: "1.11.1-5-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js
index 7c372119d0..06cdaf97c2 100644
--- a/packages/ddp-server/package.js
+++ b/packages/ddp-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data server",
-  version: '1.3.13-beta.0',
+  version: '1.3.13-beta.1',
   documentation: null
 });
 
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 90c0959fb6..5fcfc72c29 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.2-beta.0',
+  version: '0.6.2-beta.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-config-ui/package.js b/packages/facebook-config-ui/package.js
index 0d69788e5a..c580ad00de 100644
--- a/packages/facebook-config-ui/package.js
+++ b/packages/facebook-config-ui/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Blaze configuration templates for Facebook OAuth.",
-  version: "1.0.0-beta.0"
+  version: "1.0.0-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index d8ada4ff3e..cde5c54fbe 100644
--- a/packages/facebook-oauth/package.js
+++ b/packages/facebook-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Facebook OAuth flow",
-  version: "1.3.0-beta.0"
+  version: "1.3.0-beta.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index 17403e10bc..7210938098 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '2.7.9-beta.0',
+  version: '2.7.9-beta.1',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3b8aaee221..732a24b76d 100644
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.3-beta.0'
+  version: '1.4.3-beta.1'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js
index 298e16f609..0cd6625d20 100644
--- a/packages/minifier-css/package.js
+++ b/packages/minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "CSS minifier",
-  version: "1.2.16-beta.0"
+  version: "1.2.16-beta.1"
 });
 
 Npm.depends({
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index b2c0b8aa89..7b74609556 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "1.2.16-beta.0"
+  version: "1.2.16-beta.1"
 });
 
 Npm.depends({
diff --git a/packages/modules/package.js b/packages/modules/package.js
index beed1d3544..f583cc1cc6 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.8-beta.0",
+  version: "0.7.8-beta.1",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 190887a9de..20caef7701 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.1.15-beta.0'
+  version: '1.1.15-beta.1'
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 6a7a6c61c0..6f5c66b4ff 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.3.3-beta.0',
+  version: '1.3.3-beta.1',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index a0788b98c1..94ea69a73e 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '1.2.2-beta.0',
+  version: '1.2.2-beta.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md'
 });
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 2b1f58db11..9cfb6d4d02 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Expressive, dynamic, robust CSS',
-  version: "2.513.9-beta.0"
+  version: "2.513.9-beta.1"
 });
 
 Package.registerBuildPlugin({
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 2a3e64f26c..7343c620a1 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.3-beta.0",
+ "version": "1.4.3-beta.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 5d0da71e2792c50320af910a85c6f2377df8965b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 6 Dec 2016 12:46:54 -0500
Subject: [PATCH 675/688] Use process.env.METEOR_HEADLESS in CI tests.

This should also fix a bug where Console.isHeadless() was returning false
in tests.

Follow-up to #8037.
---
 scripts/ci.sh            |  2 ++
 tools/console/console.js | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/ci.sh b/scripts/ci.sh
index 63793594a6..cfd9453746 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -23,6 +23,8 @@ fi
 # Don't print as many progress indicators
 export EMACS=t
 
+export METEOR_HEADLESS=true
+
 if [ -z "$CIRCLE_NODE_TOTAL" ] || [ -z "$CIRCLE_NODE_INDEX" ]; then
   # In the case where these aren't set, just pretend like we're a single node.
   # This is also handy if the user is using another CI service besides CircleCI
diff --git a/tools/console/console.js b/tools/console/console.js
index a665682992..9053caf1b7 100644
--- a/tools/console/console.js
+++ b/tools/console/console.js
@@ -309,7 +309,10 @@ var ProgressDisplayFull = function (console) {
   self._progressBarRenderer = new ProgressBarRenderer(PROGRESS_BAR_FORMAT, options);
   self._progressBarRenderer.start = new Date();
 
-  self._headless = !!(process.env.METEOR_HEADLESS && JSON.parse(process.env.METEOR_HEADLESS));
+  self._headless = !! (
+    process.env.METEOR_HEADLESS &&
+    JSON.parse(process.env.METEOR_HEADLESS)
+  );
 
   self._spinnerRenderer = new SpinnerRenderer();
 
@@ -541,7 +544,10 @@ var Console = function (options) {
 
   options = options || {};
 
-  self._headless = false;
+  self._headless = !! (
+    process.env.METEOR_HEADLESS &&
+    JSON.parse(process.env.METEOR_HEADLESS)
+  );
 
   // The progress display we are showing on-screen
   self._progressDisplay = new ProgressDisplayNone(self);

From 63c890738d6350182213e116b581db7c7eb40fe9 Mon Sep 17 00:00:00 2001
From: Tom Coleman <tom@percolatestudio.com>
Date: Wed, 7 Dec 2016 10:15:24 +1100
Subject: [PATCH 676/688] Change log for #7727

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index 3f0aa261b5..e182c8e227 100644
--- a/History.md
+++ b/History.md
@@ -19,6 +19,8 @@
 
 * Added support for frame-ancestors CSP option in browser-policy.
   [#7970](https://github.com/meteor/meteor/pull/7970)
+  
+* You can now use autoprefixer with stylus files added via packages [#7727](https://github.com/meteor/meteor/pull/7727)
 
 ## v1.4.2.3
 

From a90e4ee8367b59fe48537aac594cdd2877a874e6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 6 Dec 2016 19:13:47 -0500
Subject: [PATCH 677/688] Call super.setDiskCacheDirectory to fix coffeescript
 cache tests.

---
 packages/coffeescript/plugin/compile-coffeescript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 28dfa152ce..c51b51b58b 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -67,6 +67,7 @@ export class CoffeeCompiler extends CachingCompiler {
 
   setDiskCacheDirectory(cacheDir) {
     this.babelCompiler.setDiskCacheDirectory(cacheDir);
+    return super.setDiskCacheDirectory(cacheDir);
   }
 
   compileOneFile(inputFile) {

From 0fc9d1bc4ffc130a33cb21bfd2545f3efe68e2cb Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 6 Dec 2016 16:15:45 -0800
Subject: [PATCH 678/688] Rename LICENSE.txt to LICENSE

---
 LICENSE.txt => LICENSE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE.txt => LICENSE (100%)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE

From f8b92d0eb9104f9939b62c0791f1a60f670186af Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 6 Dec 2016 16:16:29 -0800
Subject: [PATCH 679/688] Update LICENSE

---
 LICENSE | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index cbd814c046..708a64fac6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,4 @@
-========================================
-Meteor is licensed under the MIT License
-========================================
+The MIT License (MIT)
 
 Copyright (C) 2011--2016 Meteor Development Group
 

From 400302f0f8e7dadab3ead3b9365c0093a99e7d0e Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 6 Dec 2016 16:17:15 -0800
Subject: [PATCH 680/688] Update LICENSE

---
 LICENSE | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 708a64fac6..f3dea8371d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,12 +1,24 @@
 The MIT License (MIT)
 
-Copyright (C) 2011--2016 Meteor Development Group
+Copyright (c) 2011 - 2016 Meteor Development Group, Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 ====================================================================

From 23c52ff0026110d278413a5e8e9e2655fe175856 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Thu, 6 Oct 2016 19:24:57 +0300
Subject: [PATCH 681/688] `meteor shell` should pass its TTY width to the
 server on connect

Previously, the width (or "columns") for the readline shell was being obtained on the server.  This causes problems for clients which are connecting to the server which are sized differently.

The client will still have problems if they resize AFTER they are connected to the REPL, but at least they have the option of being a different size.

A more complete solution would be to have the client listen on process.stdout "resize" and pass that to the server when it occurs, but I'm not sure of an easy way to do that with the current communication (perhaps pause-reconfigure-unpause?).

Fixes meteor/meteor#5346
---
 packages/shell-server/shell-server.js | 27 ++++++---------------------
 tools/shell-client.js                 |  1 +
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/packages/shell-server/shell-server.js b/packages/shell-server/shell-server.js
index eff77e0468..419fdaa4c7 100644
--- a/packages/shell-server/shell-server.js
+++ b/packages/shell-server/shell-server.js
@@ -3,7 +3,6 @@ var path = require("path");
 var stream = require("stream");
 var fs = require("fs");
 var net = require("net");
-var tty = require("tty");
 var vm = require("vm");
 var _ = require("underscore");
 var INFO_FILE_MODE = parseInt("600", 8); // Only the owner can read or write.
@@ -119,6 +118,12 @@ class Server {
       }
       delete options.key;
 
+      // Set the columns to what is being requested by the client.
+      if (options.columns && socket) {
+        socket.columns = options.columns;
+      }
+      delete options.columns;
+
       if (options.evaluateAndExit) {
         evalCommand.call(
           Object.create(null), // Dummy repl object without ._RecoverableError.
@@ -166,13 +171,6 @@ class Server {
   startREPL(options) {
     var self = this;
 
-    if (! options.output.columns) {
-      // The REPL's tab completion logic assumes process.stdout is a TTY,
-      // and while that isn't technically true here, we can get tab
-      // completion to behave correctly if we fake the .columns property.
-      options.output.columns = getTerminalWidth();
-    }
-
     // Make sure this function doesn't try to write anything to the output
     // stream after it has been closed.
     options.output.on("close", function() {
@@ -384,19 +382,6 @@ function getHistoryFile(shellDir) {
   return path.join(shellDir, "history");
 }
 
-function getTerminalWidth() {
-  try {
-    // Inspired by https://github.com/TooTallNate/ttys/blob/master/index.js
-    var fd = fs.openSync("/dev/tty", "r");
-    assert.ok(tty.isatty(fd));
-    var ws = new tty.WriteStream(fd);
-    ws.end();
-    return ws.columns;
-  } catch (fancyApproachWasTooFancy) {
-    return 80;
-  }
-}
-
 // Shell commands need to be executed in a Fiber in case they call into
 // code that yields. Using a Promise is an even better idea, since it runs
 // its callbacks in Fibers drawn from a pool, so the Fibers are recycled.
diff --git a/tools/shell-client.js b/tools/shell-client.js
index 4f6bc936ee..f1543dbd68 100644
--- a/tools/shell-client.js
+++ b/tools/shell-client.js
@@ -137,6 +137,7 @@ Cp.setUpSocket = function setUpSocket(sock, key) {
     // Sending a JSON-stringified options object (even just an empty
     // object) over the socket is required to start the REPL session.
     sock.write(JSON.stringify({
+      columns: process.stdout.columns,
       terminal: ! process.env.EMACS,
       key: key
     }) + "\n");

From 1fda39b3a0abe13ef9cf7565fb21a4371ea24783 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Mon, 12 Dec 2016 15:05:57 +0200
Subject: [PATCH 682/688] Cordova project preparation must occur before copying
 to the build

This fixes a regression caused by 88d43a0f16a484a5716050cb7de8066b126c7b28 which is demonstrated in meteor/meteor#7849.

Essentially, with the current implementation some Cordova build elements are "stale" when the build is copied.  For example, if you execute a `meteor run ios` and then `meteor build . --server=http://example.com/` (note: `example.com`) the `config.xml` (`<access origin />`), the boilerplate HTML (`__meteor_runtime_config__`) and other elements of the bundle (`Info.plist` on iOS) will still contain the previously used `http://<local_ip>:3000` address instead of `http://example.com` as they should.

Additionally, it would appear that it's impossible to actually checkout a project and immediately run `meteor build` without running `meteor run (android|ios)` first.

Various work-arounds for this seem to exist, such as running `meteor build` twice, or running `meteor run --server=http://production.com` first.

Ultimately, this is occurring because the bundle is being copied before the Cordova `prepareForPlatform` occurs which I believe was not intended.

There is already a test in place which fails without this fix, but marked as `slow` and therefore not executed on CircleCI.  Specifically, `cordova builds with server options` would have caught this.  Forcibly running this test locally now passes with this change.

Fixes meteor/meteor#7849
Fixes meteor/meteor#7291
Fixes meteor/meteor#6756
---
 tools/cli/commands.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index 3632698a2e..82ff99149e 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1016,12 +1016,22 @@ ${cordova.displayNameForPlatform(platform)}` }, () => {
               'platforms', platform);
             const platformOutputPath = files.pathJoin(outputPath, platform);
 
+            // Prepare the project once again to ensure that it is up to date
+            // with current build options.  For example, --server=example.com
+            // is utilized in the Cordova builder to write boilerplate HTML and
+            // various config.xml settings (e.g. access policies)
+            if (platform === 'ios') {
+              cordovaProject.prepareForPlatform(platform, buildOptions);
+            } else if (platform === 'android') {
+              cordovaProject.buildForPlatform(platform, buildOptions);
+            }
+
+            // Once prepared, copy the bundle to the final location.
             files.cp_r(buildPath,
               files.pathJoin(platformOutputPath, 'project'));
 
+            // Make some platform-specific adjustments to the resulting build.
             if (platform === 'ios') {
-              cordovaProject.prepareForPlatform(platform, buildOptions);
-
               files.writeFile(
                 files.pathJoin(platformOutputPath, 'README'),
 `This is an auto-generated XCode project for your iOS application.
@@ -1030,8 +1040,6 @@ Instructions for publishing your iOS app to App Store can be found at:
 https://github.com/meteor/meteor/wiki/How-to-submit-your-iOS-app-to-App-Store
 `, "utf8");
             } else if (platform === 'android') {
-              cordovaProject.buildForPlatform(platform, buildOptions);
-
               const apkPath = files.pathJoin(buildPath, 'build/outputs/apk',
                 options.debug ? 'android-debug.apk' : 'android-release-unsigned.apk')
 

From 4a16e649ccc69ea35916cc974e3e9f98c1af6aaa Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Tue, 13 Dec 2016 15:54:10 +0200
Subject: [PATCH 683/688] Fix console glitch when using some admin package
 functions

Tiny fix for an old issue where the console output would get corrupted when running `meteor admin set-unmigrated` or `meteor admin change-homepage` due to missing newline on `rawInfo` command.

Fixes meteor/meteor#4054
---
 tools/cli/commands-packages.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index baf35ca5a4..a075ffacea 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -2617,7 +2617,7 @@ main.registerCommand({
   try {
     Console.rawInfo(
         "Changing homepage on "
-          + name + " to " + url + "...");
+          + name + " to " + url + "...\n");
       packageClient.callPackageServer(conn,
           '_changePackageHomepage', name, url);
       Console.info(" done");
@@ -2670,7 +2670,7 @@ main.registerCommand({
     _.each(versions, function (version) {
       Console.rawInfo(
         "Setting " + name + "@" + version + " as " +
-         status + " migrated ... ");
+         status + " migrated ...\n");
       packageClient.callPackageServer(
         conn,
         '_changeVersionMigrationStatus',

From cf744f800b51d8954e71c04abb1f916eb0b1ed44 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 13 Dec 2016 14:31:08 -0800
Subject: [PATCH 684/688] Update roadmap for december 2016 (#8153)

---
 Roadmap.md | 89 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 16 deletions(-)

diff --git a/Roadmap.md b/Roadmap.md
index 892fd7c6e3..24b2ba37a6 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -1,42 +1,99 @@
-Meteor Roadmap
-==============
 
-This document describes the high level features the project has decided to prioritize in the near to medium term future. A large fraction of the MDG core engineering team's time will be dedicated to working on the features described here.
 
-Contributors are encouraged to focus their efforts on work that aligns with the roadmap as maintainers will prioritize their time around these contributions. This however does not mean that PR's against other features and bugs will be automatically rejected.
+# **Meteor Roadmap**
 
-For the meantime, MDG won't be accepting PR's for changes to the roadmap. We hope to change this in the future as we figure out strategies to decentralize Meteor development.
+**Last updated December 13, 2016**
 
-## MongoDB updates
+This document describes the high level features the Meteor project maintainers have decided to prioritize in the near- to medium-term future. A large fraction of the maintainers’ time will be dedicated to working on the features described here. As with any roadmap, this is a living document that will evolve as priorities and dependencies shift; we aim to update the roadmap with any changes or status updates on a monthly basis.
 
-The mongo driver that currently ships with Meteor is old and doesn’t reliably work with connecting to MongoDB 3.2 databases (e.g [#6258](https://github.com/meteor/meteor/issues/6258)). We want to update to the latest driver [#5763](https://github.com/meteor/meteor/issues/5763).
+Contributors are encouraged to focus their efforts on work that aligns with the roadmap as maintainers will prioritize their time spent reviewing PRs and issues around these contributions. This however does not mean that PRs against other features and bugs will automatically be rejected.
 
-In addition, we'd like to update the dev bundle to ship with the latest stable version of MongoDB (3.2) [#5809](https://github.com/meteor/meteor/issues/5809) as MongoDB 2.6 will be officially sunsetted at the end of October, 2016.
+Items can be added to this roadmap by first getting design approval for a solution to an open issue, as outlined by our [contributing guidelines](https://github.com/meteor/meteor/blob/devel/Contributing.md). Then, when a contributor has committed to solving the issue in the short to medium term, they can submit a PR to add that work to the roadmap. All other PRs to the roadmap will be rejected.
 
-## Support for Node 4 and beyond
 
-We want to be able to update the version of Node that ships with Meteor to 4 and eventually 6  [#5124](https://github.com/meteor/meteor/issues/5124). [#6537](https://github.com/meteor/meteor/issues/6537) lays the groundwork to overcome the main blocker for updating to Node 4, that is, needing to rebuild all existing Meteor packages that contain binary dependencies.
+## Upgrade to Node 6
+
+Tracking pull request: https://github.com/meteor/meteor/pull/6923
+
+
+## Page load performance improvements
+
+*Status: In progress*
+
+Fast initial page load times are somewhat less important for single-page reactive web apps than for other kinds of websites, but large Meteor apps with lots of packages tend to load quite a bit of JavaScript, and the cost of all that network traffic, parsing, and evaluation definitely adds up.
+
+Speeding up page load times will require a combination of new tools for asynchronous JavaScript delivery (code splitting), dead code elimination, deferred evaluation of JavaScript modules, and performance profiling (so that developers can identify expensive packages).
+
+
+## Build system improvements
+
+*Status: In progress*
+
+Meteor 1.4.2 addressed a number of critical performance problems with the Meteor build system, but there are still more areas left for improvement. For example, Meteor could take better advantage of native support for new ECMAScript features in Node 4 (and eventually Node 6) on the server.
+
 
 ## Full transition to npm
 
+*Status: We encourage publishing Meteor-related packages to npm where possible. We are investigating ways to make it possible to move some parts of Meteor core onto npm without making the installation process more complex.*
+
 The community has rallied around npm as the de-facto standard package manager for JavaScript. We believe committing fully to npm will strengthen the entire JavaScript ecosystem by removing fragmentation, will benefit existing Meteor developers by making it seamless to use any JavaScript package and increase Meteor adoption by aligning it with JavaScript best practices.
 
 1.3 introduced `npm install` support along with ES2015 modules. In the future, we would like to transition the Meteor package ecosystem over entirely from Atmosphere to npm. We are still in the early conceptual design phase and expect to update the roadmap once we have a design in place that will underpin further development.
 
 
-## Testing updates
+## GraphQL Data: SQL, REST, performance
 
-Meteor 1.3 shipped with two new testing modes and many developers are writing test suites and building test drivers as part of migrating to 1.3. We’re looking at improving the feature in upcoming releases, especially our support for continuous integration mode (see [#6755](https://github.com/meteor/meteor/issues/6755)).
+*Status: In progress at [http://dev.apollodata.com/](http://dev.apollodata.com/)*
 
-## Project Governance/Community Contribution
+We're building a next generation GraphQL-focused data stack for modern applications called Apollo. We believe that this spiritual successor to the data part of the Meteor stack is impactful enough to deserve it's own fully fledged project that is compatible with other languages and frameworks. Apollo is born from the Meteor project and works perfectly with Meteor today.
 
-Currently, it’s difficult for external developers to make meaningful contributions to Meteor as there is no clear guidance on what to work on, how best to do that work and signals around what will/won’t get merged. We plan on fixing this by creating tight documentation around how the project is developed (e.g the [Swift contribution guidelines](https://swift.org/contributing/)) and giving contributors a path towards earning increased privileges that culminate in full commit access. We’re also aiming to move more sub-projects into their own repositories that can be released on their own release schedule and more easily maintained by the community.
+Apollo is our approach to giving Meteor developers SQL and other database support, the ability to choose between realtime and static data, and improved performance analysis. We are working on providing better tools and documentation for Meteor developers to integrate Apollo into their apps, and welcome contributions in this area. The next priority for Apollo and Meteor is enabling Meteor developers to choose to replace MongoDB entirely with GraphQL on top of other storage engines.
 
-## Data (SQL, REST, Performance)
+Even though Apollo could eventually be a complete replacement for Meteor’s included Mongo/DDP data stack, you should feel good about Meteor’s existing data system. We are currently open to ideas around performance and stability improvements.
 
-We're building the next generation data stack for modern applications called [Apollo](https://github.com/apollostack/apollo). We believe the data part of the Meteor stack is impactful enough to deserve it's own fully fledged sub-project that will be compatible with other languages and frameworks. Apollo is born from the Meteor project and is naturally designed to work perfectly with Meteor. It is GraphQL based and will work with multiple data sources starting with REST. Apollo is our answer to bringing SQL and improved performance analysis to Meteor.
+
+
+# **Recently completed**
+
+
+
+## Rebuild performance improvements
+
+*Status: Shipped in 1.4.2*
+
+Rebuild performance refers to the length of time between changing a file in development and being able to reload your app in a browser. After extensive profiling to identify performance hot-spots, and with careful caching of previously completed work, Meteor 1.4.2 takes substantially less time to rebuild most apps, especially larger apps.
+
+
+## MongoDB updates
+
+*Status: Shipped in 1.4*
+
+The mongo driver that currently ships with Meteor is old and doesn’t reliably work with connecting to MongoDB 3.2 databases (e.g [#6258](https://github.com/meteor/meteor/issues/6258)). We want to update to the latest driver [#5763](https://github.com/meteor/meteor/issues/5763).
+In addition, we'd like to update the dev bundle to ship with the latest stable version of MongoDB (3.2) [#5809](https://github.com/meteor/meteor/issues/5809) as MongoDB 2.6 will be officially sunsetted at the end of October, 2016.
+
+
+## Support for Node 4 and beyond
+
+*Status: Shipped in 1.4*
+
+We want to be able to update the version of Node that ships with Meteor to 4 and eventually 6 [#5124](https://github.com/meteor/meteor/issues/5124). [#6537](https://github.com/meteor/meteor/issues/6537) lays the groundwork to overcome the main blocker for updating to Node 4, that is, needing to rebuild all existing Meteor packages that contain binary dependencies.
 
 
 ## View Layer
 
+*Status: Blaze split into new repository and can be published independently as of 1.4.2*
+
 Our plans around the view layer are to maintain strong integrations (along with guidance) with React, Angular and Blaze. We'll make essential fixes to Blaze but most likely won't be adding new features ourselves. We encourage you to help build the features you need at the [meteor/blaze](https://github.com/meteor/blaze) repository.
+
+
+## Project Governance/Community Contribution
+
+*Status: Since this topic was added to the roadmap, we have introduced *[*completely new contribution guidelines*](https://github.com/meteor/meteor/blob/devel/Contributing.md)* that outline exactly how to contribute to Meteor in several ways, including triaging issues, improving documentation, submitting designs for new features, and submitting PRs for bug fixes and improvements. We encourage proposals about how to make the process better via new GitHub issues.*
+
+Currently, it’s difficult for external developers to make meaningful contributions to Meteor as there is no clear guidance on what to work on, how best to do that work and signals around what will/won’t get merged. We plan on fixing this by creating tight documentation around how the project is developed (e.g the [Swift contribution guidelines](https://swift.org/contributing/)) and giving contributors a path towards earning increased privileges that culminate in full commit access. We’re also aiming to move more sub-projects into their own repositories that can be released on their own release schedule and more easily maintained by the community.
+
+
+## **Other**
+
+For more completed items, refer to the project history here: https://github.com/meteor/meteor/blob/devel/History.md
+

From 23994623f958c30bfec38c8f7d436c6ba61ce6d9 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 13 Dec 2016 19:25:16 -0800
Subject: [PATCH 685/688] Update README formatting

---
 Roadmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Roadmap.md b/Roadmap.md
index 24b2ba37a6..9e12d9f6fe 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -88,7 +88,7 @@ Our plans around the view layer are to maintain strong integrations (along with
 
 ## Project Governance/Community Contribution
 
-*Status: Since this topic was added to the roadmap, we have introduced *[*completely new contribution guidelines*](https://github.com/meteor/meteor/blob/devel/Contributing.md)* that outline exactly how to contribute to Meteor in several ways, including triaging issues, improving documentation, submitting designs for new features, and submitting PRs for bug fixes and improvements. We encourage proposals about how to make the process better via new GitHub issues.*
+*Status: Since this topic was added to the roadmap, we have introduced *[completely new contribution guidelines](https://github.com/meteor/meteor/blob/devel/Contributing.md)* that outline exactly how to contribute to Meteor in several ways, including triaging issues, improving documentation, submitting designs for new features, and submitting PRs for bug fixes and improvements. We encourage proposals about how to make the process better via new GitHub issues.*
 
 Currently, it’s difficult for external developers to make meaningful contributions to Meteor as there is no clear guidance on what to work on, how best to do that work and signals around what will/won’t get merged. We plan on fixing this by creating tight documentation around how the project is developed (e.g the [Swift contribution guidelines](https://swift.org/contributing/)) and giving contributors a path towards earning increased privileges that culminate in full commit access. We’re also aiming to move more sub-projects into their own repositories that can be released on their own release schedule and more easily maintained by the community.
 

From 8e32da57a128a70fdc09823b5d506758ce6a9b82 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@stubailo.com>
Date: Tue, 13 Dec 2016 19:25:45 -0800
Subject: [PATCH 686/688] Update formatting again

---
 Roadmap.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Roadmap.md b/Roadmap.md
index 9e12d9f6fe..94f3978295 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -88,12 +88,12 @@ Our plans around the view layer are to maintain strong integrations (along with
 
 ## Project Governance/Community Contribution
 
-*Status: Since this topic was added to the roadmap, we have introduced *[completely new contribution guidelines](https://github.com/meteor/meteor/blob/devel/Contributing.md)* that outline exactly how to contribute to Meteor in several ways, including triaging issues, improving documentation, submitting designs for new features, and submitting PRs for bug fixes and improvements. We encourage proposals about how to make the process better via new GitHub issues.*
+*Status: Since this topic was added to the roadmap, we have introduced [completely new contribution guidelines](https://github.com/meteor/meteor/blob/devel/Contributing.md) that outline exactly how to contribute to Meteor in several ways, including triaging issues, improving documentation, submitting designs for new features, and submitting PRs for bug fixes and improvements. We encourage proposals about how to make the process better via new GitHub issues.*
 
 Currently, it’s difficult for external developers to make meaningful contributions to Meteor as there is no clear guidance on what to work on, how best to do that work and signals around what will/won’t get merged. We plan on fixing this by creating tight documentation around how the project is developed (e.g the [Swift contribution guidelines](https://swift.org/contributing/)) and giving contributors a path towards earning increased privileges that culminate in full commit access. We’re also aiming to move more sub-projects into their own repositories that can be released on their own release schedule and more easily maintained by the community.
 
 
-## **Other**
+## Other
 
 For more completed items, refer to the project history here: https://github.com/meteor/meteor/blob/devel/History.md
 

From ffd0a50f9487a0a9ffd7b6b415991c2022bf86fe Mon Sep 17 00:00:00 2001
From: brucejo <brucejo.wk@outlook.com>
Date: Sat, 17 Dec 2016 08:33:55 -0800
Subject: [PATCH 687/688] Check for is Array via _.isArray, instanceOf does not
 work cross window

---
 packages/observe-sequence/observe_sequence.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/observe-sequence/observe_sequence.js b/packages/observe-sequence/observe_sequence.js
index 1a823ab019..68ec026591 100644
--- a/packages/observe-sequence/observe_sequence.js
+++ b/packages/observe-sequence/observe_sequence.js
@@ -94,7 +94,7 @@ ObserveSequence = {
 
         if (!seq) {
           seqArray = seqChangedToEmpty(lastSeqArray, callbacks);
-        } else if (seq instanceof Array) {
+        } else if (_.isArray(seq)) {
           seqArray = seqChangedToArray(lastSeqArray, seq, callbacks);
         } else if (isStoreCursor(seq)) {
           var result /* [seqArray, activeObserveHandle] */ =
@@ -126,7 +126,7 @@ ObserveSequence = {
   fetch: function (seq) {
     if (!seq) {
       return [];
-    } else if (seq instanceof Array) {
+    } else if (_.isArray(seq)) {
       return seq;
     } else if (isStoreCursor(seq)) {
       return seq.fetch();

From 8a81e7156e07ca9e1a6c2b2b89870eb4abe72a2d Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 19 Dec 2016 11:43:14 -0800
Subject: [PATCH 688/688] Fix missing var in mongo package.

---
 packages/mongo/mongo_driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index 77eabdc3b6..d16b6a540f 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -608,7 +608,7 @@ var isModificationMod = function (mod) {
 var transformResult = function (driverResult) {
   var meteorResult = { numberAffected: 0 };
   if (driverResult) {
-    mongoResult = driverResult.result;
+    var mongoResult = driverResult.result;
 
     // On updates with upsert:true, the inserted values come as a list of
     // upserted values -- even with options.multi, when the upsert does insert,