create-plasmic-app 0.0.98 → 0.0.99

package/dist/index.js

@@ -52,8 +52,8 @@ if (process.env.CPA_DEBUG_CHDIR) {
 const createPlasmicAppVersion = (0, npm_utils_1.updateNotify)();
 // Specify command-line args
 const argv = yargs_1.default
-    .command("$0 [projectName]", "Create a Plasmic app with Next.js, Gatsby, or React (Vite)", (yargs) => {
-    yargs
+    .command("$0 [projectName]", "Create a Plasmic app with Next.js, Gatsby, or React (Vite)", (yargs2) => {
+    yargs2
         .usage("Usage: $0 [projectName] [options]")
         .positional("projectName", {
         describe: "Project and NPM package name",
@@ -91,13 +91,13 @@ const argv = yargs_1.default
     .strict()
     .help("h")
     .alias("h", "help")
-    .check((argv) => {
-    if (argv.scheme === "loader" &&
-        !(argv.platform === "nextjs" || argv.platform === "gatsby")) {
+    .check((argv2) => {
+    if (argv2.scheme === "loader" &&
+        !(argv2.platform === "nextjs" || argv2.platform === "gatsby")) {
         throw new Error(`Loader scheme may only be used with Next.js or Gatsby`);
     }
-    if (argv.appDir &&
-        !(argv.platform === "nextjs" && argv.scheme === "loader")) {
+    if (argv2.appDir &&
+        !(argv2.platform === "nextjs" && argv2.scheme === "loader")) {
         throw new Error(`App dir may only be used with Next.js and loader scheme`);
     }
     return true;
@@ -133,7 +133,6 @@ function maybePrompt(question) {
     });
 }
 // Keeping these as globals to easily share with our `crash` function
-const projectName = argv._.length > 0 ? argv._[0] + "" : undefined;
 let resolvedProjectPath;
 /**
  * Main function

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

@@ -1,5 +1,5 @@
 import type { PlasmicConfig } from "@plasmicapp/cli/dist/utils/config-utils";
-import { JsOrTs, PlatformType } from "../utils/types";
+import { JsOrTs, PlatformType } from "./types";
 /**
  * Runs the search pattern through `glob` and deletes all resulting files
  * @param searchPattern - glob search query
@@ -28,7 +28,7 @@ export declare function generateHomePage(componentAbsPath: string, indexAbsPath:
  * @param noPages - don't render links to pages
  * @returns
  */
-export declare function generateWelcomePage(config: any, platform: string): string;
+export declare function generateWelcomePage(config: PlasmicConfig, platform: string): string;
 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

@@ -134,40 +134,41 @@ exports.generateHomePage = generateHomePage;
  * @returns
  */
 function generateWelcomePage(config, platform) {
-    var _a, _b, _c;
-    let hasPages = false;
-    let pageComponents;
-    let pagesDir;
+    var _a, _b, _c, _d;
+    let pages;
     if (platform !== "react" && config && lodash_1.default.isArray(config.projects)) {
-        pageComponents = lodash_1.default.flatMap(config.projects, (p) => p.components).filter((c) => c.componentType === "page");
-        pagesDir = (_b = (_a = config === null || config === void 0 ? void 0 : config.nextjsConfig) === null || _a === void 0 ? void 0 : _a.pagesDir) !== null && _b !== void 0 ? _b : (_c = config === null || config === void 0 ? void 0 : config.gatsbyConfig) === null || _c === void 0 ? void 0 : _c.pagesDir;
-        if (pageComponents.length > 0 && pagesDir) {
-            hasPages = true;
-        }
-    }
-    const getPageSection = () => {
-        const pageLinks = pageComponents
-            .map((pc) => {
-            // Get the relative path on the filesystem
-            const relativePath = path.relative(pagesDir, pc.importSpec.modulePath);
-            // Format as an absolute path without the extension name
-            const relativeLink = "/" + stripExtension(relativePath);
-            if (platform === "nextjs") {
-                return `<li><Link href="${relativeLink}">${pc.name} - ${relativeLink}</Link></li>`;
-            }
-            else {
-                return `<li><a style={{ color: "blue" }} href="${relativeLink}">${pc.name} - ${relativeLink}</a></li>`;
-            }
-        })
-            .join("\n");
-        return `
+        const components = lodash_1.default.flatMap(config.projects, (p) => p.components).filter((c) => c.componentType === "page");
+        const dir = (_b = (_a = config === null || config === void 0 ? void 0 : config.nextjsConfig) === null || _a === void 0 ? void 0 : _a.pagesDir) !== null && _b !== void 0 ? _b : (_c = config === null || config === void 0 ? void 0 : config.gatsbyConfig) === null || _c === void 0 ? void 0 : _c.pagesDir;
+        if (components.length > 0 && dir) {
+            pages = {
+                components,
+                dir,
+                getPageSection: () => {
+                    const pageLinks = components
+                        .map((pc) => {
+                        // Get the relative path on the filesystem
+                        const relativePath = path.relative(dir, pc.importSpec.modulePath);
+                        // Format as an absolute path without the extension name
+                        const relativeLink = "/" + stripExtension(relativePath);
+                        if (platform === "nextjs") {
+                            return `<li><Link href="${relativeLink}">${pc.name} - ${relativeLink}</Link></li>`;
+                        }
+                        else {
+                            return `<li><a style={{ color: "blue" }} href="${relativeLink}">${pc.name} - ${relativeLink}</a></li>`;
+                        }
+                    })
+                        .join("\n");
+                    return `
           <h3>Your pages:</h3>
           <ul>
             ${pageLinks}
           </ul>
     `;
-    };
-    const content = (0, welcomePage_1.WELCOME_PAGE)(hasPages, platform, hasPages ? getPageSection() : "");
+                },
+            };
+        }
+    }
+    const content = (0, welcomePage_1.WELCOME_PAGE)(!!pages, platform, (_d = pages === null || pages === void 0 ? void 0 : pages.getPageSection()) !== null && _d !== void 0 ? _d : "");
     return content;
 }
 exports.generateWelcomePage = generateWelcomePage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.98",
+  "version": "0.0.99",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",
@@ -12,9 +12,8 @@
     "create-plasmic-app": "./dist/index.js"
   },
   "scripts": {
-    "wtest": "jest --colors --watchAll",
-    "test": "jest --colors",
-    "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand --watch",
+    "test": "TEST_CWD=`pwd` yarn --cwd=../.. test --passWithNoTests",
+    "coverage": "TEST_CWD=`pwd` yarn --cwd=../.. test --coverage --passWithNoTests",
     "build": "eslint 'src/**' && tsc",
     "run-cpa": "yarn build && ts-node run-cpa.ts",
     "create-plasmic-app": "ts-node src/index.ts",
@@ -30,14 +29,7 @@
     "@types/semver": "^7.3.5",
     "@types/update-notifier": "^5.0.0",
     "@types/validate-npm-package-name": "^3.0.2",
-    "@types/yargs": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "5.59.0",
-    "@typescript-eslint/parser": "5.59.0",
-    "eslint": "^8.50.0",
-    "jest": "^26.6.3",
-    "jest-circus": "^26.6.3",
-    "ts-jest": "^26.5.3",
-    "ts-node": "^10.9.1"
+    "@types/yargs": "^16.0.0"
   },
   "dependencies": {
     "@plasmicapp/cli": "0.1.187",
@@ -54,5 +46,5 @@
     "validate-npm-package-name": "^3.0.0",
     "yargs": "^16.2.0"
   },
-  "gitHead": "b43bfc6e9e68b75cac25f9fee2fed8795b5d8518"
+  "gitHead": "951909f9952ffe42fefb6e15a1797cdc1aee1197"
 }

package/src/index.ts

@@ -22,8 +22,8 @@ const argv = yargs
   .command(
     "$0 [projectName]",
     "Create a Plasmic app with Next.js, Gatsby, or React (Vite)",
-    (yargs) => {
-      yargs
+    (yargs2) => {
+      yargs2
         .usage("Usage: $0 [projectName] [options]")
         .positional("projectName", {
           describe: "Project and NPM package name",
@@ -62,17 +62,17 @@ const argv = yargs
   .strict()
   .help("h")
   .alias("h", "help")
-  .check((argv) => {
+  .check((argv2) => {
     if (
-      argv.scheme === "loader" &&
-      !(argv.platform === "nextjs" || argv.platform === "gatsby")
+      argv2.scheme === "loader" &&
+      !(argv2.platform === "nextjs" || argv2.platform === "gatsby")
     ) {
       throw new Error(`Loader scheme may only be used with Next.js or Gatsby`);
     }
 
     if (
-      argv.appDir &&
-      !(argv.platform === "nextjs" && argv.scheme === "loader")
+      argv2.appDir &&
+      !(argv2.platform === "nextjs" && argv2.scheme === "loader")
     ) {
       throw new Error(
         `App dir may only be used with Next.js and loader scheme`
@@ -119,8 +119,6 @@ async function maybePrompt<T>(
 }
 
 // Keeping these as globals to easily share with our `crash` function
-const projectName: string | undefined =
-  argv._.length > 0 ? argv._[0] + "" : undefined;
 let resolvedProjectPath: string;
 
 /**

package/src/utils/file-utils.ts

@@ -1,13 +1,16 @@
-import type { PlasmicConfig } from "@plasmicapp/cli/dist/utils/config-utils";
+import type {
+  ComponentConfig,
+  PlasmicConfig,
+} from "@plasmicapp/cli/dist/utils/config-utils";
 import { existsSync, promises as fs, unlinkSync } from "fs";
 import glob from "glob";
 import L from "lodash";
 import * as path from "upath";
 import { README } from "../templates/readme";
 import { WELCOME_PAGE } from "../templates/welcomePage";
-import { JsOrTs, PlatformType } from "../utils/types";
 import { ensure } from "./lang-utils";
 import { installUpgrade } from "./npm-utils";
+import { JsOrTs, PlatformType } from "./types";
 
 /**
  * Runs the search pattern through `glob` and deletes all resulting files
@@ -121,45 +124,56 @@ export default App;
  * @param noPages - don't render links to pages
  * @returns
  */
-export function generateWelcomePage(config: any, platform: string): string {
-  let hasPages = false;
-  let pageComponents: any[];
-  let pagesDir: string;
+export function generateWelcomePage(
+  config: PlasmicConfig,
+  platform: string
+): string {
+  let pages:
+    | {
+        components: ComponentConfig[];
+        dir: string;
+        getPageSection: () => string;
+      }
+    | undefined;
   if (platform !== "react" && config && L.isArray(config.projects)) {
-    pageComponents = L.flatMap(config.projects, (p) => p.components).filter(
+    const components = L.flatMap(config.projects, (p) => p.components).filter(
       (c) => c.componentType === "page"
     );
-    pagesDir = config?.nextjsConfig?.pagesDir ?? config?.gatsbyConfig?.pagesDir;
-    if (pageComponents.length > 0 && pagesDir) {
-      hasPages = true;
-    }
-  }
-  const getPageSection = () => {
-    const pageLinks = pageComponents
-      .map((pc) => {
-        // Get the relative path on the filesystem
-        const relativePath = path.relative(pagesDir, pc.importSpec.modulePath);
-        // Format as an absolute path without the extension name
-        const relativeLink = "/" + stripExtension(relativePath);
-        if (platform === "nextjs") {
-          return `<li><Link href="${relativeLink}">${pc.name} - ${relativeLink}</Link></li>`;
-        } else {
-          return `<li><a style={{ color: "blue" }} href="${relativeLink}">${pc.name} - ${relativeLink}</a></li>`;
-        }
-      })
-      .join("\n");
-    return `
+    const dir =
+      config?.nextjsConfig?.pagesDir ?? config?.gatsbyConfig?.pagesDir;
+    if (components.length > 0 && dir) {
+      pages = {
+        components,
+        dir,
+        getPageSection: () => {
+          const pageLinks = components
+            .map((pc) => {
+              // Get the relative path on the filesystem
+              const relativePath = path.relative(dir, pc.importSpec.modulePath);
+              // Format as an absolute path without the extension name
+              const relativeLink = "/" + stripExtension(relativePath);
+              if (platform === "nextjs") {
+                return `<li><Link href="${relativeLink}">${pc.name} - ${relativeLink}</Link></li>`;
+              } else {
+                return `<li><a style={{ color: "blue" }} href="${relativeLink}">${pc.name} - ${relativeLink}</a></li>`;
+              }
+            })
+            .join("\n");
+          return `
           <h3>Your pages:</h3>
           <ul>
             ${pageLinks}
           </ul>
     `;
-  };
+        },
+      };
+    }
+  }
 
   const content = WELCOME_PAGE(
-    hasPages,
+    !!pages,
     platform,
-    hasPages ? getPageSection() : ""
+    pages?.getPageSection() ?? ""
   );
   return content;
 }

package/.eslintrc.js

@@ -1,15 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    browser: true,
-    es2020: true,
-  },
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 11,
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {},
-};