@plasmicapp/cli 0.1.321 → 0.1.322

package/dist/index.js

@@ -504502,11 +504502,11 @@ async function readCurStyleMap(context) {
 // src/actions/sync.ts
 async function ensureRequiredPackages(context, baseDir, yes) {
   const requireds = await context.api.requiredPackages();
-  const confirmInstall = async (pkg, requiredVersion, opts) => {
+  const confirmInstall = async (pkg, requiredVersion, currentVersion, opts) => {
     let success = false;
     const command = installCommand(context.config, pkg, baseDir, opts);
     const upgrade = await confirmWithUser(
-      `A more recent version of ${pkg} >=${requiredVersion} is required. Would you like to upgrade via "${command}"?`,
+      currentVersion ? `A more recent version of ${pkg} >=${requiredVersion} is required (you currently have ${currentVersion}). Would you like to upgrade via "${command}"?` : `You need ${pkg} >=${requiredVersion} to proceed.  Would you like to install via "${command}"?`,
       yes
     );
     if (upgrade) {
@@ -504521,10 +504521,15 @@ async function ensureRequiredPackages(context, baseDir, yes) {
   const cliVersion = getCliVersion();
   if (!cliVersion || gt2(requireds["@plasmicapp/cli"], cliVersion)) {
     const isGlobal = isCliGloballyInstalled(context.rootDir);
-    await confirmInstall("@plasmicapp/cli", requireds["@plasmicapp/cli"], {
-      global: isGlobal,
-      dev: true
-    });
+    await confirmInstall(
+      "@plasmicapp/cli",
+      requireds["@plasmicapp/cli"],
+      cliVersion,
+      {
+        global: isGlobal,
+        dev: true
+      }
+    );
     logger.info(
       import_chalk6.default.bold("@plasmicapp/cli has been upgraded; please try again!")
     );
@@ -504539,6 +504544,7 @@ async function ensureRequiredPackages(context, baseDir, yes) {
     await confirmInstall(
       "@plasmicapp/react-web",
       requireds["@plasmicapp/react-web"],
+      reactWebVersion,
       { global: false, dev: false }
     );
   }
@@ -504552,6 +504558,7 @@ async function ensureRequiredPackages(context, baseDir, yes) {
       await confirmInstall(
         "@plasmicapp/react-web-runtime",
         requireds["@plasmicapp/react-web-runtime"],
+        runtimeVersion,
         { global: false, dev: false }
       );
     }
@@ -504731,15 +504738,21 @@ async function sync(opts, metadataDefaults) {
   }
 }
 async function checkExternalPkgs(context, baseDir, opts, pkgs) {
-  const missingPkgs = pkgs.filter((pkgSpec) => {
+  const missingPkgs = pkgs.map((pkgSpec) => {
     const [pkg, version] = pkgSpec.split("@");
-    const installedVersion = findInstalledVersion(context.config, baseDir, pkg);
-    if (version) {
-      return version !== installedVersion;
+    const installedVersion = findInstalledVersion(
+      context.config,
+      baseDir,
+      pkg
+    );
+    if (!installedVersion) {
+      return pkg;
+    } else if (version) {
+      return gt2(version, installedVersion) ? pkg : void 0;
     } else {
-      return !installedVersion;
+      return void 0;
     }
-  });
+  }).filter((x) => !!x);
   if (missingPkgs.length > 0) {
     const upgrade = await confirmWithUser(
       `The following packages aren't installed or are outdated, but are required by some projects; would you like to install them? ${missingPkgs.join(

package/dist/lib.js

@@ -499800,11 +499800,11 @@ async function readCurStyleMap(context) {
 // src/actions/sync.ts
 async function ensureRequiredPackages(context, baseDir, yes) {
   const requireds = await context.api.requiredPackages();
-  const confirmInstall = async (pkg, requiredVersion, opts) => {
+  const confirmInstall = async (pkg, requiredVersion, currentVersion, opts) => {
     let success = false;
     const command = installCommand(context.config, pkg, baseDir, opts);
     const upgrade = await confirmWithUser(
-      `A more recent version of ${pkg} >=${requiredVersion} is required. Would you like to upgrade via "${command}"?`,
+      currentVersion ? `A more recent version of ${pkg} >=${requiredVersion} is required (you currently have ${currentVersion}). Would you like to upgrade via "${command}"?` : `You need ${pkg} >=${requiredVersion} to proceed.  Would you like to install via "${command}"?`,
       yes
     );
     if (upgrade) {
@@ -499819,10 +499819,15 @@ async function ensureRequiredPackages(context, baseDir, yes) {
   const cliVersion = getCliVersion();
   if (!cliVersion || gt2(requireds["@plasmicapp/cli"], cliVersion)) {
     const isGlobal = isCliGloballyInstalled(context.rootDir);
-    await confirmInstall("@plasmicapp/cli", requireds["@plasmicapp/cli"], {
-      global: isGlobal,
-      dev: true
-    });
+    await confirmInstall(
+      "@plasmicapp/cli",
+      requireds["@plasmicapp/cli"],
+      cliVersion,
+      {
+        global: isGlobal,
+        dev: true
+      }
+    );
     logger.info(
       import_chalk6.default.bold("@plasmicapp/cli has been upgraded; please try again!")
     );
@@ -499837,6 +499842,7 @@ async function ensureRequiredPackages(context, baseDir, yes) {
     await confirmInstall(
       "@plasmicapp/react-web",
       requireds["@plasmicapp/react-web"],
+      reactWebVersion,
       { global: false, dev: false }
     );
   }
@@ -499850,6 +499856,7 @@ async function ensureRequiredPackages(context, baseDir, yes) {
       await confirmInstall(
         "@plasmicapp/react-web-runtime",
         requireds["@plasmicapp/react-web-runtime"],
+        runtimeVersion,
         { global: false, dev: false }
       );
     }
@@ -500029,15 +500036,21 @@ async function sync(opts, metadataDefaults) {
   }
 }
 async function checkExternalPkgs(context, baseDir, opts, pkgs) {
-  const missingPkgs = pkgs.filter((pkgSpec) => {
+  const missingPkgs = pkgs.map((pkgSpec) => {
     const [pkg, version] = pkgSpec.split("@");
-    const installedVersion = findInstalledVersion(context.config, baseDir, pkg);
-    if (version) {
-      return version !== installedVersion;
+    const installedVersion = findInstalledVersion(
+      context.config,
+      baseDir,
+      pkg
+    );
+    if (!installedVersion) {
+      return pkg;
+    } else if (version) {
+      return gt2(version, installedVersion) ? pkg : void 0;
     } else {
-      return !installedVersion;
+      return void 0;
     }
-  });
+  }).filter((x) => !!x);
   if (missingPkgs.length > 0) {
     const upgrade = await confirmWithUser(
       `The following packages aren't installed or are outdated, but are required by some projects; would you like to install them? ${missingPkgs.join(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.321",
+  "version": "0.1.322",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -83,5 +83,5 @@
     "wrap-ansi": "^7.0.0",
     "yargs": "^15.4.1"
   },
-  "gitHead": "1089fbd93d2ac0d2ac7e0e8f755ba98d5c21f0eb"
+  "gitHead": "38d7f209c6f5ac131c4d34395166ea5eafcc733b"
 }

package/src/actions/sync.ts

@@ -84,12 +84,15 @@ async function ensureRequiredPackages(
   const confirmInstall = async (
     pkg: string,
     requiredVersion: string,
+    currentVersion: string | undefined,
     opts: { global: boolean; dev: boolean }
   ) => {
     let success = false;
     const command = installCommand(context.config, pkg, baseDir, opts);
     const upgrade = await confirmWithUser(
-      `A more recent version of ${pkg} >=${requiredVersion} is required. Would you like to upgrade via "${command}"?`,
+      currentVersion
+        ? `A more recent version of ${pkg} >=${requiredVersion} is required (you currently have ${currentVersion}). Would you like to upgrade via "${command}"?`
+        : `You need ${pkg} >=${requiredVersion} to proceed.  Would you like to install via "${command}"?`,
       yes
     );
     if (upgrade) {
@@ -106,10 +109,15 @@ async function ensureRequiredPackages(
   const cliVersion = getCliVersion();
   if (!cliVersion || semver.gt(requireds["@plasmicapp/cli"], cliVersion)) {
     const isGlobal = isCliGloballyInstalled(context.rootDir);
-    await confirmInstall("@plasmicapp/cli", requireds["@plasmicapp/cli"], {
-      global: isGlobal,
-      dev: true,
-    });
+    await confirmInstall(
+      "@plasmicapp/cli",
+      requireds["@plasmicapp/cli"],
+      cliVersion,
+      {
+        global: isGlobal,
+        dev: true,
+      }
+    );
 
     logger.info(
       chalk.bold("@plasmicapp/cli has been upgraded; please try again!")
@@ -131,6 +139,7 @@ async function ensureRequiredPackages(
     await confirmInstall(
       "@plasmicapp/react-web",
       requireds["@plasmicapp/react-web"],
+      reactWebVersion,
       { global: false, dev: false }
     );
   }
@@ -149,6 +158,7 @@ async function ensureRequiredPackages(
       await confirmInstall(
         "@plasmicapp/react-web-runtime",
         requireds["@plasmicapp/react-web-runtime"],
+        runtimeVersion,
         { global: false, dev: false }
       );
     }
@@ -403,15 +413,26 @@ async function checkExternalPkgs(
   opts: SyncArgs,
   pkgs: string[]
 ) {
-  const missingPkgs = pkgs.filter((pkgSpec) => {
-    const [pkg, version] = pkgSpec.split("@");
-    const installedVersion = findInstalledVersion(context.config, baseDir, pkg);
-    if (version) {
-      return version !== installedVersion;
-    } else {
-      return !installedVersion;
-    }
-  });
+  const missingPkgs = pkgs
+    .map((pkgSpec) => {
+      const [pkg, version] = pkgSpec.split("@");
+      const installedVersion = findInstalledVersion(
+        context.config,
+        baseDir,
+        pkg
+      );
+      if (!installedVersion) {
+        // Not installed
+        return pkg;
+      } else if (version) {
+        // Installed, so check against requested version; upgrade if
+        // requested version is greater than installed version
+        return semver.gt(version, installedVersion) ? pkg : undefined;
+      } else {
+        return undefined;
+      }
+    })
+    .filter((x): x is string => !!x);
   if (missingPkgs.length > 0) {
     const upgrade = await confirmWithUser(
       `The following packages aren't installed or are outdated, but are required by some projects; would you like to install them? ${missingPkgs.join(