create-plasmic-app 0.0.48 → 0.0.49

package/dist/strategies/gatsby.js

@@ -62,25 +62,24 @@ const gatsbyStrategy = {
         yield cmd_utils_1.spawnOrFail(`${createCommand}`, parent);
     }),
     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 });

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

@@ -42,6 +42,7 @@ 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";
 
@@ -62,6 +63,7 @@ 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>
@@ -83,6 +85,7 @@ export const getStaticProps${file_utils_1.ifTs(ts, `: GetStaticProps`)} = async
       loader={PLASMIC}
       prefetchedData={plasmicData}
       pageParams={pageMeta.params}
+      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>
@@ -146,10 +149,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.49",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",

package/src/strategies/gatsby.ts

@@ -37,34 +37,29 @@ const gatsbyStrategy: CPAStrategy = {
     await spawnOrFail(`${createCommand}`, parent);
   },
   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 });
     }

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

@@ -45,6 +45,7 @@ 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";
 
@@ -68,6 +69,7 @@ export default function PlasmicLoaderPage(props${ifTs(
       prefetchedQueryData={queryCache}
       pageParams={pageMeta.params}
       pageQuery={router.query}
+      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>
@@ -92,6 +94,7 @@ export const getStaticProps${ifTs(
       loader={PLASMIC}
       prefetchedData={plasmicData}
       pageParams={pageMeta.params}
+      Head={Head}
     >
       <PlasmicComponent component={pageMeta.displayName} />
     </PlasmicRootProvider>
@@ -155,10 +158,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>
   );