create-plasmic-app 0.0.106 → 0.0.107

package/cpa-out/tanstack-codegen-ts/tsconfig.json

@@ -10,7 +10,7 @@
     /* Bundler mode */
     "moduleResolution": "bundler",
     "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": false,
     "noEmit": true,
 
     /* Linting */

package/dist/index.js

@@ -151,25 +151,6 @@ function run() {
         });
         // Absolute path to the new project
         resolvedProjectPath = path.resolve(projectName);
-        // Prompt for Typescript
-        const jsOrTs = (yield maybePrompt({
-            name: "typescript",
-            message: "What language do you want to use?",
-            type: "list",
-            choices: () => [
-                {
-                    name: "TypeScript",
-                    value: true,
-                },
-                {
-                    name: "JavaScript",
-                    value: false,
-                },
-            ],
-            default: true,
-        }))
-            ? "ts"
-            : "js";
         // Prompt for the platform
         const platform = yield maybePrompt({
             name: "platform",
@@ -198,6 +179,25 @@ function run() {
             ],
             default: "nextjs",
         });
+        // Prompt for Typescript
+        const jsOrTs = platform === "tanstack"
+            ? "ts"
+            : yield maybePrompt({
+                name: "typescript",
+                message: "What language do you want to use?",
+                type: "list",
+                choices: () => [
+                    {
+                        name: "TypeScript",
+                        value: "ts",
+                    },
+                    {
+                        name: "JavaScript",
+                        value: "js",
+                    },
+                ],
+                default: "ts",
+            });
         // Scheme to use for Plasmic integration
         // - loader only available for gatsby/next.js
         const scheme = platform === "nextjs" || platform === "gatsby"

package/dist/tanstack/tanstack.js

@@ -50,13 +50,15 @@ exports.tanstackStrategy = {
         }
     }),
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
-        const { projectPath, jsOrTs } = args;
+        const { projectPath } = args;
         /* We need to provide @plasmicapp/* packages in noExternal ssr packages for
          * them to work properly during ssr phase.
          */
-        if (jsOrTs === "ts") {
-            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "vite.config.ts"), (0, config_1.makeCustomViteConfig_file_router_codegen)());
-        }
+        yield fs_1.promises.writeFile(path_1.default.join(projectPath, "vite.config.ts"), (0, config_1.makeCustomViteConfig_file_router_codegen)());
+        // Disable verbatimModuleSyntax in tsconfig.json
+        const tsconfigPath = path_1.default.join(projectPath, "tsconfig.json");
+        const tsconfigContent = yield fs_1.promises.readFile(tsconfigPath, "utf8");
+        yield fs_1.promises.writeFile(tsconfigPath, tsconfigContent.replace(`"verbatimModuleSyntax": true`, `"verbatimModuleSyntax": false`));
     }),
     generateFiles: (args) => {
         return generateFilesFileRouterTemplate(args);
@@ -68,7 +70,7 @@ exports.tanstackStrategy = {
 };
 function generateFilesFileRouterTemplate(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { projectPath, scheme, jsOrTs, projectId, projectApiToken } = args;
+        const { projectPath, scheme, projectId, projectApiToken } = args;
         // Delete existing pages
         (0, file_utils_1.deleteGlob)(path_1.default.join(projectPath, "src/routes", "*.*"));
         if (scheme === "loader") {
@@ -76,9 +78,9 @@ function generateFilesFileRouterTemplate(args) {
         }
         else {
             // ./src/routes/__root.tsx
-            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "src/routes", `__root.${jsOrTs}x`), (0, root_1.makeCustomRoot_file_router_codegen)(jsOrTs));
+            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "src/routes", "__root.tsx"), (0, root_1.makeCustomRoot_file_router_codegen)());
             // ./src/routes/plasmic-host.tsx
-            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "src/routes", `plasmic-host.${jsOrTs}x`), (0, plasmic_host_1.makePlasmicHostPage_fileRouter_codegen)());
+            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "src/routes", "plasmic-host.tsx"), (0, plasmic_host_1.makePlasmicHostPage_fileRouter_codegen)());
             // This should generate
             // ./plasmic.json
             // ./routes/index.tsx

package/dist/tanstack/templates/file-router/root.d.ts

@@ -1,2 +1 @@
-import { JsOrTs } from "../../../utils/types";
-export declare function makeCustomRoot_file_router_codegen(_jsOrTs: JsOrTs): string;
+export declare function makeCustomRoot_file_router_codegen(): string;

package/dist/tanstack/templates/file-router/root.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCustomRoot_file_router_codegen = void 0;
-function makeCustomRoot_file_router_codegen(_jsOrTs) {
+function makeCustomRoot_file_router_codegen() {
     return `import { createRootRoute, HeadContent, Outlet, Scripts } from '@tanstack/react-router'
 import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
 import { PlasmicRootProvider } from "@plasmicapp/react-web"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.106",
+  "version": "0.0.107",
   "description": "Create Plasmic-powered React apps",
   "main": "./dist/lib.js",
   "types": "./dist/lib.d.ts",
@@ -46,5 +46,5 @@
     "validate-npm-package-name": "^3.0.0",
     "yargs": "^16.2.0"
   },
-  "gitHead": "b1b13b4f03d13517cc8a8bb7526deb862c8deeb8"
+  "gitHead": "7eba0fb9492e4b1907a42537163ba9d1e91f8482"
 }

package/run-cpa.ts

@@ -31,11 +31,13 @@ async function run() {
         typescript,
       });
       if (scheme === "codegen") {
-        allArgSets.push({
-          platform: "tanstack",
-          scheme,
-          typescript,
-        });
+        if (typescript) {
+          allArgSets.push({
+            platform: "tanstack",
+            scheme,
+            typescript,
+          });
+        }
 
         allArgSets.push({
           platform: "react",

package/src/index.ts

@@ -8,7 +8,12 @@ import yargs from "yargs";
 import * as cpa from "./lib";
 import { ensure } from "./utils/lang-utils";
 import { checkEngineStrict, updateNotify } from "./utils/npm-utils";
-import { PlatformOptions, PlatformType, SchemeType } from "./utils/types";
+import {
+  JsOrTs,
+  PlatformOptions,
+  PlatformType,
+  SchemeType,
+} from "./utils/types";
 
 if (process.env.CPA_DEBUG_CHDIR) {
   process.chdir(process.env.CPA_DEBUG_CHDIR);
@@ -138,26 +143,6 @@ async function run(): Promise<void> {
   // Absolute path to the new project
   resolvedProjectPath = path.resolve(projectName);
 
-  // Prompt for Typescript
-  const jsOrTs = (await maybePrompt({
-    name: "typescript",
-    message: "What language do you want to use?",
-    type: "list",
-    choices: () => [
-      {
-        name: "TypeScript",
-        value: true,
-      },
-      {
-        name: "JavaScript",
-        value: false,
-      },
-    ],
-    default: true,
-  }))
-    ? "ts"
-    : "js";
-
   // Prompt for the platform
   const platform = await maybePrompt<PlatformType>({
     name: "platform",
@@ -187,6 +172,27 @@ async function run(): Promise<void> {
     default: "nextjs",
   });
 
+  // Prompt for Typescript
+  const jsOrTs: JsOrTs =
+    platform === "tanstack"
+      ? "ts"
+      : await maybePrompt({
+          name: "typescript",
+          message: "What language do you want to use?",
+          type: "list",
+          choices: () => [
+            {
+              name: "TypeScript",
+              value: "ts",
+            },
+            {
+              name: "JavaScript",
+              value: "js",
+            },
+          ],
+          default: "ts",
+        });
+
   // Scheme to use for Plasmic integration
   // - loader only available for gatsby/next.js
   const scheme: SchemeType =

package/src/tanstack/tanstack.ts

@@ -43,17 +43,26 @@ export const tanstackStrategy: CPAStrategy = {
     }
   },
   overwriteConfig: async (args) => {
-    const { projectPath, jsOrTs } = args;
+    const { projectPath } = args;
 
     /* We need to provide @plasmicapp/* packages in noExternal ssr packages for
      * them to work properly during ssr phase.
      */
-    if (jsOrTs === "ts") {
-      await fs.writeFile(
-        path.join(projectPath, "vite.config.ts"),
-        makeCustomViteConfig_file_router_codegen()
-      );
-    }
+    await fs.writeFile(
+      path.join(projectPath, "vite.config.ts"),
+      makeCustomViteConfig_file_router_codegen()
+    );
+
+    // Disable verbatimModuleSyntax in tsconfig.json
+    const tsconfigPath = path.join(projectPath, "tsconfig.json");
+    const tsconfigContent = await fs.readFile(tsconfigPath, "utf8");
+    await fs.writeFile(
+      tsconfigPath,
+      tsconfigContent.replace(
+        `"verbatimModuleSyntax": true`,
+        `"verbatimModuleSyntax": false`
+      )
+    );
   },
   generateFiles: (args) => {
     return generateFilesFileRouterTemplate(args);
@@ -65,7 +74,7 @@ export const tanstackStrategy: CPAStrategy = {
 };
 
 async function generateFilesFileRouterTemplate(args: GenerateFilesArgs) {
-  const { projectPath, scheme, jsOrTs, projectId, projectApiToken } = args;
+  const { projectPath, scheme, projectId, projectApiToken } = args;
 
   // Delete existing pages
   deleteGlob(path.join(projectPath, "src/routes", "*.*"));
@@ -77,13 +86,13 @@ async function generateFilesFileRouterTemplate(args: GenerateFilesArgs) {
   } else {
     // ./src/routes/__root.tsx
     await fs.writeFile(
-      path.join(projectPath, "src/routes", `__root.${jsOrTs}x`),
-      makeCustomRoot_file_router_codegen(jsOrTs)
+      path.join(projectPath, "src/routes", "__root.tsx"),
+      makeCustomRoot_file_router_codegen()
     );
 
     // ./src/routes/plasmic-host.tsx
     await fs.writeFile(
-      path.join(projectPath, "src/routes", `plasmic-host.${jsOrTs}x`),
+      path.join(projectPath, "src/routes", "plasmic-host.tsx"),
       makePlasmicHostPage_fileRouter_codegen()
     );
 

package/src/tanstack/templates/file-router/root.ts

@@ -1,6 +1,4 @@
-import { JsOrTs } from "../../../utils/types";
-
-export function makeCustomRoot_file_router_codegen(_jsOrTs: JsOrTs): string {
+export function makeCustomRoot_file_router_codegen(): string {
   return `import { createRootRoute, HeadContent, Outlet, Scripts } from '@tanstack/react-router'
 import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
 import { PlasmicRootProvider } from "@plasmicapp/react-web"