@plasmicapp/cli 0.1.162 → 0.1.166

package/dist/__mocks__/api.js

@@ -50,7 +50,7 @@ function mockProjectToProjectVersionMeta(mock, componentIdOrNames) {
             .filter((c) => !componentIdOrNames ||
             componentIdOrNames.includes(c.name) ||
             componentIdOrNames.includes(c.id))
-            .map((c) => c.id) });
+            .map((c) => c.id), indirect: false });
 }
 /**
  * Call this in test to setup the data model

package/dist/actions/sync.js

@@ -82,14 +82,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, "@plasmicapp/react-web");
+        const reactWebVersion = npm_utils_1.findInstalledVersion(context, 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, "@plasmicapp/react-web-runtime");
+            const runtimeVersion = npm_utils_1.findInstalledVersion(context, 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 });
@@ -150,6 +150,7 @@ function sync(opts, metadataDefaults) {
                 versionRange: versionRange || ((_a = projectConfigMap[projectId]) === null || _a === void 0 ? void 0 : _a.version) || "latest",
                 componentIdOrNames: undefined,
                 projectApiToken: projectApiToken || projectIdToToken.get(projectId),
+                indirect: false,
             };
         });
         const projectSyncParams = projectWithVersion.length
@@ -159,6 +160,7 @@ function sync(opts, metadataDefaults) {
                 versionRange: p.version,
                 componentIdOrNames: undefined,
                 projectApiToken: p.projectApiToken,
+                indirect: !!p.indirect,
             }));
         // Short-circuit if nothing to sync
         if (projectSyncParams.length === 0) {
@@ -212,7 +214,7 @@ function sync(opts, metadataDefaults) {
             // Sync in sequence (no parallelism)
             // going in reverse to get leaves of the dependency tree first
             for (const projectMeta of projectsToSync) {
-                yield syncProject(context, opts, projectIdsAndTokens, projectMeta.projectId, projectMeta.componentIds, projectMeta.version, projectMeta.dependencies, summary, pendingMerge, metadataDefaults);
+                yield syncProject(context, opts, projectIdsAndTokens, projectMeta.projectId, projectMeta.componentIds, projectMeta.version, projectMeta.dependencies, summary, pendingMerge, projectMeta.indirect, metadataDefaults);
             }
             // Materialize scheme into each component config.
             context.config.projects.forEach((p) => p.components.forEach((c) => {
@@ -221,11 +223,20 @@ function sync(opts, metadataDefaults) {
                 }
             }));
             yield syncStyleConfig(context, yield context.api.genStyleConfig(context.config.style));
-            // Update project version if specified and successfully synced.
+            // Update project version and indirect status if specified and
+            // successfully synced.
             if (projectWithVersion.length) {
                 const versionMap = {};
                 projectWithVersion.forEach((p) => (versionMap[p.projectId] = p.versionRange));
-                context.config.projects.forEach((p) => (p.version = versionMap[p.projectId] || p.version));
+                const indirectMap = {};
+                projectsToSync.forEach((p) => (indirectMap[p.projectId] = p.indirect));
+                context.config.projects.forEach((p) => {
+                    p.version = versionMap[p.projectId] || p.version;
+                    // Only update `indirect` if it is set in current config.
+                    if (p.projectId in indirectMap && p.indirect) {
+                        p.indirect = indirectMap[p.projectId];
+                    }
+                });
             }
             // Fix imports
             const fixImportContext = code_utils_1.mkFixImportContext(context.config);
@@ -281,7 +292,7 @@ function fixFileExtension(context) {
         });
     });
 }
-function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds, projectVersion, dependencies, summary, pendingMerge, metadataDefaults) {
+function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds, projectVersion, dependencies, summary, pendingMerge, indirect, metadataDefaults) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const newComponentScheme = opts.newComponentScheme || context.config.code.scheme;
@@ -301,6 +312,7 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
             checksums: existingChecksums,
             codeOpts: context.config.code,
             metadata: get_context_1.generateMetadata(Object.assign(Object.assign({}, metadataDefaults), { platform: context.config.platform }), opts.metadata),
+            indirect,
         });
         // Convert from TSX => JSX
         if (context.config.code.lang === "js") {
@@ -319,8 +331,8 @@ function syncProject(context, opts, projectIdsAndTokens, projectId, componentIds
             });
         }
         yield sync_global_variants_1.syncGlobalVariants(context, projectBundle.projectConfig, projectBundle.globalVariants, projectBundle.checksums, opts.baseDir);
+        yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, !!opts.appendJsxOnMissingBase, summary, pendingMerge, projectBundle.checksums, opts.baseDir, indirect);
         syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
-        yield syncProjectConfig(context, projectBundle.projectConfig, projectApiToken, projectVersion, dependencies, projectBundle.components, opts.forceOverwrite, !!opts.appendJsxOnMissingBase, summary, pendingMerge, projectBundle.checksums, opts.baseDir);
         yield sync_styles_1.upsertStyleTokens(context, projectBundle.usedTokens);
         yield sync_icons_1.syncProjectIconAssets(context, projectId, projectVersion, projectBundle.iconAssets, projectBundle.checksums, opts.baseDir);
         yield sync_images_1.syncProjectImageAssets(context, projectId, projectVersion, projectBundle.imageAssets, projectBundle.checksums);
@@ -336,18 +348,17 @@ function syncStyleConfig(context, response) {
         });
     });
 }
-function syncProjectConfig(context, projectBundle, projectApiToken, version, dependencies, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, checksums, baseDir) {
+function syncProjectConfig(context, projectBundle, projectApiToken, version, dependencies, componentBundles, forceOverwrite, appendJsxOnMissingBase, summary, pendingMerge, checksums, baseDir, indirect) {
     return __awaiter(this, void 0, void 0, function* () {
         const defaultCssFilePath = file_utils_1.defaultResourcePath(context, projectBundle.projectName, projectBundle.cssFileName);
         const isNew = !context.config.projects.find((p) => p.projectId === projectBundle.projectId);
-        // If latest, use that as the range, otherwise set to latest published (>=0.0.0)
-        const versionRange = semver.isLatest(version) ? version : ">=0.0.0";
         const projectConfig = config_utils_1.getOrAddProjectConfig(context, projectBundle.projectId, config_utils_1.createProjectConfig({
             projectId: projectBundle.projectId,
             projectApiToken,
             projectName: projectBundle.projectName,
-            version: versionRange,
+            version,
             cssFilePath: defaultCssFilePath,
+            indirect,
         }));
         // Update missing/outdated props
         projectConfig.projectName = projectBundle.projectName;

package/dist/api.d.ts

@@ -58,6 +58,7 @@ export interface ProjectVersionMeta {
     dependencies: {
         [projectId: string]: string;
     };
+    indirect: boolean;
 }
 export interface VersionResolution {
     projects: ProjectVersionMeta[];
@@ -165,6 +166,7 @@ export declare class PlasmicApi {
         stylesOpts: StyleConfig;
         codeOpts: CodeConfig;
         checksums: ChecksumBundle;
+        indirect: boolean;
         metadata?: Metadata;
     }): Promise<ProjectBundle>;
     uploadBundle(projectId: string, bundleName: string, bundleJs: string, css: string[], metaJson: string, genModulePath: string | undefined, genCssPaths: string[], pkgVersion: string | undefined, extraPropMetaJson: string | undefined, themeProviderWrapper: string | undefined, themeModule: string | undefined): Promise<StyleTokensMap>;

package/dist/migrations/0.1.166-indirect.d.ts

@@ -0,0 +1,2 @@
+import { PlasmicConfig } from "../utils/config-utils";
+export declare function ensureIndirect(config: PlasmicConfig): PlasmicConfig;

package/dist/migrations/0.1.166-indirect.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureIndirect = void 0;
+function ensureIndirect(config) {
+    for (const p of config.projects) {
+        if (p.indirect === undefined) {
+            p.indirect = false;
+        }
+    }
+    return config;
+}
+exports.ensureIndirect = ensureIndirect;

package/dist/migrations/migrations.js

@@ -40,6 +40,7 @@ const npm_utils_1 = require("../utils/npm-utils");
 const user_utils_1 = require("../utils/user-utils");
 const _0_1_110_fileLocks_1 = require("./0.1.110-fileLocks");
 const _0_1_146_addReactRuntime_1 = require("./0.1.146-addReactRuntime");
+const _0_1_166_indirect_1 = require("./0.1.166-indirect");
 const _0_1_27_migrateInit_1 = require("./0.1.27-migrateInit");
 const _0_1_28_tsToTsx_1 = require("./0.1.28-tsToTsx");
 const _0_1_31_ensureProjectIcons_1 = require("./0.1.31-ensureProjectIcons");
@@ -56,6 +57,7 @@ exports.MIGRATIONS = {
     "0.1.64": _0_1_64_imageFiles_1.ensureImageFiles,
     "0.1.95": _0_1_95_componentType_1.ensureComponentType,
     "0.1.146": _0_1_146_addReactRuntime_1.ensureReactRuntime,
+    "0.1.166": _0_1_166_indirect_1.ensureIndirect,
 };
 exports.LOCK_MIGRATIONS = {
     "0.1.110": _0_1_110_fileLocks_1.ensureFileLocks,

package/dist/plasmic.schema.json

@@ -296,6 +296,10 @@
                     },
                     "type": "array"
                 },
+                "indirect": {
+                    "description": "True if the project was installed indirectly (as a dependency); if set,\ncodegen will not generate pages.",
+                    "type": "boolean"
+                },
                 "jsBundleThemes": {
                     "items": {
                         "$ref": "#/definitions/JsBundleThemeConfig"
@@ -324,6 +328,7 @@
                 "cssFilePath",
                 "icons",
                 "images",
+                "indirect",
                 "projectId",
                 "projectName",
                 "version"

package/dist/test-common/fixtures.js

@@ -138,6 +138,7 @@ exports.project1Config = {
     icons: [],
     images: [],
     jsBundleThemes: [],
+    indirect: false,
 };
 function expectProject1PlasmicJson() {
     const plasmicJson = exports.tmpRepo.readPlasmicJson();

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

@@ -126,6 +126,11 @@ export interface ProjectConfig {
     icons: IconConfig[];
     /** Metadata for each synced image in this project */
     images: ImageConfig[];
+    /**
+     * True if the project was installed indirectly (as a dependency); if set,
+     * codegen will not generate pages.
+     */
+    indirect: boolean;
 }
 export declare function createProjectConfig(base: {
     projectId: string;
@@ -133,6 +138,7 @@ export declare function createProjectConfig(base: {
     projectName: string;
     version: string;
     cssFilePath: string;
+    indirect: boolean;
 }): ProjectConfig;
 export interface TokensConfig {
     scheme: "theo";

package/dist/utils/config-utils.js

@@ -39,6 +39,7 @@ function createProjectConfig(base) {
         components: [],
         icons: [],
         images: [],
+        indirect: base.indirect,
     };
 }
 exports.createProjectConfig = createProjectConfig;
@@ -148,6 +149,7 @@ function getOrAddProjectConfig(context, projectId, base // if one doesn't exist,
                 icons: [],
                 images: [],
                 jsBundleThemes: [],
+                indirect: false,
             };
         context.config.projects.push(project);
     }

package/dist/utils/get-context.js

@@ -81,7 +81,7 @@ function removeMissingFilesFromLock(context, config, lock) {
             image.id,
             image,
         ]));
-        const knownIcons = Object.fromEntries(knownProjects[project.projectId].images.map((icons) => [
+        const knownIcons = Object.fromEntries(knownProjects[project.projectId].icons.map((icons) => [
             icons.id,
             icons,
         ]));

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

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

package/dist/utils/npm-utils.js

@@ -60,7 +60,7 @@ 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, pkg);
+        const check = yield checkVersion(context, baseDir, pkg);
         if (check.type === "up-to-date") {
             return;
         }
@@ -76,7 +76,7 @@ function warnLatest(context, pkg, baseDir, msgs, yes) {
     });
 }
 exports.warnLatest = warnLatest;
-function checkVersion(context, pkg) {
+function checkVersion(context, baseDir, pkg) {
     return __awaiter(this, void 0, void 0, function* () {
         // Try to get the latest version from npm
         let last = null;
@@ -87,7 +87,7 @@ function checkVersion(context, pkg) {
             // This is likely because .npmrc is set to a different registry
             return { type: "wrong-npm-registry" };
         }
-        const cur = findInstalledVersion(context, pkg);
+        const cur = findInstalledVersion(context, baseDir, pkg);
         if (!cur) {
             return { type: "not-installed" };
         }
@@ -101,7 +101,18 @@ function checkVersion(context, pkg) {
         return { type: "up-to-date" };
     });
 }
-function findInstalledVersion(context, pkg) {
+function findInstalledVersion(context, baseDir, pkg) {
+    var _a;
+    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;
+        }
+        catch (_) {
+            return undefined;
+        }
+    }
     const filename = findInstalledPackageJsonFile(context, pkg);
     if (filename) {
         const json = parsePackageJson(filename);
@@ -190,6 +201,18 @@ function installCommand(pkg, baseDir, opts = {}) {
             return `yarn add --ignore-scripts -W ${pkg}`;
         }
     }
+    else if (mgr === "yarn2") {
+        if (opts.global) {
+            // yarn2 does not support global.
+            return `npm install -g ${pkg}`;
+        }
+        else if (opts.dev) {
+            return `yarn add -D ${pkg}`;
+        }
+        else {
+            return `yarn add ${pkg}`;
+        }
+    }
     else {
         if (opts.global) {
             return `npm install -g ${pkg}`;
@@ -206,10 +229,9 @@ exports.installCommand = installCommand;
 function detectPackageManager(baseDir) {
     const yarnLock = findup_sync_1.default("yarn.lock", { cwd: baseDir });
     if (yarnLock) {
-        return "yarn";
-    }
-    else {
-        return "npm";
+        const yarnVersion = child_process_1.execSync(`yarn --version`).toString().trim();
+        return semver_1.default.gte(yarnVersion, "2.0.0") ? "yarn2" : "yarn";
     }
+    return "npm";
 }
 exports.detectPackageManager = detectPackageManager;

package/dist/utils/resolve-utils.js

@@ -47,6 +47,7 @@ const user_utils_1 = require("./user-utils");
  * @param versionResolution
  */
 function walkDependencyTree(root, available) {
+    root.indirect = false;
     const queue = [root];
     const result = [];
     const getMeta = (projectId, version) => {
@@ -54,7 +55,7 @@ function walkDependencyTree(root, available) {
         if (!meta) {
             throw new Error(`Cannot find projectId=${projectId}, version=${version} in the sync resolution results.`);
         }
-        return meta;
+        return Object.assign(Object.assign({}, meta), { indirect: meta.projectId !== root.projectId });
     };
     while (queue.length > 0) {
         const curr = lang_utils_1.ensure(queue.shift());
@@ -73,6 +74,7 @@ function checkProjectMeta(meta, root, context, opts) {
         const projectId = meta.projectId;
         const projectName = meta.projectName;
         const newVersion = meta.version;
+        const indirect = meta.indirect;
         // Checks newVersion against plasmic.lock
         const checkVersionLock = () => __awaiter(this, void 0, void 0, function* () {
             const projectLock = context.lock.projects.find((p) => p.projectId === projectId);
@@ -145,6 +147,15 @@ function checkProjectMeta(meta, root, context, opts) {
             deps_1.logger.warn(`${projectName}@${newVersion} falls outside the range specified in ${config_utils_1.CONFIG_FILE_NAME} (${versionRange})\nTip: To avoid this warning in the future, update your ${config_utils_1.CONFIG_FILE_NAME}.`);
             return yield user_utils_1.confirmWithUser("Do you want to force it?", opts.force || opts.yes, "n");
         });
+        const checkIndirect = () => __awaiter(this, void 0, void 0, function* () {
+            const projectConfig = context.config.projects.find((p) => p.projectId === projectId);
+            const configIndirect = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.indirect;
+            if (configIndirect && !indirect) {
+                deps_1.logger.warn(`'${projectName}' was synced indirectly before, but a direct sync was requested. If it has page components, they will be synced and saved to plasmic.json.`);
+                return yield user_utils_1.confirmWithUser("Do you want to confirm it?", opts.force || opts.yes, "n");
+            }
+            return true;
+        });
         const projectIds = opts.projects.length > 0
             ? opts.projects
             : context.config.projects.map((p) => p.projectId);
@@ -153,7 +164,9 @@ function checkProjectMeta(meta, root, context, opts) {
             // we should always sync it, even if nothing has changed
             return true;
         }
-        return (yield checkVersionLock()) && (yield checkVersionRange());
+        return ((yield checkVersionLock()) &&
+            (yield checkVersionRange()) &&
+            (yield checkIndirect()));
     });
 }
 /**
@@ -175,13 +188,18 @@ function checkVersionResolution(versionResolution, context, opts) {
                 ? [root]
                 : walkDependencyTree(root, versionResolution.dependencies).reverse();
             for (const m of queue) {
-                // If we haven't seen this yet
                 if (!seen.find((p) => p.projectId === m.projectId)) {
                     if (yield checkProjectMeta(m, root, context, opts)) {
                         result.push(m);
                     }
                     seen.push(m);
                 }
+                else if (root.projectId === m.projectId) {
+                    // If m is the root project and it was already seen (maybe as a dep
+                    // for another project), set indirect = false.
+                    const project = lang_utils_1.ensure(seen.find((p) => p.projectId === m.projectId));
+                    project.indirect = false;
+                }
             }
         }
         // Ignore repeats

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/cli",
-  "version": "0.1.162",
+  "version": "0.1.166",
   "description": "plasmic cli for syncing local code with Plasmic designs",
   "engines": {
     "node": ">=12"
@@ -49,7 +49,9 @@
   "dependencies": {
     "@babel/core": "^7.12.3",
     "@babel/generator": "^7.12.1",
-    "@plasmicapp/code-merger": "^0.0.31",
+    "@babel/parser": "^7.12.3",
+    "@babel/traverse": "^7.12.1",
+    "@plasmicapp/code-merger": "^0.0.33",
     "@sentry/node": "^5.19.2",
     "@types/socket.io-client": "^1.4.34",
     "axios": "^0.21.1",

package/src/__mocks__/api.ts

@@ -61,6 +61,7 @@ function mockProjectToProjectVersionMeta(
           componentIdOrNames.includes(c.id)
       )
       .map((c) => c.id),
+    indirect: false,
   };
 }
 

package/src/actions/sync.ts

@@ -128,6 +128,7 @@ async function ensureRequiredPackages(
 
   const reactWebVersion = findInstalledVersion(
     context,
+    baseDir,
     "@plasmicapp/react-web"
   );
   if (
@@ -145,6 +146,7 @@ async function ensureRequiredPackages(
     // Using automatic runtime requires installing the @plasmicapp/react-web-runtime package
     const runtimeVersion = findInstalledVersion(
       context,
+      baseDir,
       "@plasmicapp/react-web-runtime"
     );
     if (
@@ -232,6 +234,7 @@ export async function sync(
         versionRange || projectConfigMap[projectId]?.version || "latest",
       componentIdOrNames: undefined, // Get all components!
       projectApiToken: projectApiToken || projectIdToToken.get(projectId),
+      indirect: false,
     };
   });
 
@@ -242,6 +245,7 @@ export async function sync(
         versionRange: p.version,
         componentIdOrNames: undefined, // Get all components!
         projectApiToken: p.projectApiToken,
+        indirect: !!p.indirect,
       }));
 
   // Short-circuit if nothing to sync
@@ -257,7 +261,7 @@ export async function sync(
     try {
       context = await getContext(opts);
     } catch (e) {
-      if (e.message.includes("Unable to authenticate Plasmic")) {
+      if ((e as any).message.includes("Unable to authenticate Plasmic")) {
         const configFileName = process.env.PLASMIC_LOADER
           ? LOADER_CONFIG_FILE_NAME
           : CONFIG_FILE_NAME;
@@ -327,6 +331,7 @@ export async function sync(
         projectMeta.dependencies,
         summary,
         pendingMerge,
+        projectMeta.indirect,
         metadataDefaults
       );
     }
@@ -345,15 +350,22 @@ export async function sync(
       await context.api.genStyleConfig(context.config.style)
     );
 
-    // Update project version if specified and successfully synced.
+    // Update project version and indirect status if specified and
+    // successfully synced.
     if (projectWithVersion.length) {
       const versionMap: Record<string, string> = {};
       projectWithVersion.forEach(
         (p) => (versionMap[p.projectId] = p.versionRange)
       );
-      context.config.projects.forEach(
-        (p) => (p.version = versionMap[p.projectId] || p.version)
-      );
+      const indirectMap: Record<string, boolean> = {};
+      projectsToSync.forEach((p) => (indirectMap[p.projectId] = p.indirect));
+      context.config.projects.forEach((p) => {
+        p.version = versionMap[p.projectId] || p.version;
+        // Only update `indirect` if it is set in current config.
+        if (p.projectId in indirectMap && p.indirect) {
+          p.indirect = indirectMap[p.projectId];
+        }
+      });
     }
 
     // Fix imports
@@ -467,6 +479,7 @@ async function syncProject(
   dependencies: { [projectId: string]: string },
   summary: Map<string, ComponentUpdateSummary>,
   pendingMerge: ComponentPendingMerge[],
+  indirect: boolean,
   metadataDefaults?: Metadata
 ): Promise<void> {
   const newComponentScheme =
@@ -510,6 +523,7 @@ async function syncProject(
       },
       opts.metadata
     ),
+    indirect,
   });
 
   // Convert from TSX => JSX
@@ -556,8 +570,6 @@ async function syncProject(
     opts.baseDir
   );
 
-  syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
-
   await syncProjectConfig(
     context,
     projectBundle.projectConfig,
@@ -570,8 +582,10 @@ async function syncProject(
     summary,
     pendingMerge,
     projectBundle.checksums,
-    opts.baseDir
+    opts.baseDir,
+    indirect
   );
+  syncCodeComponentsMeta(context, projectId, projectBundle.codeComponentMetas);
   await upsertStyleTokens(context, projectBundle.usedTokens);
   await syncProjectIconAssets(
     context,
@@ -618,7 +632,8 @@ async function syncProjectConfig(
   summary: Map<string, ComponentUpdateSummary>,
   pendingMerge: ComponentPendingMerge[],
   checksums: ChecksumBundle,
-  baseDir: string
+  baseDir: string,
+  indirect: boolean
 ) {
   const defaultCssFilePath = defaultResourcePath(
     context,
@@ -629,8 +644,6 @@ async function syncProjectConfig(
     (p) => p.projectId === projectBundle.projectId
   );
 
-  // If latest, use that as the range, otherwise set to latest published (>=0.0.0)
-  const versionRange = semver.isLatest(version) ? version : ">=0.0.0";
   const projectConfig = getOrAddProjectConfig(
     context,
     projectBundle.projectId,
@@ -638,8 +651,9 @@ async function syncProjectConfig(
       projectId: projectBundle.projectId,
       projectApiToken,
       projectName: projectBundle.projectName,
-      version: versionRange,
+      version,
       cssFilePath: defaultCssFilePath,
+      indirect,
     })
   );
 

package/src/api.ts

@@ -76,6 +76,7 @@ export interface ProjectVersionMeta {
   dependencies: {
     [projectId: string]: string;
   };
+  indirect: boolean;
 }
 
 export interface VersionResolution {
@@ -235,6 +236,7 @@ export class PlasmicApi {
       stylesOpts: StyleConfig;
       codeOpts: CodeConfig;
       checksums: ChecksumBundle;
+      indirect: boolean;
       metadata?: Metadata;
     }
   ): Promise<ProjectBundle> {

package/src/migrations/0.1.166-indirect.ts

@@ -0,0 +1,10 @@
+import { PlasmicConfig } from "../utils/config-utils";
+
+export function ensureIndirect(config: PlasmicConfig) {
+  for (const p of config.projects) {
+    if (p.indirect === undefined) {
+      p.indirect = false;
+    }
+  }
+  return config;
+}

package/src/migrations/migrations.ts

@@ -35,6 +35,7 @@ import {
 import { confirmWithUser } from "../utils/user-utils";
 import { ensureFileLocks } from "./0.1.110-fileLocks";
 import { ensureReactRuntime } from "./0.1.146-addReactRuntime";
+import { ensureIndirect } from "./0.1.166-indirect";
 import { migrateInit } from "./0.1.27-migrateInit";
 import { tsToTsx } from "./0.1.28-tsToTsx";
 import { ensureProjectIcons } from "./0.1.31-ensureProjectIcons";
@@ -64,6 +65,7 @@ export const MIGRATIONS: Record<string, MigrateConfigFunc> = {
   "0.1.64": ensureImageFiles,
   "0.1.95": ensureComponentType,
   "0.1.146": ensureReactRuntime,
+  "0.1.166": ensureIndirect,
 };
 
 export const LOCK_MIGRATIONS: Record<string, MigrateLockFunc> = {

package/src/test-common/fixtures.ts

@@ -147,6 +147,7 @@ export const project1Config: ProjectConfig = {
   icons: [],
   images: [],
   jsBundleThemes: [],
+  indirect: false,
 };
 
 export function expectProject1PlasmicJson() {

package/src/utils/config-utils.ts

@@ -171,6 +171,12 @@ export interface ProjectConfig {
   icons: IconConfig[];
   /** Metadata for each synced image in this project */
   images: ImageConfig[];
+
+  /**
+   * True if the project was installed indirectly (as a dependency); if set,
+   * codegen will not generate pages.
+   */
+  indirect: boolean;
 }
 
 export function createProjectConfig(base: {
@@ -179,6 +185,7 @@ export function createProjectConfig(base: {
   projectName: string;
   version: string;
   cssFilePath: string;
+  indirect: boolean;
 }): ProjectConfig {
   return {
     projectId: base.projectId,
@@ -189,6 +196,7 @@ export function createProjectConfig(base: {
     components: [],
     icons: [],
     images: [],
+    indirect: base.indirect,
   };
 }
 
@@ -519,6 +527,7 @@ export function getOrAddProjectConfig(
           icons: [],
           images: [],
           jsBundleThemes: [],
+          indirect: false,
         };
     context.config.projects.push(project);
   }

package/src/utils/get-context.ts

@@ -79,7 +79,7 @@ function removeMissingFilesFromLock(
         ])
       );
       const knownIcons = Object.fromEntries(
-        knownProjects[project.projectId].images.map((icons) => [
+        knownProjects[project.projectId].icons.map((icons) => [
           icons.id,
           icons,
         ])

package/src/utils/npm-utils.ts

@@ -1,4 +1,4 @@
-import { spawnSync } from "child_process";
+import { execSync, spawnSync } from "child_process";
 import glob from "fast-glob";
 import findupSync from "findup-sync";
 import latest from "latest-version";
@@ -54,7 +54,7 @@ export async function warnLatest(
   },
   yes?: boolean
 ) {
-  const check = await checkVersion(context, pkg);
+  const check = await checkVersion(context, baseDir, pkg);
   if (check.type === "up-to-date") {
     return;
   } else if (check.type === "wrong-npm-registry") {
@@ -80,7 +80,11 @@ export async function warnLatest(
   }
 }
 
-async function checkVersion(context: PlasmicContext, pkg: string) {
+async function checkVersion(
+  context: PlasmicContext,
+  baseDir: string,
+  pkg: string
+) {
   // Try to get the latest version from npm
   let last = null;
   try {
@@ -90,7 +94,7 @@ async function checkVersion(context: PlasmicContext, pkg: string) {
     return { type: "wrong-npm-registry" } as const;
   }
 
-  const cur = findInstalledVersion(context, pkg);
+  const cur = findInstalledVersion(context, baseDir, pkg);
   if (!cur) {
     return { type: "not-installed" } as const;
   }
@@ -104,7 +108,23 @@ async function checkVersion(context: PlasmicContext, pkg: string) {
   return { type: "up-to-date" } as const;
 }
 
-export function findInstalledVersion(context: PlasmicContext, pkg: string) {
+export function findInstalledVersion(
+  context: PlasmicContext,
+  baseDir: string,
+  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;
+    }
+  }
+
   const filename = findInstalledPackageJsonFile(context, pkg);
   if (filename) {
     const json = parsePackageJson(filename);
@@ -202,6 +222,15 @@ export function installCommand(
     } else {
       return `yarn add --ignore-scripts -W ${pkg}`;
     }
+  } else if (mgr === "yarn2") {
+    if (opts.global) {
+      // yarn2 does not support global.
+      return `npm install -g ${pkg}`;
+    } else if (opts.dev) {
+      return `yarn add -D ${pkg}`;
+    } else {
+      return `yarn add ${pkg}`;
+    }
   } else {
     if (opts.global) {
       return `npm install -g ${pkg}`;
@@ -216,8 +245,9 @@ export function installCommand(
 export function detectPackageManager(baseDir: string) {
   const yarnLock = findupSync("yarn.lock", { cwd: baseDir });
   if (yarnLock) {
-    return "yarn";
-  } else {
-    return "npm";
+    const yarnVersion = execSync(`yarn --version`).toString().trim();
+    return semver.gte(yarnVersion, "2.0.0") ? "yarn2" : "yarn";
   }
+
+  return "npm";
 }

package/src/utils/resolve-utils.ts

@@ -1,4 +1,5 @@
 import L from "lodash";
+import { InvalidatedProjectKind } from "typescript";
 import { SyncArgs } from "../actions/sync";
 import { ProjectVersionMeta, VersionResolution } from "../api";
 import { logger } from "../deps";
@@ -19,6 +20,7 @@ function walkDependencyTree(
   root: ProjectVersionMeta,
   available: ProjectVersionMeta[]
 ): ProjectVersionMeta[] {
+  root.indirect = false;
   const queue: ProjectVersionMeta[] = [root];
   const result: ProjectVersionMeta[] = [];
 
@@ -31,7 +33,10 @@ function walkDependencyTree(
         `Cannot find projectId=${projectId}, version=${version} in the sync resolution results.`
       );
     }
-    return meta;
+    return {
+      ...meta,
+      indirect: meta.projectId !== root.projectId,
+    };
   };
 
   while (queue.length > 0) {
@@ -61,6 +66,7 @@ async function checkProjectMeta(
   const projectId = meta.projectId;
   const projectName = meta.projectName;
   const newVersion = meta.version;
+  const indirect = meta.indirect;
 
   // Checks newVersion against plasmic.lock
   const checkVersionLock = async (): Promise<boolean> => {
@@ -177,6 +183,24 @@ async function checkProjectMeta(
     );
   };
 
+  const checkIndirect = async (): Promise<boolean> => {
+    const projectConfig = context.config.projects.find(
+      (p) => p.projectId === projectId
+    );
+    const configIndirect = projectConfig?.indirect;
+    if (configIndirect && !indirect) {
+      logger.warn(
+        `'${projectName}' was synced indirectly before, but a direct sync was requested. If it has page components, they will be synced and saved to plasmic.json.`
+      );
+      return await confirmWithUser(
+        "Do you want to confirm it?",
+        opts.force || opts.yes,
+        "n"
+      );
+    }
+    return true;
+  };
+
   const projectIds =
     opts.projects.length > 0
       ? opts.projects
@@ -188,7 +212,11 @@ async function checkProjectMeta(
     return true;
   }
 
-  return (await checkVersionLock()) && (await checkVersionRange());
+  return (
+    (await checkVersionLock()) &&
+    (await checkVersionRange()) &&
+    (await checkIndirect())
+  );
 }
 
 /**
@@ -216,12 +244,16 @@ export async function checkVersionResolution(
       ? [root]
       : walkDependencyTree(root, versionResolution.dependencies).reverse();
     for (const m of queue) {
-      // If we haven't seen this yet
       if (!seen.find((p) => p.projectId === m.projectId)) {
         if (await checkProjectMeta(m, root, context, opts)) {
           result.push(m);
         }
         seen.push(m);
+      } else if (root.projectId === m.projectId) {
+        // If m is the root project and it was already seen (maybe as a dep
+        // for another project), set indirect = false.
+        const project = ensure(seen.find((p) => p.projectId === m.projectId));
+        project.indirect = false;
       }
     }
   }

package/dist/migrations/0.1.143-ensureImportModuleType.d.ts

@@ -1,2 +0,0 @@
-import { PlasmicConfig } from "../utils/config-utils";
-export declare function ensureImportModuleType(config: PlasmicConfig): PlasmicConfig;

package/dist/migrations/0.1.143-ensureImportModuleType.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureImportModuleType = void 0;
-function ensureImportModuleType(config) {
-    for (const project of config.projects) {
-        for (const component of project.components) {
-            component.importSpec.moduleType = "local";
-        }
-    }
-    return config;
-}
-exports.ensureImportModuleType = ensureImportModuleType;