create-prisma-php-app 1.20.509 → 1.20.511

package/dist/index.js

@@ -142,27 +142,19 @@ async function updatePackageJson(baseDir, answer) {
       Object.assign({}, packageJson.scripts),
       { "create-swagger-docs": "node settings/swagger-setup.js" }
     );
-    answersToInclude.push("swaggerDocs");
-  }
-  if (answer.swaggerDocs) {
-    packageJson.scripts = Object.assign(
-      Object.assign({}, packageJson.scripts),
-      { dev: "node settings/start-dev.js" }
-    );
   }
   // Initialize with existing scripts
-  const updatedScripts = Object.assign({}, packageJson.scripts);
+  let updatedScripts = Object.assign({}, packageJson.scripts);
   // Conditionally add "browser-sync" command
-  updatedScripts["browser-sync"] = browserSyncCommand;
-  // Conditionally set the "dev" command
-  if (!answer.swaggerDocs) {
-    updatedScripts.dev =
-      answersToInclude.length > 0
-        ? `npm-run-all --parallel projectName browser-sync ${answersToInclude.join(
-            " "
-          )}`
-        : `npm-run-all --parallel projectName browser-sync`;
-  }
+  updatedScripts.browserSync = browserSyncCommand;
+  updatedScripts._dev =
+    answersToInclude.length > 0
+      ? `npm-run-all --parallel projectName browser-sync ${answersToInclude.join(
+          " "
+        )}`
+      : `npm-run-all --parallel projectName browser-sync`;
+  updatedScripts.startDev = `node settings/start-dev.js`;
+  updatedScripts.dev = `npm run startDev`;
   // Finally, assign the updated scripts back to packageJson
   packageJson.scripts = updatedScripts;
   packageJson.type = "module";
@@ -594,7 +586,7 @@ async function getAnswer(predefinedAnswers = {}) {
       });
     }
     if (!predefinedAnswers.tailwindcss) {
-      nonBackendOnlyQuestionsArray.unshift({
+      nonBackendOnlyQuestionsArray.push({
         type: "toggle",
         name: "tailwindcss",
         message: `Would you like to use ${chalk.blue("Tailwind CSS")}?`,
@@ -933,13 +925,11 @@ async function main() {
       "ts-node",
       "http-proxy-middleware@^3.0.0",
       "chalk",
+      "npm-run-all",
     ];
     if (answer.swaggerDocs) {
       dependencies.push("swagger-jsdoc");
     }
-    if (!answer.backendOnly && !answer.swaggerDocs) {
-      dependencies.push("npm-run-all");
-    }
     if (answer.tailwindcss) {
       dependencies.push(
         "tailwindcss",

package/dist/settings/start-dev.js

@@ -1,132 +1,80 @@
-import { exec, execSync } from "child_process";
+import { exec } from "child_process";
 import chalk from "chalk";
 import { writeFileSync } from "fs";
 
-// Function to check if a command exists in the system
-function commandExists(command) {
-  try {
-    execSync(`command -v ${command}`, { stdio: "ignore" }); // Works for Linux/macOS
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function startDev() {
-  // Start projectName first, since it's always required
-  console.log("Starting projectName...");
-  const projectName = exec("npm run projectName");
-
-  projectName.stdout.on("data", (data) => {
-    console.log(`projectName: ${data}`);
-  });
-
-  projectName.stderr.on("data", (data) => {
-    console.error(`projectName error: ${data}`);
-  });
-
-  projectName.on("close", (code) => {
-    // console.log(`projectName process exited with code ${code}`);
-
-    // Start browser-sync after projectName completes
-    console.log("Starting browser-sync...");
-    const browserSync = exec("npm run browser-sync");
-    let formattedLog = {
-      local: "",
-      external: "",
-      ui: "",
-      uiExternal: "",
-    };
-
-    browserSync.stdout.on("data", (data) => {
-      const lines = data.split("\n");
+// Run the original dev command and capture the output
+const devProcess = exec("npm run _dev");
 
-      lines.forEach((line) => {
-        if (/Proxying/.test(line)) {
-          console.log(chalk.blue("[Browsersync]") + ` ${line.trim()}`);
-        } else if (/Access URLs:/.test(line)) {
-          console.log(chalk.green("[Browsersync] Access URLs:"));
-        } else if (/Local:/.test(line)) {
-          const localUrl = line.match(/Local:\s*(http:\/\/.+)/)[1];
-          formattedLog.local = localUrl;
-          console.log(chalk.white("Local: ") + chalk.cyanBright(localUrl));
-        } else if (/^ {4}External:/.test(line)) {
-          const externalUrl = line.match(/External:\s*(http:\/\/\S+)/)[1];
-          formattedLog.external = externalUrl;
-          console.log(
-            chalk.white("External: ") + chalk.magentaBright(externalUrl)
-          );
-        } else if (/UI:/.test(line)) {
-          const uiUrl = line.match(/UI:\s*(http:\/\/.+)/)[1];
-          formattedLog.ui = uiUrl;
-          console.log(chalk.yellow("UI: ") + chalk.cyanBright(uiUrl));
-        } else if (/UI External:/.test(line)) {
-          const uiExternalUrl = line.match(/UI External:\s*(http:\/\/.+)/)[1];
-          formattedLog.uiExternal = uiExternalUrl;
-          console.log(
-            chalk.yellow("UI External: ") + chalk.magentaBright(uiExternalUrl)
-          );
-        } else if (/Watching files/.test(line)) {
-          console.log(chalk.blue("[Browsersync] Watching files..."));
-          const outputPath = "./settings/bs-output.json";
-          writeFileSync(
-            outputPath,
-            JSON.stringify(formattedLog, null, 2),
-            "utf-8"
-          );
-          console.log(`Browser-sync output saved to ${outputPath}`);
-        }
-      });
-    });
+// Use a Set to track logged lines to avoid duplicate logging
+const loggedLines = new Set();
 
-    browserSync.stderr.on("data", (data) => {
-      console.error(`browser-sync error: ${data}`);
-    });
+// Log the output from stdout (standard output)
+devProcess.stdout.on("data", (data) => {
+  const dataString = data.toString(); // Ensure data is a string
 
-    // Check if tailwind exists, and if so, execute it
-    if (commandExists("tailwindcss")) {
-      console.log("Starting tailwind...");
-      const tailwind = exec("npm run tailwind");
-
-      tailwind.stdout.on("data", (data) => {
-        console.log(chalk.magenta("tailwind: ") + data);
-      });
-
-      tailwind.stderr.on("data", (data) => {
-        console.error(chalk.red("tailwind error: ") + data);
-      });
-
-      tailwind.on("close", (code) => {
-        console.log(`tailwind process exited with code ${code}`);
-      });
-    } else {
-      //   console.log(
-      //     chalk.red("tailwindcss is not installed, skipping tailwind task.")
-      //   );
-    }
-
-    // Check if websocket exists, and if so, execute it
-    if (commandExists("node")) {
-      console.log("Starting websocket...");
-      const websocket = exec("npm run websocket");
-
-      websocket.stdout.on("data", (data) => {
-        console.log(chalk.blue("websocket: ") + data);
-      });
-
-      websocket.stderr.on("data", (data) => {
-        console.error(chalk.red("websocket error: ") + data);
-      });
+  // Only log if neither "Proxying" nor "Access URLs" have been logged before
+  if (
+    !dataString.includes("[Browsersync] Proxying:") &&
+    !dataString.includes("[Browsersync] Access URLs:") &&
+    !loggedLines.has(dataString)
+  ) {
+    console.log(dataString);
+    loggedLines.add(dataString); // Add to set to avoid future duplicates
+  }
 
-      websocket.on("close", (code) => {
-        console.log(`websocket process exited with code ${code}`);
-      });
-    } else {
-      // console.log(
-      //   chalk.red("Websocket is not installed, skipping websocket task.")
-      // );
+  let formattedLog = {
+    local: "",
+    external: "",
+    ui: "",
+    uiExternal: "",
+  };
+  const lines = dataString.split("\n");
+
+  lines.forEach((line) => {
+    if (/Proxying/.test(line) && !loggedLines.has(line)) {
+      console.log(`${line.trim()}`);
+      loggedLines.add(line); // Mark this line as logged
+    } else if (/Access URLs:/.test(line) && !loggedLines.has(line)) {
+      console.log(chalk.green("[Browsersync] Access URLs:"));
+      loggedLines.add(line);
+    } else if (/Local:/.test(line) && !loggedLines.has(line)) {
+      const localUrl = line.match(/Local:\s*(http:\/\/.+)/)[1];
+      formattedLog.local = localUrl;
+      console.log(chalk.white("Local: ") + chalk.cyanBright(localUrl));
+      loggedLines.add(line);
+    } else if (/^ {4}External:/.test(line) && !loggedLines.has(line)) {
+      const externalUrl = line.match(/External:\s*(http:\/\/\S+)/)[1];
+      formattedLog.external = externalUrl;
+      console.log(chalk.white("External: ") + chalk.magentaBright(externalUrl));
+      loggedLines.add(line);
+    } else if (/UI:/.test(line) && !loggedLines.has(line)) {
+      const uiUrl = line.match(/UI:\s*(http:\/\/.+)/)[1];
+      formattedLog.ui = uiUrl;
+      console.log(chalk.yellow("UI: ") + chalk.cyanBright(uiUrl));
+      loggedLines.add(line);
+    } else if (/UI External:/.test(line) && !loggedLines.has(line)) {
+      const uiExternalUrl = line.match(/UI External:\s*(http:\/\/.+)/)[1];
+      formattedLog.uiExternal = uiExternalUrl;
+      console.log(
+        chalk.yellow("UI External: ") + chalk.magentaBright(uiExternalUrl)
+      );
+      loggedLines.add(line);
+    } else if (/Watching files/.test(line) && !loggedLines.has(line)) {
+      console.log(chalk.blue("[Browsersync] Watching files..."));
+      const outputPath = "./settings/bs-output.json";
+      writeFileSync(outputPath, JSON.stringify(formattedLog, null, 2), "utf-8");
+      console.log(`Browser-sync output saved to ${outputPath}`);
+      loggedLines.add(line);
     }
   });
-}
+});
+
+// Log the output from stderr (error output)
+devProcess.stderr.on("data", (data) => {
+  console.error(data.toString()); // Convert data to string
+});
 
-startDev();
+// Handle process exit
+devProcess.on("exit", (code) => {
+  console.log(`Dev process exited with code ${code}`);
+});

package/package.json

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