create-plasmic-app 0.0.103 → 0.0.105

package/cpa-out/tanstack-codegen-ts/vite.config.ts

@@ -0,0 +1,26 @@
+import { defineConfig } from 'vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+import tailwindcss from '@tailwindcss/vite'
+
+const config = defineConfig({
+  ssr: {
+    noExternal: [
+      "@plasmicapp/data-sources",
+      "@plasmicapp/data-sources-context",
+      "@plasmicapp/prepass",
+      "@plasmicapp/query",
+      "@plasmicapp/react-web",
+    ],
+  },
+  plugins: [
+    // this is the plugin that enables path aliases
+    viteTsConfigPaths({
+      projects: ['./tsconfig.json'],
+    }),
+    tailwindcss(),
+    tanstackStart(),
+  ],
+})
+
+export default config

package/dist/react/react.js

@@ -61,18 +61,16 @@ exports.reactStrategy = {
     overwriteConfig: (args) => __awaiter(void 0, void 0, void 0, function* () {
         const { projectPath, jsOrTs } = args;
         if (jsOrTs === "ts") {
-            const tsConfigJsonPath = path_1.default.join(projectPath, "tsconfig.app.json");
-            let tsConfigJson = yield fs_1.promises.readFile(tsConfigJsonPath, "utf8");
-            /* tsconfig.app.json has comments such as /* Bundler mode */ /* Linting */
-            /* We need to remove them before parsing the json */
-            tsConfigJson = tsConfigJson.replace(/\/\*[\s\S]*?\*\//g, "");
-            tsConfigJson = tsConfigJson.replace(/\/\/.*$/gm, "");
-            const tsConfig = JSON.parse(tsConfigJson);
-            /* In our codegen, we have components where React is imported but not used, we need to
-              turn off the `noUnusedLocals` rule to ensure the project builds successfully.
-             */
-            tsConfig.compilerOptions = Object.assign(Object.assign({}, tsConfig.compilerOptions), { noUnusedLocals: false });
-            yield fs_1.promises.writeFile(tsConfigJsonPath, JSON.stringify(tsConfig, null, 2));
+            const tsconfigPath = path_1.default.join(projectPath, "tsconfig.app.json");
+            let tsconfigContent = yield fs_1.promises.readFile(tsconfigPath, "utf8");
+            tsconfigContent = tsconfigContent
+                // Disable verbatimModuleSyntax
+                .replace(`"verbatimModuleSyntax": true`, `"verbatimModuleSyntax": false`)
+                /* In our codegen, we have components where React is imported but not used, we need to
+                    turn off the `noUnusedLocals` rule to ensure the project builds successfully.
+                   */
+                .replace(`"noUnusedLocals": true`, `"noUnusedLocals": false`);
+            yield fs_1.promises.writeFile(tsconfigPath, tsconfigContent);
         }
     }),
     generateFiles: ({ scheme, projectApiToken, projectId, projectPath, jsOrTs, }) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/tanstack/tanstack.js

@@ -55,7 +55,7 @@ exports.tanstackStrategy = {
          * them to work properly during ssr phase.
          */
         if (jsOrTs === "ts") {
-            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "app.config.ts"), (0, config_1.makeCustomAppConfig_file_router_codegen)());
+            yield fs_1.promises.writeFile(path_1.default.join(projectPath, "vite.config.ts"), (0, config_1.makeCustomViteConfig_file_router_codegen)());
         }
     }),
     generateFiles: (args) => {

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

@@ -1 +1 @@
-export declare function makeCustomAppConfig_file_router_codegen(): string;
+export declare function makeCustomViteConfig_file_router_codegen(): string;

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

@@ -1,33 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCustomAppConfig_file_router_codegen = void 0;
-function makeCustomAppConfig_file_router_codegen() {
-    return `import { defineConfig } from "@tanstack/react-start/config";
-import viteTsConfigPaths from "vite-tsconfig-paths";
-import tailwindcss from "@tailwindcss/vite";
+exports.makeCustomViteConfig_file_router_codegen = void 0;
+function makeCustomViteConfig_file_router_codegen() {
+    return `import { defineConfig } from 'vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+import tailwindcss from '@tailwindcss/vite'
 
-export default defineConfig({
-  tsr: {
-    appDirectory: "src",
-  },
-  vite: {
-    plugins: [
-      // this is the plugin that enables path aliases
-      viteTsConfigPaths({
-        projects: ["./tsconfig.json"],
-      }),
-      tailwindcss(),
+const config = defineConfig({
+  ssr: {
+    noExternal: [
+      "@plasmicapp/data-sources",
+      "@plasmicapp/data-sources-context",
+      "@plasmicapp/prepass",
+      "@plasmicapp/query",
+      "@plasmicapp/react-web",
     ],
-    ssr: {
-      noExternal: [
-        "@plasmicapp/data-sources",
-        "@plasmicapp/data-sources-context",
-        "@plasmicapp/prepass",
-        "@plasmicapp/query",
-        "@plasmicapp/react-web",
-      ],
-    },
   },
-})`;
+  plugins: [
+    // this is the plugin that enables path aliases
+    viteTsConfigPaths({
+      projects: ['./tsconfig.json'],
+    }),
+    tailwindcss(),
+    tanstackStart(),
+  ],
+})
+
+export default config
+`;
 }
-exports.makeCustomAppConfig_file_router_codegen = makeCustomAppConfig_file_router_codegen;
+exports.makeCustomViteConfig_file_router_codegen = makeCustomViteConfig_file_router_codegen;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmic-app",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "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": "74a85a4ad10be4a50c0fcc53f0d073763d018fb8"
+  "gitHead": "0c49eb5026b12b17d836be44234696d1f7560140"
 }

package/src/react/react.ts

@@ -59,24 +59,20 @@ export const reactStrategy: CPAStrategy = {
     const { projectPath, jsOrTs } = args;
 
     if (jsOrTs === "ts") {
-      const tsConfigJsonPath = path.join(projectPath, "tsconfig.app.json");
-      let tsConfigJson = await fs.readFile(tsConfigJsonPath, "utf8");
-
-      /* tsconfig.app.json has comments such as /* Bundler mode */ /* Linting */
-      /* We need to remove them before parsing the json */
-      tsConfigJson = tsConfigJson.replace(/\/\*[\s\S]*?\*\//g, "");
-      tsConfigJson = tsConfigJson.replace(/\/\/.*$/gm, "");
-
-      const tsConfig = JSON.parse(tsConfigJson);
-      /* In our codegen, we have components where React is imported but not used, we need to
-        turn off the `noUnusedLocals` rule to ensure the project builds successfully.
-       */
-      tsConfig.compilerOptions = {
-        ...tsConfig.compilerOptions,
-        noUnusedLocals: false,
-      };
-
-      await fs.writeFile(tsConfigJsonPath, JSON.stringify(tsConfig, null, 2));
+      const tsconfigPath = path.join(projectPath, "tsconfig.app.json");
+      let tsconfigContent = await fs.readFile(tsconfigPath, "utf8");
+      tsconfigContent = tsconfigContent
+        // Disable verbatimModuleSyntax
+        .replace(
+          `"verbatimModuleSyntax": true`,
+          `"verbatimModuleSyntax": false`
+        )
+        /* In our codegen, we have components where React is imported but not used, we need to
+            turn off the `noUnusedLocals` rule to ensure the project builds successfully.
+           */
+        .replace(`"noUnusedLocals": true`, `"noUnusedLocals": false`);
+
+      await fs.writeFile(tsconfigPath, tsconfigContent);
     }
   },
   generateFiles: async ({

package/src/tanstack/tanstack.ts

@@ -4,7 +4,7 @@ import { spawnOrFail } from "../utils/cmd-utils";
 import { installCodegenDeps, runCodegenSync } from "../utils/codegen";
 import { deleteGlob } from "../utils/file-utils";
 import { CPAStrategy, GenerateFilesArgs } from "../utils/strategy";
-import { makeCustomAppConfig_file_router_codegen } from "./templates/file-router/config";
+import { makeCustomViteConfig_file_router_codegen } from "./templates/file-router/config";
 import { makePlasmicHostPage_fileRouter_codegen } from "./templates/file-router/plasmic-host";
 import { makeCustomRoot_file_router_codegen } from "./templates/file-router/root";
 
@@ -50,8 +50,8 @@ export const tanstackStrategy: CPAStrategy = {
      */
     if (jsOrTs === "ts") {
       await fs.writeFile(
-        path.join(projectPath, "app.config.ts"),
-        makeCustomAppConfig_file_router_codegen()
+        path.join(projectPath, "vite.config.ts"),
+        makeCustomViteConfig_file_router_codegen()
       );
     }
   },

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

@@ -1,29 +1,29 @@
-export function makeCustomAppConfig_file_router_codegen(): string {
-  return `import { defineConfig } from "@tanstack/react-start/config";
-import viteTsConfigPaths from "vite-tsconfig-paths";
-import tailwindcss from "@tailwindcss/vite";
+export function makeCustomViteConfig_file_router_codegen(): string {
+  return `import { defineConfig } from 'vite'
+import { tanstackStart } from '@tanstack/react-start/plugin/vite'
+import viteTsConfigPaths from 'vite-tsconfig-paths'
+import tailwindcss from '@tailwindcss/vite'
 
-export default defineConfig({
-  tsr: {
-    appDirectory: "src",
-  },
-  vite: {
-    plugins: [
-      // this is the plugin that enables path aliases
-      viteTsConfigPaths({
-        projects: ["./tsconfig.json"],
-      }),
-      tailwindcss(),
+const config = defineConfig({
+  ssr: {
+    noExternal: [
+      "@plasmicapp/data-sources",
+      "@plasmicapp/data-sources-context",
+      "@plasmicapp/prepass",
+      "@plasmicapp/query",
+      "@plasmicapp/react-web",
     ],
-    ssr: {
-      noExternal: [
-        "@plasmicapp/data-sources",
-        "@plasmicapp/data-sources-context",
-        "@plasmicapp/prepass",
-        "@plasmicapp/query",
-        "@plasmicapp/react-web",
-      ],
-    },
   },
-})`;
+  plugins: [
+    // this is the plugin that enables path aliases
+    viteTsConfigPaths({
+      projects: ['./tsconfig.json'],
+    }),
+    tailwindcss(),
+    tanstackStart(),
+  ],
+})
+
+export default config
+`;
 }