create-plasmic-app 0.0.168 → 0.0.170

package/cpa-out/tanstack-codegen-ts/src/routeTree.gen.ts

@@ -9,20 +9,20 @@
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
 import { Route as rootRouteImport } from './routes/__root'
-import { Route as PlasmicHostRouteImport } from './routes/plasmic-host'
 import { Route as IndexRouteImport } from './routes/index'
+import { Route as PlasmicHostRouteImport } from './routes/plasmic-host'
 import { Route as DynamicSlugIndexRouteImport } from './routes/dynamic/$slug/index'
 
-const PlasmicHostRoute = PlasmicHostRouteImport.update({
-  id: '/plasmic-host',
-  path: '/plasmic-host',
-  getParentRoute: () => rootRouteImport,
-} as any)
 const IndexRoute = IndexRouteImport.update({
   id: '/',
   path: '/',
   getParentRoute: () => rootRouteImport,
 } as any)
+const PlasmicHostRoute = PlasmicHostRouteImport.update({
+  id: '/plasmic-host',
+  path: '/plasmic-host',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const DynamicSlugIndexRoute = DynamicSlugIndexRouteImport.update({
   id: '/dynamic/$slug/',
   path: '/dynamic/$slug/',
@@ -61,13 +61,6 @@ export interface RootRouteChildren {
 
 declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
-    '/plasmic-host': {
-      id: '/plasmic-host'
-      path: '/plasmic-host'
-      fullPath: '/plasmic-host'
-      preLoaderRoute: typeof PlasmicHostRouteImport
-      parentRoute: typeof rootRouteImport
-    }
     '/': {
       id: '/'
       path: '/'
@@ -75,6 +68,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof IndexRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/plasmic-host': {
+      id: '/plasmic-host'
+      path: '/plasmic-host'
+      fullPath: '/plasmic-host'
+      preLoaderRoute: typeof PlasmicHostRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/dynamic/$slug/': {
       id: '/dynamic/$slug/'
       path: '/dynamic/$slug'

package/cpa-out/tanstack-codegen-ts/src/routes/dynamic/$slug/index.tsx

@@ -9,7 +9,7 @@ import {
   serverQueryTree
 } from "../../../components/plasmic/create_plasmic_app/PlasmicDynamicPage";
 import { createFileRoute } from "@tanstack/react-router";
-import { unstable_executePlasmicQueries } from "@plasmicapp/react-web/lib/data-sources";
+import { executePlasmicQueries } from "@plasmicapp/react-web/lib/data-sources";
 import { PlasmicQueryDataProvider } from "@plasmicapp/react-web/lib/query";
 
 export const Route = createFileRoute("/dynamic/$slug/")({
@@ -28,7 +28,7 @@ export const Route = createFileRoute("/dynamic/$slug/")({
         string | string[] | undefined
       >
     };
-    const { cache: prefetchedCache } = await unstable_executePlasmicQueries(
+    const { cache: prefetchedCache } = await executePlasmicQueries(
       serverQueryTree,
       { $props: {}, $ctx }
     );

package/dist/gatsby/gatsby.js

@@ -28,28 +28,42 @@ exports.GATSBY_TEMPLATES = {
 };
 exports.gatsbyStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        const { projectPath, template, jsOrTs } = args;
+        const { projectPath, projectId, template, jsOrTs, packageManager } = args;
         if (template) {
             console.log(`Warning: Ignoring template '${template}' (argument is not supported by Gatsby).`);
         }
         const gatsbyTemplate = exports.GATSBY_TEMPLATES[jsOrTs];
         const createCommand = `git clone ${gatsbyTemplate} ${projectPath} --recursive --depth 1 --quiet`;
         yield (0, cmd_utils_1.spawnOrFail)(`${createCommand}`);
-        // Remove .git and LICENSE so that we don't generate linked outputs
-        yield (0, cmd_utils_1.spawnOrFail)(`rm -rf ${projectPath}/.git`);
-        yield (0, cmd_utils_1.spawnOrFail)(`rm -rf ${projectPath}/LICENSE`);
+        // Remove package-lock.json since the user might be using a different package manager
+        yield (0, cmd_utils_1.spawnOrFail)(`rm -rf ${projectPath}/.git ${projectPath}/LICENSE ${projectPath}/package-lock.json`);
+        // Rename before installing; Yarn Berry rejects `yarn run` once the lockfile's
+        // workspace name no longer matches package.json
+        const packageJsonPath = path_1.default.join(projectPath, "package.json");
+        const packageJsonObject = JSON.parse(yield fs_1.promises.readFile(packageJsonPath, "utf8"));
+        packageJsonObject.name = path_1.default.basename(projectPath);
+        packageJsonObject.description = `Plasmic app for ${projectId}`;
+        delete packageJsonObject.license;
+        delete packageJsonObject.author;
+        yield fs_1.promises.writeFile(packageJsonPath, JSON.stringify(packageJsonObject, null, 2));
+        if (packageManager === "yarn2") {
+            yield (0, npm_utils_1.initYarnBerryProject)(projectPath);
+        }
     }),
-    installDeps: ({ projectPath, scheme, jsOrTs }) => __awaiter(void 0, void 0, void 0, function* () {
+    installDeps: ({ projectPath, scheme, jsOrTs, packageManager }) => __awaiter(void 0, void 0, void 0, function* () {
         const installedHelmet = yield (0, npm_utils_1.installUpgrade)("react-helmet", {
             workingDir: projectPath,
+            packageManager,
         });
         const installedHelmetTypes = jsOrTs === "js" ||
             (yield (0, npm_utils_1.installUpgrade)("@types/react-helmet", {
                 workingDir: projectPath,
                 dev: true,
+                packageManager,
             }));
         const installedHelmetPlugin = yield (0, npm_utils_1.installUpgrade)("gatsby-plugin-react-helmet", {
             workingDir: projectPath,
+            packageManager,
         });
         if (!installedHelmet || !installedHelmetPlugin || !installedHelmetTypes) {
             return false;
@@ -57,24 +71,15 @@ exports.gatsbyStrategy = {
         if (scheme === "loader") {
             return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/loader-gatsby", {
                 workingDir: projectPath,
+                packageManager,
             });
         }
         else {
-            return yield (0, codegen_1.installCodegenDeps)({ projectPath });
+            return yield (0, codegen_1.installCodegenDeps)({ projectPath, packageManager });
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
         const { projectId, projectPath, projectApiToken, jsOrTs, scheme } = args;
-        const packageName = path_1.default.basename(projectPath);
-        // Update package.json: adding name and description, removing license and author
-        const packageJsonPath = path_1.default.join(projectPath, "package.json");
-        const packageJson = yield fs_1.promises.readFile(packageJsonPath, "utf8");
-        const packageJsonObject = JSON.parse(packageJson);
-        packageJsonObject.name = packageName;
-        packageJsonObject.description = `Plasmic app for ${projectId}`;
-        delete packageJsonObject.license;
-        delete packageJsonObject.author;
-        yield fs_1.promises.writeFile(packageJsonPath, JSON.stringify(packageJsonObject, null, 2));
         if (scheme === "loader") {
             const gatsbyConfigFile = path_1.default.join(projectPath, `gatsby-config.${jsOrTs}`);
             yield fs_1.promises.writeFile(gatsbyConfigFile, (0, template_1.makeGatsbyConfig)(projectId, (0, lang_utils_1.ensure)(projectApiToken, "Missing projectApiToken"), jsOrTs));
@@ -83,7 +88,7 @@ exports.gatsbyStrategy = {
     generateFiles: (args) => __awaiter(void 0, void 0, void 0, function* () {
         // in gatsby we can delete all existing pages/components, since all pages are going
         // to be handled by templates/defaultPlasmicPage
-        const { projectId, projectApiToken, projectPath, jsOrTs, scheme } = args;
+        const { projectId, projectApiToken, projectPath, jsOrTs, scheme, packageManager, } = args;
         (0, file_utils_1.deleteGlob)(path_1.default.join(projectPath, "src/@(pages|components|templates)/*.*"));
         // Create a very basic 404 page - `gatsby build` fails without it.
         yield fs_1.promises.writeFile(path_1.default.join(projectPath, `src/pages/404.${jsOrTs}`), template_1.GATSBY_404);
@@ -111,6 +116,7 @@ exports.gatsbyStrategy = {
                 projectId,
                 projectApiToken,
                 projectPath,
+                packageManager,
             });
             // Special case: remove all Gatsby components (due to conflicting file names)
             const config = yield (0, file_utils_1.getPlasmicConfig)(projectPath, "gatsby", scheme);

package/dist/index.js

@@ -87,6 +87,10 @@ const argv = yargs_1.default
     .option("appDir", {
     describe: "(Next.js) Use app directory?",
     boolean: true,
+})
+    .option("packageManager", {
+    describe: "Package manager to scaffold and install with",
+    choices: ["", "npm", "yarn", "pnpm"],
 })
     .strict()
     .help("h")
@@ -261,6 +265,7 @@ What is the URL of your project?`,
         console.log();
         const template = argv["template"];
         const projectApiToken = argv["projectApiToken"];
+        const packageManager = (argv["packageManager"] || undefined);
         // Set the metadata environment variable to tag the future Segment codegen event
         (0, cli_1.setMetadataEnv)({
             source: "create-plasmic-app",
@@ -274,6 +279,7 @@ What is the URL of your project?`,
             jsOrTs,
             projectApiToken,
             template,
+            packageManager,
         });
     });
 }

package/dist/lib.d.ts

@@ -1,5 +1,5 @@
 import { setMetadataEnv } from "@plasmicapp/cli";
-import { JsOrTs, PlatformOptions, PlatformType, SchemeType } from "./utils/types";
+import { JsOrTs, PackageManagerType, PlatformOptions, PlatformType, SchemeType } from "./utils/types";
 export interface CreatePlasmicAppArgs {
     resolvedProjectPath: string;
     projectId: string;
@@ -9,6 +9,7 @@ export interface CreatePlasmicAppArgs {
     jsOrTs: JsOrTs;
     projectApiToken?: string;
     template?: string;
+    packageManager?: PackageManagerType;
 }
 export declare function create(args: CreatePlasmicAppArgs): Promise<void>;
 export declare function checkValidName(name?: string): boolean;

package/dist/lib.js

@@ -60,6 +60,7 @@ function create(args) {
     return __awaiter(this, void 0, void 0, function* () {
         const { resolvedProjectPath, projectId, platform, platformOptions, scheme, jsOrTs, template, } = args;
         let { projectApiToken } = args;
+        const packageManager = (0, npm_utils_1.resolvePackageManager)(args.packageManager);
         console.log("Let's get started! Here's what we'll do: ");
         console.log("1. Authenticate with Plasmic");
         console.log("2. Create a React/Next/Gatsby repo");
@@ -94,15 +95,17 @@ function create(args) {
         // Create project using strategy for platform
         yield cpaStrategy.create({
             projectPath: resolvedProjectPath,
+            projectId,
             jsOrTs,
             template,
             platformOptions,
+            packageManager,
         });
         // Ensure that we have a empty tsconfig and @types packages.
         // Gatsby and Next.js by default support typescript handling internally
         // tsconfig so we don't have to ensure it.
         if (jsOrTs === "ts" && platform === "react") {
-            yield (0, file_utils_1.ensureTsconfig)(resolvedProjectPath);
+            yield (0, file_utils_1.ensureTsconfig)(resolvedProjectPath, packageManager);
         }
         // Make sure we have an api token for loader
         if (scheme === "loader" && !projectApiToken) {
@@ -117,6 +120,7 @@ function create(args) {
             scheme,
             projectPath: resolvedProjectPath,
             jsOrTs,
+            packageManager,
         });
         if (!installResult) {
             throw new Error("Failed to install the Plasmic dependency");
@@ -138,12 +142,13 @@ function create(args) {
             projectId,
             projectApiToken,
             platformOptions,
+            packageManager,
         });
         /**
          * INSTRUCT USER ON NEXT STEPS
          */
-        const pkgMgr = (0, npm_utils_1.detectPackageManager)(resolvedProjectPath);
-        const npmRunCmd = pkgMgr === "yarn" ? "yarn" : pkgMgr === "pnpm" ? "pnpm run" : "npm run";
+        const pmCmd = (0, npm_utils_1.packageManagerCommand)(packageManager);
+        const npmRunCmd = pmCmd === "yarn" ? "yarn" : `${pmCmd} run`;
         const command = platform === "nextjs"
             ? `${npmRunCmd} dev`
             : platform === "gatsby"
@@ -169,7 +174,7 @@ function create(args) {
         }
         if (scheme === "codegen") {
             console.log("To watch for changes in Plasmic components, in a separate terminal run:");
-            console.log(chalk_1.default.bold(`npx plasmic watch`));
+            console.log(chalk_1.default.bold(`${(0, npm_utils_1.packageManagerExec)(packageManager)} plasmic watch`));
         }
     });
 }

package/dist/nextjs/nextjs.js

@@ -38,27 +38,35 @@ const pages_seo_1 = require("./templates/pages-seo");
 exports.nextjsStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        const { projectPath, template, jsOrTs, platformOptions } = args;
+        const { projectPath, template, jsOrTs, platformOptions, packageManager } = args;
         const typescriptArg = `--${jsOrTs}`;
         const experimentalAppArg = ((_a = platformOptions.nextjs) === null || _a === void 0 ? void 0 : _a.appDir)
             ? "--app"
             : "--no-app";
         const templateArg = template ? ` --example ${template}` : "";
+        const isYarnBerry = packageManager === "yarn2";
         // NOTE: Not using create-next-app@latest to keep major version bumps deliberate
         const createCommand = `npx create-next-app@16 ${projectPath} ${typescriptArg} ${experimentalAppArg} ${templateArg}` +
-            ` --eslint --no-src-dir  --import-alias "@/*" --no-tailwind`;
+            ` --use-${(0, npm_utils_1.packageManagerCommand)(packageManager)} --eslint --no-src-dir  --import-alias "@/*" --no-tailwind` +
+            // Berry must install into the project we set up below, not the default PnP one
+            (isYarnBerry ? " --skip-install" : "");
         // Default Next.js starter already supports Typescript
         // See where we `touch tsconfig.json` later on
         yield (0, cmd_utils_1.spawnOrFail)(createCommand);
+        if (isYarnBerry) {
+            yield (0, npm_utils_1.initYarnBerryProject)(projectPath);
+            yield (0, cmd_utils_1.spawnOrFail)("yarn install", projectPath);
+        }
     }),
-    installDeps: ({ scheme, projectPath }) => __awaiter(void 0, void 0, void 0, function* () {
+    installDeps: ({ scheme, projectPath, packageManager }) => __awaiter(void 0, void 0, void 0, function* () {
         if (scheme === "loader") {
             return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/loader-nextjs", {
                 workingDir: projectPath,
+                packageManager,
             });
         }
         else {
-            return yield (0, codegen_1.installCodegenDeps)({ projectPath });
+            return yield (0, codegen_1.installCodegenDeps)({ projectPath, packageManager });
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
@@ -123,7 +131,7 @@ a {
 }
 function generateFilesAppDir(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath, scheme, jsOrTs, projectId, projectApiToken } = args;
+        const { projectPath, scheme, jsOrTs, projectId, projectApiToken, packageManager, } = args;
         // Delete existing pages
         (0, file_utils_1.deleteGlob)(path_1.default.join(projectPath, "app", "page.*"));
         // ./app/robots.ts
@@ -156,6 +164,7 @@ function generateFilesAppDir(args) {
                 projectId,
                 projectApiToken,
                 projectPath,
+                packageManager,
             });
             // ./app/sitemap.ts
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, "app", `sitemap.${jsOrTs}`), (0, app_seo_1.makeSitemap_app_codegen)(jsOrTs));
@@ -182,7 +191,7 @@ function generateFilesAppDir(args) {
 }
 function generateFilesPagesDir(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath, scheme, jsOrTs, projectId, projectApiToken } = args;
+        const { projectPath, scheme, jsOrTs, projectId, projectApiToken, packageManager, } = args;
         // Delete existing pages
         (0, file_utils_1.deleteGlob)(path_1.default.join(projectPath, "pages", "*.*"));
         // ./pages/robots.txt.ts
@@ -208,6 +217,7 @@ function generateFilesPagesDir(args) {
                 projectId,
                 projectApiToken,
                 projectPath,
+                packageManager,
             });
             // ./pages/sitemap.xml.ts
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, "pages", `sitemap.xml.${jsOrTs}`), (0, pages_seo_1.makeSitemap_pages_codegen)(jsOrTs));

package/dist/react/react.js

@@ -22,7 +22,7 @@ const file_utils_1 = require("../utils/file-utils");
 const npm_utils_1 = require("../utils/npm-utils");
 exports.reactStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        const { projectPath, jsOrTs } = args;
+        const { projectPath, jsOrTs, packageManager } = args;
         let { template } = args;
         /* create-vite package checks if the targetDir doesn't exist then it creates the targetDir in the
           current directory instead of the targetDir path. For example,
@@ -47,15 +47,19 @@ exports.reactStrategy = {
         }
         const templateArg = template ? ` --template ${template}` : "";
         yield (0, cmd_utils_1.spawnOrFail)(`${createCommand}${templateArg}`);
+        if (packageManager === "yarn2") {
+            yield (0, npm_utils_1.initYarnBerryProject)(fullProjectPath);
+        }
     }),
-    installDeps: ({ projectPath, scheme }) => __awaiter(void 0, void 0, void 0, function* () {
+    installDeps: ({ projectPath, scheme, packageManager }) => __awaiter(void 0, void 0, void 0, function* () {
         if (scheme === "loader") {
             return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/loader-react", {
                 workingDir: projectPath,
+                packageManager,
             });
         }
         else {
-            return yield (0, codegen_1.installCodegenDeps)({ projectPath });
+            return yield (0, codegen_1.installCodegenDeps)({ projectPath, packageManager });
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
@@ -73,7 +77,7 @@ exports.reactStrategy = {
             yield fs_1.promises.writeFile(tsconfigPath, tsconfigContent);
         }
     }),
-    generateFiles: ({ scheme, projectApiToken, projectId, projectPath, jsOrTs, }) => __awaiter(void 0, void 0, void 0, function* () {
+    generateFiles: ({ scheme, projectApiToken, projectId, projectPath, jsOrTs, packageManager, }) => __awaiter(void 0, void 0, void 0, function* () {
         if (scheme === "loader") {
             // Nothing to do
         }
@@ -84,6 +88,7 @@ exports.reactStrategy = {
                 projectId,
                 projectApiToken,
                 projectPath,
+                packageManager,
             });
             // Pick a page for the entry point App.tsx page
             const config = yield (0, file_utils_1.getPlasmicConfig)(projectPath, "react", scheme);

package/dist/tanstack/tanstack.js

@@ -23,7 +23,7 @@ const plasmic_host_1 = require("./templates/file-router/plasmic-host");
 const root_1 = require("./templates/file-router/root");
 exports.tanstackStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        const { projectPath, template } = args;
+        const { projectPath, template, packageManager } = args;
         if (template) {
             console.warn(`Warning: Ignoring template '${template}' (argument is not supported by TanStack).`);
         }
@@ -46,24 +46,30 @@ exports.tanstackStrategy = {
             "--framework React",
             "--router-only",
             "--no-toolchain",
-            "--package-manager yarn",
+            `--package-manager ${(0, npm_utils_1.packageManagerCommand)(packageManager)}`,
             "--git",
             "--no-intent",
             "--no-examples",
             "--yes",
+            // Berry must install into the project we set up below, not the default PnP one
+            ...(packageManager === "yarn2" ? ["--no-install"] : []),
         ].join(" ");
         yield (0, cmd_utils_1.spawnOrFail)(createCommand);
+        if (packageManager === "yarn2") {
+            yield (0, npm_utils_1.initYarnBerryProject)(fullProjectPath);
+        }
         // Install peer-dep of @tanstack/react-router-with-query
         yield (0, npm_utils_1.installUpgrade)("@tanstack/react-query", {
             workingDir: projectPath,
+            packageManager,
         });
     }),
-    installDeps: ({ scheme, projectPath }) => __awaiter(void 0, void 0, void 0, function* () {
+    installDeps: ({ scheme, projectPath, packageManager }) => __awaiter(void 0, void 0, void 0, function* () {
         if (scheme === "loader") {
             throw new Error("Plasmic loader scheme is not supported for TanStack platform. Please use the codegen scheme instead.");
         }
         else {
-            return yield (0, codegen_1.installCodegenDeps)({ projectPath });
+            return yield (0, codegen_1.installCodegenDeps)({ projectPath, packageManager });
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
@@ -96,7 +102,7 @@ exports.tanstackStrategy = {
 };
 function generateFilesFileRouterTemplate(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath, scheme, projectId, projectApiToken } = args;
+        const { projectPath, scheme, projectId, projectApiToken, packageManager } = args;
         // Delete existing pages
         (0, file_utils_1.deleteGlob)(path_1.default.join(projectPath, "src/routes", "*.*"));
         if (scheme === "loader") {
@@ -115,6 +121,7 @@ function generateFilesFileRouterTemplate(args) {
                 projectId,
                 projectApiToken,
                 projectPath,
+                packageManager,
             });
         }
     });

package/dist/utils/codegen.d.ts

@@ -1,8 +1,11 @@
+import { PackageManagerType } from "../utils/types";
 export declare function installCodegenDeps(opts: {
     projectPath: string;
+    packageManager: PackageManagerType;
 }): Promise<boolean>;
 export declare function runCodegenSync(opts: {
     projectId: string;
     projectApiToken: string | undefined;
     projectPath: string;
+    packageManager: PackageManagerType;
 }): Promise<void>;

package/dist/utils/codegen.js

@@ -8,26 +8,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.runCodegenSync = exports.installCodegenDeps = void 0;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
 const lib_1 = require("../lib");
 const cmd_utils_1 = require("../utils/cmd-utils");
 const npm_utils_1 = require("../utils/npm-utils");
 function installCodegenDeps(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath } = opts;
-        return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/cli", { workingDir: projectPath });
+        const { projectPath, packageManager } = opts;
+        // Generated pages import @plasmicapp/host directly
+        return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/cli @plasmicapp/host", {
+            workingDir: projectPath,
+            packageManager,
+        });
     });
 }
 exports.installCodegenDeps = installCodegenDeps;
 function runCodegenSync(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectId, projectApiToken, projectPath } = opts;
+        const { projectId, projectApiToken, projectPath, packageManager } = opts;
         (0, lib_1.banner)("SYNCING PLASMIC COMPONENTS");
         const project = projectApiToken
             ? `${projectId}:${projectApiToken}`
             : projectId;
-        yield (0, cmd_utils_1.spawnOrFail)(`npx plasmic sync --yes -p ${project}`, projectPath);
+        yield (0, cmd_utils_1.spawnOrFail)(`${(0, npm_utils_1.packageManagerExec)(packageManager)} plasmic sync --yes -p ${project}`, projectPath);
+        // Pin the package manager, so syncs don't have to guess from lockfiles
+        const configPath = path_1.default.join(projectPath, "plasmic.json");
+        const config = JSON.parse(yield fs_1.promises.readFile(configPath, "utf8"));
+        yield fs_1.promises.writeFile(configPath, JSON.stringify(Object.assign(Object.assign({}, config), { packageManager }), undefined, 2) + "\n");
     });
 }
 exports.runCodegenSync = runCodegenSync;

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

@@ -1,5 +1,5 @@
 import type { PlasmicConfig } from "@plasmicapp/cli/dist/utils/config-utils";
-import { JsOrTs, PlatformType } from "./types";
+import { JsOrTs, PackageManagerType, PlatformType } from "./types";
 /**
  * Runs the search pattern through `glob` and deletes all resulting files
  * @param searchPattern - glob search query
@@ -30,5 +30,5 @@ export declare function generateHomePage(componentAbsPath: string, indexAbsPath:
  */
 export declare function generateWelcomePage(config: PlasmicConfig, platform: string): string;
 export declare function getPlasmicConfig(projectPath: string, platform: PlatformType, scheme: string): Promise<PlasmicConfig>;
-export declare function ensureTsconfig(projectPath: string): Promise<void>;
+export declare function ensureTsconfig(projectPath: string, packageManager: PackageManagerType): Promise<void>;
 export declare function ifTs(ts: JsOrTs, str: string): string;

package/dist/utils/file-utils.js

@@ -200,13 +200,14 @@ function getPlasmicConfig(projectPath, platform, scheme) {
 exports.getPlasmicConfig = getPlasmicConfig;
 // Create tsconfig.json if it doesn't exist
 // this will force Plasmic to recognize Typescript
-function ensureTsconfig(projectPath) {
+function ensureTsconfig(projectPath, packageManager) {
     return __awaiter(this, void 0, void 0, function* () {
         const tsconfigPath = path.join(projectPath, "tsconfig.json");
         if (!(0, fs_1.existsSync)(tsconfigPath)) {
             yield fs_1.promises.writeFile(tsconfigPath, "");
             const installTsResult = yield (0, npm_utils_1.installUpgrade)("typescript @types/react", {
                 workingDir: projectPath,
+                packageManager,
             });
             if (!installTsResult) {
                 throw new Error("Failed to install Typescript");

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

@@ -1,3 +1,4 @@
+import { PackageManagerType } from "./types";
 /**
  * Call this to check if there's an update available
  * and display to the user
@@ -15,20 +16,34 @@ export declare function checkEngineStrict(): boolean;
  * @returns boolean - true if success, false if fail
  */
 export declare function spawn(cmd: string, workingDir?: string): Promise<boolean>;
+interface InstallOpts {
+    global?: boolean;
+    dev?: boolean;
+    workingDir?: string;
+    packageManager: PackageManagerType;
+}
 /**
  * Install a package using either `npm` or `yarn`
  * @param pkg - package name
  * @param opts
  * @returns
  */
-export declare function installUpgrade(pkg: string, opts?: {
-    global?: boolean;
-    dev?: boolean;
-    workingDir?: string;
-}): Promise<boolean>;
+export declare function installUpgrade(pkg: string, opts: InstallOpts): Promise<boolean>;
 /**
- * Detect if you should use `npm` or `yarn`
- * @param dir
- * @returns
+ * The package manager to install with: the one requested, else the one we were run
+ * with. `npx` overwrites npm_config_user_agent, so this must be read before spawning
+ * nested create commands.
+ */
+export declare function resolvePackageManager(requested?: PackageManagerType): PackageManagerType;
+/** Scaffolders and run scripts only know the `yarn` command. */
+export declare function packageManagerCommand(mgr: PackageManagerType): "npm" | "yarn" | "pnpm";
+/** Run a locally installed bin. `npx` can't see Yarn Berry's PnP installs. */
+export declare function packageManagerExec(mgr: PackageManagerType): string;
+/**
+ * Make a freshly scaffolded app its own Yarn Berry project. Without a lockfile Berry
+ * claims the app for the nearest ancestor project, and its default PnP linker can't
+ * load CommonJS from Node 24's ESM resolver (EBADF), which breaks every framework we
+ * scaffold. Must run before anything invokes yarn in `projectPath`.
  */
-export declare function detectPackageManager(dir?: string): "yarn" | "pnpm" | "npm";
+export declare function initYarnBerryProject(projectPath: string): Promise<void>;
+export {};