create-prisma-php-app 4.0.0-alpha.36 → 4.0.0-alpha.38

package/dist/index.js

@@ -1277,14 +1277,23 @@ function mergeConfigurationFiles(
   const bsConfig = bsConfigUrls(projectPathModified);
   // If we have existing config, merge with it
   if (existingConfig) {
+    console.log(chalk.blue("Merging with existing configuration..."));
+    console.log(
+      chalk.gray(
+        `Preserving excludeFiles: ${JSON.stringify(
+          existingConfig.excludeFiles || []
+        )}`
+      )
+    );
     const mergedConfig = {
-      ...existingConfig, // Start with existing config
-      // Only update specific fields that should be updated
+      ...existingConfig, // Start with existing config to preserve all existing fields
+      // Only update specific fields that should be updated for starter kits
       projectName: answer.projectName,
       projectRootPath: projectPathModified,
       bsTarget: bsConfig.bsTarget,
       bsPathRewrite: bsConfig.bsPathRewrite,
-      // Update feature flags only if they're different from existing
+      version: latestVersion,
+      // Update feature flags based on starter kit
       backendOnly: answer.backendOnly,
       swaggerDocs: answer.swaggerDocs,
       tailwindcss: answer.tailwindcss,
@@ -1292,8 +1301,7 @@ function mergeConfigurationFiles(
       mcp: answer.mcp,
       prisma: answer.prisma,
       docker: answer.docker,
-      version: latestVersion,
-      // KEEP existing excludeFiles - this is crucial!
+      // CRITICAL: Always preserve existing excludeFiles
       excludeFiles: existingConfig.excludeFiles || [],
     };
     fs.writeFileSync(
@@ -1301,10 +1309,16 @@ function mergeConfigurationFiles(
       JSON.stringify(mergedConfig, null, 2),
       { flag: "w" }
     );
+    console.log(chalk.green("✓ Configuration merged successfully!"));
     console.log(
-      chalk.green("✓ Configuration merged successfully, exclusions preserved")
+      chalk.green(
+        `✓ Preserved ${
+          (existingConfig.excludeFiles || []).length
+        } excluded files`
+      )
     );
   } else {
+    console.log(chalk.blue("Creating new configuration..."));
     // New project - create fresh config
     const prismaPhpConfig = {
       projectName: answer.projectName,
@@ -1328,6 +1342,7 @@ function mergeConfigurationFiles(
       JSON.stringify(prismaPhpConfig, null, 2),
       { flag: "w" }
     );
+    console.log(chalk.green("✓ New configuration created"));
   }
 }
 async function main() {
@@ -1509,6 +1524,10 @@ async function main() {
       projectPath = path.join(currentDir, answer.projectName);
       process.chdir(answer.projectName);
     }
+    // Add starter kit setup before npm/composer installation
+    if (answer.starterKit) {
+      await setupStarterKit(projectPath, answer);
+    }
     let npmDependencies = [
       npmPkg("typescript"),
       npmPkg("@types/node"),
@@ -1557,10 +1576,6 @@ async function main() {
     if (answer.prisma) {
       execSync("npm install -g prisma-client-php", { stdio: "inherit" });
     }
-    // Add starter kit setup before npm/composer installation
-    if (answer.starterKit) {
-      await setupStarterKit(projectPath, answer);
-    }
     await installNpmDependencies(projectPath, npmDependencies, true);
     await installComposerDependencies(projectPath, composerDependencies);
     if (!projectName) {
@@ -1797,14 +1812,24 @@ async function main() {
     // Check if there's an existing config to merge with
     let existingConfig = null;
     const configPath = path.join(projectPath, "prisma-php.json");
-    if (fs.existsSync(configPath) && updateAnswer?.excludeFiles) {
+    // Always check if config exists - don't depend on updateAnswer
+    if (fs.existsSync(configPath)) {
       try {
-        existingConfig = JSON.parse(fs.readFileSync(configPath, "utf8"));
+        const rawConfig = fs.readFileSync(configPath, "utf8");
+        existingConfig = JSON.parse(rawConfig);
         console.log(chalk.blue("Found existing configuration, merging..."));
+        console.log(
+          chalk.gray(
+            `Existing excludeFiles: ${JSON.stringify(
+              existingConfig.excludeFiles || []
+            )}`
+          )
+        );
       } catch (error) {
         console.warn(
           chalk.yellow("Could not read existing config, creating new one")
         );
+        existingConfig = null;
       }
     }
     // Merge or create configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "4.0.0-alpha.36",
+  "version": "4.0.0-alpha.38",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",