monorepo-next 8.4.0 → 8.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "8.4.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/get-workspaces-paths.js

@@ -1,8 +1,6 @@
 'use strict';
 
 const execa = require('execa');
-const { promisify } = require('util');
-const glob = promisify(require('glob'));
 const path = require('path');
 const readJson = require('./json').read;
 
@@ -13,27 +11,22 @@ 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);
   }
-    
-  workspaces = [...new Set(_1dFilesArray)];
-    
+
   return workspaces;
 }