create-plasmic-app 0.0.167 → 0.0.169

package/dist/nextjs/nextjs.js

@@ -28,35 +28,45 @@ const catchall_page_1 = require("./templates/app-loader/catchall-page");
 const plasmic_host_2 = require("./templates/app-loader/plasmic-host");
 const plasmic_init_1 = require("./templates/app-loader/plasmic-init");
 const plasmic_init_client_2 = require("./templates/app-loader/plasmic-init-client");
+const app_seo_1 = require("./templates/app-seo");
 const app_1 = require("./templates/pages-codegen/app");
 const plasmic_host_3 = require("./templates/pages-codegen/plasmic-host");
 const catchall_page_2 = require("./templates/pages-loader/catchall-page");
 const plasmic_host_4 = require("./templates/pages-loader/plasmic-host");
 const plasmic_init_2 = require("./templates/pages-loader/plasmic-init");
+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* () {
@@ -121,9 +131,11 @@ 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
+        yield fs_1.promises.writeFile(path_1.default.join(projectPath, "app", `robots.${jsOrTs}`), (0, app_seo_1.makeRobots_app)(jsOrTs));
         if (scheme === "loader") {
             // ./plasmic-init.ts
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, `plasmic-init.${jsOrTs}`), (0, plasmic_init_1.makePlasmicInit_app_loader)(projectId, (0, lang_utils_1.ensure)(projectApiToken, "Missing projectApiToken")));
@@ -135,6 +147,8 @@ function generateFilesAppDir(args) {
             // ./app/[[...catchall]]/page.tsx
             yield fs_1.promises.mkdir(path_1.default.join(projectPath, "app", "[[...catchall]]"));
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, "app", "[[...catchall]]", `page.${jsOrTs}x`), (0, catchall_page_1.makeCatchallPage_app_loader)(jsOrTs));
+            // ./app/sitemap.ts
+            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "app", `sitemap.${jsOrTs}`), (0, app_seo_1.makeSitemap_app_loader)(jsOrTs));
         }
         else {
             // ./plasmic-init-client.tsx
@@ -150,7 +164,10 @@ 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));
             // Read plasmic.json so we can wire each top-level project's plasmic.css
             // import directly into the root layout template.
             const config = yield (0, file_utils_1.getPlasmicConfig)(projectPath, "nextjs", scheme);
@@ -174,9 +191,11 @@ 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
+        yield fs_1.promises.writeFile(path_1.default.join(projectPath, "pages", `robots.txt.${jsOrTs}`), (0, pages_seo_1.makeRobots_pages)(jsOrTs));
         if (scheme === "loader") {
             // ./plasmic-init.ts
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, `plasmic-init.${jsOrTs}`), (0, plasmic_init_2.makePlasmicInit_pages_loader)(projectId, (0, lang_utils_1.ensure)(projectApiToken, "Missing projectApiToken")));
@@ -184,6 +203,8 @@ function generateFilesPagesDir(args) {
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, "pages", `plasmic-host.${jsOrTs}x`), (0, plasmic_host_4.makePlasmicHostPage_pages_loader)());
             // ./pages/[[...catchall]].tsx
             yield fs_1.promises.writeFile(path_1.default.join(projectPath, "pages", `[[...catchall]].${jsOrTs}x`), (0, catchall_page_2.makeCatchallPage_pages_loader)(jsOrTs));
+            // ./pages/sitemap.xml.ts
+            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "pages", `sitemap.xml.${jsOrTs}`), (0, pages_seo_1.makeSitemap_pages_loader)(jsOrTs));
         }
         else {
             // ./pages/plasmic-host.tsx
@@ -196,7 +217,10 @@ 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));
             // Read plasmic.json so we can wire each top-level project's plasmic.css
             // import directly into the _app template.
             const config = yield (0, file_utils_1.getPlasmicConfig)(projectPath, "nextjs", scheme);

package/dist/nextjs/templates/app-seo.d.ts

@@ -0,0 +1,4 @@
+import { JsOrTs } from "../../utils/types";
+export declare function makeSitemap_app_loader(jsOrTs: JsOrTs): string;
+export declare function makeSitemap_app_codegen(jsOrTs: JsOrTs): string;
+export declare function makeRobots_app(jsOrTs: JsOrTs): string;

package/dist/nextjs/templates/app-seo.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeRobots_app = exports.makeSitemap_app_codegen = exports.makeSitemap_app_loader = void 0;
+const file_utils_1 = require("../../utils/file-utils");
+const getSiteUrl = `// Set NEXT_PUBLIC_SITE_URL to pin the origin and keep this route static;
+// otherwise it is derived per-request, which opts the route out of prerendering.
+async function getSiteUrl() {
+  if (process.env.NEXT_PUBLIC_SITE_URL) {
+    return process.env.NEXT_PUBLIC_SITE_URL;
+  }
+  if (process.env.VERCEL_PROJECT_PRODUCTION_URL) {
+    return \`https://\${process.env.VERCEL_PROJECT_PRODUCTION_URL}\`;
+  }
+  const h = await headers();
+  const proto = h.get("x-forwarded-proto") ?? "http";
+  return \`\${proto}://\${h.get("x-forwarded-host") ?? h.get("host")}\`;
+}`;
+function makeHeader(jsOrTs) {
+    return `${(0, file_utils_1.ifTs)(jsOrTs, `import type { MetadataRoute } from "next";\n`)}import { headers } from "next/headers";\n`;
+}
+function makeSignature(jsOrTs) {
+    return `export default async function sitemap()${(0, file_utils_1.ifTs)(jsOrTs, ": Promise<MetadataRoute.Sitemap>")} {`;
+}
+function makeSitemap_app_loader(jsOrTs) {
+    return `import { PLASMIC } from "@/plasmic-init";
+${makeHeader(jsOrTs)}
+export const revalidate = 60;
+
+${getSiteUrl}
+
+${makeSignature(jsOrTs)}
+  const siteUrl = await getSiteUrl();
+
+  // fetchPages() drops pages whose path takes a param, e.g. "/blog/[slug]".
+  const pages = await PLASMIC.fetchPages();
+
+  return pages.map((page) => ({
+    url: new URL(page.path, siteUrl).toString(),
+  }));
+}
+`;
+}
+exports.makeSitemap_app_loader = makeSitemap_app_loader;
+function makeSitemap_app_codegen(jsOrTs) {
+    const projects = jsOrTs === "ts"
+        ? `(plasmicJson.projects as {
+    components: { componentType: string; path?: string }[];
+  }[])`
+        : "plasmicJson.projects";
+    return `${makeHeader(jsOrTs)}import plasmicJson from "../plasmic.json";
+
+${getSiteUrl}
+
+${makeSignature(jsOrTs)}
+  const siteUrl = await getSiteUrl();
+
+  return ${projects}
+    .flatMap((project) => project.components)
+    .flatMap((component) =>
+      component.componentType === "page" &&
+      component.path &&
+      !component.path.includes("[")
+        ? [
+            {
+              // next.config sets trailingSlash.
+              url: new URL(
+                component.path.replace(/\\/?$/, "/"),
+                siteUrl
+              ).toString(),
+            },
+          ]
+        : []
+    );
+}
+`;
+}
+exports.makeSitemap_app_codegen = makeSitemap_app_codegen;
+function makeRobots_app(jsOrTs) {
+    return `${makeHeader(jsOrTs)}
+${getSiteUrl}
+
+export default async function robots()${(0, file_utils_1.ifTs)(jsOrTs, ": Promise<MetadataRoute.Robots>")} {
+  const siteUrl = await getSiteUrl();
+
+  return {
+    rules: { userAgent: "*", allow: "/" },
+    sitemap: new URL("/sitemap.xml", siteUrl).toString(),
+  };
+}
+`;
+}
+exports.makeRobots_app = makeRobots_app;

package/dist/nextjs/templates/pages-seo.d.ts

@@ -0,0 +1,4 @@
+import { JsOrTs } from "../../utils/types";
+export declare function makeSitemap_pages_loader(jsOrTs: JsOrTs): string;
+export declare function makeSitemap_pages_codegen(jsOrTs: JsOrTs): string;
+export declare function makeRobots_pages(jsOrTs: JsOrTs): string;

package/dist/nextjs/templates/pages-seo.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeRobots_pages = exports.makeSitemap_pages_codegen = exports.makeSitemap_pages_loader = void 0;
+const file_utils_1 = require("../../utils/file-utils");
+const siteUrl = `  // Set NEXT_PUBLIC_SITE_URL to pin the origin;
+  // otherwise it is derived per-request from the request headers.
+  const siteUrl =
+    process.env.NEXT_PUBLIC_SITE_URL ??
+    (process.env.VERCEL_PROJECT_PRODUCTION_URL
+      ? \`https://\${process.env.VERCEL_PROJECT_PRODUCTION_URL}\`
+      : \`\${req.headers["x-forwarded-proto"] ?? "http"}://\${
+          req.headers["x-forwarded-host"] ?? req.headers.host
+        }\`);`;
+function makeHeader(jsOrTs) {
+    return (0, file_utils_1.ifTs)(jsOrTs, `import type { GetServerSideProps } from "next";\n`);
+}
+function makeSignature(jsOrTs) {
+    return `export const getServerSideProps${(0, file_utils_1.ifTs)(jsOrTs, ": GetServerSideProps")} = async ({ req, res }) => {`;
+}
+function makeSitemapXml(jsOrTs) {
+    return `function escapeXml(str${(0, file_utils_1.ifTs)(jsOrTs, ": string")}) {
+  return str
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}
+
+function makeSitemapXml(urls${(0, file_utils_1.ifTs)(jsOrTs, ": string[]")}) {
+  const entries = urls.map(
+    (url) => \`  <url><loc>\${escapeXml(url)}</loc></url>\`
+  );
+  return \`<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+\${entries.join("\\n")}
+</urlset>
+\`;
+}`;
+}
+function makeSitemap_pages_loader(jsOrTs) {
+    return `import { PLASMIC } from "@/plasmic-init";
+${makeHeader(jsOrTs)}
+${makeSitemapXml(jsOrTs)}
+
+${makeSignature(jsOrTs)}
+${siteUrl}
+
+  // fetchPages() drops pages whose path takes a param, e.g. "/blog/[slug]".
+  const pages = await PLASMIC.fetchPages();
+  const urls = pages.map((page) => new URL(page.path, siteUrl).toString());
+
+  res.setHeader("Content-Type", "application/xml; charset=utf-8");
+  res.write(makeSitemapXml(urls));
+  res.end();
+  return { props: {} };
+};
+
+export default function Sitemap() {
+  return null;
+}
+`;
+}
+exports.makeSitemap_pages_loader = makeSitemap_pages_loader;
+function makeSitemap_pages_codegen(jsOrTs) {
+    const projects = jsOrTs === "ts"
+        ? `(plasmicJson.projects as {
+    components: { componentType: string; path?: string }[];
+  }[])`
+        : "plasmicJson.projects";
+    return `${makeHeader(jsOrTs)}import plasmicJson from "../plasmic.json";
+
+${makeSitemapXml(jsOrTs)}
+
+${makeSignature(jsOrTs)}
+${siteUrl}
+
+  const urls = ${projects}
+    .flatMap((project) => project.components)
+    .flatMap((component) =>
+      component.componentType === "page" &&
+      component.path &&
+      !component.path.includes("[")
+        ? // next.config sets trailingSlash.
+          [new URL(component.path.replace(/\\/?$/, "/"), siteUrl).toString()]
+        : []
+    );
+
+  res.setHeader("Content-Type", "application/xml; charset=utf-8");
+  res.write(makeSitemapXml(urls));
+  res.end();
+  return { props: {} };
+};
+
+export default function Sitemap() {
+  return null;
+}
+`;
+}
+exports.makeSitemap_pages_codegen = makeSitemap_pages_codegen;
+function makeRobots_pages(jsOrTs) {
+    return `${(0, file_utils_1.ifTs)(jsOrTs, `import type { GetServerSideProps } from "next";\n\n`)}${makeSignature(jsOrTs)}
+${siteUrl}
+
+  res.setHeader("Content-Type", "text/plain; charset=utf-8");
+  res.write(
+    \`User-agent: *\\nAllow: /\\n\\nSitemap: \${new URL(
+      "/sitemap.xml",
+      siteUrl
+    ).toString()}\\n\`
+  );
+  res.end();
+  return { props: {} };
+};
+
+export default function Robots() {
+  return null;
+}
+`;
+}
+exports.makeRobots_pages = makeRobots_pages;

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 {};