create-plasmic-app 0.0.59 → 0.0.61

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export declare type CodeScheme = "codegen" | "loader";
+export type CodeScheme = "codegen" | "loader";

package/dist/index.js

@@ -210,7 +210,7 @@ function run() {
 What is the URL of your project?`,
             }, firstPrompt);
             firstPrompt = false; // avoid infinite loop with an invalid CLI answer
-            const matchUrl = rawProjectId.match(/studio\.plasmic\.app\/projects\/([a-z0-9]{5,})\//i);
+            const matchUrl = rawProjectId.match(/studio\.plasmic\.app\/projects\/([a-z0-9]{5,})(\/|$)/i);
             if (matchUrl) {
                 projectId = matchUrl[1];
                 continue;

package/dist/lib.d.ts

@@ -1,6 +1,6 @@
 import { setMetadataEnv } from "@plasmicapp/cli";
-export declare type PlatformType = "nextjs" | "gatsby" | "react";
-export declare type SchemeType = "codegen" | "loader";
+export type PlatformType = "nextjs" | "gatsby" | "react";
+export type SchemeType = "codegen" | "loader";
 export declare function toString(s: PlatformType): string;
 export interface CreatePlasmicAppArgs {
     resolvedProjectPath: string;

package/dist/strategies/gatsby.js

@@ -94,7 +94,7 @@ const gatsbyStrategy = {
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         const { projectId, projectPath, projectApiToken, useTypescript, scheme, } = args;
         const extension = useTypescript ? "ts" : "js";
         const packageName = path_1.default.basename(projectPath);
@@ -119,23 +119,30 @@ const gatsbyStrategy = {
             let result = useTypescript ? `import path from "path";\n` : "";
             const pluginConfig = (0, gatsby_1.GATSBY_PLUGIN_CONFIG)(projectId, (0, lang_utils_1.ensure)(projectApiToken), useTypescript);
             try {
-                for (var rl_1 = __asyncValues(rl), rl_1_1; rl_1_1 = yield rl_1.next(), !rl_1_1.done;) {
-                    const line = rl_1_1.value;
-                    if (line.includes("plugins: []")) {
-                        result += "  plugins: [" + pluginConfig + "]\n";
+                for (var _d = true, rl_1 = __asyncValues(rl), rl_1_1; rl_1_1 = yield rl_1.next(), _a = rl_1_1.done, !_a;) {
+                    _c = rl_1_1.value;
+                    _d = false;
+                    try {
+                        const line = _c;
+                        if (line.includes("plugins: []")) {
+                            result += "  plugins: [" + pluginConfig + "]\n";
+                        }
+                        else if (line.includes("plugins: [")) {
+                            result += line + pluginConfig + "\n";
+                        }
+                        else {
+                            result += line + "\n";
+                        }
                     }
-                    else if (line.includes("plugins: [")) {
-                        result += line + pluginConfig + "\n";
-                    }
-                    else {
-                        result += line + "\n";
+                    finally {
+                        _d = true;
                     }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (rl_1_1 && !rl_1_1.done && (_a = rl_1.return)) yield _a.call(rl_1);
+                    if (!_d && !_a && (_b = rl_1.return)) yield _b.call(rl_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }

package/dist/strategies/nextjs.js

@@ -23,7 +23,7 @@ const common_1 = require("./common");
 const nextjsStrategy = {
     create: (args) => __awaiter(void 0, void 0, void 0, function* () {
         const { projectPath, template, useTypescript } = args;
-        const createCommand = `npx create-next-app@latest ${useTypescript ? "--ts" : "--js"} --eslint ${projectPath}`;
+        const createCommand = `npx create-next-app@latest ${useTypescript ? "--ts" : "--js"} --eslint --no-src-dir --no-experimental-app ${projectPath}`;
         const templateArg = template ? ` --template ${template}` : "";
         // Default Next.js starter already supports Typescript
         // See where we `touch tsconfig.json` later on

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

@@ -1,4 +1,4 @@
-declare type StringGen = string | (() => string);
+type StringGen = string | (() => string);
 export declare function flatMap<T, U>(arr: T[], f: (x: T) => U[]): U[];
 export declare function ensure<T>(x: T | null | undefined, msg?: StringGen): T;
 export declare function ensureString(x: any): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "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": "a9822920199e1809d0e15008515dea8e23aaf676"
+  "gitHead": "450ed61be16d7970f33c4405aa3e19fa3026a9b0"
 }

package/src/index.ts

@@ -200,7 +200,7 @@ What is the URL of your project?`,
     firstPrompt = false; // avoid infinite loop with an invalid CLI answer
 
     const matchUrl = rawProjectId.match(
-      /studio\.plasmic\.app\/projects\/([a-z0-9]{5,})\//i
+      /studio\.plasmic\.app\/projects\/([a-z0-9]{5,})(\/|$)/i
     );
     if (matchUrl) {
       projectId = matchUrl[1];

package/src/strategies/nextjs.ts

@@ -18,7 +18,7 @@ const nextjsStrategy: CPAStrategy = {
     const { projectPath, template, useTypescript } = args;
     const createCommand = `npx create-next-app@latest ${
       useTypescript ? "--ts" : "--js"
-    } --eslint ${projectPath}`;
+    } --eslint --no-src-dir --no-experimental-app ${projectPath}`;
     const templateArg = template ? ` --template ${template}` : "";
 
     // Default Next.js starter already supports Typescript