create-plasmic-app 0.0.48 → 0.0.51

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,40 +48,42 @@ 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* () {
-        if (scheme === "loader") {
-            const installedLoader = yield npm_utils_1.installUpgrade("@plasmicapp/loader-gatsby", {
-                workingDir: projectPath,
-            });
-            const installedHelmet = yield npm_utils_1.installUpgrade("react-helmet", {
+        const installedHelmet = yield npm_utils_1.installUpgrade("react-helmet", {
+            workingDir: projectPath,
+        });
+        const installedHelmetTypes = !useTypescript ||
+            (yield npm_utils_1.installUpgrade("@types/react-helmet", {
                 workingDir: projectPath,
-            });
-            const installedHelmetTypes = !useTypescript ||
-                (yield npm_utils_1.installUpgrade("@types/react-helmet", {
-                    workingDir: projectPath,
-                    dev: true,
-                }));
-            const installedHelmetPlugin = yield npm_utils_1.installUpgrade("gatsby-plugin-react-helmet", {
+                dev: true,
+            }));
+        const installedHelmetPlugin = yield npm_utils_1.installUpgrade("gatsby-plugin-react-helmet", {
+            workingDir: projectPath,
+        });
+        if (!installedHelmet || !installedHelmetPlugin || !installedHelmetTypes) {
+            return false;
+        }
+        if (scheme === "loader") {
+            return yield npm_utils_1.installUpgrade("@plasmicapp/loader-gatsby", {
                 workingDir: projectPath,
             });
-            return (installedLoader &&
-                installedHelmet &&
-                installedHelmetPlugin &&
-                installedHelmetTypes);
         }
         else {
             return yield common_1.installCodegenDeps({ projectPath });
@@ -90,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/templates/gatsby.js

@@ -43,6 +43,7 @@ const PlasmicGatsbyPage = ({ data, location }${file_utils_1.ifTs(ts, ": PlasmicG
       prefetchedData={plasmicComponents}
       pageParams={pageMeta.params}
       pageQuery={Object.fromEntries(new URLSearchParams(location.search))}
+      Head={Helmet}
     >
       <Helmet>
         {pageMetadata?.title && <title>{pageMetadata.title}</title>}
@@ -212,10 +213,11 @@ function wrapAppRootForCodegen() {
     return `
 import React from "react";
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
+import Helmet from "react-helmet";
 
 export const wrapRootElement = ({ element }) => {
   return (
-    <PlasmicRootProvider>
+    <PlasmicRootProvider Head={Helmet}>
       {element}
     </PlasmicRootProvider>
   );

package/dist/templates/nextjs.js

@@ -146,10 +146,11 @@ function wrapAppRootForCodegen() {
     return `
 import '../styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
+import Head from "next/head";
 
 function MyApp({ Component, pageProps }) {
   return (
-    <PlasmicRootProvider>
+    <PlasmicRootProvider Head={Head}>
       <Component {...pageProps} />
     </PlasmicRootProvider>
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.48",
+  "version": "0.0.51",
   "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,46 +30,37 @@ 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", {
+      workingDir: projectPath,
+    });
+    const installedHelmetTypes =
+      !useTypescript ||
+      (await installUpgrade("@types/react-helmet", {
+        workingDir: projectPath,
+        dev: true,
+      }));
+    const installedHelmetPlugin = await installUpgrade(
+      "gatsby-plugin-react-helmet",
+      {
+        workingDir: projectPath,
+      }
+    );
+    if (!installedHelmet || !installedHelmetPlugin || !installedHelmetTypes) {
+      return false;
+    }
+
     if (scheme === "loader") {
-      const installedLoader = await installUpgrade(
-        "@plasmicapp/loader-gatsby",
-        {
-          workingDir: projectPath,
-        }
-      );
-      const installedHelmet = await installUpgrade("react-helmet", {
+      return await installUpgrade("@plasmicapp/loader-gatsby", {
         workingDir: projectPath,
       });
-      const installedHelmetTypes =
-        !useTypescript ||
-        (await installUpgrade("@types/react-helmet", {
-          workingDir: projectPath,
-          dev: true,
-        }));
-      const installedHelmetPlugin = await installUpgrade(
-        "gatsby-plugin-react-helmet",
-        {
-          workingDir: projectPath,
-        }
-      );
-      return (
-        installedLoader &&
-        installedHelmet &&
-        installedHelmetPlugin &&
-        installedHelmetTypes
-      );
     } else {
       return await installCodegenDeps({ projectPath });
     }
@@ -79,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/templates/gatsby.ts

@@ -51,6 +51,7 @@ const PlasmicGatsbyPage = ({ data, location }${ifTs(
       prefetchedData={plasmicComponents}
       pageParams={pageMeta.params}
       pageQuery={Object.fromEntries(new URLSearchParams(location.search))}
+      Head={Helmet}
     >
       <Helmet>
         {pageMetadata?.title && <title>{pageMetadata.title}</title>}
@@ -241,10 +242,11 @@ export function wrapAppRootForCodegen(): string {
   return `
 import React from "react";
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
+import Helmet from "react-helmet";
 
 export const wrapRootElement = ({ element }) => {
   return (
-    <PlasmicRootProvider>
+    <PlasmicRootProvider Head={Helmet}>
       {element}
     </PlasmicRootProvider>
   );

package/src/templates/nextjs.ts

@@ -155,10 +155,11 @@ export function wrapAppRootForCodegen(): string {
   return `
 import '../styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
+import Head from "next/head";
 
 function MyApp({ Component, pageProps }) {
   return (
-    <PlasmicRootProvider>
+    <PlasmicRootProvider Head={Head}>
       <Component {...pageProps} />
     </PlasmicRootProvider>
   );