@idevconn/create-icore 0.3.1 → 0.4.1

package/dist/cli.js

@@ -225,6 +225,7 @@ Re-run with @latest to refresh:
 
 // src/lib/scaffold.ts
 import { copyFile, mkdir, readdir, readFile as readFile2, stat, writeFile, rm } from "fs/promises";
+import { readFileSync } from "fs";
 import { join as join2 } from "path";
 import { spawnSync } from "child_process";
 var IGNORE_TOP = /* @__PURE__ */ new Set([
@@ -283,6 +284,19 @@ async function writeUploadEnv(targetDir, opts) {
   }
   await writeFile(join2(targetDir, "apps/microservices/upload/.env"), next);
 }
+async function writeNotesEnv(targetDir, opts) {
+  if (opts.example === "none") return;
+  const envExample = join2(targetDir, "apps/microservices/notes/.env.example");
+  try {
+    const env = await readFile2(envExample, "utf8");
+    let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
+    if (opts.transport !== "tcp") {
+      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
+    }
+    await writeFile(join2(targetDir, "apps/microservices/notes/.env"), next);
+  } catch {
+  }
+}
 async function writeGatewayEnv(targetDir, opts) {
   const envExample = join2(targetDir, "apps/api/.env.example");
   const env = await readFile2(envExample, "utf8");
@@ -649,15 +663,30 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
+function resolveYarnBin(cwd) {
+  try {
+    const yarnrc = readFileSync(join2(cwd, ".yarnrc.yml"), "utf8");
+    const match = yarnrc.match(/^yarnPath:\s*(.+)$/m);
+    if (match?.[1]) return join2(cwd, match[1].trim());
+  } catch {
+  }
+  return join2(cwd, ".yarn", "releases", "yarn-4.5.0.cjs");
+}
 function runInstall(cwd, pm) {
-  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
-  spawnSync(cmd, args, { cwd, stdio: "inherit" });
+  if (pm === "yarn") {
+    spawnSync("node", [resolveYarnBin(cwd), "install"], { cwd, stdio: "inherit" });
+  } else if (pm === "npm") {
+    spawnSync("npm", ["install"], { cwd, stdio: "inherit" });
+  } else {
+    spawnSync("pnpm", ["install"], { cwd, stdio: "inherit" });
+  }
 }
 async function scaffold(opts, templatesDir2) {
   await copyTree(templatesDir2, opts.targetDir);
   await rewriteRootPackageJson(opts.targetDir, opts);
   await writeAuthEnv(opts.targetDir, opts);
   await writeUploadEnv(opts.targetDir, opts);
+  await writeNotesEnv(opts.targetDir, opts);
   await writePaymentEnv(opts.targetDir, opts);
   await writeGatewayEnv(opts.targetDir, opts);
   await writeRootEnv(opts.targetDir, opts);

package/dist/index.cjs

@@ -41,6 +41,7 @@ var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
 // src/lib/scaffold.ts
 var import_promises = require("fs/promises");
+var import_node_fs = require("fs");
 var import_node_path = require("path");
 var import_node_child_process = require("child_process");
 var IGNORE_TOP = /* @__PURE__ */ new Set([
@@ -99,6 +100,19 @@ async function writeUploadEnv(targetDir, opts) {
   }
   await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/upload/.env"), next);
 }
+async function writeNotesEnv(targetDir, opts) {
+  if (opts.example === "none") return;
+  const envExample = (0, import_node_path.join)(targetDir, "apps/microservices/notes/.env.example");
+  try {
+    const env = await (0, import_promises.readFile)(envExample, "utf8");
+    let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
+    if (opts.transport !== "tcp") {
+      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
+    }
+    await (0, import_promises.writeFile)((0, import_node_path.join)(targetDir, "apps/microservices/notes/.env"), next);
+  } catch {
+  }
+}
 async function writeGatewayEnv(targetDir, opts) {
   const envExample = (0, import_node_path.join)(targetDir, "apps/api/.env.example");
   const env = await (0, import_promises.readFile)(envExample, "utf8");
@@ -465,15 +479,30 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
+function resolveYarnBin(cwd) {
+  try {
+    const yarnrc = (0, import_node_fs.readFileSync)((0, import_node_path.join)(cwd, ".yarnrc.yml"), "utf8");
+    const match = yarnrc.match(/^yarnPath:\s*(.+)$/m);
+    if (match?.[1]) return (0, import_node_path.join)(cwd, match[1].trim());
+  } catch {
+  }
+  return (0, import_node_path.join)(cwd, ".yarn", "releases", "yarn-4.5.0.cjs");
+}
 function runInstall(cwd, pm) {
-  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
-  (0, import_node_child_process.spawnSync)(cmd, args, { cwd, stdio: "inherit" });
+  if (pm === "yarn") {
+    (0, import_node_child_process.spawnSync)("node", [resolveYarnBin(cwd), "install"], { cwd, stdio: "inherit" });
+  } else if (pm === "npm") {
+    (0, import_node_child_process.spawnSync)("npm", ["install"], { cwd, stdio: "inherit" });
+  } else {
+    (0, import_node_child_process.spawnSync)("pnpm", ["install"], { cwd, stdio: "inherit" });
+  }
 }
 async function scaffold(opts, templatesDir) {
   await copyTree(templatesDir, opts.targetDir);
   await rewriteRootPackageJson(opts.targetDir, opts);
   await writeAuthEnv(opts.targetDir, opts);
   await writeUploadEnv(opts.targetDir, opts);
+  await writeNotesEnv(opts.targetDir, opts);
   await writePaymentEnv(opts.targetDir, opts);
   await writeGatewayEnv(opts.targetDir, opts);
   await writeRootEnv(opts.targetDir, opts);

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/lib/scaffold.ts
 import { copyFile, mkdir, readdir, readFile, stat, writeFile, rm } from "fs/promises";
+import { readFileSync } from "fs";
 import { join } from "path";
 import { spawnSync } from "child_process";
 var IGNORE_TOP = /* @__PURE__ */ new Set([
@@ -58,6 +59,19 @@ async function writeUploadEnv(targetDir, opts) {
   }
   await writeFile(join(targetDir, "apps/microservices/upload/.env"), next);
 }
+async function writeNotesEnv(targetDir, opts) {
+  if (opts.example === "none") return;
+  const envExample = join(targetDir, "apps/microservices/notes/.env.example");
+  try {
+    const env = await readFile(envExample, "utf8");
+    let next = env.replace(/^NOTES_TRANSPORT=.*$/m, `NOTES_TRANSPORT=${opts.transport}`);
+    if (opts.transport !== "tcp") {
+      next = next.replace(/^# (NOTES_(?:REDIS|NATS)_URL=)/m, "$1");
+    }
+    await writeFile(join(targetDir, "apps/microservices/notes/.env"), next);
+  } catch {
+  }
+}
 async function writeGatewayEnv(targetDir, opts) {
   const envExample = join(targetDir, "apps/api/.env.example");
   const env = await readFile(envExample, "utf8");
@@ -424,15 +438,30 @@ function gitInit(cwd, projectName) {
     { cwd, stdio: "inherit" }
   );
 }
+function resolveYarnBin(cwd) {
+  try {
+    const yarnrc = readFileSync(join(cwd, ".yarnrc.yml"), "utf8");
+    const match = yarnrc.match(/^yarnPath:\s*(.+)$/m);
+    if (match?.[1]) return join(cwd, match[1].trim());
+  } catch {
+  }
+  return join(cwd, ".yarn", "releases", "yarn-4.5.0.cjs");
+}
 function runInstall(cwd, pm) {
-  const [cmd, ...args] = pm === "npm" ? ["npm", "install"] : pm === "pnpm" ? ["pnpm", "install"] : ["yarn", "install"];
-  spawnSync(cmd, args, { cwd, stdio: "inherit" });
+  if (pm === "yarn") {
+    spawnSync("node", [resolveYarnBin(cwd), "install"], { cwd, stdio: "inherit" });
+  } else if (pm === "npm") {
+    spawnSync("npm", ["install"], { cwd, stdio: "inherit" });
+  } else {
+    spawnSync("pnpm", ["install"], { cwd, stdio: "inherit" });
+  }
 }
 async function scaffold(opts, templatesDir) {
   await copyTree(templatesDir, opts.targetDir);
   await rewriteRootPackageJson(opts.targetDir, opts);
   await writeAuthEnv(opts.targetDir, opts);
   await writeUploadEnv(opts.targetDir, opts);
+  await writeNotesEnv(opts.targetDir, opts);
   await writePaymentEnv(opts.targetDir, opts);
   await writeGatewayEnv(opts.targetDir, opts);
   await writeRootEnv(opts.targetDir, opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idevconn/create-icore",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Bootstrap a new project from the iCore scaffold (Nx + NestJS + React + Vite + shadcn/Tailwind, swappable auth + storage providers).",
   "license": "Apache-2.0",
   "author": "iDEVconn",