monorepo-next 8.0.2 → 8.1.0

package/package.json

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

package/src/build-release-graph.js

@@ -45,11 +45,11 @@ function isReleaseTypeInRange(version, type, range) {
   return semver.satisfies(semver.inc(version, type), range);
 }
 
+let shouldVersionBumpSymbol = Symbol('shouldVersionBump');
+
 async function init({
   dag,
   releaseTrees,
-  releaseType,
-  shouldVersionBump = true,
 }) {
   let {
     isPackage,
@@ -69,23 +69,30 @@ async function init({
     }
   }
 
-  if (!releaseType) {
-    releaseType = await module.exports.getReleaseType(name, cwd);
-  }
-
   let canBumpVersion = !!(version && name);
   let canPublish = isPackage;
-  let shouldBumpVersion = canBumpVersion && shouldVersionBump;
-  let shouldPublish = canPublish && shouldBumpVersion;
 
-  return releaseTrees[name] = {
+  let shouldVersionBump = false;
+
+  let releaseTree = {
     oldVersion: version,
-    releaseType,
+    releaseType: defaultReleaseType,
     cwd,
     name,
-    shouldBumpVersion,
-    shouldPublish,
+    [shouldVersionBumpSymbol]() {
+      shouldVersionBump = true;
+    },
+    get shouldBumpVersion() {
+      return canBumpVersion && shouldVersionBump;
+    },
+    get shouldPublish() {
+      return canPublish && this.shouldBumpVersion;
+    },
   };
+
+  releaseTrees[name] = releaseTree;
+
+  return releaseTree;
 }
 
 async function firstPass({
@@ -97,7 +104,14 @@ async function firstPass({
       continue;
     }
 
-    await init({ dag, releaseTrees });
+    let {
+      packageName: name,
+      cwd,
+    } = dag.node;
+
+    let releaseTree = await init({ dag, releaseTrees });
+
+    releaseTree.releaseType = await module.exports.getReleaseType(name, cwd);
   }
 }
 
@@ -108,6 +122,8 @@ async function secondPass({
   shouldInheritGreaterReleaseType,
   shouldExcludeDevChanges,
 }) {
+  let visitedNodes = new Set();
+
   for (let { dag, changedReleasableFiles } of packagesWithChanges) {
     if (!changedReleasableFiles.length) {
       continue;
@@ -117,21 +133,28 @@ async function secondPass({
       dag,
       parent,
     }) {
+      if (visitedNodes.has(dag.node.packageName)) {
+        return;
+      }
+
+      visitedNodes.add(dag.node.packageName);
+
       let doesPackageHaveChanges = !!releaseTrees[dag.node.packageName];
       if (!doesPackageHaveChanges) {
         let isDevDep = dag.dependencyType === 'devDependencies';
-        let shouldVersionBump = !shouldExcludeDevChanges || !isDevDep;
 
         if (dag.node.isPackage && shouldInheritGreaterReleaseType && !isDevDep && shouldBumpInRangeDependencies) {
-          await init({ dag, releaseTrees, releaseType: parent.releaseType });
+          await init({ dag, releaseTrees });
         } else if (!isReleaseTypeInRange(parent.oldVersion, parent.releaseType, dag.dependencyRange)) {
-          await init({ dag, releaseTrees, releaseType: defaultReleaseType, shouldVersionBump });
+          await init({ dag, releaseTrees });
         } else if (shouldBumpInRangeDependencies) {
-          await init({ dag, releaseTrees, releaseType: defaultReleaseType, shouldVersionBump });
+          await init({ dag, releaseTrees });
         } else {
           return;
         }
 
+        let shouldVersionBump = !(shouldExcludeDevChanges && isDevDep);
+
         if (!shouldVersionBump) {
           return;
         }
@@ -157,7 +180,10 @@ function thirdPass({
   releaseTrees,
   packagesWithChanges,
   shouldInheritGreaterReleaseType,
+  shouldExcludeDevChanges,
 }) {
+  let visitedNodes = new Set();
+
   for (let { dag, changedReleasableFiles } of packagesWithChanges) {
     if (!changedReleasableFiles.length) {
       continue;
@@ -167,24 +193,36 @@ function thirdPass({
       dag,
       parent,
     }) {
+      if (visitedNodes.has(dag.node.packageName)) {
+        // return;
+      }
+
+      visitedNodes.add(dag.node.packageName);
+
       let current = releaseTrees[dag.node.packageName];
 
       if (!current) {
         return;
       }
 
+      let isDevDep = dag.dependencyType === 'devDependencies';
       let currentReleaseType = current.releaseType;
-
       let incomingReleaseType = parent ? parent.releaseType : currentReleaseType;
 
-      if (shouldInheritGreaterReleaseType && dag.dependencyType !== 'devDependencies' && isReleaseTypeLessThan(currentReleaseType, incomingReleaseType)) {
+      if (shouldInheritGreaterReleaseType && !isDevDep && isReleaseTypeLessThan(currentReleaseType, incomingReleaseType)) {
         currentReleaseType = incomingReleaseType;
       }
 
       current.releaseType = currentReleaseType;
 
+      let shouldVersionBump = !(shouldExcludeDevChanges && isDevDep);
+
+      if (shouldVersionBump) {
+        current[shouldVersionBumpSymbol]();
+      }
+
       for (let group of dag.node.dependents) {
-        if (!group.node.isPackage || isCycle(group)) {
+        if (isCycle(group)) {
           continue;
         }
 
@@ -204,6 +242,8 @@ function fourthPass({
   packagesWithChanges,
   shouldBumpInRangeDependencies,
 }) {
+  let visitedNodes = new Set();
+
   for (let { dag, changedReleasableFiles } of packagesWithChanges) {
     if (!changedReleasableFiles.length) {
       continue;
@@ -213,6 +253,12 @@ function fourthPass({
       dag,
       parent,
     }) {
+      if (visitedNodes.has(dag.node.packageName)) {
+        // return;
+      }
+
+      visitedNodes.add(dag.node.packageName);
+
       let current = releaseTrees[dag.node.packageName];
 
       if (!current) {
@@ -290,6 +336,7 @@ async function buildReleaseGraph({
     releaseTrees,
     packagesWithChanges,
     shouldInheritGreaterReleaseType,
+    shouldExcludeDevChanges,
   });
 
   // dependents have now inherited release type