@digigov/cli 2.0.8 → 2.0.9-platform-196.17-02-26-12-34

package/lib/project-utils.cjs

@@ -1,7 +1,8 @@
 const fs = require('fs-extra');
 const path = require('path');
 const merge = require('deepmerge');
-const rushLib = require('@microsoft/rush-lib');
+const { execSync } = require('child_process');
+const assert = require('assert');
 
 /**
  * Resolve the project configuration from the nearest package.json
@@ -48,13 +49,13 @@ function resolveProject(dir) {
     isLib = true;
   }
 
-  const rush = resolveWorkspace();
-  if (rush) isWorkspace = true;
+  const workspaceConfig = resolveWorkspace();
+  if (workspaceConfig) isWorkspace = true;
 
-  const workspace = rush
+  const workspace = workspaceConfig
     ? {
-        config: rush,
-        root: rush.rushJsonFolder,
+        config: workspaceConfig,
+        root: workspaceConfig.root,
       }
     : {};
 
@@ -165,23 +166,47 @@ function makeConfig(file, cfg = {}) {
   }
 }
 
+/** @type {{ root: string, projects: { packageName: string, projectFolder: string }[] } | null | undefined} */
+let _workspaceCache;
+
 /**
- * Resolve the project's Rush workspace configuration
+ * Resolve the pnpm workspace configuration using `pnpm ls`
  *
- * @returns {rushLib.RushConfiguration | null} - The Rush configuration or null if not found
+ * @returns {{ root: string, projects: { packageName: string, projectFolder: string }[] } | null}
  */
 function resolveWorkspace() {
+  if (_workspaceCache !== undefined) return _workspaceCache;
+
   try {
-    const rushConfiguration = rushLib.RushConfiguration.loadFromDefaultLocation(
-      {
-        startingFolder: process.cwd(),
-      }
-    );
-    return rushConfiguration;
+    const output = execSync('pnpm ls -r --json --depth -1', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    /** @type {{ name: string, version: string, private: boolean, path: string }[]} */
+    const packages = JSON.parse(output);
+
+    if (!packages.length) {
+      _workspaceCache = null;
+      return null;
+    }
+
+    const root = packages.find((pkg) => pkg.name === 'digigov-sdk')?.path;
+    assert(!!root, 'Expected to find a package named "digigov-sdk" in the workspace');
+
+    // First entry is the workspace root
+    const projects = packages
+      .filter((pkg) => pkg.name !== 'digigov-sdk')
+      .map((pkg) => ({
+        packageName: pkg.name,
+        projectFolder: pkg.path,
+      }));
+
+    _workspaceCache = { root, projects };
+    return _workspaceCache;
   } catch {
-    // No rush config, ignore error
+    _workspaceCache = null;
+    return null;
   }
-  return null;
 }
 
 /**
@@ -189,12 +214,11 @@ function resolveWorkspace() {
  * @returns {{ [key: string]: ReturnType<typeof resolveProject> }} - The local packages
  */
 function resolveLocalPackages(dependencies) {
-  const rush = resolveWorkspace();
+  const workspace = resolveWorkspace();
   /** @type {{ [key: string]: ReturnType<typeof resolveProject> }} */
   let localPackages = {};
-  if (rush) {
-    const rushProjects = rush.projects;
-    for (const project of rushProjects) {
+  if (workspace) {
+    for (const project of workspace.projects) {
       if (dependencies.includes(project.packageName)) {
         localPackages[project.packageName] = resolveProject(
           project.projectFolder

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@digigov/cli",
   "description": "CLI for Digigov apps and libs with plugin support",
-  "version": "2.0.8",
+  "version": "2.0.9-platform-196.17-02-26-12-34",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "type": "module",
   "bin": {
@@ -11,7 +11,6 @@
     "fs-extra": "11.2.0",
     "deepmerge": "4.3.1",
     "execa": "8.0.1",
-    "@microsoft/rush-lib": "5.151.0",
     "commander": "12.1.0",
     "chalk": "4.1.0"
   },