create-prisma-php-app 1.20.514 → 1.20.516

package/dist/index.js

@@ -149,10 +149,8 @@ async function updatePackageJson(baseDir, answer) {
   updatedScripts.browserSync = browserSyncCommand;
   updatedScripts._dev =
     answersToInclude.length > 0
-      ? `npm-run-all --parallel projectName browserSync ${answersToInclude.join(
-          " "
-        )}`
-      : `npm-run-all --parallel projectName browserSync`;
+      ? `npm-run-all -p ${answersToInclude.join(" ")}`
+      : 'echo "No additional scripts to run"';
   updatedScripts.startDev = `node settings/start-dev.js`;
   updatedScripts.dev = `npm run startDev`;
   // Finally, assign the updated scripts back to packageJson
@@ -345,13 +343,17 @@ function modifyLayoutPHP(baseDir, answer) {
   if (checkExcludeFiles(layoutPath)) return;
   try {
     let indexContent = fs.readFileSync(layoutPath, "utf8");
-    const stylesAndLinks = `\n    <link href="<?php echo $baseUrl; ?>css/index.css" rel="stylesheet">\n    <script src="<?php echo $baseUrl; ?>js/index.js"></script>`;
+    const stylesAndLinks = `\n    <link href="<?php echo $baseUrl; ?>/css/index.css" rel="stylesheet">\n    <script src="<?php echo $baseUrl; ?>/js/index.js"></script>`;
     // Tailwind CSS link or CDN script
     const tailwindLink = answer.tailwindcss
-      ? `    <link href="<?php echo $baseUrl; ?>css/styles.css" rel="stylesheet"> ${stylesAndLinks}`
+      ? `    <link href="<?php echo $baseUrl; ?>/css/styles.css" rel="stylesheet"> ${stylesAndLinks}`
       : `    <script src="https://cdn.tailwindcss.com"></script> ${stylesAndLinks}`;
     // Insert before the closing </head> tag
-    indexContent = indexContent.replace("</head>", `${tailwindLink}\n</head>`);
+    indexContent = indexContent.replace(
+      "</head>",
+      `${tailwindLink}\n    <!-- Dynamic Head -->\n
+    <?php echo implode("\n", $mainLayoutHead); ?></head>`
+    );
     fs.writeFileSync(layoutPath, indexContent, { flag: "w" });
     console.log(
       chalk.green(
@@ -421,16 +423,16 @@ async function createDirectoryStructure(baseDir, answer) {
     },
   ];
   if (answer.backendOnly && answer.swaggerDocs) {
-    directoriesToCopy.push(
-      {
-        srcDir: "/swagger-docs-layout.php",
-        destDir: "/src/app/layout.php",
-      },
-      {
-        srcDir: "/swagger-docs-index.php",
-        destDir: "/src/app/swagger-docs/index.php",
-      }
-    );
+    directoriesToCopy.push({
+      srcDir: "/swagger-docs-layout.php",
+      destDir: "/src/app/layout.php",
+    });
+  }
+  if (answer.swaggerDocs) {
+    directoriesToCopy.push({
+      srcDir: "/swagger-docs-index.php",
+      destDir: "/src/app/swagger-docs/index.php",
+    });
   }
   if (answer.prisma) {
     directoriesToCopy.push({
@@ -867,7 +869,7 @@ async function main() {
       answer = await getAnswer();
     }
     if (answer === null) {
-      console.log(chalk.red("Installation cancelled."));
+      console.warn(chalk.red("Installation cancelled."));
       return;
     }
     const latestVersionOfCreatePrismaPhpApp = await fetchPackageVersion(

package/dist/settings/request-methods.php

@@ -32,8 +32,8 @@ $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
     $_SERVER['SERVER_PORT'] == 443 ? "https://" : "http://";
 $domainName = $_SERVER['HTTP_HOST'];
 $scriptName = dirname($_SERVER['SCRIPT_NAME']) . '/';
-$baseUrl = $protocol . $domainName . rtrim($scriptName, '/') . '/src/app/';
-$documentUrl = $protocol . $domainName . rtrim($scriptName, '/') . '/';
+$baseUrl = $protocol . $domainName . rtrim($scriptName, '/') . '/src/app';
+$documentUrl = $protocol . $domainName . rtrim($scriptName, '/');
 $referer = $_SERVER['HTTP_REFERER'] ?? 'Unknown';
 
 $params = [];

package/dist/settings/start-dev.js

@@ -1,73 +1,153 @@
 import { exec } from "child_process";
 import chalk from "chalk";
 import { writeFileSync } from "fs";
+import readline from "readline";
 
-// Run the original dev command and capture the output
-const devProcess = exec("npm run _dev");
+function runCommand(command, options = {}) {
+  return new Promise((resolve, reject) => {
+    const process = exec(command, options);
 
-// Use a Set to track logged lines to avoid duplicate logging
-const loggedLines = new Set();
+    let stdout = "";
+    let stderr = "";
 
-// Log the output from stdout (standard output)
-devProcess.stdout.on("data", (data) => {
-  const dataString = data.toString(); // Ensure data is a string
+    process.stdout.on("data", (data) => {
+      stdout += 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
-  }
+    process.stderr.on("data", (data) => {
+      stderr += data;
+    });
 
-  let formattedLog = {
-    local: "",
-    external: "",
-    ui: "",
-    uiExternal: "",
-  };
-  const lines = dataString.split("\n");
-
-  lines.forEach((line) => {
-    if (/Proxying/.test(line)) {
-      console.log(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}`);
-    }
+    process.on("close", (code) => {
+      if (code === 0) {
+        resolve({ stdout, stderr });
+      } else {
+        reject(
+          new Error(`Command "${command}" exited with code ${code}\n${stderr}`)
+        );
+      }
+    });
   });
-});
+}
+
+async function startDev() {
+  try {
+    // Step 1: Start projectName and wait for it to complete
+    console.log("Starting projectName...");
+    const projectName = await runCommand("npm run projectName");
+    console.log(projectName.stdout);
+
+    // Step 2: Start browserSync and process its output
+    console.log("Starting browser-sync...");
+    const browserSync = exec("npm run browserSync");
+    let formattedLog = {
+      local: "",
+      external: "",
+      ui: "",
+      uiExternal: "",
+    };
+
+    const rl = readline.createInterface({
+      input: browserSync.stdout,
+      crlfDelay: Infinity,
+    });
+
+    let browserSyncReady = false;
+
+    rl.on("line", (line) => {
+      if (/Proxying/.test(line)) {
+        console.log(line.trim());
+      } else if (/Access URLs:/.test(line)) {
+        console.log(chalk.green("[Browsersync] Access URLs:"));
+      } else if (/Local:/.test(line)) {
+        const match = line.match(/Local:\s*(http:\/\/.+)/);
+        if (match) {
+          const localUrl = match[1];
+          formattedLog.local = localUrl;
+          console.log(chalk.white("Local: ") + chalk.cyanBright(localUrl));
+        }
+      } else if (/^ {4}External:/.test(line)) {
+        const match = line.match(/External:\s*(http:\/\/\S+)/);
+        if (match) {
+          const externalUrl = match[1];
+          formattedLog.external = externalUrl;
+          console.log(
+            chalk.white("External: ") + chalk.magentaBright(externalUrl)
+          );
+        }
+      } else if (/UI:/.test(line)) {
+        const match = line.match(/UI:\s*(http:\/\/.+)/);
+        if (match) {
+          const uiUrl = match[1];
+          formattedLog.ui = uiUrl;
+          console.log(chalk.yellow("UI: ") + chalk.cyanBright(uiUrl));
+        }
+      } else if (/UI External:/.test(line)) {
+        const match = line.match(/UI External:\s*(http:\/\/.+)/);
+        if (match) {
+          const uiExternalUrl = match[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}`);
+
+        if (!browserSyncReady) {
+          browserSyncReady = true;
+          // Start _dev after browserSync is ready
+          startDevProcess();
+        }
+      } else if (/Reloading Browsers/.test(line)) {
+        console.log(`${chalk.blue("[Browsersync]")} Reloading Browsers...`);
+      } else {
+        // Print any other notifications
+        console.log(line);
+      }
+    });
 
-// Log the output from stderr (error output)
-devProcess.stderr.on("data", (data) => {
-  console.error(data.toString()); // Convert data to string
-});
+    const rlErr = readline.createInterface({
+      input: browserSync.stderr,
+      crlfDelay: Infinity,
+    });
+
+    rlErr.on("line", (line) => {
+      console.error(`browser-sync error: ${line}`);
+    });
+
+    // Function to start _dev process
+    function startDevProcess() {
+      console.log("Starting _dev...");
+      const devProcess = exec("npm run _dev");
+
+      devProcess.stdout.on("data", (data) => {
+        process.stdout.write(data);
+      });
+
+      devProcess.stderr.on("data", (data) => {
+        process.stderr.write(data);
+      });
+
+      devProcess.on("close", (code) => {
+        console.log(`Dev process exited with code ${code}`);
+      });
+    }
+
+    // Handle browserSync close event
+    browserSync.on("close", (code) => {
+      console.log(`browserSync process exited with code ${code}`);
+    });
+  } catch (error) {
+    console.error("An error occurred:", error.message);
+  }
+}
 
-// Handle process exit
-devProcess.on("exit", (code) => {
-  console.log(`Dev process exited with code ${code}`);
-});
+startDev();

package/dist/src/app/layout.php

@@ -6,11 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="pp-description" content="<?php echo htmlspecialchars($metadata['description']); ?>">
     <title><?php echo htmlspecialchars($metadata['title']); ?></title>
-    <link rel="icon" href="<?php echo $baseUrl; ?>favicon.ico" type="image/x-icon">
+    <link rel="icon" href="<?php echo $baseUrl; ?>\favicon.ico" type="image/x-icon">
 </head>
 
 <body>
     <?php echo $content; ?>
+    <!-- Dynamic Footer -->
+    <?php echo implode("\n", $mainLayoutFooter); ?>
 </body>
 
 </html>

package/package.json

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