From de5725e28317f9200389363fbe491d19f397ab4c Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 24 Jun 2021 18:20:36 +0200
Subject: [PATCH 01/25] Deprecation warnings for meteor show

---
 History.md                                |  3 +
 tools/cli/commands-packages-query.js      | 71 +++++++++++++----------
 tools/packaging/catalog/catalog-remote.js |  2 +-
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/History.md b/History.md
index 255afa3cd2..c24a2f36b5 100644
--- a/History.md
+++ b/History.md
@@ -2,6 +2,9 @@
 
 #### Meteor Version Release
 
+* `meteor-tool@2.4`
+  - `meteor show` now reports if a package is deprecated
+
 #### Independent Releases
 
 ## v2.3, 2021-06-24
diff --git a/tools/cli/commands-packages-query.js b/tools/cli/commands-packages-query.js
index 9c5a5213f1..20d51e8186 100644
--- a/tools/cli/commands-packages-query.js
+++ b/tools/cli/commands-packages-query.js
@@ -421,7 +421,7 @@ var PackageQuery = function (options) {
       self.data = null;
       return;
     }
-    self.data =  versionRecord.local ?
+    self.data = versionRecord.local ?
       self._getLocalVersion(versionRecord) :
       self._getOfficialVersion(versionRecord);
   } else {
@@ -429,7 +429,7 @@ var PackageQuery = function (options) {
   }
 };
 
-_.extend(PackageQuery.prototype, {
+Object.assign(PackageQuery.prototype, {
   // Find and return a version record for a given version. Mark the version
   // record as local, if it is a local version of the package.
   _getVersionRecord: function (version) {
@@ -442,13 +442,13 @@ _.extend(PackageQuery.prototype, {
     // If we asked for "local" as the version number, and found any local version
     // at all, we are done.
     if (version === "local") {
-      return versionRecord && _.extend(versionRecord, { local: true });
+      return versionRecord && Object.assign(versionRecord, { local: true });
     }
 
     // We have a local record, and its version matches the version that we asked
     // for, so we are done.
     if (versionRecord && (versionRecord.version === version)) {
-      return _.extend(versionRecord, { local: true });
+      return Object.assign(versionRecord, { local: true });
     }
 
     // If we haven't found a local record, or if the local record that we found
@@ -578,7 +578,9 @@ _.extend(PackageQuery.prototype, {
         description: local.description,
         git: local.git,
         implies: local.implies,
-        exports: local.exports
+        exports: local.exports,
+        deprecated: local.deprecated,
+        deprecatedMessage: local.deprecatedMessage
       };
     } else {
       var mainlineRecord = catalog.official.getLatestMainlineVersion(self.name);
@@ -591,7 +593,9 @@ _.extend(PackageQuery.prototype, {
           description: mainlineRecord.longDescription,
           git: mainlineRecord.git,
           exports: pkgExports,
-          implies: implies
+          implies: implies,
+          deprecated: mainlineRecord.deprecated,
+          deprecatedMessage: mainlineRecord.deprecatedMessage
         };
       } else {
         data["defaultVersion"] = _.last(data.versions);
@@ -632,7 +636,9 @@ _.extend(PackageQuery.prototype, {
       versionRecord.publishedBy && versionRecord.publishedBy.username,
       publishedOn: new Date(versionRecord.published),
       git: versionRecord.git,
-      exports: versionRecord.exports
+      exports: versionRecord.exports,
+      deprecated: versionRecord.deprecated,
+      deprecatedMessage: versionRecord.deprecatedMessage
     };
 
     // Get the export and imply data, if the record has any.
@@ -707,7 +713,9 @@ _.extend(PackageQuery.prototype, {
       name: self.name,
       summary: localRecord.description,
       git: localRecord.git,
-      local: true
+      local: true,
+      deprecated: localRecord.deprecated,
+      deprecatedMessage: localRecord.deprecatedMessage
     };
 
     // Get the source directory.
@@ -772,6 +780,12 @@ _.extend(PackageQuery.prototype, {
     if (data.directory) {
       Console.info("Directory: " + Console.path(data.directory));
     }
+    if (data.deprecated) {
+      Console.error('This package is deprecated!');
+      if (data.deprecatedMessage) {
+        Console.warn(data.deprecatedMessage);
+      }
+    }
     if (data.exports && ! data.exports.isEmpty()) {
       Console.info(
         data["exports"].getConsoleStr(),
@@ -825,16 +839,6 @@ _.extend(PackageQuery.prototype, {
         Console.command("'meteor show " + data.name + "@" + data.version + "'"),
         "from outside the project.");
     }
-
-    // Display deprecation message
-    if (data.deprecated) {
-      Console.info();
-      if (data.deprecatedMessage) {
-        Console.info(data.deprecatedMessage);
-      } else {
-        Console.info('This packages has been DEPRECATED.');
-      }
-    }
   },
   // Returns a user-friendly object from this PackageQuery to the caller.  Takes
   // in a data object with the same keys as _displayVersion.
@@ -861,12 +865,13 @@ _.extend(PackageQuery.prototype, {
     var versionFields = [
       "name", "version", "description", "summary", "git", "directory",
       "publishedBy", "publishedOn", "installed", "local", "architecturesOS",
+      "deprecated", "deprecatedMessage"
     ];
     var processedData = {};
-    _.each(["exports", "implies", "dependencies"], function (key) {
+    ["exports", "implies", "dependencies"].forEach(function (key) {
       processedData[key] = data[key] ? data[key].getObject() : [];
     });
-    return _.extend(processedData, _.pick(data, versionFields));
+    return Object.assign(processedData, _.pick(data, versionFields));
   },
 
   // Displays general package data from this PackageQuery to the terminal in a
@@ -906,6 +911,12 @@ _.extend(PackageQuery.prototype, {
     var displayName = data.defaultVersion ?
       data.name + "@" + data.defaultVersion.version : data.name;
     Console.info(displayName, Console.options({ bulletPoint: "Package: " }));
+    if (data.defaultVersion.deprecated) {
+      Console.error('This package is deprecated!');
+      if (data.defaultVersion.deprecatedMessage) {
+        Console.warn(data.defaultVersion.deprecatedMessage);
+      }
+    }
     if (data.homepage) {
       Console.info(Console.url(data.homepage),
         Console.options({ bulletPoint: "Homepage: " }));
@@ -951,7 +962,7 @@ _.extend(PackageQuery.prototype, {
       var versionsHeader =
             self.showHiddenVersions ? "Versions:" : "Recent versions:";
       Console.info(versionsHeader);
-      _.each(data.versions, function (v) {
+      data.versions.forEach(function (v) {
 
         // For a local package, we don't have a published date, and we don't
         // need to show if it has already been downloaded (it is local, we don't
@@ -1037,18 +1048,19 @@ _.extend(PackageQuery.prototype, {
           [ "name", "homepage", "maintainers", "totalVersions" ];
     // Process the versions array. We only want some of the keys, and we want to
     // make sure to get the right exports object.
-    var versions = _.map(data["versions"], function (version) {
+    var versions = data.versions.map(function (version) {
       var versionFields = [
         "name", "version", "description", "summary", "git", "publishedBy",
-        "publishedOn", "installed", "local", "directory", "architecturesOS"
+        "publishedOn", "installed", "local", "directory", "architecturesOS",
+        "deprecated", "deprecatedMessage"
       ];
       var processedData = {};
-      _.each(["exports", "implies"], function (key) {
+      ["exports", "implies"].forEach(function (key) {
         processedData[key] = version[key] ? version[key].getObject() : [];
       });
-      return _.extend(processedData, _.pick(version, versionFields));
+      return Object.assign(processedData, _.pick(version, versionFields));
     });
-    return _.extend({ versions: versions }, _.pick(data, packageFields));
+    return Object.assign({ versions: versions }, _.pick(data, packageFields));
   },
 
 });
@@ -1080,7 +1092,7 @@ var ReleaseQuery = function (options) {
     self._getReleaseData();
 };
 
-_.extend(ReleaseQuery.prototype, {
+Object.assign(ReleaseQuery.prototype, {
   // Prints the data from this ReleaseQuery to the terminal. Takes the following
   // options:
   //   - ejson: Don't pretty-print the data. Return a machine-readable ejson
@@ -1209,7 +1221,6 @@ _.extend(ReleaseQuery.prototype, {
   // - tool: tool package specification for this version
   // - packages: map of packages for this release version
   _displayVersion: function (data) {
-    var self = this;
     Console.info("Release: " + data.track + "@" + data.version);
     var isRecommended = data.recommended ? "yes" : "no";
     Console.info("Recommended: " + isRecommended);
@@ -1269,11 +1280,11 @@ _.extend(ReleaseQuery.prototype, {
     var rows = [];
     if (!_.isEmpty(data.versions)) {
       Console.info("Recommended versions:");
-      _.each(data.versions, function (v) {
+      data.versions.forEach(function (v) {
         rows.push([v.version, utils.longformDate(v.publishedOn)]);
       });
       Console.printTwoColumns(rows, { indent: 2 });
-    };
+    }
 
     // Display a warning about other release versions at the bottom.
     if (data.totalVersions > rows.length) {
diff --git a/tools/packaging/catalog/catalog-remote.js b/tools/packaging/catalog/catalog-remote.js
index 41c1bad686..727ce5a44f 100644
--- a/tools/packaging/catalog/catalog-remote.js
+++ b/tools/packaging/catalog/catalog-remote.js
@@ -520,7 +520,7 @@ var RemoteCatalog = function () {
   self.db = null;
 };
 
-_.extend(RemoteCatalog.prototype, {
+Object.assign(RemoteCatalog.prototype, {
   toString: function () {
     var self = this;
     return "RemoteCatalog";

From 2326499ef9a18803298dee441bdc0be7bd01c427 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Fri, 25 Jun 2021 12:04:05 +0200
Subject: [PATCH 02/25] Prepare for Node July security release

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

diff --git a/History.md b/History.md
index 255afa3cd2..a049838192 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,19 @@
 
 #### Independent Releases
 
+## v2.3.1, UNRELEASED
+
+#### Highlights
+
+* Node.js updated to 14.17.2, following [security release]()
+
+#### Meteor Version Release
+
+* `meteor-tool@2.3.1`
+  - Node.js updated to 14.17.2
+
+#### Independent Releases
+
 ## v2.3, 2021-06-24
 
 #### Highlights

From 8b7c7eb3f71031dee6d00e3f4559f7fdf8536a11 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 17:32:00 +0200
Subject: [PATCH 03/25] Update babel runtime and skelets

---
 packages/non-core/less/package.js                   |  2 +-
 packages/standard-minifier-css/package.js           |  2 +-
 packages/standard-minifier-js/package.js            |  2 +-
 scripts/dev-bundle-tool-package.js                  |  2 +-
 tools/static-assets/skel-apollo/imports/ui/Info.jsx |  3 +--
 tools/static-assets/skel-apollo/package.json        | 13 ++++++-------
 tools/static-assets/skel-bare/package.json          |  2 +-
 tools/static-assets/skel-blaze/package.json         |  2 +-
 tools/static-assets/skel-full/package.json          |  2 +-
 tools/static-assets/skel-minimal/package.json       |  2 +-
 tools/static-assets/skel-react/package.json         |  2 +-
 tools/static-assets/skel-svelte/package.json        |  2 +-
 tools/static-assets/skel-typescript/package.json    |  2 +-
 tools/static-assets/skel-vue/package.json           |  2 +-
 tools/tests/apps/app-config/package.json            |  2 +-
 tools/tests/apps/app-prints-pid/package.json        |  4 ++--
 tools/tests/apps/client-refresh/package.json        |  2 +-
 tools/tests/apps/css-injection-test/package.json    |  4 ++--
 tools/tests/apps/custom-minifier/package.json       |  2 +-
 .../tests/apps/dev-bundle-bin-commands/package.json |  4 ++--
 tools/tests/apps/dynamic-import/package.json        |  2 +-
 tools/tests/apps/git-commit-hash/package.json       |  2 +-
 .../tests/apps/link-config-npm-package/package.json |  2 +-
 .../apps/linked-external-npm-package/package.json   |  2 +-
 tools/tests/apps/meteor-ignore/package.json         |  2 +-
 tools/tests/apps/modules/package.json               |  4 ++--
 tools/tests/apps/package-tests/package.json         |  2 +-
 tools/tests/apps/shell/package.json                 |  2 +-
 tools/tests/apps/standard-app/package.json          |  2 +-
 29 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/packages/non-core/less/package.js b/packages/non-core/less/package.js
index f758c45978..1a87c7561e 100644
--- a/packages/non-core/less/package.js
+++ b/packages/non-core/less/package.js
@@ -15,7 +15,7 @@ Package.registerBuildPlugin({
     'plugin/compile-less.js'
   ],
   npmDependencies: {
-    "@babel/runtime": "7.9.2",
+    "@babel/runtime": "7.14.6",
     "less": "3.11.1"
   }
 });
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 9fc41c6414..16676584c0 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -12,7 +12,7 @@ Package.registerBuildPlugin({
     'ecmascript'
   ],
   npmDependencies: {
-    "@babel/runtime": "7.11.2",
+    "@babel/runtime": "7.14.6",
     "source-map": "0.7.3",
     "lru-cache": "6.0.0"
   },
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index f9a90c7969..018cd07f26 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -13,7 +13,7 @@ Package.registerBuildPlugin({
     'ecmascript'
   ],
   npmDependencies: {
-    "@babel/runtime": "7.7.4"
+    "@babel/runtime": "7.14.6"
   },
   sources: [
     'plugin/minify-js.js',
diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js
index adb7bc5918..6a8e64644a 100644
--- a/scripts/dev-bundle-tool-package.js
+++ b/scripts/dev-bundle-tool-package.js
@@ -22,7 +22,7 @@ var packageJson = {
     fibers: "5.0.0",
     reify: "0.20.12",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.
-    "@babel/runtime": "7.14.0",
+    "@babel/runtime": "7.14.6",
     // For backwards compatibility with isopackets that still depend on
     // babel-runtime rather than @babel/runtime.
     "babel-runtime": "7.0.0-beta.3",
diff --git a/tools/static-assets/skel-apollo/imports/ui/Info.jsx b/tools/static-assets/skel-apollo/imports/ui/Info.jsx
index a7073c4839..7d97da3514 100644
--- a/tools/static-assets/skel-apollo/imports/ui/Info.jsx
+++ b/tools/static-assets/skel-apollo/imports/ui/Info.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { useQuery } from '@apollo/client';
-import { gql } from 'apollo-boost';
+import { useQuery, gql } from '@apollo/client';
 
 const GET_LINKS = gql`
     {
diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json
index f4ff9e6707..3470b0c1e1 100644
--- a/tools/static-assets/skel-apollo/package.json
+++ b/tools/static-assets/skel-apollo/package.json
@@ -8,14 +8,13 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@apollo/client": "^3.3.19",
-    "@babel/runtime": "^7.14.0",
-    "apollo-boost": "^0.4.9",
-    "apollo-server-express": "^2.24.1",
-    "graphql": "^15.5.0",
+    "@apollo/client": "^3.3.20",
+    "@babel/runtime": "^7.14.6",
+    "apollo-server-express": "^2.25.2",
+    "graphql": "^15.5.1",
     "meteor-node-stubs": "^1.0.3",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/static-assets/skel-bare/package.json b/tools/static-assets/skel-bare/package.json
index 7da6cef632..1837faeec4 100644
--- a/tools/static-assets/skel-bare/package.json
+++ b/tools/static-assets/skel-bare/package.json
@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   }
 }
diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json
index 3c567d8097..331acac295 100644
--- a/tools/static-assets/skel-blaze/package.json
+++ b/tools/static-assets/skel-blaze/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "jquery": "^3.6.0",
     "meteor-node-stubs": "^1.0.3"
   },
diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json
index eefa388e12..370dbf46d2 100644
--- a/tools/static-assets/skel-full/package.json
+++ b/tools/static-assets/skel-full/package.json
@@ -6,7 +6,7 @@
     "test": "meteor test --once --driver-package meteortesting:mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "jquery": "^3.6.0",
     "meteor-node-stubs": "^1.0.3"
   },
diff --git a/tools/static-assets/skel-minimal/package.json b/tools/static-assets/skel-minimal/package.json
index ef9ec2f93c..f9488df42b 100644
--- a/tools/static-assets/skel-minimal/package.json
+++ b/tools/static-assets/skel-minimal/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   },
   "meteor": {
diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json
index 317516513f..0659a55de1 100644
--- a/tools/static-assets/skel-react/package.json
+++ b/tools/static-assets/skel-react/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json
index ae940b8108..2e0b77719e 100644
--- a/tools/static-assets/skel-svelte/package.json
+++ b/tools/static-assets/skel-svelte/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "svelte": "^3.38.2"
   },
diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json
index cac28e33ab..fa17dff5fa 100644
--- a/tools/static-assets/skel-typescript/package.json
+++ b/tools/static-assets/skel-typescript/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index e8806022df..ce2f49e116 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "vue": "^2.6.12",
     "vue-meteor-tracker": "^2.0.0-beta.5"
diff --git a/tools/tests/apps/app-config/package.json b/tools/tests/apps/app-config/package.json
index d992ebe0db..d8ec66403b 100644
--- a/tools/tests/apps/app-config/package.json
+++ b/tools/tests/apps/app-config/package.json
@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "puppeteer": "^2.1.1"
   },
diff --git a/tools/tests/apps/app-prints-pid/package.json b/tools/tests/apps/app-prints-pid/package.json
index 7213252a4a..f5394ebc53 100644
--- a/tools/tests/apps/app-prints-pid/package.json
+++ b/tools/tests/apps/app-prints-pid/package.json
@@ -2,8 +2,8 @@
   "name": "app-prints-pid",
   "private": true,
   "dependencies": {
-    "@babel/runtime": "^7.5.0",
-    "meteor-node-stubs": "^1.0.1"
+    "@babel/runtime": "^7.14.6",
+    "meteor-node-stubs": "^1.0.3"
   },
   "meteor": {
     "mainModule": {
diff --git a/tools/tests/apps/client-refresh/package.json b/tools/tests/apps/client-refresh/package.json
index a40f825a1e..6189989bd3 100644
--- a/tools/tests/apps/client-refresh/package.json
+++ b/tools/tests/apps/client-refresh/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   },
   "meteor": {
diff --git a/tools/tests/apps/css-injection-test/package.json b/tools/tests/apps/css-injection-test/package.json
index f9413ed275..86e9e7f433 100644
--- a/tools/tests/apps/css-injection-test/package.json
+++ b/tools/tests/apps/css-injection-test/package.json
@@ -8,9 +8,9 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.3.4",
+    "@babel/runtime": "^7.14.6",
     "jquery": "^3.5.1",
-    "meteor-node-stubs": "^0.4.1"
+    "meteor-node-stubs": "^1.0.3"
   },
   "meteor": {
     "mainModule": "css-injection-test.js"
diff --git a/tools/tests/apps/custom-minifier/package.json b/tools/tests/apps/custom-minifier/package.json
index 8da40ecb65..5b465e002a 100644
--- a/tools/tests/apps/custom-minifier/package.json
+++ b/tools/tests/apps/custom-minifier/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "jquery": "^3.6.0",
     "meteor-node-stubs": "^1.0.3"
   },
diff --git a/tools/tests/apps/dev-bundle-bin-commands/package.json b/tools/tests/apps/dev-bundle-bin-commands/package.json
index 80f3d838d1..6cae43a1d9 100644
--- a/tools/tests/apps/dev-bundle-bin-commands/package.json
+++ b/tools/tests/apps/dev-bundle-bin-commands/package.json
@@ -7,7 +7,7 @@
     "exit-normally": "echo \"This script will exit normally\" && exit 0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.5.0",
-    "meteor-node-stubs": "^1.0.1"
+    "@babel/runtime": "^7.14.6",
+    "meteor-node-stubs": "^1.0.3"
   }
 }
diff --git a/tools/tests/apps/dynamic-import/package.json b/tools/tests/apps/dynamic-import/package.json
index 4174c5cabc..5d1dc387d5 100644
--- a/tools/tests/apps/dynamic-import/package.json
+++ b/tools/tests/apps/dynamic-import/package.json
@@ -6,7 +6,7 @@
     "test": "TEST_BROWSER_DRIVER=puppeteer meteor test --full-app --driver-package meteortesting:mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "acorn": "^7.4.1",
     "arson": "^0.2.6",
     "jquery": "^3.6.0",
diff --git a/tools/tests/apps/git-commit-hash/package.json b/tools/tests/apps/git-commit-hash/package.json
index ea30a2f000..fbd9846503 100644
--- a/tools/tests/apps/git-commit-hash/package.json
+++ b/tools/tests/apps/git-commit-hash/package.json
@@ -6,7 +6,7 @@
     "test": "TEST_BROWSER_DRIVER=puppeteer meteor test --once --full-app --driver-package meteortesting:mocha"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3",
     "puppeteer": "^2.1.1"
   },
diff --git a/tools/tests/apps/link-config-npm-package/package.json b/tools/tests/apps/link-config-npm-package/package.json
index 414ecbd466..1476ee57ce 100644
--- a/tools/tests/apps/link-config-npm-package/package.json
+++ b/tools/tests/apps/link-config-npm-package/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "config": "file:../config-package",
     "meteor-node-stubs": "^1.0.3"
   },
diff --git a/tools/tests/apps/linked-external-npm-package/package.json b/tools/tests/apps/linked-external-npm-package/package.json
index af13bf29d9..2446a99fef 100644
--- a/tools/tests/apps/linked-external-npm-package/package.json
+++ b/tools/tests/apps/linked-external-npm-package/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "external-package": "file:../external-package",
     "meteor-node-stubs": "^1.0.3"
   },
diff --git a/tools/tests/apps/meteor-ignore/package.json b/tools/tests/apps/meteor-ignore/package.json
index 84a8a9686d..20c92916cf 100644
--- a/tools/tests/apps/meteor-ignore/package.json
+++ b/tools/tests/apps/meteor-ignore/package.json
@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   }
 }
diff --git a/tools/tests/apps/modules/package.json b/tools/tests/apps/modules/package.json
index 2bde3e87d2..f9a92a1747 100644
--- a/tools/tests/apps/modules/package.json
+++ b/tools/tests/apps/modules/package.json
@@ -4,9 +4,9 @@
   "description": "Test app exercising many aspects of the Meteor module system.",
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.8.4",
+    "@babel/core": "^7.14.6",
     "@babel/plugin-proposal-do-expressions": "^7.8.3",
-    "@babel/runtime": "^7.8.4",
+    "@babel/runtime": "^7.14.6",
     "@polymer/lit-element": "0.7.1",
     "@wry/context": "^0.4.0",
     "acorn": "file:imports/links/acorn",
diff --git a/tools/tests/apps/package-tests/package.json b/tools/tests/apps/package-tests/package.json
index 03611f8f6d..499c6e7cfc 100644
--- a/tools/tests/apps/package-tests/package.json
+++ b/tools/tests/apps/package-tests/package.json
@@ -5,6 +5,6 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17"
+    "@babel/runtime": "^7.14.6"
   }
 }
diff --git a/tools/tests/apps/shell/package.json b/tools/tests/apps/shell/package.json
index 99ee04601c..ad306d2661 100644
--- a/tools/tests/apps/shell/package.json
+++ b/tools/tests/apps/shell/package.json
@@ -5,7 +5,7 @@
     "start": "meteor run"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   }
 }
diff --git a/tools/tests/apps/standard-app/package.json b/tools/tests/apps/standard-app/package.json
index 0138c3e4d0..bcadef076f 100644
--- a/tools/tests/apps/standard-app/package.json
+++ b/tools/tests/apps/standard-app/package.json
@@ -8,7 +8,7 @@
     "visualize": "meteor --production --extra-packages bundle-visualizer"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.17",
+    "@babel/runtime": "^7.14.6",
     "meteor-node-stubs": "^1.0.3"
   },
   "meteor": {

From f1334ed6336755d0b2c6de0257a1fe0e32621f76 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 17:36:02 +0200
Subject: [PATCH 04/25] Adding shrinkwraps for minifiers

---
 .../.npm/plugin/minifyStdCSS/npm-shrinkwrap.json     |  6 +++---
 .../.npm/plugin/minifyStdJS/npm-shrinkwrap.json      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
index 740cbbcb85..88352a6812 100644
--- a/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
+++ b/packages/standard-minifier-css/.npm/plugin/minifyStdCSS/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.11.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="
     },
     "lru-cache": {
       "version": "6.0.0",
diff --git a/packages/standard-minifier-js/.npm/plugin/minifyStdJS/npm-shrinkwrap.json b/packages/standard-minifier-js/.npm/plugin/minifyStdJS/npm-shrinkwrap.json
index e667352263..c6f5dc6fd2 100644
--- a/packages/standard-minifier-js/.npm/plugin/minifyStdJS/npm-shrinkwrap.json
+++ b/packages/standard-minifier-js/.npm/plugin/minifyStdJS/npm-shrinkwrap.json
@@ -2,14 +2,14 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.4.tgz",
-      "integrity": "sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw=="
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="
     },
     "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     }
   }
 }

From bc6d8031ff0d4056a7e9cdd7c1b480eeec139a79 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 21:23:04 +0200
Subject: [PATCH 05/25] Update history and package versions

---
 History.md                                | 14 ++++++++++++++
 packages/non-core/less/package.js         |  6 +++---
 packages/standard-minifier-css/package.js |  4 ++--
 packages/standard-minifier-js/package.js  |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index a049838192..17fcf2578e 100644
--- a/History.md
+++ b/History.md
@@ -14,9 +14,23 @@
 
 * `meteor-tool@2.3.1`
   - Node.js updated to 14.17.2
+  - `@babel/runtime` dependency updated to v7.14.6 across the tool and testing apps
+  - Skeletons dependencies updated
+  - Apollo skeleton removed `apollo-boost` dependency which is no longer needed
 
 #### Independent Releases
 
+* `less@3.0.2`
+  - Updated `@babel/runtime` to v7.14.6
+  - Updated `less` to v3.11.3
+  
+* `standard-minifiers-css@1.7.3`
+  - Updated `@babel/runtime` to v7.14.6
+
+* `standard-minifiers-js@2.6.1`
+  - Updated `@babel/runtime` to v7.14.6
+  
+
 ## v2.3, 2021-06-24
 
 #### Highlights
diff --git a/packages/non-core/less/package.js b/packages/non-core/less/package.js
index 1a87c7561e..e4252e3955 100644
--- a/packages/non-core/less/package.js
+++ b/packages/non-core/less/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'less',
-  version: '3.0.1',
+  version: '3.0.2',
   summary: 'Leaner CSS language',
   documentation: 'README.md'
 });
@@ -9,14 +9,14 @@ Package.registerBuildPlugin({
   name: "compileLessBatch",
   use: [
     "caching-compiler@1.2.2",
-    "ecmascript@0.14.3",
+    "ecmascript@0.15.2",
   ],
   sources: [
     'plugin/compile-less.js'
   ],
   npmDependencies: {
     "@babel/runtime": "7.14.6",
-    "less": "3.11.1"
+    "less": "3.11.3"
   }
 });
 
diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js
index 16676584c0..2909e932ea 100644
--- a/packages/standard-minifier-css/package.js
+++ b/packages/standard-minifier-css/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-css',
-  version: '1.7.2',
+  version: '1.7.3',
   summary: 'Standard css minifier used with Meteor apps by default.',
   documentation: 'README.md'
 });
@@ -22,6 +22,6 @@ Package.registerBuildPlugin({
 });
 
 Package.onUse(function(api) {
-  api.use('minifier-css@1.5.3');
+  api.use('minifier-css@1.5.4');
   api.use('isobuild:minifier-plugin@1.0.0');
 });
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 018cd07f26..39044e5ad5 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.6.0',
+  version: '2.6.1',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });

From 94a38009bb5633f85d08cafed59a8ae4b177be24 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 21:48:34 +0200
Subject: [PATCH 06/25] Publish independent packages

---
 .../compileLessBatch/npm-shrinkwrap.json      | 109 +++++++++---------
 packages/non-core/less/package.js             |   2 +-
 2 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json b/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
index 56a9a953ef..e9d4470bdc 100644
--- a/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
+++ b/packages/non-core/less/.npm/plugin/compileLessBatch/npm-shrinkwrap.json
@@ -2,14 +2,14 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
-      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="
     },
     "ajv": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
     },
     "asap": {
       "version": "2.0.6",
@@ -37,9 +37,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -82,9 +82,9 @@
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk="
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="
     },
     "extend": {
       "version": "3.0.2",
@@ -97,9 +97,9 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -122,9 +122,9 @@
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo="
     },
     "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "har-schema": {
       "version": "2.0.0",
@@ -132,9 +132,9 @@
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -182,9 +182,14 @@
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI="
     },
     "less": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz",
-      "integrity": "sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.11.3.tgz",
+      "integrity": "sha512-VkZiTDdtNEzXA3LgjQiC3D7/ejleBPFVvq+aRI9mIj+Zhmif5TvFPM244bT4rzkvOCvJ9q4zAztok1M7Nygagw=="
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="
     },
     "mime": {
       "version": "1.6.0",
@@ -192,24 +197,14 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
     },
     "mime-types": {
-      "version": "2.1.26",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "mkdirp": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
-      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="
     },
     "oauth-sign": {
       "version": "0.9.0",
@@ -221,6 +216,11 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -247,9 +247,9 @@
       "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "regenerator-runtime": {
-      "version": "0.13.5",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "request": {
       "version": "2.88.2",
@@ -257,15 +257,20 @@
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
     },
     "safe-buffer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -282,9 +287,9 @@
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="
     },
     "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "tunnel-agent": {
       "version": "0.6.0",
@@ -297,9 +302,9 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="
     },
     "uuid": {
       "version": "3.4.0",
diff --git a/packages/non-core/less/package.js b/packages/non-core/less/package.js
index e4252e3955..ba6dd1a774 100644
--- a/packages/non-core/less/package.js
+++ b/packages/non-core/less/package.js
@@ -9,7 +9,7 @@ Package.registerBuildPlugin({
   name: "compileLessBatch",
   use: [
     "caching-compiler@1.2.2",
-    "ecmascript@0.15.2",
+    "ecmascript@0.15.1",
   ],
   sources: [
     'plugin/compile-less.js'

From d74e3cfb1fb91a1ddbc329c86ae24b7eff5a4b0a Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 21:50:56 +0200
Subject: [PATCH 07/25] Dev bundle 14.17.1.3

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

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

From 4ec725023edd0360b880abbda0c9e677936ddbc5 Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Mon, 28 Jun 2021 17:22:09 -0300
Subject: [PATCH 08/25] Start meteor v2.3.1 beta

---
 History.md                                     | 9 +++++++++
 scripts/admin/meteor-release-experimental.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 255afa3cd2..e95176a7e7 100644
--- a/History.md
+++ b/History.md
@@ -4,6 +4,15 @@
 
 #### Independent Releases
 
+## v2.3.1, 2021-06-28
+
+#### Highlights
+* Fix windows issue when running webapp package.
+
+### Migration steps
+N/A
+### Breaking changes
+N/A
 ## v2.3, 2021-06-24
 
 #### Highlights
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index ce82410b07..77f98d9a5c 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3-rc.3",
+  "version": "2.3.1-beta.1",
   "recommended": false,
   "official": false,
   "description": "Meteor"

From 20bb3a8853fb515bfe89db5dede51cbd4ef10321 Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Mon, 28 Jun 2021 17:29:34 -0300
Subject: [PATCH 09/25] Start meteor v2.3.1 beta

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

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index e0382598a7..abd4b2f7a6 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: '2.3.0'
+  version: '2.3.1-beta.1'
 });
 
 Package.includeTool();

From 57056257bdf26fb93a3ab39b3dd150b4be45c39e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 28 Jun 2021 22:38:26 +0200
Subject: [PATCH 10/25] Add webapp update to history

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

diff --git a/History.md b/History.md
index 47be59eb6a..3636c6fe0b 100644
--- a/History.md
+++ b/History.md
@@ -21,6 +21,9 @@
 
 #### Independent Releases
 
+* `webapp@1.11.1`
+  - Remove `posix` from npm shrinkwrap, to fix a bug it causes on Windows.
+
 * `less@3.0.2`
   - Updated `@babel/runtime` to v7.14.6
   - Updated `less` to v3.11.3

From 3dc2bd211a004b2d7ff2a26ad47c57a1ea459959 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 1 Jul 2021 18:08:34 +0200
Subject: [PATCH 11/25] Update node to 14.17.2

---
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index 3f099d2776..058116f8ea 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=14.17.1.3
+BUNDLE_VERSION=14.17.2.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index f3f6d64cee..83a0f350a5 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=14.17.1
+NODE_VERSION=14.17.2
 MONGO_VERSION_64BIT=4.4.4
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=6.14.13

From 72001622fd12cd6a090d287de12763960da0d8d1 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 1 Jul 2021 19:07:52 +0200
Subject: [PATCH 12/25] 2.3.1-beta.2

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

diff --git a/History.md b/History.md
index c0bab83c1f..0f22e8f5d7 100644
--- a/History.md
+++ b/History.md
@@ -9,12 +9,12 @@
 #### Highlights
 
 * Fix windows issue when running webapp package.
-* Node.js updated to 14.17.2, following [security release]()
+* Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
 
 #### Meteor Version Release
 
 * `meteor-tool@2.3.1`
-  - Node.js updated to 14.17.2
+  - Node.js updated to [14.17.2](https://nodejs.org/en/blog/release/v14.17.2/)
   - `@babel/runtime` dependency updated to v7.14.6 across the tool and testing apps
   - Skeletons dependencies updated
   - Apollo skeleton removed `apollo-boost` dependency which is no longer needed
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index abd4b2f7a6..7bd5d3f30e 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: '2.3.1-beta.1'
+  version: '2.3.1-beta.2'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 77f98d9a5c..6b657a3748 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3.1-beta.1",
+  "version": "2.3.1-beta.2",
   "recommended": false,
   "official": false,
   "description": "Meteor"

From 609381e0ac2509c1add7609eb6533e9813a8c1c8 Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Thu, 1 Jul 2021 17:11:15 -0300
Subject: [PATCH 13/25] Support BUNDLE format on android builds as it's a new
 google play standard

---
 tools/cli/commands.js    | 13 +++++++++----
 tools/cli/help.txt       |  3 ++-
 tools/cordova/project.js |  6 ++++--
 tools/cordova/runner.js  |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index ae383e8c1a..a689897b0f 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -917,6 +917,7 @@ var buildCommands = {
   requiresApp: true,
   options: {
     debug: { type: Boolean },
+    packageType: { type: String },
     directory: { type: Boolean },
     architecture: { type: String },
     "server-only": { type: Boolean },
@@ -1195,7 +1196,7 @@ ${displayNameForPlatform(platform)}` }, () => {
             if (platform === 'ios') {
               cordovaProject.prepareForPlatform(platform, buildOptions);
             } else if (platform === 'android') {
-              cordovaProject.buildForPlatform(platform, buildOptions);
+              cordovaProject.buildForPlatform(platform, {...buildOptions, argv: ["--packageType", options.packageType || "bundle"]});
             }
 
             // Once prepared, copy the bundle to the final location.
@@ -1212,12 +1213,16 @@ Instructions for publishing your iOS app to App Store can be found at:
 https://guide.meteor.com/cordova.html#submitting-ios
 `, "utf8");
             } else if (platform === 'android') {
-              const apkPath = files.pathJoin(buildPath, 'build/outputs/apk',
-                options.debug ? 'android-debug.apk' : 'android-release-unsigned.apk');
+              const packageType = options.packageType || "bundle"
+              const packageExtension = packageType === 'bundle' ? 'aab' : 'apk';
+              const packageName = packageType === 'bundle' ? `app-release` : `app-release-unsigned`;
+              const apkPath = files.pathJoin(buildPath, `app/build/outputs/${packageType}/${options.debug ? 'debug' : 'release'}`,
+                options.debug ? `app-debug.${packageExtension}` : `${packageName}.${packageExtension}`);
 
+              console.log(apkPath)
               if (files.exists(apkPath)) {
               files.copyFile(apkPath, files.pathJoin(platformOutputPath,
-                options.debug ? 'debug.apk' : 'release-unsigned.apk'));
+                options.debug ? `app-debug.${packageExtension}` : `${packageName}.${packageExtension}`));
               }
 
               files.writeFile(
diff --git a/tools/cli/help.txt b/tools/cli/help.txt
index e3f4689465..571b65ba71 100644
--- a/tools/cli/help.txt
+++ b/tools/cli/help.txt
@@ -386,7 +386,7 @@ builds for all platforms in this project.
 
 If you have added mobile platforms to your project with the
 'meteor add-platform' command, then the output directory will contain
-subdirectories named 'android' (with the APK bundle and Android project
+subdirectories named 'android' (with the AAB/APK bundle and Android project
 source) and/or 'ios' (with the Xcode project source).
 
 Pass `--server-only` to skip building mobile apps, but still build the
@@ -426,6 +426,7 @@ Options:
                       with the current versions, if required to satisfy all
                       package version constraints.
   --platforms         Builds only the specified platforms (when available).
+  --packageType       Choose between apk/bundle for android builds. (Defaults to bundle)
 
 
 
diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index 8b99bf3e2f..d23e47fbc5 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -286,7 +286,7 @@ outdated platforms`);
     builder.copyBuildOverride();
   }
 
-  prepareForPlatform(platform) {
+  prepareForPlatform(platform, options) {
     assert(platform);
 
     // Temporary workaround for Cordova iOS bug until
@@ -309,9 +309,10 @@ ${displayNameForPlatform(platform)}`, async () => {
 
   // Building (includes prepare)
 
-  buildForPlatform(platform, options = {}, extraPaths) {
+  buildForPlatform(platform, options = {}) {
     assert(platform);
 
+    console.log("PLATFORM: ", platform)
     const commandOptions = {
       ...this.defaultOptions,
       platforms: [platform],
@@ -335,6 +336,7 @@ ${displayNameForPlatform(platform)}`, async () => {
       ...this.defaultOptions,
       platforms: [platform],
       device: isDevice,
+      options: (platform === 'android' ? {argv: ["--packageType", options.packageType || "bundle"]} : {})
     };
 
     this.runCommands(`running Cordova app for platform \
diff --git a/tools/cordova/runner.js b/tools/cordova/runner.js
index 71723dea87..3f089a0e65 100644
--- a/tools/cordova/runner.js
+++ b/tools/cordova/runner.js
@@ -83,7 +83,7 @@ export class CordovaRunner {
       }
 
       for (let platform of this.platformsForRunTargets) {
-        this.cordovaProject.prepareForPlatform(platform);
+        this.cordovaProject.prepareForPlatform(platform, options);
       }
     });
 

From 24e83658a87ba84315ee903b6cd3c3bc27fa95dc Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Thu, 1 Jul 2021 17:18:23 -0300
Subject: [PATCH 14/25] Support BUNDLE format on android builds as it's a new
 google play standard - remove debug console.log

---
 tools/cordova/project.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/cordova/project.js b/tools/cordova/project.js
index d23e47fbc5..f219915844 100644
--- a/tools/cordova/project.js
+++ b/tools/cordova/project.js
@@ -312,7 +312,6 @@ ${displayNameForPlatform(platform)}`, async () => {
   buildForPlatform(platform, options = {}) {
     assert(platform);
 
-    console.log("PLATFORM: ", platform)
     const commandOptions = {
       ...this.defaultOptions,
       platforms: [platform],

From 32b9b5ebd1fb98ab3d4a863338c864a6c1921ffc Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Fri, 2 Jul 2021 15:23:20 +0200
Subject: [PATCH 15/25] Dev bundle 14.17.2.1

---
 .travis.yml | 2 +-
 meteor      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a82a67559..fa8eb364ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "12.16.1"
+  - "14.17.2"
 cache:
   directories:
     - ".meteor"
diff --git a/meteor b/meteor
index 058116f8ea..25f9b1436f 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=14.17.2.0
+BUNDLE_VERSION=14.17.2.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 34668f9a76506204899b46ced178e6ba4ccfec05 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Fri, 2 Jul 2021 17:04:27 +0200
Subject: [PATCH 16/25] 2.3.1-beta.3

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

diff --git a/History.md b/History.md
index 5c21e464a0..068a4f0818 100644
--- a/History.md
+++ b/History.md
@@ -13,14 +13,18 @@
 
 * Fix windows issue when running webapp package.
 * Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
+* New build flag `--packageType` to choose between apk/bundle for android builds.
 
 #### Meteor Version Release
 
+* Updated travis CI environment to use Node.js 14.17.2
+
 * `meteor-tool@2.3.1`
   - Node.js updated to [14.17.2](https://nodejs.org/en/blog/release/v14.17.2/)
   - `@babel/runtime` dependency updated to v7.14.6 across the tool and testing apps
   - Skeletons dependencies updated
   - Apollo skeleton removed `apollo-boost` dependency which is no longer needed
+  - New build flag `--packageType` to choose between apk/bundle for android builds (defaults to bundle).
 
 #### Independent Releases
 
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 7bd5d3f30e..5db9dba7db 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: '2.3.1-beta.2'
+  version: '2.3.1-beta.3'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 6b657a3748..64458e24f9 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3.1-beta.2",
+  "version": "2.3.1-beta.3",
   "recommended": false,
   "official": false,
   "description": "Meteor"

From 37916408c7a7de5bd1144df288df6e917fcf4e3e Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Fri, 2 Jul 2021 17:16:13 +0200
Subject: [PATCH 17/25] MDG -> Meteor Software

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

diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js
index 10bf7c8ced..7444bfdcaa 100644
--- a/tools/cli/commands-packages.js
+++ b/tools/cli/commands-packages.js
@@ -1103,7 +1103,7 @@ main.registerCommand({
       var fail = false;
       try {
         Console.info(
-          "Pushing git tag (this should fail if you are not from MDG)");
+          "Pushing git tag (this should fail if you are not from Meteor Software)");
         utils.runGitInCheckout('push', 'git@github.com:meteor/meteor.git',
                              'refs/tags/' + gitTag);
       } catch (err) {

From 9a1d8bdc36ffaf074ba2d5c0875cc147891dc2f0 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 5 Jul 2021 12:56:18 +0200
Subject: [PATCH 18/25] 2.3.1-rc.0

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

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 5db9dba7db..8bc18f803f 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: '2.3.1-beta.3'
+  version: '2.3.1-rc.0'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 64458e24f9..6b275850d9 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3.1-beta.3",
+  "version": "2.3.1-rc.0",
   "recommended": false,
   "official": false,
   "description": "Meteor"

From fd110759b705a1ba5d3d78e58b57f04fe4925441 Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Mon, 5 Jul 2021 09:19:02 -0300
Subject: [PATCH 19/25] Support BUNDLE format on android builds as it's a new
 google play standard

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

diff --git a/History.md b/History.md
index 068a4f0818..85ee43998c 100644
--- a/History.md
+++ b/History.md
@@ -14,6 +14,7 @@
 * Fix windows issue when running webapp package.
 * Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
 * New build flag `--packageType` to choose between apk/bundle for android builds.
+* Meteor will now generate ".aab" (bundle files) by default when building for Android.
 
 #### Meteor Version Release
 

From b8f001ccc7011d53a983a8a623c150eefc261f8d Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 5 Jul 2021 14:43:09 +0200
Subject: [PATCH 20/25] Update history with link to Google and how to create
 apk

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

diff --git a/History.md b/History.md
index 85ee43998c..a274a5a1cb 100644
--- a/History.md
+++ b/History.md
@@ -13,8 +13,7 @@
 
 * Fix windows issue when running webapp package.
 * Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
-* New build flag `--packageType` to choose between apk/bundle for android builds.
-* Meteor will now generate ".aab" (bundle files) by default when building for Android.
+* Meteor will now generate ".aab" (bundle files) by default when building for Android. This is the [new default format](https://android-developers.googleblog.com/2021/06/the-future-of-android-app-bundles-is.html) for Android apps. Use the new build flag `--packageType=apk` if you still need to generate APK.
 
 #### Meteor Version Release
 

From e2e66983c254d32809bc9ac65bc9672bbe9a77ac Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Mon, 5 Jul 2021 14:55:29 +0200
Subject: [PATCH 21/25] Tie @types/node to our current node version

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b16af59e01..739228949c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -149,7 +149,7 @@ jobs:
           command: |
             eval $PRE_TEST_COMMANDS;
             pushd tools
-            npm install @types/node --save-dev
+            npm install @types/node@14.17.4 --save-dev
             # Ensure that meteor/tools has no TypeScript errors.
             ../meteor npx tsc --noEmit --skipLibCheck
             popd

From 914dbd4d87e29db49b6cb676e3c5af2f49a091e4 Mon Sep 17 00:00:00 2001
From: Renan Castro <renanccastro@gmail.com>
Date: Mon, 5 Jul 2021 13:59:48 -0300
Subject: [PATCH 22/25] Change aab disclaimer to breaking changes

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

diff --git a/History.md b/History.md
index a274a5a1cb..d0ec2bc7a5 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,9 @@
 
 * Fix windows issue when running webapp package.
 * Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
+
+#### Breaking Changes
+
 * Meteor will now generate ".aab" (bundle files) by default when building for Android. This is the [new default format](https://android-developers.googleblog.com/2021/06/the-future-of-android-app-bundles-is.html) for Android apps. Use the new build flag `--packageType=apk` if you still need to generate APK.
 
 #### Meteor Version Release

From cf9441980dbe55e303d0af82f271dc9c17883236 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Wed, 7 Jul 2021 09:44:17 +0200
Subject: [PATCH 23/25] Bump Node to 14.17.3

---
 .travis.yml                        | 2 +-
 History.md                         | 6 +++---
 meteor                             | 2 +-
 scripts/build-dev-bundle-common.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa8eb364ca..a3694bbe07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "14.17.2"
+  - "14.17.3"
 cache:
   directories:
     - ".meteor"
diff --git a/History.md b/History.md
index d0ec2bc7a5..be3cae3bef 100644
--- a/History.md
+++ b/History.md
@@ -12,7 +12,7 @@
 #### Highlights
 
 * Fix windows issue when running webapp package.
-* Node.js updated to 14.17.2, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
+* Node.js updated to 14.17.3, following [security release](https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/)
 
 #### Breaking Changes
 
@@ -20,10 +20,10 @@
 
 #### Meteor Version Release
 
-* Updated travis CI environment to use Node.js 14.17.2
+* Updated travis CI environment to use Node.js 14.17.3
 
 * `meteor-tool@2.3.1`
-  - Node.js updated to [14.17.2](https://nodejs.org/en/blog/release/v14.17.2/)
+  - Node.js updated to [14.17.2](https://nodejs.org/en/blog/release/v14.17.2/) and [14.17.3](https://nodejs.org/en/blog/release/v14.17.3/)
   - `@babel/runtime` dependency updated to v7.14.6 across the tool and testing apps
   - Skeletons dependencies updated
   - Apollo skeleton removed `apollo-boost` dependency which is no longer needed
diff --git a/meteor b/meteor
index 25f9b1436f..6ad3438062 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=14.17.2.1
+BUNDLE_VERSION=14.17.3.0
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh
index 83a0f350a5..3459b422d1 100644
--- a/scripts/build-dev-bundle-common.sh
+++ b/scripts/build-dev-bundle-common.sh
@@ -5,7 +5,7 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=14.17.2
+NODE_VERSION=14.17.3
 MONGO_VERSION_64BIT=4.4.4
 MONGO_VERSION_32BIT=3.2.22
 NPM_VERSION=6.14.13

From 467165d041428fab61b918e16e81d734f6767ae4 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Wed, 7 Jul 2021 10:03:41 +0200
Subject: [PATCH 24/25] 2.3.1-rc.1

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

diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 8bc18f803f..0425e0f284 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: '2.3.1-rc.0'
+  version: '2.3.1-rc.1'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json
index 6b275850d9..53c583fdbe 100644
--- a/scripts/admin/meteor-release-experimental.json
+++ b/scripts/admin/meteor-release-experimental.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3.1-rc.0",
+  "version": "2.3.1-rc.1",
   "recommended": false,
   "official": false,
   "description": "Meteor"

From 6ff780c7dcca7fd5f2cb78d613ec2553b6ec9949 Mon Sep 17 00:00:00 2001
From: Jan Dvorak <storyteller@freedombase.net>
Date: Thu, 8 Jul 2021 10:46:42 +0200
Subject: [PATCH 25/25] 2.3.1 release

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

diff --git a/History.md b/History.md
index be3cae3bef..179b4a65c3 100644
--- a/History.md
+++ b/History.md
@@ -7,7 +7,7 @@
 
 #### Independent Releases
 
-## v2.3.1, UNRELEASED
+## v2.3.1, 2021-07-08
 
 #### Highlights
 
diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js
index 0425e0f284..69ea39b6ab 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: '2.3.1-rc.1'
+  version: '2.3.1'
 });
 
 Package.includeTool();
diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 49ee69da51..3af6f47a4b 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "2.3",
+  "version": "2.3.1",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"