@plasmicapp/cli 0.1.258 → 0.1.260

package/dist/utils/npm-utils.js

@@ -46,7 +46,7 @@ function getParsedPackageJson() {
 }
 exports.getParsedPackageJson = getParsedPackageJson;
 function findInstalledVersion(config, baseDir, pkg) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const pm = detectPackageManager(config, baseDir);
     try {
         if (pm === "yarn2") {
@@ -73,11 +73,16 @@ function findInstalledVersion(config, baseDir, pkg) {
             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;
         }
+        else if (pm === "pnpm") {
+            const output = child_process_1.execSync(`pnpm list --json ${pkg}`).toString().trim();
+            const info = JSON.parse(output);
+            return (_j = (_h = info === null || info === void 0 ? void 0 : info.dependencies) === null || _h === void 0 ? void 0 : _h[pkg]) === null || _j === void 0 ? void 0 : _j.version;
+        }
         else {
             // Unknown package manager (e.g. pnpm).
             const output = child_process_1.execSync(`npm list --json ${pkg}`).toString().trim();
             const info = JSON.parse(output);
-            return (_j = (_h = info === null || info === void 0 ? void 0 : info.dependencies) === null || _h === void 0 ? void 0 : _h[pkg]) === null || _j === void 0 ? void 0 : _j.version;
+            return (_l = (_k = info === null || info === void 0 ? void 0 : info.dependencies) === null || _k === void 0 ? void 0 : _k[pkg]) === null || _l === void 0 ? void 0 : _l.version;
         }
     }
     catch (err) {
@@ -168,6 +173,17 @@ function installCommand(config, pkg, baseDir, opts = {}) {
             return `yarn add ${pkg}`;
         }
     }
+    else if (mgr === "pnpm") {
+        if (opts.global) {
+            return `pnpm install -g ${pkg}`;
+        }
+        else if (opts.dev) {
+            return `pnpm install --dev --ignore-scripts ${pkg}`;
+        }
+        else {
+            return `pnpm install --ignore-scripts ${pkg}`;
+        }
+    }
     else {
         if (opts.global) {
             return `npm install -g ${pkg}`;
@@ -195,6 +211,10 @@ function detectPackageManager(config, baseDir) {
             return "yarn";
         }
     }
+    const pnpmLock = findup_sync_1.default("pnpm-lock.yaml", { cwd: baseDir });
+    if (pnpmLock) {
+        return "pnpm";
+    }
     const npmLock = findup_sync_1.default("package-lock.json", { cwd: baseDir });
     if (npmLock) {
         return "npm";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.258",
+  "version": "0.1.260",
   "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.194",
+    "@plasmicapp/react-web": "0.2.195",
     "@types/cli-progress": "^3.11.0",
     "@types/findup-sync": "^2.0.2",
     "@types/glob": "^7.1.3",
@@ -81,5 +81,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "fdb37e4fae6510d955efef6034d992bab1a189e3"
+  "gitHead": "98577cdd374585ea4ed032c13828316c6e2cf186"
 }

package/src/utils/npm-utils.ts

@@ -71,6 +71,10 @@ export function findInstalledVersion(
         .trim();
       const info = JSON.parse(output);
       return info?.dependencies?.[pkg]?.version;
+    } else if (pm === "pnpm") {
+      const output = execSync(`pnpm list --json ${pkg}`).toString().trim();
+      const info = JSON.parse(output);
+      return info?.dependencies?.[pkg]?.version;
     } else {
       // Unknown package manager (e.g. pnpm).
       const output = execSync(`npm list --json ${pkg}`).toString().trim();
@@ -175,6 +179,14 @@ export function installCommand(
     } else {
       return `yarn add ${pkg}`;
     }
+  } else if (mgr === "pnpm") {
+    if (opts.global) {
+      return `pnpm install -g ${pkg}`;
+    } else if (opts.dev) {
+      return `pnpm install --dev --ignore-scripts ${pkg}`;
+    } else {
+      return `pnpm install --ignore-scripts ${pkg}`;
+    }
   } else {
     if (opts.global) {
       return `npm install -g ${pkg}`;
@@ -199,6 +211,10 @@ export function detectPackageManager(config: PlasmicConfig, baseDir: string) {
       return "yarn";
     }
   }
+  const pnpmLock = findupSync("pnpm-lock.yaml", { cwd: baseDir });
+  if (pnpmLock) {
+    return "pnpm";
+  }
 
   const npmLock = findupSync("package-lock.json", { cwd: baseDir });
   if (npmLock) {