create-plasmic-app 0.0.88 → 0.0.90

package/cpa-out/nextjs-pages-codegen-js/pages/_app.jsx

@@ -1,4 +1,4 @@
-import 'styles/globals.css'
+import '@/styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
 import Head from "next/head";
 

package/cpa-out/nextjs-pages-codegen-ts/pages/_app.tsx

@@ -1,4 +1,4 @@
-import 'styles/globals.css'
+import '@/styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";
 import type { AppProps } from "next/app";
 import Head from "next/head";

package/dist/nextjs/templates/pages-codegen/app.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCustomApp_pages_codegen = void 0;
 const file_utils_1 = require("../../../utils/file-utils");
 function makeCustomApp_pages_codegen(jsOrTs) {
-    return `import 'styles/globals.css'
+    return `import '@/styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";${(0, file_utils_1.ifTs)(jsOrTs, `
 import type { AppProps } from "next/app";`)}
 import Head from "next/head";

package/dist/react/react.js

@@ -19,7 +19,6 @@ const path_1 = __importDefault(require("path"));
 const cmd_utils_1 = require("../utils/cmd-utils");
 const codegen_1 = require("../utils/codegen");
 const file_utils_1 = require("../utils/file-utils");
-const lang_utils_1 = require("../utils/lang-utils");
 const npm_utils_1 = require("../utils/npm-utils");
 exports.reactStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
@@ -59,12 +58,18 @@ exports.reactStrategy = {
             });
             // Pick a page for the entry point App.tsx page
             const config = yield (0, file_utils_1.getPlasmicConfig)(projectPath, "react", scheme);
-            const pagesDir = path_1.default.join(projectPath, (0, lang_utils_1.ensureString)(config.srcDir));
+            const pagesDir = path_1.default.join(projectPath, config.srcDir);
+            const projectConfig = config.projects.find((p) => p.projectId === projectId);
+            const globalContextsPath = projectConfig &&
+                projectConfig.globalContextsFilePath &&
+                config.wrapPagesWithGlobalContexts
+                ? path_1.default.join(projectPath, config.srcDir, projectConfig.globalContextsFilePath)
+                : undefined;
             const homeFilePossibilities = glob_1.default.sync(path_1.default.join(pagesDir, "**", "@(index|Home|home|Homepage).*"));
             // Overwrite App.tsx
             const indexPath = path_1.default.join(projectPath, "src", `App.${jsOrTs}x`);
             const content = homeFilePossibilities.length > 0
-                ? (0, file_utils_1.generateHomePage)(homeFilePossibilities[0], indexPath)
+                ? (0, file_utils_1.generateHomePage)(homeFilePossibilities[0], indexPath, globalContextsPath)
                 : (0, file_utils_1.generateWelcomePage)(config, "react");
             yield fs_1.promises.writeFile(indexPath, content);
         }

package/dist/utils/file-utils.d.ts

@@ -1,3 +1,4 @@
+import type { PlasmicConfig } from "@plasmicapp/cli/dist/utils/config-utils";
 import { JsOrTs, PlatformType } from "../utils/types";
 /**
  * Runs the search pattern through `glob` and deletes all resulting files
@@ -20,7 +21,7 @@ export declare function overwriteReadme(projectPath: string, platform: PlatformT
  * @param indexAbsPath - absolute path of index file to write
  * @returns
  */
-export declare function generateHomePage(componentAbsPath: string, indexAbsPath: string): string;
+export declare function generateHomePage(componentAbsPath: string, indexAbsPath: string, globalContextsAbsPath?: string): string;
 /**
  * Generate a Welcome page based on a PlasmicConfig
  * @param config - PlasmicConfig
@@ -28,6 +29,6 @@ export declare function generateHomePage(componentAbsPath: string, indexAbsPath:
  * @returns
  */
 export declare function generateWelcomePage(config: any, platform: string): string;
-export declare function getPlasmicConfig(projectPath: string, platform: PlatformType, scheme: string): Promise<any>;
+export declare function getPlasmicConfig(projectPath: string, platform: PlatformType, scheme: string): Promise<PlasmicConfig>;
 export declare function ensureTsconfig(projectPath: string): Promise<void>;
 export declare function ifTs(ts: JsOrTs, str: string): string;

package/dist/utils/file-utils.js

@@ -101,16 +101,25 @@ exports.overwriteReadme = overwriteReadme;
  * @param indexAbsPath - absolute path of index file to write
  * @returns
  */
-function generateHomePage(componentAbsPath, indexAbsPath) {
+function generateHomePage(componentAbsPath, indexAbsPath, globalContextsAbsPath) {
     const componentFilename = path.basename(componentAbsPath);
     const componentName = stripExtension(componentFilename);
     // The relative import path from App.js to the Plasmic component
     const componentRelativePath = path.relative(path.dirname(indexAbsPath), componentAbsPath);
+    const globalContextsImport = globalContextsAbsPath
+        ? `import GlobalContextsProvider from './${stripExtension(path.relative(path.dirname(indexAbsPath), globalContextsAbsPath))}'`
+        : ``;
+    const maybeWrapInGlobalContexts = (content) => {
+        return globalContextsAbsPath
+            ? `<GlobalContextsProvider>${content}</GlobalContextsProvider>`
+            : content;
+    };
     const appjsContents = `
 import ${componentName} from './${stripExtension(componentRelativePath)}';
+${globalContextsImport}
 
 function App() {
-  return (<${componentName} />);
+  return (${maybeWrapInGlobalContexts(`<${componentName} />`)});
 }
 
 export default App;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",
@@ -54,5 +54,5 @@
     "validate-npm-package-name": "^3.0.0",
     "yargs": "^16.2.0"
   },
-  "gitHead": "1089fbd93d2ac0d2ac7e0e8f755ba98d5c21f0eb"
+  "gitHead": "ce7c1c867f3583d4d723912b6832ed44a56cd759"
 }

package/src/nextjs/templates/pages-codegen/app.ts

@@ -2,7 +2,7 @@ import { ifTs } from "../../../utils/file-utils";
 import { JsOrTs } from "../../../utils/types";
 
 export function makeCustomApp_pages_codegen(jsOrTs: JsOrTs): string {
-  return `import 'styles/globals.css'
+  return `import '@/styles/globals.css'
 import { PlasmicRootProvider } from "@plasmicapp/react-web";${ifTs(
     jsOrTs,
     `

package/src/react/react.ts

@@ -9,7 +9,6 @@ import {
   generateWelcomePage,
   getPlasmicConfig,
 } from "../utils/file-utils";
-import { ensureString } from "../utils/lang-utils";
 import { installUpgrade } from "../utils/npm-utils";
 import { CPAStrategy } from "../utils/strategy";
 
@@ -59,7 +58,20 @@ export const reactStrategy: CPAStrategy = {
 
       // Pick a page for the entry point App.tsx page
       const config = await getPlasmicConfig(projectPath, "react", scheme);
-      const pagesDir = path.join(projectPath, ensureString(config.srcDir));
+      const pagesDir = path.join(projectPath, config.srcDir);
+      const projectConfig = config.projects.find(
+        (p) => p.projectId === projectId
+      );
+      const globalContextsPath =
+        projectConfig &&
+        projectConfig.globalContextsFilePath &&
+        config.wrapPagesWithGlobalContexts
+          ? path.join(
+              projectPath,
+              config.srcDir,
+              projectConfig.globalContextsFilePath
+            )
+          : undefined;
       const homeFilePossibilities = glob.sync(
         path.join(pagesDir, "**", "@(index|Home|home|Homepage).*")
       );
@@ -68,7 +80,11 @@ export const reactStrategy: CPAStrategy = {
       const indexPath = path.join(projectPath, "src", `App.${jsOrTs}x`);
       const content =
         homeFilePossibilities.length > 0
-          ? generateHomePage(homeFilePossibilities[0], indexPath)
+          ? generateHomePage(
+              homeFilePossibilities[0],
+              indexPath,
+              globalContextsPath
+            )
           : generateWelcomePage(config, "react");
       await fs.writeFile(indexPath, content);
     }

package/src/utils/file-utils.ts

@@ -1,3 +1,4 @@
+import type { PlasmicConfig } from "@plasmicapp/cli/dist/utils/config-utils";
 import { existsSync, promises as fs, unlinkSync } from "fs";
 import glob from "glob";
 import L from "lodash";
@@ -80,7 +81,8 @@ export async function overwriteReadme(
  */
 export function generateHomePage(
   componentAbsPath: string,
-  indexAbsPath: string
+  indexAbsPath: string,
+  globalContextsAbsPath?: string
 ): string {
   const componentFilename = path.basename(componentAbsPath);
   const componentName = stripExtension(componentFilename);
@@ -89,11 +91,23 @@ export function generateHomePage(
     path.dirname(indexAbsPath),
     componentAbsPath
   );
+  const globalContextsImport = globalContextsAbsPath
+    ? `import GlobalContextsProvider from './${stripExtension(
+        path.relative(path.dirname(indexAbsPath), globalContextsAbsPath)
+      )}'`
+    : ``;
+  const maybeWrapInGlobalContexts = (content: string) => {
+    return globalContextsAbsPath
+      ? `<GlobalContextsProvider>${content}</GlobalContextsProvider>`
+      : content;
+  };
+
   const appjsContents = `
 import ${componentName} from './${stripExtension(componentRelativePath)}';
+${globalContextsImport}
 
 function App() {
-  return (<${componentName} />);
+  return (${maybeWrapInGlobalContexts(`<${componentName} />`)});
 }
 
 export default App;
@@ -154,7 +168,7 @@ export async function getPlasmicConfig(
   projectPath: string,
   platform: PlatformType,
   scheme: string
-) {
+): Promise<PlasmicConfig> {
   const isNextjs = platform === "nextjs";
   const isGatsby = platform === "gatsby";
   const isLoader = scheme === "loader";