@plasmicapp/cli 0.1.241 → 0.1.243

package/dist/index.js

@@ -261,6 +261,11 @@ function configureSyncArgs(yags, includeQuietOption = true) {
         type: "boolean",
         describe: "Ignore post-sync commands in plasmic.json",
         default: false,
+    })
+        .option("skip-upgrade-check", {
+        type: "boolean",
+        describe: "Skip upgrade check for Plasmic dependencies",
+        default: false,
     })
         .option("metadata", {
         type: "string",

package/dist/utils/npm-utils.d.ts

@@ -6,10 +6,6 @@ export declare function getCliVersion(): string;
  */
 export declare function checkEngineStrict(): boolean;
 export declare function getParsedPackageJson(): any;
-export declare function warnLatest(context: PlasmicContext, pkg: string, baseDir: string, msgs: {
-    requiredMsg: () => string;
-    updateMsg: (curVersion: string, latestVersion: string) => string;
-}, yes?: boolean): Promise<void>;
 export declare function findInstalledVersion(context: PlasmicContext, baseDir: string, pkg: string): any;
 /**
  * Detects if the cli is globally installed.  `rootDir` is the folder
@@ -25,4 +21,4 @@ export declare function installCommand(pkg: string, baseDir: string, opts?: {
     global?: boolean;
     dev?: boolean;
 }): string;
-export declare function detectPackageManager(baseDir: string): "yarn2" | "yarn" | "npm";
+export declare function detectPackageManager(baseDir: string): "yarn2" | "yarn" | "npm" | "unknown";

package/dist/utils/npm-utils.js

@@ -1,26 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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;
+exports.detectPackageManager = exports.installCommand = exports.installUpgrade = exports.findPackageJsonDir = exports.isCliGloballyInstalled = exports.findInstalledVersion = exports.getParsedPackageJson = exports.checkEngineStrict = exports.getCliVersion = exports.getParsedCliPackageJson = void 0;
 const child_process_1 = require("child_process");
 const findup_sync_1 = __importDefault(require("findup-sync"));
-const latest_version_1 = __importDefault(require("latest-version"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const deps_1 = require("../deps");
 const file_utils_1 = require("./file-utils");
-const user_utils_1 = require("./user-utils");
 function getParsedCliPackageJson() {
     const packageJson = findup_sync_1.default("package.json", { cwd: __dirname });
     if (!packageJson) {
@@ -56,52 +45,8 @@ function getParsedPackageJson() {
     return parsePackageJson(packageJson);
 }
 exports.getParsedPackageJson = getParsedPackageJson;
-// @TODO: is this function still used?
-function warnLatest(context, pkg, baseDir, msgs, yes) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const check = yield checkVersion(context, baseDir, pkg);
-        if (check.type === "up-to-date") {
-            return;
-        }
-        else if (check.type === "wrong-npm-registry") {
-            deps_1.logger.warn(`${msgs.requiredMsg()} Unable to find this package in your npm registry. Please update this dependency manually.`);
-            return;
-        }
-        if (yield user_utils_1.confirmWithUser(`${check.type === "not-installed"
-            ? msgs.requiredMsg()
-            : msgs.updateMsg(check.current, check.latest)}  Do you want to ${check.type === "not-installed" ? "add" : "update"} it now?`, yes)) {
-            installUpgrade(pkg, baseDir);
-        }
-    });
-}
-exports.warnLatest = warnLatest;
-function checkVersion(context, baseDir, pkg) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Try to get the latest version from npm
-        let last = null;
-        try {
-            last = yield latest_version_1.default(pkg);
-        }
-        catch (e) {
-            // This is likely because .npmrc is set to a different registry
-            return { type: "wrong-npm-registry" };
-        }
-        const cur = findInstalledVersion(context, baseDir, pkg);
-        if (!cur) {
-            return { type: "not-installed" };
-        }
-        if (semver_1.default.gt(last, cur)) {
-            return {
-                type: "obsolete",
-                latest: last,
-                current: cur,
-            };
-        }
-        return { type: "up-to-date" };
-    });
-}
 function findInstalledVersion(context, baseDir, pkg) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const pm = detectPackageManager(baseDir);
     try {
         if (pm === "yarn2") {
@@ -121,13 +66,19 @@ function findInstalledVersion(context, baseDir, pkg) {
                 }
             }
         }
-        else {
+        else if (pm === "npm") {
             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;
         }
+        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;
+        }
     }
     catch (err) {
         deps_1.logger.warn(`Could not detect installed version of ${pkg} using ${pm}: ${err}`);
@@ -234,8 +185,17 @@ function detectPackageManager(baseDir) {
     const yarnLock = findup_sync_1.default("yarn.lock", { cwd: baseDir });
     if (yarnLock) {
         const yarnVersion = child_process_1.execSync(`yarn --version`).toString().trim();
-        return semver_1.default.gte(yarnVersion, "2.0.0") ? "yarn2" : "yarn";
+        if (semver_1.default.gte(yarnVersion, "2.0.0")) {
+            return "yarn2";
+        }
+        else {
+            return "yarn";
+        }
+    }
+    const npmLock = findup_sync_1.default("package-lock.json", { cwd: baseDir });
+    if (npmLock) {
+        return "npm";
     }
-    return "npm";
+    return "unknown";
 }
 exports.detectPackageManager = detectPackageManager;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.241",
+  "version": "0.1.243",
   "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.180",
+    "@plasmicapp/react-web": "0.2.182",
     "@types/cli-progress": "^3.11.0",
     "@types/findup-sync": "^2.0.2",
     "@types/glob": "^7.1.3",
@@ -80,5 +80,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "36bd188ff81eca470799daa15bc7f002afa33b7b"
+  "gitHead": "dff00ecdf8a21a7e4744bcfd80efc4d5478fd00d"
 }

package/src/index.ts

@@ -322,6 +322,11 @@ function configureSyncArgs(
       describe: "Ignore post-sync commands in plasmic.json",
       default: false,
     })
+    .option("skip-upgrade-check", {
+      type: "boolean",
+      describe: "Skip upgrade check for Plasmic dependencies",
+      default: false,
+    })
     .option("metadata", {
       type: "string",
       describe:

package/src/utils/npm-utils.ts

@@ -1,12 +1,10 @@
 import { execSync, spawnSync } from "child_process";
 import findupSync from "findup-sync";
-import latest from "latest-version";
 import path from "path";
 import semver from "semver";
 import { logger } from "../deps";
 import { PlasmicContext } from "./config-utils";
 import { findFile, readFileText } from "./file-utils";
-import { confirmWithUser } from "./user-utils";
 
 export function getParsedCliPackageJson() {
   const packageJson = findupSync("package.json", { cwd: __dirname });
@@ -42,71 +40,6 @@ export function getParsedPackageJson() {
   return parsePackageJson(packageJson);
 }
 
-// @TODO: is this function still used?
-export async function warnLatest(
-  context: PlasmicContext,
-  pkg: string,
-  baseDir: string,
-  msgs: {
-    requiredMsg: () => string;
-    updateMsg: (curVersion: string, latestVersion: string) => string;
-  },
-  yes?: boolean
-) {
-  const check = await checkVersion(context, baseDir, pkg);
-  if (check.type === "up-to-date") {
-    return;
-  } else if (check.type === "wrong-npm-registry") {
-    logger.warn(
-      `${msgs.requiredMsg()} Unable to find this package in your npm registry. Please update this dependency manually.`
-    );
-    return;
-  }
-
-  if (
-    await confirmWithUser(
-      `${
-        check.type === "not-installed"
-          ? msgs.requiredMsg()
-          : msgs.updateMsg(check.current, check.latest)
-      }  Do you want to ${
-        check.type === "not-installed" ? "add" : "update"
-      } it now?`,
-      yes
-    )
-  ) {
-    installUpgrade(pkg, baseDir);
-  }
-}
-
-async function checkVersion(
-  context: PlasmicContext,
-  baseDir: string,
-  pkg: string
-) {
-  // Try to get the latest version from npm
-  let last = null;
-  try {
-    last = await latest(pkg);
-  } catch (e) {
-    // This is likely because .npmrc is set to a different registry
-    return { type: "wrong-npm-registry" } as const;
-  }
-
-  const cur = findInstalledVersion(context, baseDir, pkg);
-  if (!cur) {
-    return { type: "not-installed" } as const;
-  }
-  if (semver.gt(last, cur)) {
-    return {
-      type: "obsolete",
-      latest: last,
-      current: cur,
-    } as const;
-  }
-  return { type: "up-to-date" } as const;
-}
-
 export function findInstalledVersion(
   context: PlasmicContext,
   baseDir: string,
@@ -132,12 +65,17 @@ export function findInstalledVersion(
           return info.data.trees[0].name.replace(`${pkg}@`, "");
         }
       }
-    } else {
+    } else if (pm === "npm") {
       const output = execSync(`npm list --package-lock-only --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();
+      const info = JSON.parse(output);
+      return info?.dependencies?.[pkg]?.version;
     }
   } catch (err) {
     logger.warn(
@@ -250,8 +188,17 @@ export function detectPackageManager(baseDir: string) {
   const yarnLock = findupSync("yarn.lock", { cwd: baseDir });
   if (yarnLock) {
     const yarnVersion = execSync(`yarn --version`).toString().trim();
-    return semver.gte(yarnVersion, "2.0.0") ? "yarn2" : "yarn";
+    if (semver.gte(yarnVersion, "2.0.0")) {
+      return "yarn2";
+    } else {
+      return "yarn";
+    }
+  }
+
+  const npmLock = findupSync("package-lock.json", { cwd: baseDir });
+  if (npmLock) {
+    return "npm";
   }
 
-  return "npm";
+  return "unknown";
 }