create-plasmic-app 0.0.47 → 0.0.50

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

@@ -13,7 +13,7 @@ import {
   InitOptions,
   ComponentRenderData,`)}
 } from "@plasmicapp/loader-gatsby";
-import { graphql } from "gatsby";
+import { graphql${file_utils_1.ifTs(ts, ", PageProps")} } from "gatsby";
 import { initPlasmicLoaderWithRegistrations } from "../plasmic-init";
 
 export const query = graphql\`
@@ -23,14 +23,14 @@ export const query = graphql\`
   }
 \`;
 
-${file_utils_1.ifTs(ts, `interface PlasmicGatsbyPageProps {
+${file_utils_1.ifTs(ts, `interface PlasmicGatsbyPageProps extends PageProps {
   data: {
     plasmicOptions: InitOptions
     plasmicComponents: ComponentRenderData
   }
 }
 `)}
-const PlasmicGatsbyPage = ({ data }${file_utils_1.ifTs(ts, ": PlasmicGatsbyPageProps")}) => {
+const PlasmicGatsbyPage = ({ data, location }${file_utils_1.ifTs(ts, ": PlasmicGatsbyPageProps")}) => {
   const {
     plasmicComponents,
     plasmicOptions,
@@ -41,6 +41,9 @@ const PlasmicGatsbyPage = ({ data }${file_utils_1.ifTs(ts, ": PlasmicGatsbyPageP
     <PlasmicRootProvider
       loader={initPlasmicLoaderWithRegistrations(plasmicOptions)}
       prefetchedData={plasmicComponents}
+      pageParams={pageMeta.params}
+      pageQuery={Object.fromEntries(new URLSearchParams(location.search))}
+      Head={Helmet}
     >
       <Helmet>
         {pageMetadata?.title && <title>{pageMetadata.title}</title>}
@@ -210,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.47",
+  "version": "0.0.50",
   "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

@@ -15,7 +15,7 @@ import {
   ComponentRenderData,`
   )}
 } from "@plasmicapp/loader-gatsby";
-import { graphql } from "gatsby";
+import { graphql${ifTs(ts, ", PageProps")} } from "gatsby";
 import { initPlasmicLoaderWithRegistrations } from "../plasmic-init";
 
 export const query = graphql\`
@@ -27,7 +27,7 @@ export const query = graphql\`
 
 ${ifTs(
   ts,
-  `interface PlasmicGatsbyPageProps {
+  `interface PlasmicGatsbyPageProps extends PageProps {
   data: {
     plasmicOptions: InitOptions
     plasmicComponents: ComponentRenderData
@@ -35,7 +35,10 @@ ${ifTs(
 }
 `
 )}
-const PlasmicGatsbyPage = ({ data }${ifTs(ts, ": PlasmicGatsbyPageProps")}) => {
+const PlasmicGatsbyPage = ({ data, location }${ifTs(
+    ts,
+    ": PlasmicGatsbyPageProps"
+  )}) => {
   const {
     plasmicComponents,
     plasmicOptions,
@@ -46,6 +49,9 @@ const PlasmicGatsbyPage = ({ data }${ifTs(ts, ": PlasmicGatsbyPageProps")}) => {
     <PlasmicRootProvider
       loader={initPlasmicLoaderWithRegistrations(plasmicOptions)}
       prefetchedData={plasmicComponents}
+      pageParams={pageMeta.params}
+      pageQuery={Object.fromEntries(new URLSearchParams(location.search))}
+      Head={Helmet}
     >
       <Helmet>
         {pageMetadata?.title && <title>{pageMetadata.title}</title>}
@@ -236,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>
   );