Merge pull request #8330 from meteor/release-1.4.2.6

Release 1.4.2.6

History.md

@@ -1,5 +1,13 @@
 ## v.NEXT
 
+## v1.4.2.6
+
+* Fixed a critical [bug](https://github.com/meteor/meteor/issues/8325)
+  that was introduced by the fix for
+  [Issue #8136](https://github.com/meteor/meteor/issues/8136), which
+  caused some npm packages in nested `node_modules` directories to be
+  omitted from bundles produced by `meteor build` and `meteor deploy`.
+
 ## v1.4.2.5
 
 * Reverted [#8213](https://github.com/meteor/meteor/pull/8213) as the

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.2_5'
+  version: '1.4.2_6'
 });
 
 Package.includeTool();

scripts/admin/meteor-release-experimental.json

@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4.2.5-rc.1",
+ "version": "1.4.2.6-rc.0",
  "recommended": false,
  "official": false,
  "description": "Meteor"

scripts/admin/meteor-release-official.json

@@ -1,7 +1,14 @@
 {
   "track": "METEOR",
-  "version": "1.4.2.5",
-  "patchFrom": ["1.4.2", "1.4.2.1", "1.4.2.2", "1.4.2.3", "1.4.2.4"],
+  "version": "1.4.2.6",
+  "patchFrom": [
+    "1.4.2",
+    "1.4.2.1",
+    "1.4.2.2",
+    "1.4.2.3",
+    "1.4.2.4",
+    "1.4.2.5"
+  ],
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"

tools/isobuild/bundler.js

@@ -469,6 +469,12 @@ export class NodeModulesDirectory {
 
       const start = parts.lastIndexOf("node_modules") + 1;
 
+      if (start >= parts.length) {
+        // If "node_modules" is the final part, then there's nothing
+        // futher to examine, yet.
+        return true;
+      }
+
       if (parts[start] === ".bin") {
         if (start === parts.length - 1) {
           // Permit node_modules/.bin directories, so that we can filter
@@ -489,7 +495,7 @@ export class NodeModulesDirectory {
       }
 
       // Strip away any parts not related to the package name.
-      parts.length = start + maxPartCount;
+      parts.length = Math.min(start + maxPartCount, parts.length);
 
       let tree = prodPackageTree;