monorepo-next 8.4.0 → 8.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "8.4.0",
+  "version": "8.5.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-dep-graph.js

@@ -4,7 +4,7 @@ const path = require('path');
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
 const readJson = require('./json').read;
-const getWorkspacesPaths = require('./get-workspaces-paths');
+const { getWorkspacesPaths } = require('./get-workspaces-paths');
 
 function copyDeps(left, right) {
   for (let dependencyType of dependencyTypes) {

package/src/get-workspaces-paths.js

@@ -1,10 +1,9 @@
 'use strict';
 
 const execa = require('execa');
-const { promisify } = require('util');
-const glob = promisify(require('glob'));
 const path = require('path');
 const readJson = require('./json').read;
+const readJsonSync = require('./json').readSync;
 
 async function getWorkspacesPaths({
   workspaceCwd,
@@ -13,28 +12,51 @@ async function getWorkspacesPaths({
 
   let { workspaces } = workspacePackageJson;
 
-  let _1dFilesArray;
-
   if (!workspaces) {
-    _1dFilesArray = (await execa('pnpm', ['recursive', 'exec', '--', 'node', '-e', 'console.log(process.cwd())'], { cwd: workspaceCwd })).stdout
+    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 packagesGlobs = workspaces.packages || workspaces;
-    
-    let _2dFilesArray = await Promise.all(packagesGlobs.map(packagesGlob => {
-      return glob(packagesGlob, {
+    let jsonString = (
+      await execa('yarn', ['--silent', 'workspaces', 'info'], {
         cwd: workspaceCwd,
-      });
-    }));
+      })
+    ).stdout;
+  
+    let workspacesJson = JSON.parse(jsonString);
     
-    _1dFilesArray = Array.prototype.concat.apply([], _2dFilesArray);
+    workspaces = Object.values(workspacesJson).map(({ location }) => location);
   }
+
+  return workspaces;
+}
+
+function getWorkspacesPathsSync({
+  workspaceCwd,
+}) {
+  let workspacePackageJson = readJsonSync(path.join(workspaceCwd, 'package.json'));
+
+  let { workspaces } = workspacePackageJson;
+
+  if (!workspaces) {
+    workspaces = (execa.sync('pnpm', ['recursive', 'exec', '--', 'node', '-e', 'console.log(process.cwd())'], { cwd: workspaceCwd })).stdout
+      .split(/\r?\n/)
+      .map(workspace => path.relative(workspaceCwd, workspace));
+  } else {
+    let jsonString = (
+      execa.sync('yarn', ['--silent', 'workspaces', 'info'], {
+        cwd: workspaceCwd,
+      })
+    ).stdout;
+  
+    let workspacesJson = JSON.parse(jsonString);
     
-  workspaces = [...new Set(_1dFilesArray)];
-    
+    workspaces = Object.values(workspacesJson).map(({ location }) => location);
+  }    
   return workspaces;
 }
 
-module.exports = getWorkspacesPaths;
+module.exports = {
+  getWorkspacesPaths,
+  getWorkspacesPathsSync,
+};

package/src/json.js

@@ -11,6 +11,10 @@ async function read(path) {
   return JSON.parse(await fs.readFile(path, 'utf8'));
 }
 
+function readSync(path) {
+  return JSON.parse(fs.readFileSync(path, 'utf8'));
+}
+
 async function write(path, json) {
   await fs.writeFile(path, stringify(json));
 }
@@ -18,5 +22,6 @@ async function write(path, json) {
 module.exports = {
   stringify,
   read,
+  readSync,
   write,
 };

package/src/releasable.js

@@ -18,6 +18,32 @@ const filesContributingToReleasability = new Set([
 
 const packageJsonDevChangeRegex = /^\/(?:devDependencies|publishConfig)(?:\/|$)/m;
 
+const relativePathRegex = /^\.{2}(?:\/|\\|$)/;
+
+function removeSubDirs(files) {
+  let remainingFiles = new Set(files);
+
+  for (let file of remainingFiles) {
+    let isSubDir = remainingFiles.some(nextFile => {
+      if (file === nextFile) {
+        return false;
+      }
+
+      let relative = path.relative(file, nextFile);
+
+      let isSubDir = !relativePathRegex.test(relative);
+
+      return isSubDir;
+    });
+
+    if (isSubDir) {
+      remainingFiles.delete(file);
+    }
+  }
+
+  return remainingFiles;
+}
+
 async function prepareTmpPackage({
   cwd,
   tmpDir,
@@ -38,11 +64,11 @@ async function prepareTmpPackage({
     }
   }
 
-  for (let file of changedFiles) {
-    if (filesContributingToReleasability.has(file)) {
-      continue;
-    }
+  let remainingFiles = changedFiles.diff(filesContributingToReleasability);
+
+  remainingFiles = removeSubDirs(remainingFiles);
 
+  for (let file of remainingFiles) {
     let filePath = path.join(tmpDir, file);
 
     await fs.mkdir(path.dirname(filePath), { recursive: true });
@@ -161,4 +187,6 @@ async function getChangedReleasableFiles({
 module.exports = {
   getChangedReleasableFiles,
   packageJsonDevChangeRegex,
+  removeSubDirs,
+  relativePathRegex,
 };