monorepo-next 8.6.0 → 8.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "8.6.0",
+  "version": "8.6.2",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -80,7 +80,7 @@
     "chai-as-promised": "^7.1.1",
     "common-tags": "^1.8.2",
     "eslint": "^8.0.0",
-    "eslint-config-crowdstrike": "^7.0.0",
+    "eslint-config-crowdstrike": "^8.0.0",
     "eslint-config-crowdstrike-node": "^3.0.0",
     "eslint-plugin-json-files": "^1.0.0",
     "eslint-plugin-mocha": "^10.0.0",

package/src/attach.js

@@ -4,7 +4,6 @@ const path = require('path');
 const writeJson = require('./json').write;
 const buildDepGraph = require('./build-dep-graph');
 const buildDAG = require('./build-dag');
-const { isCycle } = buildDAG;
 const dependencyTypes = require('./dependency-types');
 const {
   getWorkspaceCwd,
@@ -84,7 +83,7 @@ async function attach({
     // don't mutate package.json until after DAG is built
     myPackageJson.version = matches[1];
 
-    if (!isCycle(dag)) {
+    if (!dag.isCycle) {
       await detachDependents(dag);
     }
   }

package/src/build-dag.js

@@ -40,10 +40,13 @@ function thirdPass({
       let visitedNode = visitedNodes[_package.packageName];
 
       if (visitedNode) {
+        let isCycle = branch.includes(_package.packageName);
+
         group.node.dependents.push({
           parent,
           dependencyType,
           dependencyRange,
+          isCycle,
           node: visitedNode,
         });
 
@@ -64,7 +67,7 @@ function thirdPass({
 
       group.node.dependents.push(newGroup);
 
-      if (group.node.isPackage && !isCycle(newGroup)) {
+      if (group.node.isPackage) {
         thirdPass({
           workspaceMeta,
           group: newGroup,
@@ -76,22 +79,6 @@ function thirdPass({
   }
 }
 
-function isCycle(group) {
-  let current = group;
-
-  do {
-    current = current.parent;
-
-    if (!current) {
-      return false;
-    }
-
-    if (current.node === group.node) {
-      return true;
-    }
-  } while (true);
-}
-
 function createPackageNode({
   workspaceMeta,
   packageName,
@@ -107,19 +94,17 @@ function createPackageNode({
     cwd: _package ? _package.cwd : workspaceMeta.cwd,
     packageName,
     version: _package ? _package.version : workspaceMeta.version,
+    dependents: [],
   };
 
   let group = {
     parent,
     dependencyType,
     dependencyRange,
+    isCycle: false,
     node,
   };
 
-  if (!isCycle(group)) {
-    node.dependents = [];
-  }
-
   let newBranch = [...branch, packageName].filter(Boolean);
 
   return {
@@ -151,6 +136,3 @@ function buildDAG(workspaceMeta, packageName) {
 }
 
 module.exports = buildDAG;
-Object.assign(module.exports, {
-  isCycle,
-});

package/src/build-dep-graph.js

@@ -12,23 +12,16 @@ function copyDeps(left, right) {
   }
 }
 
-async function firstPass(workspaceMeta, workspacePackageJson, packageDirs) {
+function firstPass(workspaceMeta, workspacePackageJson, workspacesPackageJsons) {
   workspaceMeta.packageName = workspacePackageJson.name || 'Workspace Root';
   workspaceMeta.version = workspacePackageJson.version;
   workspaceMeta.isPrivate = true;
   workspaceMeta.packages = {};
   copyDeps(workspaceMeta, workspacePackageJson);
-  for (let packageDir of packageDirs) {
-    let packageJson;
-    try {
-      packageJson = await readJson(path.join(packageDir, 'package.json'));
-    } catch (err) {
-      // ignore empty folders
-      continue;
-    }
+  for (let [workspace, packageJson] of Object.entries(workspacesPackageJsons)) {
     let packageName = packageJson.name;
     workspaceMeta.packages[packageName] = {
-      cwd: packageDir,
+      cwd: path.join(workspaceMeta.cwd, workspace),
       packageName,
       version: packageJson.version,
       isPrivate: packageJson.private,
@@ -65,7 +58,7 @@ function deleteOutOfRangePackages(_package, packages) {
 function secondPass(workspaceMeta) {
   let { packages } = workspaceMeta;
   let packageNames = Object.keys(packages);
-  for (let _package of [...Object.values(packages), workspaceMeta]) {
+  for (let _package of collectPackages(workspaceMeta)) {
     deleteUnrecognizedDeps(_package, packageNames);
     deleteOutOfRangePackages(_package, packages);
   }
@@ -73,19 +66,48 @@ function secondPass(workspaceMeta) {
 
 async function buildDepGraph({
   workspaceCwd,
-  shouldPruneDeps = true,
+  ...options
 }) {
   let workspacePackageJson = await readJson(path.join(workspaceCwd, 'package.json'));
 
   let workspaces = await getWorkspacesPaths({ cwd: workspaceCwd });
 
-  let packageDirs = workspaces.map(dir => path.join(workspaceCwd, dir));
+  let workspacesPackageJsons = {};
+
+  for (let workspace of workspaces) {
+    let packageJson;
+
+    try {
+      packageJson = await readJson(path.join(workspaceCwd, workspace, 'package.json'));
+    } catch (err) {
+      // ignore empty folders
+      continue;
+    }
+
+    workspacesPackageJsons[workspace] = packageJson;
+  }
+
+  let workspaceMeta = buildDepGraphFromObject({
+    workspaceCwd,
+    workspacePackageJson,
+    workspacesPackageJsons,
+    ...options,
+  });
 
+  return workspaceMeta;
+}
+
+function buildDepGraphFromObject({
+  workspaceCwd,
+  workspacePackageJson,
+  workspacesPackageJsons,
+  shouldPruneDeps = true,
+}) {
   let workspaceMeta = {
     cwd: workspaceCwd,
   };
 
-  await firstPass(workspaceMeta, workspacePackageJson, packageDirs);
+  firstPass(workspaceMeta, workspacePackageJson, workspacesPackageJsons);
   if (shouldPruneDeps) {
     secondPass(workspaceMeta);
   }
@@ -99,5 +121,6 @@ function collectPackages(workspaceMeta) {
 
 module.exports = buildDepGraph;
 Object.assign(module.exports, {
+  buildDepGraphFromObject,
   collectPackages,
 });

package/src/build-release-graph.js

@@ -9,7 +9,6 @@ const {
 const { trackNewVersion } = require('./version');
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
-const { isCycle } = require('./build-dag');
 const { loadPackageConfig } = require('./config');
 
 const defaultReleaseType = 'patch';
@@ -168,7 +167,7 @@ async function secondPass({
       }
 
       for (let group of dag.node.dependents) {
-        if (isCycle(group)) {
+        if (group.isCycle) {
           continue;
         }
 
@@ -221,7 +220,7 @@ function thirdPass({
       }
 
       for (let group of dag.node.dependents) {
-        if (isCycle(group)) {
+        if (group.isCycle) {
           continue;
         }
 
@@ -283,7 +282,7 @@ function fourthPass({
       }
 
       for (let group of dag.node.dependents) {
-        if (isCycle(group)) {
+        if (group.isCycle) {
           continue;
         }
 

package/src/changed-files.js

@@ -67,7 +67,7 @@ async function changedFiles({
         isMatch = true;
       } else if (exts.some(ext => file.endsWith(`.${ext}`))) {
         isMatch = true;
-      } else if (globs.some(glob => minimatch(file, glob))) {
+      } else if (globs.some(glob => minimatch(file, glob, { dot: true }))) {
         isMatch = true;
       }