@plasmicapp/cli 0.1.251 → 0.1.253

package/dist/actions/init.js

@@ -38,13 +38,14 @@ function initPlasmic(opts) {
         // path to plasmic.json
         const newConfigFile = opts.config || upath_1.default.join(opts.baseDir, config_utils_1.CONFIG_FILE_NAME);
         const answers = yield deriveInitAnswers(opts);
-        yield config_utils_1.writeConfig(newConfigFile, createInitConfig(answers), opts.baseDir);
+        const initConfig = createInitConfig(answers);
+        yield config_utils_1.writeConfig(newConfigFile, initConfig, opts.baseDir);
         if (!process.env.QUIET) {
             deps_1.logger.info("Successfully created plasmic.json.\n");
         }
         const answer = yield user_utils_1.confirmWithUser("@plasmicapp/react-web is a small runtime required by Plasmic-generated code.\n  Do you want to add them now?", opts.yes);
         if (answer) {
-            npm_utils_1.installUpgrade("@plasmicapp/react-web", opts.baseDir);
+            npm_utils_1.installUpgrade(initConfig, "@plasmicapp/react-web", opts.baseDir);
         }
     });
 }

package/dist/actions/sync.js

@@ -60,10 +60,10 @@ function ensureRequiredPackages(context, baseDir, yes) {
         const requireds = yield context.api.requiredPackages();
         const confirmInstall = (pkg, requiredVersion, opts) => __awaiter(this, void 0, void 0, function* () {
             let success = false;
-            const command = npm_utils_1.installCommand(pkg, baseDir, opts);
+            const command = npm_utils_1.installCommand(context.config, pkg, baseDir, opts);
             const upgrade = yield user_utils_1.confirmWithUser(`A more recent version of ${pkg} >=${requiredVersion} is required. Would you like to upgrade via "${command}"?`, yes);
             if (upgrade) {
-                success = npm_utils_1.installUpgrade(pkg, baseDir, opts);
+                success = npm_utils_1.installUpgrade(context.config, pkg, baseDir, opts);
             }
             else {
                 success = false;
@@ -83,14 +83,14 @@ function ensureRequiredPackages(context, baseDir, yes) {
             // Exit so the user can run again with the new cli
             throw new error_1.HandledError();
         }
-        const reactWebVersion = npm_utils_1.findInstalledVersion(context, baseDir, "@plasmicapp/react-web");
+        const reactWebVersion = npm_utils_1.findInstalledVersion(context.config, baseDir, "@plasmicapp/react-web");
         if (!reactWebVersion ||
             semver.gt(requireds["@plasmicapp/react-web"], reactWebVersion)) {
             yield confirmInstall("@plasmicapp/react-web", requireds["@plasmicapp/react-web"], { global: false, dev: false });
         }
         if (context.config.code.reactRuntime === "automatic") {
             // Using automatic runtime requires installing the @plasmicapp/react-web-runtime package
-            const runtimeVersion = npm_utils_1.findInstalledVersion(context, baseDir, "@plasmicapp/react-web-runtime");
+            const runtimeVersion = npm_utils_1.findInstalledVersion(context.config, baseDir, "@plasmicapp/react-web-runtime");
             if (!runtimeVersion ||
                 semver.gt(requireds["@plasmicapp/react-web-runtime"], runtimeVersion)) {
                 yield confirmInstall("@plasmicapp/react-web-runtime", requireds["@plasmicapp/react-web-runtime"], { global: false, dev: false });
@@ -288,13 +288,13 @@ exports.sync = sync;
 function checkExternalPkgs(context, baseDir, opts, pkgs) {
     return __awaiter(this, void 0, void 0, function* () {
         const missingPkgs = pkgs.filter((pkg) => {
-            const installedPkg = npm_utils_1.findInstalledVersion(context, baseDir, pkg);
+            const installedPkg = npm_utils_1.findInstalledVersion(context.config, baseDir, pkg);
             return !installedPkg;
         });
         if (missingPkgs.length > 0) {
             const upgrade = yield user_utils_1.confirmWithUser(`The following packages aren't installed but are required by some projects, would you like to install them? ${missingPkgs.join(", ")}`, opts.yes);
             if (upgrade) {
-                npm_utils_1.installUpgrade(missingPkgs.join(" "), baseDir);
+                npm_utils_1.installUpgrade(context.config, missingPkgs.join(" "), baseDir);
             }
         }
     });

package/dist/migrations/migrations.js

@@ -79,7 +79,7 @@ function runNecessaryMigrations(configFile, lockFile, baseDir, yes) {
             if (!confirm) {
                 throw new error_1.HandledError("Upgrading is required to continue.");
             }
-            const success = npm_utils_1.installUpgrade("@plasmicapp/cli", baseDir, {
+            const success = npm_utils_1.installUpgrade(cur, "@plasmicapp/cli", baseDir, {
                 global: npm_utils_1.isCliGloballyInstalled(upath_1.default.dirname(configFile)),
                 dev: true,
             });

package/dist/plasmic.schema.json

@@ -447,6 +447,16 @@
             },
             "type": "object"
         },
+        "packageManager": {
+            "description": "Package manager to use when installing or upgrading required\npackages. If not specified, then it is best-effort automatically\nderived.",
+            "enum": [
+                "npm",
+                "pnpm",
+                "yarn",
+                "yarn2"
+            ],
+            "type": "string"
+        },
         "platform": {
             "description": "Target platform to generate code for",
             "enum": [

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

@@ -64,6 +64,12 @@ export interface PlasmicConfig {
     i18n?: I18NConfig;
     /** Arbitrary command to run after `plasmic sync` has run; useful for linting and code formatting synced files */
     postSyncCommands?: string[];
+    /**
+     * Package manager to use when installing or upgrading required
+     * packages. If not specified, then it is best-effort automatically
+     * derived.
+     */
+    packageManager?: "npm" | "yarn" | "yarn2" | "pnpm";
 }
 export interface CodeConfig {
     /** Language to generate code in */

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

@@ -1,4 +1,4 @@
-import { PlasmicContext } from "./config-utils";
+import { PlasmicConfig } from "./config-utils";
 export declare function getParsedCliPackageJson(): any;
 export declare function getCliVersion(): string;
 /**
@@ -6,19 +6,19 @@ export declare function getCliVersion(): string;
  */
 export declare function checkEngineStrict(): boolean;
 export declare function getParsedPackageJson(): any;
-export declare function findInstalledVersion(context: PlasmicContext, baseDir: string, pkg: string): any;
+export declare function findInstalledVersion(config: PlasmicConfig, baseDir: string, pkg: string): any;
 /**
  * Detects if the cli is globally installed.  `rootDir` is the folder
  * where plasmic.json is
  */
 export declare function isCliGloballyInstalled(rootDir: string): boolean;
 export declare function findPackageJsonDir(rootDir: string): string | undefined;
-export declare function installUpgrade(pkg: string, baseDir: string, opts?: {
+export declare function installUpgrade(config: PlasmicConfig, pkg: string, baseDir: string, opts?: {
     global?: boolean;
     dev?: boolean;
 }): boolean;
-export declare function installCommand(pkg: string, baseDir: string, opts?: {
+export declare function installCommand(config: PlasmicConfig, pkg: string, baseDir: string, opts?: {
     global?: boolean;
     dev?: boolean;
 }): string;
-export declare function detectPackageManager(baseDir: string): "yarn2" | "yarn" | "npm" | "unknown";
+export declare function detectPackageManager(config: PlasmicConfig, baseDir: string): "npm" | "yarn" | "yarn2" | "pnpm" | "unknown";

package/dist/utils/npm-utils.js

@@ -45,9 +45,9 @@ function getParsedPackageJson() {
     return parsePackageJson(packageJson);
 }
 exports.getParsedPackageJson = getParsedPackageJson;
-function findInstalledVersion(context, baseDir, pkg) {
+function findInstalledVersion(config, baseDir, pkg) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    const pm = detectPackageManager(baseDir);
+    const pm = detectPackageManager(config, baseDir);
     try {
         if (pm === "yarn2") {
             const output = child_process_1.execSync(`yarn info --json ${pkg}`).toString().trim();
@@ -121,8 +121,8 @@ function parsePackageJson(path) {
         return undefined;
     }
 }
-function installUpgrade(pkg, baseDir, opts = {}) {
-    const cmd = installCommand(pkg, baseDir, opts);
+function installUpgrade(config, pkg, baseDir, opts = {}) {
+    const cmd = installCommand(config, pkg, baseDir, opts);
     if (!process.env.QUIET) {
         deps_1.logger.info(cmd);
     }
@@ -143,8 +143,8 @@ function installUpgrade(pkg, baseDir, opts = {}) {
     }
 }
 exports.installUpgrade = installUpgrade;
-function installCommand(pkg, baseDir, opts = {}) {
-    const mgr = detectPackageManager(baseDir);
+function installCommand(config, pkg, baseDir, opts = {}) {
+    const mgr = detectPackageManager(config, baseDir);
     if (mgr === "yarn") {
         if (opts.global) {
             return `yarn global add ${pkg}`;
@@ -181,7 +181,10 @@ function installCommand(pkg, baseDir, opts = {}) {
     }
 }
 exports.installCommand = installCommand;
-function detectPackageManager(baseDir) {
+function detectPackageManager(config, baseDir) {
+    if (config.packageManager) {
+        return config.packageManager;
+    }
     const yarnLock = findup_sync_1.default("yarn.lock", { cwd: baseDir });
     if (yarnLock) {
         const yarnVersion = child_process_1.execSync(`yarn --version`).toString().trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.251",
+  "version": "0.1.253",
   "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.189",
+    "@plasmicapp/react-web": "0.2.190",
     "@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": "a9fb9ed8d9fb397f60a30f9078e0c05912130a7c"
+  "gitHead": "96b7db457fb8ad72167bc8a793d2718406d763a5"
 }

package/src/actions/init.ts

@@ -67,7 +67,8 @@ export async function initPlasmic(
     opts.config || path.join(opts.baseDir, CONFIG_FILE_NAME);
 
   const answers = await deriveInitAnswers(opts);
-  await writeConfig(newConfigFile, createInitConfig(answers), opts.baseDir);
+  const initConfig = createInitConfig(answers);
+  await writeConfig(newConfigFile, initConfig, opts.baseDir);
 
   if (!process.env.QUIET) {
     logger.info("Successfully created plasmic.json.\n");
@@ -78,7 +79,7 @@ export async function initPlasmic(
     opts.yes
   );
   if (answer) {
-    installUpgrade("@plasmicapp/react-web", opts.baseDir);
+    installUpgrade(initConfig, "@plasmicapp/react-web", opts.baseDir);
   }
 }
 

package/src/actions/sync.ts

@@ -88,13 +88,13 @@ async function ensureRequiredPackages(
     opts: { global: boolean; dev: boolean }
   ) => {
     let success = false;
-    const command = installCommand(pkg, baseDir, opts);
+    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}"?`,
       yes
     );
     if (upgrade) {
-      success = installUpgrade(pkg, baseDir, opts);
+      success = installUpgrade(context.config, pkg, baseDir, opts);
     } else {
       success = false;
     }
@@ -121,7 +121,7 @@ async function ensureRequiredPackages(
   }
 
   const reactWebVersion = findInstalledVersion(
-    context,
+    context.config,
     baseDir,
     "@plasmicapp/react-web"
   );
@@ -139,7 +139,7 @@ async function ensureRequiredPackages(
   if (context.config.code.reactRuntime === "automatic") {
     // Using automatic runtime requires installing the @plasmicapp/react-web-runtime package
     const runtimeVersion = findInstalledVersion(
-      context,
+      context.config,
       baseDir,
       "@plasmicapp/react-web-runtime"
     );
@@ -443,7 +443,7 @@ async function checkExternalPkgs(
   pkgs: string[]
 ) {
   const missingPkgs = pkgs.filter((pkg) => {
-    const installedPkg = findInstalledVersion(context, baseDir, pkg);
+    const installedPkg = findInstalledVersion(context.config, baseDir, pkg);
     return !installedPkg;
   });
   if (missingPkgs.length > 0) {
@@ -455,7 +455,7 @@ async function checkExternalPkgs(
     );
 
     if (upgrade) {
-      installUpgrade(missingPkgs.join(" "), baseDir);
+      installUpgrade(context.config, missingPkgs.join(" "), baseDir);
     }
   }
 }

package/src/migrations/migrations.ts

@@ -98,7 +98,7 @@ export async function runNecessaryMigrations(
       throw new HandledError("Upgrading is required to continue.");
     }
 
-    const success = installUpgrade("@plasmicapp/cli", baseDir, {
+    const success = installUpgrade(cur, "@plasmicapp/cli", baseDir, {
       global: isCliGloballyInstalled(path.dirname(configFile)),
       dev: true,
     });

package/src/utils/config-utils.ts

@@ -96,6 +96,13 @@ export interface PlasmicConfig {
 
   /** Arbitrary command to run after `plasmic sync` has run; useful for linting and code formatting synced files */
   postSyncCommands?: string[];
+
+  /**
+   * Package manager to use when installing or upgrading required
+   * packages. If not specified, then it is best-effort automatically
+   * derived.
+   */
+  packageManager?: "npm" | "yarn" | "yarn2" | "pnpm";
 }
 
 export interface CodeConfig {

package/src/utils/npm-utils.ts

@@ -3,7 +3,7 @@ import findupSync from "findup-sync";
 import path from "path";
 import semver from "semver";
 import { logger } from "../deps";
-import { PlasmicContext } from "./config-utils";
+import { PlasmicConfig } from "./config-utils";
 import { findFile, readFileText } from "./file-utils";
 
 export function getParsedCliPackageJson() {
@@ -41,11 +41,11 @@ export function getParsedPackageJson() {
 }
 
 export function findInstalledVersion(
-  context: PlasmicContext,
+  config: PlasmicConfig,
   baseDir: string,
   pkg: string
 ) {
-  const pm = detectPackageManager(baseDir);
+  const pm = detectPackageManager(config, baseDir);
   try {
     if (pm === "yarn2") {
       const output = execSync(`yarn info --json ${pkg}`).toString().trim();
@@ -124,11 +124,12 @@ function parsePackageJson(path: string) {
 }
 
 export function installUpgrade(
+  config: PlasmicConfig,
   pkg: string,
   baseDir: string,
   opts: { global?: boolean; dev?: boolean } = {}
 ) {
-  const cmd = installCommand(pkg, baseDir, opts);
+  const cmd = installCommand(config, pkg, baseDir, opts);
   if (!process.env.QUIET) {
     logger.info(cmd);
   }
@@ -151,11 +152,12 @@ export function installUpgrade(
 }
 
 export function installCommand(
+  config: PlasmicConfig,
   pkg: string,
   baseDir: string,
   opts: { global?: boolean; dev?: boolean } = {}
 ) {
-  const mgr = detectPackageManager(baseDir);
+  const mgr = detectPackageManager(config, baseDir);
   if (mgr === "yarn") {
     if (opts.global) {
       return `yarn global add ${pkg}`;
@@ -184,7 +186,10 @@ export function installCommand(
   }
 }
 
-export function detectPackageManager(baseDir: string) {
+export function detectPackageManager(config: PlasmicConfig, baseDir: string) {
+  if (config.packageManager) {
+    return config.packageManager;
+  }
   const yarnLock = findupSync("yarn.lock", { cwd: baseDir });
   if (yarnLock) {
     const yarnVersion = execSync(`yarn --version`).toString().trim();