From a01cd04cfe2f1c9c1955aa22d6733e0d6eb33ef3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 15:01:17 -0500
Subject: [PATCH 001/195] Polyfill Meteor._localStorage on the server too.

Although Meteor._localStorage has historically been used only in browsers,
it can be helpful on the server for writing isomorphic code.
---
 packages/localstorage/localstorage.js | 58 +++++++++++----------------
 packages/localstorage/package.js      | 12 +++---
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/packages/localstorage/localstorage.js b/packages/localstorage/localstorage.js
index fb72c0bf59..4eb5719830 100644
--- a/packages/localstorage/localstorage.js
+++ b/packages/localstorage/localstorage.js
@@ -5,52 +5,42 @@
 // trying to use it throws.
 // Accessing window.localStorage can also immediately throw an error in IE (#1291).
 
+var hasOwn = Object.prototype.hasOwnProperty;
+var storage = global.localStorage;
 var key = '_localstorage_test_' + Random.id();
 var retrieved;
+
 try {
-  if (window.localStorage) {
-    window.localStorage.setItem(key, key);
-    retrieved = window.localStorage.getItem(key);
-    window.localStorage.removeItem(key);
+  if (storage) {
+    storage.setItem(key, key);
+    retrieved = storage.getItem(key);
+    storage.removeItem(key);
   }
-} catch (e) {
-  // ... ignore
-}
+} catch (ignored) {}
+
 if (key === retrieved) {
-  Meteor._localStorage = {
-    getItem: function (key) {
-      return window.localStorage.getItem(key);
-    },
-    setItem: function (key, value) {
-      window.localStorage.setItem(key, value);
-    },
-    removeItem: function (key) {
-      window.localStorage.removeItem(key);
-    }
-  };
+  Meteor._localStorage = storage;
 }
 
-if (!Meteor._localStorage) {
-  Meteor._debug(
-    "You are running a browser with no localStorage or userData "
-      + "support. Logging in from one tab will not cause another "
-      + "tab to be logged in.");
-
-  Meteor._localStorage = {
-    _data: {},
+if (! Meteor._localStorage) {
+  if (Meteor.isClient) {
+    Meteor._debug(
+      "You are running a browser with no localStorage or userData "
+        + "support. Logging in from one tab will not cause another "
+        + "tab to be logged in.");
+  }
 
+  Meteor._localStorage = Object.create({
     setItem: function (key, val) {
-      this._data[key] = val;
+      this[key] = val;
     },
+
     removeItem: function (key) {
-      delete this._data[key];
+      delete this[key];
     },
+
     getItem: function (key) {
-      var value = this._data[key];
-      if (value === undefined)
-        return null;
-      else
-        return value;
+      return hasOwn.call(this, key) ? this[key] : null;
     }
-  };
+  });
 }
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 3b4cc80c50..744d9eee5f 100644
--- a/packages/localstorage/package.js
+++ b/packages/localstorage/package.js
@@ -1,17 +1,15 @@
 Package.describe({
   summary: "Simulates local storage on IE 6,7 using userData",
-  version: "1.0.12"
+  version: "1.1.0"
 });
 
 Package.onUse(function (api) {
-  api.use('random', 'client');
-
-  api.addFiles('localstorage.js', 'client');
+  api.use('random');
+  api.addFiles('localstorage.js');
 });
 
 Package.onTest(function (api) {
-  api.use('localstorage', 'client');
+  api.use('localstorage');
   api.use('tinytest');
-
-  api.addFiles('localstorage_tests.js', 'client');
+  api.addFiles('localstorage_tests.js');
 });

From 960ad2266bfb1e34d17cd09154ed764acdf3e133 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 2 Feb 2017 18:10:58 -0500
Subject: [PATCH 002/195] Refactor modules-runtime into multiple files.

---
 packages/modules-runtime/client.js          |  5 ++
 packages/modules-runtime/modules-runtime.js | 86 ---------------------
 packages/modules-runtime/options.js         | 10 +++
 packages/modules-runtime/package.js         |  5 +-
 packages/modules-runtime/server.js          | 67 ++++++++++++++++
 5 files changed, 86 insertions(+), 87 deletions(-)
 create mode 100644 packages/modules-runtime/client.js
 delete mode 100644 packages/modules-runtime/modules-runtime.js
 create mode 100644 packages/modules-runtime/options.js
 create mode 100644 packages/modules-runtime/server.js

diff --git a/packages/modules-runtime/client.js b/packages/modules-runtime/client.js
new file mode 100644
index 0000000000..d902671864
--- /dev/null
+++ b/packages/modules-runtime/client.js
@@ -0,0 +1,5 @@
+// On the client, make package resolution prefer the "browser" field of
+// package.json files to the "main" field.
+makeInstallerOptions.browser = true;
+
+meteorInstall = makeInstaller(makeInstallerOptions);
diff --git a/packages/modules-runtime/modules-runtime.js b/packages/modules-runtime/modules-runtime.js
deleted file mode 100644
index da38e75648..0000000000
--- a/packages/modules-runtime/modules-runtime.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var options = {};
-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);
-  };
-}
-
-// On the client, make package resolution prefer the "browser" field of
-// package.json files to the "main" field.
-options.browser = Meteor.isClient;
-
-// 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
-// fallback in terms of Npm.require.
-options.fallback = function (id, parentId, error) {
-  // For simplicity, we honor only top-level module identifiers here.
-  // We could try to honor relative and absolute module identifiers by
-  // somehow combining `id` with `dir`, but we'd have to be really careful
-  // that the resulting modules were located in a known directory (not
-  // some arbitrary location on the file system), and we only really need
-  // the fallback for dependencies installed in node_modules directories.
-  if (topLevelIdPattern.test(id)) {
-    if (typeof Npm === "object" &&
-        typeof Npm.require === "function") {
-      return Npm.require(id);
-    }
-  }
-
-  throw error;
-};
-
-options.fallback.resolve = function (id, parentId, error) {
-  if (Meteor.isServer &&
-      topLevelIdPattern.test(id)) {
-    // Allow any top-level identifier to resolve to itself on the server,
-    // so that options.fallback can have a chance to handle it.
-    return id;
-  }
-
-  throw error;
-};
-
-meteorInstall = makeInstaller(options);
-var Mp = meteorInstall.Module.prototype;
-
-if (Meteor.isServer) {
-  Mp.useNode = function () {
-    if (typeof npmRequire !== "function") {
-      // Can't use Node if npmRequire is not defined.
-      return false;
-    }
-
-    var parts = this.id.split("/");
-    var start = 0;
-    if (parts[start] === "") ++start;
-    if (parts[start] === "node_modules" &&
-        parts[start + 1] === "meteor") {
-      start += 2;
-    }
-
-    if (parts.indexOf("node_modules", start) < 0) {
-      // Don't try to use Node for modules that aren't in node_modules
-      // directories.
-      return false;
-    }
-
-    try {
-      npmRequire.resolve(this.id);
-    } catch (e) {
-      return false;
-    }
-
-    this.exports = npmRequire(this.id);
-
-    return true;
-  };
-}
diff --git a/packages/modules-runtime/options.js b/packages/modules-runtime/options.js
new file mode 100644
index 0000000000..200b878613
--- /dev/null
+++ b/packages/modules-runtime/options.js
@@ -0,0 +1,10 @@
+makeInstallerOptions = {};
+
+if (typeof Profile === "function" &&
+    process.env.METEOR_PROFILE) {
+  makeInstallerOptions.wrapRequire = function (require) {
+    return Profile(function (id) {
+      return "require(" + JSON.stringify(id) + ")";
+    }, require);
+  };
+}
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 5aff025d47..6d0735fcab 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -18,7 +18,10 @@ Package.onUse(function(api) {
     bare: true
   });
 
-  api.addFiles("modules-runtime.js");
+  api.addFiles("options.js");
+  api.addFiles("client.js", "client");
+  api.addFiles("server.js", "server");
+
   api.export("meteorInstall");
 });
 
diff --git a/packages/modules-runtime/server.js b/packages/modules-runtime/server.js
new file mode 100644
index 0000000000..367a60c769
--- /dev/null
+++ b/packages/modules-runtime/server.js
@@ -0,0 +1,67 @@
+// RegExp matching strings that don't start with a `.` or a `/`.
+var topLevelIdPattern = /^[^./]/;
+
+// 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
+// fallback in terms of Npm.require.
+makeInstallerOptions.fallback = function (id, parentId, error) {
+  // For simplicity, we honor only top-level module identifiers here.
+  // We could try to honor relative and absolute module identifiers by
+  // somehow combining `id` with `dir`, but we'd have to be really careful
+  // that the resulting modules were located in a known directory (not
+  // some arbitrary location on the file system), and we only really need
+  // the fallback for dependencies installed in node_modules directories.
+  if (topLevelIdPattern.test(id)) {
+    if (typeof Npm === "object" &&
+        typeof Npm.require === "function") {
+      return Npm.require(id);
+    }
+  }
+
+  throw error;
+};
+
+makeInstallerOptions.fallback.resolve = function (id, parentId, error) {
+  if (topLevelIdPattern.test(id)) {
+    // Allow any top-level identifier to resolve to itself on the server,
+    // so that makeInstallerOptions.fallback has a chance to handle it.
+    return id;
+  }
+
+  throw error;
+};
+
+meteorInstall = makeInstaller(makeInstallerOptions);
+var Module = meteorInstall.Module;
+
+Module.prototype.useNode = function () {
+  if (typeof npmRequire !== "function") {
+    // Can't use Node if npmRequire is not defined.
+    return false;
+  }
+
+  var parts = this.id.split("/");
+  var start = 0;
+  if (parts[start] === "") ++start;
+  if (parts[start] === "node_modules" &&
+      parts[start + 1] === "meteor") {
+    start += 2;
+  }
+
+  if (parts.indexOf("node_modules", start) < 0) {
+    // Don't try to use Node for modules that aren't in node_modules
+    // directories.
+    return false;
+  }
+
+  try {
+    npmRequire.resolve(this.id);
+  } catch (e) {
+    return false;
+  }
+
+  this.exports = npmRequire(this.id);
+
+  return true;
+};

From 38c1e5b88a63a8a752e2b7d6bdfadc593e62aea2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 14 Dec 2016 16:38:24 -0500
Subject: [PATCH 003/195] Teach findImportedModuleIdentifiers to find dynamic
 imports.

---
 tools/isobuild/js-analyze.js | 94 +++++++++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 24 deletions(-)

diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index ae1b7507af..5a335ca308 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -35,7 +35,7 @@ function tryToParse(source, hash) {
   return ast;
 }
 
-var dependencyKeywordPattern = /\b(require|import|export)\b/g;
+var dependencyKeywordPattern = /\b(require|import|export|dynamicImport)\b/g;
 
 /**
  * The `findImportedModuleIdentifiers` function takes a string of module
@@ -95,9 +95,14 @@ export function findImportedModuleIdentifiers(source, hash) {
           return addIdentifier(id, "require", requireIsBound);
         }
 
-        id = getImportedModuleId(node);
-        if (typeof id === "string") {
-          return addIdentifier(id, "import", requireIsBound);
+        const importInfo = getImportedModuleInfo(node);
+        if (importInfo) {
+          return addIdentifier(
+            importInfo.id,
+            "import",
+            requireIsBound,
+            importInfo.dynamic
+          );
         }
 
         // Continue traversing the children of this node.
@@ -117,10 +122,17 @@ export function findImportedModuleIdentifiers(source, hash) {
     }
   }
 
-  function addIdentifier(id, type, requireIsBound) {
+  function addIdentifier(id, type, requireIsBound, isDynamic) {
     const entry = hasOwn.call(identifiers, id)
       ? identifiers[id]
-      : identifiers[id] = { possiblySpurious: true };
+      : identifiers[id] = {
+          possiblySpurious: true,
+          dynamic: !! isDynamic
+        };
+
+    if (! isDynamic) {
+      entry.dynamic = false;
+    }
 
     if (type === "require") {
       // If the identifier comes from a require call, but require is not a
@@ -182,31 +194,65 @@ function isStringLiteral(node) {
      typeof node.value === "string"));
 }
 
-function getImportedModuleId(node) {
-  if (node.type === "CallExpression" &&
-      node.callee.type === "MemberExpression" &&
-      isIdWithName(node.callee.object, "module") &&
-      (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) {
-      const arg = args[0];
-      if (isStringLiteral(arg)) {
-        return arg.value;
+function getImportedModuleInfo(node) {
+  switch (node.type) {
+  case "CallExpression":
+    if (node.callee.type === "Import" ||
+        isIdWithName(node.callee, "import")) {
+      const firstArg = node.arguments[0];
+      if (isStringLiteral(firstArg)) {
+        return {
+          id: firstArg.value,
+          dynamic: true,
+        };
+      }
+
+    } else if (node.callee.type === "MemberExpression" &&
+               isIdWithName(node.callee.object, "module")) {
+      const propertyName =
+        isPropertyWithName(node.callee.property, "import") ||
+        isPropertyWithName(node.callee.property, "dynamicImport");
+
+      if (propertyName) {
+        const dynamic = propertyName === "dynamicImport";
+        const args = node.arguments;
+        const argc = args.length;
+
+        if (argc > 0) {
+          const arg = args[0];
+          if (isStringLiteral(arg)) {
+            return {
+              id: arg.value,
+              dynamic,
+            };
+          }
+        }
       }
     }
-  }
 
-  if (node.type === "ImportDeclaration" ||
-      node.type === "ExportAllDeclaration" ||
-      node.type === "ExportNamedDeclaration") {
+    return null;
+
+  case "ImportDeclaration":
+  case "ExportAllDeclaration":
+  case "ExportNamedDeclaration":
     // The .source of an ImportDeclaration or Export{Named,All}Declaration
     // is always a string-valued Literal node, if not null.
     if (isNode(node.source)) {
-      return node.source.value;
+      return {
+        id: node.source.value,
+        dynamic: false,
+      };
     }
+
+    return null;
+  }
+}
+
+function isPropertyWithName(node, name) {
+  if (isIdWithName(node, name) ||
+      (isStringLiteral(node) &&
+       node.value === name)) {
+    return name;
   }
 }
 

From 0e210ef53cccae8810829e218d06c854dc21cef5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 14 Dec 2016 16:51:09 -0500
Subject: [PATCH 004/195] Allow ImportScanner#getOutputFiles to return dynamic
 files.

---
 tools/isobuild/import-scanner.js | 174 ++++++++++++++++++++++---------
 1 file changed, 127 insertions(+), 47 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index bd6262a699..7619b0c465 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -255,17 +255,10 @@ export default class ImportScanner {
       file.installPath = this._getInstallPath(absTargetPath);
       file.sourcePath = file.targetPath;
 
-      let relativeId = convertToPosixPath(pathRelative(
-        pathDirname(absSourcePath),
-        absTargetPath
-      ));
-
-      // If the result of pathRelative does not already start with a "."
-      // or a "/", prepend a "./" to make it a valid relative identifier
-      // according to CommonJS syntax.
-      if ("./".indexOf(relativeId.charAt(0)) < 0) {
-        relativeId = "./" + relativeId;
-      }
+      const relativeId = this._getRelativeImportId(
+        absSourcePath,
+        absTargetPath,
+      );
 
       // Set the contents of the source module to import the target
       // module(s). Note that module.exports will be set to the exports of
@@ -336,7 +329,17 @@ export default class ImportScanner {
     oldFile.dataString = combinedDataString;
     oldFile.data = new Buffer(oldFile.dataString, "utf8");
     oldFile.hash = sha1(oldFile.data);
-    oldFile.imported = oldFile.imported || newFile.imported;
+
+    // If either oldFile or newFile has been imported non-dynamically,
+    // then oldFile.imported needs to be === true. Otherwise we simply set
+    // oldFile.imported = oldFile.imported || newFile.imported, which
+    // could be either false, "dynamic", or "fake" (see addNodeModules).
+    oldFile.imported =
+      oldFile.imported === true ||
+      newFile.imported === true ||
+      oldFile.imported ||
+      newFile.imported;
+
     oldFile.sourceMap = combinedSourceMap.toJSON();
     if (! oldFile.sourceMap.mappings) {
       oldFile.sourceMap = null;
@@ -346,7 +349,7 @@ export default class ImportScanner {
   scanImports() {
     this.outputFiles.forEach(file => {
       if (! file.lazy || file.imported) {
-        this._scanFile(file);
+        this._scanFile(file, file.imported === "dynamic");
       }
     });
 
@@ -368,6 +371,11 @@ export default class ImportScanner {
       try {
         this._scanFile({
           sourcePath: "fake.js",
+          // It's important that the fake.js file itself never gets
+          // scanned or bundled. See the _scanFile and getOutputFiles
+          // methods for logic that deals with file.imported values.
+          imported: "fake",
+          lazy: true,
           // By specifying the .deps property of this fake file ahead of
           // time, we can avoid calling findImportedModuleIdentifiers in the
           // _scanFile method.
@@ -403,11 +411,14 @@ export default class ImportScanner {
     };
   }
 
-  getOutputFiles(options) {
+  getOutputFiles() {
     // Return all installable output files that are either eager or
-    // imported by another module.
+    // imported (statically or dynamically).
     return this.outputFiles.filter(file => {
-      return file.installPath && (! file.lazy || file.imported);
+      return file.installPath &&
+        (! file.lazy ||
+         file.imported === true ||
+         file.imported === "dynamic");
     });
   }
 
@@ -467,23 +478,54 @@ export default class ImportScanner {
     return result;
   }
 
-  _resolve(id, absPath) {
+  _resolve(parentFile, id, forDynamicImport = false) {
+    const absPath = pathJoin(this.sourceRoot, parentFile.sourcePath);
     const resolved = this.resolver.resolve(id, absPath);
 
     if (resolved === "missing") {
-      return this._onMissing(id, absPath);
+      return this._onMissing(parentFile, id, forDynamicImport);
     }
 
     if (resolved && resolved.packageJsonMap) {
+      const info = parentFile.deps[id];
+      info.helpers = info.helpers || {};
+
       each(resolved.packageJsonMap, (pkg, path) => {
-        this._addPkgJsonToOutput(path, pkg);
+        const packageJsonFile =
+          this._addPkgJsonToOutput(path, pkg, forDynamicImport);
+
+        const relativeId = this._getRelativeImportId(
+          parentFile.installPath,
+          packageJsonFile.installPath
+        );
+
+        // Although not explicitly imported, any package.json modules
+        // involved in resolving this import should be recorded as
+        // implicit "helpers."
+        info.helpers[relativeId] = forDynamicImport;
       });
     }
 
     return resolved;
   }
 
-  _scanFile(file) {
+  _getRelativeImportId(parentPath, childPath) {
+    const relativeId = convertToPosixPath(pathRelative(
+      pathDirname(parentPath),
+      childPath
+    ));
+
+    // If the result of pathRelative does not already start with a "." or
+    // a "/", prepend a "./" to make it a valid relative identifier
+    // according to CommonJS syntax.
+    if ("./".indexOf(relativeId.charAt(0)) < 0) {
+      return "./" + relativeId;
+    }
+
+    return relativeId;
+  }
+
+  _scanFile(file, forDynamicImport = false) {
     const absPath = pathJoin(this.sourceRoot, file.sourcePath);
 
     try {
@@ -501,7 +543,12 @@ export default class ImportScanner {
     }
 
     each(file.deps, (info, id) => {
-      const resolved = this._resolve(id, absPath);
+      // Asynchronous module fetching only really makes sense on the
+      // client (even though it works equally well on the server), so it's
+      // better if forDynamicImport never becomes true on the server.
+      const dynamic = this.isWeb() && (forDynamicImport || info.dynamic);
+
+      const resolved = this._resolve(file, id, dynamic);
       if (! resolved) {
         return;
       }
@@ -524,16 +571,30 @@ export default class ImportScanner {
         // as imported so we know to include them in the bundle if they
         // are lazy. Eager files and files that we have imported before do
         // not need to be scanned again. Lazy files that we have not
-        // imported before still need to be scanned, however.
+        // imported before still need to be scanned, however. Note that
+        // alreadyScanned will be "dynamic" (which is truthy) if the file
+        // has only been scanned because of a dynamic import(...).
         const alreadyScanned = ! depFile.lazy || depFile.imported;
 
         // Whether the file is eager or lazy, mark it as imported. For
         // lazy files, this makes the difference between being included in
         // or omitted from the bundle. For eager files, this just ensures
-        // we won't scan them again.
-        depFile.imported = true;
+        // we won't scan them again. If this scan began from a dynamic
+        // import(...), we set depFile.imported = "dynamic" unless it's
+        // already been set true.
+        depFile.imported = dynamic
+          ? depFile.imported || "dynamic"
+          : true;
 
-        if (! alreadyScanned) {
+        const needsToBeScanned = ! alreadyScanned ||
+          // If the file has already been scanned, but only because of a
+          // dynamic import(...), then it needs to be scanned again, so that
+          // we mark it and its dependencies as non-dynamic. This will be
+          // cheaper than before because we've already computed depFile.deps.
+          (alreadyScanned === "dynamic" &&
+           depFile.imported === true);
+
+        if (needsToBeScanned) {
           if (depFile.error) {
             // Since this file is lazy, it might never have been imported,
             // so any errors reported to InputFile#error were saved but
@@ -542,7 +603,7 @@ export default class ImportScanner {
             buildmessage.error(depFile.error.message,
                                depFile.error.info);
           } else {
-            this._scanFile(depFile);
+            this._scanFile(depFile, dynamic);
           }
         }
 
@@ -555,6 +616,8 @@ export default class ImportScanner {
         return;
       }
 
+      info.installPath = installPath;
+
       // If the module is not readable, _readModule may return
       // null. Otherwise it will return an object with .data, .dataString,
       // and .hash properties.
@@ -568,7 +631,7 @@ export default class ImportScanner {
       depFile.installPath = installPath;
       depFile.servePath = installPath;
       depFile.lazy = true;
-      depFile.imported = true;
+      depFile.imported = dynamic ? "dynamic" : true;
 
       // Append this file to the output array and record its index.
       this._addFile(absImportedPath, depFile);
@@ -589,12 +652,12 @@ export default class ImportScanner {
         return;
       }
 
-      this._scanFile(depFile);
+      this._scanFile(depFile, dynamic);
     });
   }
 
   isWeb() {
-    return archMatches(this.bundleArch, "web");
+    return ! archMatches(this.bundleArch, "os");
   }
 
   _readFile(absPath) {
@@ -773,9 +836,12 @@ export default class ImportScanner {
   }
 
   // Called by this.resolver when a module identifier cannot be resolved.
-  _onMissing(id, absParentPath) {
+  _onMissing(parentFile, id, forDynamicImport = false) {
     const isApp = ! this.name;
-    const parentFile = this._getFile(absParentPath);
+    const absParentPath = pathJoin(
+      this.sourceRoot,
+      parentFile.sourcePath,
+    );
 
     if (isApp &&
         Resolver.isNative(id) &&
@@ -784,27 +850,33 @@ export default class ImportScanner {
       // a dependency on meteor-node-stubs/deps/<id>.js.
       const stubId = Resolver.getNativeStubId(id);
       if (isString(stubId) && stubId !== id) {
-        if (parentFile &&
-            parentFile.deps) {
-          parentFile.deps[stubId] = parentFile.deps[id];
-        }
-        return this._resolve(stubId, absParentPath);
+        const info = parentFile.deps[id];
+
+        // Although not explicitly imported, any stubs associated with
+        // this native import should be recorded as implicit "helpers."
+        info.helpers = info.helpers || {};
+        info.helpers[stubId] = forDynamicImport;
+
+        return this._resolve(parentFile, stubId, forDynamicImport);
       }
     }
 
-    const possiblySpurious =
-      parentFile &&
-      parentFile.deps &&
-      has(parentFile.deps, id) &&
-      parentFile.deps[id].possiblySpurious;
-
     const info = {
       packageName: this.name,
       parentPath: absParentPath,
       bundleArch: this.bundleArch,
-      possiblySpurious,
+      possiblySpurious: false,
+      dynamic: false,
     };
 
+    if (parentFile &&
+        parentFile.deps &&
+        has(parentFile.deps, id)) {
+      const importInfo = parentFile.deps[id];
+      info.possiblySpurious = importInfo.possiblySpurious;
+      info.dynamic = importInfo.dynamic;
+    }
+
     // If the imported identifier is neither absolute nor relative, but
     // top-level, then it might be satisfied by a package installed in
     // the top-level node_modules directory, and we should record the
@@ -825,11 +897,17 @@ export default class ImportScanner {
     }
   }
 
-  _addPkgJsonToOutput(pkgJsonPath, pkg) {
+  _addPkgJsonToOutput(pkgJsonPath, pkg, forDynamicImport = false) {
     const file = this._getFile(pkgJsonPath);
+
     if (file) {
-      // If the file already exists, don't modify or replace it.
-      return;
+      // If the file already exists, just update file.imported according
+      // to the forDynamicImport parameter.
+      file.imported = forDynamicImport
+        ? file.imported || "dynamic"
+        : true;
+
+      return file;
     }
 
     const data = new Buffer(map(pkg, (value, key) => {
@@ -847,7 +925,7 @@ export default class ImportScanner {
       servePath: relPkgJsonPath,
       hash: sha1(data),
       lazy: true,
-      imported: true,
+      imported: forDynamicImport ? "dynamic" : true,
       // Since _addPkgJsonToOutput is only ever called for package.json
       // files that are involved in resolving package directories, and pkg
       // is only a subset of the information in the actual package.json
@@ -863,6 +941,8 @@ export default class ImportScanner {
     if (hash) {
       this.watchSet.addFile(pkgJsonPath, hash);
     }
+
+    return pkgFile;
   }
 }
 

From 4bff3220e86b7544dac0a627eaee3e43375bd90e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 23 Jan 2017 13:30:03 -0500
Subject: [PATCH 005/195] Include .jsonData on files returned by
 ImportScanner#getOutputFiles.

---
 tools/isobuild/import-scanner.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 7619b0c465..bf90b66711 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -52,8 +52,10 @@ const defaultExtensionHandlers = {
   },
 
   ".json"(dataString) {
+    const file = this;
+    file.jsonData = JSON.parse(dataString);
     return "module.exports = " +
-      JSON.stringify(JSON.parse(dataString), null, 2) +
+      JSON.stringify(file.jsonData, null, 2) +
       ";\n";
   },
 
@@ -191,8 +193,11 @@ export default class ImportScanner {
 
       const dotExt = "." + file.type;
       const dataString = file.data.toString("utf8");
-      file.dataString = defaultExtensionHandlers[dotExt](
-        dataString, file.hash);
+      file.dataString = defaultExtensionHandlers[dotExt].call(
+        file,
+        dataString,
+        file.hash,
+      );
 
       if (! (file.data instanceof Buffer) ||
           file.dataString !== dataString) {
@@ -714,7 +719,8 @@ export default class ImportScanner {
       }
     }
 
-    info.dataString = defaultExtensionHandlers[ext](
+    info.dataString = defaultExtensionHandlers[ext].call(
+      info,
       info.dataString,
       info.hash,
     );
@@ -919,6 +925,7 @@ export default class ImportScanner {
     const pkgFile = {
       type: "js", // We represent the JSON module with JS.
       data,
+      jsonData: pkg,
       deps: {}, // Avoid accidentally re-scanning this file.
       sourcePath: relPkgJsonPath,
       installPath: this._getInstallPath(pkgJsonPath),

From 352f545be236ab19727e8d1a791a8c17b2c7ef37 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 3 Feb 2017 12:57:24 -0500
Subject: [PATCH 006/195] Record complete module graph, including dynamic
 stubs, in meteorInstall.

---
 packages/modules-runtime/client.js         |   2 +-
 packages/modules-runtime/meteor-install.js | 132 +++++++++++++++++++++
 packages/modules-runtime/package.js        |   1 +
 packages/modules-runtime/server.js         |   4 +-
 4 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 packages/modules-runtime/meteor-install.js

diff --git a/packages/modules-runtime/client.js b/packages/modules-runtime/client.js
index d902671864..570609ef60 100644
--- a/packages/modules-runtime/client.js
+++ b/packages/modules-runtime/client.js
@@ -2,4 +2,4 @@
 // package.json files to the "main" field.
 makeInstallerOptions.browser = true;
 
-meteorInstall = makeInstaller(makeInstallerOptions);
+install = makeInstaller(makeInstallerOptions);
diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
new file mode 100644
index 0000000000..e03c82412b
--- /dev/null
+++ b/packages/modules-runtime/meteor-install.js
@@ -0,0 +1,132 @@
+// The metaInstall function will be used to create a module graph that
+// parallels the installed module graph. This parallel graph consists of
+// metadata about all available modules, not only those already installed
+// but also modules that can be fetched dynamically.
+var metaInstall = makeInstaller({
+  browser: makeInstallerOptions.browser
+});
+
+meteorInstall = function (tree, options) {
+  if (isObject(tree)) {
+    var meta = Object.create(null);
+    var modules = Object.create(null);
+    walk(options, tree, meta, modules);
+    metaInstall(meta, options);
+    return install(modules, options);
+  }
+
+  return install();
+};
+
+// Other packages (namely the dynamic-import package) call this function
+// to retrieve module metadata from the metaInstall graph.
+meteorInstall._requireMeta = metaInstall();
+
+function isObject(value) {
+  return value && typeof value === "object";
+}
+
+function getOrSet(obj, name) {
+  return obj[name] = obj[name] || Object.create(null);
+}
+
+function walk(options, input, meta, modules) {
+  Object.keys(input).forEach(function (name) {
+    var value = input[name];
+
+    if (tryChild(value, name, meta, modules, options)) {
+      // If the value was a leaf node that we were able to handle, then we
+      // don't need to (and can't) keep walking it.
+      return;
+    }
+
+    if (isObject(value)) {
+      walk(
+        options,
+        value,
+        getOrSet(meta, name),
+        getOrSet(modules, name)
+      );
+    }
+  });
+
+  return this;
+}
+
+function tryChild(value, name, meta, modules, options) {
+  function tryFunc(value) {
+    if (typeof value === "function") {
+      meta[name] = makeMetaFunc({}, false, options);
+      modules[name] = value;
+      return true;
+    }
+  }
+
+  if (Array.isArray(value)) {
+    return value.some(function (value) {
+      // Dynamic stub modules are represented by objects wrapped in array
+      // brackets. When we find one of these objects, we install it in the
+      // meta graph, but not in the installed modules graph. Later, this
+      // information may be used to fetch dynamic modules from the server,
+      // which will then be installed into the modules graph.
+      if (isObject(value)) {
+        meta[name] = makeMetaFunc(value, true, options);
+        return true;
+      }
+
+      // Older versions of the install.js library supported wrapping a
+      // module function in an array that also contained the dependency
+      // identifier strings of that module. That style should no longer be
+      // used, but we might as well handle it gracefully, since it is not
+      // ambiguous with the [{...}] style.
+      return tryFunc(value);
+    });
+  }
+
+  // Installed (immediately importable) modules are represented by
+  // function expressions with the parameters (require, exports, module).
+  if (tryFunc(value)) {
+    return true;
+  }
+
+  // The install.js library supports a notion of aliases, represented by
+  // module identifier strings. This functionality works the same way in
+  // both the meta graph and the modules graph.
+  if (typeof value === "string") {
+    meta[name] = value;
+    modules[name] = value;
+    return true;
+  }
+}
+
+function makeMetaFunc(value, dynamic, options) {
+  return function (require, exports, module) {
+    Object.assign(exports, value);
+
+    exports.module = module;
+    exports.dynamic = !! dynamic;
+    exports.options = options;
+
+    // One of the purposes of the meta graph is to support traversing
+    // module dependencies without evaluating any actual module code.
+    // The eachChild function is essential to that traversal.
+    exports.eachChild = function (callback, idsToRequire) {
+      // By default, this function requires all value.deps dependencies
+      // before iterating over the resulting children, but the caller can
+      // provide a custom array of modules to require instead.
+      idsToRequire = idsToRequire || (value && value.deps);
+
+      if (Array.isArray(idsToRequire)) {
+        idsToRequire.forEach(require);
+      }
+
+      // After requiring any/all dependencies of this module, iterate over
+      // the children according to module.childrenById. Note that this
+      // includes all children ever imported by this module, including
+      // implicit modules such as package.json files.
+      Object.keys(module.childrenById).forEach(function (id) {
+        callback(module.childrenById[id]);
+      });
+    };
+  };
+}
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 6d0735fcab..6480d94ca8 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -21,6 +21,7 @@ Package.onUse(function(api) {
   api.addFiles("options.js");
   api.addFiles("client.js", "client");
   api.addFiles("server.js", "server");
+  api.addFiles("meteor-install.js");
 
   api.export("meteorInstall");
 });
diff --git a/packages/modules-runtime/server.js b/packages/modules-runtime/server.js
index 367a60c769..1ce8ffb0be 100644
--- a/packages/modules-runtime/server.js
+++ b/packages/modules-runtime/server.js
@@ -32,8 +32,8 @@ makeInstallerOptions.fallback.resolve = function (id, parentId, error) {
   throw error;
 };
 
-meteorInstall = makeInstaller(makeInstallerOptions);
-var Module = meteorInstall.Module;
+install = makeInstaller(makeInstallerOptions);
+var Module = install.Module;
 
 Module.prototype.useNode = function () {
   if (typeof npmRequire !== "function") {

From a2e950dfd3b473598d6a279672f6d838b87f0a35 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 3 Feb 2017 11:03:13 -0500
Subject: [PATCH 007/195] Include dynamic stubs in linked meteorInstall
 bundles.

---
 tools/isobuild/linker.js | 156 +++++++++++++++++++++++++++------------
 1 file changed, 110 insertions(+), 46 deletions(-)

diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 276ec9e913..d1721d053b 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -162,13 +162,15 @@ _.extend(Module.prototype, {
       servePath: self.combinedServePath,
     };
 
+    const results = [result];
+
     // An array of strings and SourceNode objects.
     let chunks = [];
     let fileCount = 0;
 
     // Emit each file
     if (self.meteorInstallOptions) {
-      const tree = self._buildModuleTree();
+      const tree = self._buildModuleTree(results, sourceWidth);
       fileCount = self._chunkifyModuleTree(tree, chunks, sourceWidth);
       result.exportsName =
         self._chunkifyEagerRequires(chunks, fileCount, sourceWidth);
@@ -216,19 +218,20 @@ _.extend(Module.prototype, {
       }
     );
 
-    return [result];
+    return results;
   }),
 
   // Builds a tree of nested objects where the properties are names of
   // files or directories, and the values are either nested objects
   // (representing directories) or File objects (representing modules).
   // Bare files and lazy files that are never imported are ignored.
-  _buildModuleTree() {
+  _buildModuleTree(results, sourceWidth) {
     assert.ok(this.meteorInstallOptions);
 
+    // Tree of File objects for all non-dynamic modules.
     const tree = {};
 
-    _.each(this.files, function (file) {
+    _.each(this.files, file => {
       if (file.bare) {
         // Bare files will be added in between the synchronous require
         // calls in _chunkifyEagerRequires.
@@ -242,22 +245,71 @@ _.extend(Module.prototype, {
         return;
       }
 
-      const parts = file.installPath.split("/");
-      let t = tree;
-      _.each(parts, function (part, i) {
-        const isLastPart = i === parts.length - 1;
-        t = _.has(t, part)
-          ? t[part]
-          : t[part] = isLastPart ? file : {};
-      });
+      const dynamic = file.lazy && file.imported === "dynamic";
+
+      if (dynamic) {
+        const servePath = "dynamic/" + file.installPath;
+        const { code: source, map } =
+          file.getPrelinkedOutput({
+            sourceWidth: sourceWidth,
+            noLineNumbers: this.noLineNumbers
+          }).toStringWithSourceMap({
+            file: servePath,
+          });
+
+        results.push({
+          source,
+          servePath,
+          sourceMap: map && map.toJSON(),
+          dynamic: true,
+        });
+
+        const entry = {
+          version: file.sourceHash,
+        };
+
+        if (! _.isEmpty(file.deps)) {
+          entry.deps = file.deps;
+        }
+
+        if (file.installPath.endsWith("/package.json") &&
+            file.jsonData) {
+          const main = file.jsonData.main;
+          if (_.isString(main)) {
+            entry.main = main;
+          }
+
+          const browser = file.jsonData.browser;
+          if (_.isString(browser)) {
+            entry.browser = browser;
+          }
+        }
+
+        this._addToTree([entry], file.installPath, tree);
+
+      } else {
+        // If the file is not dynamic, then it should be included in the
+        // initial bundle, so we add it to the static tree.
+        this._addToTree(file, file.installPath, tree);
+      }
     });
 
     return tree;
   },
 
-  // Takes the tree generated by _buildModuleTree and populates the chunks
+  _addToTree(obj, path, tree) {
+    const parts = path.split("/");
+    const lastIndex = parts.length - 1;
+    parts.forEach((part, i) => {
+      tree = _.has(tree, part)
+        ? tree[part]
+        : tree[part] = i < lastIndex ? {} : obj;
+    });
+  },
+
+  // Take the tree generated in getPrelinkedFiles and populate the chunks
   // array with strings and SourceNode objects that can be combined into a
-  // single SourceNode object. Returns the count of modules in the tree.
+  // single SourceNode object. Return the count of modules in the tree.
   _chunkifyModuleTree(tree, chunks, sourceWidth) {
     const self = this;
 
@@ -268,12 +320,18 @@ _.extend(Module.prototype, {
     let moduleCount = 0;
 
     function walk(t) {
-      if (t instanceof File) {
+      if (Array.isArray(t)) {
         ++moduleCount;
+        chunks.push(JSON.stringify(t, null, 2));
+
+      } else if (t instanceof File) {
+        ++moduleCount;
+
         chunks.push(t.getPrelinkedOutput({
           sourceWidth,
           noLineNumbers: self.noLineNumbers
         }));
+
       } else if (_.isObject(t)) {
         chunks.push("{");
         const keys = _.keys(t);
@@ -424,20 +482,16 @@ var File = function (inputFile, module) {
   self.servePath = inputFile.servePath;
 
   // Module identifiers imported or required by this module, if any.
-  if (Array.isArray(inputFile.deps)) {
-    self.deps = inputFile.deps;
-  } else if (inputFile.deps && typeof inputFile.deps === "object") {
-    self.deps = Object.keys(inputFile.deps);
-  } else {
-    self.deps = [];
-  }
+  // Excludes dynamically imported dependencies, and may exclude
+  // dependencies already included in the non-dynamic initial bundle.
+  self.deps = getNonDynamicDeps(inputFile.deps);
 
   // True if the input file should not be evaluated eagerly.
   self.lazy = inputFile.lazy; // could be `true`, `false` or `undefined` <sigh>
 
-  // True if the file is an eagerly evaluated entry point, or if some
-  // other file imports or requires it.
-  self.imported = !!inputFile.imported;
+  // True if the file is eagerly imported, "dynamic" if the file is
+  // dynamically imported.
+  self.imported = inputFile.imported;
 
   // Boolean indicating whether this file is the main entry point module
   // for its package.
@@ -450,10 +504,28 @@ var File = function (inputFile, module) {
   // Is an Object, not a string.
   self.sourceMap = inputFile.sourceMap;
 
+  // If inputFile is a JSON file, its parsed data will be exposed via the
+  // .jsonData property.
+  self.jsonData = inputFile.jsonData || null;
+
   // The Module containing this file.
   self.module = module;
 };
 
+function getNonDynamicDeps(inputFileDeps) {
+  const nonDynamicDeps = Object.create(null);
+
+  if (! _.isEmpty(inputFileDeps)) {
+    _.each(inputFileDeps, (info, id) => {
+      if (! info.dynamic) {
+        nonDynamicDeps[id] = info;
+      }
+    });
+  }
+
+  return Object.keys(nonDynamicDeps);
+}
+
 _.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
@@ -513,19 +585,12 @@ _.extend(File.prototype, {
 
   _getClosureHeader() {
     if (this._useMeteorInstall()) {
-      var header = "";
-
-      if (this.deps.length > 0) {
-        header += "[";
-        _.each(this.deps, dep => {
-          header += JSON.stringify(dep) + ",";
-        });
-      }
-
-      const headerParts = [
-        header,
-        "function("
-      ];
+      // The wrapper function is named "module" so that the UglifyJS
+      // minifier will parse it as a function declaration, because
+      // UglifyJS has trouble parsing single function expressions. If the
+      // module refers to `module`, however, it will be referring to the
+      // parameter of that name, rather than the function name.
+      const headerParts = ["function module("];
 
       if (this.source.match(/\b__dirname\b/)) {
         headerParts.push("require,exports,module,__filename,__dirname");
@@ -548,14 +613,9 @@ _.extend(File.prototype, {
   },
 
   _getClosureFooter() {
-    if (this._useMeteorInstall()) {
-      var footer = "}";
-      if (this.deps.length > 0) {
-        footer += "]";
-      }
-      return footer;
-    }
-    return "}).call(this);\n";
+    return this._useMeteorInstall()
+      ? "}"
+      : "}).call(this);\n";
   },
 
   // Options:
@@ -1057,6 +1117,10 @@ export var fullLink = Profile("linker.fullLink", function (inputFiles, {
   var headerContent = (new Array(headerLines + 1).join(';'));
 
   return _.map(prelinkedFiles, function (file) {
+    if (file.dynamic) {
+      return file;
+    }
+
     if (file.sourceMap) {
       var sourceMap = file.sourceMap;
       sourceMap.mappings = headerContent + sourceMap.mappings;

From ebff32f6266be8369fa857790a87cb7c0a722d50 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 3 Feb 2017 11:34:54 -0500
Subject: [PATCH 008/195] Write dynamic files separately in builder output
 directories.

---
 tools/isobuild/bundler.js | 92 +++++++++++++++++++++++++++++++--------
 1 file changed, 75 insertions(+), 17 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index bc971e80c6..2520d44d53 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -677,7 +677,7 @@ class File {
 
   setTargetPathFromRelPath(relPath) {
     // XXX hack
-    if (relPath.match(/^packages\//) || relPath.match(/^assets\//)) {
+    if (relPath.match(/^(packages|assets|dynamic)\//)) {
       this.targetPath = relPath;
     } else {
       this.targetPath = files.pathJoin('app', relPath);
@@ -1173,29 +1173,42 @@ class Target {
 
   // Minify the JS in this target
   minifyJs(minifierDef, minifyMode) {
-    const sources = _.map(this.js, function (file) {
-      return new JsFile(file, {
-        arch: this.arch
-      });
+    const staticFiles = [];
+    const dynamicFiles = [];
+
+    this.js.forEach(file => {
+      const jsf = new JsFile(file, { arch: this.arch });
+      if (file.targetPath.startsWith("dynamic/")) {
+        dynamicFiles.push(jsf);
+      } else {
+        staticFiles.push(jsf);
+      }
     });
-    var minifier = minifierDef.userPlugin.processFilesForBundle.bind(
-      minifierDef.userPlugin);
+
+    var minifier = minifierDef.userPlugin.processFilesForBundle
+      .bind(minifierDef.userPlugin);
 
     buildmessage.enterJob('minifying app code', function () {
       try {
         var markedMinifier = buildmessage.markBoundary(minifier);
-        markedMinifier(sources, { minifyMode });
+        markedMinifier(staticFiles, { minifyMode });
+        dynamicFiles.forEach(file => {
+          markedMinifier([file], { minifyMode });
+        });
       } catch (e) {
         buildmessage.exception(e);
       }
     });
 
-    this.js = _.flatten(sources.map((source) => {
-      return source._minifiedFiles.map((file) => {
+    const js = [];
+
+    function handle(source, dynamic) {
+      const newFiles = source._minifiedFiles.map(file => {
         const newFile = new File({
           info: 'minified js',
-          data: new Buffer(file.data, 'utf8')
+          data: new Buffer(file.data, 'utf8'),
         });
+
         if (file.sourceMap) {
           newFile.setSourceMap(file.sourceMap, '/');
         }
@@ -1203,13 +1216,24 @@ class Target {
         if (file.path) {
           newFile.setUrlFromRelPath(file.path);
           newFile.targetPath = file.path;
+        } else if (dynamic) {
+          const { targetPath } = source._source;
+          newFile.setUrlFromRelPath(targetPath);
+          newFile.targetPath = targetPath;
         } else {
           newFile.setUrlToHash('.js', '?meteor_js_resource=true');
         }
 
         return newFile;
       });
-    }));
+
+      js.push(...newFiles);
+    }
+
+    staticFiles.forEach(file => handle(file, false));
+    dynamicFiles.forEach(file => handle(file, true));
+
+    this.js = js;
   }
 
   // For every source file we process, sets the domain name to
@@ -1477,9 +1501,27 @@ class ClientTarget extends Target {
       manifestItem.size = file.size();
       manifestItem.hash = file.hash();
 
-      writeFile(file, builder);
+      writeFile(file, {
+        sourceMapUrl: manifestItem.sourceMapUrl,
+      }, builder);
 
-      manifest.push(manifestItem);
+      if (! file.targetPath.startsWith("dynamic/")) {
+        manifest.push(manifestItem);
+      } else if (file.sourceMap) {
+        // If the file is dynamic, we don't need/want the file itself to
+        // be served by the web server, but we do want its source map (if
+        // defined) to be accessible via HTTP, so that we can refer to it
+        // by URL rather than embedding it as a very long data URL comment
+        // in the file.
+        manifest.push({
+          type: "json",
+          path: manifestItem.sourceMap,
+          url: manifestItem.sourceMapUrl,
+          where: manifestItem.where,
+          cacheable: manifestItem.cacheable,
+          hash: manifestItem.hash,
+        });
+      }
     });
 
     ['head', 'body'].forEach((type) => {
@@ -1980,7 +2022,9 @@ class JsImage {
         });
       }
 
-      load.push(loadItem);
+      if (! item.targetPath.startsWith("dynamic/")) {
+        load.push(loadItem);
+      }
     });
 
     const rebuildDirs = Object.create(null);
@@ -2324,7 +2368,7 @@ class ServerTarget extends JsImageTarget {
   ServerTarget.prototype[method] = Profile(`ServerTarget#${method}`, ServerTarget.prototype[method]);
 });
 
-var writeFile = Profile("bundler writeFile", function (file, builder) {
+var writeFile = Profile("bundler writeFile", function (file, options, builder) {
   if (! file.targetPath) {
     throw new Error("No targetPath?");
   }
@@ -2336,7 +2380,21 @@ var writeFile = Profile("bundler writeFile", function (file, builder) {
   // to wait until the server is actually driven by the manifest
   // (rather than just serving all of the files in a certain
   // directories)
-  builder.write(file.targetPath, { data: file.contents(), hash: file.hash() });
+
+  let data = file.contents();
+  const hash = file.hash();
+
+  if (options.sourceMapUrl) {
+    // TODO Remove any existing //# sourceMappingURL=, and maybe unify
+    // with similar logic in JsImage#write.
+    data = Buffer.concat([data, new Buffer([
+      "",
+      "//# sourceMappingURL=" + options.sourceMapUrl,
+      ""
+    ].join("\n"), "utf8")]);
+  }
+
+  builder.write(file.targetPath, { data, hash });
 });
 
 // Writes a target a path in 'programs'

From 9845c2f484d436cd10e26ca778030278d5ba7da8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 09:50:47 -0500
Subject: [PATCH 009/195] Unify sourceMappingURL logic in
 tools/isobuild/bundler.js.

---
 tools/isobuild/bundler.js | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 2520d44d53..a41f9e8bc8 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1981,11 +1981,11 @@ class JsImage {
         );
 
         var sourceMapFileName = files.pathBasename(loadItem.sourceMap);
+
         // Remove any existing sourceMappingURL line. (eg, if roundtripping
         // through JsImage.readFromDisk, don't end up with two!)
-        item.source = item.source.replace(
-            /\n\/\/# sourceMappingURL=.+\n?$/g, '');
-        item.source += "\n//# sourceMappingURL=" + sourceMapFileName + "\n";
+        item.source = addSourceMappingURL(item.source, sourceMapFileName);
+
         if (item.sourceMapRoot) {
           loadItem.sourceMapRoot = item.sourceMapRoot;
         }
@@ -2385,18 +2385,27 @@ var writeFile = Profile("bundler writeFile", function (file, options, builder) {
   const hash = file.hash();
 
   if (options.sourceMapUrl) {
-    // TODO Remove any existing //# sourceMappingURL=, and maybe unify
-    // with similar logic in JsImage#write.
-    data = Buffer.concat([data, new Buffer([
-      "",
-      "//# sourceMappingURL=" + options.sourceMapUrl,
-      ""
-    ].join("\n"), "utf8")]);
+    data = new Buffer(
+      addSourceMappingURL(data, options.sourceMapUrl),
+      "utf8"
+    );
   }
 
   builder.write(file.targetPath, { data, hash });
 });
 
+// The data argument may be either a Buffer or a string, but this function
+// always returns a string.
+function addSourceMappingURL(data, url) {
+  const dataString = data
+    // If data is a Buffer, convert it to a string.
+    .toString("utf8")
+    // Remove any existing source map comments.
+    .replace(/\/\/# sourceMappingURL=[^\n]+/g, '//');
+  // Append the new source map comment to the end of the code.
+  return dataString + "\n//# sourceMappingURL=" + url + "\n";
+}
+
 // Writes a target a path in 'programs'
 var writeTargetToPath = Profile(
   "bundler writeTargetToPath",

From 22d1b3ddfe5cd3b11455611ff27427c9d4aa0692 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 14 Dec 2016 17:23:51 -0500
Subject: [PATCH 010/195] Make special arguments in boot.js more configurable.

Currently this functionality is only used for exposing npmRequire and
Profile to the packages/modules-runtime.js bundle, but I'm planning to use
it for packages/dynamic-import.js soon.
---
 tools/static-assets/server/boot.js | 34 ++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 4abc6dc05f..1d867bd913 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -13,6 +13,8 @@ var Profile = require('./profile.js').Profile;
 // This code is duplicated in tools/main.js.
 var MIN_NODE_VERSION = 'v0.10.41';
 
+var hasOwn = Object.prototype.hasOwnProperty;
+
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
@@ -124,6 +126,15 @@ var startCheckForLiveParent = function (parentPid) {
   }
 };
 
+var specialArgPaths = {
+  "packages/modules-runtime.js": function () {
+    return {
+      npmRequire: npmRequire,
+      Profile: Profile
+    };
+  }
+};
+
 var loadServerBundles = Profile("Load server bundles", function () {
   _.each(serverJson.load, function (fileInfo) {
     var code = fs.readFileSync(path.resolve(serverDir, fileInfo.path));
@@ -269,13 +280,17 @@ var loadServerBundles = Profile("Load server bundles", function () {
       },
     };
 
-    var isModulesRuntime =
-      fileInfo.path === "packages/modules-runtime.js";
-
     var wrapParts = ["(function(Npm,Assets"];
-    if (isModulesRuntime) {
-      wrapParts.push(",npmRequire,Profile");
-    }
+
+    var specialArgs =
+      hasOwn.call(specialArgPaths, fileInfo.path) &&
+      specialArgPaths[fileInfo.path](fileInfo);
+
+    var specialKeys = Object.keys(specialArgs || {});
+    specialKeys.forEach(function (key) {
+      wrapParts.push("," + key);
+    });
+
     // \n is necessary in case final line is a //-comment
     wrapParts.push("){", code, "\n})");
     var wrapped = wrapParts.join("");
@@ -296,9 +311,10 @@ var loadServerBundles = Profile("Load server bundles", function () {
     // what require() uses to generate its errors.
     var func = require('vm').runInThisContext(wrapped, scriptPath, true);
     var args = [Npm, Assets];
-    if (isModulesRuntime) {
-      args.push(npmRequire, Profile);
-    }
+
+    specialKeys.forEach(function (key) {
+      args.push(specialArgs[key]);
+    });
 
     Profile(fileInfo.path, func).apply(global, args);
   });

From 158adc48e8cb97d8de48ffef9bbc041b59790e5d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 14 Dec 2016 17:26:28 -0500
Subject: [PATCH 011/195] Expose manifest of dynamic modules to the
 dynamic-import package.

---
 tools/static-assets/server/boot.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tools/static-assets/server/boot.js b/tools/static-assets/server/boot.js
index 1d867bd913..0f73a9bd9c 100644
--- a/tools/static-assets/server/boot.js
+++ b/tools/static-assets/server/boot.js
@@ -132,6 +132,25 @@ var specialArgPaths = {
       npmRequire: npmRequire,
       Profile: Profile
     };
+  },
+
+  "packages/dynamic-import.js": function (file) {
+    var dynamicImportInfo = {};
+
+    Object.keys(configJson.clientPaths).map(function (key) {
+      var programJsonPath = path.resolve(configJson.clientPaths[key]);
+      var programJson = require(programJsonPath);
+
+      dynamicImportInfo[key] = {
+        dynamicRoot: path.join(path.dirname(programJsonPath), "dynamic")
+      };
+    });
+
+    dynamicImportInfo.server = {
+      dynamicRoot: path.join(serverDir, "dynamic")
+    };
+
+    return { dynamicImportInfo: dynamicImportInfo };
   }
 };
 

From 6095204bb3be1e5e8679b163a66f38e2d9c21efb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Feb 2017 13:13:26 -0500
Subject: [PATCH 012/195] Implement Module.prototype.dynamicImport with a
 package.

---
 packages/dynamic-import/README.md  | 24 +++++++++
 packages/dynamic-import/client.js  | 85 ++++++++++++++++++++++++++++++
 packages/dynamic-import/package.js | 13 +++++
 packages/dynamic-import/server.js  | 69 ++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 packages/dynamic-import/README.md
 create mode 100644 packages/dynamic-import/client.js
 create mode 100644 packages/dynamic-import/package.js
 create mode 100644 packages/dynamic-import/server.js

diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
new file mode 100644
index 0000000000..ea7b121df7
--- /dev/null
+++ b/packages/dynamic-import/README.md
@@ -0,0 +1,24 @@
+Remaining work:
+
+- [x] Future-proof `findImportedModuleIdentifiers` for real `import(...)`
+- [x] Source maps in development
+- [x] Debugger stops at reasonable points in dev tools
+- [x] Open another WebSocket? NO
+- [x] Make `import(...)` work on the server
+- [x] Modules are minified but not merged in production
+  - [x] Wrap modules with function to enable better minification
+- [ ] Babel transform from `import(...)` to `module.importAsync(...)`
+- [ ] Bundle cachability story
+- [x] Compact `previous` state representation
+- [x] Improve dependency resolution in `packages/dynamic-import/server.js`
+- [x] Report static import/syntax/etc. errors for async files
+- [ ] What about old/new versions of code?
+- [ ] What about package pseudo-globals (imports)?
+- [x] What about dynamic stubs?
+- [x] Avoid creating dynamic files on the server.
+- [ ] `Mp.dynamicImport` could be implemented without the fallback on the
+      server if we were sure the server had no dynamic files.
+- [ ] Batch multiple __dynamicImport method calls.
+- [x] Make sure client-only reloads work (revisit _read caching).
+- [x] Make sure path manipulation is Windows-safe.
+- [ ] Tests!
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
new file mode 100644
index 0000000000..755baad591
--- /dev/null
+++ b/packages/dynamic-import/client.js
@@ -0,0 +1,85 @@
+var Module = module.constructor;
+var delayPromise = Promise.resolve();
+var requireMeta = meteorInstall._requireMeta;
+
+Module.prototype.dynamicImport = function (id) {
+  // The real (not meta) parent module.
+  var module = this;
+
+  function get() {
+    return getNamespace(module, id);
+  }
+
+  return delayPromise.then(get).catch(function (error) {
+    // Require the current module from the complete meta graph.
+    var meta = requireMeta(module.id);
+    var missingTree = Object.create(null);
+
+    function walk(meta) {
+      if (meta.dynamic && ! meta.pending) {
+        meta.pending = true;
+        addToTree(missingTree, meta.module.id, 1);
+        meta.eachChild(walkChild);
+      }
+    }
+
+    function walkChild(childModule) {
+      walk(childModule.exports);
+    }
+
+    // The meta.eachChild iteration includes all child modules imported by
+    // meta.module, not just the child explicitly required here, so that
+    // implicit modules like package.json will be included too. See
+    // meteor/packages/modules-runtime/meteor-install.js for the
+    // definition of meta.eachChild.
+    meta.eachChild(walkChild, [id]);
+
+    return new Promise(function (resolve, reject) {
+      Meteor.call(
+        "__dynamicImport",
+        missingTree,
+        function (error, resultsTree) {
+          error ? reject(error) : resolve(resultsTree);
+        }
+      );
+
+    }).then(function (resultsTree) {
+      function walk(tree) {
+        if (typeof tree === "string") {
+          return (0, eval)("(" + tree + ")");
+        }
+
+        Object.keys(tree).forEach(function (name) {
+          tree[name] = walk(tree[name]);
+        });
+
+        return tree;
+      }
+
+      meteorInstall(walk(resultsTree)); // TODO Options!
+    }).then(get);
+  });
+};
+
+function addToTree(tree, id, value) {
+  var parts = id.split("/");
+  var lastIndex = parts.length - 1;
+  parts.forEach(function (part, i) {
+    if (part) {
+      tree = tree[part] = tree[part] ||
+        (i < lastIndex ? Object.create(null) : value);
+    }
+  });
+}
+
+function getNamespace(module, id) {
+  var namespace = Object.create(null);
+
+  module.import(id, {
+    "*": function (value, name) {
+      namespace[name] = value;
+    }
+  });
+
+  return namespace;
+}
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
new file mode 100644
index 0000000000..bb86dedac1
--- /dev/null
+++ b/packages/dynamic-import/package.js
@@ -0,0 +1,13 @@
+Package.describe({
+  name: "dynamic-import",
+  version: "0.0.1",
+  summary: "Support for module.dynamicImport(id).then(namespace => ...)",
+  documentation: "README.md"
+});
+
+Package.onUse(function (api) {
+  api.use("modules");
+  api.use("ecmascript", "server");
+  api.mainModule("client.js", "client");
+  api.mainModule("server.js", "server");
+});
diff --git a/packages/dynamic-import/server.js b/packages/dynamic-import/server.js
new file mode 100644
index 0000000000..ef787d30cc
--- /dev/null
+++ b/packages/dynamic-import/server.js
@@ -0,0 +1,69 @@
+import assert from "assert";
+import { readFileSync } from "fs";
+import {
+  join as pathJoin,
+  normalize as pathNormalize,
+} from "path";
+import "./client.js";
+
+const hasOwn = Object.prototype.hasOwnProperty;
+
+Object.keys(dynamicImportInfo).forEach(platform => {
+  const info = dynamicImportInfo[platform];
+  if (info.dynamicRoot) {
+    info.dynamicRoot = pathNormalize(info.dynamicRoot);
+  }
+});
+
+Meteor.methods({
+  __dynamicImport(tree) {
+    const platform = this.connection ? "web.browser" : "server";
+    const pathParts = [];
+
+    function walk(node) {
+      if (node && typeof node === "object") {
+        Object.keys(node).forEach(name => {
+          pathParts.push(name);
+          node[name] = walk(node[name]);
+          assert.strictEqual(pathParts.pop(), name);
+        });
+      } else {
+        return read(pathParts, platform);
+      }
+      return node;
+    }
+
+    return walk(tree);
+  }
+});
+
+function read(pathParts, platform) {
+  const { dynamicRoot } = dynamicImportInfo[platform];
+  const absPath = pathNormalize(pathJoin(dynamicRoot, ...pathParts));
+
+  if (! absPath.startsWith(dynamicRoot)) {
+    throw new Meteor.Error("bad dynamic module path");
+  }
+
+  const cache = getCache(platform);
+  return hasOwn.call(cache, absPath)
+    ? cache[absPath]
+    : cache[absPath] = readFileSync(absPath, "utf8");
+}
+
+const cachesByPlatform = Object.create(null);
+function getCache(platform) {
+  return hasOwn.call(cachesByPlatform, platform)
+    ? cachesByPlatform[platform]
+    : cachesByPlatform[platform] = Object.create(null);
+}
+
+process.on("message", msg => {
+  // The cache for the "web.browser" platform needs to be discarded
+  // whenever a client-only refresh occurs, so that new client code does
+  // not receive stale module data from __dynamicImport. This code handles
+  // the same message listened for by the autoupdate package.
+  if (msg && msg.refresh === "client") {
+    delete cachesByPlatform["web.browser"];
+  }
+});

From c6e27dc44708f50aee181c05f50327bd35126662 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 5 Feb 2017 13:08:59 -0500
Subject: [PATCH 013/195] Install dynamic modules with correct meteorInstall
 options.

---
 packages/dynamic-import/README.md |  1 +
 packages/dynamic-import/client.js | 56 ++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
index ea7b121df7..e7fe7c85ee 100644
--- a/packages/dynamic-import/README.md
+++ b/packages/dynamic-import/README.md
@@ -21,4 +21,5 @@ Remaining work:
 - [ ] Batch multiple __dynamicImport method calls.
 - [x] Make sure client-only reloads work (revisit _read caching).
 - [x] Make sure path manipulation is Windows-safe.
+- [x] Install dynamic modules with correct `meteorInstall` options.
 - [ ] Tests!
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 755baad591..e1bb39a548 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -43,24 +43,50 @@ Module.prototype.dynamicImport = function (id) {
         }
       );
 
-    }).then(function (resultsTree) {
-      function walk(tree) {
-        if (typeof tree === "string") {
-          return (0, eval)("(" + tree + ")");
-        }
-
-        Object.keys(tree).forEach(function (name) {
-          tree[name] = walk(tree[name]);
-        });
-
-        return tree;
-      }
-
-      meteorInstall(walk(resultsTree)); // TODO Options!
-    }).then(get);
+    }).then(installResults).then(get);
   });
 };
 
+function installResults(resultsTree) {
+  var parts = [""];
+  var trees = [];
+  var options = [];
+
+  function walk(tree) {
+    if (typeof tree === "string") {
+      var meta = requireMeta(parts.join("/"));
+      var optionsIndex = options.indexOf(meta.options);
+      if (optionsIndex < 0) {
+        options[optionsIndex = options.length] = meta.options;
+        trees.push(Object.create(null));
+      }
+
+      // The results tree is partitioned into separate trees according
+      // to the meta.options object that governs the tree. Usually the
+      // number of trees will be approximately one, because options
+      // are shared by entire bundles.
+      addToTree(
+        trees[optionsIndex],
+        meta.module.id,
+        (0, eval)("(" + tree + ")")
+      );
+
+    } else {
+      Object.keys(tree).forEach(function (name) {
+        parts.push(name);
+        walk(tree[name]);
+        parts.pop(name);
+      });
+    }
+  }
+
+  walk(resultsTree);
+
+  trees.forEach(function (tree, i) {
+    meteorInstall(tree, options[i]);
+  });
+}
+
 function addToTree(tree, id, value) {
   var parts = id.split("/");
   var lastIndex = parts.length - 1;

From 7c5f8789edb74a59a858ebd56cdce9c819471a03 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 09:54:05 -0500
Subject: [PATCH 014/195] Enable immutable caching for dynamic modules.

Even though localStorage is a synchronous API, I wrote this code in an
asynchronous style so that we can easily switch to an async API when/if
that becomes preferable.

While localStorage has stricter size limits than IndexedDB, retrieving
data from IndexedDB is unbelievably slow (~10ms for each cache.check
call). When developing locally, that delay pretty much destroys any
benefit from caching.
---
 packages/dynamic-import/README.md  |  4 +-
 packages/dynamic-import/cache.js   | 59 +++++++++++++++++++++
 packages/dynamic-import/client.js  | 82 +++++++++++++++++++++---------
 packages/dynamic-import/package.js |  1 +
 4 files changed, 121 insertions(+), 25 deletions(-)
 create mode 100644 packages/dynamic-import/cache.js

diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
index e7fe7c85ee..0a7dd84cef 100644
--- a/packages/dynamic-import/README.md
+++ b/packages/dynamic-import/README.md
@@ -8,11 +8,11 @@ Remaining work:
 - [x] Modules are minified but not merged in production
   - [x] Wrap modules with function to enable better minification
 - [ ] Babel transform from `import(...)` to `module.importAsync(...)`
-- [ ] Bundle cachability story
+- [x] Local module caching.
 - [x] Compact `previous` state representation
 - [x] Improve dependency resolution in `packages/dynamic-import/server.js`
 - [x] Report static import/syntax/etc. errors for async files
-- [ ] What about old/new versions of code?
+- [x] What about old/new versions of code?
 - [ ] What about package pseudo-globals (imports)?
 - [x] What about dynamic stubs?
 - [x] Avoid creating dynamic files on the server.
diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
new file mode 100644
index 0000000000..7174b78c7d
--- /dev/null
+++ b/packages/dynamic-import/cache.js
@@ -0,0 +1,59 @@
+var PREFIX = "dynamic-import:";
+var ID_PREFIX = PREFIX + "id:";
+var VERSION_PREFIX = PREFIX + "version:";
+var MISSING_ERROR = new Error("version not found");
+var pendingClean = null;
+
+function getItem(key) {
+  var value = Meteor._localStorage.getItem(key);
+  return typeof value === "string"
+    ? Promise.resolve(value)
+    : Promise.reject(MISSING_ERROR);
+}
+
+function setItem(key, value) {
+  Meteor._localStorage.setItem(key, value);
+}
+
+function clean() {
+  clearTimeout(pendingClean);
+  pendingClean = null;
+
+  var activeVersions = Object.create(null);
+  var allVersions = Object.create(null);
+
+  Object.keys(Meteor._localStorage).forEach(function (key) {
+    if (key.startsWith(ID_PREFIX)) {
+      activeVersions[Meteor._localStorage.getItem(key)] = true;
+    } else if (key.startsWith(VERSION_PREFIX)) {
+      var version = key.slice(VERSION_PREFIX.length);
+      allVersions[version] = key;
+    }
+  });
+
+  Object.keys(allVersions).forEach(function (version) {
+    if (activeVersions[version] !== true) {
+      Meteor._localStorage.removeItem(allVersions[version]);
+    }
+  });
+}
+
+exports.check = function check(id, currentVersion) {
+  return getItem(ID_PREFIX + id).then(function (previousVersion) {
+    if (currentVersion === previousVersion) {
+      return getItem(VERSION_PREFIX + previousVersion);
+    }
+    throw MISSING_ERROR;
+  });
+};
+
+exports.set = function set(id, version, value) {
+  if (! pendingClean) {
+    pendingClean = setTimeout(clean, 1000);
+  }
+
+  return Promise.all([
+    setItem(VERSION_PREFIX + version, value),
+    setItem(ID_PREFIX + id, version)
+  ]);
+};
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index e1bb39a548..215e6de197 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -1,6 +1,7 @@
 var Module = module.constructor;
 var delayPromise = Promise.resolve();
 var requireMeta = meteorInstall._requireMeta;
+var cache = require("./cache.js");
 
 Module.prototype.dynamicImport = function (id) {
   // The real (not meta) parent module.
@@ -11,42 +12,74 @@ Module.prototype.dynamicImport = function (id) {
   }
 
   return delayPromise.then(get).catch(function (error) {
+    var message = error.message;
+    if (! (message &&
+           message.startsWith("Cannot find module"))) {
+      throw error;
+    }
+
     // Require the current module from the complete meta graph.
     var meta = requireMeta(module.id);
-    var missingTree = Object.create(null);
+    var missingTree;
+    var localTree;
 
     function walk(meta) {
-      if (meta.dynamic && ! meta.pending) {
-        meta.pending = true;
-        addToTree(missingTree, meta.module.id, 1);
-        meta.eachChild(walkChild);
+      if (meta.dynamic) {
+        return meta.pending || (meta.pending = add(
+          meta.module.id,
+          meta.version
+        ).then(function () {
+          return allChildren(meta, walkChild);
+        }));
       }
     }
 
-    function walkChild(childModule) {
-      walk(childModule.exports);
+    function add(id, version) {
+      return cache.check(id, version).then(function (code) {
+        addToTree(localTree = localTree || Object.create(null), id, code);
+      }, function (missing) {
+        addToTree(missingTree = missingTree || Object.create(null), id, 1);
+      });
     }
 
-    // The meta.eachChild iteration includes all child modules imported by
-    // meta.module, not just the child explicitly required here, so that
-    // implicit modules like package.json will be included too. See
-    // meteor/packages/modules-runtime/meteor-install.js for the
-    // definition of meta.eachChild.
-    meta.eachChild(walkChild, [id]);
+    function walkChild(childModule) {
+      return walk(childModule.exports);
+    }
 
-    return new Promise(function (resolve, reject) {
-      Meteor.call(
-        "__dynamicImport",
-        missingTree,
-        function (error, resultsTree) {
-          error ? reject(error) : resolve(resultsTree);
-        }
-      );
-
-    }).then(installResults).then(get);
+    return allChildren(meta, walkChild, [id]).then(function () {
+      if (localTree) {
+        installResults(localTree);
+      }
+      return missingTree && fetchMissing(missingTree);
+    }).then(get);
   });
 };
 
+// The allChildren iteration includes all child modules imported by
+// meta.module, not just the child explicitly required here, so that
+// implicit modules like package.json will be included too.
+function allChildren(meta, callback, idsToRequire) {
+  var results = [];
+  // See meteor/packages/modules-runtime/meteor-install.js for the
+  // definition of meta.eachChild.
+  meta.eachChild(function (child) {
+    results.push(callback(child));
+  }, idsToRequire);
+  return Promise.all(results);
+}
+
+function fetchMissing(missingTree) {
+  return new Promise(function (resolve, reject) {
+    Meteor.call(
+      "__dynamicImport",
+      missingTree,
+      function (error, resultsTree) {
+        error ? reject(error) : resolve(resultsTree);
+      }
+    );
+  }).then(installResults);
+}
+
 function installResults(resultsTree) {
   var parts = [""];
   var trees = [];
@@ -71,6 +104,9 @@ function installResults(resultsTree) {
         (0, eval)("(" + tree + ")")
       );
 
+      // Intentionally do not delay resolution waiting for the cache.
+      cache.set(meta.module.id, meta.version, tree);
+
     } else {
       Object.keys(tree).forEach(function (name) {
         parts.push(name);
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index bb86dedac1..5707f6e314 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -7,6 +7,7 @@ Package.describe({
 
 Package.onUse(function (api) {
   api.use("modules");
+  api.use("localstorage");
   api.use("ecmascript", "server");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");

From 0c5f6ae7b1134d385cd78eaf80b54a3494f389c2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 18:16:28 -0500
Subject: [PATCH 015/195] Upgrade `reify` npm package to version 0.4.7.

---
 History.md                                    |  2 ++
 .../modules/.npm/package/npm-shrinkwrap.json  | 28 +++++++++----------
 packages/modules/package.js                   |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/History.md b/History.md
index 998df42b36..ce2269b861 100644
--- a/History.md
+++ b/History.md
@@ -17,6 +17,8 @@
   fixing [#8021](https://github.com/meteor/meteor/issues/8021) and
   [#7662](https://github.com/meteor/meteor/issues/7662).
 
+* The `reify` npm package has been upgraded to 0.4.7.
+
 * Added support for frame-ancestors CSP option in browser-policy.
   [#7970](https://github.com/meteor/meteor/pull/7970)
   
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index eff3d98216..a83c8e4619 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -1,29 +1,29 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-      "from": "acorn@>=3.3.0 <3.4.0"
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.9.tgz",
+      "from": "acorn@>=4.0.5 <4.1.0"
     },
     "acorn-es7-plugin": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.3.tgz",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.5.tgz",
       "from": "acorn-es7-plugin@>=1.1.0 <1.2.0"
     },
     "ast-types": {
-      "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"
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz",
+      "from": "ast-types@>=0.9.5 <0.10.0"
     },
     "magic-string": {
-      "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"
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.0.tgz",
+      "from": "magic-string@>=0.19.0 <0.20.0"
     },
     "reify": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.4.tgz",
-      "from": "reify@0.4.4"
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.7.tgz",
+      "from": "reify@0.4.7"
     },
     "vlq": {
       "version": "0.2.1",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index a50d1c5754..42975e262f 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.4.4"
+  reify: "0.4.7"
 });
 
 Package.onUse(function(api) {

From 7adac542244a5f9f8842c88d17f9a909a95ed019 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 18:14:42 -0500
Subject: [PATCH 016/195] Upgrade the `meteor-babel` npm package to version
 0.15.1.

---
 History.md                                    |   2 +-
 .../.npm/package/npm-shrinkwrap.json          | 390 +++++++++---------
 packages/babel-compiler/package.js            |   4 +-
 packages/dynamic-import/README.md             |   2 +-
 scripts/dev-bundle-tool-package.js            |   2 +-
 5 files changed, 205 insertions(+), 195 deletions(-)

diff --git a/History.md b/History.md
index ce2269b861..88247f7ef6 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.3,
+* The `meteor-babel` npm package has been upgraded to version 0.15.1,
   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 21ecc62663..61fb5960cc 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -1,18 +1,18 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-      "from": "acorn@>=3.3.0 <3.4.0"
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.9.tgz",
+      "from": "acorn@>=4.0.5 <4.1.0"
     },
     "acorn-es7-plugin": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.3.tgz",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.5.tgz",
       "from": "acorn-es7-plugin@>=1.1.0 <1.2.0"
     },
     "ansi-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "from": "ansi-regex@>=2.0.0 <3.0.0"
     },
     "ansi-styles": {
@@ -21,84 +21,84 @@
       "from": "ansi-styles@>=2.2.1 <3.0.0"
     },
     "ast-types": {
-      "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"
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz",
+      "from": "ast-types@>=0.9.5 <0.10.0"
     },
     "babel-code-frame": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+      "from": "babel-code-frame@>=6.22.0 <7.0.0"
     },
     "babel-core": {
-      "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"
+      "version": "6.22.1",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.22.1.tgz",
+      "from": "babel-core@>=6.22.1 <7.0.0"
     },
     "babel-generator": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.22.0.tgz",
+      "from": "babel-generator@>=6.22.0 <7.0.0"
     },
     "babel-helper-builder-react-jsx": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.22.0.tgz",
+      "from": "babel-helper-builder-react-jsx@>=6.22.0 <7.0.0"
     },
     "babel-helper-call-delegate": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz",
+      "from": "babel-helper-call-delegate@>=6.22.0 <7.0.0"
     },
     "babel-helper-define-map": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.22.0.tgz",
+      "from": "babel-helper-define-map@>=6.22.0 <7.0.0"
     },
     "babel-helper-function-name": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.22.0.tgz",
+      "from": "babel-helper-function-name@>=6.22.0 <7.0.0"
     },
     "babel-helper-get-function-arity": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz",
+      "from": "babel-helper-get-function-arity@>=6.22.0 <7.0.0"
     },
     "babel-helper-hoist-variables": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz",
+      "from": "babel-helper-hoist-variables@>=6.22.0 <7.0.0"
     },
     "babel-helper-optimise-call-expression": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.22.0.tgz",
+      "from": "babel-helper-optimise-call-expression@>=6.22.0 <7.0.0"
     },
     "babel-helper-regex": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz",
+      "from": "babel-helper-regex@>=6.22.0 <7.0.0"
     },
     "babel-helper-replace-supers": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.22.0.tgz",
+      "from": "babel-helper-replace-supers@>=6.22.0 <7.0.0"
     },
     "babel-helpers": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.22.0.tgz",
+      "from": "babel-helpers@>=6.22.0 <7.0.0"
     },
     "babel-messages": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz",
-      "from": "babel-messages@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.22.0.tgz",
+      "from": "babel-messages@>=6.22.0 <7.0.0"
     },
     "babel-plugin-check-es2015-constants": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz",
-      "from": "babel-plugin-check-es2015-constants@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "from": "babel-plugin-check-es2015-constants@>=6.22.0 <7.0.0"
     },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
@@ -110,10 +110,15 @@
       "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-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "from": "babel-plugin-syntax-dynamic-import@>=6.18.0 <7.0.0"
+    },
     "babel-plugin-syntax-flow": {
       "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"
+      "from": "babel-plugin-syntax-flow@>=6.18.0 <7.0.0"
     },
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0",
@@ -126,184 +131,184 @@
       "from": "babel-plugin-syntax-object-rest-spread@>=6.13.0 <7.0.0"
     },
     "babel-plugin-syntax-trailing-function-commas": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "from": "babel-plugin-syntax-trailing-function-commas@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-arrow-functions@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-arrow-functions@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-block-scoping": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-block-scoping@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-classes": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-classes@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-computed-properties@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-computed-properties@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-destructuring": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-destructuring@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-for-of": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-for-of@>=6.22.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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-object-super": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-object-super@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-object-super@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-parameters": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-parameters@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-spread": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-spread@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-spread@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-sticky-regex@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-sticky-regex@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-template-literals@>=6.8.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.22.0 <7.0.0"
     },
     "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.11.0 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz",
+      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.22.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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es3-property-literals/-/babel-plugin-transform-es3-property-literals-6.22.0.tgz",
+      "from": "babel-plugin-transform-es3-property-literals@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-flow-strip-types": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "from": "babel-plugin-transform-flow-strip-types@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-object-rest-spread": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz",
+      "from": "babel-plugin-transform-object-rest-spread@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-react-display-name": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.8.0.tgz",
-      "from": "babel-plugin-transform-react-display-name@>=6.3.13 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.22.0.tgz",
+      "from": "babel-plugin-transform-react-display-name@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-react-jsx": {
-      "version": "6.8.0",
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz",
+      "from": "babel-plugin-transform-react-jsx@>=6.22.0 <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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
+      "from": "babel-plugin-transform-react-jsx-self@>=6.22.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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "from": "babel-plugin-transform-react-jsx-source@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-regenerator": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz",
+      "from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0"
     },
     "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 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz",
+      "from": "babel-plugin-transform-runtime@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-strict-mode": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz",
+      "from": "babel-plugin-transform-strict-mode@>=6.22.0 <7.0.0"
     },
     "babel-preset-meteor": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.22.0.tgz",
+      "from": "babel-preset-meteor@6.22.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 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.22.0.tgz",
+      "from": "babel-preset-react@>=6.22.0 <7.0.0"
     },
     "babel-register": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.22.0.tgz",
+      "from": "babel-register@>=6.22.0 <7.0.0"
     },
     "babel-runtime": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz",
+      "from": "babel-runtime@>=6.22.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 <7.0.0"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.22.0.tgz",
+      "from": "babel-template@>=6.22.0 <7.0.0"
     },
     "babel-traverse": {
-      "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"
+      "version": "6.22.1",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.22.1.tgz",
+      "from": "babel-traverse@>=6.22.1 <7.0.0"
     },
     "babel-types": {
-      "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"
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.22.0.tgz",
+      "from": "babel-types@>=6.22.0 <7.0.0"
     },
     "babylon": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.14.1.tgz",
-      "from": "babylon@>=6.13.1 <7.0.0"
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.15.0.tgz",
+      "from": "babylon@>=6.15.0 <7.0.0"
     },
     "balanced-match": {
       "version": "0.4.2",
@@ -336,8 +341,8 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
@@ -381,9 +386,9 @@
       "from": "is-finite@>=1.0.0 <2.0.0"
     },
     "js-tokens": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz",
-      "from": "js-tokens@>=2.0.0 <3.0.0"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+      "from": "js-tokens@>=3.0.0 <4.0.0"
     },
     "jsesc": {
       "version": "1.3.0",
@@ -396,24 +401,24 @@
       "from": "json5@>=0.5.0 <0.6.0"
     },
     "lodash": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
-      "from": "lodash@>=4.16.4 <5.0.0"
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "from": "lodash@>=4.17.4 <5.0.0"
     },
     "loose-envify": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.0.tgz",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "magic-string": {
-      "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"
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.0.tgz",
+      "from": "magic-string@>=0.19.0 <0.20.0"
     },
     "meteor-babel": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.14.3.tgz",
-      "from": "meteor-babel@0.14.3"
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.15.1.tgz",
+      "from": "meteor-babel@0.15.1"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -461,8 +466,8 @@
       "from": "path-is-absolute@>=1.0.0 <2.0.0"
     },
     "private": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
       "from": "private@>=0.1.6 <0.2.0"
     },
     "regenerate": {
@@ -471,9 +476,14 @@
       "from": "regenerate@>=1.2.1 <2.0.0"
     },
     "regenerator-runtime": {
-      "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"
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz",
+      "from": "regenerator-runtime@>=0.10.0 <0.11.0"
+    },
+    "regenerator-transform": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.8.tgz",
+      "from": "regenerator-transform@0.9.8"
     },
     "regexpu-core": {
       "version": "2.0.0",
@@ -498,9 +508,9 @@
       }
     },
     "reify": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.4.tgz",
-      "from": "reify@>=0.4.0 <0.5.0"
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.7.tgz",
+      "from": "reify@>=0.4.7 <0.5.0"
     },
     "repeating": {
       "version": "2.0.1",
@@ -518,8 +528,8 @@
       "from": "source-map@>=0.5.0 <0.6.0"
     },
     "source-map-support": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.11.tgz",
       "from": "source-map-support@>=0.4.2 <0.5.0"
     },
     "strip-ansi": {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 8555ad4923..617402d0a2 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.14.0-rc.1'
+  version: '6.15.0'
 });
 
 Npm.depends({
-  'meteor-babel': '0.14.3'
+  'meteor-babel': '0.15.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
index 0a7dd84cef..b65c33903c 100644
--- a/packages/dynamic-import/README.md
+++ b/packages/dynamic-import/README.md
@@ -7,7 +7,7 @@ Remaining work:
 - [x] Make `import(...)` work on the server
 - [x] Modules are minified but not merged in production
   - [x] Wrap modules with function to enable better minification
-- [ ] Babel transform from `import(...)` to `module.importAsync(...)`
+- [x] Babel transform from `import(...)` to `module.importAsync(...)`
 - [x] Local module caching.
 - [x] Compact `previous` state representation
 - [x] Improve dependency resolution in `packages/dynamic-import/server.js`
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index e737c461bc..269de060c4 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "4.1.2",
     "node-gyp": "3.4.0",
     "node-pre-gyp": "0.6.30",
-    "meteor-babel": "0.14.3",
+    "meteor-babel": "0.15.1",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 8e344a324a58c6529a7bb8dc9b1d358e549ad04d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 20:26:26 -0500
Subject: [PATCH 017/195] Bump LINKER_CACHE_SALT and compiler.BUILT_BY for good
 measure.

---
 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 164fca22c0..96a01c1d9b 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 = 13; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 14; // 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 bca69ccf4b..c00f588617 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/26';
+compiler.BUILT_BY = 'meteor/27';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From d26c554bce815046796a22421bc529cf535fee58 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Feb 2017 20:00:08 -0500
Subject: [PATCH 018/195] Bump $BUNDLE_VERSION to 4.8.0 before rebuilding dev
 bundle.

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

diff --git a/meteor b/meteor
index 4c6f1a5d23..61dcd6d9b9 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.7.8
+BUNDLE_VERSION=4.8.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 5ff0f4f98702f059684d4fef04c234bbd62e2675 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Feb 2017 18:54:40 -0500
Subject: [PATCH 019/195] Fix test failures by re-anonymizing module wrapper
 functions.

---
 tools/isobuild/bundler.js | 22 ++++++++++++++++++++++
 tools/isobuild/linker.js  |  7 +------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index a41f9e8bc8..3c986f085b 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1178,8 +1178,25 @@ class Target {
 
     this.js.forEach(file => {
       const jsf = new JsFile(file, { arch: this.arch });
+
       if (file.targetPath.startsWith("dynamic/")) {
+        // Make sure file._hash is cached.
+        file.hash();
+
+        // Dynamic files consist of a single anonymous function
+        // expression, which some minifiers (e.g. UglifyJS) either fail to
+        // parse or mistakenly eliminate as dead code. To avoid these
+        // problems, we temporarily name the function __minifyJs.
+        file._contents = new Buffer(
+          file.contents()
+            .toString("utf8")
+            .replace(/^\s*function\s*\(/,
+                     "function __minifyJs("),
+          "utf8"
+        );
+
         dynamicFiles.push(jsf);
+
       } else {
         staticFiles.push(jsf);
       }
@@ -1204,6 +1221,11 @@ class Target {
 
     function handle(source, dynamic) {
       const newFiles = source._minifiedFiles.map(file => {
+        // Remove the function name __minifyJs that was added above.
+        file.data = file.data
+          .replace(/^\s*function\s+__minifyJs\s*\(/,
+                   "function(");
+
         const newFile = new File({
           info: 'minified js',
           data: new Buffer(file.data, 'utf8'),
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index d1721d053b..84597aee8a 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -585,12 +585,7 @@ _.extend(File.prototype, {
 
   _getClosureHeader() {
     if (this._useMeteorInstall()) {
-      // The wrapper function is named "module" so that the UglifyJS
-      // minifier will parse it as a function declaration, because
-      // UglifyJS has trouble parsing single function expressions. If the
-      // module refers to `module`, however, it will be referring to the
-      // parameter of that name, rather than the function name.
-      const headerParts = ["function module("];
+      const headerParts = ["function("];
 
       if (this.source.match(/\b__dirname\b/)) {
         headerParts.push("require,exports,module,__filename,__dirname");

From c3f9ec403273f736bcb2b3b9b7a21aca29687125 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Feb 2017 16:43:09 -0500
Subject: [PATCH 020/195] Bump package versions for 1.5-beta.0 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 617402d0a2..fdaf4bb914 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.15.0'
+  version: '6.15.0-beta.0'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 5707f6e314..4b7d3fe938 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.0.1",
+  version: "0.1.0-beta.0",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 744d9eee5f..921f0d1968 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.1.0"
+  version: "1.1.0-beta.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 9d0908b330..f98342660b 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-rc.1'
+  version: '1.5.0-beta.0'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 6480d94ca8..7f76b2512e 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.9-rc.1",
+  version: "0.8.0-beta.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 42975e262f..f289eb1cb9 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.7.8-rc.1",
+  version: "0.8.0-beta.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index f17a300954..4f6e7a5af1 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-rc.1",
+ "version": "1.5-beta.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4baa5a44dc79ecf2ac0a66d7c6fbcc62d2a4ea34 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Feb 2017 20:06:10 -0500
Subject: [PATCH 021/195] Allow file.data to be a Buffer in Target#minifyJs.

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

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 3c986f085b..e38644b395 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1223,6 +1223,7 @@ class Target {
       const newFiles = source._minifiedFiles.map(file => {
         // Remove the function name __minifyJs that was added above.
         file.data = file.data
+          .toString("utf8")
           .replace(/^\s*function\s+__minifyJs\s*\(/,
                    "function(");
 

From 2f3aba96f37ff5787bdc3d24e72e9738d09a682a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Feb 2017 20:07:36 -0500
Subject: [PATCH 022/195] Bump package versions for 1.5-beta.1 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index fdaf4bb914..27ccd2dc40 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.15.0-beta.0'
+  version: '6.15.0-beta.1'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 4b7d3fe938..949c91b381 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.0",
+  version: "0.1.0-beta.1",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 921f0d1968..2e4fcfaa82 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.1.0-beta.0"
+  version: "1.1.0-beta.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index f98342660b..eb8c5a09c2 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.5.0-beta.0'
+  version: '1.5.0-beta.1'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 7f76b2512e..b1366f61ea 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.0",
+  version: "0.8.0-beta.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 f289eb1cb9..72457822f8 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.0",
+  version: "0.8.0-beta.1",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 4f6e7a5af1..6e8c314880 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.0",
+ "version": "1.5-beta.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 2537707cb39a8400f56452a08e367ee7ade5bbe2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Feb 2017 20:25:30 -0500
Subject: [PATCH 023/195] Disable optimistic caching for `meteor --get-ready`
 on Circle CI.

We (@abernix and I) suspect the intermittent "died unexpectedly" failures
of `meteor --get-ready` on Circle CI are due to hitting their (low) limit
on the maximum number of open files.

Although optimistic caching speeds up rebuilds considerably, it doesn't do
much for initial builds, and it definitely keeps more files open.
Disabling it here seems worth a try.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 79e5e7ef8dbf623cfb002375d07164acef10be8f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Feb 2017 12:39:01 -0500
Subject: [PATCH 024/195] Bump package versions for 1.5-beta.2 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 27ccd2dc40..aa4ab2aabf 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.15.0-beta.1'
+  version: '6.15.0-beta.2'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 949c91b381..f73c48f559 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.1",
+  version: "0.1.0-beta.2",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 37a041d709..3228bdbfcb 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.6.2-rc.1',
+  version: '0.7.0-beta.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 2e4fcfaa82..fde3497f03 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.1.0-beta.1"
+  version: "1.1.0-beta.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index eb8c5a09c2..f9e3388d25 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.5.0-beta.1'
+  version: '1.5.0-beta.2'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index b1366f61ea..a720232ec4 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.1",
+  version: "0.8.0-beta.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 72457822f8..20ed0a418d 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.1",
+  version: "0.8.0-beta.2",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 6e8c314880..7999cac923 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.1",
+ "version": "1.5-beta.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 9b016bd28d14ee762f1be87d6fb82948cf914c2e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Feb 2017 18:34:19 -0500
Subject: [PATCH 025/195] Rename `modules` to `real` in
 modules-runtime/meteor-install.js.

I think `real` is a better antonym for `meta`, and I appreciate that
`real` and `meta` are both four letters long.
---
 packages/modules-runtime/meteor-install.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
index e03c82412b..5798590ac6 100644
--- a/packages/modules-runtime/meteor-install.js
+++ b/packages/modules-runtime/meteor-install.js
@@ -9,10 +9,10 @@ var metaInstall = makeInstaller({
 meteorInstall = function (tree, options) {
   if (isObject(tree)) {
     var meta = Object.create(null);
-    var modules = Object.create(null);
-    walk(options, tree, meta, modules);
+    var real = Object.create(null);
+    walk(options, tree, meta, real);
     metaInstall(meta, options);
-    return install(modules, options);
+    return install(real, options);
   }
 
   return install();
@@ -30,11 +30,11 @@ function getOrSet(obj, name) {
   return obj[name] = obj[name] || Object.create(null);
 }
 
-function walk(options, input, meta, modules) {
+function walk(options, input, meta, real) {
   Object.keys(input).forEach(function (name) {
     var value = input[name];
 
-    if (tryChild(value, name, meta, modules, options)) {
+    if (tryChild(value, name, meta, real, options)) {
       // If the value was a leaf node that we were able to handle, then we
       // don't need to (and can't) keep walking it.
       return;
@@ -45,7 +45,7 @@ function walk(options, input, meta, modules) {
         options,
         value,
         getOrSet(meta, name),
-        getOrSet(modules, name)
+        getOrSet(real, name)
       );
     }
   });
@@ -53,11 +53,11 @@ function walk(options, input, meta, modules) {
   return this;
 }
 
-function tryChild(value, name, meta, modules, options) {
+function tryChild(value, name, meta, real, options) {
   function tryFunc(value) {
     if (typeof value === "function") {
       meta[name] = makeMetaFunc({}, false, options);
-      modules[name] = value;
+      real[name] = value;
       return true;
     }
   }
@@ -68,7 +68,7 @@ function tryChild(value, name, meta, modules, options) {
       // brackets. When we find one of these objects, we install it in the
       // meta graph, but not in the installed modules graph. Later, this
       // information may be used to fetch dynamic modules from the server,
-      // which will then be installed into the modules graph.
+      // which will then be installed into the real graph.
       if (isObject(value)) {
         meta[name] = makeMetaFunc(value, true, options);
         return true;
@@ -91,10 +91,10 @@ function tryChild(value, name, meta, modules, options) {
 
   // The install.js library supports a notion of aliases, represented by
   // module identifier strings. This functionality works the same way in
-  // both the meta graph and the modules graph.
+  // both the meta graph and the real graph.
   if (typeof value === "string") {
     meta[name] = value;
-    modules[name] = value;
+    real[name] = value;
     return true;
   }
 }

From cf3744f62427cb9735703ade75d34f849e47e536 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Feb 2017 18:34:27 -0500
Subject: [PATCH 026/195] Copy "main" and "browser" from non-dynamic
 package.json files.

Fixes the first problem reported by @klaussner in this comment:
https://github.com/meteor/meteor/pull/8327#issuecomment-278491257
---
 packages/modules-runtime/meteor-install.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
index 5798590ac6..ae9f6ca33c 100644
--- a/packages/modules-runtime/meteor-install.js
+++ b/packages/modules-runtime/meteor-install.js
@@ -99,10 +99,27 @@ function tryChild(value, name, meta, real, options) {
   }
 }
 
+var requireReal = install();
+
 function makeMetaFunc(value, dynamic, options) {
   return function (require, exports, module) {
     Object.assign(exports, value);
 
+    if (! dynamic &&
+        module.id.endsWith("/package.json")) {
+      // If the package.json file is not dynamic, require it from the real
+      // graph to read its "main" and "browser" properties.
+      var pkg = requireReal(module.id);
+
+      if (typeof pkg.main === "string") {
+        exports.main = pkg.main;
+      }
+
+      if (typeof pkg.browser === "string") {
+        exports.browser = pkg.browser;
+      }
+    }
+
     exports.module = module;
     exports.dynamic = !! dynamic;
     exports.options = options;

From e469eeec0537bd1f019a0d3cf242013830379c84 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Feb 2017 19:25:10 -0500
Subject: [PATCH 027/195] Fix tests by adding //# sourceMappingURL= only to
 dynamic files.

Also, the regular expression for removing existing source map comments now
matches only if the comment starts at the beginning of a line, following
previous behavior more closely.

To get this exactly right, we would need to tokenize the source to avoid
matching comments in string literals, for example, but that's hard because
this logic needs to work for multiple file types, not just JavaScript.
---
 tools/isobuild/bundler.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 50d1a81847..c98f506d5a 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1530,13 +1530,15 @@ class ClientTarget extends Target {
       manifestItem.size = file.size();
       manifestItem.hash = file.hash();
 
-      writeFile(file, {
-        sourceMapUrl: manifestItem.sourceMapUrl,
-      }, builder);
-
       if (! file.targetPath.startsWith("dynamic/")) {
+        writeFile(file, builder);
         manifest.push(manifestItem);
-      } else if (file.sourceMap) {
+
+      } else if (manifestItem.sourceMapUrl) {
+        writeFile(file, builder, {
+          sourceMapUrl: manifestItem.sourceMapUrl,
+        });
+
         // If the file is dynamic, we don't need/want the file itself to
         // be served by the web server, but we do want its source map (if
         // defined) to be accessible via HTTP, so that we can refer to it
@@ -2397,7 +2399,7 @@ class ServerTarget extends JsImageTarget {
   ServerTarget.prototype[method] = Profile(`ServerTarget#${method}`, ServerTarget.prototype[method]);
 });
 
-var writeFile = Profile("bundler writeFile", function (file, options, builder) {
+var writeFile = Profile("bundler writeFile", function (file, builder, options) {
   if (! file.targetPath) {
     throw new Error("No targetPath?");
   }
@@ -2413,7 +2415,7 @@ var writeFile = Profile("bundler writeFile", function (file, options, builder) {
   let data = file.contents();
   const hash = file.hash();
 
-  if (options.sourceMapUrl) {
+  if (options && options.sourceMapUrl) {
     data = new Buffer(
       addSourceMappingURL(data, options.sourceMapUrl),
       "utf8"
@@ -2430,7 +2432,7 @@ function addSourceMappingURL(data, url) {
     // If data is a Buffer, convert it to a string.
     .toString("utf8")
     // Remove any existing source map comments.
-    .replace(/\/\/# sourceMappingURL=[^\n]+/g, '//');
+    .replace(/\n\/\/# sourceMappingURL=[^\n]+/g, "");
   // Append the new source map comment to the end of the code.
   return dataString + "\n//# sourceMappingURL=" + url + "\n";
 }

From 1bbe7b677070554ce4085c1f8aca9b8cdd3569da Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Feb 2017 19:44:23 -0500
Subject: [PATCH 028/195] Bump package versions for 1.5-beta.3 release.

https://github.com/meteor/meteor/releases/tag/release%2FMETEOR%401.5-beta.3
---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index aa4ab2aabf..e20256dd05 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.15.0-beta.2'
+  version: '6.15.0-beta.3'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index f73c48f559..66e55b04c4 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.2",
+  version: "0.1.0-beta.3",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 3228bdbfcb..10572f80d8 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.2',
+  version: '0.7.0-beta.3',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index fde3497f03..f7195b35f9 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.1.0-beta.2"
+  version: "1.1.0-beta.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index f9e3388d25..667c8808fe 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.5.0-beta.2'
+  version: '1.5.0-beta.3'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index a720232ec4..b3a8e383d2 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.2",
+  version: "0.8.0-beta.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 20ed0a418d..7a33d75c4e 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.2",
+  version: "0.8.0-beta.3",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 7999cac923..41d34df469 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.2",
+ "version": "1.5-beta.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 51c9f5e16cbb4b1a2597a8f7febcfb0447eed3fa Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 10:19:02 -0500
Subject: [PATCH 029/195] Use Meteor._localStorage only in production mode.

https://github.com/meteor/meteor/pull/8327#issuecomment-278660587
---
 packages/dynamic-import/cache.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 7174b78c7d..e957998806 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -1,14 +1,18 @@
 var PREFIX = "dynamic-import:";
 var ID_PREFIX = PREFIX + "id:";
 var VERSION_PREFIX = PREFIX + "version:";
+var RESOLVED = Promise.resolve();
 var MISSING_ERROR = new Error("version not found");
+var MISSING = Promise.reject(MISSING_ERROR);
+// Silence uncaught rejection warnings.
+MISSING.catch(function(){});
 var pendingClean = null;
 
 function getItem(key) {
   var value = Meteor._localStorage.getItem(key);
   return typeof value === "string"
     ? Promise.resolve(value)
-    : Promise.reject(MISSING_ERROR);
+    : MISSING;
 }
 
 function setItem(key, value) {
@@ -39,15 +43,22 @@ function clean() {
 }
 
 exports.check = function check(id, currentVersion) {
+  if (! Meteor.isProduction) {
+    return MISSING;
+  }
+
   return getItem(ID_PREFIX + id).then(function (previousVersion) {
-    if (currentVersion === previousVersion) {
-      return getItem(VERSION_PREFIX + previousVersion);
-    }
-    throw MISSING_ERROR;
+    return currentVersion === previousVersion
+      ? getItem(VERSION_PREFIX + previousVersion)
+      : MISSING;
   });
 };
 
 exports.set = function set(id, version, value) {
+  if (! Meteor.isProduction) {
+    return RESOLVED;
+  }
+
   if (! pendingClean) {
     pendingClean = setTimeout(clean, 1000);
   }

From f5ae115c10f99668282bf678f5288be37dbb33a0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 10:19:49 -0500
Subject: [PATCH 030/195] Don't forget to write dynamic files without source
 maps.

---
 tools/isobuild/bundler.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index c98f506d5a..405e6b8c4c 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1552,6 +1552,9 @@ class ClientTarget extends Target {
           cacheable: manifestItem.cacheable,
           hash: manifestItem.hash,
         });
+
+      } else {
+        writeFile(file, builder);
       }
     });
 

From 696b8d4b3c26fc2f2995a90cc93e4e4cc86f9efc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 10:20:28 -0500
Subject: [PATCH 031/195] Fix Buffer conversion logic in writeFile.

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

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 405e6b8c4c..722d5073a6 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -2419,10 +2419,11 @@ var writeFile = Profile("bundler writeFile", function (file, builder, options) {
   const hash = file.hash();
 
   if (options && options.sourceMapUrl) {
-    data = new Buffer(
-      addSourceMappingURL(data, options.sourceMapUrl),
-      "utf8"
-    );
+    data = addSourceMappingURL(data, options.sourceMapUrl);
+  }
+
+  if (! Buffer.isBuffer(data)) {
+    data = new Buffer(data, "utf8");
   }
 
   builder.write(file.targetPath, { data, hash });

From 1b7ceab6d560c57b9c81bd2bd6167aed276ca940 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 10:24:49 -0500
Subject: [PATCH 032/195] Bump package versions for 1.5-beta.4 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index e20256dd05..0d1befc136 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.15.0-beta.3'
+  version: '6.15.0-beta.4'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 66e55b04c4..853e9353b6 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.3",
+  version: "0.1.0-beta.4",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 10572f80d8..24b8dd433d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.3',
+  version: '0.7.0-beta.4',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index f7195b35f9..1f9b6b2c2a 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.1.0-beta.3"
+  version: "1.1.0-beta.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 667c8808fe..53e4ad42f1 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.5.0-beta.3'
+  version: '1.5.0-beta.4'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index b3a8e383d2..cb96b432a0 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.3",
+  version: "0.8.0-beta.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 7a33d75c4e..c0e9a131da 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.3",
+  version: "0.8.0-beta.4",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 41d34df469..c647a97bba 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.3",
+ "version": "1.5-beta.4",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From cf71259080df736ca9f54111145a8b0d7b252578 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 11:55:42 -0500
Subject: [PATCH 033/195] Overwrite implicit modules only if they are
 package.json files.

Implicit empty stub CSS modules added in addStylesheet in
compiler-plugin.js were being overwritten with actual CSS module code,
thanks to logic intended to support replacing package.json stubs with
their actual contents.

The meaning of "implicit" is somewhat overloaded: for package.json
modules, it means the module is a minimal stub (just the "name",
"version", and "main"/"browser" fields) that should be replaced if ever
explicitly imported. For empty stub CSS modules, it means the module
should yield to any actual modules added via addJavaScript.
---
 tools/isobuild/import-scanner.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index bf90b66711..168cefac74 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -562,9 +562,11 @@ export default class ImportScanner {
 
       let depFile = this._getFile(absImportedPath);
       if (depFile) {
-        // If the module was imported implicitly before, update to the
+        // If the module is an implicit package.json stub, update to the
         // explicit version now.
-        if (depFile.implicit === true) {
+        if (depFile.jsonData &&
+            depFile.installPath.endsWith("/package.json") &&
+            depFile.implicit === true) {
           const file = this._readModule(absImportedPath);
           if (file) {
             depFile.implicit = false;

From 4784b77c9ed1567aa47a557960c24fb358d43f0a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 13:18:42 -0500
Subject: [PATCH 034/195] Make sure dynamic-import package has Promise
 polyfill.

I might not have noticed this, except that PhantomJS still does not
provide a native Promise constructor.
---
 packages/dynamic-import/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 853e9353b6..e356459550 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -8,6 +8,7 @@ Package.describe({
 Package.onUse(function (api) {
   api.use("modules");
   api.use("localstorage");
+  api.use("promise");
   api.use("ecmascript", "server");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");

From d0aa53cef9c111899daf4b0c83ab61172930b68f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 13:19:47 -0500
Subject: [PATCH 035/195] Basic test harness for dynamic imports.

---
 tools/tests/apps/dynamic-import/.gitignore    |  1 +
 .../.meteor/.finished-upgraders               | 15 ++++
 .../apps/dynamic-import/.meteor/.gitignore    |  1 +
 tools/tests/apps/dynamic-import/.meteor/.id   |  7 ++
 .../apps/dynamic-import/.meteor/packages      | 25 ++++++
 .../apps/dynamic-import/.meteor/platforms     |  2 +
 .../tests/apps/dynamic-import/.meteor/release |  1 +
 .../tests/apps/dynamic-import/imports/date.js |  2 +
 .../apps/dynamic-import/imports/mutual-a.js   |  6 ++
 .../apps/dynamic-import/imports/mutual-b.js   |  6 ++
 tools/tests/apps/dynamic-import/package.json  | 17 +++++
 tools/tests/apps/dynamic-import/tests.js      | 76 +++++++++++++++++++
 tools/tests/dynamic-import.js                 | 32 ++++++++
 13 files changed, 191 insertions(+)
 create mode 100644 tools/tests/apps/dynamic-import/.gitignore
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/.finished-upgraders
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/.gitignore
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/.id
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/packages
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/platforms
 create mode 100644 tools/tests/apps/dynamic-import/.meteor/release
 create mode 100644 tools/tests/apps/dynamic-import/imports/date.js
 create mode 100644 tools/tests/apps/dynamic-import/imports/mutual-a.js
 create mode 100644 tools/tests/apps/dynamic-import/imports/mutual-b.js
 create mode 100644 tools/tests/apps/dynamic-import/package.json
 create mode 100644 tools/tests/apps/dynamic-import/tests.js
 create mode 100644 tools/tests/dynamic-import.js

diff --git a/tools/tests/apps/dynamic-import/.gitignore b/tools/tests/apps/dynamic-import/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders b/tools/tests/apps/dynamic-import/.meteor/.finished-upgraders
new file mode 100644
index 0000000000..aa607041da
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.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/dynamic-import/.meteor/.gitignore b/tools/tests/apps/dynamic-import/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/tools/tests/apps/dynamic-import/.meteor/.id b/tools/tests/apps/dynamic-import/.meteor/.id
new file mode 100644
index 0000000000..d7d6ade371
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.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
+
+1ue5kcr1q6a4v2o7ro4
diff --git a/tools/tests/apps/dynamic-import/.meteor/packages b/tools/tests/apps/dynamic-import/.meteor/packages
new file mode 100644
index 0000000000..0c9f41f8e4
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.meteor/packages
@@ -0,0 +1,25 @@
+# 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@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
+
+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)
+dynamic-import
+dispatch:mocha-phantomjs
+dispatch:mocha-browser
diff --git a/tools/tests/apps/dynamic-import/.meteor/platforms b/tools/tests/apps/dynamic-import/.meteor/platforms
new file mode 100644
index 0000000000..efeba1b50c
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/tools/tests/apps/dynamic-import/.meteor/release b/tools/tests/apps/dynamic-import/.meteor/release
new file mode 100644
index 0000000000..621e94f0ec
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/.meteor/release
@@ -0,0 +1 @@
+none
diff --git a/tools/tests/apps/dynamic-import/imports/date.js b/tools/tests/apps/dynamic-import/imports/date.js
new file mode 100644
index 0000000000..c95bcb1446
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/date.js
@@ -0,0 +1,2 @@
+import moment from "moment";
+export { moment };
diff --git a/tools/tests/apps/dynamic-import/imports/mutual-a.js b/tools/tests/apps/dynamic-import/imports/mutual-a.js
new file mode 100644
index 0000000000..8ea482c7e4
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/mutual-a.js
@@ -0,0 +1,6 @@
+import { strictEqual } from "assert";
+export const name = module.id;
+export const promise = import("./mutual-b").then(b => {
+  strictEqual(b.name, "/imports/mutual-b.js");
+  return b;
+});
diff --git a/tools/tests/apps/dynamic-import/imports/mutual-b.js b/tools/tests/apps/dynamic-import/imports/mutual-b.js
new file mode 100644
index 0000000000..d8d46bff10
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/mutual-b.js
@@ -0,0 +1,6 @@
+import { strictEqual } from "assert";
+export const name = module.id;
+export const promise = import("./mutual-a").then(a => {
+  strictEqual(a.name, "/imports/mutual-a.js");
+  return a;
+});
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
new file mode 100644
index 0000000000..1a6a568e7c
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "dynamic-import",
+  "private": true,
+  "scripts": {
+    "start": "meteor run",
+    "test": "meteor test --full-app --driver-package dispatch:mocha-browser"
+  },
+  "dependencies": {
+    "acorn": "^4.0.11",
+    "arson": "^0.2.3",
+    "babel-runtime": "^6.20.0",
+    "meteor-node-stubs": "~0.2.4",
+    "moment": "^2.17.1",
+    "private": "^0.1.7",
+    "react": "^15.4.2"
+  }
+}
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
new file mode 100644
index 0000000000..fbc0ff499d
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -0,0 +1,76 @@
+import assert from "assert";
+
+describe("dynamic import(...)", function () {
+  it("import same module both statically and dynamically", function () {
+    import moment from "moment";
+    return import("./imports/date").then(date => {
+      assert.strictEqual(date.moment, moment);
+    });
+  });
+
+  it("import builtin stub dynamically", function () {
+    const stubId = "console";
+    let missing = false;
+
+    try {
+      require(stubId);
+    } catch (e) {
+      missing = true;
+    }
+
+    if (Meteor.isClient) {
+      assert.strictEqual(missing, true);
+    }
+
+    return import("console").then(console => {
+      assert.deepEqual(console, require(stubId));
+      assert.strictEqual(typeof console.log, "function");
+    });
+  });
+
+  it("static package.json, static package", function () {
+    import { name } from "acorn/package.json";
+    import acorn from "acorn";
+    assert.strictEqual(name, "acorn");
+    assert.strictEqual(typeof acorn.parse, "function");
+  });
+
+  it("static package.json, dynamic package", function () {
+    import { name } from "private/package.json";
+    return import("private").then(priv => {
+      assert.strictEqual(name, "private");
+      assert.strictEqual(typeof priv.makeAccessor, "function");
+      assert.deepEqual(priv, require("pri" + "vate"));
+    });
+  });
+
+  it("dynamic package.json, static package", function () {
+    import arson from "arson";
+    return import("arson/package.json").then(({ name }) => {
+      assert.strictEqual(name, "arson");
+      assert.strictEqual(typeof arson.encode, "function");
+      assert.deepEqual(arson, require("ar" + "son"));
+    });
+  });
+
+  it("dynamic package.json, dynamic package", function () {
+    return Promise.all([
+      import("react/package.json"),
+      import("react")
+    ]).then(([{ name }, React]) => {
+      assert.strictEqual(name, "react");
+      assert.strictEqual(typeof React.createClass, "function");
+      assert.deepEqual(React, require("re" + "act"));
+    });
+  });
+
+  it("mutual dynamic imports", function () {
+    return import("./imports/mutual-a").then(a => {
+      assert.strictEqual(a.name, "/imports/mutual-a.js");
+      return a.promise;
+    }).then(b => {
+      assert.strictEqual(b.name, "/imports/mutual-b.js");
+      return b.promise;
+    });
+  });
+});
diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
new file mode 100644
index 0000000000..1ea5552f73
--- /dev/null
+++ b/tools/tests/dynamic-import.js
@@ -0,0 +1,32 @@
+var selftest = require('../tool-testing/selftest.js');
+var Sandbox = selftest.Sandbox;
+
+selftest.define("dynamic import(...)", function () {
+  const s = new Sandbox();
+  s.createApp("dynamic-import-test-app", "dynamic-import");
+  s.cd("dynamic-import-test-app", function () {
+    run(s, false);
+    run(s, true);
+  });
+});
+
+function run(sandbox, prod) {
+  const args = [
+    "test",
+    "--once",
+    "--full-app",
+    "--driver-package", "dispatch:mocha-phantomjs"
+  ];
+
+  if (prod) {
+    args.push("--production");
+  }
+
+  const run = sandbox.run(...args);
+
+  run.waitSecs(60);
+  run.match("App running at");
+  run.match("SERVER FAILURES: 0");
+  run.match("CLIENT FAILURES: 0");
+  run.expectExit(0);
+}

From 844e2c34adb0460fbde272360ddccda982d37d3f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 9 Feb 2017 15:58:21 -0500
Subject: [PATCH 036/195] Consider npm packages with {,pre,post}install scripts
 non-portable.

Inspired by analysis from @danstiner:
https://github.com/meteor/meteor/issues/8225#issuecomment-275044900

Fixes #8225, as well as the tests I added in 672c4f338a1a392f9dfe57d8e796ef6a51175f51.

I changed the name of the .meteor-portable file to .meteor-portable-1.json
in order to invalidate previous .meteor-portable files. This naming scheme
will be more sustainable, because we can keep incrementing the version
number whenever we change this logic.
---
 tools/isobuild/meteor-npm.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index 90bd3ef028..a873c9a17e 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -434,6 +434,9 @@ function copyNpmPackageWithSymlinkedNodeModules(fromPkgDir, toPkgDir) {
 
 const portableCache = Object.create(null);
 
+// Increment this version to trigger the full portability check again.
+const portableVersion = 1;
+
 const isPortable = Profile("meteorNpm.isPortable", dir => {
   const lstat = optimisticLStat(dir);
   if (! lstat.isDirectory()) {
@@ -441,9 +444,11 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     return ! dir.endsWith(".node");
   }
 
-  const pkgJsonStat = optimisticStatOrNull(files.pathJoin(dir, "package.json"));
+  const pkgJsonPath = files.pathJoin(dir, "package.json");
+  const pkgJsonStat = optimisticStatOrNull(pkgJsonPath);
   const canCache = pkgJsonStat && pkgJsonStat.isFile();
-  const portableFile = files.pathJoin(dir, ".meteor-portable");
+  const portableFile = files.pathJoin(
+    dir, ".meteor-portable-" + portableVersion + ".json");
 
   if (canCache) {
     // Cache previous results by writing a boolean value to a hidden file
@@ -470,10 +475,20 @@ const isPortable = Profile("meteorNpm.isPortable", dir => {
     fs.unlink(portableFile, error => {});
   }
 
-  const result = optimisticReaddir(dir).every(
-    // Ignore files that start with a ".", such as .bin directories.
-    itemName => itemName.startsWith(".") ||
-      isPortable(files.pathJoin(dir, itemName)));
+  const pkgJson = canCache && optimisticReadJsonOrNull(pkgJsonPath);
+  const hasBuildScript =
+    pkgJson &&
+    pkgJson.scripts &&
+    (pkgJson.scripts.preinstall ||
+     pkgJson.scripts.install ||
+     pkgJson.scripts.postinstall);
+
+  const result = hasBuildScript
+    ? false // Build scripts may not be portable.
+    : optimisticReaddir(dir).every(
+      // Ignore files that start with a ".", such as .bin directories.
+      itemName => itemName.startsWith(".") ||
+        isPortable(files.pathJoin(dir, itemName)));
 
   if (canCache) {
     // Write the .meteor-portable file asynchronously, and don't worry

From d9184808cbe7bba552def7bf38dd252ca738286e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 10 Feb 2017 14:33:14 -0500
Subject: [PATCH 037/195] Avoid calling ImportScanner#_getRelativeImportId with
 bad parentPath.

Fixes #8336.
---
 tools/isobuild/import-scanner.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 168cefac74..4e8fda1cb8 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -499,6 +499,13 @@ export default class ImportScanner {
         const packageJsonFile =
           this._addPkgJsonToOutput(path, pkg, forDynamicImport);
 
+        if (! parentFile.installPath) {
+          // If parentFile is not installable, then we won't return it
+          // from getOutputFiles, so we don't need to worry about
+          // recording any parentFile.deps[id].helpers.
+          return;
+        }
+
         const relativeId = this._getRelativeImportId(
           parentFile.installPath,
           packageJsonFile.installPath
@@ -518,7 +525,7 @@ export default class ImportScanner {
     const relativeId = convertToPosixPath(pathRelative(
       pathDirname(parentPath),
       childPath
-    ));
+    ), true);
 
     // If the result of pathRelative does not already start with a "." or
     // a "/", prepend a "./" to make it a valid relative identifier

From b6e3a52b6373e34eac4ff26ea7b02ed4ec22bf54 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 10 Feb 2017 14:39:27 -0500
Subject: [PATCH 038/195] Bump package versions for 1.5-beta.5 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 0d1befc136..303b302322 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.15.0-beta.4'
+  version: '6.15.0-beta.5'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index e356459550..9cd9c50dc9 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.4",
+  version: "0.1.0-beta.5",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 24b8dd433d..d0d2d20531 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.4',
+  version: '0.7.0-beta.5',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 1f9b6b2c2a..8767eeb70c 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.1.0-beta.4"
+  version: "1.1.0-beta.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 53e4ad42f1..91c815427e 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.5.0-beta.4'
+  version: '1.5.0-beta.5'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index cb96b432a0..8e03d77823 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.4",
+  version: "0.8.0-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 c0e9a131da..e3c3afd649 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.4",
+  version: "0.8.0-beta.5",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index c647a97bba..34cf200deb 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.4",
+ "version": "1.5-beta.5",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From c8f77a57b99e60feea2470e5d669ab0ef7776d98 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 10 Feb 2017 18:05:45 -0500
Subject: [PATCH 039/195] Automatically add dynamic-import package when
 updating to Meteor 1.5.

---
 tools/upgraders.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/upgraders.js b/tools/upgraders.js
index 5605642d13..ddde9fc619 100644
--- a/tools/upgraders.js
+++ b/tools/upgraders.js
@@ -285,6 +285,12 @@ be removed if there is no need for the Blaze configuration interface.`,
     packagesFile.writeIfModified();
   },
 
+  "1.5-add-dynamic-import-package": function (projectContext) {
+    const packagesFile = projectContext.projectConstraintsFile;
+    packagesFile.addPackages(["dynamic-import"]);
+    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 95a7d110188d1654d26772d9ef4744c5917599e2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Feb 2017 12:31:40 -0500
Subject: [PATCH 040/195] Regenerate
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json.

---
 .../.npm/package/npm-shrinkwrap.json          | 160 ++++++++++--------
 1 file changed, 85 insertions(+), 75 deletions(-)

diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 61fb5960cc..0589d5e836 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.9.tgz",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz",
       "from": "acorn@>=4.0.5 <4.1.0"
     },
     "acorn-es7-plugin": {
@@ -31,19 +31,19 @@
       "from": "babel-code-frame@>=6.22.0 <7.0.0"
     },
     "babel-core": {
-      "version": "6.22.1",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.22.1.tgz",
+      "version": "6.23.1",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz",
       "from": "babel-core@>=6.22.1 <7.0.0"
     },
     "babel-generator": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.22.0.tgz",
-      "from": "babel-generator@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.23.0.tgz",
+      "from": "babel-generator@>=6.23.0 <7.0.0"
     },
     "babel-helper-builder-react-jsx": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.22.0.tgz",
-      "from": "babel-helper-builder-react-jsx@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz",
+      "from": "babel-helper-builder-react-jsx@>=6.23.0 <7.0.0"
     },
     "babel-helper-call-delegate": {
       "version": "6.22.0",
@@ -51,14 +51,14 @@
       "from": "babel-helper-call-delegate@>=6.22.0 <7.0.0"
     },
     "babel-helper-define-map": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.22.0.tgz",
-      "from": "babel-helper-define-map@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz",
+      "from": "babel-helper-define-map@>=6.23.0 <7.0.0"
     },
     "babel-helper-function-name": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.22.0.tgz",
-      "from": "babel-helper-function-name@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz",
+      "from": "babel-helper-function-name@>=6.23.0 <7.0.0"
     },
     "babel-helper-get-function-arity": {
       "version": "6.22.0",
@@ -71,9 +71,9 @@
       "from": "babel-helper-hoist-variables@>=6.22.0 <7.0.0"
     },
     "babel-helper-optimise-call-expression": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.22.0.tgz",
-      "from": "babel-helper-optimise-call-expression@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz",
+      "from": "babel-helper-optimise-call-expression@>=6.23.0 <7.0.0"
     },
     "babel-helper-regex": {
       "version": "6.22.0",
@@ -81,19 +81,19 @@
       "from": "babel-helper-regex@>=6.22.0 <7.0.0"
     },
     "babel-helper-replace-supers": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.22.0.tgz",
-      "from": "babel-helper-replace-supers@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz",
+      "from": "babel-helper-replace-supers@>=6.23.0 <7.0.0"
     },
     "babel-helpers": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.22.0.tgz",
-      "from": "babel-helpers@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.23.0.tgz",
+      "from": "babel-helpers@>=6.23.0 <7.0.0"
     },
     "babel-messages": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.22.0.tgz",
-      "from": "babel-messages@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "from": "babel-messages@>=6.23.0 <7.0.0"
     },
     "babel-plugin-check-es2015-constants": {
       "version": "6.22.0",
@@ -146,13 +146,13 @@
       "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-block-scoping@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-classes": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-classes@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-computed-properties": {
@@ -161,13 +161,13 @@
       "from": "babel-plugin-transform-es2015-computed-properties@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-destructuring@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-for-of": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-for-of@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-literals": {
@@ -176,8 +176,8 @@
       "from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-object-super": {
@@ -186,8 +186,8 @@
       "from": "babel-plugin-transform-es2015-object-super@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-parameters": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-parameters@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
@@ -211,8 +211,8 @@
       "from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
       "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-unicode-regex": {
@@ -231,19 +231,19 @@
       "from": "babel-plugin-transform-flow-strip-types@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-object-rest-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz",
       "from": "babel-plugin-transform-object-rest-spread@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-react-display-name": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.22.0.tgz",
-      "from": "babel-plugin-transform-react-display-name@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz",
+      "from": "babel-plugin-transform-react-display-name@>=6.23.0 <7.0.0"
     },
     "babel-plugin-transform-react-jsx": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz",
-      "from": "babel-plugin-transform-react-jsx@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz",
+      "from": "babel-plugin-transform-react-jsx@>=6.23.0 <7.0.0"
     },
     "babel-plugin-transform-react-jsx-self": {
       "version": "6.22.0",
@@ -261,8 +261,8 @@
       "from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-runtime": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
       "from": "babel-plugin-transform-runtime@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-strict-mode": {
@@ -270,20 +270,25 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz",
       "from": "babel-plugin-transform-strict-mode@>=6.22.0 <7.0.0"
     },
+    "babel-preset-flow": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
+      "from": "babel-preset-flow@>=6.23.0 <7.0.0"
+    },
     "babel-preset-meteor": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.22.0.tgz",
       "from": "babel-preset-meteor@6.22.0"
     },
     "babel-preset-react": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.23.0.tgz",
       "from": "babel-preset-react@>=6.22.0 <7.0.0"
     },
     "babel-register": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.22.0.tgz",
-      "from": "babel-register@>=6.22.0 <7.0.0"
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.23.0.tgz",
+      "from": "babel-register@>=6.23.0 <7.0.0"
     },
     "babel-runtime": {
       "version": "6.22.0",
@@ -291,18 +296,18 @@
       "from": "babel-runtime@>=6.22.0 <7.0.0"
     },
     "babel-template": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.23.0.tgz",
       "from": "babel-template@>=6.22.0 <7.0.0"
     },
     "babel-traverse": {
-      "version": "6.22.1",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.22.1.tgz",
+      "version": "6.23.1",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.23.1.tgz",
       "from": "babel-traverse@>=6.22.1 <7.0.0"
     },
     "babel-types": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.22.0.tgz",
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.23.0.tgz",
       "from": "babel-types@>=6.22.0 <7.0.0"
     },
     "babylon": {
@@ -331,8 +336,8 @@
       "from": "concat-map@0.0.1"
     },
     "convert-source-map": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz",
       "from": "convert-source-map@>=1.3.0 <2.0.0"
     },
     "core-js": {
@@ -341,8 +346,8 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
@@ -361,8 +366,8 @@
       "from": "esutils@>=2.0.2 <3.0.0"
     },
     "globals": {
-      "version": "9.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz",
+      "version": "9.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.15.0.tgz",
       "from": "globals@>=9.0.0 <10.0.0"
     },
     "has-ansi": {
@@ -416,9 +421,9 @@
       "from": "magic-string@>=0.19.0 <0.20.0"
     },
     "meteor-babel": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.15.1.tgz",
-      "from": "meteor-babel@0.15.1"
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.15.2.tgz",
+      "from": "meteor-babel@0.15.2"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -508,9 +513,9 @@
       }
     },
     "reify": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.7.tgz",
-      "from": "reify@>=0.4.7 <0.5.0"
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.9.tgz",
+      "from": "reify@>=0.4.8 <0.5.0"
     },
     "repeating": {
       "version": "2.0.1",
@@ -547,6 +552,11 @@
       "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"
     },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "from": "trim-right@>=1.0.1 <2.0.0"
+    },
     "vlq": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.1.tgz",

From 92480b09a049af261f1caf3555cbd03a1f13337b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Feb 2017 12:31:54 -0500
Subject: [PATCH 041/195] Regenerate
 packages/modules/.npm/package/npm-shrinkwrap.json.

---
 packages/modules/.npm/package/npm-shrinkwrap.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index a83c8e4619..3e60433a36 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "acorn": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.9.tgz",
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz",
       "from": "acorn@>=4.0.5 <4.1.0"
     },
     "acorn-es7-plugin": {
@@ -21,9 +21,9 @@
       "from": "magic-string@>=0.19.0 <0.20.0"
     },
     "reify": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.7.tgz",
-      "from": "reify@0.4.7"
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.4.9.tgz",
+      "from": "reify@0.4.9"
     },
     "vlq": {
       "version": "0.2.1",

From 44370f0ec86ee38fdb4f810e69cbeee964c2bad4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Feb 2017 12:32:52 -0500
Subject: [PATCH 042/195] Bump $BUNDLE_VERSION to 4.8.1 before rebuilding dev
 bundle.

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

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

From 87d95ce60ffdffb0d4b2e90028bcbd103f190ae2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Feb 2017 12:38:36 -0500
Subject: [PATCH 043/195] Bump package versions for 1.5-beta.6 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index d43fbe30d5..f1c081e037 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.15.0-beta.5'
+  version: '6.15.0-beta.6'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 9cd9c50dc9..b97b4c9155 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.5",
+  version: "0.1.0-beta.6",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index d0d2d20531..fea630e3b8 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.5',
+  version: '0.7.0-beta.6',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 8767eeb70c..74a6497bbd 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.1.0-beta.5"
+  version: "1.1.0-beta.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 91c815427e..7e409a8b3f 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.5.0-beta.5'
+  version: '1.5.0-beta.6'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 8e03d77823..3221182dcb 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.5",
+  version: "0.8.0-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 c8664ffa0c..fd8bb0d316 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.5",
+  version: "0.8.0-beta.6",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 34cf200deb..dacd9a570c 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.5",
+ "version": "1.5-beta.6",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 0b26890d97adebbf9406c7cc34f09107d94a0f57 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 15 Feb 2017 13:57:43 -0500
Subject: [PATCH 044/195] Protect against edge case when `resolved` is a
 string.

In particular, if the "main" field of the package.json file cannot be
resolved, then the `resolved` variable will be "missing", which is a
truthy value that silently rejects property assignments. Ugh!
---
 tools/isobuild/resolver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 70e5f7703c..3737b60429 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -316,7 +316,7 @@ export default class Resolver {
       const resolved = this._joinAndStat(dirPath, main) ||
         this._resolve(main, pkgJsonPath, _seenDirPaths);
 
-      if (resolved) {
+      if (resolved && typeof resolved === "object") {
         if (! resolved.packageJsonMap) {
           resolved.packageJsonMap = Object.create(null);
         }

From eadd954115d52e546b6ff4647264989e5600b08d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 16 Feb 2017 18:18:58 -0500
Subject: [PATCH 045/195] Use alias instead of stub module for meteor/package
 imports.

Aliases are lighter weight than stub module functions, and easier for the
dynamic import(...) dependency traversal logic to understand.
---
 packages/modules/install-packages.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/modules/install-packages.js b/packages/modules/install-packages.js
index c663c100c2..8965383ac2 100644
--- a/packages/modules/install-packages.js
+++ b/packages/modules/install-packages.js
@@ -8,10 +8,10 @@ function install(name, mainModule) {
   // /node_modules/meteor/<name>/index.js, in the rare but possible event
   // that the package contains a file called index.js (#6590).
 
-  if (mainModule) {
-    meteorDir[name + ".js"] = [mainModule, function (require, e, module) {
-      module.exports = require(mainModule);
-    }];
+  if (typeof mainModule === "string") {
+    // Set up an alias from /node_modules/meteor/<package>.js to the main
+    // module, e.g. meteor/<package>/index.js.
+    meteorDir[name + ".js"] = mainModule;
   } else {
     // back compat with old Meteor packages
     meteorDir[name + ".js"] = function (r, e, module) {

From edb4e0664c221d3094365f552fd02820e0f8e238 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 16 Feb 2017 16:38:11 -0500
Subject: [PATCH 046/195] Walk dynamic module graph synchronously.

I made this code asynchronous at first to accommodate the asynchronous
cache API, but walking the graph needs to happen synchronously so that
near-simultaneous dynamic import(...)s do not interleave.
---
 packages/dynamic-import/client.js | 53 ++++++++++++-------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 215e6de197..2d96067a2d 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -18,56 +18,45 @@ Module.prototype.dynamicImport = function (id) {
       throw error;
     }
 
-    // Require the current module from the complete meta graph.
+    // Require the parent module from the complete meta graph.
     var meta = requireMeta(module.id);
-    var missingTree;
-    var localTree;
+    var versions = Object.create(null);
 
     function walk(meta) {
-      if (meta.dynamic) {
-        return meta.pending || (meta.pending = add(
-          meta.module.id,
-          meta.version
-        ).then(function () {
-          return allChildren(meta, walkChild);
-        }));
+      if (meta.dynamic && ! meta.pending) {
+        meta.pending = true;
+        versions[meta.module.id] = meta.version;
+        meta.eachChild(walkChild);
       }
     }
 
-    function add(id, version) {
-      return cache.check(id, version).then(function (code) {
-        addToTree(localTree = localTree || Object.create(null), id, code);
-      }, function (missing) {
-        addToTree(missingTree = missingTree || Object.create(null), id, 1);
-      });
-    }
-
     function walkChild(childModule) {
       return walk(childModule.exports);
     }
 
-    return allChildren(meta, walkChild, [id]).then(function () {
+    meta.eachChild(walkChild, [id]);
+
+    var localTree;
+    var missingTree;
+
+    return Promise.all(Object.keys(versions).map(function (id) {
+      return cache.check(id, versions[id]).then(function (code) {
+        addToTree(localTree = localTree || Object.create(null), id, code);
+      }, function (missing) {
+        addToTree(missingTree = missingTree || Object.create(null), id, 1);
+      });
+
+    })).then(function () {
       if (localTree) {
         installResults(localTree);
       }
+
       return missingTree && fetchMissing(missingTree);
+
     }).then(get);
   });
 };
 
-// The allChildren iteration includes all child modules imported by
-// meta.module, not just the child explicitly required here, so that
-// implicit modules like package.json will be included too.
-function allChildren(meta, callback, idsToRequire) {
-  var results = [];
-  // See meteor/packages/modules-runtime/meteor-install.js for the
-  // definition of meta.eachChild.
-  meta.eachChild(function (child) {
-    results.push(callback(child));
-  }, idsToRequire);
-  return Promise.all(results);
-}
-
 function fetchMissing(missingTree) {
   return new Promise(function (resolve, reject) {
     Meteor.call(

From a1c4df3f579ce4625937959dd1c974184b0a5507 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 16 Feb 2017 16:40:28 -0500
Subject: [PATCH 047/195] Call api.use("ddp") in dynamic-import/package.js.

Though I am still considering alternatives to DDP, the dynamic-import
package should depend on the packages that it uses.
---
 packages/dynamic-import/package.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index b97b4c9155..0854fd61c7 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -9,6 +9,7 @@ Package.onUse(function (api) {
   api.use("modules");
   api.use("localstorage");
   api.use("promise");
+  api.use("ddp");
   api.use("ecmascript", "server");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");

From 15135a65df9483e483b74d9fd22ea864c810641b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 16 Feb 2017 18:18:04 -0500
Subject: [PATCH 048/195] Test importing lazy packages and dynamic package
 modules.

---
 .../apps/dynamic-import/.meteor/packages      |  1 +
 .../packages/lazy-test-package/dynamic.js     |  1 +
 .../packages/lazy-test-package/main.js        |  1 +
 .../packages/lazy-test-package/package.js     | 14 +++++
 tools/tests/apps/dynamic-import/tests.js      | 51 +++++++++++++++++++
 5 files changed, 68 insertions(+)
 create mode 100644 tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/lazy-test-package/main.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js

diff --git a/tools/tests/apps/dynamic-import/.meteor/packages b/tools/tests/apps/dynamic-import/.meteor/packages
index 0c9f41f8e4..6732427412 100644
--- a/tools/tests/apps/dynamic-import/.meteor/packages
+++ b/tools/tests/apps/dynamic-import/.meteor/packages
@@ -23,3 +23,4 @@ insecure                # Allow all DB writes from clients (for prototyping)
 dynamic-import
 dispatch:mocha-phantomjs
 dispatch:mocha-browser
+lazy-test-package
diff --git a/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js b/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
new file mode 100644
index 0000000000..f3e9aa9c6f
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
@@ -0,0 +1 @@
+export const name = module.id;
diff --git a/tools/tests/apps/dynamic-import/packages/lazy-test-package/main.js b/tools/tests/apps/dynamic-import/packages/lazy-test-package/main.js
new file mode 100644
index 0000000000..f3e9aa9c6f
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/lazy-test-package/main.js
@@ -0,0 +1 @@
+export const name = module.id;
diff --git a/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js b/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js
new file mode 100644
index 0000000000..3f740f2ec8
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js
@@ -0,0 +1,14 @@
+Package.describe({
+  name: "lazy-test-package",
+  version: "0.0.1",
+});
+
+Package.onUse(function(api) {
+  api.use("ecmascript");
+  api.mainModule("main.js", [
+    "client",
+    "server"
+  ], {
+    lazy: true
+  });
+});
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index fbc0ff499d..e04ef67f1a 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -73,4 +73,55 @@ describe("dynamic import(...)", function () {
       return b.promise;
     });
   });
+
+  it("imports from lazy packages", function () {
+    let missing = false;
+    const dynamicId = [
+      "meteor", "lazy-test-package", "dynamic"
+    ].join("/");
+
+    try {
+      // Synchronous dynamic requires should fail if the module has not
+      // been fetched dynamically yet.
+      require(dynamicId);
+    } catch (e) {
+      missing = true;
+    }
+
+    if (Meteor.isClient) {
+      // Dynamic modules only exist on the client. On the server, modules
+      // imported via dynamic import(...) are treated the same as
+      // statically imported modules.
+      assert.strictEqual(missing, true);
+    }
+
+    return Promise.all([
+      import("meteor/lazy-test-package").then(lazy => {
+        const requiredName = require([
+          "meteor", "lazy-test-package"
+        ].join("/")).name;
+
+        assert.strictEqual(
+          lazy.name,
+          "/node_modules/meteor/lazy-test-package/main.js"
+        );
+
+        assert.strictEqual(lazy.name, requiredName);
+      }),
+
+      import("meteor/lazy-test-package/dynamic").then(dynamic => {
+        assert.strictEqual(
+          dynamic.name,
+          "/node_modules/meteor/lazy-test-package/dynamic.js"
+        );
+
+        // Now the synchronous dynamic require succeeds because the module
+        // has been fetched dynamically.
+        assert.strictEqual(
+          require(dynamicId).name,
+          dynamic.name
+        );
+      })
+    ]);
+  });
 });

From 2a32faf27a198c64c9b2fe492b255fedc784dbd6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 16 Feb 2017 18:34:03 -0500
Subject: [PATCH 049/195] Bump package versions for 1.5-beta.7 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index f1c081e037..3bed5d86ae 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.15.0-beta.6'
+  version: '6.15.0-beta.7'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 0854fd61c7..947972e1e2 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.6",
+  version: "0.1.0-beta.7",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index fea630e3b8..b1c17ab104 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.6',
+  version: '0.7.0-beta.7',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 74a6497bbd..aa9869d3d7 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.1.0-beta.6"
+  version: "1.1.0-beta.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 7e409a8b3f..3deb9dd87e 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.5.0-beta.6'
+  version: '1.5.0-beta.7'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 3221182dcb..64e47589a4 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.6",
+  version: "0.8.0-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 fd8bb0d316..26a9a2e279 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.6",
+  version: "0.8.0-beta.7",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index dacd9a570c..f6306e3280 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.6",
+ "version": "1.5-beta.7",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 41e9ee857ebf7c3e693126e504d0a3faab39da80 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 21 Feb 2017 10:54:04 -0500
Subject: [PATCH 050/195] Evaluate dynamic module code in package scope.

This should elegantly address the issues described in this comment:
https://github.com/meteor/meteor/pull/8327#issuecomment-280881830

I toyed with the possibility of turning package variables (both imports
from other packages and intercepted "global" variable assignments) into
properties on a shared namespace object, but that would have been a major
breaking change for existing package code, because it would have required
automatically rewriting variable references in package modules.
---
 packages/dynamic-import/client.js             | 16 ++++++-
 tools/isobuild/linker.js                      | 44 +++++++++++++++++--
 .../apps/dynamic-import/.meteor/packages      |  1 +
 .../packages/helper-package/dynamic/a.js      |  3 ++
 .../packages/helper-package/dynamic/b.coffee  |  3 ++
 .../packages/helper-package/helper-package.js | 15 +++++++
 .../packages/helper-package/package.js        | 12 +++++
 .../packages/lazy-test-package/dynamic.js     |  7 +++
 .../packages/lazy-test-package/package.js     |  2 +
 tools/tests/apps/dynamic-import/tests.js      | 22 ++++++++++
 10 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 tools/tests/apps/dynamic-import/packages/helper-package/dynamic/a.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/helper-package/dynamic/b.coffee
 create mode 100644 tools/tests/apps/dynamic-import/packages/helper-package/helper-package.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/helper-package/package.js

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 2d96067a2d..325e16dae0 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -90,7 +90,21 @@ function installResults(resultsTree) {
       addToTree(
         trees[optionsIndex],
         meta.module.id,
-        (0, eval)("(" + tree + ")")
+        // By calling (meta.options.eval || eval) in a wrapper function,
+        // we delay the cost of parsing and evaluating the module code
+        // until the module is first imported.
+        function () {
+          // If an options.eval function was provided in the second
+          // argument to meteorInstall when this bundle was first
+          // installed, use that function to parse and evaluate the
+          // dynamic module code in the scope of the package. Otherwise
+          // fall back to indirect (global) eval.
+          return (meta.options.eval || eval)(
+            // Wrap the function(require,exports,module){...} expression
+            // in parentheses to force it to be parsed as an expression.
+            "(" + tree + ")"
+          ).apply(this, arguments);
+        }
       );
 
       // Intentionally do not delay resolution waiting for the cache.
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 84597aee8a..c00c1eaa66 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -245,9 +245,7 @@ _.extend(Module.prototype, {
         return;
       }
 
-      const dynamic = file.lazy && file.imported === "dynamic";
-
-      if (dynamic) {
+      if (file.isDynamic()) {
         const servePath = "dynamic/" + file.installPath;
         const { code: source, map } =
           file.getPrelinkedOutput({
@@ -352,7 +350,7 @@ _.extend(Module.prototype, {
     // allows us to call meteorInstall just once to install everything.
     chunks.push("var require = meteorInstall(");
     walk(tree);
-    chunks.push(",", JSON.stringify(self.meteorInstallOptions), ");");
+    chunks.push(",", self._stringifyInstallOptions(), ");");
 
     if (moduleCount === 0) {
       // If no files were actually added to the chunks array, roll back
@@ -363,6 +361,40 @@ _.extend(Module.prototype, {
     return moduleCount;
   },
 
+  _stringifyInstallOptions() {
+    let optionsString =
+      JSON.stringify(this.meteorInstallOptions, null, 2);
+
+    if (this.useGlobalNamespace) {
+      return optionsString;
+    }
+
+    if (! this.files.some(file => file.isDynamic())) {
+      // If the package contains no files that can be imported
+      // dynamically, then we don't need to provide an options.eval
+      // function for evaluating dynamic modules.
+      return optionsString;
+    }
+
+    assert.ok(optionsString.endsWith("\n}"));
+
+    // If this package is not using the global namespace, pass an
+    // options.eval method to meteorInstall, so that code added later can
+    // have access to the same shared package variables as other code in
+    // the package.
+    return optionsString.slice(0, optionsString.length - 2) + [
+      ",",
+      "  eval: function () {",
+      "    return eval(arguments[0]);",
+      "  }",
+      "}"
+    ].join("\n");
+  },
+
+  _hasDynamicModules() {
+    return this.files.some(file => file.isDynamic());
+  },
+
   // Adds require calls to the chunks array for all modules that should be
   // eagerly evaluated, and also includes bare files in the appropriate
   // order with respect to the require calls. Returns the name of the
@@ -583,6 +615,10 @@ _.extend(File.prototype, {
     return this.module.meteorInstallOptions;
   },
 
+  isDynamic() {
+    return this.lazy && this.imported === "dynamic";
+  },
+
   _getClosureHeader() {
     if (this._useMeteorInstall()) {
       const headerParts = ["function("];
diff --git a/tools/tests/apps/dynamic-import/.meteor/packages b/tools/tests/apps/dynamic-import/.meteor/packages
index 6732427412..bf003114fb 100644
--- a/tools/tests/apps/dynamic-import/.meteor/packages
+++ b/tools/tests/apps/dynamic-import/.meteor/packages
@@ -24,3 +24,4 @@ dynamic-import
 dispatch:mocha-phantomjs
 dispatch:mocha-browser
 lazy-test-package
+helper-package
diff --git a/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/a.js b/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/a.js
new file mode 100644
index 0000000000..50d7cacfac
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/a.js
@@ -0,0 +1,3 @@
+sharedWithinHelperPackage = sharedWithinHelperPackage || {};
+sharedWithinHelperPackage[module.id] = true;
+export { sharedWithinHelperPackage as shared }
diff --git a/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/b.coffee b/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/b.coffee
new file mode 100644
index 0000000000..504ae3344a
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/helper-package/dynamic/b.coffee
@@ -0,0 +1,3 @@
+localShared = require("./a.js").shared
+localShared[module.id] = true
+exports.shared = localShared
diff --git a/tools/tests/apps/dynamic-import/packages/helper-package/helper-package.js b/tools/tests/apps/dynamic-import/packages/helper-package/helper-package.js
new file mode 100644
index 0000000000..9f689d2b74
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/helper-package/helper-package.js
@@ -0,0 +1,15 @@
+import assert from "assert";
+
+// Maks sure sharedWithinHelperPackage and __coffeescriptShare are
+// declared as variables in the private scope of this package, but not
+// defined globally.
+assert.strictEqual(sharedWithinHelperPackage, void 0);
+assert.strictEqual("sharedWithinHelperPackage" in global, false);
+assert.strictEqual(__coffeescriptShare, void 0);
+assert.strictEqual("__coffeescriptShare" in global, false);
+
+export const Helper = {
+  help() {
+    return "ok";
+  }
+};
diff --git a/tools/tests/apps/dynamic-import/packages/helper-package/package.js b/tools/tests/apps/dynamic-import/packages/helper-package/package.js
new file mode 100644
index 0000000000..28e93af859
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/helper-package/package.js
@@ -0,0 +1,12 @@
+Package.describe({
+  name: 'helper-package',
+  version: '0.0.1',
+});
+
+Package.onUse(function(api) {
+//  api.versionsFrom('1.4.2.7');
+  api.use('ecmascript');
+  api.use('coffeescript');
+  api.mainModule('helper-package.js');
+  api.export("Helper");
+});
diff --git a/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js b/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
index f3e9aa9c6f..038673028a 100644
--- a/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
+++ b/tools/tests/apps/dynamic-import/packages/lazy-test-package/dynamic.js
@@ -1 +1,8 @@
+import assert from "assert";
+
 export const name = module.id;
+
+export function checkHelper() {
+  assert.strictEqual(typeof Helper, "object");
+  assert.strictEqual(Helper.help(), "ok");
+}
diff --git a/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js b/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js
index 3f740f2ec8..ec3a50664b 100644
--- a/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js
+++ b/tools/tests/apps/dynamic-import/packages/lazy-test-package/package.js
@@ -5,6 +5,8 @@ Package.describe({
 
 Package.onUse(function(api) {
   api.use("ecmascript");
+  api.use("helper-package");
+
   api.mainModule("main.js", [
     "client",
     "server"
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index e04ef67f1a..0905ce7386 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -124,4 +124,26 @@ describe("dynamic import(...)", function () {
       })
     ]);
   });
+
+  it("gives dynamic modules access to package variables", async function () {
+    const dynamic = await import("meteor/lazy-test-package/dynamic");
+    dynamic.checkHelper();
+
+    const a = await import("meteor/helper-package/dynamic/a");
+    const b = await import("meteor/helper-package/dynamic/b.coffee");
+
+    assert.strictEqual(a.shared, b.shared);
+    assert.deepEqual(a.shared, {
+      "/node_modules/meteor/helper-package/dynamic/a.js": true,
+      "/node_modules/meteor/helper-package/dynamic/b.coffee.js": true
+    });
+
+    assert.strictEqual(
+      (await import("meteor/helper-package")).Helper,
+      // Since these tests are defined in an application that uses the
+      // global scope for imported package variables, global.Helper should
+      // be identical to the Helper symbol exported by helper-package.
+      global.Helper
+    );
+  });
 });

From 7031ea1dd54d6ad91ccd5b8af7a51198573bf7e8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 21 Feb 2017 13:24:59 -0500
Subject: [PATCH 051/195] Bump LINKER_CACHE_SALT for good measure.

Recent changes to the way the linker works might not be reflected unless
we invalidate .meteor/local/bundler-cache.
---
 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 96a01c1d9b..4c2925226e 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 = 14; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 15; // 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.

From a9ac309fb906240fccec0e919af942b54ba6843f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 21 Feb 2017 13:26:01 -0500
Subject: [PATCH 052/195] Bump package versions for 1.5-beta.8 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 3bed5d86ae..6804dd2fd9 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.15.0-beta.7'
+  version: '6.15.0-beta.8'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 947972e1e2..15ff01727b 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.7",
+  version: "0.1.0-beta.8",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index b1c17ab104..84a3c08654 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.7',
+  version: '0.7.0-beta.8',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index aa9869d3d7..25854e8b89 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.1.0-beta.7"
+  version: "1.1.0-beta.8"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 3deb9dd87e..bacd444772 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.5.0-beta.7'
+  version: '1.5.0-beta.8'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 64e47589a4..2d053ebac7 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.7",
+  version: "0.8.0-beta.8",
   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 26a9a2e279..8e0304df68 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.7",
+  version: "0.8.0-beta.8",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index f6306e3280..0b7cf43a28 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.7",
+ "version": "1.5-beta.8",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From cd62d4284ec0fdf534937cdf603415578e3790d7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 22 Feb 2017 10:46:39 -0500
Subject: [PATCH 053/195] Enable eval if browser-policy-content is used.

---
 packages/dynamic-import/package.js  |  2 ++
 packages/dynamic-import/security.js | 20 ++++++++++++++++++++
 packages/dynamic-import/server.js   |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 packages/dynamic-import/security.js

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 15ff01727b..618dadebdd 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -6,6 +6,8 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
+  api.use("browser-policy-content", { weak: true });
+
   api.use("modules");
   api.use("localstorage");
   api.use("promise");
diff --git a/packages/dynamic-import/security.js b/packages/dynamic-import/security.js
new file mode 100644
index 0000000000..f8ccb576f2
--- /dev/null
+++ b/packages/dynamic-import/security.js
@@ -0,0 +1,20 @@
+const bpc = Package["browser-policy-content"];
+const BP = bpc && bpc.BrowserPolicy;
+const BPc = BP && BP.content;
+if (BPc) {
+  // The ability to evaluate new code is essential for loading dynamic
+  // modules. Without eval, we would be forced to load modules using
+  // <script src=...> tags, and then there would be no way to save those
+  // modules to a local cache (or load them from the cache) without the
+  // unique response caching abilities of service workers, which are not
+  // available in all browsers, and cannot be polyfilled in a way that
+  // satisfies Content Security Policy eval restrictions. Moreover, eval
+  // allows us to evaluate dynamic module code in the original package
+  // scope, which would never be possible using <script> tags. If you're
+  // deploying an app in an environment that demands a Content Security
+  // Policy that forbids eval, your only option is to bundle all dynamic
+  // modules in the initial bundle. Fortunately, that works perfectly
+  // well; you just won't get the performance benefits of dynamic module
+  // fetching.
+  BPc.allowEval();
+}
diff --git a/packages/dynamic-import/server.js b/packages/dynamic-import/server.js
index ef787d30cc..269cbfae43 100644
--- a/packages/dynamic-import/server.js
+++ b/packages/dynamic-import/server.js
@@ -4,6 +4,8 @@ import {
   join as pathJoin,
   normalize as pathNormalize,
 } from "path";
+
+import "./security.js";
 import "./client.js";
 
 const hasOwn = Object.prototype.hasOwnProperty;

From a78b09fa852ea23ef89baa07153b44731aa76000 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 22 Feb 2017 12:28:43 -0500
Subject: [PATCH 054/195] Check arguments to __dynamicImport method call.

This prevents the audit-argument-checks package from complaining about
this method in production.
---
 packages/dynamic-import/package.js | 1 +
 packages/dynamic-import/server.js  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 618dadebdd..da50877a56 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -12,6 +12,7 @@ Package.onUse(function (api) {
   api.use("localstorage");
   api.use("promise");
   api.use("ddp");
+  api.use("check");
   api.use("ecmascript", "server");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
diff --git a/packages/dynamic-import/server.js b/packages/dynamic-import/server.js
index 269cbfae43..569591f202 100644
--- a/packages/dynamic-import/server.js
+++ b/packages/dynamic-import/server.js
@@ -5,6 +5,8 @@ import {
   normalize as pathNormalize,
 } from "path";
 
+import { check } from "meteor/check";
+
 import "./security.js";
 import "./client.js";
 
@@ -19,6 +21,8 @@ Object.keys(dynamicImportInfo).forEach(platform => {
 
 Meteor.methods({
   __dynamicImport(tree) {
+    check(tree, Object);
+
     const platform = this.connection ? "web.browser" : "server";
     const pathParts = [];
 

From 705ff310621080aee601c7d5a83d719dccac50ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Tr=C4=99bacz?= <maciej@trebacz.org>
Date: Thu, 23 Feb 2017 11:31:04 +0100
Subject: [PATCH 055/195] Remove jQuery dependency from http package (#8389)

`jquery` is no longer necessary as of https://github.com/meteor/meteor/commit/4e922fd709e2f8586ba8a6c811b4d90c4bb4f9d3 and thus the removal of this dependency is warranted.
---
 packages/http/package.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/http/package.js b/packages/http/package.js
index 6e1d7a7074..ac37a56fe3 100644
--- a/packages/http/package.js
+++ b/packages/http/package.js
@@ -27,7 +27,6 @@ Package.onTest(function (api) {
   api.use('webapp', 'server');
   api.use('underscore');
   api.use('random');
-  api.use('jquery', 'client');
   api.use('http', ['client', 'server']);
   api.use('tinytest');
   api.use('test-helpers', ['client', 'server']);

From afb7e31c51a8cebdc768afe4dba6b8399f80e08a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 27 Feb 2017 16:41:38 -0500
Subject: [PATCH 056/195] Use IndexedDB instead of localStorage for caching
 dynamic modules.

I was able to achieve tolerable performance by using only one (read-only)
transaction for each cache.getMany call, and only one (read+write)
transaction for each cache.setMany call.
---
 packages/dynamic-import/cache.js   | 160 +++++++++++++++++++----------
 packages/dynamic-import/client.js  |  31 ++++--
 packages/dynamic-import/package.js |   2 +-
 3 files changed, 128 insertions(+), 65 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index e957998806..05e5ab30e7 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -1,70 +1,122 @@
-var PREFIX = "dynamic-import:";
-var ID_PREFIX = PREFIX + "id:";
-var VERSION_PREFIX = PREFIX + "version:";
-var RESOLVED = Promise.resolve();
-var MISSING_ERROR = new Error("version not found");
-var MISSING = Promise.reject(MISSING_ERROR);
-// Silence uncaught rejection warnings.
-MISSING.catch(function(){});
-var pendingClean = null;
+var dbPromise;
 
-function getItem(key) {
-  var value = Meteor._localStorage.getItem(key);
-  return typeof value === "string"
-    ? Promise.resolve(value)
-    : MISSING;
-}
+function withDB(callback) {
+  dbPromise = dbPromise || new Promise(function (resolve, reject) {
+    var request = global.indexedDB.open("MeteorDynamicImportCache", 1);
 
-function setItem(key, value) {
-  Meteor._localStorage.setItem(key, value);
-}
+    request.onupgradeneeded = function (event) {
+      var db = event.target.result;
+      db.createObjectStore("versionsById", { keyPath: "id" });
+      db.createObjectStore("sourcesByVersion", { keyPath: "version" });
+    };
 
-function clean() {
-  clearTimeout(pendingClean);
-  pendingClean = null;
-
-  var activeVersions = Object.create(null);
-  var allVersions = Object.create(null);
-
-  Object.keys(Meteor._localStorage).forEach(function (key) {
-    if (key.startsWith(ID_PREFIX)) {
-      activeVersions[Meteor._localStorage.getItem(key)] = true;
-    } else if (key.startsWith(VERSION_PREFIX)) {
-      var version = key.slice(VERSION_PREFIX.length);
-      allVersions[version] = key;
-    }
+    request.onerror = reject;
+    request.onsuccess = function (event) {
+      resolve(event.target.result);
+    };
   });
 
-  Object.keys(allVersions).forEach(function (version) {
-    if (activeVersions[version] !== true) {
-      Meteor._localStorage.removeItem(allVersions[version]);
-    }
-  });
+  return dbPromise.then(callback);
 }
 
-exports.check = function check(id, currentVersion) {
+var checkTxn;
+
+exports.checkMany = function (versions) {
+  var ids = Object.keys(versions);
+  var sourcesById = Object.create(null);
+
+  // Initialize sourcesById with null values to indicate all sources are
+  // missing (unless replaced with actual sources below).
+  ids.forEach(function (id) {
+    sourcesById[id] = null;
+  });
+
   if (! Meteor.isProduction) {
-    return MISSING;
+    return Promise.resolve(sourcesById);
   }
 
-  return getItem(ID_PREFIX + id).then(function (previousVersion) {
-    return currentVersion === previousVersion
-      ? getItem(VERSION_PREFIX + previousVersion)
-      : MISSING;
+  return withDB(function (db) {
+    checkTxn = checkTxn || db.transaction([
+      "versionsById",
+      "sourcesByVersion"
+    ], "readonly");
+
+    var versionsById = checkTxn.objectStore("versionsById");
+    var sourcesByVersion = checkTxn.objectStore("sourcesByVersion");
+
+    return Promise.all(ids.map(function (id) {
+      return get(versionsById, id).then(function (result) {
+        var previousVersion = result && result.version;
+        if (previousVersion === versions[id]) {
+          return get(
+            sourcesByVersion,
+            result.version
+          ).then(function (result) {
+            if (result) {
+              sourcesById[id] = result.source;
+            }
+          });
+        }
+      });
+
+    })).then(function () {
+      checkTxn = null;
+      return sourcesById;
+    });
   });
 };
 
-exports.set = function set(id, version, value) {
-  if (! Meteor.isProduction) {
-    return RESOLVED;
-  }
+function get(store, key) {
+  return new Promise(function (resolve, reject) {
+    var request = store.get(key);
+    request.onerror = reject;
+    request.onsuccess = function (event) {
+      resolve(event.target.result);
+    };
+  });
+}
 
-  if (! pendingClean) {
-    pendingClean = setTimeout(clean, 1000);
+exports.setMany = function (versionsAndSourcesById) {
+  if (Meteor.isProduction) {
+    setTimeout(function () {
+      setMany(versionsAndSourcesById);
+    }, 100);
   }
-
-  return Promise.all([
-    setItem(VERSION_PREFIX + version, value),
-    setItem(ID_PREFIX + id, version)
-  ]);
 };
+
+function setMany(versionsAndSourcesById) {
+  return withDB(function (db) {
+    var setTxn = db.transaction([
+      "versionsById",
+      "sourcesByVersion"
+    ], "readwrite");
+
+    var versionsById = setTxn.objectStore("versionsById");
+    var sourcesByVersion = setTxn.objectStore("sourcesByVersion");
+    var promises = [];
+
+    Object.keys(versionsAndSourcesById).forEach(function (id) {
+      var info = versionsAndSourcesById[id];
+
+      promises.push(put(versionsById, {
+        id: id,
+        version: info.version
+      }));
+
+      promises.push(put(sourcesByVersion, {
+        version: info.version,
+        source: info.source
+      }));
+    });
+
+    return Promise.all(promises);
+  });
+};
+
+function put(store, object) {
+  return new Promise(function (resolve, reject) {
+    var request = store.put(object);
+    request.onerror = reject;
+    request.onsuccess = resolve;
+  });
+}
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 325e16dae0..647bdfee94 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -39,20 +39,21 @@ Module.prototype.dynamicImport = function (id) {
     var localTree;
     var missingTree;
 
-    return Promise.all(Object.keys(versions).map(function (id) {
-      return cache.check(id, versions[id]).then(function (code) {
-        addToTree(localTree = localTree || Object.create(null), id, code);
-      }, function (missing) {
-        addToTree(missingTree = missingTree || Object.create(null), id, 1);
+    return cache.checkMany(versions).then(function (sources) {
+      Object.keys(sources).forEach(function (id) {
+        var source = sources[id];
+        if (source) {
+          addToTree(localTree = localTree || Object.create(null), id, source);
+        } else {
+          addToTree(missingTree = missingTree || Object.create(null), id, 1);
+        }
       });
 
-    })).then(function () {
       if (localTree) {
-        installResults(localTree);
+        installResults(localTree, true);
       }
 
       return missingTree && fetchMissing(missingTree);
-
     }).then(get);
   });
 };
@@ -69,10 +70,11 @@ function fetchMissing(missingTree) {
   }).then(installResults);
 }
 
-function installResults(resultsTree) {
+function installResults(resultsTree, doNotCache) {
   var parts = [""];
   var trees = [];
   var options = [];
+  var versionsAndSourcesById = Object.create(null);
 
   function walk(tree) {
     if (typeof tree === "string") {
@@ -108,7 +110,12 @@ function installResults(resultsTree) {
       );
 
       // Intentionally do not delay resolution waiting for the cache.
-      cache.set(meta.module.id, meta.version, tree);
+      if (! doNotCache) {
+        versionsAndSourcesById[meta.module.id] = {
+          version: meta.version,
+          source: tree
+        };
+      }
 
     } else {
       Object.keys(tree).forEach(function (name) {
@@ -124,6 +131,10 @@ function installResults(resultsTree) {
   trees.forEach(function (tree, i) {
     meteorInstall(tree, options[i]);
   });
+
+  if (! doNotCache) {
+    cache.setMany(versionsAndSourcesById);
+  }
 }
 
 function addToTree(tree, id, value) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index da50877a56..4b6b487e0d 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -9,11 +9,11 @@ Package.onUse(function (api) {
   api.use("browser-policy-content", { weak: true });
 
   api.use("modules");
-  api.use("localstorage");
   api.use("promise");
   api.use("ddp");
   api.use("check");
   api.use("ecmascript", "server");
+
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
 });

From e8f224638c0db8d7a1f8f06eb861fe9e8d5be615 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 3 Mar 2017 14:31:53 -0500
Subject: [PATCH 057/195] Postpone cache.setMany if cache.checkMany currently
 underway.

---
 packages/dynamic-import/cache.js | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 05e5ab30e7..6934ea5383 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -76,15 +76,35 @@ function get(store, key) {
   });
 }
 
+var pendingVersionsAndSourcesById = Object.create(null);
+
 exports.setMany = function (versionsAndSourcesById) {
   if (Meteor.isProduction) {
-    setTimeout(function () {
-      setMany(versionsAndSourcesById);
-    }, 100);
+    Object.assign(
+      pendingVersionsAndSourcesById,
+      versionsAndSourcesById
+    );
+
+    // Delay the call to flushSetMany so that it doesn't contribute to the
+    // amount of time it takes to call module.dynamicImport.
+    if (! flushSetMany.timer) {
+      flushSetMany.timer = setTimeout(flushSetMany, 100);
+    }
   }
 };
 
-function setMany(versionsAndSourcesById) {
+function flushSetMany() {
+  if (checkTxn) {
+    // If checkMany is currently underway, postpone the flush until later,
+    // since updating the cache is less important than reading from it.
+    return flushSetMany.timer = setTimeout(flushSetMany, 100);
+  }
+
+  flushSetMany.timer = null;
+
+  var versionsAndSourcesById = pendingVersionsAndSourcesById;
+  pendingVersionsAndSourcesById = Object.create(null);
+
   return withDB(function (db) {
     var setTxn = db.transaction([
       "versionsById",
@@ -111,7 +131,7 @@ function setMany(versionsAndSourcesById) {
 
     return Promise.all(promises);
   });
-};
+}
 
 function put(store, object) {
   return new Promise(function (resolve, reject) {

From be68fb8d2f9cbbd484b1f32cd135aa8820b3c15d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 13:08:58 -0500
Subject: [PATCH 058/195] Call this.unblock() in __dynamicImport method.

This prevents __dynamicImport from blocking other method calls made by the
application, but introduces the possibility that __dynamicImport method
results could be delivered out of order, which is now handled in the
fetchMissing function.
---
 packages/dynamic-import/client.js | 25 +++++++++++++++++++++++--
 packages/dynamic-import/server.js |  1 +
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 647bdfee94..b6282fb6c4 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -58,13 +58,34 @@ Module.prototype.dynamicImport = function (id) {
   });
 };
 
+// Results from fetchMissing must be delivered in the same order as calls
+// to fetchMissing, because previous results may include modules needed by
+// more recent calls. In practice, results are usually delivered in order,
+// but might be delivered out of order because the __dynamicImport method
+// calls this.unblock(). To achieve this ordering of results while still
+// allowing parallel __dynamicImport method calls, we keep track of the
+// most recent Promise returned by fetchMissing, and delay resolving the
+// next Promise until the previous Promise has been resolved or rejected.
+var lastFetchMissingPromise = delayPromise;
+
 function fetchMissing(missingTree) {
-  return new Promise(function (resolve, reject) {
+  // Save the Promise that was most recent when fetchMissing was called.
+  var previousPromise = lastFetchMissingPromise;
+
+  // Update lastFetchMissingPromise immediately, without waiting for
+  // the results to be delivered.
+  return lastFetchMissingPromise = new Promise(function (resolve, reject) {
     Meteor.call(
       "__dynamicImport",
       missingTree,
       function (error, resultsTree) {
-        error ? reject(error) : resolve(resultsTree);
+        if (error) {
+          reject(error);
+        } else {
+          resolve = resolve.bind(null, resultsTree)
+          // Continue even if previousPromise was rejected.
+          previousPromise.then(resolve, resolve);
+        }
       }
     );
   }).then(installResults);
diff --git a/packages/dynamic-import/server.js b/packages/dynamic-import/server.js
index 569591f202..7f4ed98b9a 100644
--- a/packages/dynamic-import/server.js
+++ b/packages/dynamic-import/server.js
@@ -22,6 +22,7 @@ Object.keys(dynamicImportInfo).forEach(platform => {
 Meteor.methods({
   __dynamicImport(tree) {
     check(tree, Object);
+    this.unblock();
 
     const platform = this.connection ? "web.browser" : "server";
     const pathParts = [];

From 7c48703a1359f025e2bfe0728a7dda803bed8726 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 16:16:29 -0500
Subject: [PATCH 059/195] Split dynamic import(...) tests into
 development/production runs.

Though running the tests twice in the same app mostly worked, the error
reporting was confusing because it did not indicate which run was which.
---
 tools/tests/dynamic-import.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
index 1ea5552f73..c0a667ac4e 100644
--- a/tools/tests/dynamic-import.js
+++ b/tools/tests/dynamic-import.js
@@ -1,16 +1,20 @@
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
 
-selftest.define("dynamic import(...)", function () {
+selftest.define("dynamic import(...) in development", function () {
   const s = new Sandbox();
-  s.createApp("dynamic-import-test-app", "dynamic-import");
-  s.cd("dynamic-import-test-app", function () {
-    run(s, false);
-    run(s, true);
-  });
+  s.createApp("dynamic-import-test-app-devel", "dynamic-import");
+  s.cd("dynamic-import-test-app-devel", run.bind(s, false));
 });
 
-function run(sandbox, prod) {
+selftest.define("dynamic import(...) in production", function () {
+  const s = new Sandbox();
+  s.createApp("dynamic-import-test-app-prod", "dynamic-import");
+  s.cd("dynamic-import-test-app-prod", run.bind(s, true));
+});
+
+function run(prod) {
+  const sandbox = this;
   const args = [
     "test",
     "--once",

From f9de0a7b6535fe2a3129db0a886f6f9cae8d2930 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 16:18:07 -0500
Subject: [PATCH 060/195] Use NODE_ENV (with --production) to run production
 import(...) tests.

---
 tools/tests/dynamic-import.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
index c0a667ac4e..e667952907 100644
--- a/tools/tests/dynamic-import.js
+++ b/tools/tests/dynamic-import.js
@@ -13,7 +13,7 @@ selftest.define("dynamic import(...) in production", function () {
   s.cd("dynamic-import-test-app-prod", run.bind(s, true));
 });
 
-function run(prod) {
+function run(isProduction) {
   const sandbox = this;
   const args = [
     "test",
@@ -22,8 +22,11 @@ function run(prod) {
     "--driver-package", "dispatch:mocha-phantomjs"
   ];
 
-  if (prod) {
+  if (isProduction) {
+    sandbox.set("NODE_ENV", "production");
     args.push("--production");
+  } else {
+    sandbox.set("NODE_ENV", "development");
   }
 
   const run = sandbox.run(...args);

From ae59532f12f3ef0d71275b08d006bf67d181a152 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 16:14:56 -0500
Subject: [PATCH 061/195] Delete MeteorDynamicImportCache database before
 running tests.

Also run the tests a third time without deleting the database, to exercise
the caching logic.
---
 tools/tests/apps/dynamic-import/tests.js | 15 +++++++++++++++
 tools/tests/dynamic-import.js            |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 0905ce7386..03a9b39d03 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -1,6 +1,21 @@
 import assert from "assert";
 
 describe("dynamic import(...)", function () {
+  if (global.indexedDB) {
+    const saveCache = process.env.METEOR_SAVE_DYNAMIC_IMPORT_CACHE;
+    if (! (saveCache && JSON.parse(saveCache))) {
+      it("cleared the IndexedDB cache", function () {
+        return new Promise((resolve, reject) => {
+          const deleteRequest =
+            global.indexedDB.deleteDatabase("MeteorDynamicImportCache");
+          deleteRequest.onerror =
+          deleteRequest.onblocked =
+          deleteRequest.onsuccess = resolve;
+        });
+      });
+    }
+  }
+
   it("import same module both statically and dynamically", function () {
     import moment from "moment";
     return import("./imports/date").then(date => {
diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
index e667952907..fc80941d39 100644
--- a/tools/tests/dynamic-import.js
+++ b/tools/tests/dynamic-import.js
@@ -13,6 +13,13 @@ selftest.define("dynamic import(...) in production", function () {
   s.cd("dynamic-import-test-app-prod", run.bind(s, true));
 });
 
+selftest.define("dynamic import(...) with cache", function () {
+  const s = new Sandbox();
+  s.createApp("dynamic-import-test-app-cache", "dynamic-import");
+  s.set("METEOR_SAVE_DYNAMIC_IMPORT_CACHE", "true");
+  s.cd("dynamic-import-test-app-cache", run.bind(s, true));
+});
+
 function run(isProduction) {
   const sandbox = this;
   const args = [

From eb33152ce334a47f4e36fccb6c04f296feade8cf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 16:19:22 -0500
Subject: [PATCH 062/195] Prevent IndexedDB from auto-committing too early.

Discussion: https://twitter.com/benjamn/status/838108246841917441
---
 packages/dynamic-import/cache.js | 57 ++++++++++++++++----------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 6934ea5383..cb6fa01b69 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -19,7 +19,7 @@ function withDB(callback) {
   return dbPromise.then(callback);
 }
 
-var checkTxn;
+var checkCount = 0;
 
 exports.checkMany = function (versions) {
   var ids = Object.keys(versions);
@@ -36,46 +36,45 @@ exports.checkMany = function (versions) {
   }
 
   return withDB(function (db) {
-    checkTxn = checkTxn || db.transaction([
+    var txn = db.transaction([
       "versionsById",
       "sourcesByVersion"
     ], "readonly");
 
-    var versionsById = checkTxn.objectStore("versionsById");
-    var sourcesByVersion = checkTxn.objectStore("sourcesByVersion");
+    var versionsById = txn.objectStore("versionsById");
+    var sourcesByVersion = txn.objectStore("sourcesByVersion");
+
+    ++checkCount;
 
     return Promise.all(ids.map(function (id) {
-      return get(versionsById, id).then(function (result) {
-        var previousVersion = result && result.version;
-        if (previousVersion === versions[id]) {
-          return get(
-            sourcesByVersion,
-            result.version
-          ).then(function (result) {
-            if (result) {
-              sourcesById[id] = result.source;
-            }
-          });
-        }
+      return new Promise(function (resolve, reject) {
+        var versionRequest = versionsById.get(id);
+        versionRequest.onerror = reject;
+        versionRequest.onsuccess = function (event) {
+          var result = event.target.result;
+          var previousVersion = result && result.version;
+          if (previousVersion === versions[id]) {
+            var sourceRequest = sourcesByVersion.get(previousVersion);
+            sourceRequest.onerror = reject;
+            sourceRequest.onsuccess = function (event) {
+              var result = event.target.result;
+              if (result) {
+                sourcesById[id] = result.source;
+              }
+              resolve();
+            };
+          } else {
+            resolve();
+          }
+        };
       });
-
     })).then(function () {
-      checkTxn = null;
+      --checkCount;
       return sourcesById;
     });
   });
 };
 
-function get(store, key) {
-  return new Promise(function (resolve, reject) {
-    var request = store.get(key);
-    request.onerror = reject;
-    request.onsuccess = function (event) {
-      resolve(event.target.result);
-    };
-  });
-}
-
 var pendingVersionsAndSourcesById = Object.create(null);
 
 exports.setMany = function (versionsAndSourcesById) {
@@ -94,7 +93,7 @@ exports.setMany = function (versionsAndSourcesById) {
 };
 
 function flushSetMany() {
-  if (checkTxn) {
+  if (checkCount > 0) {
     // If checkMany is currently underway, postpone the flush until later,
     // since updating the cache is less important than reading from it.
     return flushSetMany.timer = setTimeout(flushSetMany, 100);

From 027d3e15a7d7636b5ba9f6d0346e7b56ee55ef63 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 19:06:38 -0500
Subject: [PATCH 063/195] Share cache.checkMany transaction between
 simultaneous calls.

If import(...) is called multiple times in quick succession, these changes
should allow cache.checkMany to avoid the overhead of creating multiple
IndexedDB transactions.
---
 packages/dynamic-import/cache.js | 39 ++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index cb6fa01b69..c2256c8279 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -19,8 +19,35 @@ function withDB(callback) {
   return dbPromise.then(callback);
 }
 
+var checkTxn;
 var checkCount = 0;
 
+function acquireCheckTransaction(db) {
+  if (++checkCount === 1) {
+    checkTxn = db.transaction([
+      "versionsById",
+      "sourcesByVersion"
+    ], "readonly");
+
+    var store = checkTxn.objectStore("versionsById");
+
+    // Keep this transaction alive as long as checkTxn is defined.
+    (function spin() {
+      if (checkTxn) {
+        store.get(-Infinity).onsuccess = spin;
+      }
+    }());
+  }
+
+  return checkTxn;
+}
+
+function releaseCheckTransaction() {
+  if (--checkCount === 0) {
+    checkTxn = null;
+  }
+}
+
 exports.checkMany = function (versions) {
   var ids = Object.keys(versions);
   var sourcesById = Object.create(null);
@@ -36,16 +63,10 @@ exports.checkMany = function (versions) {
   }
 
   return withDB(function (db) {
-    var txn = db.transaction([
-      "versionsById",
-      "sourcesByVersion"
-    ], "readonly");
-
+    var txn = acquireCheckTransaction(db);
     var versionsById = txn.objectStore("versionsById");
     var sourcesByVersion = txn.objectStore("sourcesByVersion");
 
-    ++checkCount;
-
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
         var versionRequest = versionsById.get(id);
@@ -69,7 +90,7 @@ exports.checkMany = function (versions) {
         };
       });
     })).then(function () {
-      --checkCount;
+      releaseCheckTransaction();
       return sourcesById;
     });
   });
@@ -93,7 +114,7 @@ exports.setMany = function (versionsAndSourcesById) {
 };
 
 function flushSetMany() {
-  if (checkCount > 0) {
+  if (checkTxn) {
     // If checkMany is currently underway, postpone the flush until later,
     // since updating the cache is less important than reading from it.
     return flushSetMany.timer = setTimeout(flushSetMany, 100);

From 6def3891e115ac539b44f3729ff8784ff725f444 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 20:09:27 -0500
Subject: [PATCH 064/195] Bump package versions for 1.5-beta.9 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 6804dd2fd9..92095b1ff7 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.15.0-beta.8'
+  version: '6.15.0-beta.9'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 4b6b487e0d..a3107f9779 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.8",
+  version: "0.1.0-beta.9",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 84a3c08654..a757407f46 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.8',
+  version: '0.7.0-beta.9',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 25854e8b89..a8271bb5f7 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.1.0-beta.8"
+  version: "1.1.0-beta.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index bacd444772..bb46b23cf6 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.5.0-beta.8'
+  version: '1.5.0-beta.9'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 2d053ebac7..e3be0cf997 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.8",
+  version: "0.8.0-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 8e0304df68..95910889b6 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.8",
+  version: "0.8.0-beta.9",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 0b7cf43a28..bfca862551 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.8",
+ "version": "1.5-beta.9",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4225528646ae4e071e9a55febd3da31f12c569eb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 20:56:00 -0500
Subject: [PATCH 065/195] Try harder to find the indexedDB API object.

---
 packages/dynamic-import/cache.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index c2256c8279..9e04812dd4 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -1,8 +1,16 @@
 var dbPromise;
 
+function getIDB() {
+  if (typeof indexedDB !== "undefined") return indexedDB;
+  if (typeof webkitIndexedDB !== "undefined") return webkitIndexedDB;
+  if (typeof mozIndexedDB !== "undefined") return mozIndexedDB;
+  if (typeof OIndexedDB !== "undefined") return OIndexedDB;
+  if (typeof msIndexedDB !== "undefined") return msIndexedDB;
+}
+
 function withDB(callback) {
   dbPromise = dbPromise || new Promise(function (resolve, reject) {
-    var request = global.indexedDB.open("MeteorDynamicImportCache", 1);
+    var request = getIDB().open("MeteorDynamicImportCache", 1);
 
     request.onupgradeneeded = function (event) {
       var db = event.target.result;

From b0a5bd51f1c2384b22bdba30d6dd22b08e23b08f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 4 Mar 2017 20:56:07 -0500
Subject: [PATCH 066/195] Fix tests by rejecting proper Error objects.

---
 packages/dynamic-import/cache.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 9e04812dd4..78cde52a54 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -18,7 +18,7 @@ function withDB(callback) {
       db.createObjectStore("sourcesByVersion", { keyPath: "version" });
     };
 
-    request.onerror = reject;
+    request.onerror = makeOnError(reject);
     request.onsuccess = function (event) {
       resolve(event.target.result);
     };
@@ -27,6 +27,12 @@ function withDB(callback) {
   return dbPromise.then(callback);
 }
 
+function makeOnError(reject) {
+  return function (event) {
+    reject(event.target.error);
+  };
+}
+
 var checkTxn;
 var checkCount = 0;
 
@@ -78,13 +84,13 @@ exports.checkMany = function (versions) {
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
         var versionRequest = versionsById.get(id);
-        versionRequest.onerror = reject;
+        versionRequest.onerror = makeOnError(reject);
         versionRequest.onsuccess = function (event) {
           var result = event.target.result;
           var previousVersion = result && result.version;
           if (previousVersion === versions[id]) {
             var sourceRequest = sourcesByVersion.get(previousVersion);
-            sourceRequest.onerror = reject;
+            sourceRequest.onerror = makeOnError(reject);
             sourceRequest.onsuccess = function (event) {
               var result = event.target.result;
               if (result) {
@@ -164,7 +170,7 @@ function flushSetMany() {
 function put(store, object) {
   return new Promise(function (resolve, reject) {
     var request = store.put(object);
-    request.onerror = reject;
+    request.onerror = makeOnError(reject);
     request.onsuccess = resolve;
   });
 }

From f6df21ff1ed7e54db2d1df90f6d766f971a93f58 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Mar 2017 19:59:25 -0500
Subject: [PATCH 067/195] Force garbage collection more aggressively during
 meteor --get-ready.

This is an effort to keep the `meteor --get-ready` command from running
out of memory during Circle CI tests, as mentioned in this comment:
https://github.com/meteor/meteor/pull/8327#issuecomment-284431618
---
 circle.yml                      |  6 +++++-
 tools/isobuild/isopack-cache.js |  2 ++
 tools/utils/gc.js               | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tools/utils/gc.js

diff --git a/circle.yml b/circle.yml
index e1f034758c..27e599e8a9 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,8 +12,12 @@ dependencies:
     - ".babel-cache"
   override:
     # shouldn't take longer than 10 minutes
-    - METEOR_PRETTY_OUTPUT=0 METEOR_DISABLE_OPTIMISTIC_CACHING=1 ./meteor --get-ready:
+    - ./meteor --get-ready:
         timeout: 600
+        environment:
+          METEOR_PRETTY_OUTPUT: 0
+          METEOR_DISABLE_OPTIMISTIC_CACHING: 1
+          TOOL_NODE_FLAGS: --expose-gc
 
 test:
   override:
diff --git a/tools/isobuild/isopack-cache.js b/tools/isobuild/isopack-cache.js
index 69fb8846c8..5da0a09ed9 100644
--- a/tools/isobuild/isopack-cache.js
+++ b/tools/isobuild/isopack-cache.js
@@ -8,6 +8,7 @@ var watch = require('../fs/watch.js');
 var colonConverter = require('../utils/colon-converter.js');
 var Profile = require('../tool-env/profile.js').Profile;
 var archinfo = require('../utils/archinfo.js');
+import { requestGarbageCollection } from "../utils/gc.js";
 
 export class IsopackCache {
   constructor(options) {
@@ -74,6 +75,7 @@ export class IsopackCache {
     } else {
       self._packageMap.eachPackage(function (name, packageInfo) {
         self._ensurePackageLoaded(name, onStack);
+        requestGarbageCollection();
       });
     }
   }
diff --git a/tools/utils/gc.js b/tools/utils/gc.js
new file mode 100644
index 0000000000..3d087dd5a4
--- /dev/null
+++ b/tools/utils/gc.js
@@ -0,0 +1,12 @@
+// For this global function to be defined, the --expose-gc flag must have
+// been passed to node at the bottom of the ../../meteor script, probably
+// via the TOOL_NODE_FLAGS environment variable.
+const gc = global.gc;
+
+// In the future, this function may become smarter about how often it
+// actually calls the gc function, but that's an implementation detail.
+export function requestGarbageCollection() {
+  if (typeof gc === "function") {
+    gc();
+  }
+}

From 35f488e140c5df4a2bc70de271feb38921d2a6d3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Mar 2017 20:10:49 -0500
Subject: [PATCH 068/195] Force garbage collection more aggressively during
 package DB sync.

This is an effort to keep the `meteor --get-ready` command from running
out of memory during Circle CI tests, as mentioned in this comment:
https://github.com/meteor/meteor/pull/8327#issuecomment-284431618
---
 tools/packaging/package-client.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/packaging/package-client.js b/tools/packaging/package-client.js
index 2ae4ed6f5d..9228cdd892 100644
--- a/tools/packaging/package-client.js
+++ b/tools/packaging/package-client.js
@@ -13,6 +13,8 @@ var projectContextModule = require('../project-context.js');
 var colonConverter = require('../utils/colon-converter.js');
 var Profile = require('../tool-env/profile.js').Profile;
 
+import { requestGarbageCollection } from "../utils/gc.js";
+
 // Opens a DDP connection to a package server. Loads the packages needed for a
 // DDP connection, then calls DDP connect to the package server URL in config,
 // using a current user-agent header composed by http-helpers.js.
@@ -219,6 +221,7 @@ var _updateServerPackageData = function (dataStore, options) {
   try {
     while (!done) {
       getSomeData();
+      requestGarbageCollection();
     }
   } finally {
     conn.close();

From 2071bdd820a9a43f8d26f69d1d938f986813168d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Mar 2017 20:26:23 -0500
Subject: [PATCH 069/195] Fix tests by throwing real Error objects when
 IndexedDB fails.

---
 packages/dynamic-import/cache.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 78cde52a54..3dbc79f9c1 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -18,7 +18,7 @@ function withDB(callback) {
       db.createObjectStore("sourcesByVersion", { keyPath: "version" });
     };
 
-    request.onerror = makeOnError(reject);
+    request.onerror = makeOnError(reject, "indexedDB.open");
     request.onsuccess = function (event) {
       resolve(event.target.result);
     };
@@ -27,9 +27,12 @@ function withDB(callback) {
   return dbPromise.then(callback);
 }
 
-function makeOnError(reject) {
+function makeOnError(reject, source) {
   return function (event) {
-    reject(event.target.error);
+    var error = new Error("IndexedDB failure in " + source);
+    var idbError = event.target.error;
+    error.stack = idbError && idbError.stack;
+    reject(error);
   };
 }
 
@@ -84,13 +87,13 @@ exports.checkMany = function (versions) {
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
         var versionRequest = versionsById.get(id);
-        versionRequest.onerror = makeOnError(reject);
+        versionRequest.onerror = makeOnError(reject, "versionsById.get");
         versionRequest.onsuccess = function (event) {
           var result = event.target.result;
           var previousVersion = result && result.version;
           if (previousVersion === versions[id]) {
             var sourceRequest = sourcesByVersion.get(previousVersion);
-            sourceRequest.onerror = makeOnError(reject);
+            sourceRequest.onerror = makeOnError(reject, "sourcesByVersion.get");
             sourceRequest.onsuccess = function (event) {
               var result = event.target.result;
               if (result) {
@@ -170,7 +173,7 @@ function flushSetMany() {
 function put(store, object) {
   return new Promise(function (resolve, reject) {
     var request = store.put(object);
-    request.onerror = makeOnError(reject);
+    request.onerror = makeOnError(reject, store.name + ".put");
     request.onsuccess = resolve;
   });
 }

From 7c37aae7cdcafbc63d7e21c5346781ef8cf50a53 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Mar 2017 20:40:21 -0500
Subject: [PATCH 070/195] Run `meteor --help` instead of `--get-ready` in
 test-in-console/run.sh.

The --help command will retrieve the dev bundle as desired, and is far
less expensive (in terms of both time and memory) than --get-ready.
---
 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..0509632277 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -12,7 +12,7 @@ export METEOR_HOME=`pwd`
 
 export PATH=$METEOR_HOME:$PATH
 # synchronously get the dev bundle and NPM modules if they're not there.
-./meteor --get-ready || exit 1
+./meteor --help || exit 1
 
 export URL='http://localhost:4096/'
 

From 732915c9a2d1e6b509e318d60fb4574a37911cde Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 6 Mar 2017 21:29:30 -0500
Subject: [PATCH 071/195] Revert "Share cache.checkMany transaction between
 simultaneous calls."

This reverts commit 027d3e15a7d7636b5ba9f6d0346e7b56ee55ef63.

This optimization was not safe in all browsers. In particular, Firefox
complained about requests against inactive transactions.
---
 packages/dynamic-import/cache.js | 39 ++++++++------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 3dbc79f9c1..9be3ae3248 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -36,35 +36,8 @@ function makeOnError(reject, source) {
   };
 }
 
-var checkTxn;
 var checkCount = 0;
 
-function acquireCheckTransaction(db) {
-  if (++checkCount === 1) {
-    checkTxn = db.transaction([
-      "versionsById",
-      "sourcesByVersion"
-    ], "readonly");
-
-    var store = checkTxn.objectStore("versionsById");
-
-    // Keep this transaction alive as long as checkTxn is defined.
-    (function spin() {
-      if (checkTxn) {
-        store.get(-Infinity).onsuccess = spin;
-      }
-    }());
-  }
-
-  return checkTxn;
-}
-
-function releaseCheckTransaction() {
-  if (--checkCount === 0) {
-    checkTxn = null;
-  }
-}
-
 exports.checkMany = function (versions) {
   var ids = Object.keys(versions);
   var sourcesById = Object.create(null);
@@ -80,10 +53,16 @@ exports.checkMany = function (versions) {
   }
 
   return withDB(function (db) {
-    var txn = acquireCheckTransaction(db);
+    var txn = db.transaction([
+      "versionsById",
+      "sourcesByVersion"
+    ], "readonly");
+
     var versionsById = txn.objectStore("versionsById");
     var sourcesByVersion = txn.objectStore("sourcesByVersion");
 
+    ++checkCount;
+
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
         var versionRequest = versionsById.get(id);
@@ -107,7 +86,7 @@ exports.checkMany = function (versions) {
         };
       });
     })).then(function () {
-      releaseCheckTransaction();
+      --checkCount;
       return sourcesById;
     });
   });
@@ -131,7 +110,7 @@ exports.setMany = function (versionsAndSourcesById) {
 };
 
 function flushSetMany() {
-  if (checkTxn) {
+  if (checkCount > 0) {
     // If checkMany is currently underway, postpone the flush until later,
     // since updating the cache is less important than reading from it.
     return flushSetMany.timer = setTimeout(flushSetMany, 100);

From 23e82bb1effe9a3cdc0fa310f442d5ca2cbde894 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Mar 2017 16:43:54 -0500
Subject: [PATCH 072/195] Include more error information when IndexedDB
 operations fail.

---
 packages/dynamic-import/cache.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 9be3ae3248..acbf6e1011 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -29,10 +29,10 @@ function withDB(callback) {
 
 function makeOnError(reject, source) {
   return function (event) {
-    var error = new Error("IndexedDB failure in " + source);
-    var idbError = event.target.error;
-    error.stack = idbError && idbError.stack;
-    reject(error);
+    reject(new Error(
+      "IndexedDB failure in " + source + " " +
+        JSON.stringify(event.target)
+    ));
   };
 }
 

From 8c44044cd1dcb129ab1e1ddefe5202dd06d809d3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Mar 2017 17:30:59 -0500
Subject: [PATCH 073/195] Ensure checkCount is decremented even if individual
 checks fail.

---
 packages/dynamic-import/cache.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index acbf6e1011..6c315f4618 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -63,6 +63,11 @@ exports.checkMany = function (versions) {
 
     ++checkCount;
 
+    function finish() {
+      --checkCount;
+      return sourcesById;
+    }
+
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
         var versionRequest = versionsById.get(id);
@@ -85,10 +90,7 @@ exports.checkMany = function (versions) {
           }
         };
       });
-    })).then(function () {
-      --checkCount;
-      return sourcesById;
-    });
+    })).then(finish, finish);
   });
 };
 

From 52c6c99b4d6905e69eaf0858faf0b0b5f5cfb34a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 7 Mar 2017 16:44:22 -0500
Subject: [PATCH 074/195] Remove versionsById IndexedDB object store.

Keeping track of the latest version for each module identifier was more
important when we were using localStorage, because it helped with
periodically removing unused module sources.

Since the storage limits for IndexedDB are substantially higher than for
localStorage, we can safely keep old versions in the cache, and reap the
benefits if those versions are ever needed again.

Eliminating this extra logic simplifies the caching logic considerably,
and also improves cache read performance.
---
 packages/dynamic-import/cache.js | 76 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 6c315f4618..1804a63db3 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -1,3 +1,4 @@
+var hasOwn = Object.prototype.hasOwnProperty;
 var dbPromise;
 
 function getIDB() {
@@ -10,12 +11,26 @@ function getIDB() {
 
 function withDB(callback) {
   dbPromise = dbPromise || new Promise(function (resolve, reject) {
-    var request = getIDB().open("MeteorDynamicImportCache", 1);
+    var idb = getIDB();
+    if (! idb) {
+      throw new Error("IndexedDB not available");
+    }
+
+    // Incrementing the version number causes all existing object stores
+    // to be deleted and recreates those specified by objectStoreMap.
+    var request = idb.open("MeteorDynamicImportCache", 2);
 
     request.onupgradeneeded = function (event) {
       var db = event.target.result;
-      db.createObjectStore("versionsById", { keyPath: "id" });
-      db.createObjectStore("sourcesByVersion", { keyPath: "version" });
+
+      // It's fine to delete existing object stores since onupgradeneeded
+      // is only called when we change the DB version number, and the data
+      // we're storing is disposable/reconstructible.
+      Array.from(db.objectStoreNames).forEach(db.deleteObjectStore, db);
+
+      Object.keys(objectStoreMap).forEach(function (name) {
+        db.createObjectStore(name, objectStoreMap[name]);
+      });
     };
 
     request.onerror = makeOnError(reject, "indexedDB.open");
@@ -27,6 +42,10 @@ function withDB(callback) {
   return dbPromise.then(callback);
 }
 
+var objectStoreMap = {
+  sourcesByVersion: { keyPath: "version" }
+};
+
 function makeOnError(reject, source) {
   return function (event) {
     reject(new Error(
@@ -54,11 +73,9 @@ exports.checkMany = function (versions) {
 
   return withDB(function (db) {
     var txn = db.transaction([
-      "versionsById",
       "sourcesByVersion"
     ], "readonly");
 
-    var versionsById = txn.objectStore("versionsById");
     var sourcesByVersion = txn.objectStore("sourcesByVersion");
 
     ++checkCount;
@@ -70,24 +87,14 @@ exports.checkMany = function (versions) {
 
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
-        var versionRequest = versionsById.get(id);
-        versionRequest.onerror = makeOnError(reject, "versionsById.get");
-        versionRequest.onsuccess = function (event) {
+        var sourceRequest = sourcesByVersion.get(versions[id]);
+        sourceRequest.onerror = makeOnError(reject, "sourcesByVersion.get");
+        sourceRequest.onsuccess = function (event) {
           var result = event.target.result;
-          var previousVersion = result && result.version;
-          if (previousVersion === versions[id]) {
-            var sourceRequest = sourcesByVersion.get(previousVersion);
-            sourceRequest.onerror = makeOnError(reject, "sourcesByVersion.get");
-            sourceRequest.onsuccess = function (event) {
-              var result = event.target.result;
-              if (result) {
-                sourcesById[id] = result.source;
-              }
-              resolve();
-            };
-          } else {
-            resolve();
+          if (result) {
+            sourcesById[id] = result.source;
           }
+          resolve();
         };
       });
     })).then(finish, finish);
@@ -125,29 +132,20 @@ function flushSetMany() {
 
   return withDB(function (db) {
     var setTxn = db.transaction([
-      "versionsById",
       "sourcesByVersion"
     ], "readwrite");
 
-    var versionsById = setTxn.objectStore("versionsById");
     var sourcesByVersion = setTxn.objectStore("sourcesByVersion");
-    var promises = [];
 
-    Object.keys(versionsAndSourcesById).forEach(function (id) {
-      var info = versionsAndSourcesById[id];
-
-      promises.push(put(versionsById, {
-        id: id,
-        version: info.version
-      }));
-
-      promises.push(put(sourcesByVersion, {
-        version: info.version,
-        source: info.source
-      }));
-    });
-
-    return Promise.all(promises);
+    return Promise.all(
+      Object.keys(versionsAndSourcesById).map(function (id) {
+        var info = versionsAndSourcesById[id];
+        return put(sourcesByVersion, {
+          version: info.version,
+          source: info.source
+        });
+      })
+    );
   });
 }
 

From aab14126d181fed150d5166eed0464f8754022e9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@benjamn.com>
Date: Wed, 8 Mar 2017 08:25:17 -0500
Subject: [PATCH 075/195] Refresh to-do list in
 packages/dynamic-import/README.md.

---
 packages/dynamic-import/README.md | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
index b65c33903c..521db3fad6 100644
--- a/packages/dynamic-import/README.md
+++ b/packages/dynamic-import/README.md
@@ -1,4 +1,4 @@
-Remaining work:
+Basic implementation:
 
 - [x] Future-proof `findImportedModuleIdentifiers` for real `import(...)`
 - [x] Source maps in development
@@ -9,17 +9,34 @@ Remaining work:
   - [x] Wrap modules with function to enable better minification
 - [x] Babel transform from `import(...)` to `module.importAsync(...)`
 - [x] Local module caching.
+  - [x] Prototype with `localStorage`.
+  - [x] Reimplement using `indexedDB` (much larger size limits).
 - [x] Compact `previous` state representation
 - [x] Improve dependency resolution in `packages/dynamic-import/server.js`
 - [x] Report static import/syntax/etc. errors for async files
 - [x] What about old/new versions of code?
-- [ ] What about package pseudo-globals (imports)?
+- [x] What about package pseudo-globals (imports)?
 - [x] What about dynamic stubs?
 - [x] Avoid creating dynamic files on the server.
-- [ ] `Mp.dynamicImport` could be implemented without the fallback on the
-      server if we were sure the server had no dynamic files.
-- [ ] Batch multiple __dynamicImport method calls.
+- [ ] ~~`Mp.dynamicImport` could be implemented without the fallback on the server if we were sure the server had no dynamic files.~~
 - [x] Make sure client-only reloads work (revisit _read caching).
 - [x] Make sure path manipulation is Windows-safe.
 - [x] Install dynamic modules with correct `meteorInstall` options.
-- [ ] Tests!
+- [x] Tests!
+
+Future work:
+- [ ] Batch multiple `__dynamicImport` method calls?
+- [ ] Detect modules unevaluated during page load and recommend importing them dynamically.
+- [ ] Quantify the impact of using `import(...)`.
+- [ ] Report initial bundle sizes.
+- [ ] Warn about `import(...)` calls before `Meteor.startup`, since they should probably be static.
+- [ ] Analyze module graph to suggest dynamic cut points (e.g. in router callbacks).
+- [ ] Warn if dynamically imported modules are imported statically elsewhere (killing the benefit of the dynamic import).
+- [ ] Use `Cache-Control: immutable` for the initial bundle.
+- [ ] Upgrade caching to `ServiceWorker` and `Cache` in supporting browsers (if actually faster!).
+- [ ] Preload modules that are often dynamically imported, when page becomes idle.
+- [ ] Allow the client to overfetch soon-to-be-needed modules to avoid waterfalls.
+- [ ] Write [Meteor Guide](https://guide.meteor.com/) article about techniques for optimizing page load times.
+  - [ ] Inlining imports.
+  - [ ] Making eager modules in apps and packages lazy.
+  - [ ] Using dynamic `import(...)` in the right places.

From 30f901bf02fbeb3b7240b7fd875a0ca81837974b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 08:53:09 -0500
Subject: [PATCH 076/195] Increase timeout for dynamic import(...) self-tests
 from 60s to 90s.

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

diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
index fc80941d39..137e77819a 100644
--- a/tools/tests/dynamic-import.js
+++ b/tools/tests/dynamic-import.js
@@ -38,7 +38,7 @@ function run(isProduction) {
 
   const run = sandbox.run(...args);
 
-  run.waitSecs(60);
+  run.waitSecs(90);
   run.match("App running at");
   run.match("SERVER FAILURES: 0");
   run.match("CLIENT FAILURES: 0");

From f955d7610c15c1ff03859d8a0274240b774acc9e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 14:33:55 -0500
Subject: [PATCH 077/195] Clone dispatch:phantomjs-tests package locally in
 dynamic-import app.

Revision: https://github.com/DispatchMe/meteor-phantomjs-tests/commit/831dfd19bdc1037b0f3251bff43aee2236f631f6
---
 .../packages/meteor-phantomjs-tests/.eslintrc |  21 +
 .../.npm/package/.gitignore                   |   1 +
 .../.npm/package/README                       |   7 +
 .../.npm/package/npm-shrinkwrap.json          | 545 ++++++++++++++++++
 .../packages/meteor-phantomjs-tests/.versions |  10 +
 .../packages/meteor-phantomjs-tests/LICENSE   |  21 +
 .../packages/meteor-phantomjs-tests/README.md |  52 ++
 .../meteor-phantomjs-tests/package.js         |  22 +
 .../meteor-phantomjs-tests/phantomjsScript.js |  56 ++
 .../packages/meteor-phantomjs-tests/server.js |  36 ++
 10 files changed, 771 insertions(+)
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.eslintrc
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/.gitignore
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/README
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/npm-shrinkwrap.json
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.versions
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/LICENSE
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/README.md
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/package.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/phantomjsScript.js
 create mode 100644 tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js

diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.eslintrc b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.eslintrc
new file mode 100644
index 0000000000..93d3ea1bd8
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.eslintrc
@@ -0,0 +1,21 @@
+{
+  "extends": "airbnb",
+  "env": {
+    "node": true,
+    "mocha": true
+  },
+  "globals": {
+    "expect": false,
+    "describe": false
+  },
+  "rules": {
+    "consistent-return": 1,
+    "max-len": 0,
+    "no-use-before-define": [2, "nofunc"],
+    "no-unused-expressions": 0,
+    "no-console": 0,
+    "space-before-function-paren": 0,
+    "react/prefer-stateless-function": 0,
+    "react/no-multi-comp": 0
+  }
+}
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/.gitignore b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/README b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/README
new file mode 100644
index 0000000000..3d492553a4
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/README
@@ -0,0 +1,7 @@
+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/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/npm-shrinkwrap.json b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 0000000000..f70a37efc6
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,545 @@
+{
+  "dependencies": {
+    "ansi-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+      "from": "ansi-regex@>=2.0.0 <3.0.0"
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "from": "ansi-styles@>=2.2.1 <3.0.0"
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "from": "asn1@>=0.2.3 <0.3.0"
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "from": "assert-plus@>=0.2.0 <0.3.0"
+    },
+    "async": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
+      "from": "async@>=2.0.1 <3.0.0"
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "from": "aws-sign2@>=0.6.0 <0.7.0"
+    },
+    "aws4": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
+      "from": "aws4@>=1.2.1 <2.0.0"
+    },
+    "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"
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz",
+      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0"
+    },
+    "bl": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+      "from": "bl@>=1.1.2 <1.2.0"
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "from": "boom@>=2.0.0 <3.0.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"
+    },
+    "caseless": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+      "from": "caseless@>=0.11.0 <0.12.0"
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "from": "chalk@>=1.1.1 <2.0.0"
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "from": "combined-stream@>=1.0.5 <1.1.0"
+    },
+    "commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "from": "commander@>=2.9.0 <3.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"
+    },
+    "concat-stream": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+      "from": "concat-stream@1.5.0"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "from": "core-util-is@>=1.0.0 <1.1.0"
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "from": "cryptiles@>=2.0.0 <3.0.0"
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "from": "dashdash@>=1.12.0 <2.0.0",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "from": "assert-plus@>=1.0.0 <2.0.0"
+        }
+      }
+    },
+    "debug": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
+      "from": "debug@0.7.4"
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "from": "delayed-stream@>=1.0.0 <1.1.0"
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "from": "ecc-jsbn@>=0.1.1 <0.2.0"
+    },
+    "es6-promise": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz",
+      "from": "es6-promise@>=4.0.3 <4.1.0"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "from": "escape-string-regexp@>=1.0.2 <2.0.0"
+    },
+    "extend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+      "from": "extend@>=3.0.0 <3.1.0"
+    },
+    "extract-zip": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
+      "from": "extract-zip@>=1.5.0 <1.6.0"
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+      "from": "extsprintf@1.0.2"
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "from": "fd-slicer@>=1.0.1 <1.1.0"
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "from": "forever-agent@>=0.6.1 <0.7.0"
+    },
+    "form-data": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
+      "from": "form-data@>=1.0.0-rc4 <1.1.0"
+    },
+    "fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "from": "fs-extra@>=0.30.0 <0.31.0"
+    },
+    "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"
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "from": "generate-function@>=2.0.0 <3.0.0"
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "from": "generate-object-property@>=1.1.0 <2.0.0"
+    },
+    "getpass": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+      "from": "getpass@>=0.1.1 <0.2.0",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "from": "assert-plus@>=1.0.0 <2.0.0"
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+      "from": "glob@>=7.0.5 <8.0.0"
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "from": "graceful-fs@>=4.1.2 <5.0.0"
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "from": "graceful-readlink@>=1.0.0"
+    },
+    "har-validator": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+      "from": "har-validator@>=2.0.6 <2.1.0"
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "from": "has-ansi@>=2.0.0 <3.0.0"
+    },
+    "hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "from": "hasha@>=2.2.0 <2.3.0"
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "from": "hawk@>=3.1.3 <3.2.0"
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "from": "hoek@>=2.0.0 <3.0.0"
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "from": "http-signature@>=1.1.0 <1.2.0"
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.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.1 <2.1.0"
+    },
+    "is-my-json-valid": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
+      "from": "is-my-json-valid@>=2.12.4 <3.0.0"
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "from": "is-property@>=1.0.0 <2.0.0"
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "from": "is-stream@>=1.0.1 <2.0.0"
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "from": "is-typedarray@>=1.0.0 <1.1.0"
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "from": "isarray@>=1.0.0 <1.1.0"
+    },
+    "isexe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz",
+      "from": "isexe@>=1.1.1 <2.0.0"
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "from": "isstream@>=0.1.2 <0.2.0"
+    },
+    "jodid25519": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
+      "from": "jodid25519@>=1.0.0 <2.0.0"
+    },
+    "jsbn": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
+      "from": "jsbn@>=0.1.0 <0.2.0"
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "from": "json-schema@0.2.3"
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "from": "json-stringify-safe@>=5.0.1 <5.1.0"
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "from": "jsonfile@>=2.1.0 <3.0.0"
+    },
+    "jsonpointer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz",
+      "from": "jsonpointer@>=4.0.0 <5.0.0"
+    },
+    "jsprim": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+      "from": "jsprim@>=1.2.2 <2.0.0"
+    },
+    "kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "from": "kew@>=0.7.0 <0.8.0"
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "from": "klaw@>=1.0.0 <2.0.0"
+    },
+    "lodash": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz",
+      "from": "lodash@>=4.14.0 <5.0.0"
+    },
+    "meteor-force-non-portable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/meteor-force-non-portable/-/meteor-force-non-portable-1.0.0.tgz",
+      "from": "meteor-force-non-portable@1.0.0"
+    },
+    "mime-db": {
+      "version": "1.25.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz",
+      "from": "mime-db@>=1.25.0 <1.26.0"
+    },
+    "mime-types": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz",
+      "from": "mime-types@>=2.1.7 <2.2.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.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+      "from": "mkdirp@0.5.0"
+    },
+    "node-uuid": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
+      "from": "node-uuid@>=1.4.7 <1.5.0"
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "from": "oauth-sign@>=0.8.1 <0.9.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.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"
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "from": "pend@>=1.2.0 <1.3.0"
+    },
+    "phantomjs-prebuilt": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
+      "from": "phantomjs-prebuilt@2.1.13"
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "from": "pinkie@>=2.0.0 <3.0.0"
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "from": "pinkie-promise@>=2.0.0 <3.0.0"
+    },
+    "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"
+    },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "from": "progress@>=1.1.8 <1.2.0"
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "from": "punycode@>=1.4.1 <2.0.0"
+    },
+    "qs": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz",
+      "from": "qs@>=6.2.0 <6.3.0"
+    },
+    "readable-stream": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+      "from": "readable-stream@>=2.0.0 <2.1.0"
+    },
+    "request": {
+      "version": "2.74.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
+      "from": "request@>=2.74.0 <2.75.0"
+    },
+    "request-progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+      "from": "request-progress@>=2.0.1 <2.1.0"
+    },
+    "rimraf": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+      "from": "rimraf@>=2.2.8 <3.0.0"
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "from": "sntp@>=1.0.0 <2.0.0"
+    },
+    "sshpk": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
+      "from": "sshpk@>=1.7.0 <2.0.0",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "from": "assert-plus@>=1.0.0 <2.0.0"
+        }
+      }
+    },
+    "string_decoder": {
+      "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"
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "from": "stringstream@>=0.0.4 <0.1.0"
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "from": "strip-ansi@>=3.0.0 <4.0.0"
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "from": "supports-color@>=2.0.0 <3.0.0"
+    },
+    "throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "from": "throttleit@>=1.0.0 <2.0.0"
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "from": "tough-cookie@>=2.3.0 <2.4.0"
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "from": "tunnel-agent@>=0.4.1 <0.5.0"
+    },
+    "tweetnacl": {
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz",
+      "from": "tweetnacl@>=0.14.0 <0.15.0"
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "from": "typedarray@>=0.0.5 <0.1.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"
+    },
+    "verror": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+      "from": "verror@1.3.6"
+    },
+    "which": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.12.tgz",
+      "from": "which@>=1.2.10 <1.3.0"
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "from": "wrappy@>=1.0.0 <2.0.0"
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "from": "xtend@>=4.0.0 <5.0.0"
+    },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "from": "yauzl@2.4.1"
+    }
+  }
+}
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.versions b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.versions
new file mode 100644
index 0000000000..302b138809
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/.versions
@@ -0,0 +1,10 @@
+babel-compiler@6.6.4
+babel-runtime@0.1.8
+dispatch:phantomjs-tests@0.0.7
+ecmascript@0.4.3
+ecmascript-runtime@0.2.10
+meteor@1.1.14
+modules@0.6.1
+modules-runtime@0.6.3
+promise@0.6.7
+underscore@1.0.8
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/LICENSE b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/LICENSE
new file mode 100644
index 0000000000..cac20154a4
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Dispatch
+
+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.
\ No newline at end of file
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/README.md b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/README.md
new file mode 100644
index 0000000000..4d90fca0e4
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/README.md
@@ -0,0 +1,52 @@
+# dispatch:phantomjs-tests
+
+This package exports a `startPhantom` function for server code, which runs your client tests within a PhantomJS page. Meteor test driver packages can depend on this package. See the example implementation here: https://github.com/DispatchMe/meteor-mocha-phantomjs
+
+## Usage
+
+In your test driver package `package.js` file, add
+
+```js
+api.use('dispatch:phantomjs-tests@0.0.1', 'server');
+```
+
+Then in your server code, do something similar to this:
+
+```js
+import { startPhantom } from 'meteor/dispatch:phantomjs-tests';
+
+function start() {
+  startPhantom({
+    stdout(data) {
+      console.log(data.toString());
+    },
+    stderr(data) {
+      console.log(data.toString());
+    },
+    done(failureCount) {
+      // Your code to run when client tests are done running
+    },
+  });
+}
+
+export { start };
+```
+
+And in your client code, you need to set some properties on `window` so that the PhantomJS script knows what is happening:
+
+```js
+// Run the client tests. Meteor calls the `runTests` function exported by
+// the driver package on the client.
+function runTests() {
+  // These `window` properties are all used by the phantomjs script to
+  // know what is happening.
+  window.testsAreRunning = true;
+  mocha.run((failures) => {
+    window.testsAreRunning = false;
+    window.testFailures = failures;
+    window.testsDone = true;
+  });
+}
+
+export { runTests };
+```
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/package.js b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/package.js
new file mode 100644
index 0000000000..a3c08df849
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/package.js
@@ -0,0 +1,22 @@
+Package.describe({
+  name: "dispatch:phantomjs-tests",
+  summary: "A helper package for Meteor test driver packages. Runs client tests in PhantomJS.",
+  git: "https://github.com/dispatch/meteor-phantomjs-tests.git",
+  version: '0.0.7',
+  testOnly: true,
+});
+
+Npm.depends({
+  'meteor-force-non-portable': '1.0.0',
+  'phantomjs-prebuilt': '2.1.13',
+});
+
+Package.onUse(function (api) {
+  api.versionsFrom('1.2.1');
+
+  api.use('ecmascript');
+
+  api.addAssets('phantomjsScript.js', 'server');
+
+  api.mainModule('server.js', 'server');
+});
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/phantomjsScript.js b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/phantomjsScript.js
new file mode 100644
index 0000000000..b33cbe1cdb
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/phantomjsScript.js
@@ -0,0 +1,56 @@
+var page = require('webpage').create();
+var system = require('system');
+
+// Returns a string with ANSII escape characters removed.
+// Borrowed from https://www.npmjs.com/package/strip-ansi
+function stripAnsi(str) {
+  if (str.length === 0) return str;
+  return str.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+}
+
+var lastOutput = new Date();
+page.onConsoleMessage = function(message) {
+  lastOutput = new Date();
+  if (typeof message === 'string') {
+    // Remove empty "stdout" lines. Not sure where these come from.
+    // See https://github.com/DispatchMe/meteor-mocha-phantomjs/issues/30
+    if (stripAnsi(message).trim() !== 'stdout:') console.log(message);
+    return;
+  }
+  console.log(message);
+};
+
+page.onError = function(msg, trace) {
+  var testsAreRunning = page.evaluate(function() {
+    return window.testsAreRunning;
+  });
+  if (testsAreRunning) return;
+  console.error(msg);
+  trace.forEach(function(item) {
+    console.error('    ' + item.file + ': ' + item.line);
+  });
+  // We could call phantom.exit here, but sometimes there are benign client errors
+  // and the tests still load and run fine. So instead there is a safeguard in the
+  // setInterval to exit if nothing happens for awhile.
+};
+
+page.open(system.env.ROOT_URL);
+
+setInterval(function() {
+  var done = page.evaluate(function() {
+    return window.testsDone;
+  });
+  if (done) {
+    var failures = page.evaluate(function() {
+      return window.testFailures;
+    });
+    // We pass back the number of failures as the exit code
+    return phantom.exit(failures);
+  }
+
+  // As a safeguard, we will exit if there hasn't been console output for
+  // 30 seconds.
+  if ((new Date()) - lastOutput > 30000) {
+    phantom.exit(2);
+  }
+}, 500);
diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js
new file mode 100644
index 0000000000..08984a6cb8
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js
@@ -0,0 +1,36 @@
+const phantomjs = Npm.require('phantomjs-prebuilt');
+const childProcess = Npm.require('child_process');
+
+const PHANTOMJS_SCRIPT_FILE_NAME = 'phantomjsScript.js';
+
+function startPhantom({
+  stdout,
+  stderr,
+  done,
+}) {
+  const scriptPath = Assets.absoluteFilePath(PHANTOMJS_SCRIPT_FILE_NAME);
+
+  if (process.env.METEOR_PHANTOMJS_DEBUG) {
+    console.log('PhantomJS Path:', phantomjs.path);
+    console.log('PhantomJS Script Path:', scriptPath);
+  }
+
+  const phantomProcess = childProcess.execFile(phantomjs.path, [scriptPath], {
+    env: {
+      ROOT_URL: process.env.ROOT_URL,
+    },
+  });
+
+  phantomProcess.on('error', (error) => {
+    throw error;
+  });
+
+  phantomProcess.on('exit', done);
+
+  // The PhantomJS script echoes whatever the page prints to the browser console and
+  // here we echo that once again.
+  phantomProcess.stdout.on('data', stdout);
+  phantomProcess.stderr.on('data', stderr);
+}
+
+export { startPhantom };

From ac451ac73fa53ad9e4fb2284478372f18b8b9a91 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 14:40:51 -0500
Subject: [PATCH 078/195] Respect METEOR_PHANTOMJS_* env vars in
 dispatch:phantomjs-tests.

Same changes as https://github.com/benjamn/meteor-phantomjs-tests/commit/185d8e9bc5af5583094fdae4413cb3f1efe4cfd6
---
 .../packages/meteor-phantomjs-tests/server.js | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js
index 08984a6cb8..1925cacbd6 100644
--- a/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js
+++ b/tools/tests/apps/dynamic-import/packages/meteor-phantomjs-tests/server.js
@@ -3,7 +3,7 @@ const childProcess = Npm.require('child_process');
 
 const PHANTOMJS_SCRIPT_FILE_NAME = 'phantomjsScript.js';
 
-function startPhantom({
+export function startPhantom({
   stdout,
   stderr,
   done,
@@ -15,7 +15,24 @@ function startPhantom({
     console.log('PhantomJS Script Path:', scriptPath);
   }
 
-  const phantomProcess = childProcess.execFile(phantomjs.path, [scriptPath], {
+  const args = [];
+  const keyPrefix = "METEOR_PHANTOMJS_";
+  Object.keys(process.env).forEach(key => {
+    if (key.startsWith(keyPrefix)) {
+      console.log(keyPrefix);
+      args.push(
+        "--" + key
+          .slice(keyPrefix.length)
+          .toLowerCase()
+          .replace(/_/g, "-"),
+        process.env[key]
+      );
+    }
+  });
+
+  args.push(scriptPath);
+
+  const phantomProcess = childProcess.execFile(phantomjs.path, args, {
     env: {
       ROOT_URL: process.env.ROOT_URL,
     },
@@ -32,5 +49,3 @@ function startPhantom({
   phantomProcess.stdout.on('data', stdout);
   phantomProcess.stderr.on('data', stderr);
 }
-
-export { startPhantom };

From b6b4cd6a21178fe3f5618aeb5a0614e8259c672b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 14:42:11 -0500
Subject: [PATCH 079/195] Set PhantomJS offline storage path/quota for dynamic
 import tests.

Telling PhantomJS where it can put offline data is critical for enabling
IndexedDB, which is critical for caching dynamically imported modules.
---
 tools/tests/dynamic-import.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/tests/dynamic-import.js b/tools/tests/dynamic-import.js
index 137e77819a..871cd23c7c 100644
--- a/tools/tests/dynamic-import.js
+++ b/tools/tests/dynamic-import.js
@@ -1,5 +1,9 @@
 var selftest = require('../tool-testing/selftest.js');
 var Sandbox = selftest.Sandbox;
+const { mkdtemp } = require("../fs/files.js");
+
+const offlineStoragePath = mkdtemp("phantomjs-offline");
+const offlineStorageQuotaKB = 10000;
 
 selftest.define("dynamic import(...) in development", function () {
   const s = new Sandbox();
@@ -36,6 +40,16 @@ function run(isProduction) {
     sandbox.set("NODE_ENV", "development");
   }
 
+  sandbox.set(
+    "METEOR_PHANTOMJS_OFFLINE_STORAGE_PATH",
+    offlineStoragePath
+  );
+
+  sandbox.set(
+    "METEOR_PHANTOMJS_OFFLINE_STORAGE_QUOTA",
+    String(offlineStorageQuotaKB)
+  );
+
   const run = sandbox.run(...args);
 
   run.waitSecs(90);

From ec3341e7adb89889deadc1d3ecd8d8a181b958f1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 10:37:09 -0500
Subject: [PATCH 080/195] Inline put(store, object) helper function since used
 only once.

---
 packages/dynamic-import/cache.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 1804a63db3..74cf64c73a 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -140,19 +140,15 @@ function flushSetMany() {
     return Promise.all(
       Object.keys(versionsAndSourcesById).map(function (id) {
         var info = versionsAndSourcesById[id];
-        return put(sourcesByVersion, {
-          version: info.version,
-          source: info.source
+        return new Promise(function (resolve, reject) {
+          var request = sourcesByVersion.put({
+            version: info.version,
+            source: info.source
+          });
+          request.onerror = makeOnError(reject, "sourcesByVersion.put");
+          request.onsuccess = resolve;
         });
       })
     );
   });
 }
-
-function put(store, object) {
-  return new Promise(function (resolve, reject) {
-    var request = store.put(object);
-    request.onerror = makeOnError(reject, store.name + ".put");
-    request.onsuccess = resolve;
-  });
-}

From 621d148909f5576de6580fbf695ac8e194b77edd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 12:10:09 -0500
Subject: [PATCH 081/195] Decompose maybeClearDynamicImportCache to declutter
 tests.

---
 tools/tests/apps/dynamic-import/tests.js | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 03a9b39d03..fd38dab720 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -1,20 +1,7 @@
 import assert from "assert";
 
 describe("dynamic import(...)", function () {
-  if (global.indexedDB) {
-    const saveCache = process.env.METEOR_SAVE_DYNAMIC_IMPORT_CACHE;
-    if (! (saveCache && JSON.parse(saveCache))) {
-      it("cleared the IndexedDB cache", function () {
-        return new Promise((resolve, reject) => {
-          const deleteRequest =
-            global.indexedDB.deleteDatabase("MeteorDynamicImportCache");
-          deleteRequest.onerror =
-          deleteRequest.onblocked =
-          deleteRequest.onsuccess = resolve;
-        });
-      });
-    }
-  }
+  maybeClearDynamicImportCache();
 
   it("import same module both statically and dynamically", function () {
     import moment from "moment";
@@ -162,3 +149,20 @@ describe("dynamic import(...)", function () {
     );
   });
 });
+
+function maybeClearDynamicImportCache() {
+  if (global.indexedDB) {
+    const saveCache = process.env.METEOR_SAVE_DYNAMIC_IMPORT_CACHE;
+    if (! (saveCache && JSON.parse(saveCache))) {
+      it("cleared the IndexedDB cache", function () {
+        return new Promise((resolve, reject) => {
+          const deleteRequest =
+            global.indexedDB.deleteDatabase("MeteorDynamicImportCache");
+          deleteRequest.onerror =
+          deleteRequest.onblocked =
+          deleteRequest.onsuccess = resolve;
+        });
+      });
+    }
+  }
+}

From 780cbf7896ace830505af435718ac7338a0a13da Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 17:56:36 -0500
Subject: [PATCH 082/195] Move dynamic-import/README.md to TODO.md and shorten
 README.md.

---
 packages/dynamic-import/README.md | 51 +++++++------------------------
 packages/dynamic-import/TODO.md   | 43 ++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 40 deletions(-)
 create mode 100644 packages/dynamic-import/TODO.md

diff --git a/packages/dynamic-import/README.md b/packages/dynamic-import/README.md
index 521db3fad6..fe315fdaa1 100644
--- a/packages/dynamic-import/README.md
+++ b/packages/dynamic-import/README.md
@@ -1,42 +1,13 @@
-Basic implementation:
+This package implements the `Module.prototype.dynamicImport(id)` runtime
+API needed for fetching modules dynamically from the server, so that those
+modules don't have to be included in the initial JavaScript bundle.
 
-- [x] Future-proof `findImportedModuleIdentifiers` for real `import(...)`
-- [x] Source maps in development
-- [x] Debugger stops at reasonable points in dev tools
-- [x] Open another WebSocket? NO
-- [x] Make `import(...)` work on the server
-- [x] Modules are minified but not merged in production
-  - [x] Wrap modules with function to enable better minification
-- [x] Babel transform from `import(...)` to `module.importAsync(...)`
-- [x] Local module caching.
-  - [x] Prototype with `localStorage`.
-  - [x] Reimplement using `indexedDB` (much larger size limits).
-- [x] Compact `previous` state representation
-- [x] Improve dependency resolution in `packages/dynamic-import/server.js`
-- [x] Report static import/syntax/etc. errors for async files
-- [x] What about old/new versions of code?
-- [x] What about package pseudo-globals (imports)?
-- [x] What about dynamic stubs?
-- [x] Avoid creating dynamic files on the server.
-- [ ] ~~`Mp.dynamicImport` could be implemented without the fallback on the server if we were sure the server had no dynamic files.~~
-- [x] Make sure client-only reloads work (revisit _read caching).
-- [x] Make sure path manipulation is Windows-safe.
-- [x] Install dynamic modules with correct `meteorInstall` options.
-- [x] Tests!
+With this package installed, supporting the [dynamic `import(...)`
+proposal](https://github.com/tc39/proposal-dynamic-import) is as easy as
+compiling `import(...)` to `module.dynamicImport(...)`.
 
-Future work:
-- [ ] Batch multiple `__dynamicImport` method calls?
-- [ ] Detect modules unevaluated during page load and recommend importing them dynamically.
-- [ ] Quantify the impact of using `import(...)`.
-- [ ] Report initial bundle sizes.
-- [ ] Warn about `import(...)` calls before `Meteor.startup`, since they should probably be static.
-- [ ] Analyze module graph to suggest dynamic cut points (e.g. in router callbacks).
-- [ ] Warn if dynamically imported modules are imported statically elsewhere (killing the benefit of the dynamic import).
-- [ ] Use `Cache-Control: immutable` for the initial bundle.
-- [ ] Upgrade caching to `ServiceWorker` and `Cache` in supporting browsers (if actually faster!).
-- [ ] Preload modules that are often dynamically imported, when page becomes idle.
-- [ ] Allow the client to overfetch soon-to-be-needed modules to avoid waterfalls.
-- [ ] Write [Meteor Guide](https://guide.meteor.com/) article about techniques for optimizing page load times.
-  - [ ] Inlining imports.
-  - [ ] Making eager modules in apps and packages lazy.
-  - [ ] Using dynamic `import(...)` in the right places.
+Any version of a module that has been fetched previously will be
+permanently cached and should never need to be fetched again by the same
+client, even after the window is closed or the browser is restarted.
+
+Meteor 1.5 is necessary for this package to work properly.
diff --git a/packages/dynamic-import/TODO.md b/packages/dynamic-import/TODO.md
new file mode 100644
index 0000000000..804a8de8b6
--- /dev/null
+++ b/packages/dynamic-import/TODO.md
@@ -0,0 +1,43 @@
+### Basic implementation:
+
+- [x] Future-proof `findImportedModuleIdentifiers` for real `import(...)`
+- [x] Source maps in development
+- [x] Debugger stops at reasonable points in dev tools
+- [x] Open another WebSocket? NO
+- [x] Make `import(...)` work on the server
+- [x] Modules are minified but not merged in production
+  - [x] Wrap modules with function to enable better minification
+- [x] Babel transform from `import(...)` to `module.importAsync(...)`
+- [x] Local module caching.
+  - [x] Prototype with `localStorage`.
+  - [x] Reimplement using `indexedDB` (much larger size limits).
+- [x] Compact `previous` state representation
+- [x] Improve dependency resolution in `packages/dynamic-import/server.js`
+- [x] Report static import/syntax/etc. errors for async files
+- [x] What about old/new versions of code?
+- [x] What about package pseudo-globals (imports)?
+- [x] What about dynamic stubs?
+- [x] Avoid creating dynamic files on the server.
+- [ ] ~~`Mp.dynamicImport` could be implemented without the fallback on the server if we were sure the server had no dynamic files.~~
+- [x] Make sure client-only reloads work (revisit _read caching).
+- [x] Make sure path manipulation is Windows-safe.
+- [x] Install dynamic modules with correct `meteorInstall` options.
+- [x] Tests!
+
+### Future work:
+
+- [ ] Batch multiple `__dynamicImport` method calls?
+- [ ] Detect modules unevaluated during page load and recommend importing them dynamically.
+- [ ] Quantify the impact of using `import(...)`.
+- [ ] Report initial bundle sizes.
+- [ ] Warn about `import(...)` calls before `Meteor.startup`, since they should probably be static.
+- [ ] Analyze module graph to suggest dynamic cut points (e.g. in router callbacks).
+- [ ] Warn if dynamically imported modules are imported statically elsewhere (killing the benefit of the dynamic import).
+- [ ] Use `Cache-Control: immutable` for the initial bundle.
+- [ ] Upgrade caching to `ServiceWorker` and `Cache` in supporting browsers (if actually faster!).
+- [ ] Preload modules that are often dynamically imported, when page becomes idle.
+- [ ] Allow the client to overfetch soon-to-be-needed modules to avoid waterfalls.
+- [ ] Write [Meteor Guide](https://guide.meteor.com/) article about techniques for optimizing page load times.
+  - [ ] Inlining imports.
+  - [ ] Making eager modules in apps and packages lazy.
+  - [ ] Using dynamic `import(...)` in the right places.

From b1aa458e38128915142d2691fc9f8f7b8d61cb58 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 8 Mar 2017 17:56:59 -0500
Subject: [PATCH 083/195] Bump package versions for 1.5-beta.10 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 92095b1ff7..a08e800fa0 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.15.0-beta.9'
+  version: '6.15.0-beta.10'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index a3107f9779..5f193fda47 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.9",
+  version: "0.1.0-beta.10",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index a757407f46..504a701ede 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.9',
+  version: '0.7.0-beta.10',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index a8271bb5f7..f11660bca5 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.1.0-beta.9"
+  version: "1.1.0-beta.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index bb46b23cf6..9cd31ab09c 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.5.0-beta.9'
+  version: '1.5.0-beta.10'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index e3be0cf997..32d5177eaa 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.9",
+  version: "0.8.0-beta.10",
   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 95910889b6..f5860edfac 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.9",
+  version: "0.8.0-beta.10",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index bfca862551..8c5b3f15c4 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.9",
+ "version": "1.5-beta.10",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 82e8d71e79004bf2d0367bd2820b8033ce9761ef Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 13 Mar 2017 14:19:46 -0400
Subject: [PATCH 084/195] Set __esModule flag on import(...) namespace objects.

This small tweak would have made this commit unecessary:
https://github.com/meteor/react-loadable-example/commit/1fac2ff3c159ae49da7d24f343dec9b71e630c79

Because we've already done the translation from CommonJS module.exports to
ES2015 namespace object, this flag should always be true.
---
 packages/dynamic-import/client.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index b6282fb6c4..cf04e8a304 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -178,5 +178,12 @@ function getNamespace(module, id) {
     }
   });
 
+  // This helps with Babel interop, since we're not just returning the
+  // module.exports object.
+  Object.defineProperty(namespace, "__esModule", {
+    value: true,
+    enumerable: false
+  });
+
   return namespace;
 }

From fd7bbc5f7f18239c427b067af8878e8beba81b68 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Mar 2017 15:37:26 -0400
Subject: [PATCH 085/195] Bump $BUNDLE_VERSION to 4.8.2 before rebuilding dev
 bundle.

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

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

From 251c6c9b8bf71373171243bbbfe07020019a85b8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 14 Mar 2017 16:13:25 -0400
Subject: [PATCH 086/195] Bump package versions for 1.5-beta.11 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index a08e800fa0..74792aa693 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.15.0-beta.10'
+  version: '6.15.0-beta.11'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 5f193fda47..71e9d816f1 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.10",
+  version: "0.1.0-beta.11",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 504a701ede..aaf23c8554 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.7.0-beta.10',
+  version: '0.7.0-beta.11',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index f11660bca5..2eb81821a3 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.1.0-beta.10"
+  version: "1.1.0-beta.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 9cd31ab09c..0594a106c4 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.5.0-beta.10'
+  version: '1.5.0-beta.11'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 32d5177eaa..872088c30c 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.10",
+  version: "0.8.0-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 f5860edfac..076ed4fe45 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.8.0-beta.10",
+  version: "0.8.0-beta.11",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8c5b3f15c4..78e8231c1c 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.10",
+ "version": "1.5-beta.11",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e24c42295eb7b7feb1c2ae88fac234f405635c0a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 17 Mar 2017 19:17:22 -0400
Subject: [PATCH 087/195] Bump $BUNDLE_VERSION to 4.8.3 before rebuilding dev
 bundle.

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

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

From 7d770c1ddac93499149473dff94e6012f0257271 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 17 Mar 2017 19:58:30 -0400
Subject: [PATCH 088/195] Bump package versions for 1.5-beta.12 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 1bf0b22558..c35268c271 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.19.0-beta.11'
+  version: '6.19.0-beta.12'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 71e9d816f1..51c1ad55e0 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.11",
+  version: "0.1.0-beta.12",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index c51cf6fce0..f94f7610f3 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.11',
+  version: '0.8.0-beta.12',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 2eb81821a3..25e254cde7 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.1.0-beta.11"
+  version: "1.1.0-beta.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 0594a106c4..06237f1bf3 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.5.0-beta.11'
+  version: '1.5.0-beta.12'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 872088c30c..99edbca630 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.11",
+  version: "0.8.0-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 4767f2f26b..9a68858fff 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.11",
+  version: "0.9.0-beta.12",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 78e8231c1c..1d302bf626 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.11",
+ "version": "1.5-beta.12",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 6842ec9c8a1f85c7e49c2dd02aefea93ce8b4daf Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 17 Mar 2017 21:12:29 -0400
Subject: [PATCH 089/195] Bump meteor-babel to v0.18.1 to fix strict
 minification errors.

---
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/babel-compiler/package.js                       | 2 +-
 scripts/dev-bundle-tool-package.js                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 0dd09f9f25..44b5d31c78 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -590,9 +590,9 @@
       "from": "magic-string@>=0.19.0 <0.20.0"
     },
     "meteor-babel": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.18.0.tgz",
-      "from": "meteor-babel@0.18.0"
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.18.1.tgz",
+      "from": "meteor-babel@0.18.1"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index c35268c271..0c415b1cdd 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.18.0'
+  'meteor-babel': '0.18.1'
 });
 
 Package.onUse(function (api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 0cd6a71879..43e68d731b 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,7 +14,7 @@ var packageJson = {
     npm: "4.3.0",
     "node-gyp": "3.5.0",
     "node-pre-gyp": "0.6.33",
-    "meteor-babel": "0.18.0",
+    "meteor-babel": "0.18.1",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 48255a38d6b876c7368e587975a78d17a6f11659 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 27 Mar 2017 15:55:14 -0400
Subject: [PATCH 090/195] Bump $BUNDLE_VERSION to 4.8.4 before rebuilding dev
 bundle.

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

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

From b490d270f1d1b340c2186018d552c06fbb064a08 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 27 Mar 2017 16:22:40 -0400
Subject: [PATCH 091/195] Bump package versions for 1.5-beta.13 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index f4ffd59331..3a168c2d21 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.19.0-beta.12'
+  version: '6.19.0-beta.13'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 51c1ad55e0..3d0cd92908 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.12",
+  version: "0.1.0-beta.13",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index f94f7610f3..6e8046725d 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.12',
+  version: '0.8.0-beta.13',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 25e254cde7..9080669392 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.1.0-beta.12"
+  version: "1.1.0-beta.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 06237f1bf3..b2d6d0651f 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.5.0-beta.12'
+  version: '1.5.0-beta.13'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 99edbca630..2545add9d4 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.12",
+  version: "0.8.0-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 9e86e8fd8a..bb9137a8e0 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.12",
+  version: "0.9.0-beta.13",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 1d302bf626..996fc96d34 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.12",
+ "version": "1.5-beta.13",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 337a61c4260d9881a06e8d896f93a69140874a24 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 4 Apr 2017 19:09:01 -0400
Subject: [PATCH 092/195] Disable dynamic module fetching in Cordova apps.

Instead of fetching a bundle of JavaScript from the server, Cordova apps
include the complete bundle in the installed app, so there's no compelling
reason to allow dynamic module fetching.

The dynamic import(...) function will still work on Cordova, of course.
It will just never have to fetch anything from the server.
---
 packages/dynamic-import/cache.js | 15 +++++++++++++--
 tools/isobuild/import-scanner.js | 14 ++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 74cf64c73a..49f883ea67 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -1,6 +1,17 @@
 var hasOwn = Object.prototype.hasOwnProperty;
 var dbPromise;
 
+var canUseCache =
+  // The server doesn't benefit from dynamic module fetching, and almost
+  // certainly doesn't support IndexedDB.
+  Meteor.isClient &&
+  // Cordova bundles all modules into the monolithic initial bundle, so
+  // the dynamic module cache won't be necessary.
+  ! Meteor.isCordova &&
+  // Caching can be confusing in development, and is designed to be a
+  // transparent optimization for production performance.
+  Meteor.isProduction;
+
 function getIDB() {
   if (typeof indexedDB !== "undefined") return indexedDB;
   if (typeof webkitIndexedDB !== "undefined") return webkitIndexedDB;
@@ -67,7 +78,7 @@ exports.checkMany = function (versions) {
     sourcesById[id] = null;
   });
 
-  if (! Meteor.isProduction) {
+  if (! canUseCache) {
     return Promise.resolve(sourcesById);
   }
 
@@ -104,7 +115,7 @@ exports.checkMany = function (versions) {
 var pendingVersionsAndSourcesById = Object.create(null);
 
 exports.setMany = function (versionsAndSourcesById) {
-  if (Meteor.isProduction) {
+  if (canUseCache) {
     Object.assign(
       pendingVersionsAndSourcesById,
       versionsAndSourcesById
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 4e8fda1cb8..d71568de7c 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -555,10 +555,11 @@ export default class ImportScanner {
     }
 
     each(file.deps, (info, id) => {
-      // Asynchronous module fetching only really makes sense on the
-      // client (even though it works equally well on the server), so it's
-      // better if forDynamicImport never becomes true on the server.
-      const dynamic = this.isWeb() && (forDynamicImport || info.dynamic);
+      // Asynchronous module fetching only really makes sense in the
+      // browser (even though it works equally well on the server), so
+      // it's better if forDynamicImport never becomes true on the server.
+      const dynamic = this.isWebBrowser() &&
+        (forDynamicImport || info.dynamic);
 
       const resolved = this._resolve(file, id, dynamic);
       if (! resolved) {
@@ -671,9 +672,14 @@ export default class ImportScanner {
   }
 
   isWeb() {
+    // Returns true for web.cordova as well as web.browser.
     return ! archMatches(this.bundleArch, "os");
   }
 
+  isWebBrowser() {
+    return archMatches(this.bundleArch, "web.browser");
+  }
+
   _readFile(absPath) {
     const contents = optimisticReadFile(absPath);
     const hash = optimisticHashOrNull(absPath);

From fc45372e7b1720fcb67af86919ead883645f140b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Apr 2017 12:45:45 -0400
Subject: [PATCH 093/195] Bump $BUNDLE_VERSION to 4.8.5 before rebuilding dev
 bundle.

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

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

From fb2290960ce0eae6c80872decd5b845ad1ae2816 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 7 Apr 2017 13:12:36 -0400
Subject: [PATCH 094/195] Bump package versions for 1.5-beta.14 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/force-ssl-common/package.js           | 2 +-
 packages/force-ssl/package.js                  | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 3a168c2d21..b229f435b1 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.19.0-beta.13'
+  version: '6.19.0-beta.14'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 3d0cd92908..6b59645bbd 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.13",
+  version: "0.1.0-beta.14",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 6e8046725d..b40144c74e 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.13',
+  version: '0.8.0-beta.14',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/force-ssl-common/package.js b/packages/force-ssl-common/package.js
index 54353d56b4..fda41c4f54 100644
--- a/packages/force-ssl-common/package.js
+++ b/packages/force-ssl-common/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Internal force-ssl common code.',
-  version: '1.0.14-rc.1'
+  version: '1.0.14'
 });
 
 Npm.depends({
diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js
index 980c9a11ae..bc9c4bf6ed 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.14-rc.1",
+  version: "1.0.14",
   prodOnly: true
 });
 
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 9080669392..e7e1684173 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.1.0-beta.13"
+  version: "1.1.0-beta.14"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index b2d6d0651f..00f3cde759 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.5.0-beta.13'
+  version: '1.5.0-beta.14'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index cf60b6b9c6..e4ba74d9b2 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.13",
+  version: "0.8.0-beta.14",
   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 bb9137a8e0..e986ca01fa 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.13",
+  version: "0.9.0-beta.14",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 0f5edc1a33..e2bc14e36e 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: '2.0.0-rc.1',
+  version: '2.0.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 996fc96d34..627106268d 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.13",
+ "version": "1.5-beta.14",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From b491985b4a59f368633a225905f582933fa47f0e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Apr 2017 13:24:37 -0400
Subject: [PATCH 095/195] Make babel-runtime use ecmascript-runtime on server
 only.

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

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index b229f435b1..456fd45fe6 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -14,7 +14,7 @@ Npm.depends({
 });
 
 Package.onUse(function (api) {
-  api.use('ecmascript-runtime');
+  api.use('ecmascript-runtime', 'server');
 
   api.addFiles([
     'babel.js',

From 0042ae55f125679d4aef3bd30c5cd9bca9c891bc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 19 Apr 2017 13:43:21 -0400
Subject: [PATCH 096/195] Split ecmascript-runtime into client and server
 packages.

This split gives us the ability to use different sets of polyfills for
server and client, which allows us to take better advantage of native
support in Node 4+.

We now rely on core-js as a peer dependency on the client (which is a win
because core-js is always installed along with babel-runtime), and as an
Npm.depends-style dependency on the server (which is necessary because
there's not always an an application to provide peer node_modules on the
server, e.g. in isopackets and compiler plugins).

Since we're using different sets of polyfills on the client and the
server, it didn't seem to make sense to rely on a single npm package, so
meteor-ecmascript-runtime has been removed.
---
 packages/ecmascript-runtime-client/README.md  |   6 +
 packages/ecmascript-runtime-client/package.js |  20 +++
 packages/ecmascript-runtime-client/runtime.js | 127 ++++++++++++++++++
 .../.npm/package/.gitignore                   |   0
 .../.npm/package/README                       |   0
 .../.npm/package/npm-shrinkwrap.json          |   9 ++
 packages/ecmascript-runtime-server/README.md  |   6 +
 packages/ecmascript-runtime-server/package.js |  23 ++++
 packages/ecmascript-runtime-server/runtime.js |  71 ++++++++++
 .../.npm/package/npm-shrinkwrap.json          |  14 --
 packages/ecmascript-runtime/package.js        |  21 +--
 11 files changed, 265 insertions(+), 32 deletions(-)
 create mode 100644 packages/ecmascript-runtime-client/README.md
 create mode 100644 packages/ecmascript-runtime-client/package.js
 create mode 100644 packages/ecmascript-runtime-client/runtime.js
 rename packages/{ecmascript-runtime => ecmascript-runtime-server}/.npm/package/.gitignore (100%)
 rename packages/{ecmascript-runtime => ecmascript-runtime-server}/.npm/package/README (100%)
 create mode 100644 packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
 create mode 100644 packages/ecmascript-runtime-server/README.md
 create mode 100644 packages/ecmascript-runtime-server/package.js
 create mode 100644 packages/ecmascript-runtime-server/runtime.js
 delete mode 100644 packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json

diff --git a/packages/ecmascript-runtime-client/README.md b/packages/ecmascript-runtime-client/README.md
new file mode 100644
index 0000000000..1b24dc649f
--- /dev/null
+++ b/packages/ecmascript-runtime-client/README.md
@@ -0,0 +1,6 @@
+# ecmascript-runtime-client
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ecmascript-runtime-client) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client)
+***
+
+[![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-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
new file mode 100644
index 0000000000..1bd6b8466a
--- /dev/null
+++ b/packages/ecmascript-runtime-client/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+  name: "ecmascript-runtime-client",
+  version: "0.4.0",
+  summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
+  git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
+  documentation: "README.md"
+});
+
+Package.onUse(function(api) {
+  // If the es5-shim package is installed, make sure it loads before
+  // ecmascript-runtime-server, since the runtime uses some ES5 APIs like
+  // Object.defineProperties that are buggy in older browsers.
+  api.use("es5-shim", { weak: true });
+  api.use("modules", "client");
+  api.use("promise", "client");
+  api.mainModule("runtime.js", "client");
+  api.export("Symbol", "client");
+  api.export("Map", "client");
+  api.export("Set", "client");
+});
diff --git a/packages/ecmascript-runtime-client/runtime.js b/packages/ecmascript-runtime-client/runtime.js
new file mode 100644
index 0000000000..58e3dbe682
--- /dev/null
+++ b/packages/ecmascript-runtime-client/runtime.js
@@ -0,0 +1,127 @@
+try {
+  require("core-js/modules/es6.symbol");
+  require("core-js/modules/es6.map");
+  require("core-js/modules/es6.set");
+} catch (e) {
+  throw new Error([
+    "The core-js npm package could not be found in your node_modules ",
+    "directory. Please run the following command to install it:",
+    "",
+    "  meteor npm install --save core-js",
+    ""
+  ].join("\n"));
+}
+
+var core = require("core-js/modules/_core");
+Symbol = exports.Symbol = core.Symbol;
+Map = exports.Map = core.Map;
+Set = exports.Set = core.Set;
+
+// List of polyfills generated by babel-preset-env with the following
+// .babelrc configuration:
+//
+// {
+//   "presets": [
+//     ["env", {
+//       "targets": {
+//         "browsers": [
+//           "last 3 versions"
+//         ]
+//       },
+//       "polyfill": true,
+//       "useBuiltIns": true
+//     }]
+//   ]
+// }
+//
+// Supported browsers: http://browserl.ist/?q=last+3+versions
+//
+// Note that the es6.reflect.* modules have been commented out for bundle
+// size reasons, and the es6.promise modules are not used because Meteor
+// provides its own Promise polyfill.
+
+require("core-js/modules/es6.typed.array-buffer");
+require("core-js/modules/es6.typed.data-view");
+require("core-js/modules/es6.typed.int8-array");
+require("core-js/modules/es6.typed.uint8-array");
+require("core-js/modules/es6.typed.uint8-clamped-array");
+require("core-js/modules/es6.typed.int16-array");
+require("core-js/modules/es6.typed.uint16-array");
+require("core-js/modules/es6.typed.int32-array");
+require("core-js/modules/es6.typed.uint32-array");
+require("core-js/modules/es6.typed.float32-array");
+require("core-js/modules/es6.typed.float64-array");
+require("core-js/modules/es6.weak-map");
+require("core-js/modules/es6.weak-set");
+// require("core-js/modules/es6.reflect.apply");
+// require("core-js/modules/es6.reflect.construct");
+// require("core-js/modules/es6.reflect.define-property");
+// require("core-js/modules/es6.reflect.delete-property");
+// require("core-js/modules/es6.reflect.get");
+// require("core-js/modules/es6.reflect.get-own-property-descriptor");
+// require("core-js/modules/es6.reflect.get-prototype-of");
+// require("core-js/modules/es6.reflect.has");
+// require("core-js/modules/es6.reflect.is-extensible");
+// require("core-js/modules/es6.reflect.own-keys");
+// require("core-js/modules/es6.reflect.prevent-extensions");
+// require("core-js/modules/es6.reflect.set");
+// require("core-js/modules/es6.reflect.set-prototype-of");
+require("core-js/modules/es6.object.assign");
+require("core-js/modules/es6.object.is");
+require("core-js/modules/es6.object.set-prototype-of");
+// require("core-js/modules/es6.promise");
+require("core-js/modules/es6.function.bind");
+require("core-js/modules/es6.function.name");
+require("core-js/modules/es6.function.has-instance");
+require("core-js/modules/es6.string.raw");
+require("core-js/modules/es6.string.from-code-point");
+require("core-js/modules/es6.string.code-point-at");
+require("core-js/modules/es6.string.repeat");
+require("core-js/modules/es6.string.starts-with");
+require("core-js/modules/es6.string.ends-with");
+require("core-js/modules/es6.string.includes");
+require("core-js/modules/es6.regexp.flags");
+require("core-js/modules/es6.regexp.match");
+require("core-js/modules/es6.regexp.replace");
+require("core-js/modules/es6.regexp.split");
+require("core-js/modules/es6.regexp.search");
+require("core-js/modules/es6.array.from");
+require("core-js/modules/es6.array.of");
+require("core-js/modules/es6.array.copy-within");
+require("core-js/modules/es6.array.find");
+require("core-js/modules/es6.array.find-index");
+require("core-js/modules/es6.array.fill");
+require("core-js/modules/es6.array.iterator");
+require("core-js/modules/es6.number.is-finite");
+require("core-js/modules/es6.number.is-integer");
+require("core-js/modules/es6.number.is-safe-integer");
+require("core-js/modules/es6.number.is-nan");
+require("core-js/modules/es6.number.epsilon");
+require("core-js/modules/es6.number.min-safe-integer");
+require("core-js/modules/es6.number.max-safe-integer");
+require("core-js/modules/es6.math.acosh");
+require("core-js/modules/es6.math.asinh");
+require("core-js/modules/es6.math.atanh");
+require("core-js/modules/es6.math.cbrt");
+require("core-js/modules/es6.math.clz32");
+require("core-js/modules/es6.math.cosh");
+require("core-js/modules/es6.math.expm1");
+require("core-js/modules/es6.math.fround");
+require("core-js/modules/es6.math.hypot");
+require("core-js/modules/es6.math.imul");
+require("core-js/modules/es6.math.log1p");
+require("core-js/modules/es6.math.log10");
+require("core-js/modules/es6.math.log2");
+require("core-js/modules/es6.math.sign");
+require("core-js/modules/es6.math.sinh");
+require("core-js/modules/es6.math.tanh");
+require("core-js/modules/es6.math.trunc");
+require("core-js/modules/es7.array.includes");
+require("core-js/modules/es7.object.values");
+require("core-js/modules/es7.object.entries");
+require("core-js/modules/es7.object.get-own-property-descriptors");
+require("core-js/modules/es7.string.pad-start");
+require("core-js/modules/es7.string.pad-end");
+require("core-js/modules/web.timers");
+require("core-js/modules/web.immediate");
+require("core-js/modules/web.dom.iterable");
diff --git a/packages/ecmascript-runtime/.npm/package/.gitignore b/packages/ecmascript-runtime-server/.npm/package/.gitignore
similarity index 100%
rename from packages/ecmascript-runtime/.npm/package/.gitignore
rename to packages/ecmascript-runtime-server/.npm/package/.gitignore
diff --git a/packages/ecmascript-runtime/.npm/package/README b/packages/ecmascript-runtime-server/.npm/package/README
similarity index 100%
rename from packages/ecmascript-runtime/.npm/package/README
rename to packages/ecmascript-runtime-server/.npm/package/README
diff --git a/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 0000000000..e54b59acd6
--- /dev/null
+++ b/packages/ecmascript-runtime-server/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "core-js": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+      "from": "core-js@2.4.1"
+    }
+  }
+}
diff --git a/packages/ecmascript-runtime-server/README.md b/packages/ecmascript-runtime-server/README.md
new file mode 100644
index 0000000000..d92f6a94ee
--- /dev/null
+++ b/packages/ecmascript-runtime-server/README.md
@@ -0,0 +1,6 @@
+# ecmascript-runtime-server
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ecmascript-runtime-server) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-server)
+***
+
+[![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-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
new file mode 100644
index 0000000000..38b80d3836
--- /dev/null
+++ b/packages/ecmascript-runtime-server/package.js
@@ -0,0 +1,23 @@
+Package.describe({
+  name: "ecmascript-runtime-server",
+  version: "0.4.0",
+  summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
+  git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
+  documentation: "README.md"
+});
+
+Npm.depends({
+  "core-js": "2.4.1"
+});
+
+Package.onUse(function(api) {
+  // If the es5-shim package is installed, make sure it loads before
+  // ecmascript-runtime-server, since the runtime uses some ES5 APIs like
+  // Object.defineProperties that are buggy in older browsers.
+  api.use("es5-shim", { weak: true });
+  api.use(["modules", "promise"], "server");
+  api.mainModule("runtime.js", "server");
+  api.export("Symbol", "server");
+  api.export("Map", "server");
+  api.export("Set", "server");
+});
diff --git a/packages/ecmascript-runtime-server/runtime.js b/packages/ecmascript-runtime-server/runtime.js
new file mode 100644
index 0000000000..1e41296fb4
--- /dev/null
+++ b/packages/ecmascript-runtime-server/runtime.js
@@ -0,0 +1,71 @@
+// The ecmascript-runtime-server package depends on its own copy of
+// core-js using Npm.depends, so we don't have to check that core-js is
+// available (as we do in ecmascript-runtime-client/runtime.js).
+
+require("core-js/modules/es6.symbol");
+require("core-js/modules/es6.map");
+require("core-js/modules/es6.set");
+
+var core = require("core-js/modules/_core");
+Symbol = exports.Symbol = core.Symbol;
+Map = exports.Map = core.Map;
+Set = exports.Set = core.Set;
+
+// List of polyfills generated by babel-preset-env with the following
+// .babelrc configuration:
+//
+// {
+//   "presets": [
+//     ["env", {
+//       "targets": {
+//         "node": 4
+//       },
+//       "polyfill": true,
+//       "useBuiltIns": true
+//     }]
+//   ]
+// }
+//
+// Note that the es6.reflect.* modules have been commented out for bundle
+// size reasons.
+
+require("core-js/modules/es6.typed.array-buffer");
+require("core-js/modules/es6.typed.int8-array");
+require("core-js/modules/es6.typed.uint8-array");
+require("core-js/modules/es6.typed.uint8-clamped-array");
+require("core-js/modules/es6.typed.int16-array");
+require("core-js/modules/es6.typed.uint16-array");
+require("core-js/modules/es6.typed.int32-array");
+require("core-js/modules/es6.typed.uint32-array");
+require("core-js/modules/es6.typed.float32-array");
+require("core-js/modules/es6.typed.float64-array");
+require("core-js/modules/es6.weak-map");
+require("core-js/modules/es6.weak-set");
+// require("core-js/modules/es6.reflect.apply");
+// require("core-js/modules/es6.reflect.construct");
+// require("core-js/modules/es6.reflect.define-property");
+// require("core-js/modules/es6.reflect.delete-property");
+// require("core-js/modules/es6.reflect.get");
+// require("core-js/modules/es6.reflect.get-own-property-descriptor");
+// require("core-js/modules/es6.reflect.get-prototype-of");
+// require("core-js/modules/es6.reflect.has");
+// require("core-js/modules/es6.reflect.is-extensible");
+// require("core-js/modules/es6.reflect.own-keys");
+// require("core-js/modules/es6.reflect.prevent-extensions");
+// require("core-js/modules/es6.reflect.set");
+// require("core-js/modules/es6.reflect.set-prototype-of");
+require("core-js/modules/es6.function.bind");
+require("core-js/modules/es6.function.name");
+require("core-js/modules/es6.function.has-instance");
+require("core-js/modules/es6.regexp.flags");
+require("core-js/modules/es6.regexp.match");
+require("core-js/modules/es6.regexp.replace");
+require("core-js/modules/es6.regexp.split");
+require("core-js/modules/es6.regexp.search");
+require("core-js/modules/es6.array.from");
+require("core-js/modules/es7.array.includes");
+require("core-js/modules/es7.object.values");
+require("core-js/modules/es7.object.entries");
+require("core-js/modules/es7.object.get-own-property-descriptors");
+require("core-js/modules/es7.string.pad-start");
+require("core-js/modules/es7.string.pad-end");
diff --git a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json b/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
deleted file mode 100644
index 2d4e33d663..0000000000
--- a/packages/ecmascript-runtime/.npm/package/npm-shrinkwrap.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "dependencies": {
-    "core-js": {
-      "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.9",
-      "resolved": "https://registry.npmjs.org/meteor-ecmascript-runtime/-/meteor-ecmascript-runtime-0.2.9.tgz",
-      "from": "meteor-ecmascript-runtime@0.2.9"
-    }
-  }
-}
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 78b193e14e..1f7b66f00a 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,29 +1,14 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.3.15",
+  version: "0.4.0",
   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.9",
-});
-
 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@4.6.13", { weak: true });
-
-  api.use("modules@0.7.5");
-  api.use("promise@0.8.3");
-
-  api.mainModule("runtime.js");
-
-  api.export("Symbol");
-  api.export("Map");
-  api.export("Set");
+  api.imply("ecmascript-runtime-client", "client");
+  api.imply("ecmascript-runtime-server", "server");
 });
 
 Package.onTest(function(api) {

From 6f75eae1353b187e358ced331e5f8e3b91cda08d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 17 Apr 2017 13:24:13 -0400
Subject: [PATCH 097/195] Remove automatic Buffer polyfill.

This polyfill is unnecessary in Node, and added a whopping 22KB to the
minified client bundle. If you really need the Buffer API on the client,
you can get it from require("buffer").Buffer.
---
 packages/modules/buffer.js        | 3 ---
 packages/modules/client.js        | 1 -
 packages/modules/package.js       | 1 -
 packages/modules/server.js        | 1 -
 tools/tests/apps/modules/tests.js | 8 ++++++++
 5 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 packages/modules/buffer.js

diff --git a/packages/modules/buffer.js b/packages/modules/buffer.js
deleted file mode 100644
index a894cdea97..0000000000
--- a/packages/modules/buffer.js
+++ /dev/null
@@ -1,3 +0,0 @@
-try {
-  Buffer = global.Buffer || require("buffer").Buffer;
-} catch (noBuffer) {}
diff --git a/packages/modules/client.js b/packages/modules/client.js
index b69fd2b188..8b2ff2c406 100644
--- a/packages/modules/client.js
+++ b/packages/modules/client.js
@@ -1,6 +1,5 @@
 require("./install-packages.js");
 require("./stubs.js");
-require("./buffer.js");
 require("./process.js");
 require("./reify.js");
 
diff --git a/packages/modules/package.js b/packages/modules/package.js
index e986ca01fa..ef715fcf7a 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -15,6 +15,5 @@ Package.onUse(function(api) {
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
   api.export("meteorInstall");
-  api.export("Buffer");
   api.export("process");
 });
diff --git a/packages/modules/server.js b/packages/modules/server.js
index aa8bc7c394..0f127659b1 100644
--- a/packages/modules/server.js
+++ b/packages/modules/server.js
@@ -1,4 +1,3 @@
 require("./install-packages.js");
-require("./buffer.js");
 require("./process.js");
 require("./reify.js");
diff --git a/tools/tests/apps/modules/tests.js b/tools/tests/apps/modules/tests.js
index 6529402431..9bc5fcebad 100644
--- a/tools/tests/apps/modules/tests.js
+++ b/tools/tests/apps/modules/tests.js
@@ -213,12 +213,20 @@ describe("native node_modules", () => {
   });
 
   it("can be implemented by wrapper npm packages", () => {
+    if (! global.Buffer) {
+      global.Buffer = require("buffer").Buffer;
+    }
+
     const Stream = require("stream");
     assert.strictEqual(typeof Stream, "function");
     assert.strictEqual(typeof Stream.Readable, "function");
   });
 
   it("can all be imported", () => {
+    if (! global.Buffer) {
+      global.Buffer = require("buffer").Buffer;
+    }
+
     require("_stream_duplex");
     require("_stream_passthrough");
     require("_stream_readable");

From 1c041237d9c425d48edb37d75faf5378962bc072 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Apr 2017 16:09:51 -0400
Subject: [PATCH 098/195] Fix faulty content-length comparison in
 utils/http-helpers.js.

Since body is a string, body.length is not necessarily the number of bytes
in the response body.
---
 tools/utils/http-helpers.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js
index 2dda4548e6..ac40002bd7 100644
--- a/tools/utils/http-helpers.js
+++ b/tools/utils/http-helpers.js
@@ -310,12 +310,16 @@ _.extend(exports, {
     var req = request(options, function (error, response, body) {
       if (! error && response && body) {
         const contentLength = Number(response.headers["content-length"]);
-        if (contentLength > 0 && body.length < contentLength) {
+        const actualLength = Buffer.byteLength(body);
+
+        if (contentLength > 0 &&
+            actualLength < contentLength) {
           error = new Error(
             "Expected " + contentLength + " bytes in request body " +
-              "but received only " + body.length);
+              "but received only " + actualLength);
         }
       }
+
       return callback.call(this, error, response, body);
     });
 

From 4122e6e7f2aabf8d22c3e23943a6b247f637ffe9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Apr 2017 16:11:35 -0400
Subject: [PATCH 099/195] Minor cleanup to make import chain test more robust.

---
 tools/tests/modules.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/tests/modules.js b/tools/tests/modules.js
index c89230a75f..5fa92593d2 100644
--- a/tools/tests/modules.js
+++ b/tools/tests/modules.js
@@ -51,18 +51,28 @@ selftest.define("modules - import chain for packages", () => {
 
   s.createApp("myapp", "package-tests");
   s.cd("myapp");
-  s.write(".meteor/packages",
-    "meteor-base \n modules \n with-add-files \n with-main-module");
-  s.write("main.js", `
-    var packageNameA = require('meteor/with-add-files').name;
-    var packageNameB = require('meteor/with-main-module').name;
 
-    console.log('with-add-files: ' + packageNameA);
-    console.log('with-main-module: ' + packageNameB);
-  `);
+  s.write(".meteor/packages", [
+    "meteor-base",
+    "modules",
+    "with-add-files",
+    "with-main-module",
+    ""
+  ].join("\n"));
+
+  s.write("main.js", [
+    "var packageNameA = require('meteor/with-add-files').name;",
+    "var packageNameB = require('meteor/with-main-module').name;",
+    "",
+    "console.log('with-add-files: ' + packageNameA);",
+    "console.log('with-main-module: ' + packageNameB);",
+    ""
+  ].join("\n"));
 
   const run = startRun(s);
 
+  run.waitSecs(30);
+
   // On the server, we just check that importing *works*, not *how* it works
   run.match("with-add-files: with-add-files");
   run.match("with-main-module: with-main-module");

From 29a3f310ca31d7b4dd2b17ba5ff1b3732032193b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 20 Apr 2017 16:48:20 -0400
Subject: [PATCH 100/195] Bump package versions for 1.5-beta.16 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index c2f0aa5f45..f70575b227 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.19.0-beta.14'
+  version: '6.19.0-beta.16'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 6b59645bbd..f03e833159 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.14",
+  version: "0.1.0-beta.16",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index b40144c74e..e79c4254e3 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.14',
+  version: '0.8.0-beta.16',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index e7e1684173..fa43225a56 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.1.0-beta.14"
+  version: "1.1.0-beta.16"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 00f3cde759..f65ee9a7c6 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.5.0-beta.14'
+  version: '1.5.0-beta.16'
 });
 
 Package.includeTool();
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index e4ba74d9b2..cb3e51fd28 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.14",
+  version: "0.8.0-beta.16",
   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 9266420984..ae781cf6cc 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.14",
+  version: "0.9.0-beta.16",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 627106268d..db2b049863 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.14",
+ "version": "1.5-beta.16",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From de6deb59542befaa0eab1992cdc77835ab2acb7d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Apr 2017 16:10:13 -0400
Subject: [PATCH 101/195] Use module.importSync instead of module.import in
 getNamespace.

---
 packages/dynamic-import/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index cf04e8a304..b074b5ab31 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -172,7 +172,7 @@ function addToTree(tree, id, value) {
 function getNamespace(module, id) {
   var namespace = Object.create(null);
 
-  module.import(id, {
+  module.importSync(id, {
     "*": function (value, name) {
       namespace[name] = value;
     }

From f4fc2a904d1769a6f628c6dbbc774909d3125c84 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 21 Apr 2017 15:18:45 -0400
Subject: [PATCH 102/195] Use final hashes of dynamic modules for browser
 caching.

Previously, the linker included a "version" hash in each stub entry
corresponding to a dynamic module in the meteorInstall bundle. These stub
entries also contain information about any module identifiers ("deps")
imported by the module, and various other metadata.

This hash was derived from the source code of the dynamic module, instead
of its fully-processed generated code, which created a small risk that the
source hash would remain the same when anything changed in the post-linker
processing logic.

This new implementation uses the same hashes found in program.json
manifest files, which more reliably reflect changes in the actual final
contents of the modules.

Because these hashes are not known at link time, they are now injected as
one blob into the meteor/dynamic-import/dynamic-versions.js module, rather
than appearing in the meteorInstall bundles for their containing packages.
---
 packages/dynamic-import/cache.js            | 21 ++++++++------
 packages/dynamic-import/client.js           | 26 +++++++++++++----
 packages/dynamic-import/dynamic-versions.js |  4 +++
 tools/isobuild/bundler.js                   | 23 +++++++++++++++
 tools/isobuild/linker.js                    | 31 +++++++++++----------
 5 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100644 packages/dynamic-import/dynamic-versions.js

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index 49f883ea67..e78b9b90de 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -98,15 +98,18 @@ exports.checkMany = function (versions) {
 
     return Promise.all(ids.map(function (id) {
       return new Promise(function (resolve, reject) {
-        var sourceRequest = sourcesByVersion.get(versions[id]);
-        sourceRequest.onerror = makeOnError(reject, "sourcesByVersion.get");
-        sourceRequest.onsuccess = function (event) {
-          var result = event.target.result;
-          if (result) {
-            sourcesById[id] = result.source;
-          }
-          resolve();
-        };
+        var version = versions[id];
+        if (version) {
+          var sourceRequest = sourcesByVersion.get(versions[id]);
+          sourceRequest.onerror = makeOnError(reject, "sourcesByVersion.get");
+          sourceRequest.onsuccess = function (event) {
+            var result = event.target.result;
+            if (result) {
+              sourcesById[id] = result.source;
+            }
+            resolve();
+          };
+        } else resolve();
       });
     })).then(finish, finish);
   });
diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index b074b5ab31..9668f32bdb 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -21,11 +21,13 @@ Module.prototype.dynamicImport = function (id) {
     // Require the parent module from the complete meta graph.
     var meta = requireMeta(module.id);
     var versions = Object.create(null);
+    var dynamicVersions = require("./dynamic-versions.js");
 
     function walk(meta) {
       if (meta.dynamic && ! meta.pending) {
         meta.pending = true;
-        versions[meta.module.id] = meta.version;
+        var id = meta.module.id;
+        versions[id] = getFromTree(dynamicVersions, id);
         meta.eachChild(walkChild);
       }
     }
@@ -100,6 +102,7 @@ function installResults(resultsTree, doNotCache) {
   function walk(tree) {
     if (typeof tree === "string") {
       var meta = requireMeta(parts.join("/"));
+      var id = meta.module.id;
       var optionsIndex = options.indexOf(meta.options);
       if (optionsIndex < 0) {
         options[optionsIndex = options.length] = meta.options;
@@ -112,7 +115,7 @@ function installResults(resultsTree, doNotCache) {
       // are shared by entire bundles.
       addToTree(
         trees[optionsIndex],
-        meta.module.id,
+        id,
         // By calling (meta.options.eval || eval) in a wrapper function,
         // we delay the cost of parsing and evaluating the module code
         // until the module is first imported.
@@ -132,10 +135,13 @@ function installResults(resultsTree, doNotCache) {
 
       // Intentionally do not delay resolution waiting for the cache.
       if (! doNotCache) {
-        versionsAndSourcesById[meta.module.id] = {
-          version: meta.version,
-          source: tree
-        };
+        var version = getFromTree(require("./dynamic-versions.js"), id);
+        if (version) {
+          versionsAndSourcesById[id] = {
+            version: version,
+            source: tree
+          };
+        }
       }
 
     } else {
@@ -158,6 +164,14 @@ function installResults(resultsTree, doNotCache) {
   }
 }
 
+function getFromTree(tree, id) {
+  id.split("/").every(function (part) {
+    return ! part || (tree = tree[part]);
+  });
+
+  return tree;
+}
+
 function addToTree(tree, id, value) {
   var parts = id.split("/");
   var lastIndex = parts.length - 1;
diff --git a/packages/dynamic-import/dynamic-versions.js b/packages/dynamic-import/dynamic-versions.js
new file mode 100644
index 0000000000..7599278028
--- /dev/null
+++ b/packages/dynamic-import/dynamic-versions.js
@@ -0,0 +1,4 @@
+// This magic double-underscored identifier gets replaced in
+// tools/isobuild/bundler.js with a tree of hashes of all dynamic
+// modules, for use in client.js and cache.js.
+module.exports = __DYNAMIC_VERSIONS__;
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 2c0141228b..47a10a05e5 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -159,6 +159,7 @@ import Builder from './builder.js';
 var compilerPluginModule = require('./compiler-plugin.js');
 import { JsFile, CssFile } from './minifier-plugin.js';
 var meteorNpm = require('./meteor-npm.js');
+import { addToTree } from "./linker.js";
 
 var files = require('../fs/files.js');
 var archinfo = require('../utils/archinfo.js');
@@ -1056,6 +1057,9 @@ class Target {
     const jsOutputFilesMap = compilerPluginModule.PackageSourceBatch
       .computeJsOutputFilesMap(sourceBatches);
 
+    const versions = {};
+    const dynamicImportFiles = new Set;
+
     // Copy their resources into the bundle in order
     sourceBatches.forEach((sourceBatch) => {
       const unibuild = sourceBatch.unibuild;
@@ -1177,6 +1181,16 @@ class Target {
         throw new Error('Unknown type ' + resource.type);
       });
 
+      this.js.forEach(file => {
+        if (file.targetPath === "packages/dynamic-import.js") {
+          dynamicImportFiles.add(file);
+        }
+
+        if (file.targetPath.startsWith("dynamic/")) {
+          addToTree(file.hash(), file.targetPath, versions);
+        }
+      });
+
       // Depend on the source files that produced these resources.
       this.watchSet.merge(unibuild.watchSet);
 
@@ -1185,6 +1199,15 @@ class Target {
       // XXX assumes that this merges cleanly
        this.watchSet.merge(unibuild.pkg.pluginWatchSet);
     });
+
+    dynamicImportFiles.forEach(file => {
+      file.setContents(
+        new Buffer(file.contents("utf8").replace(
+          "__DYNAMIC_VERSIONS__",
+          () => JSON.stringify(versions.dynamic || {})
+        ), "utf8")
+      );
+    });
   }
 
   // Minify the JS in this target
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index c00c1eaa66..3b32b8620f 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -262,9 +262,7 @@ _.extend(Module.prototype, {
           dynamic: true,
         });
 
-        const entry = {
-          version: file.sourceHash,
-        };
+        const entry = {};
 
         if (! _.isEmpty(file.deps)) {
           entry.deps = file.deps;
@@ -283,28 +281,18 @@ _.extend(Module.prototype, {
           }
         }
 
-        this._addToTree([entry], file.installPath, tree);
+        addToTree([entry], file.installPath, tree);
 
       } else {
         // If the file is not dynamic, then it should be included in the
         // initial bundle, so we add it to the static tree.
-        this._addToTree(file, file.installPath, tree);
+        addToTree(file, file.installPath, tree);
       }
     });
 
     return tree;
   },
 
-  _addToTree(obj, path, tree) {
-    const parts = path.split("/");
-    const lastIndex = parts.length - 1;
-    parts.forEach((part, i) => {
-      tree = _.has(tree, part)
-        ? tree[part]
-        : tree[part] = i < lastIndex ? {} : obj;
-    });
-  },
-
   // Take the tree generated in getPrelinkedFiles and populate the chunks
   // array with strings and SourceNode objects that can be combined into a
   // single SourceNode object. Return the count of modules in the tree.
@@ -434,6 +422,19 @@ _.extend(Module.prototype, {
   }
 });
 
+// Insert the given value into the tree by splitting the path and
+// creating/following nested objects properties named by each component of
+// the split path.
+export function addToTree(value, path, tree) {
+  const parts = path.split("/");
+  const lastIndex = parts.length - 1;
+  parts.forEach((part, i) => {
+    tree = _.has(tree, part)
+      ? tree[part]
+      : tree[part] = i < lastIndex ? {} : value;
+  });
+}
+
 // Given 'symbolMap' like {Foo: 's1', 'Bar.Baz': 's2', 'Bar.Quux.A': 's3', 'Bar.Quux.B': 's4'}
 // return something like
 // {Foo: 's1', Bar: {Baz: 's2', Quux: {A: 's3', B: 's4'}}}

From 5477aeac3fc1b2fd67226dc271c006895d4eedfe Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 24 Apr 2017 15:49:47 -0400
Subject: [PATCH 103/195] Support module.prefetch(id) to fetch but not evaluate
 dynamic modules.

Generally, module.prefetch(id) will not throw even if the fetched module
is missing. If you need to know whether module.prefetch(id) succeeded,
simply await the result of the promise, which will be null on success, or
an Error object if the module could not be imported.
---
 packages/dynamic-import/client.js             | 93 ++++++++++++-------
 packages/modules-runtime/meteor-install.js    | 12 ++-
 .../dynamic-import/imports/prefetch-child.js  |  1 +
 .../apps/dynamic-import/imports/prefetch.js   |  3 +
 tools/tests/apps/dynamic-import/tests.js      | 22 +++++
 5 files changed, 94 insertions(+), 37 deletions(-)
 create mode 100644 tools/tests/apps/dynamic-import/imports/prefetch-child.js
 create mode 100644 tools/tests/apps/dynamic-import/imports/prefetch.js

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 9668f32bdb..b6d444f31b 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -2,8 +2,13 @@ var Module = module.constructor;
 var delayPromise = Promise.resolve();
 var requireMeta = meteorInstall._requireMeta;
 var cache = require("./cache.js");
+var Mp = Module.prototype;
 
-Module.prototype.dynamicImport = function (id) {
+// Call module.dynamicImport(id) to fetch a module and any/all of its
+// dependencies that have not already been fetched, and evaluate them as
+// soon as they arrive. This runtime API makes it very easy to implement
+// ECMAScript dynamic import(...) syntax.
+Mp.dynamicImport = function (id) {
   // The real (not meta) parent module.
   var module = this;
 
@@ -18,45 +23,59 @@ Module.prototype.dynamicImport = function (id) {
       throw error;
     }
 
-    // Require the parent module from the complete meta graph.
-    var meta = requireMeta(module.id);
-    var versions = Object.create(null);
-    var dynamicVersions = require("./dynamic-versions.js");
+    return module.prefetch(id).then(get);
+  });
+};
 
-    function walk(meta) {
-      if (meta.dynamic && ! meta.pending) {
-        meta.pending = true;
-        var id = meta.module.id;
-        versions[id] = getFromTree(dynamicVersions, id);
-        meta.eachChild(walkChild);
+// Call module.prefetch(id) to fetch modules without evaluating them.
+// Returns a Promise that resolves to an Error object if importing the
+// given id failed, and null otherwise.
+Mp.prefetch = function (id) {
+  // Require the parent module from the complete meta graph.
+  var meta = requireMeta(this.id);
+  var versions = Object.create(null);
+  var dynamicVersions = require("./dynamic-versions.js");
+
+  function walk(meta) {
+    if (meta.dynamic && ! meta.pending) {
+      meta.pending = true;
+      var id = meta.module.id;
+      versions[id] = getFromTree(dynamicVersions, id);
+      meta.eachChild(walkChild);
+    }
+  }
+
+  function walkChild(childModule) {
+    return walk(childModule.exports);
+  }
+
+  meta.eachChild(walkChild, [id]);
+
+  var error = meta.errors && meta.errors[id];
+  if (error) {
+    // If there was an error resolving the top-level id, let that error be
+    // the final result of the module.prefetch(id) promise.
+    return Promise.resolve(error);
+  }
+
+  return cache.checkMany(versions).then(function (sources) {
+    var localTree = null;
+    var missingTree = null;
+
+    Object.keys(sources).forEach(function (id) {
+      var source = sources[id];
+      if (source) {
+        addToTree(localTree = localTree || Object.create(null), id, source);
+      } else {
+        addToTree(missingTree = missingTree || Object.create(null), id, 1);
       }
+    });
+
+    if (localTree) {
+      installResults(localTree, true);
     }
 
-    function walkChild(childModule) {
-      return walk(childModule.exports);
-    }
-
-    meta.eachChild(walkChild, [id]);
-
-    var localTree;
-    var missingTree;
-
-    return cache.checkMany(versions).then(function (sources) {
-      Object.keys(sources).forEach(function (id) {
-        var source = sources[id];
-        if (source) {
-          addToTree(localTree = localTree || Object.create(null), id, source);
-        } else {
-          addToTree(missingTree = missingTree || Object.create(null), id, 1);
-        }
-      });
-
-      if (localTree) {
-        installResults(localTree, true);
-      }
-
-      return missingTree && fetchMissing(missingTree);
-    }).then(get);
+    return missingTree && fetchMissing(missingTree);
   });
 };
 
@@ -162,6 +181,8 @@ function installResults(resultsTree, doNotCache) {
   if (! doNotCache) {
     cache.setMany(versionsAndSourcesById);
   }
+
+  return null;
 }
 
 function getFromTree(tree, id) {
diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
index ae9f6ca33c..57c40ec4d1 100644
--- a/packages/modules-runtime/meteor-install.js
+++ b/packages/modules-runtime/meteor-install.js
@@ -124,6 +124,16 @@ function makeMetaFunc(value, dynamic, options) {
     exports.dynamic = !! dynamic;
     exports.options = options;
 
+    function quietRequire(id) {
+      try {
+        return require(id);
+      } catch (error) {
+        (exports.errors =
+         exports.errors || Object.create(null)
+        )[id] = error;
+      }
+    }
+
     // One of the purposes of the meta graph is to support traversing
     // module dependencies without evaluating any actual module code.
     // The eachChild function is essential to that traversal.
@@ -134,7 +144,7 @@ function makeMetaFunc(value, dynamic, options) {
       idsToRequire = idsToRequire || (value && value.deps);
 
       if (Array.isArray(idsToRequire)) {
-        idsToRequire.forEach(require);
+        idsToRequire.forEach(quietRequire);
       }
 
       // After requiring any/all dependencies of this module, iterate over
diff --git a/tools/tests/apps/dynamic-import/imports/prefetch-child.js b/tools/tests/apps/dynamic-import/imports/prefetch-child.js
new file mode 100644
index 0000000000..dba4092260
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/prefetch-child.js
@@ -0,0 +1 @@
+export const shared = Object.create(null);
diff --git a/tools/tests/apps/dynamic-import/imports/prefetch.js b/tools/tests/apps/dynamic-import/imports/prefetch.js
new file mode 100644
index 0000000000..25dcdc0e57
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/prefetch.js
@@ -0,0 +1,3 @@
+import { shared } from "./prefetch-child.js";
+export const name = module.id;
+shared[name] = true;
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index fd38dab720..9109d5ebec 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -148,6 +148,28 @@ describe("dynamic import(...)", function () {
       global.Helper
     );
   });
+
+  it("works with module.prefetch(id)", async function () {
+    import { shared } from "./imports/prefetch-child";
+    assert.deepEqual(shared, {});
+
+    const error = await module.prefetch("./imports/nonexistent.js");
+    assert.ok(error instanceof Error);
+    assert.ok(error.message.startsWith("Cannot find module"));
+
+    assert.strictEqual(
+      await module.prefetch("./tests"),
+      null // Indicates no error.
+    );
+
+    return module.prefetch("./imports/prefetch").then(() => {
+      assert.deepEqual(shared, {});
+    }).then(() => {
+      import { name } from "./imports/prefetch.js";
+      assert.strictEqual(name, "/imports/prefetch.js");
+      assert.deepEqual(shared, { [name]: true });
+    });
+  });
 });
 
 function maybeClearDynamicImportCache() {

From d9264e3b4b60cd31e9012c588f61360941e0990e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Apr 2017 10:24:36 -0400
Subject: [PATCH 104/195] Better API for module.prefetch(id).

---
 packages/dynamic-import/client.js        | 19 +++++++++++++++----
 tools/tests/apps/dynamic-import/tests.js | 15 +++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index b6d444f31b..4a818aa57a 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -31,8 +31,10 @@ Mp.dynamicImport = function (id) {
 // Returns a Promise that resolves to an Error object if importing the
 // given id failed, and null otherwise.
 Mp.prefetch = function (id) {
+  var module = this;
+
   // Require the parent module from the complete meta graph.
-  var meta = requireMeta(this.id);
+  var meta = requireMeta(module.id);
   var versions = Object.create(null);
   var dynamicVersions = require("./dynamic-versions.js");
 
@@ -53,9 +55,12 @@ Mp.prefetch = function (id) {
 
   var error = meta.errors && meta.errors[id];
   if (error) {
-    // If there was an error resolving the top-level id, let that error be
-    // the final result of the module.prefetch(id) promise.
-    return Promise.resolve(error);
+    // If module.prefetch(id) fails, the failure will probably be reported
+    // as an uncaught promise rejection, unless the calling code
+    // deliberately handles the rejection. This seems appropriate because
+    // failed prefetches should not be fatal to the application, yet they
+    // should be noticeable, so that they can be cleaned up at some point.
+    return Promise.reject(error);
   }
 
   return cache.checkMany(versions).then(function (sources) {
@@ -76,6 +81,12 @@ Mp.prefetch = function (id) {
     }
 
     return missingTree && fetchMissing(missingTree);
+
+  }).then(function () {
+    // If everything was successful, the final result of the
+    // module.prefetch(id) promise will be the fully-resolved absolute
+    // form of the given identifier.
+    return module.resolve(id);
   });
 };
 
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 9109d5ebec..41473f8883 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -153,13 +153,20 @@ describe("dynamic import(...)", function () {
     import { shared } from "./imports/prefetch-child";
     assert.deepEqual(shared, {});
 
-    const error = await module.prefetch("./imports/nonexistent.js");
-    assert.ok(error instanceof Error);
-    assert.ok(error.message.startsWith("Cannot find module"));
+    const rejection = module.prefetch("./imports/nonexistent.js");
+    let threw = false;
+    try {
+      await rejection;
+    } catch (e) {
+      assert.ok(e instanceof Error);
+      assert.ok(e.message.startsWith("Cannot find module"));
+      threw = true;
+    }
+    assert.strictEqual(threw, true);
 
     assert.strictEqual(
       await module.prefetch("./tests"),
-      null // Indicates no error.
+      "/tests.js"
     );
 
     return module.prefetch("./imports/prefetch").then(() => {

From ff86dcd5f101a3368348d0b0f1edcee475ac0a9a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 26 Apr 2017 14:34:24 -0400
Subject: [PATCH 105/195] Upgrade meteor-babel, reify, and
 meteor-ecmascript-runtime.

---
 History.md                                    |  7 +--
 .../.npm/package/npm-shrinkwrap.json          | 51 ++++++++++++-------
 packages/babel-compiler/package.js            |  2 +-
 .../modules/.npm/package/npm-shrinkwrap.json  | 21 ++++++--
 packages/modules/package.js                   |  2 +-
 scripts/dev-bundle-tool-package.js            |  5 +-
 6 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/History.md b/History.md
index f4978a3b1f..f076518816 100644
--- a/History.md
+++ b/History.md
@@ -9,9 +9,10 @@
   information about how dynamic `import(...)` works in Meteor, and how to
   use it in your applications.
 
-* The `meteor-babel` npm package has been upgraded to version 0.20.1, and
-  the `reify` npm package has been upgraded to version 0.7.4, fixing
-  [issue #8595](https://github.com/meteor/meteor/issues/8595).
+* The `meteor-babel` npm package has been upgraded to version 0.20.2, and
+  the `reify` npm package has been upgraded to version 0.8.2, fixing
+  [issue #8595](https://github.com/meteor/meteor/issues/8595) and
+  improving compilation performance.
 
 ## v1.4.4.1, 2017-04-07
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index f297b0adf2..b0a59e4b42 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -270,9 +270,9 @@
       "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-reify": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.7.0.tgz",
-      "from": "babel-plugin-transform-es2015-modules-reify@>=0.7.0 <0.8.0"
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.8.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-reify@>=0.8.0 <0.9.0"
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.24.1",
@@ -465,8 +465,8 @@
       "from": "babel-types@>=6.22.0 <7.0.0"
     },
     "babylon": {
-      "version": "6.16.1",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.16.1.tgz",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.0.tgz",
       "from": "babylon@>=6.15.0 <7.0.0"
     },
     "balanced-match": {
@@ -500,8 +500,8 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
@@ -580,9 +580,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.20.1.tgz",
-      "from": "meteor-babel@0.20.1"
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.20.2.tgz",
+      "from": "meteor-babel@0.20.2"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -599,15 +599,25 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "from": "minimist@0.0.8"
     },
+    "minipass": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-1.1.9.tgz",
+      "from": "minipass@>=1.1.6 <2.0.0"
+    },
+    "minizlib": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.2.tgz",
+      "from": "minizlib@>=1.0.2 <2.0.0"
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "from": "mkdirp@>=0.5.1 <0.6.0"
     },
     "ms": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-      "from": "ms@0.7.2"
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
+      "from": "ms@0.7.3"
     },
     "number-is-nan": {
       "version": "1.0.1",
@@ -640,8 +650,8 @@
       "from": "regenerate@>=1.2.1 <2.0.0"
     },
     "regenerator-runtime": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.4.tgz",
       "from": "regenerator-runtime@>=0.10.0 <0.11.0"
     },
     "regenerator-transform": {
@@ -672,9 +682,9 @@
       }
     },
     "reify": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.7.4.tgz",
-      "from": "reify@>=0.7.2 <0.8.0"
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.2.tgz",
+      "from": "reify@>=0.8.0 <0.9.0"
     },
     "repeating": {
       "version": "2.0.1",
@@ -715,6 +725,11 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
       "from": "trim-right@>=1.0.1 <2.0.0"
+    },
+    "yallist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+      "from": "yallist@>=3.0.0 <4.0.0"
     }
   }
 }
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index f70575b227..9f4e01a024 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.20.1'
+  'meteor-babel': '0.20.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 20c76d7a1d..b429851f1d 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -5,10 +5,25 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
       "from": "acorn@>=5.0.0 <5.1.0"
     },
+    "minipass": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-1.1.9.tgz",
+      "from": "minipass@>=1.1.6 <2.0.0"
+    },
+    "minizlib": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.2.tgz",
+      "from": "minizlib@>=1.0.2 <2.0.0"
+    },
     "reify": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.7.4.tgz",
-      "from": "reify@0.7.4"
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.2.tgz",
+      "from": "reify@0.8.2"
+    },
+    "yallist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
+      "from": "yallist@>=3.0.0 <4.0.0"
     }
   }
 }
diff --git a/packages/modules/package.js b/packages/modules/package.js
index ae781cf6cc..cea3053ba3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.7.4"
+  reify: "0.8.2"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 9d8d0ec578..2942cc3710 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,14 +14,15 @@ var packageJson = {
     npm: "4.4.4",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
-    "meteor-babel": "0.20.1",
+    "meteor-babel": "0.20.2",
+    reify: "0.8.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.
     "babel-runtime": "6.9.2",
     // For various ES2015 polyfills, such as Map and Set.
-    "meteor-ecmascript-runtime": "0.2.9",
+    "meteor-ecmascript-runtime": "0.3.0",
     // 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 750217c386512778c9fc83815526e52f12bbec4a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 26 Apr 2017 14:36:03 -0400
Subject: [PATCH 106/195] Bump $BUNDLE_VERSION to 4.8.7 before rebuilding dev
 bundle.

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

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

From dbc3f8461e31b8f9d6878e6fc6b6f8b970f78642 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Apr 2017 17:18:32 -0400
Subject: [PATCH 107/195] Upgrade the `reify` npm package to version 0.8.3.

---
 History.md                                        | 2 +-
 packages/modules/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/modules/package.js                       | 2 +-
 scripts/dev-bundle-tool-package.js                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 538e6512bc..0ae0a1e646 100644
--- a/History.md
+++ b/History.md
@@ -10,7 +10,7 @@
   use it in your applications.
 
 * The `meteor-babel` npm package has been upgraded to version 0.20.2, and
-  the `reify` npm package has been upgraded to version 0.8.2, fixing
+  the `reify` npm package has been upgraded to version 0.8.3, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation performance.
 
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index b429851f1d..f8f8d11e48 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.2 <2.0.0"
     },
     "reify": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.2.tgz",
-      "from": "reify@0.8.2"
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.3.tgz",
+      "from": "reify@0.8.3"
     },
     "yallist": {
       "version": "3.0.2",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index cea3053ba3..554fa59771 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.8.2"
+  reify: "0.8.3"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index e797a5f4e1..9d0a91c697 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.20.2",
-    reify: "0.8.2",
+    reify: "0.8.3",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 9cc97f28a92b52fd56062366fd012ca843de98a7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Apr 2017 17:19:19 -0400
Subject: [PATCH 108/195] Bump $BUNDLE_VERSION to 4.8.8 before rebuilding dev
 bundle.

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

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

From d7cae3c939e2231ed89e694d05fe5f3698540b72 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 25 Apr 2017 20:03:05 -0400
Subject: [PATCH 109/195] Support pkg.module in client bundles, even for
 node_modules.

As proposed here: https://github.com/rollup/rollup/wiki/pkg.module

By supporting ECMAScript module entry points for npm packages in Meteor
1.5, we will be well-positioned to do more effective import/export-based
tree shaking in future versions of Meteor.

We can't do the same thing on the server because we can't change how
native Node resolves package entry points based on the "main" field of the
package.json module.

On the other hand, all npm packages have to work in Node using the "main"
field, and client bundles stand to benefit the most from tree shaking, so
this client/server difference should not be problematic.

Note that the "jsnext:main" property is also supported as a legacy synonym
for "module".
---
 packages/dynamic-import/client.js             |  4 +-
 .../.npm/package/npm-shrinkwrap.json          |  6 +--
 packages/modules-runtime/client.js            |  2 +
 packages/modules-runtime/meteor-install.js    | 21 +++++---
 packages/modules-runtime/package.js           |  2 +-
 tools/isobuild/import-scanner.js              | 17 +++++-
 tools/isobuild/js-analyze.js                  | 54 ++++++++++++++++++-
 tools/isobuild/linker.js                      | 16 +++---
 tools/isobuild/resolver.js                    | 20 ++++---
 tools/tests/apps/dynamic-import/package.json  |  2 +-
 tools/tests/apps/dynamic-import/tests.js      | 10 +++-
 11 files changed, 121 insertions(+), 33 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 4a818aa57a..17703c4b6e 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -41,7 +41,7 @@ Mp.prefetch = function (id) {
   function walk(meta) {
     if (meta.dynamic && ! meta.pending) {
       meta.pending = true;
-      var id = meta.module.id;
+      var id = meta.mod.id;
       versions[id] = getFromTree(dynamicVersions, id);
       meta.eachChild(walkChild);
     }
@@ -132,7 +132,7 @@ function installResults(resultsTree, doNotCache) {
   function walk(tree) {
     if (typeof tree === "string") {
       var meta = requireMeta(parts.join("/"));
-      var id = meta.module.id;
+      var id = meta.mod.id;
       var optionsIndex = options.indexOf(meta.options);
       if (optionsIndex < 0) {
         options[optionsIndex = options.length] = meta.options;
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index 5186366969..9923bcf12b 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.8",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.8.tgz",
-      "from": "install@0.8.8"
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
+      "from": "install@0.8.9"
     }
   }
 }
diff --git a/packages/modules-runtime/client.js b/packages/modules-runtime/client.js
index 570609ef60..a6be2fb3d1 100644
--- a/packages/modules-runtime/client.js
+++ b/packages/modules-runtime/client.js
@@ -1,5 +1,7 @@
 // On the client, make package resolution prefer the "browser" field of
 // package.json files to the "main" field.
 makeInstallerOptions.browser = true;
+makeInstallerOptions.mainFields =
+  ["browser", "module", "jsnext:main", "main"];
 
 install = makeInstaller(makeInstallerOptions);
diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
index 57c40ec4d1..9b9263f61b 100644
--- a/packages/modules-runtime/meteor-install.js
+++ b/packages/modules-runtime/meteor-install.js
@@ -3,7 +3,8 @@
 // metadata about all available modules, not only those already installed
 // but also modules that can be fetched dynamically.
 var metaInstall = makeInstaller({
-  browser: makeInstallerOptions.browser
+  browser: makeInstallerOptions.browser,
+  mainFields: makeInstallerOptions.mainFields
 });
 
 meteorInstall = function (tree, options) {
@@ -111,16 +112,24 @@ function makeMetaFunc(value, dynamic, options) {
       // graph to read its "main" and "browser" properties.
       var pkg = requireReal(module.id);
 
-      if (typeof pkg.main === "string") {
-        exports.main = pkg.main;
+      function copy(name) {
+        if (typeof pkg[name] === "string") {
+          exports[name] = pkg[name];
+        }
       }
 
-      if (typeof pkg.browser === "string") {
-        exports.browser = pkg.browser;
+      if (Meteor.isClient) {
+        copy("browser");
+        copy("module");
+        copy("jsnext:main");
       }
+
+      copy("main");
     }
 
-    exports.module = module;
+    // This needs to have a different name from the "module" property that
+    // may have been added above.
+    exports.mod = module;
     exports.dynamic = !! dynamic;
     exports.options = options;
 
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index cb3e51fd28..7bc4e61aeb 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.8.8"
+  install: "0.8.9"
 });
 
 Package.onUse(function(api) {
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index d71568de7c..6026935029 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -6,7 +6,10 @@ import {
 } from "underscore";
 import {sha1} from "../fs/watch.js";
 import {matches as archMatches} from "../utils/archinfo.js";
-import {findImportedModuleIdentifiers} from "./js-analyze.js";
+import {
+  findImportedModuleIdentifiers,
+  reifyCompileWithCache,
+} from "./js-analyze.js";
 import {cssToCommonJS} from "./css-modules.js";
 import buildmessage from "../utils/buildmessage.js";
 import LRU from "lru-cache";
@@ -740,6 +743,12 @@ export default class ImportScanner {
       info.hash,
     );
 
+    if (this.isWeb()) {
+      const result = reifyCompileWithCache(info.dataString, info.hash);
+      info.dataString = result.code;
+      info.deps = result.deps;
+    }
+
     if (info.dataString !== dataString) {
       info.data = new Buffer(info.dataString, "utf8");
     }
@@ -932,7 +941,11 @@ export default class ImportScanner {
     }
 
     const data = new Buffer(map(pkg, (value, key) => {
-      return `exports.${key} = ${JSON.stringify(value)};\n`;
+      const isIdentifier = /^[_$a-zA-Z]\w*$/.test(key);
+      const prop = isIdentifier
+        ? "." + key
+        : "[" + JSON.stringify(key) + "]";
+      return `exports${prop} = ${JSON.stringify(value)};\n`;
     }).join(""));
 
     const relPkgJsonPath = pathRelative(this.sourceRoot, pkgJsonPath);
diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index bc36d061a6..cb945fd663 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -1,5 +1,7 @@
-import { parse } from 'meteor-babel';
+import { parse as meteorBabelParse } from 'meteor-babel';
 import { analyze as analyzeScope } from 'escope';
+import { Profile } from "../tool-env/profile.js";
+import { compile as reifyCompile } from "reify/lib/compiler.js";
 import LRU from "lru-cache";
 
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -20,7 +22,7 @@ function tryToParse(source, hash) {
   let ast;
 
   try {
-    ast = parse(source);
+    ast = meteorBabelParse(source);
   } catch (e) {
     if (typeof e.loc === 'object') {
       e.$ParseError = true;
@@ -35,6 +37,54 @@ function tryToParse(source, hash) {
   return ast;
 }
 
+// Map from file hash to Reify-compiled output.
+const REIFY_COMPILE_CACHE = new LRU({
+  max: Math.pow(2, 20),
+  length(result) {
+    return result.code.length;
+  }
+});
+
+export const reifyCompileWithCache = Profile(
+  "reifyCompileWithCache (js-analyze.js)",
+  function (source, hash) {
+    if (hash && REIFY_COMPILE_CACHE.has(hash)) {
+      return REIFY_COMPILE_CACHE.get(hash);
+    }
+
+    const result = reifyCompile(source, {
+      // Do not modify the AST, nor bother returning result.ast.
+      ast: false,
+      // It's not our job to enforce strict mode here.
+      enforceStrictMode: false,
+      // We may be generating code for JavaScript environments that don't
+      // support const and let declarations (e.g. older browsers), so it
+      // would be dangerous at this stage to introduce such declarations.
+      // Fortunately, reifyCompileWithCache is only called for modules in
+      // node_modules, which should only be using top-level import and
+      // export declarations, so there should not be any difference.
+      generateLetDeclarations: false,
+      // Same concern for arrow functions as for const/let declarations.
+      avoidArrowFunctions: true,
+      parse(code) {
+        // Avoid double-parsing the input source, but allow Reify to parse
+        // other strings using the meteor-babel parser.
+        return code === source
+          ? tryToParse(code, hash)
+          : meteorBabelParse(code);
+      }
+    });
+
+    result.deps = findImportedModuleIdentifiers(source, hash);
+
+    if (hash) {
+      REIFY_COMPILE_CACHE.set(hash, result);
+    }
+
+    return result;
+  }
+);
+
 var dependencyKeywordPattern =
   /\b(?:require|import|importSync|dynamicImport|export)\b/g;
 
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 3b32b8620f..58b8c69418 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -270,15 +270,17 @@ _.extend(Module.prototype, {
 
         if (file.installPath.endsWith("/package.json") &&
             file.jsonData) {
-          const main = file.jsonData.main;
-          if (_.isString(main)) {
-            entry.main = main;
+          function tryMain(name) {
+            const value = file.jsonData[name];
+            if (_.isString(value)) {
+              entry[name] = value;
+            }
           }
 
-          const browser = file.jsonData.browser;
-          if (_.isString(browser)) {
-            entry.browser = browser;
-          }
+          tryMain("browser");
+          tryMain("module");
+          tryMain("jsnext:main");
+          tryMain("main");
         }
 
         addToTree([entry], file.installPath, tree);
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 499178f703..6cf8a4aa75 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -297,17 +297,23 @@ export default class Resolver {
       pkgSubset.version = pkg.version;
     }
 
-    let main = pkg.main;
-    if (has(pkg, "main")) {
-      pkgSubset.main = pkg.main;
+    let main;
+    function tryMain(name) {
+      const value = pkg[name];
+      if (isString(value)) {
+        main = main || value;
+        pkgSubset[name] = value;
+      }
     }
 
-    if (archMatches(this.targetArch, "web") &&
-        isString(pkg.browser)) {
-      main = pkg.browser;
-      pkgSubset.browser = pkg.browser;
+    if (archMatches(this.targetArch, "web")) {
+      tryMain("browser");
+      tryMain("module");
+      tryMain("jsnext:main");
     }
 
+    tryMain("main");
+
     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
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
index 1a6a568e7c..ac7a9c28e3 100644
--- a/tools/tests/apps/dynamic-import/package.json
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -6,7 +6,7 @@
     "test": "meteor test --full-app --driver-package dispatch:mocha-browser"
   },
   "dependencies": {
-    "acorn": "^4.0.11",
+    "acorn": "^5.0.0",
     "arson": "^0.2.3",
     "babel-runtime": "^6.20.0",
     "meteor-node-stubs": "~0.2.4",
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 41473f8883..2619143e0b 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -31,10 +31,16 @@ describe("dynamic import(...)", function () {
   });
 
   it("static package.json, static package", function () {
-    import { name } from "acorn/package.json";
+    import * as pkg from "acorn/package.json";
     import acorn from "acorn";
-    assert.strictEqual(name, "acorn");
+    assert.strictEqual(pkg.name, "acorn");
     assert.strictEqual(typeof acorn.parse, "function");
+    assert.strictEqual(
+      require.resolve("acorn"),
+      Meteor.isServer
+        ? "/node_modules/acorn/dist/acorn.js"
+        : "/node_modules/acorn/dist/acorn.es.js"
+    );
   });
 
   it("static package.json, dynamic package", function () {

From 79ad707c6a3d99cddcd3e73e43b0616018167395 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 27 Apr 2017 17:43:45 -0400
Subject: [PATCH 110/195] Bump package versions for 1.5-beta.17 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 9f4e01a024..a43d1b377a 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.19.0-beta.16'
+  version: '6.19.0-beta.17'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index f03e833159..9d42902d92 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.16",
+  version: "0.1.0-beta.17",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index e79c4254e3..3e39c0ccb2 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.16',
+  version: '0.8.0-beta.17',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index fa43225a56..d6f8683458 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.1.0-beta.16"
+  version: "1.1.0-beta.17"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index f65ee9a7c6..554cfb5c1e 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.5.0-beta.16'
+  version: '1.5.0-beta.17'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index f941764096..5d787f897b 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.1.0'
+  version: '1.1.0-beta.17'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 7bc4e61aeb..5af7f2300b 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.16",
+  version: "0.8.0-beta.17",
   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 554fa59771..c5fa8f4292 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.16",
+  version: "0.9.0-beta.17",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index db2b049863..915360b00d 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.16",
+ "version": "1.5-beta.17",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 9c7778da364550528de9c966b6976e952c714755 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 1 May 2017 17:04:24 -0400
Subject: [PATCH 111/195] Let the `install` npm package implement
 Module.prototype.prefetch.

Now anyone can define meteorInstall.fetch however they see fit, and the
install.js implementation will handle everything else.

This separation of concerns leads to significantly less code, too.
---
 packages/dynamic-import/client.js             | 230 ++++++------------
 .../.npm/package/npm-shrinkwrap.json          |   6 +-
 packages/modules-runtime/client.js            |   2 +-
 packages/modules-runtime/meteor-install.js    | 168 -------------
 packages/modules-runtime/package.js           |   3 +-
 packages/modules-runtime/server.js            |   4 +-
 tools/isobuild/linker.js                      |  14 +-
 7 files changed, 90 insertions(+), 337 deletions(-)
 delete mode 100644 packages/modules-runtime/meteor-install.js

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 17703c4b6e..843a5f6ba7 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -1,199 +1,121 @@
 var Module = module.constructor;
-var delayPromise = Promise.resolve();
-var requireMeta = meteorInstall._requireMeta;
 var cache = require("./cache.js");
-var Mp = Module.prototype;
 
 // Call module.dynamicImport(id) to fetch a module and any/all of its
 // dependencies that have not already been fetched, and evaluate them as
 // soon as they arrive. This runtime API makes it very easy to implement
 // ECMAScript dynamic import(...) syntax.
-Mp.dynamicImport = function (id) {
-  // The real (not meta) parent module.
+Module.prototype.dynamicImport = function (id) {
   var module = this;
-
-  function get() {
+  return module.prefetch(id).then(function () {
     return getNamespace(module, id);
-  }
-
-  return delayPromise.then(get).catch(function (error) {
-    var message = error.message;
-    if (! (message &&
-           message.startsWith("Cannot find module"))) {
-      throw error;
-    }
-
-    return module.prefetch(id).then(get);
   });
 };
 
-// Call module.prefetch(id) to fetch modules without evaluating them.
-// Returns a Promise that resolves to an Error object if importing the
-// given id failed, and null otherwise.
-Mp.prefetch = function (id) {
-  var module = this;
-
-  // Require the parent module from the complete meta graph.
-  var meta = requireMeta(module.id);
+// Called by Module.prototype.fetch if there are any missing dynamic
+// modules that need to be fetched.
+meteorInstall.fetch = function (ids) {
+  var tree = Object.create(null);
   var versions = Object.create(null);
   var dynamicVersions = require("./dynamic-versions.js");
+  var missing;
 
-  function walk(meta) {
-    if (meta.dynamic && ! meta.pending) {
-      meta.pending = true;
-      var id = meta.mod.id;
-      versions[id] = getFromTree(dynamicVersions, id);
-      meta.eachChild(walkChild);
+  Object.keys(ids).forEach(function (id) {
+    var version = getFromTree(dynamicVersions, id);
+    if (version) {
+      versions[id] = version;
+    } else {
+      addToTree(missing = missing || Object.create(null), id, 1);
     }
-  }
-
-  function walkChild(childModule) {
-    return walk(childModule.exports);
-  }
-
-  meta.eachChild(walkChild, [id]);
-
-  var error = meta.errors && meta.errors[id];
-  if (error) {
-    // If module.prefetch(id) fails, the failure will probably be reported
-    // as an uncaught promise rejection, unless the calling code
-    // deliberately handles the rejection. This seems appropriate because
-    // failed prefetches should not be fatal to the application, yet they
-    // should be noticeable, so that they can be cleaned up at some point.
-    return Promise.reject(error);
-  }
+  });
 
   return cache.checkMany(versions).then(function (sources) {
-    var localTree = null;
-    var missingTree = null;
-
     Object.keys(sources).forEach(function (id) {
       var source = sources[id];
       if (source) {
-        addToTree(localTree = localTree || Object.create(null), id, source);
+        addToTree(tree, id, makeModuleFunction(source, ids[id]));
       } else {
-        addToTree(missingTree = missingTree || Object.create(null), id, 1);
+        addToTree(missing = missing || Object.create(null), id, 1);
       }
     });
 
-    if (localTree) {
-      installResults(localTree, true);
-    }
+    return missing && fetchMissing(missing).then(function (results) {
+      var versionsAndSourcesById = Object.create(null);
+      var flatResults = flattenModuleTree(results);
 
-    return missingTree && fetchMissing(missingTree);
+      Object.keys(flatResults).forEach(function (id) {
+        var source = flatResults[id];
+        var options = ids[id];
+
+        addToTree(tree, id, makeModuleFunction(source, options));
+
+        var version = getFromTree(dynamicVersions, id);
+        if (version) {
+          versionsAndSourcesById[id] = {
+            version: version,
+            source: source
+          };
+        }
+      });
+
+      cache.setMany(versionsAndSourcesById);
+    });
 
   }).then(function () {
-    // If everything was successful, the final result of the
-    // module.prefetch(id) promise will be the fully-resolved absolute
-    // form of the given identifier.
-    return module.resolve(id);
+    return tree;
   });
 };
 
-// Results from fetchMissing must be delivered in the same order as calls
-// to fetchMissing, because previous results may include modules needed by
-// more recent calls. In practice, results are usually delivered in order,
-// but might be delivered out of order because the __dynamicImport method
-// calls this.unblock(). To achieve this ordering of results while still
-// allowing parallel __dynamicImport method calls, we keep track of the
-// most recent Promise returned by fetchMissing, and delay resolving the
-// next Promise until the previous Promise has been resolved or rejected.
-var lastFetchMissingPromise = delayPromise;
+function flattenModuleTree(tree) {
+  var parts = [""];
+  var result = Object.create(null);
+
+  function walk(t) {
+    if (t && typeof t === "object") {
+      Object.keys(t).forEach(function (key) {
+        parts.push(key);
+        walk(t[key]);
+        parts.pop();
+      });
+    } else if (typeof t === "string") {
+      result[parts.join("/")] = t;
+    }
+  }
+
+  walk(tree);
+
+  return result;
+}
+
+function makeModuleFunction(source, options) {
+  // By calling (options && options.eval || eval) in a wrapper function,
+  // we delay the cost of parsing and evaluating the module code until the
+  // module is first imported.
+  return function () {
+    // If an options.eval function was provided in the second argument to
+    // meteorInstall when this bundle was first installed, use that
+    // function to parse and evaluate the dynamic module code in the scope
+    // of the package. Otherwise fall back to indirect (global) eval.
+    return (options && options.eval || eval)(
+      // Wrap the function(require,exports,module){...} expression in
+      // parentheses to force it to be parsed as an expression.
+      "(" + source + ")"
+    ).apply(this, arguments);
+  };
+}
 
 function fetchMissing(missingTree) {
-  // Save the Promise that was most recent when fetchMissing was called.
-  var previousPromise = lastFetchMissingPromise;
-
   // Update lastFetchMissingPromise immediately, without waiting for
   // the results to be delivered.
-  return lastFetchMissingPromise = new Promise(function (resolve, reject) {
+  return new Promise(function (resolve, reject) {
     Meteor.call(
       "__dynamicImport",
       missingTree,
       function (error, resultsTree) {
-        if (error) {
-          reject(error);
-        } else {
-          resolve = resolve.bind(null, resultsTree)
-          // Continue even if previousPromise was rejected.
-          previousPromise.then(resolve, resolve);
-        }
+        error ? reject(error) : resolve(resultsTree);
       }
     );
-  }).then(installResults);
-}
-
-function installResults(resultsTree, doNotCache) {
-  var parts = [""];
-  var trees = [];
-  var options = [];
-  var versionsAndSourcesById = Object.create(null);
-
-  function walk(tree) {
-    if (typeof tree === "string") {
-      var meta = requireMeta(parts.join("/"));
-      var id = meta.mod.id;
-      var optionsIndex = options.indexOf(meta.options);
-      if (optionsIndex < 0) {
-        options[optionsIndex = options.length] = meta.options;
-        trees.push(Object.create(null));
-      }
-
-      // The results tree is partitioned into separate trees according
-      // to the meta.options object that governs the tree. Usually the
-      // number of trees will be approximately one, because options
-      // are shared by entire bundles.
-      addToTree(
-        trees[optionsIndex],
-        id,
-        // By calling (meta.options.eval || eval) in a wrapper function,
-        // we delay the cost of parsing and evaluating the module code
-        // until the module is first imported.
-        function () {
-          // If an options.eval function was provided in the second
-          // argument to meteorInstall when this bundle was first
-          // installed, use that function to parse and evaluate the
-          // dynamic module code in the scope of the package. Otherwise
-          // fall back to indirect (global) eval.
-          return (meta.options.eval || eval)(
-            // Wrap the function(require,exports,module){...} expression
-            // in parentheses to force it to be parsed as an expression.
-            "(" + tree + ")"
-          ).apply(this, arguments);
-        }
-      );
-
-      // Intentionally do not delay resolution waiting for the cache.
-      if (! doNotCache) {
-        var version = getFromTree(require("./dynamic-versions.js"), id);
-        if (version) {
-          versionsAndSourcesById[id] = {
-            version: version,
-            source: tree
-          };
-        }
-      }
-
-    } else {
-      Object.keys(tree).forEach(function (name) {
-        parts.push(name);
-        walk(tree[name]);
-        parts.pop(name);
-      });
-    }
-  }
-
-  walk(resultsTree);
-
-  trees.forEach(function (tree, i) {
-    meteorInstall(tree, options[i]);
   });
-
-  if (! doNotCache) {
-    cache.setMany(versionsAndSourcesById);
-  }
-
-  return null;
 }
 
 function getFromTree(tree, id) {
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index 9923bcf12b..ad61832e44 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.9",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
-      "from": "install@0.8.9"
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.9.5.tgz",
+      "from": "install@0.9.5"
     }
   }
 }
diff --git a/packages/modules-runtime/client.js b/packages/modules-runtime/client.js
index a6be2fb3d1..1fbf18f13d 100644
--- a/packages/modules-runtime/client.js
+++ b/packages/modules-runtime/client.js
@@ -4,4 +4,4 @@ makeInstallerOptions.browser = true;
 makeInstallerOptions.mainFields =
   ["browser", "module", "jsnext:main", "main"];
 
-install = makeInstaller(makeInstallerOptions);
+meteorInstall = makeInstaller(makeInstallerOptions);
diff --git a/packages/modules-runtime/meteor-install.js b/packages/modules-runtime/meteor-install.js
deleted file mode 100644
index 9b9263f61b..0000000000
--- a/packages/modules-runtime/meteor-install.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// The metaInstall function will be used to create a module graph that
-// parallels the installed module graph. This parallel graph consists of
-// metadata about all available modules, not only those already installed
-// but also modules that can be fetched dynamically.
-var metaInstall = makeInstaller({
-  browser: makeInstallerOptions.browser,
-  mainFields: makeInstallerOptions.mainFields
-});
-
-meteorInstall = function (tree, options) {
-  if (isObject(tree)) {
-    var meta = Object.create(null);
-    var real = Object.create(null);
-    walk(options, tree, meta, real);
-    metaInstall(meta, options);
-    return install(real, options);
-  }
-
-  return install();
-};
-
-// Other packages (namely the dynamic-import package) call this function
-// to retrieve module metadata from the metaInstall graph.
-meteorInstall._requireMeta = metaInstall();
-
-function isObject(value) {
-  return value && typeof value === "object";
-}
-
-function getOrSet(obj, name) {
-  return obj[name] = obj[name] || Object.create(null);
-}
-
-function walk(options, input, meta, real) {
-  Object.keys(input).forEach(function (name) {
-    var value = input[name];
-
-    if (tryChild(value, name, meta, real, options)) {
-      // If the value was a leaf node that we were able to handle, then we
-      // don't need to (and can't) keep walking it.
-      return;
-    }
-
-    if (isObject(value)) {
-      walk(
-        options,
-        value,
-        getOrSet(meta, name),
-        getOrSet(real, name)
-      );
-    }
-  });
-
-  return this;
-}
-
-function tryChild(value, name, meta, real, options) {
-  function tryFunc(value) {
-    if (typeof value === "function") {
-      meta[name] = makeMetaFunc({}, false, options);
-      real[name] = value;
-      return true;
-    }
-  }
-
-  if (Array.isArray(value)) {
-    return value.some(function (value) {
-      // Dynamic stub modules are represented by objects wrapped in array
-      // brackets. When we find one of these objects, we install it in the
-      // meta graph, but not in the installed modules graph. Later, this
-      // information may be used to fetch dynamic modules from the server,
-      // which will then be installed into the real graph.
-      if (isObject(value)) {
-        meta[name] = makeMetaFunc(value, true, options);
-        return true;
-      }
-
-      // Older versions of the install.js library supported wrapping a
-      // module function in an array that also contained the dependency
-      // identifier strings of that module. That style should no longer be
-      // used, but we might as well handle it gracefully, since it is not
-      // ambiguous with the [{...}] style.
-      return tryFunc(value);
-    });
-  }
-
-  // Installed (immediately importable) modules are represented by
-  // function expressions with the parameters (require, exports, module).
-  if (tryFunc(value)) {
-    return true;
-  }
-
-  // The install.js library supports a notion of aliases, represented by
-  // module identifier strings. This functionality works the same way in
-  // both the meta graph and the real graph.
-  if (typeof value === "string") {
-    meta[name] = value;
-    real[name] = value;
-    return true;
-  }
-}
-
-var requireReal = install();
-
-function makeMetaFunc(value, dynamic, options) {
-  return function (require, exports, module) {
-    Object.assign(exports, value);
-
-    if (! dynamic &&
-        module.id.endsWith("/package.json")) {
-      // If the package.json file is not dynamic, require it from the real
-      // graph to read its "main" and "browser" properties.
-      var pkg = requireReal(module.id);
-
-      function copy(name) {
-        if (typeof pkg[name] === "string") {
-          exports[name] = pkg[name];
-        }
-      }
-
-      if (Meteor.isClient) {
-        copy("browser");
-        copy("module");
-        copy("jsnext:main");
-      }
-
-      copy("main");
-    }
-
-    // This needs to have a different name from the "module" property that
-    // may have been added above.
-    exports.mod = module;
-    exports.dynamic = !! dynamic;
-    exports.options = options;
-
-    function quietRequire(id) {
-      try {
-        return require(id);
-      } catch (error) {
-        (exports.errors =
-         exports.errors || Object.create(null)
-        )[id] = error;
-      }
-    }
-
-    // One of the purposes of the meta graph is to support traversing
-    // module dependencies without evaluating any actual module code.
-    // The eachChild function is essential to that traversal.
-    exports.eachChild = function (callback, idsToRequire) {
-      // By default, this function requires all value.deps dependencies
-      // before iterating over the resulting children, but the caller can
-      // provide a custom array of modules to require instead.
-      idsToRequire = idsToRequire || (value && value.deps);
-
-      if (Array.isArray(idsToRequire)) {
-        idsToRequire.forEach(quietRequire);
-      }
-
-      // After requiring any/all dependencies of this module, iterate over
-      // the children according to module.childrenById. Note that this
-      // includes all children ever imported by this module, including
-      // implicit modules such as package.json files.
-      Object.keys(module.childrenById).forEach(function (id) {
-        callback(module.childrenById[id]);
-      });
-    };
-  };
-}
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 5af7f2300b..480b57dea1 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.8.9"
+  install: "0.9.5"
 });
 
 Package.onUse(function(api) {
@@ -21,7 +21,6 @@ Package.onUse(function(api) {
   api.addFiles("options.js");
   api.addFiles("client.js", "client");
   api.addFiles("server.js", "server");
-  api.addFiles("meteor-install.js");
 
   api.export("meteorInstall");
 });
diff --git a/packages/modules-runtime/server.js b/packages/modules-runtime/server.js
index 1ce8ffb0be..367a60c769 100644
--- a/packages/modules-runtime/server.js
+++ b/packages/modules-runtime/server.js
@@ -32,8 +32,8 @@ makeInstallerOptions.fallback.resolve = function (id, parentId, error) {
   throw error;
 };
 
-install = makeInstaller(makeInstallerOptions);
-var Module = install.Module;
+meteorInstall = makeInstaller(makeInstallerOptions);
+var Module = meteorInstall.Module;
 
 Module.prototype.useNode = function () {
   if (typeof npmRequire !== "function") {
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 58b8c69418..9858923305 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -262,18 +262,16 @@ _.extend(Module.prototype, {
           dynamic: true,
         });
 
-        const entry = {};
-
-        if (! _.isEmpty(file.deps)) {
-          entry.deps = file.deps;
-        }
+        const stubArray = file.deps.slice(0);
 
         if (file.installPath.endsWith("/package.json") &&
             file.jsonData) {
+          const stub = {};
+
           function tryMain(name) {
             const value = file.jsonData[name];
             if (_.isString(value)) {
-              entry[name] = value;
+              stub[name] = value;
             }
           }
 
@@ -281,9 +279,11 @@ _.extend(Module.prototype, {
           tryMain("module");
           tryMain("jsnext:main");
           tryMain("main");
+
+          stubArray.push(stub);
         }
 
-        addToTree([entry], file.installPath, tree);
+        addToTree(stubArray, file.installPath, tree);
 
       } else {
         // If the file is not dynamic, then it should be included in the

From 807c4224eb6ac4111102199f42a60e0c269182b8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 May 2017 11:04:52 -0400
Subject: [PATCH 112/195] Update to latest meteorInstall.fetch API.

https://github.com/benjamn/install/commit/90fd573f8617586b0404547153ba552b8f0fc745
---
 packages/dynamic-import/client.js                         | 7 ++++---
 packages/modules-runtime/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/modules-runtime/package.js                       | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 843a5f6ba7..9d5f9593b9 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -33,7 +33,8 @@ meteorInstall.fetch = function (ids) {
     Object.keys(sources).forEach(function (id) {
       var source = sources[id];
       if (source) {
-        addToTree(tree, id, makeModuleFunction(source, ids[id]));
+        var info = ids[id];
+        addToTree(tree, id, makeModuleFunction(source, info.options));
       } else {
         addToTree(missing = missing || Object.create(null), id, 1);
       }
@@ -45,9 +46,9 @@ meteorInstall.fetch = function (ids) {
 
       Object.keys(flatResults).forEach(function (id) {
         var source = flatResults[id];
-        var options = ids[id];
+        var info = ids[id];
 
-        addToTree(tree, id, makeModuleFunction(source, options));
+        addToTree(tree, id, makeModuleFunction(source, info.options));
 
         var version = getFromTree(dynamicVersions, id);
         if (version) {
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index ad61832e44..45dca93b24 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.9.5",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.9.5.tgz",
-      "from": "install@0.9.5"
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.9.6.tgz",
+      "from": "install@0.9.6"
     }
   }
 }
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 480b57dea1..8efbd7e6dd 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.9.5"
+  install: "0.9.6"
 });
 
 Package.onUse(function(api) {

From cccf387c44184247dcbf6153c0cd9a44752f7ba5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 May 2017 11:21:06 -0400
Subject: [PATCH 113/195] Bump $BUNDLE_VERSION to 4.8.9 before rebuilding dev
 bundle.

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

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

From 6fb8e1f0ab7837bbc09ad27dbd157c4b1b5160ee Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 2 May 2017 11:42:53 -0400
Subject: [PATCH 114/195] Bump package versions for 1.5-beta.18 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index a43d1b377a..dc9749cc5c 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.19.0-beta.17'
+  version: '6.19.0-beta.18'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 9d42902d92..8b96290cfa 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.17",
+  version: "0.1.0-beta.18",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 3e39c0ccb2..ae5d723ebf 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.17',
+  version: '0.8.0-beta.18',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index d6f8683458..0f9fe32981 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.1.0-beta.17"
+  version: "1.1.0-beta.18"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 554cfb5c1e..79f89bb918 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.5.0-beta.17'
+  version: '1.5.0-beta.18'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index ab9fc65043..9d75927950 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.2.0-beta.17'
+  version: '1.2.0-beta.18'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 8efbd7e6dd..fb953a6b5e 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.17",
+  version: "0.8.0-beta.18",
   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 c5fa8f4292..840b146401 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.17",
+  version: "0.9.0-beta.18",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 915360b00d..7e4e12b7c1 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.17",
+ "version": "1.5-beta.18",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 46e00ab517e80d525da6c1426ec6fcaf955e868f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 May 2017 16:00:23 -0400
Subject: [PATCH 115/195] Upgrade the `reify` npm package to version 0.9.2.

---
 History.md                                    |  6 +--
 .../.npm/package/npm-shrinkwrap.json          | 50 +++++++++----------
 packages/babel-compiler/package.js            |  2 +-
 .../.npm/package/npm-shrinkwrap.json          |  6 +--
 packages/modules-runtime/package.js           |  2 +-
 .../modules/.npm/package/npm-shrinkwrap.json  | 18 +++----
 packages/modules/package.js                   |  2 +-
 scripts/dev-bundle-tool-package.js            |  4 +-
 8 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/History.md b/History.md
index f830eec702..8bbb71b861 100644
--- a/History.md
+++ b/History.md
@@ -9,10 +9,10 @@
   information about how dynamic `import(...)` works in Meteor, and how to
   use it in your applications.
 
-* The `meteor-babel` npm package has been upgraded to version 0.20.2, and
-  the `reify` npm package has been upgraded to version 0.8.3, fixing
+* The `meteor-babel` npm package has been upgraded to version 0.20.3, and
+  the `reify` npm package has been upgraded to version 0.9.2, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
-  improving compilation performance.
+  improving compilation and runtime performance.
 
 ## v1.4.4.2, 2017-05-02
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index b63f3111c7..c52b3cbdc0 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -131,8 +131,8 @@
       "from": "babel-plugin-minify-constant-folding@>=0.0.4 <0.0.5",
       "dependencies": {
         "jsesc": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.0.tgz",
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
           "from": "jsesc@>=2.4.0 <3.0.0"
         }
       }
@@ -270,9 +270,9 @@
       "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-reify": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.8.0.tgz",
-      "from": "babel-plugin-transform-es2015-modules-reify@>=0.8.0 <0.9.0"
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.9.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-reify@>=0.9.0 <0.10.0"
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.24.1",
@@ -500,8 +500,8 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.5.tgz",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
@@ -580,9 +580,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.20.2.tgz",
-      "from": "meteor-babel@0.20.2"
+      "version": "0.20.3",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.20.3.tgz",
+      "from": "meteor-babel@0.20.3"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -600,14 +600,14 @@
       "from": "minimist@0.0.8"
     },
     "minipass": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-1.1.9.tgz",
-      "from": "minipass@>=1.1.6 <2.0.0"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.0.tgz",
+      "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.2.tgz",
-      "from": "minizlib@>=1.0.2 <2.0.0"
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz",
+      "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "mkdirp": {
       "version": "0.5.1",
@@ -650,8 +650,8 @@
       "from": "regenerate@>=1.2.1 <2.0.0"
     },
     "regenerator-runtime": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.4.tgz",
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
       "from": "regenerator-runtime@>=0.10.0 <0.11.0"
     },
     "regenerator-transform": {
@@ -682,9 +682,9 @@
       }
     },
     "reify": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.3.tgz",
-      "from": "reify@>=0.8.0 <0.9.0"
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.9.2.tgz",
+      "from": "reify@>=0.9.1 <0.10.0"
     },
     "repeating": {
       "version": "2.0.1",
@@ -702,8 +702,8 @@
       "from": "source-map@>=0.5.0 <0.6.0"
     },
     "source-map-support": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.14.tgz",
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
       "from": "source-map-support@>=0.4.2 <0.5.0"
     },
     "strip-ansi": {
@@ -717,8 +717,8 @@
       "from": "supports-color@>=2.0.0 <3.0.0"
     },
     "to-fast-properties": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
       "from": "to-fast-properties@>=1.0.1 <2.0.0"
     },
     "trim-right": {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index dc9749cc5c..fe930543df 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.20.2'
+  'meteor-babel': '0.20.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index 45dca93b24..f02ecf48bf 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.9.6",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.9.6.tgz",
-      "from": "install@0.9.6"
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.10.0.tgz",
+      "from": "install@0.10.0"
     }
   }
 }
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index fb953a6b5e..abedb00e02 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.9.6"
+  install: "0.10.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index f8f8d11e48..32ff3e2743 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -6,19 +6,19 @@
       "from": "acorn@>=5.0.0 <5.1.0"
     },
     "minipass": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-1.1.9.tgz",
-      "from": "minipass@>=1.1.6 <2.0.0"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.0.tgz",
+      "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.2.tgz",
-      "from": "minizlib@>=1.0.2 <2.0.0"
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.0.3.tgz",
+      "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.8.3.tgz",
-      "from": "reify@0.8.3"
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.9.2.tgz",
+      "from": "reify@0.9.2"
     },
     "yallist": {
       "version": "3.0.2",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 840b146401..819ebb55f1 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.8.3"
+  reify: "0.9.2"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 9d0a91c697..07bd68d707 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,8 +14,8 @@ var packageJson = {
     npm: "4.5.0",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
-    "meteor-babel": "0.20.2",
-    reify: "0.8.3",
+    "meteor-babel": "0.20.3",
+    reify: "0.9.2",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 269e10caa6c72312e7032f4c23b4f06f974320d4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 May 2017 16:07:42 -0400
Subject: [PATCH 116/195] Remove support for pkg.module in client bundles.

This partially reverts commit d7cae3c939e2231ed89e694d05fe5f3698540b72.

This functionality was problematic without providing any clear benefits to
Meteor developers, as reported by @fermuch and @markoshust:
https://github.com/meteor/meteor/pull/8327#issuecomment-298723203
---
 packages/modules-runtime/client.js           |  2 -
 tools/isobuild/import-scanner.js             | 11 +---
 tools/isobuild/js-analyze.js                 | 54 +-------------------
 tools/isobuild/linker.js                     |  2 -
 tools/isobuild/resolver.js                   |  2 -
 tools/tests/apps/dynamic-import/package.json |  2 +-
 tools/tests/apps/dynamic-import/tests.js     | 10 +---
 7 files changed, 6 insertions(+), 77 deletions(-)

diff --git a/packages/modules-runtime/client.js b/packages/modules-runtime/client.js
index 1fbf18f13d..d902671864 100644
--- a/packages/modules-runtime/client.js
+++ b/packages/modules-runtime/client.js
@@ -1,7 +1,5 @@
 // On the client, make package resolution prefer the "browser" field of
 // package.json files to the "main" field.
 makeInstallerOptions.browser = true;
-makeInstallerOptions.mainFields =
-  ["browser", "module", "jsnext:main", "main"];
 
 meteorInstall = makeInstaller(makeInstallerOptions);
diff --git a/tools/isobuild/import-scanner.js b/tools/isobuild/import-scanner.js
index 6026935029..dcd26d956d 100644
--- a/tools/isobuild/import-scanner.js
+++ b/tools/isobuild/import-scanner.js
@@ -6,10 +6,7 @@ import {
 } from "underscore";
 import {sha1} from "../fs/watch.js";
 import {matches as archMatches} from "../utils/archinfo.js";
-import {
-  findImportedModuleIdentifiers,
-  reifyCompileWithCache,
-} from "./js-analyze.js";
+import {findImportedModuleIdentifiers} from "./js-analyze.js";
 import {cssToCommonJS} from "./css-modules.js";
 import buildmessage from "../utils/buildmessage.js";
 import LRU from "lru-cache";
@@ -743,12 +740,6 @@ export default class ImportScanner {
       info.hash,
     );
 
-    if (this.isWeb()) {
-      const result = reifyCompileWithCache(info.dataString, info.hash);
-      info.dataString = result.code;
-      info.deps = result.deps;
-    }
-
     if (info.dataString !== dataString) {
       info.data = new Buffer(info.dataString, "utf8");
     }
diff --git a/tools/isobuild/js-analyze.js b/tools/isobuild/js-analyze.js
index cb945fd663..bc36d061a6 100644
--- a/tools/isobuild/js-analyze.js
+++ b/tools/isobuild/js-analyze.js
@@ -1,7 +1,5 @@
-import { parse as meteorBabelParse } from 'meteor-babel';
+import { parse } from 'meteor-babel';
 import { analyze as analyzeScope } from 'escope';
-import { Profile } from "../tool-env/profile.js";
-import { compile as reifyCompile } from "reify/lib/compiler.js";
 import LRU from "lru-cache";
 
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -22,7 +20,7 @@ function tryToParse(source, hash) {
   let ast;
 
   try {
-    ast = meteorBabelParse(source);
+    ast = parse(source);
   } catch (e) {
     if (typeof e.loc === 'object') {
       e.$ParseError = true;
@@ -37,54 +35,6 @@ function tryToParse(source, hash) {
   return ast;
 }
 
-// Map from file hash to Reify-compiled output.
-const REIFY_COMPILE_CACHE = new LRU({
-  max: Math.pow(2, 20),
-  length(result) {
-    return result.code.length;
-  }
-});
-
-export const reifyCompileWithCache = Profile(
-  "reifyCompileWithCache (js-analyze.js)",
-  function (source, hash) {
-    if (hash && REIFY_COMPILE_CACHE.has(hash)) {
-      return REIFY_COMPILE_CACHE.get(hash);
-    }
-
-    const result = reifyCompile(source, {
-      // Do not modify the AST, nor bother returning result.ast.
-      ast: false,
-      // It's not our job to enforce strict mode here.
-      enforceStrictMode: false,
-      // We may be generating code for JavaScript environments that don't
-      // support const and let declarations (e.g. older browsers), so it
-      // would be dangerous at this stage to introduce such declarations.
-      // Fortunately, reifyCompileWithCache is only called for modules in
-      // node_modules, which should only be using top-level import and
-      // export declarations, so there should not be any difference.
-      generateLetDeclarations: false,
-      // Same concern for arrow functions as for const/let declarations.
-      avoidArrowFunctions: true,
-      parse(code) {
-        // Avoid double-parsing the input source, but allow Reify to parse
-        // other strings using the meteor-babel parser.
-        return code === source
-          ? tryToParse(code, hash)
-          : meteorBabelParse(code);
-      }
-    });
-
-    result.deps = findImportedModuleIdentifiers(source, hash);
-
-    if (hash) {
-      REIFY_COMPILE_CACHE.set(hash, result);
-    }
-
-    return result;
-  }
-);
-
 var dependencyKeywordPattern =
   /\b(?:require|import|importSync|dynamicImport|export)\b/g;
 
diff --git a/tools/isobuild/linker.js b/tools/isobuild/linker.js
index 9858923305..d117fb88f7 100644
--- a/tools/isobuild/linker.js
+++ b/tools/isobuild/linker.js
@@ -276,8 +276,6 @@ _.extend(Module.prototype, {
           }
 
           tryMain("browser");
-          tryMain("module");
-          tryMain("jsnext:main");
           tryMain("main");
 
           stubArray.push(stub);
diff --git a/tools/isobuild/resolver.js b/tools/isobuild/resolver.js
index 6cf8a4aa75..e2a7c50954 100644
--- a/tools/isobuild/resolver.js
+++ b/tools/isobuild/resolver.js
@@ -308,8 +308,6 @@ export default class Resolver {
 
     if (archMatches(this.targetArch, "web")) {
       tryMain("browser");
-      tryMain("module");
-      tryMain("jsnext:main");
     }
 
     tryMain("main");
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
index ac7a9c28e3..1a6a568e7c 100644
--- a/tools/tests/apps/dynamic-import/package.json
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -6,7 +6,7 @@
     "test": "meteor test --full-app --driver-package dispatch:mocha-browser"
   },
   "dependencies": {
-    "acorn": "^5.0.0",
+    "acorn": "^4.0.11",
     "arson": "^0.2.3",
     "babel-runtime": "^6.20.0",
     "meteor-node-stubs": "~0.2.4",
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 2619143e0b..41473f8883 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -31,16 +31,10 @@ describe("dynamic import(...)", function () {
   });
 
   it("static package.json, static package", function () {
-    import * as pkg from "acorn/package.json";
+    import { name } from "acorn/package.json";
     import acorn from "acorn";
-    assert.strictEqual(pkg.name, "acorn");
+    assert.strictEqual(name, "acorn");
     assert.strictEqual(typeof acorn.parse, "function");
-    assert.strictEqual(
-      require.resolve("acorn"),
-      Meteor.isServer
-        ? "/node_modules/acorn/dist/acorn.js"
-        : "/node_modules/acorn/dist/acorn.es.js"
-    );
   });
 
   it("static package.json, dynamic package", function () {

From 509f9aee11523902f8ac506d231d878170d2f7c8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 May 2017 16:23:48 -0400
Subject: [PATCH 117/195] Bump $BUNDLE_VERSION to 4.8.10 before rebuilding dev
 bundle.

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

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

From 9228345ce666bc75ee14a84b20a251d062ffb6ba Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Thu, 4 May 2017 16:42:05 -0400
Subject: [PATCH 118/195] Fixed broken upserts with undefined selectors
 (#8668).

Fixes #8666.
---
 packages/mongo/collection.js           |  2 +-
 packages/mongo/mongo_livedata_tests.js | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js
index 000e84e850..45b296d860 100644
--- a/packages/mongo/collection.js
+++ b/packages/mongo/collection.js
@@ -558,7 +558,7 @@ Mongo.Collection.prototype.update = function update(selector, modifier, ...optio
       if (!(typeof options.insertedId === 'string' || options.insertedId instanceof Mongo.ObjectID))
         throw new Error("insertedId must be string or ObjectID");
       insertedId = options.insertedId;
-    } else if (! selector._id) {
+    } else if (!selector || !selector._id) {
       insertedId = this._makeNewID();
       options.insertedId = insertedId;
     }
diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js
index 09759f0097..1e1ea0174e 100644
--- a/packages/mongo/mongo_livedata_tests.js
+++ b/packages/mongo/mongo_livedata_tests.js
@@ -1301,6 +1301,29 @@ testAsyncMulti('mongo-livedata - upsert without callback, ' + idGeneration, [
   }
 ]);
 
+// Regression test for https://github.com/meteor/meteor/issues/8666.
+testAsyncMulti('mongo-livedata - upsert with an undefined selector, ' + idGeneration, [
+  function (test, expect) {
+    this.collectionName = Random.id();
+    if (Meteor.isClient) {
+      Meteor.call('createInsecureCollection', this.collectionName);
+      Meteor.subscribe('c-' + this.collectionName, expect());
+    }
+  }, function (test, expect) {
+    var coll = new Mongo.Collection(this.collectionName, collectionOptions);
+    var testWidget = {
+      name: 'Widget name'
+    };
+    coll.upsert(testWidget._id, testWidget, expect(function (error, insertDetails) {
+      test.isFalse(error);
+      test.equal(
+        coll.findOne(insertDetails.insertedId),
+        Object.assign({ _id: insertDetails.insertedId }, testWidget)
+      );
+    }));
+  }
+]);
+
 // See https://github.com/meteor/meteor/issues/594.
 testAsyncMulti('mongo-livedata - document with length, ' + idGeneration, [
   function (test, expect) {

From a89963fdbe5a55d0741cecae6bbb2fe52ca02063 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 4 May 2017 16:23:07 -0400
Subject: [PATCH 119/195] Bump package versions for 1.5-beta.19 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index fe930543df..4a3309cb00 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.19.0-beta.18'
+  version: '6.19.1-beta.19'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 8b96290cfa..94908b7c81 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.18",
+  version: "0.1.0-beta.19",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index ae5d723ebf..28f837d339 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.18',
+  version: '0.8.0-beta.19',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index e6acd883db..e79740cd61 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.1-beta.19"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 0f9fe32981..d8ed167141 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.1.0-beta.18"
+  version: "1.1.0-beta.19"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 79f89bb918..24df7a41f1 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.5.0-beta.18'
+  version: '1.5.0-beta.19'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 9d75927950..541e9ea468 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.2.0-beta.18'
+  version: '1.2.0-beta.19'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index abedb00e02..06917e328c 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.18",
+  version: "0.8.0-beta.19",
   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 819ebb55f1..3da4d3e38f 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.18",
+  version: "0.9.0-beta.19",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 0c442d6e42..bfc3b3034d 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.17'
+  version: '1.1.18-beta.19'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index c7d75f7fd0..215517b833 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.8'
+  version: '1.1.9-beta.19'
 });
 
 Package.onUse(function (api) {
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 7e4e12b7c1..e51412b902 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.18",
+ "version": "1.5-beta.19",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 95c4bcd6f2bd73f932d951f875c2d1029f3152dd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 May 2017 20:05:12 -0400
Subject: [PATCH 120/195] Make `meteor create --bare` apps use static-html.

Perhaps most importantly, this means bare apps no longer depend on jquery.
---
 tools/static-assets/skel-bare/.meteor/packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-bare/.meteor/packages b/tools/static-assets/skel-bare/.meteor/packages
index 199c1c1034..56a930a9ed 100644
--- a/tools/static-assets/skel-bare/.meteor/packages
+++ b/tools/static-assets/skel-bare/.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
+static-html             # Define static page content in .html files
 reactive-var            # Reactive variable for tracker
 tracker                 # Meteor's client-side reactive programming library
 

From 084801237a8c288d99ec82b0fbc1c76bdf1aab16 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 5 May 2017 20:07:23 -0400
Subject: [PATCH 121/195] Report per-bundle stats from minifier.

---
 packages/babel-compiler/babel.js              |  4 +
 packages/standard-minifier-js/package.js      |  5 ++
 .../standard-minifier-js/plugin/minify-js.js  | 65 +++++++++------
 packages/standard-minifier-js/plugin/stats.js | 83 +++++++++++++++++++
 packages/standard-minifier-js/plugin/utils.js | 26 ++++++
 .../standard-minifier-js/plugin/visitor.js    | 57 +++++++++++++
 tools/isobuild/bundler.js                     |  4 +
 tools/isobuild/minifier-plugin.js             | 15 +---
 8 files changed, 224 insertions(+), 35 deletions(-)
 create mode 100644 packages/standard-minifier-js/plugin/stats.js
 create mode 100644 packages/standard-minifier-js/plugin/utils.js
 create mode 100644 packages/standard-minifier-js/plugin/visitor.js

diff --git a/packages/babel-compiler/babel.js b/packages/babel-compiler/babel.js
index ac518d1034..13306f306b 100644
--- a/packages/babel-compiler/babel.js
+++ b/packages/babel-compiler/babel.js
@@ -21,6 +21,10 @@ Babel = {
   // Deprecated, now a no-op.
   validateExtraFeatures: Function.prototype,
 
+  parse: function (source) {
+    return Npm.require('meteor-babel').parse(source);
+  },
+
   compile: function (source, options) {
     var meteorBabel = Npm.require('meteor-babel');
     options = options || getDefaultOptions();
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index e2bc14e36e..8b9900cc8b 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -9,9 +9,14 @@ Package.registerBuildPlugin({
   name: "minifyStdJS",
   use: [
     'minifier-js',
+    'babel-compiler',
+    'ecmascript'
   ],
   sources: [
     'plugin/minify-js.js',
+    'plugin/stats.js',
+    'plugin/visitor.js',
+    'plugin/utils.js',
   ],
 });
 
diff --git a/packages/standard-minifier-js/plugin/minify-js.js b/packages/standard-minifier-js/plugin/minify-js.js
index 202f3b2a55..d1d67482d1 100644
--- a/packages/standard-minifier-js/plugin/minify-js.js
+++ b/packages/standard-minifier-js/plugin/minify-js.js
@@ -1,3 +1,5 @@
+import { extractModuleSizesTree } from "./stats.js";
+
 Plugin.registerMinifier({
   extensions: ['js'],
   archMatching: 'web'
@@ -108,37 +110,52 @@ MeteorBabelMinifier.prototype.processFilesForBundle = function(files, options) {
     }
   }
 
-  var allJs = '';
-  files.forEach(function (file) {
-      // Don't reminify *.min.js.
-      if (/\.min\.js$/.test(file.getPathInBundle())) {
-        allJs += file.getContentsAsString();
-      } else {
-        var minified;
+  const toBeAdded = {
+    data: "",
+    stats: Object.create(null)
+  };
 
-        try {
-          minified = meteorJsMinify(file.getContentsAsString());
+  files.forEach(file => {
+    // Don't reminify *.min.js.
+    if (/\.min\.js$/.test(file.getPathInBundle())) {
+      toBeAdded.data += file.getContentsAsString();
+    } else {
+      var minified;
 
-          if (!(minified && typeof minified.code === "string")) {
-            throw new Error();
-          }
-        } catch (err) {
-          var filePath = file.getPathInBundle();
+      try {
+        minified = meteorJsMinify(file.getContentsAsString());
 
-          maybeThrowMinifyErrorBySourceFile(err, file);
-
-          err.message += " while minifying " + filePath;
-          throw err;
+        if (!(minified && typeof minified.code === "string")) {
+          throw new Error();
         }
 
-        allJs += minified.code;
-      }
-      allJs += '\n\n';
+      } catch (err) {
+        var filePath = file.getPathInBundle();
 
-      Plugin.nudge();
-    });
+        maybeThrowMinifyErrorBySourceFile(err, file);
+
+        err.message += " while minifying " + filePath;
+        throw err;
+      }
+
+      const tree = extractModuleSizesTree(minified.code);
+      if (tree) {
+        toBeAdded.stats[file.getPathInBundle()] =
+          [Buffer.byteLength(minified.code), tree];
+      } else {
+        toBeAdded.stats[file.getPathInBundle()] =
+          Buffer.byteLength(minified.code);
+      }
+
+      toBeAdded.data += minified.code;
+    }
+
+    toBeAdded.data += '\n\n';
+
+    Plugin.nudge();
+  });
 
   if (files.length) {
-    files[0].addJavaScript({ data: allJs });
+    files[0].addJavaScript(toBeAdded);
   }
 };
diff --git a/packages/standard-minifier-js/plugin/stats.js b/packages/standard-minifier-js/plugin/stats.js
new file mode 100644
index 0000000000..b8c5d408c9
--- /dev/null
+++ b/packages/standard-minifier-js/plugin/stats.js
@@ -0,0 +1,83 @@
+import Visitor from "./visitor.js";
+
+// This RegExp will be used to scan the source for calls to meteorInstall,
+// taking into consideration that the function name may have been mangled
+// to something other than "meteorInstall" by the minifier.
+const meteorInstallRegExp = new RegExp([
+  // If meteorInstall is called by its unminified name, then that's what
+  // we should be looking for in the AST.
+  /\b(meteorInstall)\(\{/,
+  // If the meteorInstall function name has been minified, we can figure
+  // out its mangled name by examining the import assingment.
+  /\b(\w+)=Package.modules.meteorInstall\b/,
+  /\b(\w+)=Package\["modules-runtime"\].meteorInstall\b/,
+].map(exp => exp.source).join("|"));
+
+export function extractModuleSizesTree(source) {
+  const match = meteorInstallRegExp.exec(source);
+  if (match) {
+    const ast = Babel.parse(source);
+    const name = match[1] || match[2] || match[3];
+    meteorInstallVisitor.visit(ast, name, source);
+    return meteorInstallVisitor.tree;
+  }
+}
+
+const meteorInstallVisitor = new (class extends Visitor {
+  reset(root, meteorInstallName, source) {
+    this.name = meteorInstallName;
+    this.source = source;
+    this.tree = null;
+  }
+
+  visitCallExpression(node) {
+    if (this.tree !== null) {
+      return;
+    }
+
+    if (isIdWithName(node.callee, this.name)) {
+      const source = this.source;
+
+      function walk(expr) {
+        if (expr.type !== "ObjectExpression") {
+          return Buffer.byteLength(source.slice(expr.start, expr.end));
+        }
+
+        const contents = Object.create(null);
+
+        expr.properties.forEach(prop => {
+          const keyName = getKeyName(prop.key);
+          if (typeof keyName === "string") {
+            contents[keyName] = walk(prop.value);
+          }
+        });
+
+        return contents;
+      }
+
+      this.tree = walk(node.arguments[0]);
+
+    } else {
+      this.visitChildren(node);
+    }
+  }
+});
+
+function isIdWithName(node, name) {
+  return node &&
+    node.type === "Identifier" &&
+    node.name === name;
+}
+
+function getKeyName(key) {
+  if (key.type === "Identifier") {
+    return key.name;
+  }
+
+  if (key.type === "StringLiteral" ||
+      key.type === "Literal") {
+    return key.value;
+  }
+
+  return null;
+}
\ No newline at end of file
diff --git a/packages/standard-minifier-js/plugin/utils.js b/packages/standard-minifier-js/plugin/utils.js
new file mode 100644
index 0000000000..0ce207b24e
--- /dev/null
+++ b/packages/standard-minifier-js/plugin/utils.js
@@ -0,0 +1,26 @@
+"use strict";
+
+const codeOfA = "A".charCodeAt(0);
+const codeOfZ = "Z".charCodeAt(0);
+
+export function isObject(value) {
+  return typeof value === "object" && value !== null;
+}
+
+// Without a complete list of Node .type names, we have to settle for this
+// fuzzy matching of object shapes. However, the infeasibility of
+// maintaining a complete list of type names is one of the reasons we're
+// using the FastPath/Visitor abstraction in the first place.
+export function isNodeLike(value) {
+  return isObject(value) &&
+    ! Array.isArray(value) &&
+    isCapitalized(value.type);
+}
+
+function isCapitalized(string) {
+  if (typeof string !== "string") {
+    return false;
+  }
+  const code = string.charCodeAt(0);
+  return code >= codeOfA && code <= codeOfZ;
+}
diff --git a/packages/standard-minifier-js/plugin/visitor.js b/packages/standard-minifier-js/plugin/visitor.js
new file mode 100644
index 0000000000..495dbb7307
--- /dev/null
+++ b/packages/standard-minifier-js/plugin/visitor.js
@@ -0,0 +1,57 @@
+"use strict";
+
+import {
+  isObject,
+  isNodeLike,
+} from "./utils.js";
+
+const codeOfUnderscore = "_".charCodeAt(0);
+
+export default class Visitor {
+  visit(root) {
+    this.reset.apply(this, arguments);
+    this.visitWithoutReset(root);
+  }
+
+  visitWithoutReset(node) {
+    if (Array.isArray(node)) {
+      node.forEach(this.visitWithoutReset, this);
+    } else if (isNodeLike(node)) {
+      const method = this["visit" + node.type];
+      if (typeof method === "function") {
+        // The method must call this.visitChildren(node) to continue
+        // traversing.
+        method.call(this, node);
+      } else {
+        this.visitChildren(node);
+      }
+    }
+  }
+
+  visitChildren(node) {
+    if (! isNodeLike(node)) {
+      return;
+    }
+
+    const keys = Object.keys(node);
+    const keyCount = keys.length;
+
+    for (let i = 0; i < keyCount; ++i) {
+      const key = keys[i];
+
+      if (key === "loc" || // Ignore .loc.{start,end} objects.
+          // Ignore "private" properties added by Babel.
+          key.charCodeAt(0) === codeOfUnderscore) {
+        continue;
+      }
+
+      const child = node[key];
+      if (! isObject(child)) {
+        // Ignore properties whose values aren't objects.
+        continue;
+      }
+
+      this.visitWithoutReset(child);
+    }
+  }
+}
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index a90bed4907..f4a7c2111e 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1286,6 +1286,10 @@ class Target {
           newFile.setUrlToHash('.js', '?meteor_js_resource=true');
         }
 
+        if (! dynamic) {
+          console.log(file.stats);
+        }
+
         return newFile;
       });
 
diff --git a/tools/isobuild/minifier-plugin.js b/tools/isobuild/minifier-plugin.js
index f75c3b4b7b..7a34efbf37 100644
--- a/tools/isobuild/minifier-plugin.js
+++ b/tools/isobuild/minifier-plugin.js
@@ -60,13 +60,9 @@ export class JsFile extends InputFile {
   // - sourceMap
   // - path
   // - hash?
+  // - stats?
   addJavaScript(options) {
-    const self = this;
-    self._minifiedFiles.push({
-      data: options.data,
-      sourceMap: options.sourceMap,
-      path: options.path
-    });
+    this._minifiedFiles.push({ ...options });
   }
 }
 
@@ -75,12 +71,9 @@ export class CssFile extends InputFile {
   // - sourceMap
   // - path
   // - hash?
+  // - stats?
   addStylesheet(options) {
-    this._minifiedFiles.push({
-      data: options.data,
-      sourceMap: options.sourceMap,
-      path: options.path
-    });
+    this._minifiedFiles.push({ ...options });
   }
 }
 

From 1c8bc7353e9a8d526880634a58c506b423c4a55e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 8 May 2017 17:34:14 -0400
Subject: [PATCH 122/195] Serve <hash>.stats.json for every <hash>.js bundle.

---
 tools/isobuild/bundler.js | 43 +++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index f4a7c2111e..09a8b8c3ba 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -171,6 +171,7 @@ var packageVersionParser = require('../packaging/package-version-parser.js');
 var release = require('../packaging/release.js');
 import { load as loadIsopacket } from '../tool-env/isopackets.js';
 import { CORDOVA_PLATFORM_VERSIONS } from '../cordova';
+import { gzipSync } from "zlib";
 
 // files to ignore when bundling. node has no globs, so use regexps
 exports.ignoreFiles = [
@@ -1259,7 +1260,7 @@ class Target {
     const js = [];
 
     function handle(source, dynamic) {
-      const newFiles = source._minifiedFiles.map(file => {
+      source._minifiedFiles.forEach(file => {
         // Remove the function name __minifyJs that was added above.
         file.data = file.data
           .toString("utf8")
@@ -1286,14 +1287,40 @@ class Target {
           newFile.setUrlToHash('.js', '?meteor_js_resource=true');
         }
 
-        if (! dynamic) {
-          console.log(file.stats);
+        js.push(newFile);
+
+        if (file.stats &&
+            ! dynamic &&
+            minifyMode === "production") {
+          // If the minifier reported any statistics, serve those data as
+          // a .stats.json file alongside the newFile.
+          const contents = newFile.contents();
+          const statsFile = new File({
+            info: "bundle size stats JSON",
+            data: new Buffer(JSON.stringify({
+              totalMinifiedBytes: contents.length,
+              totalMinifiedGzipBytes: gzipSync(contents).length,
+              minifiedBytesByPackage: file.stats,
+            }, null, 2) + "\n", "utf8")
+          });
+
+          statsFile.url = newFile.url.replace(/\.js\b/, ".stats.json");
+          statsFile.targetPath =
+            newFile.targetPath.replace(/\.js\b/, ".stats.json");
+          statsFile.cacheable = true;
+          statsFile.type = "json";
+
+          if (statsFile.url !== newFile.url &&
+              statsFile.targetPath !== newFile.targetPath) {
+            // If the minifier used a file extension other than .js, the
+            // .replace calls above won't inject the .stats.json extension
+            // into the statsFile.{url,targetPath} strings, and it would
+            // be a mistake to serve the statsFile with the same URL as
+            // the real JS bundle. This should be a very uncommon case.
+            js.push(statsFile);
+          }
         }
-
-        return newFile;
       });
-
-      js.push(...newFiles);
     }
 
     staticFiles.forEach(file => handle(file, false));
@@ -1511,7 +1538,7 @@ class ClientTarget extends Target {
     const eachResource = function (f) {
       ["js", "css", "asset"].forEach((type) => {
         this[type].forEach((file) => {
-          f(file, type);
+          f(file, file.type || type);
         });
       });
     }.bind(this);

From b5b76a850e175afe7fc3c91b9d42cffbaf753cd1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 11:44:37 -0400
Subject: [PATCH 123/195] Include minifier package name and version in
 .stats.json file.

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

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 09a8b8c3ba..d64e3c995b 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1298,6 +1298,10 @@ class Target {
           const statsFile = new File({
             info: "bundle size stats JSON",
             data: new Buffer(JSON.stringify({
+              minifier: {
+                name: minifierDef.isopack.name,
+                version: minifierDef.isopack.version,
+              },
               totalMinifiedBytes: contents.length,
               totalMinifiedGzipBytes: gzipSync(contents).length,
               minifiedBytesByPackage: file.stats,

From 3bda1c3df844d7d0037d1771c82cebd8ae79bb24 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 6 May 2017 20:43:23 -0400
Subject: [PATCH 124/195] Upgrade the `meteor-babel`, `reify`, and `install`
 npm packages.

---
 History.md                                    | 13 ++++++--
 .../.npm/package/npm-shrinkwrap.json          | 33 +++++++++++--------
 packages/babel-compiler/package.js            |  2 +-
 .../.npm/package/npm-shrinkwrap.json          |  6 ++--
 packages/modules-runtime/package.js           |  2 +-
 .../modules/.npm/package/npm-shrinkwrap.json  | 15 ++++++---
 packages/modules/package.js                   |  2 +-
 packages/modules/reify.js                     |  2 +-
 scripts/dev-bundle-tool-package.js            |  4 +--
 9 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/History.md b/History.md
index 8bbb71b861..486b5ef79d 100644
--- a/History.md
+++ b/History.md
@@ -9,11 +9,20 @@
   information about how dynamic `import(...)` works in Meteor, and how to
   use it in your applications.
 
-* The `meteor-babel` npm package has been upgraded to version 0.20.3, and
-  the `reify` npm package has been upgraded to version 0.9.2, fixing
+* The `meteor-babel` npm package has been upgraded to version 0.21.1.
+
+* The `reify` npm package has been upgraded to version 0.11.0, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
+> Note: With this version of Reify, `import` declarations are compiled to
+  `module.watch(require(id), ...)` instead of `module.importSync(id, ...)`
+  or the older `module.import(id, ...)`. The behavior of the compiled code
+  should be the same as before, but the details seemed different enough to
+  warrant a note.
+
+* The `install` npm package has been upgraded to version 0.10.1.
+
 ## v1.4.4.2, 2017-05-02
 
 * Node has been upgraded to version 4.8.2.
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index c52b3cbdc0..c6866fd16c 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -270,9 +270,9 @@
       "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-es2015-modules-reify": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.9.0.tgz",
-      "from": "babel-plugin-transform-es2015-modules-reify@>=0.9.0 <0.10.0"
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-reify/-/babel-plugin-transform-es2015-modules-reify-0.11.0.tgz",
+      "from": "babel-plugin-transform-es2015-modules-reify@>=0.11.0 <0.12.0"
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "6.24.1",
@@ -477,7 +477,7 @@
     "brace-expansion": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-      "from": "brace-expansion@>=1.0.0 <2.0.0"
+      "from": "brace-expansion@>=1.1.7 <2.0.0"
     },
     "chalk": {
       "version": "1.1.3",
@@ -580,9 +580,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.20.3",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.20.3.tgz",
-      "from": "meteor-babel@0.20.3"
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.1.tgz",
+      "from": "meteor-babel@0.21.1"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -590,8 +590,8 @@
       "from": "meteor-babel-helpers@0.0.3"
     },
     "minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "from": "minimatch@>=3.0.2 <4.0.0"
     },
     "minimist": {
@@ -600,8 +600,8 @@
       "from": "minimist@0.0.8"
     },
     "minipass": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.0.tgz",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.1.tgz",
       "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
@@ -682,15 +682,20 @@
       }
     },
     "reify": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.9.2.tgz",
-      "from": "reify@>=0.9.1 <0.10.0"
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.0.tgz",
+      "from": "reify@>=0.11.0 <0.12.0"
     },
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "from": "repeating@>=2.0.0 <3.0.0"
     },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "from": "semver@>=5.3.0 <6.0.0"
+    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 4a3309cb00..e6d14c7981 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.20.3'
+  'meteor-babel': '0.21.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/.npm/package/npm-shrinkwrap.json b/packages/modules-runtime/.npm/package/npm-shrinkwrap.json
index f02ecf48bf..1bbd59e1e2 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.10.0",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.10.0.tgz",
-      "from": "install@0.10.0"
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.10.1.tgz",
+      "from": "install@0.10.1"
     }
   }
 }
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 06917e328c..7ba33bfaa8 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  install: "0.10.0"
+  install: "0.10.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 32ff3e2743..0c95dcf9fd 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -6,8 +6,8 @@
       "from": "acorn@>=5.0.0 <5.1.0"
     },
     "minipass": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.0.tgz",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.1.tgz",
       "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
@@ -16,9 +16,14 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.9.2.tgz",
-      "from": "reify@0.9.2"
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.0.tgz",
+      "from": "reify@0.11.0"
+    },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "from": "semver@>=5.3.0 <6.0.0"
     },
     "yallist": {
       "version": "3.0.2",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 3da4d3e38f..c245ebdb3c 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.9.2"
+  reify: "0.11.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/modules/reify.js b/packages/modules/reify.js
index 5b8fa26bcf..6bbb48af8a 100644
--- a/packages/modules/reify.js
+++ b/packages/modules/reify.js
@@ -1,5 +1,5 @@
 var Module = module.constructor;
-require("reify/lib/runtime").enable(Module);
 var Mp = Module.prototype;
+require("reify/lib/runtime").enable(Mp);
 Mp.importSync = Mp.importSync || Mp.import;
 Mp.import = Mp.import || Mp.importSync;
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 07bd68d707..de3790f2c7 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,8 +14,8 @@ var packageJson = {
     npm: "4.5.0",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
-    "meteor-babel": "0.20.3",
-    reify: "0.9.2",
+    "meteor-babel": "0.21.1",
+    reify: "0.11.0",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From ea286d0aba06c0320b85b4e828662e779f54e7ed Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 13:51:46 -0400
Subject: [PATCH 125/195] Upgrade Node to version 4.8.3.

https://nodejs.org/en/blog/release/v4.8.3/
---
 History.md                         | 2 ++
 scripts/build-dev-bundle-common.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 486b5ef79d..d4800a9aaa 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## v.NEXT
 
+* Node has been upgraded to version 4.8.3.
+
 * Running `meteor add dynamic-import` installs support for ECMAScript
   [dynamic `import(...)`](https://github.com/tc39/proposal-dynamic-import),
   a new language feature which allows for asynchronous module fetching
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 5e5b8062f7..da0f8253f9 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.12
-NODE_VERSION=4.8.2
+NODE_VERSION=4.8.3
 NPM_VERSION=4.5.0
 
 if [ "$UNAME" == "Linux" ] ; then

From f8bf1ae6eb37e88def597763751bf85a6fc48ea8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 13:53:49 -0400
Subject: [PATCH 126/195] Bump $BUNDLE_VERSION to 4.8.11 before rebuilding dev
 bundle.

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

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

From 8364f813448bfd10457e63fe3a22d0142d248cd5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 14:48:13 -0400
Subject: [PATCH 127/195] Include the dynamic-import package in new apps and
 packages.

It's tempting to make the ecmascript package api.imply("dynamic-import"),
but the dynamic-import package depends on the ddp package, which depends
heavily on the ecmascript package, and I'm not sure how best to break that
dependency cycle.
---
 tools/static-assets/skel-bare/.meteor/packages | 3 ++-
 tools/static-assets/skel-full/.meteor/packages | 3 ++-
 tools/static-assets/skel-pack/package.js       | 1 +
 tools/static-assets/skel/.meteor/packages      | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/static-assets/skel-bare/.meteor/packages b/tools/static-assets/skel-bare/.meteor/packages
index 56a930a9ed..eaef440301 100644
--- a/tools/static-assets/skel-bare/.meteor/packages
+++ b/tools/static-assets/skel-bare/.meteor/packages
@@ -13,6 +13,7 @@ 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.
+es5-shim                # ECMAScript 5 compatibility for older browsers
 ecmascript              # Enable ECMAScript2015+ syntax in app code
+dynamic-import          # Enable dynamic import(...) syntax and runtime
 shell-server            # Server-side component of the `meteor shell` command
diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages
index 75aaefb27e..45c1e58942 100644
--- a/tools/static-assets/skel-full/.meteor/packages
+++ b/tools/static-assets/skel-full/.meteor/packages
@@ -13,8 +13,9 @@ 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.
+es5-shim                # ECMAScript 5 compatibility for older browsers
 ecmascript              # Enable ECMAScript2015+ syntax in app code
+dynamic-import          # Enable dynamic import(...) syntax and runtime
 
 kadira:flow-router      # FlowRouter is a very simple router for Meteor
 kadira:blaze-layout     # Layout manager for blaze (works well with FlowRouter)
diff --git a/tools/static-assets/skel-pack/package.js b/tools/static-assets/skel-pack/package.js
index d0bbaf2c14..87d09b4847 100644
--- a/tools/static-assets/skel-pack/package.js
+++ b/tools/static-assets/skel-pack/package.js
@@ -13,6 +13,7 @@ Package.describe({
 Package.onUse(function(api) {
 ~cc~  api.versionsFrom('~release~');
   api.use('ecmascript');
+  api.use('dynamic-import');
   api.mainModule('~fs-name~.js');
 });
 
diff --git a/tools/static-assets/skel/.meteor/packages b/tools/static-assets/skel/.meteor/packages
index 39fe93e662..d7c0f56593 100644
--- a/tools/static-assets/skel/.meteor/packages
+++ b/tools/static-assets/skel/.meteor/packages
@@ -13,8 +13,9 @@ 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.
+es5-shim                # ECMAScript 5 compatibility for older browsers
 ecmascript              # Enable ECMAScript2015+ syntax in app code
+dynamic-import          # Enable dynamic import(...) syntax and runtime
 shell-server            # Server-side component of the `meteor shell` command
 
 autopublish             # Publish all data to the clients (for prototyping)

From ee5638761e9c0ae78b5771e84bfb71c52178ddb5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 14:53:41 -0400
Subject: [PATCH 128/195] Mention bundle size analysis in History.md.

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

diff --git a/History.md b/History.md
index d4800a9aaa..a5b4b199f4 100644
--- a/History.md
+++ b/History.md
@@ -25,6 +25,18 @@
 
 * The `install` npm package has been upgraded to version 0.10.1.
 
+* If you're using the `standard-minifier-js` Meteor package, as most
+  Meteor developers do, it will now produce a detailed analysis of package
+  and module sizes within your production `.js` bundle whenever you run
+  `meteor build` or `meteor run --production`. These data are served by
+  the application web server at the same URL as the minified `.js` bundle,
+  except with a `.stats.json` file extension instead of `.js`. If you're
+  using a different minifier plugin, and would like to support similar
+  functionality, refer to
+  [these](https://github.com/meteor/meteor/pull/8327/commits/084801237a8c288d99ec82b0fbc1c76bdf1aab16)
+  [commits](https://github.com/meteor/meteor/pull/8327/commits/1c8bc7353e9a8d526880634a58c506b423c4a55e)
+  for inspiration.
+
 ## v1.4.4.2, 2017-05-02
 
 * Node has been upgraded to version 4.8.2.

From 75ada39092aaa152726511c10f42a816d205c1ea Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 15:21:42 -0400
Subject: [PATCH 129/195] Bump LINKER_CACHE_SALT and compiler.BUILT_BY for good
 measure.

Recent updates to meteor-babel and reify make it particularly important to
force recompilation of ECMAScript modules and package/app bundles.
---
 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 4c2925226e..10f4f3e031 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 = 15; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 16; // 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 c00f588617..befd61ebf7 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/27';
+compiler.BUILT_BY = 'meteor/28';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From 3b6a577ffb167af47396f243721aef028b1db70f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 21:22:00 -0400
Subject: [PATCH 130/195] Fix typo in dynamic-import/client.js comment.

---
 packages/dynamic-import/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index 9d5f9593b9..a7120dca9c 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -12,7 +12,7 @@ Module.prototype.dynamicImport = function (id) {
   });
 };
 
-// Called by Module.prototype.fetch if there are any missing dynamic
+// Called by Module.prototype.prefetch if there are any missing dynamic
 // modules that need to be fetched.
 meteorInstall.fetch = function (ids) {
   var tree = Object.create(null);

From 42c41901c53d2b0916f2ab5289596eeaa2d318f5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 21:23:41 -0400
Subject: [PATCH 131/195] Call module.runSetters() after any meteor/tools
 modules load.

---
 tools/tool-env/install-runtime.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/tool-env/install-runtime.js b/tools/tool-env/install-runtime.js
index a134327915..00178ef8a3 100644
--- a/tools/tool-env/install-runtime.js
+++ b/tools/tool-env/install-runtime.js
@@ -24,6 +24,19 @@ regenerator.async = function () {
 // add boilerplate at the top of every file.
 require("meteor-babel").defineHelpers();
 
+var Mp = module.constructor.prototype;
+var moduleLoad = Mp.load;
+Mp.load = function (filename) {
+  var result = moduleLoad.apply(this, arguments);
+  var runSetters = this.runSetters || this.runModuleSetters;
+  if (typeof runSetters === "function") {
+    // Make sure we call module.runSetters (or module.runModuleSetters, a
+    // legacy synonym) whenever a module finishes loading.
+    runSetters.call(this);
+  }
+  return result;
+};
+
 // Installs source map support with a hook to add functions to look for
 // source maps in custom places.
 require('./source-map-retriever-stack.js');

From 7a54259c94b92a672911c52633c65815fe29124c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 21:24:41 -0400
Subject: [PATCH 132/195] Revert "Include the dynamic-import package in new
 apps and packages."

Partially reverts commit 8364f813448bfd10457e63fe3a22d0142d248cd5.

This commit was causing self-test failures like the following:

  While selecting package versions:
  error: unknown package in top-level dependencies: dynamic-import

I suspect these tests won't work until the dynamic-import package is
published with a non-prerelease version.
---
 tools/static-assets/skel-bare/.meteor/packages | 1 -
 tools/static-assets/skel-full/.meteor/packages | 1 -
 tools/static-assets/skel-pack/package.js       | 1 -
 tools/static-assets/skel/.meteor/packages      | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tools/static-assets/skel-bare/.meteor/packages b/tools/static-assets/skel-bare/.meteor/packages
index eaef440301..1dacd59dda 100644
--- a/tools/static-assets/skel-bare/.meteor/packages
+++ b/tools/static-assets/skel-bare/.meteor/packages
@@ -15,5 +15,4 @@ 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
-dynamic-import          # Enable dynamic import(...) syntax and runtime
 shell-server            # Server-side component of the `meteor shell` command
diff --git a/tools/static-assets/skel-full/.meteor/packages b/tools/static-assets/skel-full/.meteor/packages
index 45c1e58942..6f3d36015c 100644
--- a/tools/static-assets/skel-full/.meteor/packages
+++ b/tools/static-assets/skel-full/.meteor/packages
@@ -15,7 +15,6 @@ 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
-dynamic-import          # Enable dynamic import(...) syntax and runtime
 
 kadira:flow-router      # FlowRouter is a very simple router for Meteor
 kadira:blaze-layout     # Layout manager for blaze (works well with FlowRouter)
diff --git a/tools/static-assets/skel-pack/package.js b/tools/static-assets/skel-pack/package.js
index 87d09b4847..d0bbaf2c14 100644
--- a/tools/static-assets/skel-pack/package.js
+++ b/tools/static-assets/skel-pack/package.js
@@ -13,7 +13,6 @@ Package.describe({
 Package.onUse(function(api) {
 ~cc~  api.versionsFrom('~release~');
   api.use('ecmascript');
-  api.use('dynamic-import');
   api.mainModule('~fs-name~.js');
 });
 
diff --git a/tools/static-assets/skel/.meteor/packages b/tools/static-assets/skel/.meteor/packages
index d7c0f56593..18f8d45d89 100644
--- a/tools/static-assets/skel/.meteor/packages
+++ b/tools/static-assets/skel/.meteor/packages
@@ -15,7 +15,6 @@ 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
-dynamic-import          # Enable dynamic import(...) syntax and runtime
 shell-server            # Server-side component of the `meteor shell` command
 
 autopublish             # Publish all data to the clients (for prototyping)

From 656fbeba9ba34e53682ce595d95a2af822313fa2 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 21:51:54 -0400
Subject: [PATCH 133/195] Upgrade meteor-babel to version 0.21.2 to enable
 class properties.

---
 History.md                                       |  4 +++-
 .../.npm/package/npm-shrinkwrap.json             | 16 +++++++++++++---
 packages/babel-compiler/package.js               |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index a5b4b199f4..ddad1870f7 100644
--- a/History.md
+++ b/History.md
@@ -11,7 +11,9 @@
   information about how dynamic `import(...)` works in Meteor, and how to
   use it in your applications.
 
-* The `meteor-babel` npm package has been upgraded to version 0.21.1.
+* The `meteor-babel` npm package has been upgraded to version 0.21.2,
+  enabling the latest Reify compiler and the transform-class-properties
+  plugin, among other improvements.
 
 * The `reify` npm package has been upgraded to version 0.11.0, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index c6866fd16c..a88dedc6c0 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -199,6 +199,11 @@
       "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-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "from": "babel-plugin-syntax-class-properties@>=6.8.0 <7.0.0"
+    },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
@@ -224,6 +229,11 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
       "from": "babel-plugin-syntax-trailing-function-commas@>=6.22.0 <7.0.0"
     },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "from": "babel-plugin-transform-class-properties@>=6.24.1 <7.0.0"
+    },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
@@ -580,9 +590,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.1.tgz",
-      "from": "meteor-babel@0.21.1"
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.2.tgz",
+      "from": "meteor-babel@0.21.2"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index e6d14c7981..e0132914eb 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.21.1'
+  'meteor-babel': '0.21.2'
 });
 
 Package.onUse(function (api) {

From d78fa46d06b9a3be678f1836bf37017c74132e24 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 22:20:59 -0400
Subject: [PATCH 134/195] Bump package versions for 1.5-beta.20 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index e0132914eb..1569b2f118 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.19.1-beta.19'
+  version: '6.19.1-beta.20'
 });
 
 Npm.depends({
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 94908b7c81..e7af46eab2 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.19",
+  version: "0.1.0-beta.20",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 28f837d339..463db14cc0 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.19',
+  version: '0.8.0-beta.20',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index e79740cd61..2d9a4d9c28 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.1-beta.19"
+  version: "1.3.1-beta.20"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index d8ed167141..8929f7ba57 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.1.0-beta.19"
+  version: "1.1.0-beta.20"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 24df7a41f1..c2e197627a 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.5.0-beta.19'
+  version: '1.5.0-beta.20'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 541e9ea468..e6f9ed5b7b 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.2.0-beta.19'
+  version: '1.2.0-beta.20'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 7ba33bfaa8..7ca843f823 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.19",
+  version: "0.8.0-beta.20",
   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 c245ebdb3c..17b8f9c9e9 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.19",
+  version: "0.9.0-beta.20",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index bfc3b3034d..0ff9c14edc 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.18-beta.19'
+  version: '1.1.18-beta.20'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 215517b833..a75766091e 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-beta.19'
+  version: '1.1.9-beta.20'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 8b9900cc8b..611288cf29 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: '2.0.0',
+  version: '2.1.0-beta.20',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index e51412b902..19054940e3 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.19",
+ "version": "1.5-beta.20",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 5f8b52b2c21e56d28c45a70391242608e8c0ea4e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 9 May 2017 22:35:39 -0400
Subject: [PATCH 135/195] Use module.watch instead of module.importSync in
 getNamespace.

https://github.com/benjamn/reify/pull/159
---
 packages/dynamic-import/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index a7120dca9c..a4bce902b8 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -141,7 +141,7 @@ function addToTree(tree, id, value) {
 function getNamespace(module, id) {
   var namespace = Object.create(null);
 
-  module.importSync(id, {
+  module.watch(module.require(id), {
     "*": function (value, name) {
       namespace[name] = value;
     }

From 1af76603c6e51ce0f182a6108427e901347472f1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 May 2017 11:02:50 -0400
Subject: [PATCH 136/195] Imply the dynamic-import package from the meteor-base
 package.

Since it's relatively easy to remove/replace the meteor-base package, this
should keep dynamic-import optional in principle, but also make sure it's
installed in most apps without need for `meteor add dynamic-import`.

I also considered implying the dynamic-import package from the ecmascript
package, but that would have made it much harder to opt out, and created
some nasty circular dependency problems.
---
 packages/meteor-base/package.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index cd962dfbc9..f3c9e0c21f 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.0.4',
+  version: '1.1.0',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
@@ -25,6 +25,9 @@ Package.onUse(function(api) {
     'ddp',
     'livedata', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
 
+    // Runtime support for Meteor 1.5 dynamic import(...) syntax.
+    'dynamic-import',
+
     // Push code changes to the client and automatically reload the page
     'hot-code-push'
   ]);

From fba9e9dfe95bc4d1036cfe4407d6d7a23b6167ae Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 May 2017 11:31:39 -0400
Subject: [PATCH 137/195] Restrict the dynamic-import package to Meteor 1.5+
 apps.

---
 packages/dynamic-import/package.js | 4 ++++
 tools/isobuild/compiler.js         | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index e7af46eab2..3e976b53b0 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -6,6 +6,10 @@ Package.describe({
 });
 
 Package.onUse(function (api) {
+  // Do not allow this package to be used in pre-Meteor 1.5 apps.
+  api.use("isobuild:dynamic-import@1.5.0");
+
+  // Modify browser policy only if browser-policy packages are used.
   api.use("browser-policy-content", { weak: true });
 
   api.use("modules");
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index befd61ebf7..6af9d217f5 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -1021,5 +1021,9 @@ export const KNOWN_ISOBUILD_FEATURE_PACKAGES = {
   // One scenario is a package depending on a Cordova plugin or version
   // that is only available on npm, which means downloading the plugin is not
   // supported on versions of Cordova below 5.0.0.
-  'isobuild:cordova': ['5.4.0']
+  'isobuild:cordova': ['5.4.0'],
+
+  // This package requires functionality introduced in meteor-tool@1.5.0
+  // to enable dynamic module fetching via import(...).
+  'isobuild:dynamic-import': ['1.5.0'],
 };

From b6694b2f5d1ba8f58ce20e56de68bef7487ca3ce Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 May 2017 11:57:37 -0400
Subject: [PATCH 138/195] Expose dynamic modules via HTTP, but do not load them
 eagerly.

This allows fetching the compiled code of dynamic modules via HTTP,
without generating <script> tags for those resources in the intial
boilerplate HTML of the application.

The URL for a dynamic module should be formed by taking its absolute
module identifier, prepending "/dynamic" and appending "?hash=<version>".
Appropriate version hashes can be obtained from the tree exported by the
meteor/dynamic-import/dynamic-versions.js module, though the hashes are
used only for cache busting, so they could be anything at all.

A good place to do this fetching would be the meteorInstall.fetch
callback, as defined (for example) in meteor/dynamic-import/client.js.
That implementation still uses a WebSocket rather than HTTP, but this
commit will allow us to experiment with HTTP in the future.

Because the code returned for these dynamic modules is wrapped as an
anonymous function expression, you'll need to fetch them using an
XMLHttpRequest, the HTTP fetch() function, or some similar utility, rather
than using a <script> tag, because executing the unmodified code as JS
will likely throw a syntax error.
---
 .../boilerplate-generator.js                  |  5 ++++-
 packages/boilerplate-generator/package.js     | 12 +++++------
 tools/isobuild/bundler.js                     | 21 ++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/boilerplate-generator/boilerplate-generator.js b/packages/boilerplate-generator/boilerplate-generator.js
index 8385aef6b1..22e06e98f0 100644
--- a/packages/boilerplate-generator/boilerplate-generator.js
+++ b/packages/boilerplate-generator/boilerplate-generator.js
@@ -73,7 +73,10 @@ Boilerplate.prototype._generateBoilerplateFromManifestAndSource =
       if (item.type === 'css' && item.where === 'client') {
         boilerplateBaseData.css.push(itemObj);
       }
-      if (item.type === 'js' && item.where === 'client') {
+      if (item.type === 'js' && item.where === 'client' &&
+          // Dynamic JS modules should not be loaded eagerly in the
+          // initial HTML of the app.
+          ! item.path.startsWith('dynamic/')) {
         boilerplateBaseData.js.push(itemObj);
       }
       if (item.type === 'head') {
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 357701a5a2..3faf0a4e51 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,15 +1,15 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '1.0.11'
+  version: '1.1.0'
 });
 
 Package.onUse(function (api) {
   api.use([
-    'underscore@1.0.9',
-    'spacebars-compiler@1.0.12',
-    'spacebars@1.0.12',
-    'htmljs@1.0.10',
-    'ui@1.0.11',
+    'underscore',
+    'spacebars-compiler',
+    'spacebars',
+    'htmljs',
+    'ui',
   ], 'server');
   api.addFiles(['boilerplate-generator.js'], 'server');
   api.export(['Boilerplate'], 'server');
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index d64e3c995b..0a2f0d8580 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1598,20 +1598,20 @@ class ClientTarget extends Target {
       manifestItem.size = file.size();
       manifestItem.hash = file.hash();
 
-      if (! file.targetPath.startsWith("dynamic/")) {
-        writeFile(file, builder);
-        manifest.push(manifestItem);
+      writeFile(file, builder);
+      manifest.push(manifestItem);
 
-      } else if (manifestItem.sourceMapUrl) {
+      if (file.targetPath.startsWith("dynamic/") &&
+          manifestItem.sourceMapUrl) {
+        // If the file is a dynamic module, we don't embed its source map
+        // in the file itself (because base64-encoded data: URLs for
+        // source maps can be very large), but rather include a normal URL
+        // referring to the source map, so that it can be loaded from the
+        // web server when needed.
         writeFile(file, builder, {
           sourceMapUrl: manifestItem.sourceMapUrl,
         });
 
-        // If the file is dynamic, we don't need/want the file itself to
-        // be served by the web server, but we do want its source map (if
-        // defined) to be accessible via HTTP, so that we can refer to it
-        // by URL rather than embedding it as a very long data URL comment
-        // in the file.
         manifest.push({
           type: "json",
           path: manifestItem.sourceMap,
@@ -1620,9 +1620,6 @@ class ClientTarget extends Target {
           cacheable: manifestItem.cacheable,
           hash: manifestItem.hash,
         });
-
-      } else {
-        writeFile(file, builder);
       }
     });
 

From 9e32c00428605a55a28f5a54671f0d9cfb034925 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 May 2017 12:30:19 -0400
Subject: [PATCH 139/195] Give dynamic module manifest items a different type:
 "dynamic js".

Now that dynamic modules are part of the manifest that determines which
files are served over HTTP, I'm a bit paranoid about them somehow ending
up as <script> tags in the initial HTML of the application.

This commit adds another safety measure to prevent that, just in case the
boilerplate-generator package for some reason fails to skip items whose
.path starts with "dynamic/" (see my previous commit).
---
 packages/webapp/package.js       |  2 +-
 packages/webapp/webapp_server.js |  3 ++-
 tools/isobuild/bundler.js        | 12 ++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index c283fe57d0..3577375bac 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.15'
+  version: '1.3.16'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 24a6cd7ad7..ff555ad387 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -395,7 +395,8 @@ WebAppInternals.staticFilesMiddleware = function (staticFiles, req, res, next) {
                   info.sourceMapUrl);
   }
 
-  if (info.type === "js") {
+  if (info.type === "js" ||
+      info.type === "dynamic js") {
     res.setHeader("Content-Type", "application/javascript; charset=UTF-8");
   } else if (info.type === "css") {
     res.setHeader("Content-Type", "text/css; charset=UTF-8");
diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 0a2f0d8580..28129d3b39 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1601,8 +1601,16 @@ class ClientTarget extends Target {
       writeFile(file, builder);
       manifest.push(manifestItem);
 
-      if (file.targetPath.startsWith("dynamic/") &&
-          manifestItem.sourceMapUrl) {
+      if (! file.targetPath.startsWith("dynamic/")) {
+        return;
+      }
+
+      // Another measure for preventing this file from being loaded
+      // eagerly as a <script> tag, in addition to manifestItem.path being
+      // prefixed with "dynamic/".
+      manifestItem.type = "dynamic js";
+
+      if (manifestItem.sourceMapUrl) {
         // If the file is a dynamic module, we don't embed its source map
         // in the file itself (because base64-encoded data: URLs for
         // source maps can be very large), but rather include a normal URL

From 74c64369d426998706d923e7f08791b43ede1231 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 10 May 2017 13:37:06 -0400
Subject: [PATCH 140/195] Bump package versions for 1.5-rc.0 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 1569b2f118..6c6c4a1f63 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.19.1-beta.20'
+  version: '6.19.1-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 3faf0a4e51..fedf50c918 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.1.0'
+  version: '1.1.0-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 3e976b53b0..872a79bc3e 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-beta.20",
+  version: "0.1.0-rc.0",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 463db14cc0..930dbbc8bc 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-beta.20',
+  version: '0.8.0-rc.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 2d9a4d9c28..947dd573a4 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.1-beta.20"
+  version: "1.3.1-rc.0"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 8929f7ba57..99c078c300 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.1.0-beta.20"
+  version: "1.1.0-rc.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index f3c9e0c21f..5d41735c04 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0',
+  version: '1.1.0-rc.0',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index c2e197627a..22cf39cbe5 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.5.0-beta.20'
+  version: '1.5.0-rc.0'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index e6f9ed5b7b..7cdd026d75 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.2.0-beta.20'
+  version: '1.2.0-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 7ca843f823..9a6a6f8e00 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-beta.20",
+  version: "0.8.0-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 17b8f9c9e9..24e4e74df3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-beta.20",
+  version: "0.9.0-rc.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 0ff9c14edc..28b56a380b 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.18-beta.20'
+  version: '1.1.18-rc.0'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index a75766091e..34352796ec 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-beta.20'
+  version: '1.1.9-rc.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 611288cf29..1571dbbd01 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: '2.1.0-beta.20',
+  version: '2.1.0-rc.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 3577375bac..d042e3e121 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.16'
+  version: '1.3.16-rc.0'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 19054940e3..38e1a6d036 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-beta.20",
+ "version": "1.5-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From a5a3611de81e9c326299baaa946aef782c513cc9 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Thu, 11 May 2017 01:16:59 +0300
Subject: [PATCH 141/195] New `bundle-visualizer` package for analyzing initial
 client bundles.

This package is required to be ran with `--production` in order to for
it to accurately use data from the minifier which is only provided when
emulating or actually in production.  The additional work required in
this mode is too costly to run during normal development as the
minification process (provided by UglifyJS, one of the fastest
minifiers) is still quite slow.

Once added, this package will display a sundial chart showing the weight
of the modules included in the application, in the web-browser, on top
of your existing application.

While maybe not the best final product, it's certainly something we can
iterate on and improve.

This package should be removed before bundling/deploying for production.
---
 .../bundle-visualizer/.npm/package/.gitignore |   1 +
 .../bundle-visualizer/.npm/package/README     |   7 +
 .../.npm/package/npm-shrinkwrap.json          | 189 ++++++++++++
 packages/non-core/bundle-visualizer/README.md |   1 +
 .../non-core/bundle-visualizer/classNames.js  |   3 +
 packages/non-core/bundle-visualizer/client.js |  46 +++
 packages/non-core/bundle-visualizer/common.js |  14 +
 .../non-core/bundle-visualizer/package.js     |  23 ++
 packages/non-core/bundle-visualizer/server.js | 144 +++++++++
 packages/non-core/bundle-visualizer/style.css | 101 +++++++
 .../non-core/bundle-visualizer/sunburst.js    | 277 ++++++++++++++++++
 11 files changed, 806 insertions(+)
 create mode 100644 packages/non-core/bundle-visualizer/.npm/package/.gitignore
 create mode 100644 packages/non-core/bundle-visualizer/.npm/package/README
 create mode 100644 packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json
 create mode 100644 packages/non-core/bundle-visualizer/README.md
 create mode 100644 packages/non-core/bundle-visualizer/classNames.js
 create mode 100644 packages/non-core/bundle-visualizer/client.js
 create mode 100644 packages/non-core/bundle-visualizer/common.js
 create mode 100644 packages/non-core/bundle-visualizer/package.js
 create mode 100644 packages/non-core/bundle-visualizer/server.js
 create mode 100644 packages/non-core/bundle-visualizer/style.css
 create mode 100644 packages/non-core/bundle-visualizer/sunburst.js

diff --git a/packages/non-core/bundle-visualizer/.npm/package/.gitignore b/packages/non-core/bundle-visualizer/.npm/package/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/.npm/package/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/packages/non-core/bundle-visualizer/.npm/package/README b/packages/non-core/bundle-visualizer/.npm/package/README
new file mode 100644
index 0000000000..3d492553a4
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/.npm/package/README
@@ -0,0 +1,7 @@
+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/bundle-visualizer/.npm/package/npm-shrinkwrap.json b/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json
new file mode 100644
index 0000000000..6b10c34bd8
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/.npm/package/npm-shrinkwrap.json
@@ -0,0 +1,189 @@
+{
+  "dependencies": {
+    "commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "from": "commander@>=2.0.0 <3.0.0"
+    },
+    "d3": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-4.8.0.tgz",
+      "from": "d3@4.8.0"
+    },
+    "d3-array": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.0.tgz",
+      "from": "d3-array@1.2.0"
+    },
+    "d3-axis": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.6.tgz",
+      "from": "d3-axis@1.0.6"
+    },
+    "d3-brush": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz",
+      "from": "d3-brush@1.0.4"
+    },
+    "d3-chord": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz",
+      "from": "d3-chord@1.0.4"
+    },
+    "d3-collection": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.3.tgz",
+      "from": "d3-collection@1.0.3"
+    },
+    "d3-color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz",
+      "from": "d3-color@1.0.3"
+    },
+    "d3-dispatch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz",
+      "from": "d3-dispatch@1.0.3"
+    },
+    "d3-drag": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.0.4.tgz",
+      "from": "d3-drag@1.0.4"
+    },
+    "d3-dsv": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.5.tgz",
+      "from": "d3-dsv@1.0.5"
+    },
+    "d3-ease": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz",
+      "from": "d3-ease@1.0.3"
+    },
+    "d3-force": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.0.6.tgz",
+      "from": "d3-force@1.0.6"
+    },
+    "d3-format": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz",
+      "from": "d3-format@1.2.0"
+    },
+    "d3-geo": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.6.3.tgz",
+      "from": "d3-geo@1.6.3"
+    },
+    "d3-hierarchy": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.4.tgz",
+      "from": "d3-hierarchy@1.1.4"
+    },
+    "d3-interpolate": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.4.tgz",
+      "from": "d3-interpolate@1.1.4"
+    },
+    "d3-path": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz",
+      "from": "d3-path@1.0.5"
+    },
+    "d3-polygon": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.3.tgz",
+      "from": "d3-polygon@1.0.3"
+    },
+    "d3-quadtree": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz",
+      "from": "d3-quadtree@1.0.3"
+    },
+    "d3-queue": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.5.tgz",
+      "from": "d3-queue@3.0.5"
+    },
+    "d3-random": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.0.3.tgz",
+      "from": "d3-random@1.0.3"
+    },
+    "d3-request": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.5.tgz",
+      "from": "d3-request@1.0.5"
+    },
+    "d3-scale": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.5.tgz",
+      "from": "d3-scale@1.0.5"
+    },
+    "d3-selection": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.0.5.tgz",
+      "from": "d3-selection@1.0.5"
+    },
+    "d3-shape": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.0.6.tgz",
+      "from": "d3-shape@1.0.6"
+    },
+    "d3-time": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.6.tgz",
+      "from": "d3-time@1.0.6"
+    },
+    "d3-time-format": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.0.5.tgz",
+      "from": "d3-time-format@2.0.5"
+    },
+    "d3-timer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.5.tgz",
+      "from": "d3-timer@1.0.5"
+    },
+    "d3-transition": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.0.4.tgz",
+      "from": "d3-transition@1.0.4"
+    },
+    "d3-voronoi": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz",
+      "from": "d3-voronoi@1.1.2"
+    },
+    "d3-zoom": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.1.4.tgz",
+      "from": "d3-zoom@1.1.4"
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "from": "graceful-readlink@>=1.0.0"
+    },
+    "iconv-lite": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz",
+      "from": "iconv-lite@>=0.4.0 <0.5.0"
+    },
+    "pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "from": "pretty-bytes@4.0.2"
+    },
+    "rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "from": "rw@>=1.0.0 <2.0.0"
+    },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "from": "xmlhttprequest@>=1.0.0 <2.0.0"
+    }
+  }
+}
diff --git a/packages/non-core/bundle-visualizer/README.md b/packages/non-core/bundle-visualizer/README.md
new file mode 100644
index 0000000000..90e47671a1
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/README.md
@@ -0,0 +1 @@
+# bundle-visualizer
\ No newline at end of file
diff --git a/packages/non-core/bundle-visualizer/classNames.js b/packages/non-core/bundle-visualizer/classNames.js
new file mode 100644
index 0000000000..60e508062c
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/classNames.js
@@ -0,0 +1,3 @@
+import { prefixedClass } from "./common.js";
+export const rootContainer = prefixedClass("rootContainer");
+export const mask = prefixedClass("mask");
diff --git a/packages/non-core/bundle-visualizer/client.js b/packages/non-core/bundle-visualizer/client.js
new file mode 100644
index 0000000000..9f9e7d4909
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/client.js
@@ -0,0 +1,46 @@
+import { Meteor } from "meteor/meteor";
+import {
+  classPrefix,
+  methodNameStats,
+  packageName,
+} from "./common.js";
+import * as classes from "./classNames.js";
+
+import "./style.css";
+
+Meteor.startup(() => {
+  import("./sunburst.js").then(({ Sunburst }) => main(Sunburst));
+});
+
+function main(builder) {
+  const { container, mask } = frameStage();
+
+  document.body.appendChild(mask);
+  document.body.appendChild(container);
+
+  Meteor.call(methodNameStats, (error, result) => {
+    if (error) {
+      console.error([
+        `${packageName}: Couldn't load stats for visualization.`,
+        "Are you using standard-minifier-js >= 2.1.0 as the minifier?",
+      ].join(" "));
+      return;
+    }
+
+    // Load the JSON, which is `d3-hierarchy` digestible.
+    if (result) {
+      (new builder({ container })).loadJson(result);
+    }
+  });
+}
+
+function frameStage() {
+  // Create the mask which will block out the main application.
+  const mask = document.createElement("div");
+  mask.setAttribute("class", `${classPrefix} ${classes.mask}`);
+
+  // Create the container which the SVG elements will be drawn into.
+  const container = document.createElement("div");
+  container.setAttribute("class", `${classPrefix} ${classes.rootContainer}`);
+  return { container, mask };
+}
diff --git a/packages/non-core/bundle-visualizer/common.js b/packages/non-core/bundle-visualizer/common.js
new file mode 100644
index 0000000000..c36a0704ad
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/common.js
@@ -0,0 +1,14 @@
+export const packageName = "bundle-visualizer";
+export const classPrefix = "meteorBundleVisualizer";
+export const methodNameStats = `_meteor/${packageName}/stats`;
+export const typeBundle = "bundle";
+export const typePackage = "package";
+export const typeNodeModules = "node_modules";
+
+function capitalizeFirstLetter(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+export function prefixedClass(className) {
+  return `${classPrefix}${capitalizeFirstLetter(className)}`;
+}
diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js
new file mode 100644
index 0000000000..389dbe3bd8
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/package.js
@@ -0,0 +1,23 @@
+Package.describe({
+  version: '1.0.0',
+  summary: 'Meteor bundle analysis and visualization.',
+  documentation: 'README.md',
+});
+
+Npm.depends({
+  "d3-selection": "1.0.5",
+  "d3-shape": "1.0.6",
+  "d3-hierarchy": "1.1.4",
+  "d3-transition": "1.0.4",
+  "pretty-bytes": "4.0.2",
+});
+
+Package.onUse(function(api) {
+  api.versionsFrom('1.4.4.1');
+  api.use([
+    'ecmascript',
+    'dynamic-import',
+  ]);
+  api.mainModule('server.js', 'server');
+  api.mainModule('client.js', 'client');
+});
diff --git a/packages/non-core/bundle-visualizer/server.js b/packages/non-core/bundle-visualizer/server.js
new file mode 100644
index 0000000000..2a38b09da2
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/server.js
@@ -0,0 +1,144 @@
+import assert from "assert";
+import { readFileSync as fsReadFileSync } from "fs";
+
+import { Meteor } from "meteor/meteor";
+import { WebAppInternals } from "meteor/webapp";
+
+import {
+  methodNameStats,
+  packageName,
+  typeBundle,
+  typeNodeModules,
+  typePackage,
+} from "./common.js";
+
+if (Meteor.isProduction) {
+  console.warn([
+    `=> The "${packageName}" package is currently enabled. Visit your`,
+    "application in a web browser to view the client bundle analysis and",
+    "'meteor remove' the package before building/deploying the final bundle.",
+  ].join(" "));
+} else {
+  console.warn([
+    "=> In order to provide accurate measurements using minified bundles,",
+    `the "${packageName}" package requires running 'meteor --production'`,
+    "to simulate production bundling."
+  ].join(" "));
+}
+
+function getStatBundles() {
+  const statFileFilter = f =>
+    f.type === "json" &&
+    f.absolutePath &&
+    f.absolutePath.endsWith(".stats.json");
+
+  // Read the stat file, but if it's in any way unusable just return null.
+  const readOrNull = file => {
+    try {
+      return JSON.parse(fsReadFileSync(file, "utf8"));
+    } catch (err) {
+      return null;
+    }
+  };
+
+  return Object.keys(WebAppInternals.staticFiles)
+    .map(staticFile => WebAppInternals.staticFiles[staticFile])
+    .filter(statFileFilter)
+    .map(statFile => ({
+      name: statFile.hash,
+      stats: readOrNull(statFile.absolutePath),
+    }));
+}
+
+function _childModules(node) {
+  return Object.keys(node)
+    .map(module => {
+      const result = {
+        name: module,
+        type: typeNodeModules,
+      };
+
+      if (typeof node[module] === "object") {
+        result.children = _childModules(node[module]);
+      } else {
+        result.size = node[module];
+      }
+
+      return result;
+    });
+}
+
+function d3TreeFromStats(stats) {
+  assert.strictEqual(typeof stats, "object",
+    "Must pass a stats object");
+  assert.strictEqual(typeof stats.minifiedBytesByPackage, "object",
+    "Stats object must contain a `minifiedBytesByPackage` object");
+
+  const sizeOrDetail = (name, node) => {
+    const result = {
+      name,
+      type: typePackage,
+    };
+
+    // A non-leaf is: [size (Number), limb (Object)]
+    // A leaf is size (Number)
+    if (Array.isArray(node)) {
+      const [, detail] = node;
+      result.children = _childModules(detail);
+    } else {
+      result.size = node;
+    }
+
+    return result;
+  };
+
+  // Main entry into the stats is the `minifiedBytesByPackage` attribute.
+  return Object.keys(stats.minifiedBytesByPackage)
+    .map(name =>
+      sizeOrDetail(name
+        // Change the "packages/bundle.js" name to "(bundle)"
+        .replace(/^[^\/]+\/(.*)\.js$/, "($1)"),
+          stats.minifiedBytesByPackage[name]));
+}
+
+Meteor.methods({
+  [methodNameStats]() {
+    const statBundles = getStatBundles();
+
+    // Silently return no data if not simulating production.
+    if (! Meteor.isProduction) {
+      return null;
+    }
+
+    if (! (statBundles && statBundles.length)) {
+      throw new Meteor.Error("no-stats-bundles", "Unable to retrieve stats");
+    }
+
+    const validStatBundles = statBundles.filter(statBundle => {
+      if (statBundle &&
+        statBundle.stats &&
+        statBundle.stats.minifier &&
+        statBundle.stats.minifier.name === "standard-minifier-js" &&
+        statBundle.stats.minifier.version.startsWith("2.1.")
+      ) {
+        return true;
+      }
+    });
+
+    if (! validStatBundles.length) {
+      throw new Meteor.Error("no-valid-stats", "No valid stats bundles")
+    }
+
+    return {
+      name: "main",
+      children: validStatBundles.map((statBundle, index, array) => ({
+        // TODO: If multiple bundles, could
+        // show abbr. bundle names with:
+        //   `...${bundle.name.substr(-3)}`,
+        name: "bundle" + (array.length > 1 ? ` (${index + 1})` : ""),
+        type: typeBundle,
+        children: d3TreeFromStats(statBundle.stats),
+      })),
+    };
+  }
+});
diff --git a/packages/non-core/bundle-visualizer/style.css b/packages/non-core/bundle-visualizer/style.css
new file mode 100644
index 0000000000..f92bcbc50c
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/style.css
@@ -0,0 +1,101 @@
+.meteorBundleVisualizer.meteorBundleVisualizerMask {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background-color: #cdcdcd;
+  opacity: 0.5;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer {
+  position: absolute;
+  top: 0;
+  font-family: 'Open Sans', sans-serif;
+  font-size: 12px;
+  font-weight: 400;
+  width: 960px;
+  height: 700px;
+  margin-top: 10px;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerMain
+{
+  float: left;
+  width: 950px;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerSequence
+{
+  width: 800px;
+  height: 70px;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerSequence text,
+{
+  font-weight: 600;
+  fill: #fff;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerChart
+{
+  position: relative;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerChart path
+{
+  stroke: #fff;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerExplanation
+{
+  position: absolute;
+  top: 260px;
+  left: 405px;
+  width: 140px;
+  text-align: center;
+  color: #000;
+  z-index: -1;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerPercentage
+{
+  font-size: 2.5em;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerBytes
+{
+  font-size: 2em;
+  font-weight: bold;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerTrail
+{
+    position: absolute;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 12px;
+    left: 0;
+    min-width: 180px;
+    font-weight: bold;
+}
+
+.meteorBundleVisualizer.meteorBundleVisualizerRootContainer
+  .meteorBundleVisualizerTrail .meteorBundleVisualizerTrailSegment
+{
+  height: 40px;
+  border-radius: 3px;
+  border: 2px dotted black;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 40px;
+  margin-bottom: 5px;
+}
diff --git a/packages/non-core/bundle-visualizer/sunburst.js b/packages/non-core/bundle-visualizer/sunburst.js
new file mode 100644
index 0000000000..694e65cfa6
--- /dev/null
+++ b/packages/non-core/bundle-visualizer/sunburst.js
@@ -0,0 +1,277 @@
+/**
+  Inspired-by, borrowed-from and improved-upon another sundial provided under
+  the Apache License:
+
+    https://bl.ocks.org/kerryrodden/766f8f6d31f645c39f488a0befa1e3c8
+
+  Copyright 2013 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import assert from "assert";
+import prettyBytes from "pretty-bytes";
+
+// Make a custom "d3" object containing exactly what we need from the
+// modularized d3 bundles.
+const d3 = Object.assign({},
+  { selectAll, select, mouse } = require("d3-selection"),
+  { arc } = require("d3-shape"),
+  { hierarchy, partition } = require("d3-hierarchy"),
+  { keys, entries } = require("d3-collection"),
+);
+
+// This is imported only for its side effects, which affect the d3 namespace.
+import "d3-transition";
+
+import {
+  typeBundle,
+  typePackage,
+  typeNodeModules,
+  prefixedClass,
+} from "./common.js";
+
+import * as classes from "./classNames.js";
+
+// Dimensions of sunburst.
+const width = 950;
+const height = 600;
+const radius = Math.min(width, height) / 2;
+
+// Mapping of step names to colors.
+const DEFAULT_COLORS = {
+  "_default_": "#ababab",
+  [typeBundle]: "#de4f4f",
+  [typePackage]: "#de783b",
+  [typeNodeModules]: "#7b615c",
+  "meteor": "#6ab975",
+  "javascript": "#a173d1",
+};
+
+export class Sunburst {
+  constructor(
+    {
+      container,
+      colors = DEFAULT_COLORS,
+    } = {}
+  ) {
+    this.elements = {};
+    this.colors = colors;
+    this.totalSize = 0;
+
+    assert.strictEqual(typeof container, "object",
+      "Must pass a 'container' element");
+
+    this.elements.container = d3.select(container);
+
+    this.elements.main =
+      this.elements.container
+        .append("div")
+          .attr("class", prefixedClass("main"));
+
+    this.elements.sequence =
+      this.elements.main
+        .append("div")
+          .attr("class", prefixedClass("sequence"));
+
+    this.elements.chart =
+      this.elements.main
+        .append("div")
+          .attr("class", prefixedClass("chart"));
+
+    this.elements.explanation =
+      this.elements.chart
+        .append("div")
+          .attr("class", prefixedClass("explanation"));
+
+    this.elements.percentage =
+      this.elements.explanation
+        .append("span")
+          .attr("class", prefixedClass("percentage"));
+
+    // BR between percentage and bytes.
+    this.elements.explanation.append("br");
+
+    this.elements.bytes =
+      this.elements.explanation
+        .append("span")
+          .attr("class", prefixedClass("bytes"));
+
+    this.svg = this.elements.chart
+      .append("svg:svg")
+        .attr("width", width)
+        .attr("height", height);
+
+    this.vis = this.svg
+      .append("svg:g")
+        .attr("class", prefixedClass("top"))
+        .attr("transform", `translate(${width / 2},${height / 2})`);
+
+    this.partition = d3.partition()
+      .size([2 * Math.PI, radius * radius]);
+
+    this.arc = d3.arc()
+      .startAngle(d => d.x0)
+      .endAngle(d => d.x1)
+      .innerRadius(d => Math.sqrt(d.y0))
+      .outerRadius(d => Math.sqrt(d.y1));
+  }
+
+  getColor(data) {
+    if (data.type === typePackage) {
+      return this.colors[typePackage];
+    }
+
+    if (data.name.endsWith(".js")) {
+      return this.colors.javascript;
+    }
+
+    if (this.colors[data.name]) {
+      return this.colors[data.name];
+    }
+
+    return this.colors._default_;
+  }
+
+  initializeBreadcrumbTrail() {
+    // Add the svg area.
+    this.elements.trail =
+      this.elements.container
+        .append("div")
+        .attr("class", prefixedClass("trail"));
+  }
+
+  loadJson(json) {
+    // Basic setup of page elements.
+    this.initializeBreadcrumbTrail();
+
+    // Bounding circle underneath the sunburst, to make it easier to detect
+    // when the mouse leaves the parent g.
+    this.vis
+      .append("svg:circle")
+        .attr("r", radius)
+        .style("opacity", 0);
+
+    // Turn the data into a d3 hierarchy and calculate the sums.
+    this.root = d3.hierarchy(json)
+      .sum(d => d.size)
+      .sort((a, b) => b.value - a.value);
+
+    // For efficiency, filter nodes to keep only those large enough to see.
+    this.nodes = this
+      .partition(this.root)
+      .descendants()
+      .filter(d => d.x1 - d.x0 > 0.005); // 0.005 radians = 0.29 degrees
+
+    this.path = this.vis.data([json]).selectAll("path")
+      .data(this.nodes)
+      .enter()
+      .append("svg:path")
+        .attr("display", d => d.depth ? null : "none")
+        .attr("d", this.arc)
+        .attr("fill-rule", "evenodd")
+        .style("fill", d => this.getColor(d.data))
+        .style("opacity", 1)
+        .on("mouseover", this.mouseoverEvent());
+
+    // Add the mouseleave handler to the bounding circle.
+    this.vis.on("mouseleave", this.mouseleaveEvent());
+
+    // // Get total size of the tree = value of root node from partition.
+    this.totalSize = this.path.datum().value;
+  }
+
+  mouseoverEvent() {
+    const self = this;
+    return self.mouseover || (self.mouseover = function (d) {
+      const percentage = (100 * d.value / self.totalSize).toPrecision(3);
+      let percentageString = `${percentage}%`;
+      if (percentage < 0.1) {
+        percentageString = "< 0.1%";
+      }
+
+      self.elements.percentage
+        .text(percentageString);
+
+      self.elements.bytes
+        .text(prettyBytes(d.value || 0));
+
+      self.elements.explanation
+        .style("display", null);
+
+      const sequenceArray = d.ancestors().reverse();
+      sequenceArray.shift(); // remove root node from the array
+      self.updateBreadcrumbs(sequenceArray, percentageString);
+
+      // Fade all the segments.
+      d3.selectAll("path")
+        .style("opacity", 0.3);
+
+      // Then highlight only those that are an ancestor of the current segment.
+      self.vis.selectAll("path")
+        .filter((node) => sequenceArray.indexOf(node) >= 0)
+        .style("opacity", 1);
+    });
+  }
+
+  // Restore everything to full opacity when moving off the visualization.
+  mouseleaveEvent() {
+    const self = this;
+    return self.mouseleave || (self.mouseleave = function (d) {
+      // Hide the breadcrumb trail
+      self.elements.trail
+        .style("visibility", "hidden");
+
+      // Deactivate all segments during transition.
+      d3.selectAll("path").on("mouseover", null);
+
+      // Transition each segment to full opacity and then reactivate it.
+      d3.selectAll("path")
+        .transition()
+        .duration(1000)
+        .style("opacity", 1)
+        .on("end", function() {
+          d3.select(this).on("mouseover", self.mouseoverEvent());
+        });
+
+      self.elements.explanation
+        .style("display", "none");
+    });
+  }
+
+  // Update the breadcrumb trail to show the current sequence and percentage.
+  updateBreadcrumbs(nodeArray, percentageString) {
+    // Data join; key function combines name and depth (= position in sequence).
+    const trail = this.elements.trail
+      .selectAll("div")
+      .data(nodeArray, d => d.data.name + d.depth);
+
+    // Remove exiting nodes.
+    trail.exit().remove();
+
+    // Add breadcrumb and label for entering nodes.
+    const entering = trail.enter()
+      .append("div")
+        .attr("class", prefixedClass("trailSegment"))
+        .style("background-color", d => this.getColor(d.data))
+        .text(d => d.data.name);
+
+    // Merge enter and update selections; set position for all nodes.
+    entering
+      .merge(trail);
+
+    // Make the breadcrumb trail visible, if it's hidden.
+    this.elements.trail
+      .style("visibility", "");
+  }
+}

From 4cd46ded3ca770309f3b00d9cff657a6c3074df9 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 May 2017 13:15:57 -0400
Subject: [PATCH 142/195] Minor tweaks to the meteor/non-core/bundle-visualizer
 package.

---
 packages/non-core/bundle-visualizer/client.js   |  4 ++--
 packages/non-core/bundle-visualizer/package.js  |  2 +-
 packages/non-core/bundle-visualizer/sunburst.js | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/non-core/bundle-visualizer/client.js b/packages/non-core/bundle-visualizer/client.js
index 9f9e7d4909..2c61989c3c 100644
--- a/packages/non-core/bundle-visualizer/client.js
+++ b/packages/non-core/bundle-visualizer/client.js
@@ -9,7 +9,7 @@ import * as classes from "./classNames.js";
 import "./style.css";
 
 Meteor.startup(() => {
-  import("./sunburst.js").then(({ Sunburst }) => main(Sunburst));
+  import("./sunburst.js").then(s => main(s.Sunburst));
 });
 
 function main(builder) {
@@ -29,7 +29,7 @@ function main(builder) {
 
     // Load the JSON, which is `d3-hierarchy` digestible.
     if (result) {
-      (new builder({ container })).loadJson(result);
+      new builder({ container }).loadJson(result);
     }
   });
 }
diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js
index 389dbe3bd8..c6878afde4 100644
--- a/packages/non-core/bundle-visualizer/package.js
+++ b/packages/non-core/bundle-visualizer/package.js
@@ -13,7 +13,7 @@ Npm.depends({
 });
 
 Package.onUse(function(api) {
-  api.versionsFrom('1.4.4.1');
+  api.use('isobuild:dynamic-import@1.5.0');
   api.use([
     'ecmascript',
     'dynamic-import',
diff --git a/packages/non-core/bundle-visualizer/sunburst.js b/packages/non-core/bundle-visualizer/sunburst.js
index 694e65cfa6..612f8938cc 100644
--- a/packages/non-core/bundle-visualizer/sunburst.js
+++ b/packages/non-core/bundle-visualizer/sunburst.js
@@ -59,12 +59,10 @@ const DEFAULT_COLORS = {
 };
 
 export class Sunburst {
-  constructor(
-    {
-      container,
-      colors = DEFAULT_COLORS,
-    } = {}
-  ) {
+  constructor({
+    container,
+    colors = DEFAULT_COLORS,
+  } = {}) {
     this.elements = {};
     this.colors = colors;
     this.totalSize = 0;

From eb45a7898292adfdb50a1e53680bfe89e28131d4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 May 2017 13:25:51 -0400
Subject: [PATCH 143/195] Bump package versions for 1.5-rc.1 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 6c6c4a1f63..c7f9d900bb 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.19.1-rc.0'
+  version: '6.19.1-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index fedf50c918..b0afb5a3ea 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.1.0-rc.0'
+  version: '1.1.0-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 872a79bc3e..6eac6b4d8a 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.0",
+  version: "0.1.0-rc.1",
   summary: "Support for module.dynamicImport(id).then(namespace => ...)",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 930dbbc8bc..63c75277ad 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.0',
+  version: '0.8.0-rc.1',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 947dd573a4..5d426bc5ec 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.1-rc.0"
+  version: "1.3.1-rc.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 99c078c300..7662121407 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.1.0-rc.0"
+  version: "1.1.0-rc.1"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 5d41735c04..2c24630265 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.0',
+  version: '1.1.0-rc.1',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 22cf39cbe5..190090fee6 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.5.0-rc.0'
+  version: '1.5.0-rc.1'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 7cdd026d75..734d49eeca 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.2.0-rc.0'
+  version: '1.2.0-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 9a6a6f8e00..ef1b1d0668 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.0",
+  version: "0.8.0-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 24e4e74df3..e859d0340e 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.0",
+  version: "0.9.0-rc.1",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 28b56a380b..c5ea346556 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.18-rc.0'
+  version: '1.1.18-rc.1'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 34352796ec..7764a40bd9 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.0'
+  version: '1.1.9-rc.1'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 1571dbbd01..db8fd550dc 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: '2.1.0-rc.0',
+  version: '2.1.0-rc.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index d042e3e121..ab2d77443f 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.16-rc.0'
+  version: '1.3.16-rc.1'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 38e1a6d036..ac8f8f7bbc 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.0",
+ "version": "1.5-rc.1",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 4ee3fc1b5e08ebd74200d1263f769e91a080c168 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 11 May 2017 16:06:42 -0400
Subject: [PATCH 144/195] Improve summary in dynamic-import/package.js.

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

diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 6eac6b4d8a..9d77d594d1 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "dynamic-import",
   version: "0.1.0-rc.1",
-  summary: "Support for module.dynamicImport(id).then(namespace => ...)",
+  summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
 

From f9772ea2ef1eef02f42847a27629fa4a4b81fddd Mon Sep 17 00:00:00 2001
From: Rahul <Primigenus@users.noreply.github.com>
Date: Thu, 11 May 2017 19:58:23 -0700
Subject: [PATCH 145/195] Ensure visualizer displays on top of other UI

There was an issue where most of the visualizer was visible but the module size details displayed when hovering over a segment were hidden behind some UI elements. Setting a high z-index fixes it.
---
 packages/non-core/bundle-visualizer/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/non-core/bundle-visualizer/style.css b/packages/non-core/bundle-visualizer/style.css
index f92bcbc50c..47b935da9a 100644
--- a/packages/non-core/bundle-visualizer/style.css
+++ b/packages/non-core/bundle-visualizer/style.css
@@ -10,6 +10,7 @@
 
 .meteorBundleVisualizer.meteorBundleVisualizerRootContainer {
   position: absolute;
+  z-index: 99999;
   top: 0;
   font-family: 'Open Sans', sans-serif;
   font-size: 12px;

From e3bd1cfb9c35b41db25b1d44d59c72792129964c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 12:11:18 -0400
Subject: [PATCH 146/195] Make dynamic import(...) caching more robust to
 IndexedDB failures.

Fixes #8697.
---
 packages/dynamic-import/cache.js         | 23 ++++++++++++++++++++++-
 tools/tests/apps/dynamic-import/tests.js |  5 ++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/dynamic-import/cache.js b/packages/dynamic-import/cache.js
index e78b9b90de..402b2b298b 100644
--- a/packages/dynamic-import/cache.js
+++ b/packages/dynamic-import/cache.js
@@ -50,7 +50,9 @@ function withDB(callback) {
     };
   });
 
-  return dbPromise.then(callback);
+  return dbPromise.then(callback, function (error) {
+    return callback(null);
+  });
 }
 
 var objectStoreMap = {
@@ -63,6 +65,13 @@ function makeOnError(reject, source) {
       "IndexedDB failure in " + source + " " +
         JSON.stringify(event.target)
     ));
+
+    // Returning true from an onerror callback function prevents an
+    // InvalidStateError in Firefox during Private Browsing. Silencing
+    // that error is safe because we handle the error more gracefully by
+    // passing it to the Promise reject function above.
+    // https://github.com/meteor/meteor/issues/8697
+    return true;
   };
 }
 
@@ -83,6 +92,12 @@ exports.checkMany = function (versions) {
   }
 
   return withDB(function (db) {
+    if (! db) {
+      // We thought we could used IndexedDB, but something went wrong
+      // while opening the database, so err on the side of safety.
+      return sourcesById;
+    }
+
     var txn = db.transaction([
       "sourcesByVersion"
     ], "readonly");
@@ -145,6 +160,12 @@ function flushSetMany() {
   pendingVersionsAndSourcesById = Object.create(null);
 
   return withDB(function (db) {
+    if (! db) {
+      // We thought we could used IndexedDB, but something went wrong
+      // while opening the database, so err on the side of safety.
+      return;
+    }
+
     var setTxn = db.transaction([
       "sourcesByVersion"
     ], "readwrite");
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index 41473f8883..c80221b2a4 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -189,7 +189,10 @@ function maybeClearDynamicImportCache() {
             global.indexedDB.deleteDatabase("MeteorDynamicImportCache");
           deleteRequest.onerror =
           deleteRequest.onblocked =
-          deleteRequest.onsuccess = resolve;
+          deleteRequest.onsuccess = function (arg) {
+            resolve(arg);
+            return true;
+          };
         });
       });
     }

From 93da21ed627adc4ede47e67dff2658499c8441a0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 13:06:52 -0400
Subject: [PATCH 147/195] Update History.md with miscellaneous Meteor 1.5
 changes.

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

diff --git a/History.md b/History.md
index ddad1870f7..b23df5faca 100644
--- a/History.md
+++ b/History.md
@@ -1,11 +1,15 @@
 ## v.NEXT
 
+## v1.5, TBD
+
 * Node has been upgraded to version 4.8.3.
 
-* Running `meteor add dynamic-import` installs support for ECMAScript
-  [dynamic `import(...)`](https://github.com/tc39/proposal-dynamic-import),
-  a new language feature which allows for asynchronous module fetching
-  (sometimes referred to as "code splitting"). See this [blog
+* The `meteor-base` package implies a new `dynamic-import` package, which
+  provides runtime support for [the proposed ECMAScript dynamic
+  `import(...)` syntax](https://github.com/tc39/proposal-dynamic-import),
+  enabling asynchronous module fetching or "code splitting." If your app
+  does not use the `meteor-base` package, you can use the package by
+  simply running `meteor add dynamic-import`. See this [blog
   post](https://blog.meteor.com/meteor-1-5-react-loadable-f029a320e59c)
   and [PR #8327](https://github.com/meteor/meteor/pull/8327) for more
   information about how dynamic `import(...)` works in Meteor, and how to
@@ -39,6 +43,46 @@
   [commits](https://github.com/meteor/meteor/pull/8327/commits/1c8bc7353e9a8d526880634a58c506b423c4a55e)
   for inspiration.
 
+* To visualize the bundle size data produced by `standard-minifier-js`,
+  run `meteor add bundle-visualizer` and then start your development
+  server in production mode with `meteor run --production`. Be sure to
+  remove the `bundle-visualizer` package before actually deploying your
+  app, or the visualization will be displayed to your users.
+
+* If you've been developing an app with multiple versions of Meteor, or
+  testing with beta versions, and you haven't recently run `meteor reset`,
+  your `.meteor/local/bundler-cache` directory may have become quite
+  large. This is just a friendly reminder that this directory is perfectly
+  safe to delete, and Meteor will repopulate it with only the most recent
+  cached bundles.
+
+* Apps created with `meteor create --bare` now use the `static-html`
+  package for processing `.html` files instead of `blaze-html-templates`,
+  to avoid large unnecessary dependencies like the `jquery` package.
+
+* Babel plugins now receive file paths without leading `/` characters,
+  which should prevent confusion about whether the path should be treated
+  as absolute. [PR #8610](https://github.com/meteor/meteor/pull/8610)
+
+* It is now possible to override the Cordova iOS and/or Android
+  compatibility version by setting the `METEOR_CORDOVA_COMPAT_VERSION_IOS`
+  and/or `METEOR_CORDOVA_COMPAT_VERSION_ANDROID` environment variables.
+  [PR #8581](https://github.com/meteor/meteor/pull/8581)
+
+* Modules in `node_modules` directories will no longer automatically have
+  access to the `Buffer` polyfill on the client, since that polyfill
+  contributed more than 22KB of minified JavaScript to the client bundle,
+  and was rarely used. If you really need the Buffer API on the client,
+  you should now obtain it explicitly with `require("buffer").Buffer`.
+  [Issue #8645](https://github.com/meteor/meteor/issues/8645).
+
+* Packages in `node_modules` directories are now considered non-portable
+  (and thus may be automatically rebuilt for the current architecture), if
+  their `package.json` files contain any of the following install hooks:
+  `install`, `preinstall`, or `postinstall`. Previously, a package was
+  considered non-portable only if it contained any `.node` binary modules.
+  [Issue #8225](https://github.com/meteor/meteor/issues/8225)
+
 ## v1.4.4.2, 2017-05-02
 
 * Node has been upgraded to version 4.8.2.

From 2032ba8b23020758fef43c78de83a36230da2c36 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 13:52:35 -0400
Subject: [PATCH 148/195] Re-run individual tests to avoid re-running the whole
 suite.

To deal with individual flaky tests, we often just re-run the entire test
suite, which feels like an enormous waste of shared computing resources.

This change automatically re-runs individual failed tests as many as two
more times, and considers the test successful if any of those attempts
succeeds.

cc @abernix @hwillson et al.
---
 tools/tool-testing/selftest.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/tool-testing/selftest.js b/tools/tool-testing/selftest.js
index 492d7fbdce..31263f1485 100644
--- a/tools/tool-testing/selftest.js
+++ b/tools/tool-testing/selftest.js
@@ -1999,7 +1999,10 @@ var runTests = function (options) {
   _.each(testList.filteredTests, function (test) {
     totalRun++;
     Console.error(test.file + ": " + test.name + " ... ");
+    runTest(test);
+  });
 
+  function runTest(test, tries = 3) {
     var failure = null;
     try {
       runningTest = test;
@@ -2017,6 +2020,16 @@ var runTests = function (options) {
 
     if (failure) {
       Console.error("... fail!", Console.options({ indent: 2 }));
+
+      if (--tries > 0) {
+        Console.error(
+          "... retrying (" + tries + (tries === 1 ? " try" : " tries") + " remaining) ...",
+          Console.options({ indent: 2 })
+        );
+
+        return runTest(test, tries);
+      }
+
       failedTests.push(test);
       testList.notifyFailed(test);
 
@@ -2078,7 +2091,7 @@ var runTests = function (options) {
         "... ok (" + durationMs + " ms)",
         Console.options({ indent: 2 }));
     }
-  });
+  }
 
   testList.saveTestState();
 

From 2e057d711914b432ab9cb6a2b07d44f55815dd47 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 16:00:20 -0400
Subject: [PATCH 149/195] Call requestGarbageCollection in Isopack#_writeTool.

This method appears to be causing large spikes in memory consumption on
Circle CI during the `meteor --get-ready` preparation step, which often
leads to the test process being killed.

Also added a call in IsopackCache#_loadLocalPackage for good measure.

We're now calling requestGarbageCollection pretty frequently when
we run Node with --expose-gc, but that currently only happens during
Circle CI tests, so I don't think we need to implement the improvements
suggested in tools/utils/gc.js, yet.

Previously: 35f488e140c5df4a2bc70de271feb38921d2a6d3, f6df21ff1ed7e54db2d1df90f6d766f971a93f58
---
 tools/isobuild/isopack-cache.js | 2 ++
 tools/isobuild/isopack.js       | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/tools/isobuild/isopack-cache.js b/tools/isobuild/isopack-cache.js
index 5da0a09ed9..4f2a5f3ed7 100644
--- a/tools/isobuild/isopack-cache.js
+++ b/tools/isobuild/isopack-cache.js
@@ -383,6 +383,8 @@ export class IsopackCache {
               });
             }
           }
+
+          requestGarbageCollection();
         }
       }
 
diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js
index 034aaced80..e78746124e 100644
--- a/tools/isobuild/isopack.js
+++ b/tools/isobuild/isopack.js
@@ -14,6 +14,7 @@ var utils = require('../utils/utils.js');
 var buildPluginModule = require('./build-plugin.js');
 var Console = require('../console/console.js').Console;
 var Profile = require('../tool-env/profile.js').Profile;
+import { requestGarbageCollection } from "../utils/gc.js";
 
 var rejectBadPath = function (p) {
   if (p.match(/\.\./)) {
@@ -1802,6 +1803,8 @@ _.extend(Isopack.prototype, {
       symlink: false
     });
 
+    requestGarbageCollection();
+
     // Build all of the isopackets now, so that no build step is required when
     // you're actually running meteor from a release in order to load packages.
     var isopacketBuildContext = isopackets.makeIsopacketBuildContext();
@@ -1812,6 +1815,8 @@ _.extend(Isopack.prototype, {
       // process are going to be the current tool's isopackets, not the
       // isopackets that we're writing out.
       _.each(isopackets.ISOPACKETS, function (packages, isopacketName) {
+        requestGarbageCollection();
+
         buildmessage.enterJob({
           title: "compiling " + isopacketName + " packages for the tool"
         }, function () {
@@ -1830,6 +1835,8 @@ _.extend(Isopack.prototype, {
             return;
           }
 
+          requestGarbageCollection();
+
           image.write(
             builder.enter(files.pathJoin('isopackets', isopacketName)));
         });

From 642e8a369f96a4ad872891bb2e9371cb4576a8c1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 16:17:24 -0400
Subject: [PATCH 150/195] Bump package versions for 1.5-rc.2 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index c7f9d900bb..0f2ee2846f 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.19.1-rc.1'
+  version: '6.19.1-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index b0afb5a3ea..247d888566 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.1.0-rc.1'
+  version: '1.1.0-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 9d77d594d1..21afaecc3f 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.1",
+  version: "0.1.0-rc.2",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 63c75277ad..f83488178f 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.1',
+  version: '0.8.0-rc.2',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 5d426bc5ec..d9d1c93433 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.1-rc.1"
+  version: "1.3.1-rc.2"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 7662121407..ee70181eb3 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.1.0-rc.1"
+  version: "1.1.0-rc.2"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 2c24630265..71da06a9e1 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.1',
+  version: '1.1.0-rc.2',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 190090fee6..a59e286156 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.5.0-rc.1'
+  version: '1.5.0-rc.2'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 734d49eeca..13caa6598d 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.2.0-rc.1'
+  version: '1.2.0-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index ef1b1d0668..9b5cda1c91 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.1",
+  version: "0.8.0-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 e859d0340e..11c4bec20b 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.1",
+  version: "0.9.0-rc.2",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index c5ea346556..edb1d49189 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.18-rc.1'
+  version: '1.1.18-rc.2'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 7764a40bd9..a14d1e2076 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.1'
+  version: '1.1.9-rc.2'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index db8fd550dc..e8ca93ea33 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: '2.1.0-rc.1',
+  version: '2.1.0-rc.2',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index ab2d77443f..2b89ce4b7c 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.16-rc.1'
+  version: '1.3.16-rc.2'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index ac8f8f7bbc..309215ff19 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.1",
+ "version": "1.5-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From ff53a9115256c3bd8ea78c904ef8a7a43a29a4da Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 18:41:43 -0400
Subject: [PATCH 151/195] Bump package versions for 1.5-rc.3 release.

Something went wrong with 1.5-rc.2 such that publishing meteor-tool failed
with the following error on all platforms:

  While publishing package build for meteor-tool:
  error: Cannot override existing build

This makes no sense to me, but it necessitates another RC release. To be
clear, meteor-tool@1.5.0-rc.2 has not been successfully published on any
platform, so please don't bother trying to update to it.
---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 0f2ee2846f..ef9c578969 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.19.1-rc.2'
+  version: '6.19.1-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 247d888566..46b90ffc0f 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.1.0-rc.2'
+  version: '1.1.0-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 21afaecc3f..35816ca854 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.2",
+  version: "0.1.0-rc.3",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index f83488178f..1565308fdb 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.2',
+  version: '0.8.0-rc.3',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index d9d1c93433..86947cefe0 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.1-rc.2"
+  version: "1.3.1-rc.3"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index ee70181eb3..e27494f22b 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.1.0-rc.2"
+  version: "1.1.0-rc.3"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 71da06a9e1..ed6fe189b9 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.2',
+  version: '1.1.0-rc.3',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index a59e286156..769d129619 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.5.0-rc.2'
+  version: '1.5.0-rc.3'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 13caa6598d..c2baeef933 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.2.0-rc.2'
+  version: '1.2.0-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 9b5cda1c91..a72ac7c675 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.2",
+  version: "0.8.0-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 11c4bec20b..399a47cff8 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.2",
+  version: "0.9.0-rc.3",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index edb1d49189..27bfadb9be 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.18-rc.2'
+  version: '1.1.18-rc.3'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index a14d1e2076..08da6b1dd2 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.2'
+  version: '1.1.9-rc.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index e8ca93ea33..4f908a586f 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: '2.1.0-rc.2',
+  version: '2.1.0-rc.3',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 2b89ce4b7c..687382e77f 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.16-rc.2'
+  version: '1.3.16-rc.3'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 309215ff19..82a56e0947 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.2",
+ "version": "1.5-rc.3",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 7dd14e723dd05385bfc23645e45c9cf934fa11b6 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Thu, 11 May 2017 10:53:42 -0400
Subject: [PATCH 152/195] Adjusted bundler-cache saved file approach to remove
 out of date cache files.

---
 tools/isobuild/compiler-plugin.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 10f4f3e031..0bf26cc067 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1292,12 +1292,13 @@ export class PackageSourceBatch {
       noLineNumbers: !isWeb
     };
 
-    const cacheKey = sha1(JSON.stringify({
+    const fileHashes = [];
+    const cacheKeyPrefix = sha1(JSON.stringify({
       LINKER_CACHE_SALT,
       linkerOptions,
       files: jsResources.map((inputFile) => {
+        fileHashes.push(inputFile.hash);
         return {
-          hash: inputFile.hash,
           installPath: inputFile.installPath,
           sourceMap: !! inputFile.sourceMap,
           mainModule: inputFile.mainModule,
@@ -1307,6 +1308,8 @@ export class PackageSourceBatch {
         };
       })
     }));
+    const cacheKeySuffix = sha1(JSON.stringify(fileHashes));
+    const cacheKey = `${cacheKeyPrefix}_${cacheKeySuffix}`;
 
     {
       const inMemoryCached = LINKER_CACHE.get(cacheKey);
@@ -1394,8 +1397,19 @@ export class PackageSourceBatch {
     if (canCache) {
       LINKER_CACHE.set(cacheKey, ret);
       if (cacheFilename) {
+        const cacheKeySuffixRegex = new RegExp('_' + cacheKeySuffix, 'g');
+        const oldCacheFilename =
+          cacheFilename.replace(cacheKeySuffixRegex, '_*');
         // Write asynchronously.
-        Fiber(() => files.writeFileAtomically(cacheFilename, retAsJSON)).run();
+        Fiber(() => {
+          try {
+            files.rm_recursive(oldCacheFilename);
+          } catch (error) {
+            // If we can't remove the old cache file, we'll just continue
+            // writing the new file.
+          }
+          files.writeFileAtomically(cacheFilename, retAsJSON);
+        }).run();
       }
     }
 

From b8a8833ac693de32b8c950d0bfb8a0477fecd040 Mon Sep 17 00:00:00 2001
From: Hugh Willson <hugh@octonary.com>
Date: Mon, 15 May 2017 16:19:27 -0400
Subject: [PATCH 153/195] Moved LINKER_CACHE_SALT into cacheKeySuffix part of
 cache filename hash.

---
 tools/isobuild/compiler-plugin.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 0bf26cc067..66fcc32523 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -1294,7 +1294,6 @@ export class PackageSourceBatch {
 
     const fileHashes = [];
     const cacheKeyPrefix = sha1(JSON.stringify({
-      LINKER_CACHE_SALT,
       linkerOptions,
       files: jsResources.map((inputFile) => {
         fileHashes.push(inputFile.hash);
@@ -1308,7 +1307,10 @@ export class PackageSourceBatch {
         };
       })
     }));
-    const cacheKeySuffix = sha1(JSON.stringify(fileHashes));
+    const cacheKeySuffix = sha1(JSON.stringify({
+      LINKER_CACHE_SALT,
+      fileHashes
+    }));
     const cacheKey = `${cacheKeyPrefix}_${cacheKeySuffix}`;
 
     {

From 16a8a3ae3c60e1c3b3692b5b78df2433780e57a5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 15 May 2017 14:19:14 -0400
Subject: [PATCH 154/195] Tweaks to linker caching.

No longer using a RegExp when we know what the old file wildcard path
should be, and no longer using Fiber when we can just use a Promise
callback (since all Promise callbacks run in a Fiber).
---
 tools/isobuild/compiler-plugin.js | 36 +++++++++++++------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 66fcc32523..02cc74da22 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -10,7 +10,6 @@ var _ = require('underscore');
 var Profile = require('../tool-env/profile.js').Profile;
 import {sha1, readAndWatchFileWithHash} from  '../fs/watch.js';
 import LRU from 'lru-cache';
-import Fiber from 'fibers';
 import {sourceMapLength} from '../utils/utils.js';
 import {Console} from '../console/console.js';
 import ImportScanner from './import-scanner.js';
@@ -1313,19 +1312,19 @@ export class PackageSourceBatch {
     }));
     const cacheKey = `${cacheKeyPrefix}_${cacheKeySuffix}`;
 
-    {
-      const inMemoryCached = LINKER_CACHE.get(cacheKey);
-      if (inMemoryCached) {
-        if (CACHE_DEBUG) {
-          console.log('LINKER IN-MEMORY CACHE HIT:',
-                      linkerOptions.name, bundleArch);
-        }
-        return inMemoryCached;
+    if (LINKER_CACHE.has(cacheKey)) {
+      if (CACHE_DEBUG) {
+        console.log('LINKER IN-MEMORY CACHE HIT:',
+                    linkerOptions.name, bundleArch);
       }
+      return LINKER_CACHE.get(cacheKey);
     }
 
-    const cacheFilename = self.linkerCacheDir && files.pathJoin(
-      self.linkerCacheDir, cacheKey + '.cache');
+    const cacheFilename = self.linkerCacheDir &&
+      files.pathJoin(self.linkerCacheDir, cacheKey + '.cache');
+
+    const wildcardCacheFilename = cacheFilename &&
+      files.pathJoin(self.linkerCacheDir, cacheKeyPrefix + "_*.cache");
 
     // The return value from _linkJS includes Buffers, but we want everything to
     // be JSON for writing to the disk cache. This function converts the string
@@ -1399,19 +1398,14 @@ export class PackageSourceBatch {
     if (canCache) {
       LINKER_CACHE.set(cacheKey, ret);
       if (cacheFilename) {
-        const cacheKeySuffixRegex = new RegExp('_' + cacheKeySuffix, 'g');
-        const oldCacheFilename =
-          cacheFilename.replace(cacheKeySuffixRegex, '_*');
         // Write asynchronously.
-        Fiber(() => {
+        Promise.resolve().then(() => {
           try {
-            files.rm_recursive(oldCacheFilename);
-          } catch (error) {
-            // If we can't remove the old cache file, we'll just continue
-            // writing the new file.
+            files.rm_recursive(wildcardCacheFilename);
+          } finally {
+            files.writeFileAtomically(cacheFilename, retAsJSON);
           }
-          files.writeFileAtomically(cacheFilename, retAsJSON);
-        }).run();
+        });
       }
     }
 

From f339dec5ae02c2ef12679d5edcf0a623ff70641f Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 May 2017 14:55:20 -0400
Subject: [PATCH 155/195] Try not running a full meteor --get-ready before
 Circle CI tests.

In the ongoing struggle with Circle CI-specific test failures, the
preparatory `meteor --get-ready` has been a consistent point of failure,
before any real tests have the chance to run.

Using a lighter-weight command (meteor --help) that still does most of
what --get-ready did seems worth a try, though it might just defer
memory-intensive work until later, so we'll have to see what happens.
---
 circle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 0241b50520..d7f983e499 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,9 +13,9 @@ dependencies:
     - ".meteor"
     - ".babel-cache"
   override:
-    # shouldn't take longer than 10 minutes
-    - ./meteor --get-ready:
-        timeout: 600
+    # shouldn't take longer than 5 minutes
+    - ./meteor --help:
+        timeout: 300
         environment:
           METEOR_PRETTY_OUTPUT: 0
           METEOR_DISABLE_OPTIMISTIC_CACHING: 1

From 0a8a538d8e5d4ae2f2f8b4e16eab88b2115892b0 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 May 2017 15:25:45 -0400
Subject: [PATCH 156/195] Mention the ecmascript-runtime-{client,server} split
 in History.md.

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

diff --git a/History.md b/History.md
index b23df5faca..e56b8b0f7f 100644
--- a/History.md
+++ b/History.md
@@ -15,6 +15,18 @@
   information about how dynamic `import(...)` works in Meteor, and how to
   use it in your applications.
 
+* The `ecmascript-runtime` package, which provides polyfills for various
+  new ECMAScript runtime APIs and language features, has been split into
+  `ecmascript-runtime-client` and `ecmascript-runtime-server`, to reflect
+  the different needs of browsers versus Node 4. The client runtime now
+  relies on the `core-js` library found in the `node_modules` directory of
+  the application, rather than a private duplicate installed via
+  `Npm.depends`. This is unlikely to be a disruptive change for most
+  developers, since the `babel-runtime` npm package is expected to be
+  installed, and `core-js` is a dependency of `babel-runtime`, so
+  `node_modules/core-js` should already be present. If that's not the
+  case, just run `meteor npm install --save core-js` to install it.
+
 * The `meteor-babel` npm package has been upgraded to version 0.21.2,
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.

From 8bd1005840a74edf4401c2622b5267a1110f2e1d Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 16 May 2017 15:30:37 -0400
Subject: [PATCH 157/195] Bump package versions for 1.5-rc.4 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index ef9c578969..ee4e85f1f4 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.19.1-rc.3'
+  version: '6.19.1-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 46b90ffc0f..affa242247 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.1.0-rc.3'
+  version: '1.1.0-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 35816ca854..51072d234b 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.3",
+  version: "0.1.0-rc.4",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 1565308fdb..0f36156970 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.3',
+  version: '0.8.0-rc.4',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 86947cefe0..963de5b80d 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.1-rc.3"
+  version: "1.3.1-rc.4"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index e27494f22b..0e3e8934d1 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.1.0-rc.3"
+  version: "1.1.0-rc.4"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index ed6fe189b9..791c07dfd5 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.3',
+  version: '1.1.0-rc.4',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 769d129619..fa94fdc245 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.5.0-rc.3'
+  version: '1.5.0-rc.4'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index c2baeef933..676f8ae7b1 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.2.0-rc.3'
+  version: '1.2.0-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index a72ac7c675..bfa99f4945 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.3",
+  version: "0.8.0-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 399a47cff8..51f002c471 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.3",
+  version: "0.9.0-rc.4",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 27bfadb9be..87de6b2cc8 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.18-rc.3'
+  version: '1.1.18-rc.4'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 08da6b1dd2..6f0992d0fa 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.3'
+  version: '1.1.9-rc.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 4f908a586f..876660006b 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: '2.1.0-rc.3',
+  version: '2.1.0-rc.4',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 687382e77f..54d3f87bd6 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.16-rc.3'
+  version: '1.3.16-rc.4'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 82a56e0947..bf335fd635 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.3",
+ "version": "1.5-rc.4",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 647e3a2fc53aa75b23c1afdefcdaa61eff3fc1f2 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger <git@jro.cc>
Date: Wed, 17 May 2017 12:46:22 -0400
Subject: [PATCH 158/195] Bump bundle-visualizer version to 1.0.1 in
 preparation for publishing.

---
 packages/non-core/bundle-visualizer/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/non-core/bundle-visualizer/package.js b/packages/non-core/bundle-visualizer/package.js
index c6878afde4..3cf24de91e 100644
--- a/packages/non-core/bundle-visualizer/package.js
+++ b/packages/non-core/bundle-visualizer/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  version: '1.0.0',
+  version: '1.0.1',
   summary: 'Meteor bundle analysis and visualization.',
   documentation: 'README.md',
 });

From fb2e35fa300014e84c21f8f70f10e21a1bf942f4 Mon Sep 17 00:00:00 2001
From: Michiel ter Reehorst <jamiter@users.noreply.github.com>
Date: Wed, 17 May 2017 22:16:49 +0200
Subject: [PATCH 159/195] Move localStorage access back into try statement
 (#8703)

Accessing window.localStorage can immediately throw an error in IE (#1291) and other/older webkit versions.
---
 packages/localstorage/localstorage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/localstorage/localstorage.js b/packages/localstorage/localstorage.js
index 4eb5719830..c943385137 100644
--- a/packages/localstorage/localstorage.js
+++ b/packages/localstorage/localstorage.js
@@ -6,11 +6,13 @@
 // Accessing window.localStorage can also immediately throw an error in IE (#1291).
 
 var hasOwn = Object.prototype.hasOwnProperty;
-var storage = global.localStorage;
 var key = '_localstorage_test_' + Random.id();
 var retrieved;
+var storage;
 
 try {
+  storage = global.localStorage;
+  
   if (storage) {
     storage.setItem(key, key);
     retrieved = storage.getItem(key);

From 2aa5c28bdbdba1c8758935400cf95582c4d8b8d7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 May 2017 16:12:08 -0400
Subject: [PATCH 160/195] Save 13.5KB minified JS by not forcing core-js
 TypedArray polyfills.

You can still import these polyfills yourself, if you need them.
---
 packages/ecmascript-runtime-client/runtime.js | 28 +++++++++----------
 packages/ecmascript-runtime-server/runtime.js | 24 ++++++++--------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/ecmascript-runtime-client/runtime.js b/packages/ecmascript-runtime-client/runtime.js
index 58e3dbe682..fe9ecec9cd 100644
--- a/packages/ecmascript-runtime-client/runtime.js
+++ b/packages/ecmascript-runtime-client/runtime.js
@@ -36,21 +36,21 @@ Set = exports.Set = core.Set;
 //
 // Supported browsers: http://browserl.ist/?q=last+3+versions
 //
-// Note that the es6.reflect.* modules have been commented out for bundle
-// size reasons, and the es6.promise modules are not used because Meteor
-// provides its own Promise polyfill.
+// Note that the es6.reflect.* and es6.typed.* modules have been commented
+// out for bundle size reasons, and the es6.promise modules are not used
+// because Meteor provides its own Promise polyfill.
 
-require("core-js/modules/es6.typed.array-buffer");
-require("core-js/modules/es6.typed.data-view");
-require("core-js/modules/es6.typed.int8-array");
-require("core-js/modules/es6.typed.uint8-array");
-require("core-js/modules/es6.typed.uint8-clamped-array");
-require("core-js/modules/es6.typed.int16-array");
-require("core-js/modules/es6.typed.uint16-array");
-require("core-js/modules/es6.typed.int32-array");
-require("core-js/modules/es6.typed.uint32-array");
-require("core-js/modules/es6.typed.float32-array");
-require("core-js/modules/es6.typed.float64-array");
+// require("core-js/modules/es6.typed.array-buffer");
+// require("core-js/modules/es6.typed.data-view");
+// require("core-js/modules/es6.typed.int8-array");
+// require("core-js/modules/es6.typed.uint8-array");
+// require("core-js/modules/es6.typed.uint8-clamped-array");
+// require("core-js/modules/es6.typed.int16-array");
+// require("core-js/modules/es6.typed.uint16-array");
+// require("core-js/modules/es6.typed.int32-array");
+// require("core-js/modules/es6.typed.uint32-array");
+// require("core-js/modules/es6.typed.float32-array");
+// require("core-js/modules/es6.typed.float64-array");
 require("core-js/modules/es6.weak-map");
 require("core-js/modules/es6.weak-set");
 // require("core-js/modules/es6.reflect.apply");
diff --git a/packages/ecmascript-runtime-server/runtime.js b/packages/ecmascript-runtime-server/runtime.js
index 1e41296fb4..f825f03be0 100644
--- a/packages/ecmascript-runtime-server/runtime.js
+++ b/packages/ecmascript-runtime-server/runtime.js
@@ -26,19 +26,19 @@ Set = exports.Set = core.Set;
 //   ]
 // }
 //
-// Note that the es6.reflect.* modules have been commented out for bundle
-// size reasons.
+// Note that the es6.reflect.* and es6.typed.* modules have been commented
+// out for bundle size reasons.
 
-require("core-js/modules/es6.typed.array-buffer");
-require("core-js/modules/es6.typed.int8-array");
-require("core-js/modules/es6.typed.uint8-array");
-require("core-js/modules/es6.typed.uint8-clamped-array");
-require("core-js/modules/es6.typed.int16-array");
-require("core-js/modules/es6.typed.uint16-array");
-require("core-js/modules/es6.typed.int32-array");
-require("core-js/modules/es6.typed.uint32-array");
-require("core-js/modules/es6.typed.float32-array");
-require("core-js/modules/es6.typed.float64-array");
+// require("core-js/modules/es6.typed.array-buffer");
+// require("core-js/modules/es6.typed.int8-array");
+// require("core-js/modules/es6.typed.uint8-array");
+// require("core-js/modules/es6.typed.uint8-clamped-array");
+// require("core-js/modules/es6.typed.int16-array");
+// require("core-js/modules/es6.typed.uint16-array");
+// require("core-js/modules/es6.typed.int32-array");
+// require("core-js/modules/es6.typed.uint32-array");
+// require("core-js/modules/es6.typed.float32-array");
+// require("core-js/modules/es6.typed.float64-array");
 require("core-js/modules/es6.weak-map");
 require("core-js/modules/es6.weak-set");
 // require("core-js/modules/es6.reflect.apply");

From c87191675601e0a94b28fbe5bea1d0799da69964 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 May 2017 16:11:58 -0400
Subject: [PATCH 161/195] Tolerate older versions of core-js.

Should fix #8699.
---
 packages/ecmascript-runtime-client/runtime.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/ecmascript-runtime-client/runtime.js b/packages/ecmascript-runtime-client/runtime.js
index fe9ecec9cd..88d2677e58 100644
--- a/packages/ecmascript-runtime-client/runtime.js
+++ b/packages/ecmascript-runtime-client/runtime.js
@@ -12,7 +12,15 @@ try {
   ].join("\n"));
 }
 
-var core = require("core-js/modules/_core");
+var core = function () {
+  try {
+    return require("core-js/modules/_core");
+  } catch (e) {
+    // Older versions of core-js had a different file layout.
+    return require("core-js/modules/$.core");
+  }
+}();
+
 Symbol = exports.Symbol = core.Symbol;
 Map = exports.Map = core.Map;
 Set = exports.Set = core.Set;

From f2d39c167b7c653e38b362d5ebf731eff6064f58 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 17 May 2017 16:25:44 -0400
Subject: [PATCH 162/195] Bump package versions for 1.5-rc.5 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index ee4e85f1f4..b6056addbb 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.19.1-rc.4'
+  version: '6.19.1-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index affa242247..1255b67f7d 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.1.0-rc.4'
+  version: '1.1.0-rc.5'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 51072d234b..2f4040c61e 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.4",
+  version: "0.1.0-rc.5",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 1bd6b8466a..39e5ce706b 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.0",
+  version: "0.4.1-rc.5",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 38b80d3836..3a47c1453a 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.0",
+  version: "0.4.1-rc.5",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 1f7b66f00a..8fd9fbd0a6 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.0",
+  version: "0.4.1-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 0f36156970..4273c8b85c 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.4',
+  version: '0.8.0-rc.5',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 963de5b80d..c064a18f02 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.1-rc.4"
+  version: "1.3.1-rc.5"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 0e3e8934d1..aec8ddb350 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.1.0-rc.4"
+  version: "1.1.0-rc.5"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 791c07dfd5..2a5e97c8c1 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.4',
+  version: '1.1.0-rc.5',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index fa94fdc245..05db4c0e26 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.5.0-rc.4'
+  version: '1.5.0-rc.5'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 676f8ae7b1..51dc150cf2 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.2.0-rc.4'
+  version: '1.2.0-rc.5'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index bfa99f4945..acb9c87f8a 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.4",
+  version: "0.8.0-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 51f002c471..fa344fdf4b 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.4",
+  version: "0.9.0-rc.5",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 87de6b2cc8..19c99e9b17 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.18-rc.4'
+  version: '1.1.18-rc.5'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 6f0992d0fa..b54b1e714b 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.4'
+  version: '1.1.9-rc.5'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 876660006b..a96e0a6b36 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: '2.1.0-rc.4',
+  version: '2.1.0-rc.5',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 54d3f87bd6..8abc35eb88 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.16-rc.4'
+  version: '1.3.16-rc.5'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index bf335fd635..8357a7bc99 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.4",
+ "version": "1.5-rc.5",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 0fbb97432c9f5c9b4c5958e719ca32d32a3922f1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 May 2017 11:48:34 -0400
Subject: [PATCH 163/195] Fix ENOTEMPTY and EPERM errors on Windows.

Windows began suffering from cryptic ENOTEMPTY and EPERM errors between
1.5-beta.20 and 1.5-rc.0. After a tricky `git bisect` adventure, I tracked
the problem down to my commit b6694b2f5d1ba8f58ce20e56de68bef7487ca3ce,
which caused dynamic modules to be written more than once by the bundler.
Though I don't understand exactly why Windows complained in this way, I'm
glad that it did, because otherwise this mistake would merely have been a
performance problem, and might not have been noticed before the release.
---
 tools/isobuild/bundler.js | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index 28129d3b39..21cdc50ecf 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1598,10 +1598,9 @@ class ClientTarget extends Target {
       manifestItem.size = file.size();
       manifestItem.hash = file.hash();
 
-      writeFile(file, builder);
-      manifest.push(manifestItem);
-
       if (! file.targetPath.startsWith("dynamic/")) {
+        writeFile(file, builder);
+        manifest.push(manifestItem);
         return;
       }
 
@@ -1610,12 +1609,20 @@ class ClientTarget extends Target {
       // prefixed with "dynamic/".
       manifestItem.type = "dynamic js";
 
-      if (manifestItem.sourceMapUrl) {
+      // Add the dynamic module to the manifest so that it can be
+      // requested via HTTP from the web server. Note, however, that we
+      // typically request dynamic modules via DDP, since we can compress
+      // the entire response more easily that way. We expose dynamic
+      // modules via HTTP here mostly to unlock future experimentation.
+      manifest.push(manifestItem);
+
+      if (manifestItem.sourceMap &&
+          manifestItem.sourceMapUrl) {
         // If the file is a dynamic module, we don't embed its source map
         // in the file itself (because base64-encoded data: URLs for
         // source maps can be very large), but rather include a normal URL
-        // referring to the source map, so that it can be loaded from the
-        // web server when needed.
+        // referring to the source map (as a comment), so that it can be
+        // loaded from the web server when needed.
         writeFile(file, builder, {
           sourceMapUrl: manifestItem.sourceMapUrl,
         });
@@ -1628,6 +1635,19 @@ class ClientTarget extends Target {
           cacheable: manifestItem.cacheable,
           hash: manifestItem.hash,
         });
+
+        // Now that we've written the module with a source map URL comment
+        // embedded in it, and also made sure the source map is exposed by
+        // the web server, we do not need to include the source map URL in
+        // the manifest, because then it would also be provided via the
+        // X-SourceMap HTTP header, redundantly.
+        delete manifestItem.sourceMap;
+        delete manifestItem.sourceMapUrl;
+
+      } else {
+        // If the dynamic module does not have a source map, just write it
+        // normally.
+        writeFile(file, builder);
       }
     });
 

From 02cbf94834bac2e01d8e8f2c3bf73a407cc00bcb Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 May 2017 12:31:00 -0400
Subject: [PATCH 164/195] Reorganize ecmascript-runtime-client to tolerate more
 core-js versions.

By not implicitly assuming a particular version of core-js (by importing
specific modules), we can avoid the problems reported in #8699.

Fixes #8699.
---
 packages/ecmascript-runtime-client/runtime.js | 149 ++++--------------
 1 file changed, 33 insertions(+), 116 deletions(-)

diff --git a/packages/ecmascript-runtime-client/runtime.js b/packages/ecmascript-runtime-client/runtime.js
index 88d2677e58..7ad015ea84 100644
--- a/packages/ecmascript-runtime-client/runtime.js
+++ b/packages/ecmascript-runtime-client/runtime.js
@@ -2,6 +2,16 @@ try {
   require("core-js/modules/es6.symbol");
   require("core-js/modules/es6.map");
   require("core-js/modules/es6.set");
+
+  var core = function () {
+    try {
+      return require("core-js/modules/_core");
+    } catch (e) {
+      // Older versions of core-js had a different file layout.
+      return require("core-js/modules/$.core");
+    }
+  }();
+
 } catch (e) {
   throw new Error([
     "The core-js npm package could not be found in your node_modules ",
@@ -12,124 +22,31 @@ try {
   ].join("\n"));
 }
 
-var core = function () {
-  try {
-    return require("core-js/modules/_core");
-  } catch (e) {
-    // Older versions of core-js had a different file layout.
-    return require("core-js/modules/$.core");
-  }
-}();
-
 Symbol = exports.Symbol = core.Symbol;
 Map = exports.Map = core.Map;
 Set = exports.Set = core.Set;
 
-// List of polyfills generated by babel-preset-env with the following
-// .babelrc configuration:
-//
-// {
-//   "presets": [
-//     ["env", {
-//       "targets": {
-//         "browsers": [
-//           "last 3 versions"
-//         ]
-//       },
-//       "polyfill": true,
-//       "useBuiltIns": true
-//     }]
-//   ]
-// }
-//
-// Supported browsers: http://browserl.ist/?q=last+3+versions
-//
-// Note that the es6.reflect.* and es6.typed.* modules have been commented
-// out for bundle size reasons, and the es6.promise modules are not used
-// because Meteor provides its own Promise polyfill.
+// ECMAScript 2015 polyfills.
+require("core-js/es6/array");
+require("core-js/es6/function");
+require("core-js/es6/math");
+require("core-js/es6/object");
+require("core-js/es6/string");
+require("core-js/es6/weak-map");
+require("core-js/es6/weak-set");
 
-// require("core-js/modules/es6.typed.array-buffer");
-// require("core-js/modules/es6.typed.data-view");
-// require("core-js/modules/es6.typed.int8-array");
-// require("core-js/modules/es6.typed.uint8-array");
-// require("core-js/modules/es6.typed.uint8-clamped-array");
-// require("core-js/modules/es6.typed.int16-array");
-// require("core-js/modules/es6.typed.uint16-array");
-// require("core-js/modules/es6.typed.int32-array");
-// require("core-js/modules/es6.typed.uint32-array");
-// require("core-js/modules/es6.typed.float32-array");
-// require("core-js/modules/es6.typed.float64-array");
-require("core-js/modules/es6.weak-map");
-require("core-js/modules/es6.weak-set");
-// require("core-js/modules/es6.reflect.apply");
-// require("core-js/modules/es6.reflect.construct");
-// require("core-js/modules/es6.reflect.define-property");
-// require("core-js/modules/es6.reflect.delete-property");
-// require("core-js/modules/es6.reflect.get");
-// require("core-js/modules/es6.reflect.get-own-property-descriptor");
-// require("core-js/modules/es6.reflect.get-prototype-of");
-// require("core-js/modules/es6.reflect.has");
-// require("core-js/modules/es6.reflect.is-extensible");
-// require("core-js/modules/es6.reflect.own-keys");
-// require("core-js/modules/es6.reflect.prevent-extensions");
-// require("core-js/modules/es6.reflect.set");
-// require("core-js/modules/es6.reflect.set-prototype-of");
-require("core-js/modules/es6.object.assign");
-require("core-js/modules/es6.object.is");
-require("core-js/modules/es6.object.set-prototype-of");
-// require("core-js/modules/es6.promise");
-require("core-js/modules/es6.function.bind");
-require("core-js/modules/es6.function.name");
-require("core-js/modules/es6.function.has-instance");
-require("core-js/modules/es6.string.raw");
-require("core-js/modules/es6.string.from-code-point");
-require("core-js/modules/es6.string.code-point-at");
-require("core-js/modules/es6.string.repeat");
-require("core-js/modules/es6.string.starts-with");
-require("core-js/modules/es6.string.ends-with");
-require("core-js/modules/es6.string.includes");
-require("core-js/modules/es6.regexp.flags");
-require("core-js/modules/es6.regexp.match");
-require("core-js/modules/es6.regexp.replace");
-require("core-js/modules/es6.regexp.split");
-require("core-js/modules/es6.regexp.search");
-require("core-js/modules/es6.array.from");
-require("core-js/modules/es6.array.of");
-require("core-js/modules/es6.array.copy-within");
-require("core-js/modules/es6.array.find");
-require("core-js/modules/es6.array.find-index");
-require("core-js/modules/es6.array.fill");
-require("core-js/modules/es6.array.iterator");
-require("core-js/modules/es6.number.is-finite");
-require("core-js/modules/es6.number.is-integer");
-require("core-js/modules/es6.number.is-safe-integer");
-require("core-js/modules/es6.number.is-nan");
-require("core-js/modules/es6.number.epsilon");
-require("core-js/modules/es6.number.min-safe-integer");
-require("core-js/modules/es6.number.max-safe-integer");
-require("core-js/modules/es6.math.acosh");
-require("core-js/modules/es6.math.asinh");
-require("core-js/modules/es6.math.atanh");
-require("core-js/modules/es6.math.cbrt");
-require("core-js/modules/es6.math.clz32");
-require("core-js/modules/es6.math.cosh");
-require("core-js/modules/es6.math.expm1");
-require("core-js/modules/es6.math.fround");
-require("core-js/modules/es6.math.hypot");
-require("core-js/modules/es6.math.imul");
-require("core-js/modules/es6.math.log1p");
-require("core-js/modules/es6.math.log10");
-require("core-js/modules/es6.math.log2");
-require("core-js/modules/es6.math.sign");
-require("core-js/modules/es6.math.sinh");
-require("core-js/modules/es6.math.tanh");
-require("core-js/modules/es6.math.trunc");
-require("core-js/modules/es7.array.includes");
-require("core-js/modules/es7.object.values");
-require("core-js/modules/es7.object.entries");
-require("core-js/modules/es7.object.get-own-property-descriptors");
-require("core-js/modules/es7.string.pad-start");
-require("core-js/modules/es7.string.pad-end");
-require("core-js/modules/web.timers");
-require("core-js/modules/web.immediate");
-require("core-js/modules/web.dom.iterable");
+// ECMAScript 2017 polyfills.
+require("core-js/es7/array");
+require("core-js/es7/object");
+
+// We want everything from the core-js/es6/number module except
+// es6.number.constructor.
+require('core-js/modules/es6.number.epsilon');
+require('core-js/modules/es6.number.is-finite');
+require('core-js/modules/es6.number.is-integer');
+require('core-js/modules/es6.number.is-nan');
+require('core-js/modules/es6.number.is-safe-integer');
+require('core-js/modules/es6.number.max-safe-integer');
+require('core-js/modules/es6.number.min-safe-integer');
+require('core-js/modules/es6.number.parse-float');
+require('core-js/modules/es6.number.parse-int');

From 30082c17d5dcc18c60f6728020c5aa9c51256570 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Thu, 18 May 2017 12:35:10 -0400
Subject: [PATCH 165/195] Bump package versions for 1.5-rc.6 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index b6056addbb..f4516509b7 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.19.1-rc.5'
+  version: '6.19.1-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 1255b67f7d..e97f358c9c 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.1.0-rc.5'
+  version: '1.1.0-rc.6'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 2f4040c61e..d9afdb31e3 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.5",
+  version: "0.1.0-rc.6",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 39e5ce706b..d64886e476 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.5",
+  version: "0.4.1-rc.6",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 3a47c1453a..da2ef9b8ca 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.5",
+  version: "0.4.1-rc.6",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 8fd9fbd0a6..15161b4293 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.5",
+  version: "0.4.1-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 4273c8b85c..2e71756c8c 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.5',
+  version: '0.8.0-rc.6',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index c064a18f02..4d4968b89b 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.1-rc.5"
+  version: "1.3.1-rc.6"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index aec8ddb350..330d0bbb97 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.1.0-rc.5"
+  version: "1.1.0-rc.6"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 2a5e97c8c1..6883296d40 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.5',
+  version: '1.1.0-rc.6',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 05db4c0e26..383f218a8c 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.5.0-rc.5'
+  version: '1.5.0-rc.6'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 51dc150cf2..70be8de1ec 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.2.0-rc.5'
+  version: '1.2.0-rc.6'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index acb9c87f8a..b4c2f14748 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.5",
+  version: "0.8.0-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 fa344fdf4b..4a395183df 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.5",
+  version: "0.9.0-rc.6",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 19c99e9b17..662146d9ff 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.18-rc.5'
+  version: '1.1.18-rc.6'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index b54b1e714b..d1803c5235 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.5'
+  version: '1.1.9-rc.6'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index a96e0a6b36..bc4f8c5833 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: '2.1.0-rc.5',
+  version: '2.1.0-rc.6',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 8abc35eb88..3091bb7ea4 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.16-rc.5'
+  version: '1.3.16-rc.6'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 8357a7bc99..0fb8475aef 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.5",
+ "version": "1.5-rc.6",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From f9f66e100af52fb65080a53a59304d3e68c0aa40 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 18:17:33 -0400
Subject: [PATCH 166/195] Upgrade npm to version 4.6.1.

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

diff --git a/History.md b/History.md
index 35162e1b01..59e3d05068 100644
--- a/History.md
+++ b/History.md
@@ -25,6 +25,8 @@
   `node_modules/core-js` should already be present. If that's not the
   case, just run `meteor npm install --save core-js` to install it.
 
+* The `npm` npm package has been upgraded to version 4.6.1.
+
 * The `meteor-babel` npm package has been upgraded to version 0.21.2,
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index da0f8253f9..72e1a217cd 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.12
 NODE_VERSION=4.8.3
-NPM_VERSION=4.5.0
+NPM_VERSION=4.6.1
 
 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 de3790f2c7..2d268d469e 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: "4.5.0",
+    npm: "4.6.1",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.21.1",

From 93cf550c1731c03d27d1a17ecd65ad85546d7e4e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 18:18:06 -0400
Subject: [PATCH 167/195] Upgrade meteor-babel to version 0.21.3 and reify to
 0.11.13.

Fixes #8720.
---
 History.md                                    |  4 +-
 .../.npm/package/npm-shrinkwrap.json          | 76 +++++++++----------
 packages/babel-compiler/package.js            |  2 +-
 .../modules/.npm/package/npm-shrinkwrap.json  | 10 +--
 packages/modules/package.js                   |  2 +-
 scripts/dev-bundle-tool-package.js            |  4 +-
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/History.md b/History.md
index 59e3d05068..71d944a390 100644
--- a/History.md
+++ b/History.md
@@ -27,11 +27,11 @@
 
 * The `npm` npm package has been upgraded to version 4.6.1.
 
-* The `meteor-babel` npm package has been upgraded to version 0.21.2,
+* The `meteor-babel` npm package has been upgraded to version 0.21.3,
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.0, fixing
+* The `reify` npm package has been upgraded to version 0.11.13, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index a88dedc6c0..a17cce963c 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -81,9 +81,9 @@
       "from": "babel-helper-is-void-0@>=0.0.1 <0.0.2"
     },
     "babel-helper-mark-eval-scopes": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.0.3.tgz",
-      "from": "babel-helper-mark-eval-scopes@>=0.0.3 <0.0.4"
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.1.1.tgz",
+      "from": "babel-helper-mark-eval-scopes@>=0.1.1 <0.2.0"
     },
     "babel-helper-optimise-call-expression": {
       "version": "6.24.1",
@@ -96,9 +96,9 @@
       "from": "babel-helper-regex@>=6.24.1 <7.0.0"
     },
     "babel-helper-remove-or-void": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.0.1.tgz",
-      "from": "babel-helper-remove-or-void@>=0.0.1 <0.0.2"
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.1.1.tgz",
+      "from": "babel-helper-remove-or-void@>=0.1.1 <0.2.0"
     },
     "babel-helper-replace-supers": {
       "version": "6.24.1",
@@ -138,8 +138,8 @@
       }
     },
     "babel-plugin-minify-dead-code-elimination": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.4.tgz",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.6.tgz",
       "from": "babel-plugin-minify-dead-code-elimination@>=0.1.3 <0.2.0"
     },
     "babel-plugin-minify-flip-comparisons": {
@@ -340,18 +340,18 @@
       "from": "babel-plugin-transform-inline-consecutive-adds@>=0.0.2 <0.0.3"
     },
     "babel-plugin-transform-member-expression-literals": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.1.tgz",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.3.tgz",
       "from": "babel-plugin-transform-member-expression-literals@>=6.8.1 <7.0.0"
     },
     "babel-plugin-transform-merge-sibling-variables": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.2.tgz",
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.4.tgz",
       "from": "babel-plugin-transform-merge-sibling-variables@>=6.8.2 <7.0.0"
     },
     "babel-plugin-transform-minify-booleans": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.0.tgz",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.2.tgz",
       "from": "babel-plugin-transform-minify-booleans@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-object-rest-spread": {
@@ -360,8 +360,8 @@
       "from": "babel-plugin-transform-object-rest-spread@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-property-literals": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.1.tgz",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.3.tgz",
       "from": "babel-plugin-transform-property-literals@>=6.8.1 <7.0.0"
     },
     "babel-plugin-transform-react-display-name": {
@@ -395,13 +395,13 @@
       "from": "babel-plugin-transform-regexp-constructors@>=0.0.5 <0.0.6"
     },
     "babel-plugin-transform-remove-console": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.1.tgz",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.3.tgz",
       "from": "babel-plugin-transform-remove-console@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-remove-debugger": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.1.tgz",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.3.tgz",
       "from": "babel-plugin-transform-remove-debugger@>=6.8.0 <7.0.0"
     },
     "babel-plugin-transform-remove-undefined": {
@@ -415,8 +415,8 @@
       "from": "babel-plugin-transform-runtime@>=6.22.0 <7.0.0"
     },
     "babel-plugin-transform-simplify-comparison-operators": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.1.tgz",
+      "version": "6.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.3.tgz",
       "from": "babel-plugin-transform-simplify-comparison-operators@>=6.8.1 <7.0.0"
     },
     "babel-plugin-transform-strict-mode": {
@@ -425,8 +425,8 @@
       "from": "babel-plugin-transform-strict-mode@>=6.24.1 <7.0.0"
     },
     "babel-plugin-transform-undefined-to-void": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.0.tgz",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.2.tgz",
       "from": "babel-plugin-transform-undefined-to-void@>=6.8.0 <7.0.0"
     },
     "babel-preset-babili": {
@@ -475,8 +475,8 @@
       "from": "babel-types@>=6.22.0 <7.0.0"
     },
     "babylon": {
-      "version": "6.17.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.0.tgz",
+      "version": "6.17.1",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
       "from": "babylon@>=6.15.0 <7.0.0"
     },
     "balanced-match": {
@@ -510,8 +510,8 @@
       "from": "core-js@>=2.4.0 <3.0.0"
     },
     "debug": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
       "from": "debug@>=2.1.1 <3.0.0"
     },
     "detect-indent": {
@@ -590,9 +590,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.21.2",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.2.tgz",
-      "from": "meteor-babel@0.21.2"
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.3.tgz",
+      "from": "meteor-babel@0.21.3"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -610,8 +610,8 @@
       "from": "minimist@0.0.8"
     },
     "minipass": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.1.tgz",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.2.tgz",
       "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
@@ -625,9 +625,9 @@
       "from": "mkdirp@>=0.5.1 <0.6.0"
     },
     "ms": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
-      "from": "ms@0.7.3"
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "from": "ms@2.0.0"
     },
     "number-is-nan": {
       "version": "1.0.1",
@@ -692,8 +692,8 @@
       }
     },
     "reify": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.0.tgz",
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.13.tgz",
       "from": "reify@>=0.11.0 <0.12.0"
     },
     "repeating": {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index f4516509b7..cc89381d50 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.21.2'
+  'meteor-babel': '0.21.3'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 0c95dcf9fd..e204a166e8 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -6,8 +6,8 @@
       "from": "acorn@>=5.0.0 <5.1.0"
     },
     "minipass": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.1.tgz",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.0.2.tgz",
       "from": "minipass@>=2.0.0 <3.0.0"
     },
     "minizlib": {
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.0.tgz",
-      "from": "reify@0.11.0"
+      "version": "0.11.13",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.13.tgz",
+      "from": "reify@0.11.13"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 4a395183df..e3f99e7eab 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.0"
+  reify: "0.11.13"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 2d268d469e..8da635a6e2 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,8 +14,8 @@ var packageJson = {
     npm: "4.6.1",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
-    "meteor-babel": "0.21.1",
-    reify: "0.11.0",
+    "meteor-babel": "0.21.3",
+    reify: "0.11.13",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From e2210ef01d32c50110fb967a5c2390c20141c7cd Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 18:18:42 -0400
Subject: [PATCH 168/195] Update Reify API usage for version 0.11.13.

---
 packages/dynamic-import/client.js        |  6 +++---
 tools/tests/apps/dynamic-import/tests.js | 26 ++++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index a4bce902b8..ce060b51dd 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -139,11 +139,11 @@ function addToTree(tree, id, value) {
 }
 
 function getNamespace(module, id) {
-  var namespace = Object.create(null);
+  var namespace;
 
   module.watch(module.require(id), {
-    "*": function (value, name) {
-      namespace[name] = value;
+    "*": function (ns) {
+      namespace = ns;
     }
   });
 
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index c80221b2a4..cd30fedc90 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -1,5 +1,15 @@
 import assert from "assert";
 
+function assertDeepEqual(a, b) {
+  const aWithoutDefault = Object.assign({}, a);
+  delete aWithoutDefault.default;
+
+  const bWithoutDefault = Object.assign({}, b);
+  delete bWithoutDefault.default;
+
+  assert.deepEqual(aWithoutDefault, bWithoutDefault);
+}
+
 describe("dynamic import(...)", function () {
   maybeClearDynamicImportCache();
 
@@ -25,7 +35,7 @@ describe("dynamic import(...)", function () {
     }
 
     return import("console").then(console => {
-      assert.deepEqual(console, require(stubId));
+      assertDeepEqual(console, require(stubId));
       assert.strictEqual(typeof console.log, "function");
     });
   });
@@ -42,7 +52,7 @@ describe("dynamic import(...)", function () {
     return import("private").then(priv => {
       assert.strictEqual(name, "private");
       assert.strictEqual(typeof priv.makeAccessor, "function");
-      assert.deepEqual(priv, require("pri" + "vate"));
+      assertDeepEqual(priv, require("pri" + "vate"));
     });
   });
 
@@ -51,7 +61,7 @@ describe("dynamic import(...)", function () {
     return import("arson/package.json").then(({ name }) => {
       assert.strictEqual(name, "arson");
       assert.strictEqual(typeof arson.encode, "function");
-      assert.deepEqual(arson, require("ar" + "son"));
+      assertDeepEqual(arson, require("ar" + "son"));
     });
   });
 
@@ -62,7 +72,7 @@ describe("dynamic import(...)", function () {
     ]).then(([{ name }, React]) => {
       assert.strictEqual(name, "react");
       assert.strictEqual(typeof React.createClass, "function");
-      assert.deepEqual(React, require("re" + "act"));
+      assertDeepEqual(React, require("re" + "act"));
     });
   });
 
@@ -135,7 +145,7 @@ describe("dynamic import(...)", function () {
     const b = await import("meteor/helper-package/dynamic/b.coffee");
 
     assert.strictEqual(a.shared, b.shared);
-    assert.deepEqual(a.shared, {
+    assertDeepEqual(a.shared, {
       "/node_modules/meteor/helper-package/dynamic/a.js": true,
       "/node_modules/meteor/helper-package/dynamic/b.coffee.js": true
     });
@@ -151,7 +161,7 @@ describe("dynamic import(...)", function () {
 
   it("works with module.prefetch(id)", async function () {
     import { shared } from "./imports/prefetch-child";
-    assert.deepEqual(shared, {});
+    assertDeepEqual(shared, {});
 
     const rejection = module.prefetch("./imports/nonexistent.js");
     let threw = false;
@@ -170,11 +180,11 @@ describe("dynamic import(...)", function () {
     );
 
     return module.prefetch("./imports/prefetch").then(() => {
-      assert.deepEqual(shared, {});
+      assertDeepEqual(shared, {});
     }).then(() => {
       import { name } from "./imports/prefetch.js";
       assert.strictEqual(name, "/imports/prefetch.js");
-      assert.deepEqual(shared, { [name]: true });
+      assertDeepEqual(shared, { [name]: true });
     });
   });
 });

From a4fa3878866d3e45faa21454b88a1e42d9c14a03 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 18:22:28 -0400
Subject: [PATCH 169/195] Bump $BUNDLE_VERSION to 4.8.12 before rebuilding dev
 bundle.

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

diff --git a/meteor b/meteor
index 7b371a760f..071bc0f093 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.8.11
+BUNDLE_VERSION=4.8.12
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From b94443391abf397b85ad2d12610b65aaba26b4e5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 20:12:10 -0400
Subject: [PATCH 170/195] Upgrade reify to version 0.11.14 to polyfill WeakMap.

---
 History.md                                               | 2 +-
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 4 ++--
 packages/modules/.npm/package/npm-shrinkwrap.json        | 6 +++---
 packages/modules/package.js                              | 2 +-
 scripts/dev-bundle-tool-package.js                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 71d944a390..2a624e3dda 100644
--- a/History.md
+++ b/History.md
@@ -31,7 +31,7 @@
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.13, fixing
+* The `reify` npm package has been upgraded to version 0.11.14, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index a17cce963c..c273d02f97 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -692,8 +692,8 @@
       }
     },
     "reify": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.13.tgz",
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.14.tgz",
       "from": "reify@>=0.11.0 <0.12.0"
     },
     "repeating": {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index e204a166e8..39dd292357 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.13.tgz",
-      "from": "reify@0.11.13"
+      "version": "0.11.14",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.14.tgz",
+      "from": "reify@0.11.14"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index e3f99e7eab..ced9b656e3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.13"
+  reify: "0.11.14"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 8da635a6e2..b14e7cda7b 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.21.3",
-    reify: "0.11.13",
+    reify: "0.11.14",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From b1f6904a4e76def41f56aec7a8f5bca65c7c3b78 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Fri, 26 May 2017 20:14:56 -0400
Subject: [PATCH 171/195] Bump package versions for 1.5-rc.7 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index cc89381d50..afce1fcfb7 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.19.1-rc.6'
+  version: '6.19.1-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index e97f358c9c..544d43acc4 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.1.0-rc.6'
+  version: '1.1.0-rc.7'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index d9afdb31e3..31c64a09ac 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.6",
+  version: "0.1.0-rc.7",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index d64886e476..02b2fa2627 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.6",
+  version: "0.4.1-rc.7",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index da2ef9b8ca..594f91e803 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.6",
+  version: "0.4.1-rc.7",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 15161b4293..f019814491 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.6",
+  version: "0.4.1-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 2e71756c8c..62a7866c21 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.6',
+  version: '0.8.0-rc.7',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 4d4968b89b..e90de5ae9f 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.1-rc.6"
+  version: "1.3.1-rc.7"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 330d0bbb97..7c50c40175 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.1.0-rc.6"
+  version: "1.1.0-rc.7"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 6883296d40..1c7a5c5d48 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.6',
+  version: '1.1.0-rc.7',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 383f218a8c..69b45c2c81 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.5.0-rc.6'
+  version: '1.5.0-rc.7'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 70be8de1ec..cb326c6270 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.2.0-rc.6'
+  version: '1.2.0-rc.7'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index b4c2f14748..45d88a363c 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.6",
+  version: "0.8.0-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 ced9b656e3..cebe4873a1 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.6",
+  version: "0.9.0-rc.7",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 662146d9ff..4ee80070d7 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.18-rc.6'
+  version: '1.1.18-rc.7'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index d1803c5235..f930b6ba74 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.6'
+  version: '1.1.9-rc.7'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index bc4f8c5833..c2166f4b05 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: '2.1.0-rc.6',
+  version: '2.1.0-rc.7',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 3091bb7ea4..f8f7674df4 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.16-rc.6'
+  version: '1.3.16-rc.7'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 0fb8475aef..650f6b2943 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.6",
+ "version": "1.5-rc.7",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 6c29e19a9409b594e9f203d68a7ff2c9a8832efc Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 12:00:56 -0400
Subject: [PATCH 172/195] Upgrade reify to latest version, 0.11.15.

---
 History.md                                               | 2 +-
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 4 ++--
 packages/modules/.npm/package/npm-shrinkwrap.json        | 6 +++---
 packages/modules/package.js                              | 2 +-
 scripts/dev-bundle-tool-package.js                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 2a624e3dda..27317d04b8 100644
--- a/History.md
+++ b/History.md
@@ -31,7 +31,7 @@
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.14, fixing
+* The `reify` npm package has been upgraded to version 0.11.15, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index c273d02f97..b9c74cb870 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -692,8 +692,8 @@
       }
     },
     "reify": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.14.tgz",
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.15.tgz",
       "from": "reify@>=0.11.0 <0.12.0"
     },
     "repeating": {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 39dd292357..17606c61d6 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.14.tgz",
-      "from": "reify@0.11.14"
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.15.tgz",
+      "from": "reify@0.11.15"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index cebe4873a1..8725fe89ee 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.14"
+  reify: "0.11.15"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index b14e7cda7b..1c5359633e 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.21.3",
-    reify: "0.11.14",
+    reify: "0.11.15",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 9a166ef21212a0b0329a5e5530bea2d4353f8167 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 12:01:34 -0400
Subject: [PATCH 173/195] Bump $BUNDLE_VERSION to 4.8.13 before rebuilding dev
 bundle.

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

diff --git a/meteor b/meteor
index 071bc0f093..37ce94b35a 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=4.8.12
+BUNDLE_VERSION=4.8.13
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 122f0d2cb3ec3d3ceeedff6c9cb728362edc4b0c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 12:28:54 -0400
Subject: [PATCH 174/195] Bump package versions for 1.5-rc.8 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index afce1fcfb7..65cae29339 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.19.1-rc.7'
+  version: '6.19.1-rc.8'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 544d43acc4..c1b0864437 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.1.0-rc.7'
+  version: '1.1.0-rc.8'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 31c64a09ac..fee6003a75 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.7",
+  version: "0.1.0-rc.8",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 02b2fa2627..295eae9894 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.7",
+  version: "0.4.1-rc.8",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 594f91e803..4ace16194b 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.7",
+  version: "0.4.1-rc.8",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index f019814491..e2c07d96d8 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.7",
+  version: "0.4.1-rc.8",
   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 62a7866c21..93336d9983 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.7',
+  version: '0.8.0-rc.8',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index e90de5ae9f..34b2fcfcc7 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.1-rc.7"
+  version: "1.3.1-rc.8"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 7c50c40175..92f4335015 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.1.0-rc.7"
+  version: "1.1.0-rc.8"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 1c7a5c5d48..36325b11fb 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.7',
+  version: '1.1.0-rc.8',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 69b45c2c81..93064beee5 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.5.0-rc.7'
+  version: '1.5.0-rc.8'
 });
 
 Package.includeTool();
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index cb326c6270..f19ac27ae7 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.2.0-rc.7'
+  version: '1.2.0-rc.8'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 45d88a363c..3611bb8040 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.7",
+  version: "0.8.0-rc.8",
   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 8725fe89ee..1a5d7aff51 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.7",
+  version: "0.9.0-rc.8",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 4ee80070d7..ed45eeb6d5 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.18-rc.7'
+  version: '1.1.18-rc.8'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index f930b6ba74..21cde3f515 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.7'
+  version: '1.1.9-rc.8'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index c2166f4b05..7ea8c43552 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: '2.1.0-rc.7',
+  version: '2.1.0-rc.8',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index f8f7674df4..fe354eb43e 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.16-rc.7'
+  version: '1.3.16-rc.8'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 650f6b2943..ca3f41836e 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.7",
+ "version": "1.5-rc.8",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 8ff00a26e827dcd11f4b2155ca01f9c9c8d01d1e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 13:36:20 -0400
Subject: [PATCH 175/195] Upgrade uglify-js to version 3.0.12.

Fixes #8704.
---
 History.md                                    |  3 +
 .../.npm/package/npm-shrinkwrap.json          | 85 +++----------------
 packages/minifier-js/minifier.js              | 12 ++-
 packages/minifier-js/package.js               |  4 +-
 4 files changed, 24 insertions(+), 80 deletions(-)

diff --git a/History.md b/History.md
index 27317d04b8..e57b31586a 100644
--- a/History.md
+++ b/History.md
@@ -43,6 +43,9 @@
 
 * The `install` npm package has been upgraded to version 0.10.1.
 
+* The `uglify-js` npm package has been upgraded to version 3.0.12, fixing
+  [#8704](https://github.com/meteor/meteor/issues/8704).
+
 * If you're using the `standard-minifier-js` Meteor package, as most
   Meteor developers do, it will now produce a detailed analysis of package
   and module sizes within your production `.js` bundle whenever you run
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index d8ce156456..dede59a0fe 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -1,59 +1,14 @@
 {
   "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"
+    "commander": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+      "from": "commander@>=2.9.0 <2.10.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.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "from": "is-buffer@>=1.0.2 <2.0.0"
-    },
-    "kind-of": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.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": {
+    "graceful-readlink": {
       "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.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": {
-      "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"
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "from": "graceful-readlink@>=1.0.0"
     },
     "source-map": {
       "version": "0.5.6",
@@ -61,29 +16,9 @@
       "from": "source-map@>=0.5.1 <0.6.0"
     },
     "uglify-js": {
-      "version": "2.8.21",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.21.tgz",
-      "from": "uglify-js@2.8.21"
-    },
-    "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"
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.12.tgz",
+      "from": "uglify-js@3.0.12"
     }
   }
 }
diff --git a/packages/minifier-js/minifier.js b/packages/minifier-js/minifier.js
index 56f0ef7414..806c88e3ab 100644
--- a/packages/minifier-js/minifier.js
+++ b/packages/minifier-js/minifier.js
@@ -5,14 +5,20 @@ meteorJsMinify = function (source) {
   uglify = uglify || Npm.require("uglify-js");
 
   try {
-    result.code = uglify.minify(source, {
-      fromString: true,
+    var uglifyResult = uglify.minify(source, {
       compress: {
         drop_debugger: false,
         unused: false,
         dead_code: false
       }
-    }).code;
+    });
+
+    if (typeof uglifyResult.code === "string") {
+      result.code = uglifyResult.code;
+    } else {
+      throw uglifyResult.error ||
+        new Error("unknown uglify.minify failure");
+    }
 
   } catch (e) {
     // Although Babel.minify can handle a wider variety of ECMAScript
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 9223acefba..3ad26dd124 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,10 +1,10 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.0.0"
+  version: "2.1.0"
 });
 
 Npm.depends({
-  "uglify-js": "2.8.21"
+  "uglify-js": "3.0.12"
 });
 
 Package.onUse(function (api) {

From ee6235147c9f6025de843c3009d7be60c37f715b Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 16:58:55 -0400
Subject: [PATCH 176/195] Bump package versions for 1.5-rc.9 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 65cae29339..d9c3f5f0cb 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.19.1-rc.8'
+  version: '6.19.1-rc.9'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index c1b0864437..72a3af8bc7 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.1.0-rc.8'
+  version: '1.1.0-rc.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index fee6003a75..c5d2bbbdb2 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.8",
+  version: "0.1.0-rc.9",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 295eae9894..86076b3982 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.8",
+  version: "0.4.1-rc.9",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 4ace16194b..26cf9ffc4f 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.8",
+  version: "0.4.1-rc.9",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index e2c07d96d8..af5e59c910 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.8",
+  version: "0.4.1-rc.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 93336d9983..788cbd5aab 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.8',
+  version: '0.8.0-rc.9',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 34b2fcfcc7..0586d813c5 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.1-rc.8"
+  version: "1.3.1-rc.9"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 92f4335015..30ad5cf400 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.1.0-rc.8"
+  version: "1.1.0-rc.9"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 36325b11fb..1182292993 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.8',
+  version: '1.1.0-rc.9',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 93064beee5..59701b4236 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.5.0-rc.8'
+  version: '1.5.0-rc.9'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 3ad26dd124..f962fd3a19 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0"
+  version: "2.1.0-rc.9"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index f19ac27ae7..e1f69ee22c 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.2.0-rc.8'
+  version: '1.2.0-rc.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 3611bb8040..bf2612ce31 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.8",
+  version: "0.8.0-rc.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 1a5d7aff51..5e72634408 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.8",
+  version: "0.9.0-rc.9",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index ed45eeb6d5..d414e67997 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.18-rc.8'
+  version: '1.1.18-rc.9'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 21cde3f515..0c96d55107 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.8'
+  version: '1.1.9-rc.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 7ea8c43552..e57e62fc71 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: '2.1.0-rc.8',
+  version: '2.1.0-rc.9',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index fe354eb43e..0c213b7342 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.16-rc.8'
+  version: '1.3.16-rc.9'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index ca3f41836e..9fd72a8d04 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.8",
+ "version": "1.5-rc.9",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From e866da2210b561e88b438b5cefe006aa042e2e52 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sat, 27 May 2017 17:06:40 -0400
Subject: [PATCH 177/195] Add a target release date for Meteor 1.5 to
 History.md.

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

diff --git a/History.md b/History.md
index e57b31586a..6a4fd6dc78 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,6 @@
 ## v.NEXT
 
-## v1.5, TBD
+## v1.5, 2017-05-30
 
 * The `meteor-base` package implies a new `dynamic-import` package, which
   provides runtime support for [the proposed ECMAScript dynamic

From bfea780495eeb2efe9ee57e94e81b6f7c1c221f7 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 28 May 2017 20:25:32 -0400
Subject: [PATCH 178/195] Upgrade meteor-babel and reify to latest versions.

---
 History.md                                           |  4 ++--
 .../babel-compiler/.npm/package/npm-shrinkwrap.json  | 12 ++++++------
 packages/babel-compiler/package.js                   |  2 +-
 packages/modules/.npm/package/npm-shrinkwrap.json    |  6 +++---
 packages/modules/package.js                          |  2 +-
 scripts/dev-bundle-tool-package.js                   |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/History.md b/History.md
index 6a4fd6dc78..38ac4d579d 100644
--- a/History.md
+++ b/History.md
@@ -27,11 +27,11 @@
 
 * The `npm` npm package has been upgraded to version 4.6.1.
 
-* The `meteor-babel` npm package has been upgraded to version 0.21.3,
+* The `meteor-babel` npm package has been upgraded to version 0.21.4,
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.15, fixing
+* The `reify` npm package has been upgraded to version 0.11.18, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index b9c74cb870..0a60643357 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -590,9 +590,9 @@
       "from": "loose-envify@>=1.0.0 <2.0.0"
     },
     "meteor-babel": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.3.tgz",
-      "from": "meteor-babel@0.21.3"
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.21.4.tgz",
+      "from": "meteor-babel@0.21.4"
     },
     "meteor-babel-helpers": {
       "version": "0.0.3",
@@ -692,9 +692,9 @@
       }
     },
     "reify": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.15.tgz",
-      "from": "reify@>=0.11.0 <0.12.0"
+      "version": "0.11.18",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.18.tgz",
+      "from": "reify@>=0.11.18 <0.12.0"
     },
     "repeating": {
       "version": "2.0.1",
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index d9c3f5f0cb..ebece222ac 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -10,7 +10,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-babel': '0.21.3'
+  'meteor-babel': '0.21.4'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 17606c61d6..e35bf529fe 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.15.tgz",
-      "from": "reify@0.11.15"
+      "version": "0.11.18",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.18.tgz",
+      "from": "reify@0.11.18"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 5e72634408..ce74e744ff 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.15"
+  reify: "0.11.18"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 1c5359633e..75d5336b81 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -14,8 +14,8 @@ var packageJson = {
     npm: "4.6.1",
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
-    "meteor-babel": "0.21.3",
-    reify: "0.11.15",
+    "meteor-babel": "0.21.4",
+    reify: "0.11.18",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From cea372909b1c3a9994b3886aa17931065b91bd3a Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 28 May 2017 20:26:00 -0400
Subject: [PATCH 179/195] Bump $BUNDLE_VERSION to 4.8.14 before rebuilding dev
 bundle.

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

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

From d11cf771cdbfc19d2f50664933fa97c32e15bc78 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 28 May 2017 20:46:42 -0400
Subject: [PATCH 180/195] Bump package versions for 1.5-rc.10 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index ebece222ac..f81697640d 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.19.1-rc.9'
+  version: '6.19.1-rc.10'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 72a3af8bc7..d0b679968a 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.1.0-rc.9'
+  version: '1.1.0-rc.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index c5d2bbbdb2..7c52fe8c9c 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.9",
+  version: "0.1.0-rc.10",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 86076b3982..2a1de8918c 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.9",
+  version: "0.4.1-rc.10",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 26cf9ffc4f..a7a7645900 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.9",
+  version: "0.4.1-rc.10",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index af5e59c910..8c3486f9e2 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.9",
+  version: "0.4.1-rc.10",
   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 788cbd5aab..40954843f9 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.9',
+  version: '0.8.0-rc.10',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 0586d813c5..2472a573a1 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.1-rc.9"
+  version: "1.3.1-rc.10"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 30ad5cf400..ae93b7b324 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.1.0-rc.9"
+  version: "1.1.0-rc.10"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 1182292993..408225a952 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.9',
+  version: '1.1.0-rc.10',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 59701b4236..2feeb4a7c4 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.5.0-rc.9'
+  version: '1.5.0-rc.10'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index f962fd3a19..8f5af9612a 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0-rc.9"
+  version: "2.1.0-rc.10"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index e1f69ee22c..df6e3e7137 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.2.0-rc.9'
+  version: '1.2.0-rc.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index bf2612ce31..14fb90c614 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.9",
+  version: "0.8.0-rc.10",
   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 ce74e744ff..76fc8dd814 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.9",
+  version: "0.9.0-rc.10",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index d414e67997..4edcfc9747 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.18-rc.9'
+  version: '1.1.18-rc.10'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 0c96d55107..ef2882834e 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.9'
+  version: '1.1.9-rc.10'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index e57e62fc71..f528746550 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: '2.1.0-rc.9',
+  version: '2.1.0-rc.10',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 0c213b7342..40c1a1756a 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.16-rc.9'
+  version: '1.3.16-rc.10'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 9fd72a8d04..bc71312b6b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.9",
+ "version": "1.5-rc.10",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From cd4fc028f8b4bf415e6520b764b137009876ab73 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 11:44:11 -0400
Subject: [PATCH 181/195] Upgrade reify to version 0.11.20 to fix getNamespace
 bug.

Reported here:
https://github.com/meteor/meteor/pull/8327#issuecomment-304582864

Fixed by:
https://github.com/benjamn/reify/commit/aeb46dcd6120d78500d4ca9bd6d3550234011230
---
 History.md                                                 | 2 +-
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json   | 4 ++--
 packages/modules/.npm/package/npm-shrinkwrap.json          | 6 +++---
 packages/modules/package.js                                | 2 +-
 scripts/dev-bundle-tool-package.js                         | 2 +-
 .../apps/dynamic-import/imports/module-exports-esModule.js | 1 +
 tools/tests/apps/dynamic-import/tests.js                   | 7 +++++++
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 tools/tests/apps/dynamic-import/imports/module-exports-esModule.js

diff --git a/History.md b/History.md
index 38ac4d579d..72e5e5fadb 100644
--- a/History.md
+++ b/History.md
@@ -31,7 +31,7 @@
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.18, fixing
+* The `reify` npm package has been upgraded to version 0.11.20, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index 0a60643357..bb7d452075 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -692,8 +692,8 @@
       }
     },
     "reify": {
-      "version": "0.11.18",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.18.tgz",
+      "version": "0.11.20",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.20.tgz",
       "from": "reify@>=0.11.18 <0.12.0"
     },
     "repeating": {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index e35bf529fe..2d5b434eec 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.18",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.18.tgz",
-      "from": "reify@0.11.18"
+      "version": "0.11.20",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.20.tgz",
+      "from": "reify@0.11.20"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index 76fc8dd814..c4949a974a 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.18"
+  reify: "0.11.20"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 75d5336b81..6d97f8bde6 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.21.4",
-    reify: "0.11.18",
+    reify: "0.11.20",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",
diff --git a/tools/tests/apps/dynamic-import/imports/module-exports-esModule.js b/tools/tests/apps/dynamic-import/imports/module-exports-esModule.js
new file mode 100644
index 0000000000..aca7482a0d
--- /dev/null
+++ b/tools/tests/apps/dynamic-import/imports/module-exports-esModule.js
@@ -0,0 +1 @@
+module.exports = { __esModule: true };
diff --git a/tools/tests/apps/dynamic-import/tests.js b/tools/tests/apps/dynamic-import/tests.js
index cd30fedc90..622afa4296 100644
--- a/tools/tests/apps/dynamic-import/tests.js
+++ b/tools/tests/apps/dynamic-import/tests.js
@@ -187,6 +187,13 @@ describe("dynamic import(...)", function () {
       assertDeepEqual(shared, { [name]: true });
     });
   });
+
+  it("can import module.exports = {...}-style modules", () => {
+    return import("./imports/module-exports-esModule").then(m => {
+      assert.strictEqual(typeof m, "object");
+      assert.deepEqual(m, {});
+    });
+  });
 });
 
 function maybeClearDynamicImportCache() {

From 67f88db386e1edfd8185ca26ead00abf56d0ba28 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 12:04:46 -0400
Subject: [PATCH 182/195] Bump $BUNDLE_VERSION to 4.8.15 before rebuilding dev
 bundle.

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

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

From 5dd7b4cfc0fcdeba0d1117cf6a0621d39f2bd6b3 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 12:17:41 -0400
Subject: [PATCH 183/195] Upgrade uglify-js to latest version.

---
 History.md                                            | 2 +-
 packages/minifier-js/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/minifier-js/package.js                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index 72e5e5fadb..53f5bf7ae4 100644
--- a/History.md
+++ b/History.md
@@ -43,7 +43,7 @@
 
 * The `install` npm package has been upgraded to version 0.10.1.
 
-* The `uglify-js` npm package has been upgraded to version 3.0.12, fixing
+* The `uglify-js` npm package has been upgraded to version 3.0.13, fixing
   [#8704](https://github.com/meteor/meteor/issues/8704).
 
 * If you're using the `standard-minifier-js` Meteor package, as most
diff --git a/packages/minifier-js/.npm/package/npm-shrinkwrap.json b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
index dede59a0fe..77e6b7279a 100644
--- a/packages/minifier-js/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifier-js/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "source-map@>=0.5.1 <0.6.0"
     },
     "uglify-js": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.12.tgz",
-      "from": "uglify-js@3.0.12"
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.13.tgz",
+      "from": "uglify-js@3.0.13"
     }
   }
 }
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 8f5af9612a..5daeaf10b8 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "uglify-js": "3.0.12"
+  "uglify-js": "3.0.13"
 });
 
 Package.onUse(function (api) {

From aff0fbcc123c375e6c075894ee5f1d0c225e7fb4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 12:27:45 -0400
Subject: [PATCH 184/195] Bump package versions for 1.5-rc.11 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index f81697640d..b73e5f3cfb 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.19.1-rc.10'
+  version: '6.19.1-rc.11'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index d0b679968a..220f494fe8 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.1.0-rc.10'
+  version: '1.1.0-rc.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 7c52fe8c9c..0278e3edb3 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.10",
+  version: "0.1.0-rc.11",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 2a1de8918c..69b6d73f02 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.10",
+  version: "0.4.1-rc.11",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index a7a7645900..9964c5a15a 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.10",
+  version: "0.4.1-rc.11",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 8c3486f9e2..00b6bba512 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.10",
+  version: "0.4.1-rc.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 40954843f9..830786f66e 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.10',
+  version: '0.8.0-rc.11',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 2472a573a1..af7b622941 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.1-rc.10"
+  version: "1.3.1-rc.11"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index ae93b7b324..578d68e45b 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.1.0-rc.10"
+  version: "1.1.0-rc.11"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 408225a952..d037dee332 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.10',
+  version: '1.1.0-rc.11',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 2feeb4a7c4..c9f16340b3 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.5.0-rc.10'
+  version: '1.5.0-rc.11'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 5daeaf10b8..231edffd63 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0-rc.10"
+  version: "2.1.0-rc.11"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index df6e3e7137..a04ea2520b 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.2.0-rc.10'
+  version: '1.2.0-rc.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 14fb90c614..ebfbf9721f 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.10",
+  version: "0.8.0-rc.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 c4949a974a..e76f520134 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.10",
+  version: "0.9.0-rc.11",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 4edcfc9747..d9e9e2f057 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.18-rc.10'
+  version: '1.1.18-rc.11'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index ef2882834e..7bc6df5b6c 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.10'
+  version: '1.1.9-rc.11'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index f528746550..bd7ef6ce2d 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: '2.1.0-rc.10',
+  version: '2.1.0-rc.11',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 40c1a1756a..fb27763a30 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.16-rc.10'
+  version: '1.3.16-rc.11'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index bc71312b6b..2ef1d74401 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.10",
+ "version": "1.5-rc.11",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 6445a440018444a5490084147f88b64667ed8166 Mon Sep 17 00:00:00 2001
From: James <jamesmillerburgess@gmail.com>
Date: Mon, 29 May 2017 13:22:35 +0200
Subject: [PATCH 185/195] Clarify meteor update message for indirect
 dependencies

* Adjust string style to be in line with meteor style guide 6.2

* Partially addresses #8721 #8488
---
 tools/cli/commands-packages.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index b41794fc71..f0fe6f5d50 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1788,8 +1788,10 @@ main.registerCommand({
                    " are available:");
       _.each(nonlatestIndirectDeps, printItem);
       Console.info([
-        "To update one or more of these packages, pass their names to ",
-        "`meteor update`, or just run `meteor update --all-packages`."
+        "These versions may not be compatible with your project.",
+        "To update one or more of these packages to their latest",
+        "compatible versions, pass their names to `meteor update`,",
+        "or just run `meteor update --all-packages`.",
       ].join("\n"));
     }
   }

From 81a07ed84f6907fb57bc4031532aa9e1a4abaff4 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 19:07:19 -0400
Subject: [PATCH 186/195] Upgrade reify to prevent accidental override of
 namespace.default.

The `winston` npm package is not an ECMAScript module, but it does export
a "default" property, and this property was accidentally clobbering the
"default" property of the namespace object, thus interfering with default
import syntax:

  import winston from "winston"

Specifically, the `winston` variable would end up referring to
`require("winston").default`, rather than `require("winston")`.

Nothing is lost by fixing this problem, as you can still refer to
`winston.default` if you need to access that property.

Reported by @fermuch here:
https://github.com/meteor/meteor/pull/8327#issuecomment-304721401

Fixed by this commit:
https://github.com/benjamn/reify/commit/20fdd10d0491d6f88e28c9128cc7284e8e09ad01
---
 History.md                                               | 2 +-
 packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 4 ++--
 packages/modules/.npm/package/npm-shrinkwrap.json        | 6 +++---
 packages/modules/package.js                              | 2 +-
 scripts/dev-bundle-tool-package.js                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 53f5bf7ae4..4cd4a91255 100644
--- a/History.md
+++ b/History.md
@@ -31,7 +31,7 @@
   enabling the latest Reify compiler and the transform-class-properties
   plugin, among other improvements.
 
-* The `reify` npm package has been upgraded to version 0.11.20, fixing
+* The `reify` npm package has been upgraded to version 0.11.21, fixing
   [issue #8595](https://github.com/meteor/meteor/issues/8595) and
   improving compilation and runtime performance.
 
diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
index bb7d452075..58b7e288b5 100644
--- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
+++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json
@@ -692,8 +692,8 @@
       }
     },
     "reify": {
-      "version": "0.11.20",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.20.tgz",
+      "version": "0.11.21",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.21.tgz",
       "from": "reify@>=0.11.18 <0.12.0"
     },
     "repeating": {
diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json
index 2d5b434eec..1fc3a13734 100644
--- a/packages/modules/.npm/package/npm-shrinkwrap.json
+++ b/packages/modules/.npm/package/npm-shrinkwrap.json
@@ -16,9 +16,9 @@
       "from": "minizlib@>=1.0.3 <2.0.0"
     },
     "reify": {
-      "version": "0.11.20",
-      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.20.tgz",
-      "from": "reify@0.11.20"
+      "version": "0.11.21",
+      "resolved": "https://registry.npmjs.org/reify/-/reify-0.11.21.tgz",
+      "from": "reify@0.11.21"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/packages/modules/package.js b/packages/modules/package.js
index e76f520134..01d34e7a87 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  reify: "0.11.20"
+  reify: "0.11.21"
 });
 
 Package.onUse(function(api) {
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index 6d97f8bde6..6aa4ec9a66 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -15,7 +15,7 @@ var packageJson = {
     "node-gyp": "3.6.0",
     "node-pre-gyp": "0.6.34",
     "meteor-babel": "0.21.4",
-    reify: "0.11.20",
+    reify: "0.11.21",
     "meteor-promise": "0.8.0",
     fibers: "1.0.15",
     promise: "7.1.1",

From 91212e3a95d366c3182013202f7934a8c09a142e Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 19:16:16 -0400
Subject: [PATCH 187/195] Bump $BUNDLE_VERSION to 4.8.16 before rebuilding dev
 bundle.

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

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

From 4351b89904b2e6314257a81b6200bb48e1713160 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 19:17:43 -0400
Subject: [PATCH 188/195] Bump package versions for 1.5-rc.12 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index b73e5f3cfb..3cc1b6e4ab 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.19.1-rc.11'
+  version: '6.19.1-rc.12'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index 220f494fe8..b9b6fda508 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.1.0-rc.11'
+  version: '1.1.0-rc.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 0278e3edb3..42fcaaee25 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.11",
+  version: "0.1.0-rc.12",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 69b6d73f02..3036b0c4a4 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.11",
+  version: "0.4.1-rc.12",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 9964c5a15a..6ee14fd02e 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.11",
+  version: "0.4.1-rc.12",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index 00b6bba512..d2ade7bb6d 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.11",
+  version: "0.4.1-rc.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 830786f66e..ec352e67b0 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.11',
+  version: '0.8.0-rc.12',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index af7b622941..4cdb8c26d5 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.1-rc.11"
+  version: "1.3.1-rc.12"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 578d68e45b..302d40d4f1 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.1.0-rc.11"
+  version: "1.1.0-rc.12"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index d037dee332..bc5d761d23 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.11',
+  version: '1.1.0-rc.12',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index c9f16340b3..02db3c3852 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.5.0-rc.11'
+  version: '1.5.0-rc.12'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 231edffd63..334949ff90 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0-rc.11"
+  version: "2.1.0-rc.12"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index a04ea2520b..fcd647bcab 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.2.0-rc.11'
+  version: '1.2.0-rc.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index ebfbf9721f..48ace64e5e 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.11",
+  version: "0.8.0-rc.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 01d34e7a87..fd20836fce 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.11",
+  version: "0.9.0-rc.12",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index d9e9e2f057..da288782c9 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.18-rc.11'
+  version: '1.1.18-rc.12'
 });
 
 Npm.depends({
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 7bc6df5b6c..43cce8f4e9 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.11'
+  version: '1.1.9-rc.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index bd7ef6ce2d..d25245e3f2 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: '2.1.0-rc.11',
+  version: '2.1.0-rc.12',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index fb27763a30..ef90dcb94b 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.16-rc.11'
+  version: '1.3.16-rc.12'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 2ef1d74401..017cda564b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.11",
+ "version": "1.5-rc.12",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From 1df6668cc903d5800ba876e59d72a5be6ed0bea1 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 19:29:55 -0400
Subject: [PATCH 189/195] Test that importing the `winston` npm package works
 now.

This is a test that should have accompanied my previous commit
81a07ed84f6907fb57bc4031532aa9e1a4abaff4.
---
 tools/tests/apps/modules/package.json   | 2 +-
 tools/tests/apps/modules/server/only.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 3bac7fc661..fd63fa15cb 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -13,7 +13,7 @@
     "mssql": "^3.1.1",
     "regenerator-runtime": "^0.9.5",
     "stripe": "^4.4.0",
-    "winston": "^2.2.0"
+    "winston": "^2.3.1"
   },
   "scripts": {
     "test": "METEOR_PROFILE=100 ../../../../meteor test --full-app --driver-package dispatch:mocha-phantomjs",
diff --git a/tools/tests/apps/modules/server/only.js b/tools/tests/apps/modules/server/only.js
index f56c293a19..e6cdfdd004 100644
--- a/tools/tests/apps/modules/server/only.js
+++ b/tools/tests/apps/modules/server/only.js
@@ -3,9 +3,14 @@ import assert from "assert";
 import "github";
 import "aws-sdk";
 import "stripe";
-import "winston";
 import "mssql";
 
+import winston from "winston";
+import * as winstonNamespace from "winston";
+assert.strictEqual(typeof winston.default, "object");
+assert.strictEqual(typeof winston.transports.Console, "function");
+assert.strictEqual(winstonNamespace.default, winston);
+
 // This package has a native .node module as the "main" property of its
 // package.json file. (#7947)
 import { start } from "idle-gc";

From bfc79eea9b02a830baa8c0e57ca1c72995e13ee5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 29 May 2017 21:27:22 -0400
Subject: [PATCH 190/195] Add //# sourceURL=<module id> comment to dynamic
 modules.

Fixes #8719 by displaying a recognizable (and even clickable) file name in
stack traces for errors thrown by dynamic code.
---
 packages/dynamic-import/client.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/dynamic-import/client.js b/packages/dynamic-import/client.js
index ce060b51dd..e3c261b700 100644
--- a/packages/dynamic-import/client.js
+++ b/packages/dynamic-import/client.js
@@ -34,7 +34,7 @@ meteorInstall.fetch = function (ids) {
       var source = sources[id];
       if (source) {
         var info = ids[id];
-        addToTree(tree, id, makeModuleFunction(source, info.options));
+        addToTree(tree, id, makeModuleFunction(id, source, info.options));
       } else {
         addToTree(missing = missing || Object.create(null), id, 1);
       }
@@ -48,7 +48,7 @@ meteorInstall.fetch = function (ids) {
         var source = flatResults[id];
         var info = ids[id];
 
-        addToTree(tree, id, makeModuleFunction(source, info.options));
+        addToTree(tree, id, makeModuleFunction(id, source, info.options));
 
         var version = getFromTree(dynamicVersions, id);
         if (version) {
@@ -88,7 +88,7 @@ function flattenModuleTree(tree) {
   return result;
 }
 
-function makeModuleFunction(source, options) {
+function makeModuleFunction(id, source, options) {
   // By calling (options && options.eval || eval) in a wrapper function,
   // we delay the cost of parsing and evaluating the module code until the
   // module is first imported.
@@ -100,7 +100,7 @@ function makeModuleFunction(source, options) {
     return (options && options.eval || eval)(
       // Wrap the function(require,exports,module){...} expression in
       // parentheses to force it to be parsed as an expression.
-      "(" + source + ")"
+      "(" + source + ")\n//# sourceURL=" + id
     ).apply(this, arguments);
   };
 }

From bfb2c9546292b42b76bd2863658e9c1b347eb39c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 30 May 2017 13:03:11 -0400
Subject: [PATCH 191/195] Upgrade meteor-promise to version 0.8.4.

This is a change that was necessary on the wip-upgrade-to-node-6 branch,
and it seems better to ship it sooner rather than waiting:
meteor/meteor@d823812e85dec75916fee91c6c64045d7ce6858e
---
 History.md                                        | 2 ++
 packages/promise/.npm/package/npm-shrinkwrap.json | 6 +++---
 packages/promise/package.js                       | 6 +++---
 scripts/dev-bundle-server-package.js              | 2 +-
 scripts/dev-bundle-tool-package.js                | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/History.md b/History.md
index 4cd4a91255..2c36135b43 100644
--- a/History.md
+++ b/History.md
@@ -43,6 +43,8 @@
 
 * The `install` npm package has been upgraded to version 0.10.1.
 
+* The `meteor-promise` npm package has been upgraded to version 0.8.4.
+
 * The `uglify-js` npm package has been upgraded to version 3.0.13, fixing
   [#8704](https://github.com/meteor/meteor/issues/8704).
 
diff --git a/packages/promise/.npm/package/npm-shrinkwrap.json b/packages/promise/.npm/package/npm-shrinkwrap.json
index 469b5f6bbe..7aa333514c 100644
--- a/packages/promise/.npm/package/npm-shrinkwrap.json
+++ b/packages/promise/.npm/package/npm-shrinkwrap.json
@@ -6,9 +6,9 @@
       "from": "asap@>=2.0.3 <2.1.0"
     },
     "meteor-promise": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.0.tgz",
-      "from": "meteor-promise@0.8.0"
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/meteor-promise/-/meteor-promise-0.8.4.tgz",
+      "from": "meteor-promise@0.8.4"
     },
     "promise": {
       "version": "7.1.1",
diff --git a/packages/promise/package.js b/packages/promise/package.js
index b4049ed53a..fb2d6f8782 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,18 +1,18 @@
 Package.describe({
   name: "promise",
-  version: "0.8.8",
+  version: "0.8.9",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
 });
 
 Npm.depends({
-  "meteor-promise": "0.8.0",
+  "meteor-promise": "0.8.4",
   "promise": "7.1.1"
 });
 
 Package.onUse(function(api) {
-  api.use("modules@0.7.6");
+  api.use("modules");
   api.mainModule("client.js", "client");
   api.mainModule("server.js", "server");
   api.export("Promise");
diff --git a/scripts/dev-bundle-server-package.js b/scripts/dev-bundle-server-package.js
index 123ca8df95..27a2a7d9db 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.8.0",
+    "meteor-promise": "0.8.4",
     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 6aa4ec9a66..993714b5b2 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.34",
     "meteor-babel": "0.21.4",
     reify: "0.11.21",
-    "meteor-promise": "0.8.0",
+    "meteor-promise": "0.8.4",
     fibers: "1.0.15",
     promise: "7.1.1",
     // So that Babel 6 can emit require("babel-runtime/helpers/...") calls.

From 66a14fe00d9d3fc76c7c8461a4e527c824d073c6 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 30 May 2017 13:06:22 -0400
Subject: [PATCH 192/195] Bump $BUNDLE_VERSION to 4.8.17 before rebuilding dev
 bundle.

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

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

From f1e628802e05402b53a48dd91027f2bac6a87ee5 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 30 May 2017 13:23:38 -0400
Subject: [PATCH 193/195] Bump package versions for 1.5-rc.13 release.

---
 packages/babel-compiler/package.js             | 2 +-
 packages/boilerplate-generator/package.js      | 2 +-
 packages/dynamic-import/package.js             | 2 +-
 packages/ecmascript-runtime-client/package.js  | 2 +-
 packages/ecmascript-runtime-server/package.js  | 2 +-
 packages/ecmascript-runtime/package.js         | 2 +-
 packages/ecmascript/package.js                 | 2 +-
 packages/facebook-oauth/package.js             | 2 +-
 packages/localstorage/package.js               | 2 +-
 packages/meteor-base/package.js                | 2 +-
 packages/meteor-tool/package.js                | 2 +-
 packages/minifier-js/package.js                | 2 +-
 packages/minimongo/package.js                  | 2 +-
 packages/modules-runtime/package.js            | 2 +-
 packages/modules/package.js                    | 2 +-
 packages/mongo/package.js                      | 2 +-
 packages/promise/package.js                    | 2 +-
 packages/reactive-dict/package.js              | 2 +-
 packages/standard-minifier-js/package.js       | 2 +-
 packages/webapp/package.js                     | 2 +-
 scripts/admin/meteor-release-experimental.json | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 3cc1b6e4ab..215760869c 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.19.1-rc.12'
+  version: '6.19.1-rc.13'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index b9b6fda508..a4c92925f8 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.1.0-rc.12'
+  version: '1.1.0-rc.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 42fcaaee25..23a99325a1 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.12",
+  version: "0.1.0-rc.13",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 3036b0c4a4..75a2c4dfa0 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.12",
+  version: "0.4.1-rc.13",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 6ee14fd02e..3275bdee2a 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.12",
+  version: "0.4.1-rc.13",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index d2ade7bb6d..ba2b8f2aee 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.12",
+  version: "0.4.1-rc.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 ec352e67b0..25e7526d07 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.12',
+  version: '0.8.0-rc.13',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 4cdb8c26d5..16304c2486 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.1-rc.12"
+  version: "1.3.1-rc.13"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index 302d40d4f1..a0c8cfb66d 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.1.0-rc.12"
+  version: "1.1.0-rc.13"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index bc5d761d23..8e8e4b037c 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.12',
+  version: '1.1.0-rc.13',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 02db3c3852..e1673f7e4a 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.5.0-rc.12'
+  version: '1.5.0-rc.13'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 334949ff90..f477b54123 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0-rc.12"
+  version: "2.1.0-rc.13"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index fcd647bcab..0f45e69575 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.2.0-rc.12'
+  version: '1.2.0-rc.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index 48ace64e5e..d91b2b7ac8 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.12",
+  version: "0.8.0-rc.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 fd20836fce..5160be17f3 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.12",
+  version: "0.9.0-rc.13",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index da288782c9..24b23140c1 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.18-rc.12'
+  version: '1.1.18-rc.13'
 });
 
 Npm.depends({
diff --git a/packages/promise/package.js b/packages/promise/package.js
index fb2d6f8782..73bd0a37d1 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.9",
+  version: "0.8.9-rc.13",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index 43cce8f4e9..f3f9ebea68 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.12'
+  version: '1.1.9-rc.13'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index d25245e3f2..ebbff83562 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: '2.1.0-rc.12',
+  version: '2.1.0-rc.13',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index ef90dcb94b..36d1903c92 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.16-rc.12'
+  version: '1.3.16-rc.13'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 017cda564b..8846fd805b 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.5-rc.12",
+ "version": "1.5-rc.13",
  "recommended": false,
  "official": false,
  "description": "Meteor"

From da097e209d637ca0b4056f699675d91f087e1b47 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 30 May 2017 14:16:46 -0400
Subject: [PATCH 194/195] Bump LINKER_CACHE_SALT and compiler.BUILT_BY for good
 measure.

---
 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 02cc74da22..1f18fbc8fa 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -61,7 +61,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 = 16; // Increment this number to force relinking.
+const LINKER_CACHE_SALT = 17; // 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 6af9d217f5..432efa56df 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/28';
+compiler.BUILT_BY = 'meteor/29';
 
 // This is a list of all possible architectures that a build can target. (Client
 // is expanded into 'web.browser' and 'web.cordova')

From a362e20a37547362b581fed52f7171d022e83b62 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Tue, 30 May 2017 14:18:48 -0400
Subject: [PATCH 195/195] Bump package versions for the official 1.5 release.

---
 packages/babel-compiler/package.js            | 2 +-
 packages/boilerplate-generator/package.js     | 2 +-
 packages/dynamic-import/package.js            | 2 +-
 packages/ecmascript-runtime-client/package.js | 2 +-
 packages/ecmascript-runtime-server/package.js | 2 +-
 packages/ecmascript-runtime/package.js        | 2 +-
 packages/ecmascript/package.js                | 2 +-
 packages/facebook-oauth/package.js            | 2 +-
 packages/localstorage/package.js              | 2 +-
 packages/meteor-base/package.js               | 2 +-
 packages/meteor-tool/package.js               | 2 +-
 packages/minifier-js/package.js               | 2 +-
 packages/minimongo/package.js                 | 2 +-
 packages/modules-runtime/package.js           | 2 +-
 packages/modules/package.js                   | 2 +-
 packages/mongo/package.js                     | 2 +-
 packages/promise/package.js                   | 2 +-
 packages/reactive-dict/package.js             | 2 +-
 packages/standard-minifier-js/package.js      | 2 +-
 packages/webapp/package.js                    | 2 +-
 scripts/admin/meteor-release-official.json    | 3 +--
 21 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 215760869c..f58e5656ba 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.19.1-rc.13'
+  version: '6.19.1'
 });
 
 Npm.depends({
diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index a4c92925f8..3faf0a4e51 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.1.0-rc.13'
+  version: '1.1.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/dynamic-import/package.js b/packages/dynamic-import/package.js
index 23a99325a1..7333cd1d16 100644
--- a/packages/dynamic-import/package.js
+++ b/packages/dynamic-import/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "dynamic-import",
-  version: "0.1.0-rc.13",
+  version: "0.1.0",
   summary: "Runtime support for Meteor 1.5 dynamic import(...) syntax",
   documentation: "README.md"
 });
diff --git a/packages/ecmascript-runtime-client/package.js b/packages/ecmascript-runtime-client/package.js
index 75a2c4dfa0..58a434327e 100644
--- a/packages/ecmascript-runtime-client/package.js
+++ b/packages/ecmascript-runtime-client/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-client",
-  version: "0.4.1-rc.13",
+  version: "0.4.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime-server/package.js b/packages/ecmascript-runtime-server/package.js
index 3275bdee2a..3c5f2d8b30 100644
--- a/packages/ecmascript-runtime-server/package.js
+++ b/packages/ecmascript-runtime-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime-server",
-  version: "0.4.1-rc.13",
+  version: "0.4.1",
   summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set",
   git: "https://github.com/meteor/meteor/tree/devel/packages/ecmascript-runtime-client",
   documentation: "README.md"
diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js
index ba2b8f2aee..2c1fbeab66 100644
--- a/packages/ecmascript-runtime/package.js
+++ b/packages/ecmascript-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "ecmascript-runtime",
-  version: "0.4.1-rc.13",
+  version: "0.4.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 25e7526d07..2a25c9bb47 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.8.0-rc.13',
+  version: '0.8.0',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md'
 });
diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js
index 16304c2486..03a537e200 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.1-rc.13"
+  version: "1.3.1"
 });
 
 Package.onUse(function(api) {
diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js
index a0c8cfb66d..744d9eee5f 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.1.0-rc.13"
+  version: "1.1.0"
 });
 
 Package.onUse(function (api) {
diff --git a/packages/meteor-base/package.js b/packages/meteor-base/package.js
index 8e8e4b037c..f3c9e0c21f 100644
--- a/packages/meteor-base/package.js
+++ b/packages/meteor-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'meteor-base',
-  version: '1.1.0-rc.13',
+  version: '1.1.0',
   // Brief, one-line summary of the package.
   summary: 'Packages that every Meteor app needs',
   // By default, Meteor will default to using README.md for documentation.
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e1673f7e4a..f10bd49fcd 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.5.0-rc.13'
+  version: '1.5.0'
 });
 
 Package.includeTool();
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index f477b54123..d6f75cc1ab 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.1.0-rc.13"
+  version: "2.1.0"
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 0f45e69575..2610194e18 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.2.0-rc.13'
+  version: '1.2.0'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js
index d91b2b7ac8..8416aded94 100644
--- a/packages/modules-runtime/package.js
+++ b/packages/modules-runtime/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules-runtime",
-  version: "0.8.0-rc.13",
+  version: "0.8.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 5160be17f3..96d30ce772 100644
--- a/packages/modules/package.js
+++ b/packages/modules/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "modules",
-  version: "0.9.0-rc.13",
+  version: "0.9.0",
   summary: "CommonJS module system",
   documentation: "README.md"
 });
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index 24b23140c1..45659fd43f 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.18-rc.13'
+  version: '1.1.18'
 });
 
 Npm.depends({
diff --git a/packages/promise/package.js b/packages/promise/package.js
index 73bd0a37d1..fb2d6f8782 100644
--- a/packages/promise/package.js
+++ b/packages/promise/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "promise",
-  version: "0.8.9-rc.13",
+  version: "0.8.9",
   summary: "ECMAScript 2015 Promise polyfill with Fiber support",
   git: "https://github.com/meteor/promise",
   documentation: "README.md"
diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js
index f3f9ebea68..46a1e91496 100644
--- a/packages/reactive-dict/package.js
+++ b/packages/reactive-dict/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Reactive dictionary",
-  version: '1.1.9-rc.13'
+  version: '1.1.9'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index ebbff83562..3b6148b45f 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: '2.1.0-rc.13',
+  version: '2.1.0',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 36d1903c92..3577375bac 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.16-rc.13'
+  version: '1.3.16'
 });
 
 Npm.depends({connect: "2.30.2",
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index d1e963fd87..2caed80a0b 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,8 +1,7 @@
 {
   "track": "METEOR",
-  "version": "1.4.4.3",
+  "version": "1.5",
   "recommended": false,
   "official": true,
-  "patchFrom": ["1.4.4.2"],
   "description": "The Official Meteor Distribution"
 }