@windrun-huaiin/dev-scripts 6.6.1 → 6.7.0

package/dist/cli.js

@@ -1206,7 +1206,36 @@ async function createDiaomaoApp(targetDir) {
     console.error("Usage: create-diaomao-app <project-name>");
     process.exit(1);
   }
-  const destDir = path2__default.default.resolve(process.cwd(), targetDir);
+  const cwd2 = process.cwd();
+  const cwdPackageJson = path2__default.default.join(cwd2, "package.json");
+  const cwdWorkspaceYaml = path2__default.default.join(cwd2, "pnpm-workspace.yaml");
+  const hasPkgJson = await fsExtra.pathExists(cwdPackageJson);
+  const hasWorkspace = await fsExtra.pathExists(cwdWorkspaceYaml);
+  let destDir;
+  let isMonorepo = false;
+  let skipInstallAndGit = false;
+  if (hasPkgJson && hasWorkspace) {
+    console.log("Detected monorepo environment, creating project under apps/");
+    destDir = path2__default.default.resolve(cwd2, "apps", targetDir);
+    isMonorepo = true;
+    skipInstallAndGit = true;
+    if (await fsExtra.pathExists(destDir)) {
+      console.error(`Error: Project 'apps/${targetDir}' already exists in this monorepo!`);
+      console.error(`Please choose a different name or remove the existing project first.`);
+      process.exit(1);
+    }
+  } else if (hasPkgJson && !hasWorkspace) {
+    console.error("Warning: You are in a directory that already contains package.json");
+    console.error("This might create a nested project structure which is usually not intended.");
+    console.error("");
+    console.error("Recommendations:");
+    console.error("- If you want to create a standalone project, run this command in an empty directory");
+    console.error("- If you want to add to a monorepo, run this command in the monorepo root");
+    console.error("");
+    process.exit(1);
+  } else {
+    destDir = path2__default.default.resolve(cwd2, targetDir);
+  }
   const tempDir = path2__default.default.join(os__default.default.tmpdir(), `diaomao-template-${Date.now()}`);
   console.log(`Creating project: ${targetDir}...`);
   try {
@@ -1224,77 +1253,106 @@ async function createDiaomaoApp(targetDir) {
       await fsExtra.rename(envTxtPath, envPath);
       console.log("Renamed .env.local.txt to .env.local");
     }
+    if (isMonorepo) {
+      const changesetDir = path2__default.default.join(destDir, ".changeset");
+      if (await fsExtra.pathExists(changesetDir)) {
+        await fsExtra.remove(changesetDir);
+        console.log("Removed .changeset folder (managed by monorepo root)");
+      }
+    }
     const pkgPath = path2__default.default.join(destDir, "package.json");
     const pkg = await fsExtra.readJson(pkgPath);
     pkg.name = path2__default.default.basename(targetDir);
     pkg.version = "1.0.0";
     pkg.private = true;
-    pkg.pnpm = {
-      "onlyBuiltDependencies": [
-        "@clerk/shared",
-        "@parcel/watcher",
-        "@tailwindcss/oxide",
-        "core-js",
-        "esbuild",
-        "sharp",
-        "unrs-resolver"
-      ],
-      "overrides": {
-        "@types/react": "19.1.2",
-        "@types/react-dom": "19.1.3"
-      },
-      "patchedDependencies": {
-        "fumadocs-ui@15.3.3": "patches/fumadocs-ui@15.3.3.patch"
+    if (isMonorepo) {
+      if (pkg.dependencies) {
+        Object.keys(pkg.dependencies).forEach((key) => {
+          if (key.startsWith("@windrun-huaiin/")) {
+            pkg.dependencies[key] = "workspace:^";
+          }
+        });
       }
-    };
-    pkg.scripts = {
-      "postinstall": "fumadocs-mdx",
-      "predev": "pnpm run lint",
-      "dev": "next dev --turbopack",
-      "build": "pnpm generate-blog-index && next build",
-      "build:dev": "pnpm generate-blog-index && next build",
-      "build:prod": "next build",
-      "start": "next start",
-      "lint": "next lint",
-      "deep-clean": "dev-scripts deep-clean",
-      "d8": "pnpm run deep-clean",
-      "easy-changeset": "dev-scripts easy-changeset",
-      "dj": "pnpm run easy-changeset && pnpm changeset status",
-      "djv": "pnpm changeset version",
-      "generate-blog-index": "dev-scripts generate-blog-index -v",
-      "check-translations": "dev-scripts check-translations -v",
-      "clean-translations": "dev-scripts clean-translations -v",
-      "remove-translations": "dev-scripts clean-translations --remove -v",
-      "whoareyou": "dev-scripts generate-nextjs-architecture -v"
-    };
+      if (pkg.devDependencies) {
+        Object.keys(pkg.devDependencies).forEach((key) => {
+          if (key.startsWith("@windrun-huaiin/")) {
+            pkg.devDependencies[key] = "workspace:^";
+          }
+        });
+      }
+      delete pkg.pnpm;
+      if (pkg.scripts) {
+        delete pkg.scripts["deep-clean"];
+        delete pkg.scripts["d8"];
+        delete pkg.scripts["easy-changeset"];
+        delete pkg.scripts["dj"];
+        delete pkg.scripts["djv"];
+        delete pkg.scripts["djvp"];
+      }
+    } else {
+      pkg.pnpm = {
+        "onlyBuiltDependencies": [
+          "@clerk/shared",
+          "@parcel/watcher",
+          "@tailwindcss/oxide",
+          "core-js",
+          "esbuild",
+          "sharp",
+          "unrs-resolver"
+        ],
+        "overrides": {
+          "@types/react": "19.1.2",
+          "@types/react-dom": "19.1.3"
+        },
+        "patchedDependencies": {
+          "fumadocs-ui@15.3.3": "patches/fumadocs-ui@15.3.3.patch"
+        }
+      };
+      if (pkg.scripts) {
+        delete pkg.scripts["djvp"];
+      }
+    }
     delete pkg.publishConfig;
     delete pkg.files;
     await fsExtra.writeJson(pkgPath, pkg, { spaces: 2 });
-    console.log("Installing dependencies...");
-    try {
-      child_process.execSync("pnpm install", { cwd: destDir, stdio: "inherit" });
-    } catch (error) {
-      console.warn("pnpm failed, trying npm...");
+    if (!skipInstallAndGit) {
+      console.log("Installing dependencies...");
       try {
-        child_process.execSync("npm install", { cwd: destDir, stdio: "inherit" });
-      } catch (npmError) {
-        console.error("Failed to install dependencies. Please run npm install or pnpm install manually.");
+        child_process.execSync("pnpm install", { cwd: destDir, stdio: "inherit" });
+      } catch (error) {
+        console.warn("pnpm failed, trying npm...");
+        try {
+          child_process.execSync("npm install", { cwd: destDir, stdio: "inherit" });
+        } catch (npmError) {
+          console.error("Failed to install dependencies. Please run npm install or pnpm install manually.");
+        }
       }
-    }
-    console.log("Initializing Git repository...");
-    try {
-      child_process.execSync("git init", { cwd: destDir, stdio: "inherit" });
-      child_process.execSync("git add .", { cwd: destDir, stdio: "inherit" });
-      child_process.execSync('git commit -m "feat: initial commit from diaomao template"', { cwd: destDir, stdio: "inherit" });
-    } catch (error) {
-      console.warn("Failed to initialize Git repository. Please initialize manually.");
+      console.log("Initializing Git repository...");
+      try {
+        child_process.execSync("git init", { cwd: destDir, stdio: "inherit" });
+        child_process.execSync("git add .", { cwd: destDir, stdio: "inherit" });
+        child_process.execSync('git commit -m "feat: initial commit from diaomao template"', { cwd: destDir, stdio: "inherit" });
+      } catch (error) {
+        console.warn("Failed to initialize Git repository. Please initialize manually.");
+      }
+    } else {
+      console.log("Skipping dependency installation and Git initialization (managed by monorepo)");
     }
     console.log(`
 \u2705 Project created: ${destDir}`);
     console.log(`
 Next steps:`);
-    console.log(`  cd ${targetDir}`);
-    console.log(`  pnpm dev`);
+    if (isMonorepo) {
+      console.log(`  Config pnpm-workspace.yaml, add your packages: -apps/${targetDir} for your monorepo`);
+      console.log(`  Config .changeset/d8-template.mdx for CHANGELOG`);
+      console.log(`  # Run 'pnpm install' from monorepo root if needed`);
+      console.log(`  pnpm build`);
+      console.log(`  pnpm dev`);
+    } else {
+      console.log(`  cd ${targetDir}`);
+      console.log(`  pnpm build`);
+      console.log(`  pnpm dev`);
+    }
     console.log(`  NOTE: please check .env.local file and set your own env!`);
   } catch (error) {
     console.error("Failed to create project:", error);