monorepo-next 8.3.0 → 8.3.1

package/package.json

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

package/src/build-change-graph.js

@@ -9,10 +9,11 @@ const {
   getCommitSinceLastRelease,
 } = require('./git');
 const { collectPackages } = require('./build-dep-graph');
-const minimatch = require('minimatch');
+const { isSubDir } = require('./path');
 const { getChangedReleasableFiles } = require('./releasable');
 const Set = require('superset');
 const { loadPackageConfig } = require('./config');
+const path = require('path');
 
 async function getPackageChangedFiles({
   fromCommit,
@@ -72,6 +73,10 @@ async function buildChangeGraph({
   let packagesWithChanges = {};
   let sinceBranchCommit;
 
+  let packagePaths = Object.values(workspaceMeta.packages).map(({ cwd }) => {
+    return path.relative(workspaceMeta.cwd, cwd);
+  });
+
   for (let _package of collectPackages(workspaceMeta)) {
     if (!_package.packageName || !_package.version) {
       continue;
@@ -136,8 +141,8 @@ async function buildChangeGraph({
     // remove package changes from the workspace root's changed files
     if (_package.cwd === workspaceMeta.cwd) {
       newFiles = newFiles.filter(file => {
-        return !workspaceMeta.packagesGlobs.some(glob => {
-          return minimatch(file, `${glob}/**`, { dot: true });
+        return !packagePaths.some((packagePath) => {
+          return isSubDir(packagePath, file);
         });
       });
     }

package/src/build-dep-graph.js

@@ -81,17 +81,13 @@ async function buildDepGraph({
 
   let { workspaces } = workspacePackageJson;
 
-  let packagesGlobs;
-
   let _1dFilesArray;
   if (!workspaces) {
     _1dFilesArray = (await execa('pnpm', ['recursive', 'exec', '--', 'node', '-e', 'console.log(process.cwd())'], { cwd: workspaceCwd })).stdout
       .split(/\r?\n/)
       .map(workspace => path.relative(workspaceCwd, workspace));
-
-    packagesGlobs = [];
   } else {
-    packagesGlobs = workspaces.packages || workspaces;
+    let packagesGlobs = workspaces.packages || workspaces;
 
     let _2dFilesArray = await Promise.all(packagesGlobs.map(packagesGlob => {
       return glob(packagesGlob, {
@@ -108,7 +104,6 @@ async function buildDepGraph({
 
   let workspaceMeta = {
     cwd: workspaceCwd,
-    packagesGlobs,
   };
 
   await firstPass(workspaceMeta, workspacePackageJson, packageDirs);

package/src/path.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const path = require('path');
+
+function isSubDir(dir, subDir) {
+  let relative = path.relative(dir, subDir);
+
+  return !relative.startsWith(`..${path.sep}`);
+}
+
+module.exports = {
+  isSubDir,
+};