create-prisma-php-app 1.11.526 → 1.11.528

package/dist/index.js

@@ -52,7 +52,7 @@ function bsConfigUrls(projectSettings) {
     },
   };
 }
-function configureBrowserSyncCommand(baseDir, projectSettings) {
+function configureBrowserSyncCommand(baseDir) {
   // TypeScript content to write
   const bsConfigTsContent = `const { createProxyMiddleware } = require("http-proxy-middleware");
 const fs = require("fs");
@@ -86,15 +86,12 @@ module.exports = {
   // Return the Browser Sync command string, using the cleaned URL
   return `browser-sync start --config settings/bs-config.cjs`;
 }
-async function updatePackageJson(baseDir, projectSettings, answer) {
+async function updatePackageJson(baseDir, answer) {
   const packageJsonPath = path.join(baseDir, "package.json");
   if (checkExcludeFiles(packageJsonPath)) return;
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
   // Use the new function to configure the Browser Sync command
-  const browserSyncCommand = configureBrowserSyncCommand(
-    baseDir,
-    projectSettings
-  );
+  const browserSyncCommand = configureBrowserSyncCommand(baseDir);
   packageJson.scripts = Object.assign(Object.assign({}, packageJson.scripts), {
     projectName: "node settings/project-name.cjs",
   });
@@ -208,7 +205,7 @@ async function createUpdateGitignoreFile(baseDir, additions) {
   fs.writeFileSync(gitignorePath, gitignoreContent);
 }
 // Recursive copy function
-function copyRecursiveSync(src, dest) {
+function copyRecursiveSync(src, dest, answer) {
   console.log("🚀 ~ copyRecursiveSync ~ dest:", dest);
   console.log("🚀 ~ copyRecursiveSync ~ src:", src);
   const exists = fs.existsSync(src);
@@ -219,11 +216,23 @@ function copyRecursiveSync(src, dest) {
     fs.readdirSync(src).forEach((childItemName) => {
       copyRecursiveSync(
         path.join(src, childItemName),
-        path.join(dest, childItemName)
+        path.join(dest, childItemName),
+        answer
       );
     });
   } else {
     if (checkExcludeFiles(dest)) return;
+    if (
+      !answer.tailwindcss &&
+      (dest.includes("tailwind.css") || dest.includes("styles.css"))
+    )
+      return;
+    if (
+      !answer.websocket &&
+      (dest.includes("restart-websocket.cjs") ||
+        dest.includes("restart-websocket.bat"))
+    )
+      return;
     fs.copyFileSync(src, dest, 0);
   }
 }
@@ -231,9 +240,10 @@ function copyRecursiveSync(src, dest) {
 async function executeCopy(baseDir, directoriesToCopy, answer) {
   directoriesToCopy.forEach(({ srcDir, destDir }) => {
     if (!answer.prisma && srcDir === "/prisma-client-php") return;
+    if (!answer.websocket && srcDir === "/src/Lib/Websocket") return;
     const sourcePath = path.join(__dirname, srcDir);
     const destPath = path.join(baseDir, destDir);
-    copyRecursiveSync(sourcePath, destPath);
+    copyRecursiveSync(sourcePath, destPath, answer);
   });
 }
 function createOrUpdateTailwindConfig(baseDir) {
@@ -326,10 +336,9 @@ function checkExcludeFiles(destPath) {
     ? _b
     : false;
 }
-async function createDirectoryStructure(baseDir, answer, projectSettings) {
+async function createDirectoryStructure(baseDir, answer) {
   console.log("🚀 ~ baseDir:", baseDir);
   console.log("🚀 ~ answer:", answer);
-  console.log("🚀 ~ projectSettings:", projectSettings);
   const filesToCopy = [
     { src: "/bootstrap.php", dest: "/bootstrap.php" },
     { src: "/.htaccess", dest: "/.htaccess" },
@@ -382,7 +391,7 @@ async function createDirectoryStructure(baseDir, answer, projectSettings) {
     fs.writeFileSync(destPath, code, { flag: "w" });
   });
   await executeCopy(baseDir, directoriesToCopy, answer);
-  await updatePackageJson(baseDir, projectSettings, answer);
+  await updatePackageJson(baseDir, answer);
   await updateComposerJson(baseDir, answer);
   await updateIndexJsForWebSocket(baseDir, answer);
   if (answer.tailwindcss) {
@@ -675,73 +684,48 @@ async function main() {
       if (!fs.existsSync(path.join(projectPath, "prisma")))
         execSync(`npx prisma init`, { stdio: "inherit" });
     }
-    const projectPathModified = projectPath.replace(/\\/g, "\\");
-    const PHP_GENERATE_CLASS_PATH = answer.prisma
-      ? "src/Lib/Prisma/Classes"
-      : "";
-    const projectSettings = {
-      PROJECT_NAME: answer.projectName,
-      PROJECT_ROOT_PATH: projectPathModified,
-      PHP_ROOT_PATH_EXE: "D:\\\\xampp\\\\php\\\\php.exe",
-      PHP_GENERATE_CLASS_PATH,
-    };
-    await createDirectoryStructure(projectPath, answer, projectSettings);
-    // execSync(`composer install`, { stdio: "inherit" });
-    // execSync(`composer dump-autoload`, { stdio: "inherit" });
-    // Create settings file
-    // const settingsPath = path.join(
-    //   projectPath,
-    //   "settings",
-    //   "project-settings.js"
-    // );
-    // const settingsCode = `export const projectSettings = {
-    //   PROJECT_NAME: "${answer.projectName}",
-    //   PROJECT_ROOT_PATH: "${projectPath.replace(/\\/g, "\\\\")}",
-    //   PHP_ROOT_PATH_EXE: "D:\\\\xampp\\\\php\\\\php.exe",
-    //   PHP_GENERATE_CLASS_PATH: "src/Lib/Prisma/Classes",
-    // };`;
-    // fs.writeFileSync(settingsPath, settingsCode, { flag: "w" });
+    await createDirectoryStructure(projectPath, answer);
     const publicDirPath = path.join(projectPath, "public");
     if (!fs.existsSync(publicDirPath)) {
       fs.mkdirSync(publicDirPath);
     }
-    if (!answer.tailwindcss) {
-      const cssPath = path.join(projectPath, "src", "app", "css");
-      const tailwindFiles = ["tailwind.css", "styles.css"];
-      tailwindFiles.forEach((file) => {
-        const filePath = path.join(cssPath, file);
-        if (fs.existsSync(filePath)) {
-          fs.unlinkSync(filePath); // Delete each file if it exists
-          console.log(`${file} was deleted successfully.`);
-        } else {
-          console.log(`${file} does not exist.`);
-        }
-      });
-    }
+    // if (!answer.tailwindcss) {
+    //   const cssPath = path.join(projectPath, "src", "app", "css");
+    //   const tailwindFiles = ["tailwind.css", "styles.css"];
+    //   tailwindFiles.forEach((file) => {
+    //     const filePath = path.join(cssPath, file);
+    //     if (fs.existsSync(filePath)) {
+    //       fs.unlinkSync(filePath); // Delete each file if it exists
+    //       console.log(`${file} was deleted successfully.`);
+    //     } else {
+    //       console.log(`${file} does not exist.`);
+    //     }
+    //   });
+    // }
     // Update websocket if not chosen by the user
-    if (!answer.websocket) {
-      const wsPath = path.join(projectPath, "src", "Lib", "Websocket");
-      // Check if the websocket directory exists
-      if (fs.existsSync(wsPath)) {
-        // Use fs.rmSync with recursive option set to true to delete the directory and its contents
-        fs.rmSync(wsPath, { recursive: true, force: true }); // force option is not necessary but can be used to ensure deletion
-        console.log("Websocket directory was deleted successfully.");
-      } else {
-        console.log("Websocket directory does not exist.");
-      }
-      // Update settings directory if websocket is not chosen
-      const settingsPath = path.join(projectPath, "settings");
-      const websocketFiles = ["restart-websocket.cjs", "restart-websocket.bat"];
-      websocketFiles.forEach((file) => {
-        const filePath = path.join(settingsPath, file);
-        if (fs.existsSync(filePath)) {
-          fs.unlinkSync(filePath); // Delete each file if it exists
-          console.log(`${file} was deleted successfully.`);
-        } else {
-          console.log(`${file} does not exist.`);
-        }
-      });
-    }
+    // if (!answer.websocket) {
+    //   const wsPath = path.join(projectPath, "src", "Lib", "Websocket");
+    //   // Check if the websocket directory exists
+    //   if (fs.existsSync(wsPath)) {
+    //     // Use fs.rmSync with recursive option set to true to delete the directory and its contents
+    //     fs.rmSync(wsPath, { recursive: true, force: true }); // force option is not necessary but can be used to ensure deletion
+    //     console.log("Websocket directory was deleted successfully.");
+    //   } else {
+    //     console.log("Websocket directory does not exist.");
+    //   }
+    //   // Update settings directory if websocket is not chosen
+    //   const settingsPath = path.join(projectPath, "settings");
+    //   const websocketFiles = ["restart-websocket.cjs", "restart-websocket.bat"];
+    //   websocketFiles.forEach((file) => {
+    //     const filePath = path.join(settingsPath, file);
+    //     if (fs.existsSync(filePath)) {
+    //       fs.unlinkSync(filePath); // Delete each file if it exists
+    //       console.log(`${file} was deleted successfully.`);
+    //     } else {
+    //       console.log(`${file} does not exist.`);
+    //     }
+    //   });
+    // }
     if (!answer.prisma) {
       const prismaPath = path.join(projectPath, "prisma");
       const prismClassPath = path.join(projectPath, "src", "Lib", "Prisma");
@@ -802,13 +786,23 @@ async function main() {
       }
     }
     const version = await fetchPackageVersion("create-prisma-php-app");
+    const projectPathModified = projectPath.replace(/\\/g, "\\");
+    const PHP_GENERATE_CLASS_PATH = answer.prisma
+      ? "src/Lib/Prisma/Classes"
+      : "";
+    const projectSettings = {
+      PROJECT_NAME: answer.projectName,
+      PROJECT_ROOT_PATH: projectPathModified,
+      PHP_ROOT_PATH_EXE: "C:\\\\xampp\\\\php\\\\php.exe",
+      PHP_GENERATE_CLASS_PATH,
+    };
     const bsConfig = bsConfigUrls(projectSettings);
     const phpGenerateClassPath = answer.prisma ? "src/Lib/Prisma/Classes" : "";
     const prismaPhpConfig = {
       projectName: answer.projectName,
       projectRootPath: projectPathModified,
       phpEnvironment: "XAMPP",
-      phpRootPathExe: "D:\\xampp\\php\\php.exe",
+      phpRootPathExe: "C:\\xampp\\php\\php.exe",
       phpGenerateClassPath,
       bsTarget: bsConfig.bsTarget,
       bsPathRewrite: bsConfig.bsPathRewrite,
@@ -829,24 +823,9 @@ async function main() {
       JSON.stringify(prismaPhpConfig, null, 2),
       { flag: "w" }
     );
-    console.log("currentDir by process", process.cwd());
-    console.log("currentDir", currentDir);
-    console.log("projectPath", projectPath);
-    // process.chdir(projectPath);
-    // console.log("currentDir", process.cwd());
-    // execSync(`composer install`, { stdio: "inherit" });
-    // execSync(`php composer install`, { stdio: "inherit" });
-    // execSync(`D:\\xampp\\php\\php.exe composer install`, { stdio: "inherit" });
-    // execSync(`D:\\xampp\\php\\php.exe php composer install`, { stdio: "inherit" });
-    // Use the full path to the PHP executable and the Composer.phar
-    // execSync(
-    //   `D:\\xampp\\php\\php.exe C:\\ProgramData\\ComposerSetup\\bin\\composer.phar install`,
-    //   { stdio: "inherit" }
-    // );
-    // execSync(`php C:\\ProgramData\\ComposerSetup\\bin\\composer.phar install`, {
-    //   stdio: "inherit",
-    // });
-    execSync(`php composer install`, { stdio: "inherit" });
+    execSync(`php C:\\ProgramData\\ComposerSetup\\bin\\composer.phar install`, {
+      stdio: "inherit",
+    });
     console.log(
       `${chalk.green("Success!")} Prisma PHP project successfully created in ${
         answer.projectName

package/package.json

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