create-plasmic-app 0.0.57 → 0.0.59

package/dist/index.js

@@ -103,19 +103,19 @@ Sentry.configureScope((scope) => {
  * @param question instance of a question formatted for `inquirer`
  * @returns
  */
-function maybePrompt(question) {
+function maybePrompt(question, checkCliAnswer = true) {
     return __awaiter(this, void 0, void 0, function* () {
         const name = (0, lang_utils_1.ensure)(question.name);
         const message = (0, lang_utils_1.ensure)(question.message);
-        const maybeAnswer = argv[name];
-        if (maybeAnswer === null || maybeAnswer === undefined || maybeAnswer === "") {
-            const ans = yield inquirer_1.default.prompt(Object.assign({}, question));
-            return ans[name];
-        }
-        else {
-            console.log(`${message}: ${maybeAnswer} (specified in CLI arg)`);
-            return (0, lang_utils_1.ensure)(argv[name]);
+        if (checkCliAnswer) {
+            const cliAnswer = argv[name];
+            if (cliAnswer !== null && cliAnswer !== undefined && cliAnswer !== "") {
+                console.log(`${message}: ${cliAnswer} (specified in CLI arg)`);
+                return cliAnswer; // assume it's the correct type
+            }
         }
+        const ans = yield inquirer_1.default.prompt(question);
+        return ans[name];
     });
 }
 // Keeping these as globals to easily share with our `crash` function
@@ -202,20 +202,26 @@ function run() {
         // Get the projectId
         console.log();
         let projectId;
+        let firstPrompt = true;
         while (!projectId) {
             const rawProjectId = yield maybePrompt({
                 name: "projectId",
-                message: `What is the URL of your project?
-If you don't have a project yet, create one by going to
-https://studio.plasmic.app/starters/blank
-`,
-            });
-            projectId = rawProjectId
-                .replace("https://studio.plasmic.app/projects/", "")
-                .trim();
-            if (!projectId) {
-                console.error(`"${rawProjectId}" is not a valid project ID.`);
+                message: `If you don't have a project yet, create one by going to https://studio.plasmic.app/starters/blank.
+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);
+            if (matchUrl) {
+                projectId = matchUrl[1];
+                continue;
+            }
+            // allow passing in a project ID
+            const matchId = rawProjectId.match(/([a-z0-9]{5,})/i);
+            if (matchId) {
+                projectId = matchId[1];
+                continue;
             }
+            console.error(`"${rawProjectId}" is not a valid project URL nor ID.`);
         }
         // RUN IT
         console.log();

package/dist/strategies/react.js

@@ -56,7 +56,7 @@ const reactStrategy = {
             yield (0, file_utils_1.overwriteIndex)(projectPath, "react", scheme);
         }
         // Deactivate React.StrictMode from index.tsx
-        const indexFileName = path_1.default.join(projectPath, "src", `index.${useTypescript ? "tsx" : "ts"}`);
+        const indexFileName = path_1.default.join(projectPath, "src", `index.${useTypescript ? "tsx" : "js"}`);
         let indexFile = fs_1.default.readFileSync(indexFileName).toString();
         indexFile = indexFile.replace("<React.StrictMode>", "");
         indexFile = indexFile.replace("</React.StrictMode>", "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@types/findup-sync": "^2.0.2",
     "@types/glob": "^7.1.3",
-    "@types/inquirer": "^7.3.1",
+    "@types/inquirer": "^8.2.5",
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.14.33",
@@ -54,5 +54,5 @@
     "validate-npm-package-name": "^3.0.0",
     "yargs": "^16.2.0"
   },
-  "gitHead": "9f6a6d8770a08c3c895c75eb8159edaca05933ab"
+  "gitHead": "a9822920199e1809d0e15008515dea8e23aaf676"
 }

package/src/index.ts

@@ -74,17 +74,23 @@ Sentry.configureScope((scope) => {
  * @param question instance of a question formatted for `inquirer`
  * @returns
  */
-async function maybePrompt(question: DistinctQuestion) {
-  const name = ensure(question.name) as string;
+async function maybePrompt<T>(
+  question: DistinctQuestion<Record<string, T>>,
+  checkCliAnswer = true
+): Promise<T> {
+  const name = ensure(question.name);
   const message = ensure(question.message);
-  const maybeAnswer = argv[name];
-  if (maybeAnswer === null || maybeAnswer === undefined || maybeAnswer === "") {
-    const ans = await inquirer.prompt({ ...question });
-    return ans[name];
-  } else {
-    console.log(`${message}: ${maybeAnswer} (specified in CLI arg)`);
-    return ensure(argv[name]);
+
+  if (checkCliAnswer) {
+    const cliAnswer = argv[name];
+    if (cliAnswer !== null && cliAnswer !== undefined && cliAnswer !== "") {
+      console.log(`${message}: ${cliAnswer} (specified in CLI arg)`);
+      return cliAnswer as T; // assume it's the correct type
+    }
   }
+
+  const ans = await inquirer.prompt<Record<string, T>>(question);
+  return ans[name];
 }
 
 // Keeping these as globals to easily share with our `crash` function
@@ -132,7 +138,7 @@ async function run(): Promise<void> {
 
   // Prompt for the platform
   const platform = ensureString(
-    await maybePrompt({
+    await maybePrompt<string>({
       name: "platform",
       message: "What React framework do you want to use?",
       type: "list",
@@ -181,20 +187,34 @@ async function run(): Promise<void> {
   // Get the projectId
   console.log();
   let projectId: string | undefined;
+  let firstPrompt = true;
   while (!projectId) {
-    const rawProjectId = await maybePrompt({
-      name: "projectId",
-      message: `What is the URL of your project?
-If you don't have a project yet, create one by going to
-https://studio.plasmic.app/starters/blank
-`,
-    });
-    projectId = rawProjectId
-      .replace("https://studio.plasmic.app/projects/", "")
-      .trim();
-    if (!projectId) {
-      console.error(`"${rawProjectId}" is not a valid project ID.`);
+    const rawProjectId = await maybePrompt<string>(
+      {
+        name: "projectId",
+        message: `If you don't have a project yet, create one by going to https://studio.plasmic.app/starters/blank.
+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
+    );
+    if (matchUrl) {
+      projectId = matchUrl[1];
+      continue;
+    }
+
+    // allow passing in a project ID
+    const matchId = rawProjectId.match(/([a-z0-9]{5,})/i);
+    if (matchId) {
+      projectId = matchId[1];
+      continue;
     }
+
+    console.error(`"${rawProjectId}" is not a valid project URL nor ID.`);
   }
 
   // RUN IT

package/src/strategies/react.ts

@@ -55,7 +55,7 @@ const reactStrategy: CPAStrategy = {
     const indexFileName = path.join(
       projectPath,
       "src",
-      `index.${useTypescript ? "tsx" : "ts"}`
+      `index.${useTypescript ? "tsx" : "js"}`
     );
     let indexFile = fs.readFileSync(indexFileName).toString();
     indexFile = indexFile.replace("<React.StrictMode>", "");