monorepo-next 8.3.0 → 8.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "8.3.0",
+  "version": "8.4.1",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"
@@ -62,7 +62,6 @@
     "conventional-recommended-bump": "6.1.0",
     "debug": "^4.3.1",
     "execa": "^5.0.0",
-    "glob": "^8.0.0",
     "inquirer": "^8.0.0",
     "minimatch": "^5.0.0",
     "npm-packlist": "^5.0.0",

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

@@ -1,12 +1,10 @@
 'use strict';
 
 const path = require('path');
-const { promisify } = require('util');
-const glob = promisify(require('glob'));
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
-const execa = require('execa');
 const readJson = require('./json').read;
+const getWorkspacesPaths = require('./get-workspaces-paths');
 
 function copyDeps(left, right) {
   for (let dependencyType of dependencyTypes) {
@@ -79,36 +77,12 @@ async function buildDepGraph({
 }) {
   let workspacePackageJson = await readJson(path.join(workspaceCwd, 'package.json'));
 
-  let { workspaces } = workspacePackageJson;
+  let workspaces = await getWorkspacesPaths({ workspaceCwd });
 
-  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 _2dFilesArray = await Promise.all(packagesGlobs.map(packagesGlob => {
-      return glob(packagesGlob, {
-        cwd: workspaceCwd,
-      });
-    }));
-
-    _1dFilesArray = Array.prototype.concat.apply([], _2dFilesArray);
-  }
-
-  let uniqueFiles = [...new Set(_1dFilesArray)];
-
-  let packageDirs = uniqueFiles.map(file => path.join(workspaceCwd, file));
+  let packageDirs = workspaces.map(dir => path.join(workspaceCwd, dir));
 
   let workspaceMeta = {
     cwd: workspaceCwd,
-    packagesGlobs,
   };
 
   await firstPass(workspaceMeta, workspacePackageJson, packageDirs);

package/src/get-workspaces-paths.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const execa = require('execa');
+const path = require('path');
+const readJson = require('./json').read;
+
+async function getWorkspacesPaths({
+  workspaceCwd,
+}) {
+  let workspacePackageJson = await readJson(path.join(workspaceCwd, 'package.json'));
+
+  let { workspaces } = workspacePackageJson;
+
+  if (!workspaces) {
+    workspaces = (await execa('pnpm', ['recursive', 'exec', '--', 'node', '-e', 'console.log(process.cwd())'], { cwd: workspaceCwd })).stdout
+      .split(/\r?\n/)
+      .map(workspace => path.relative(workspaceCwd, workspace));
+  } else {
+    let jsonString = (
+      await execa('yarn', ['--silent', 'workspaces', 'info'], {
+        cwd: workspaceCwd,
+      })
+    ).stdout;
+  
+    let workspacesJson = JSON.parse(jsonString);
+    
+    workspaces = Object.values(workspacesJson).map(({ location }) => location);
+  }
+
+  return workspaces;
+}
+
+module.exports = getWorkspacesPaths;

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,
+};