monorepo-next 9.4.3 → 9.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "9.4.3",
+  "version": "9.4.5",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"

package/src/build-release-graph.js

@@ -48,6 +48,7 @@ function isReleaseTypeInRange(version, type, range) {
 }
 
 let shouldVersionBumpSymbol = Symbol('shouldVersionBump');
+let nextConfigSymbol = Symbol('nextConfig');
 
 async function init({
   dag,
@@ -71,6 +72,8 @@ async function init({
     }
   }
 
+  let nextConfig = loadPackageConfig(cwd);
+
   let canBumpVersion = !!(version && name);
   let canPublish = isPackage;
 
@@ -81,6 +84,9 @@ async function init({
     releaseType: defaultReleaseType,
     cwd,
     name,
+    get [nextConfigSymbol]() {
+      return nextConfig;
+    },
     [shouldVersionBumpSymbol]() {
       shouldVersionBump = true;
     },
@@ -124,6 +130,23 @@ async function secondPass({
   shouldInheritGreaterReleaseType,
   shouldExcludeDevChanges,
 }) {
+  function shouldInit({
+    dag,
+    parent,
+  }) {
+    let isDevDep = dag.dependencyType === 'devDependencies';
+
+    if (dag.node.isPackage && shouldInheritGreaterReleaseType && !isDevDep && shouldBumpInRangeDependencies) {
+      return true;
+    } else if (!isReleaseTypeInRange(parent.oldVersion, parent.releaseType, dag.dependencyRange)) {
+      return true;
+    } else if (shouldBumpInRangeDependencies) {
+      return true;
+    }
+
+    return false;
+  }
+
   let visitedNodes = new Set();
 
   for (let { dag, changedReleasableFiles } of packagesWithChanges) {
@@ -139,28 +162,20 @@ async function secondPass({
         return;
       }
 
-      visitedNodes.add(dag.node.packageName);
-
-      let nextConfig = loadPackageConfig(dag.node.cwd);
-
-      if (!nextConfig.shouldBumpVersion) {
-        return;
-      }
+      let releaseTree = releaseTrees[dag.node.packageName];
+      let doesPackageHaveChanges = !!releaseTree;
 
-      let doesPackageHaveChanges = !!releaseTrees[dag.node.packageName];
       if (!doesPackageHaveChanges) {
-        let isDevDep = dag.dependencyType === 'devDependencies';
-
-        if (dag.node.isPackage && shouldInheritGreaterReleaseType && !isDevDep && shouldBumpInRangeDependencies) {
-          await init({ dag, releaseTrees });
-        } else if (!isReleaseTypeInRange(parent.oldVersion, parent.releaseType, dag.dependencyRange)) {
-          await init({ dag, releaseTrees });
-        } else if (shouldBumpInRangeDependencies) {
-          await init({ dag, releaseTrees });
-        } else {
+        if (!shouldInit({
+          dag,
+          parent,
+        })) {
           return;
         }
 
+        releaseTree = await init({ dag, releaseTrees });
+
+        let isDevDep = dag.dependencyType === 'devDependencies';
         let shouldVersionBump = !(shouldExcludeDevChanges && isDevDep);
 
         if (!shouldVersionBump) {
@@ -168,6 +183,12 @@ async function secondPass({
         }
       }
 
+      visitedNodes.add(dag.node.packageName);
+
+      if (!releaseTree[nextConfigSymbol].shouldBumpVersion) {
+        return;
+      }
+
       for (let group of dag.node.dependents) {
         if (group.isCycle) {
           continue;
@@ -217,7 +238,7 @@ function thirdPass({
 
       let shouldVersionBump = !(shouldExcludeDevChanges && isDevDep);
 
-      if (shouldVersionBump) {
+      if (shouldVersionBump && current[nextConfigSymbol].shouldBumpVersion) {
         current[shouldVersionBumpSymbol]();
       }