@plasmicapp/cli 0.1.233 → 0.1.235

package/dist/utils/npm-utils.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectPackageManager = exports.installCommand = exports.installUpgrade = exports.findPackageJsonDir = exports.isCliGloballyInstalled = exports.findInstalledVersion = exports.warnLatest = exports.getParsedPackageJson = exports.checkEngineStrict = exports.getCliVersion = exports.getParsedCliPackageJson = void 0;
 const child_process_1 = require("child_process");
-const fast_glob_1 = __importDefault(require("fast-glob"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
 const latest_version_1 = __importDefault(require("latest-version"));
 const path_1 = __importDefault(require("path"));
@@ -102,23 +101,36 @@ function checkVersion(context, baseDir, pkg) {
     });
 }
 function findInstalledVersion(context, baseDir, pkg) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
     const pm = detectPackageManager(baseDir);
-    if (pm === "yarn2") {
-        try {
-            const pkgInfo = JSON.parse(child_process_1.execSync(`yarn info --json ${pkg}`).toString().trim());
-            return (_a = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.children) === null || _a === void 0 ? void 0 : _a.Version;
+    try {
+        if (pm === "yarn2") {
+            const output = child_process_1.execSync(`yarn info --json ${pkg}`).toString().trim();
+            const info = JSON.parse(output);
+            return (_a = info === null || info === void 0 ? void 0 : info.children) === null || _a === void 0 ? void 0 : _a.Version;
+        }
+        else if (pm === "yarn") {
+            const output = child_process_1.execSync(`yarn list --json --pattern ${pkg}`)
+                .toString()
+                .trim()
+                .split("\n");
+            for (const line of output) {
+                const info = JSON.parse(line);
+                if ((info === null || info === void 0 ? void 0 : info.type) === "tree" && ((_e = (_d = (_c = (_b = info === null || info === void 0 ? void 0 : info.data) === null || _b === void 0 ? void 0 : _b.trees) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.startsWith(`${pkg}@`))) {
+                    return info.data.trees[0].name.replace(`${pkg}@`, "");
+                }
+            }
         }
-        catch (_) {
-            return undefined;
+        else {
+            const output = child_process_1.execSync(`npm list --package-lock-only --json ${pkg}`)
+                .toString()
+                .trim();
+            const info = JSON.parse(output);
+            return (_g = (_f = info === null || info === void 0 ? void 0 : info.dependencies) === null || _f === void 0 ? void 0 : _f[pkg]) === null || _g === void 0 ? void 0 : _g.version;
         }
     }
-    const filename = findInstalledPackageJsonFile(context, pkg);
-    if (filename) {
-        const json = parsePackageJson(filename);
-        if (json && json.name === pkg) {
-            return json.version;
-        }
+    catch (err) {
+        deps_1.logger.warn(`Could not detect installed version of ${pkg} using ${pm}: ${err}`);
     }
     return undefined;
 }
@@ -150,16 +162,6 @@ function findPackageJsonDir(rootDir) {
     return filePath ? path_1.default.dirname(filePath) : undefined;
 }
 exports.findPackageJsonDir = findPackageJsonDir;
-function findInstalledPackageJsonFile(context, pkg) {
-    const packageJsonPath = findPackageJsonPath(context.rootDir);
-    const rootDir = packageJsonPath
-        ? path_1.default.dirname(packageJsonPath)
-        : context.rootDir;
-    const files = fast_glob_1.default.sync(`${rootDir}/**/node_modules/${pkg}/package.json`, {
-        ignore: [`**/node_modules/**/node_modules/**`],
-    });
-    return files.length > 0 ? files[0] : undefined;
-}
 function parsePackageJson(path) {
     try {
         return JSON.parse(file_utils_1.readFileText(path));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.233",
+  "version": "0.1.235",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.12.1",
-    "@plasmicapp/react-web": "0.2.175",
+    "@plasmicapp/react-web": "0.2.176",
     "@types/findup-sync": "^2.0.2",
     "@types/glob": "^7.1.3",
     "@types/inquirer": "^6.5.0",
@@ -77,5 +77,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "411aa3e27a221f2a3a88578bc108905e424b4a8c"
+  "gitHead": "29193a15e9341b80f6f588c5583ef8446bbc87b1"
 }

package/src/utils/npm-utils.ts

@@ -1,5 +1,4 @@
 import { execSync, spawnSync } from "child_process";
-import glob from "fast-glob";
 import findupSync from "findup-sync";
 import latest from "latest-version";
 import path from "path";
@@ -114,24 +113,38 @@ export function findInstalledVersion(
   pkg: string
 ) {
   const pm = detectPackageManager(baseDir);
-  if (pm === "yarn2") {
-    try {
-      const pkgInfo = JSON.parse(
-        execSync(`yarn info --json ${pkg}`).toString().trim()
-      );
-      return pkgInfo?.children?.Version;
-    } catch (_) {
-      return undefined;
+  try {
+    if (pm === "yarn2") {
+      const output = execSync(`yarn info --json ${pkg}`).toString().trim();
+      const info = JSON.parse(output);
+      return info?.children?.Version;
+    } else if (pm === "yarn") {
+      const output = execSync(`yarn list --json --pattern ${pkg}`)
+        .toString()
+        .trim()
+        .split("\n");
+      for (const line of output) {
+        const info = JSON.parse(line);
+        if (
+          info?.type === "tree" &&
+          info?.data?.trees?.[0]?.name?.startsWith(`${pkg}@`)
+        ) {
+          return info.data.trees[0].name.replace(`${pkg}@`, "");
+        }
+      }
+    } else {
+      const output = execSync(`npm list --package-lock-only --json ${pkg}`)
+        .toString()
+        .trim();
+      const info = JSON.parse(output);
+      return info?.dependencies?.[pkg]?.version;
     }
+  } catch (err) {
+    logger.warn(
+      `Could not detect installed version of ${pkg} using ${pm}: ${err}`
+    );
   }
 
-  const filename = findInstalledPackageJsonFile(context, pkg);
-  if (filename) {
-    const json = parsePackageJson(filename);
-    if (json && json.name === pkg) {
-      return json.version as string;
-    }
-  }
   return undefined;
 }
 
@@ -164,17 +177,6 @@ export function findPackageJsonDir(rootDir: string) {
   return filePath ? path.dirname(filePath) : undefined;
 }
 
-function findInstalledPackageJsonFile(context: PlasmicContext, pkg: string) {
-  const packageJsonPath = findPackageJsonPath(context.rootDir);
-  const rootDir = packageJsonPath
-    ? path.dirname(packageJsonPath)
-    : context.rootDir;
-  const files = glob.sync(`${rootDir}/**/node_modules/${pkg}/package.json`, {
-    ignore: [`**/node_modules/**/node_modules/**`],
-  });
-  return files.length > 0 ? files[0] : undefined;
-}
-
 function parsePackageJson(path: string) {
   try {
     return JSON.parse(readFileText(path));