create-plasmic-app 0.0.49 → 0.0.52

package/dist/strategies/gatsby.d.ts

@@ -1,3 +1,7 @@
 import { CPAStrategy } from "./types";
+export declare const GATSBY_TEMPLATES: {
+    js: string;
+    ts: string;
+};
 declare const gatsbyStrategy: CPAStrategy;
 export default gatsbyStrategy;

package/dist/strategies/gatsby.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GATSBY_TEMPLATES = void 0;
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const readline = __importStar(require("readline"));
@@ -47,19 +48,22 @@ const file_utils_1 = require("../utils/file-utils");
 const lang_utils_1 = require("../utils/lang-utils");
 const npm_utils_1 = require("../utils/npm-utils");
 const common_1 = require("./common");
+exports.GATSBY_TEMPLATES = {
+    js: `https://github.com/gatsbyjs/gatsby-starter-minimal.git`,
+    ts: `https://github.com/gatsbyjs/gatsby-starter-minimal-ts.git`,
+};
 const gatsbyStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
         const { projectPath, template, useTypescript } = args;
         if (template) {
             console.log(`Warning: Ignoring template '${template}' (argument is not supported by Gatsby).`);
         }
-        // create-gatsby does not support absolute paths as of 2022-08-12
-        // (see https://github.com/gatsbyjs/gatsby/issues/36381).
-        const parent = path_1.default.dirname(projectPath);
-        yield fs_1.promises.mkdir(parent, { recursive: true });
-        const dir = path_1.default.basename(projectPath);
-        const createCommand = `npx -p create-gatsby create-gatsby ${useTypescript ? "-ts" : ""} -y ${dir}`;
-        yield cmd_utils_1.spawnOrFail(`${createCommand}`, parent);
+        const gatsbyTemplate = exports.GATSBY_TEMPLATES[useTypescript ? "ts" : "js"];
+        const createCommand = `git clone ${gatsbyTemplate} ${projectPath} --recursive --depth 1 --quiet`;
+        yield cmd_utils_1.spawnOrFail(`${createCommand}`);
+        // Remove .git and LICENSE so that we don't generate linked outputs
+        yield cmd_utils_1.spawnOrFail(`rm -rf ${projectPath}/.git`);
+        yield cmd_utils_1.spawnOrFail(`rm -rf ${projectPath}/LICENSE`);
     }),
     installDeps: ({ projectPath, scheme, useTypescript }) => __awaiter(void 0, void 0, void 0, function* () {
         const installedHelmet = yield npm_utils_1.installUpgrade("react-helmet", {
@@ -89,6 +93,16 @@ const gatsbyStrategy = {
         var e_1, _a;
         const { projectId, projectPath, projectApiToken, useTypescript, scheme, } = args;
         const extension = useTypescript ? "ts" : "js";
+        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") {
             // create-gatsby will create a default gatsby-config that we need to modify
             const gatsbyConfigFile = path_1.default.join(projectPath, `gatsby-config.${extension}`);

package/dist/strategies/nextjs.js

@@ -23,7 +23,7 @@ const common_1 = require("./common");
 const nextjsStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
         const { projectPath, template, useTypescript } = args;
-        const createCommand = `npx -p create-next-app create-next-app ${useTypescript ? "--typescript" : ""} ${projectPath}`;
+        const createCommand = `npx create-next-app@latest ${useTypescript ? "--typescript" : ""} ${projectPath}`;
         const templateArg = template ? ` --template ${template}` : "";
         // Default Next.js starter already supports Typescript
         // See where we `touch tsconfig.json` later on
@@ -57,7 +57,7 @@ module.exports = {
             yield fs_1.promises.writeFile(nextjsConfigFile, `
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  // Turn off React StrictMode for now, as react-aria (used by Plasmic) 
+  // Turn off React StrictMode for now, as react-aria (used by Plasmic)
   // has some troubles with it. See
   // https://github.com/adobe/react-spectrum/labels/strict%20mode
   reactStrictMode: false,

package/dist/templates/nextjs.js

@@ -42,7 +42,6 @@ import {
 } from "@plasmicapp/loader-nextjs";
 ${file_utils_1.ifTs(ts, `import type { GetStaticPaths, GetStaticProps } from "next";\n`)}
 import Error from "next/error";
-import Head from "next/head";
 import { useRouter } from "next/router";
 import { PLASMIC } from "../plasmic-init";
 
@@ -63,7 +62,6 @@ export default function PlasmicLoaderPage(props${file_utils_1.ifTs(ts, `: {
       prefetchedQueryData={queryCache}
       pageParams={pageMeta.params}
       pageQuery={router.query}
-      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>
@@ -85,7 +83,6 @@ export const getStaticProps${file_utils_1.ifTs(ts, `: GetStaticProps`)} = async
       loader={PLASMIC}
       prefetchedData={plasmicData}
       pageParams={pageMeta.params}
-      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.49",
+  "version": "0.0.52",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",

package/src/strategies/gatsby.ts

@@ -17,6 +17,11 @@ import { installUpgrade } from "../utils/npm-utils";
 import { installCodegenDeps, runCodegenSync } from "./common";
 import { CPAStrategy } from "./types";
 
+export const GATSBY_TEMPLATES = {
+  js: `https://github.com/gatsbyjs/gatsby-starter-minimal.git`,
+  ts: `https://github.com/gatsbyjs/gatsby-starter-minimal-ts.git`,
+};
+
 const gatsbyStrategy: CPAStrategy = {
   create: async (args) => {
     const { projectPath, template, useTypescript } = args;
@@ -25,16 +30,12 @@ const gatsbyStrategy: CPAStrategy = {
         `Warning: Ignoring template '${template}' (argument is not supported by Gatsby).`
       );
     }
-
-    // create-gatsby does not support absolute paths as of 2022-08-12
-    // (see https://github.com/gatsbyjs/gatsby/issues/36381).
-    const parent = path.dirname(projectPath);
-    await fs.mkdir(parent, { recursive: true });
-    const dir = path.basename(projectPath);
-    const createCommand = `npx -p create-gatsby create-gatsby ${
-      useTypescript ? "-ts" : ""
-    } -y ${dir}`;
-    await spawnOrFail(`${createCommand}`, parent);
+    const gatsbyTemplate = GATSBY_TEMPLATES[useTypescript ? "ts" : "js"];
+    const createCommand = `git clone ${gatsbyTemplate} ${projectPath} --recursive --depth 1 --quiet`;
+    await spawnOrFail(`${createCommand}`);
+    // Remove .git and LICENSE so that we don't generate linked outputs
+    await spawnOrFail(`rm -rf ${projectPath}/.git`);
+    await spawnOrFail(`rm -rf ${projectPath}/LICENSE`);
   },
   installDeps: async ({ projectPath, scheme, useTypescript }) => {
     const installedHelmet = await installUpgrade("react-helmet", {
@@ -74,6 +75,21 @@ const gatsbyStrategy: CPAStrategy = {
     } = args;
     const extension = useTypescript ? "ts" : "js";
 
+    const packageName = path.basename(projectPath);
+
+    // Update package.json: adding name and description, removing license and author
+    const packageJsonPath = path.join(projectPath, "package.json");
+    const packageJson = await fs.readFile(packageJsonPath, "utf8");
+    const packageJsonObject = JSON.parse(packageJson);
+    packageJsonObject.name = packageName;
+    packageJsonObject.description = `Plasmic app for ${projectId}`;
+    delete packageJsonObject.license;
+    delete packageJsonObject.author;
+    await fs.writeFile(
+      packageJsonPath,
+      JSON.stringify(packageJsonObject, null, 2)
+    );
+
     if (scheme === "loader") {
       // create-gatsby will create a default gatsby-config that we need to modify
       const gatsbyConfigFile = path.join(

package/src/strategies/nextjs.ts

@@ -16,7 +16,7 @@ import { CPAStrategy } from "./types";
 const nextjsStrategy: CPAStrategy = {
   create: async (args) => {
     const { projectPath, template, useTypescript } = args;
-    const createCommand = `npx -p create-next-app create-next-app ${
+    const createCommand = `npx create-next-app@latest ${
       useTypescript ? "--typescript" : ""
     } ${projectPath}`;
     const templateArg = template ? ` --template ${template}` : "";
@@ -52,11 +52,11 @@ module.exports = {
       );
     } else {
       await fs.writeFile(
-        nextjsConfigFile, 
+        nextjsConfigFile,
         `
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  // Turn off React StrictMode for now, as react-aria (used by Plasmic) 
+  // Turn off React StrictMode for now, as react-aria (used by Plasmic)
   // has some troubles with it. See
   // https://github.com/adobe/react-spectrum/labels/strict%20mode
   reactStrictMode: false,
@@ -64,7 +64,7 @@ const nextConfig = {
 
 module.exports = nextConfig
         `
-      )
+      );
     }
   },
   generateFiles: async (args) => {

package/src/templates/nextjs.ts

@@ -45,7 +45,6 @@ import {
 } from "@plasmicapp/loader-nextjs";
 ${ifTs(ts, `import type { GetStaticPaths, GetStaticProps } from "next";\n`)}
 import Error from "next/error";
-import Head from "next/head";
 import { useRouter } from "next/router";
 import { PLASMIC } from "../plasmic-init";
 
@@ -69,7 +68,6 @@ export default function PlasmicLoaderPage(props${ifTs(
       prefetchedQueryData={queryCache}
       pageParams={pageMeta.params}
       pageQuery={router.query}
-      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>
@@ -94,7 +92,6 @@ export const getStaticProps${ifTs(
       loader={PLASMIC}
       prefetchedData={plasmicData}
       pageParams={pageMeta.params}
-      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>