@mnci/cli 1.12.2 → 1.13.0

package/README.md

@@ -38,6 +38,8 @@ mnci add node-app api --framework express  # ...or fastify | koa | nest
 mnci add node-function-app api # @nx/node + an Azure Functions v4 overlay
 mnci add npm-lib sdk           # @nx/js publishable lib -> packages/
 mnci add internal-lib utils    # @nx/js private lib -> libs/
+mnci add react-lib ui          # @nx/react publishable component lib -> packages/
+mnci add react-internal-lib design  # @nx/react private component lib -> libs/
 
 # Python (@mnci/nx-python-pip — pip + Ruff + pytest + PyPA build/twine, no uv)
 mnci add python-app svc            # app -> apps/ (wheel, zipped into the drop)

package/dist/cli.js

@@ -38,8 +38,8 @@ module.exports = __toCommonJS(cli_exports);
 var import_commander = require("commander");
 
 // src/commands/add.ts
-var import_node_path9 = require("path");
-var import_prompts4 = require("@inquirer/prompts");
+var import_node_path10 = require("path");
+var import_prompts5 = require("@inquirer/prompts");
 
 // src/nx.ts
 var import_cross_spawn = __toESM(require("cross-spawn"));
@@ -192,6 +192,21 @@ function hasPlugin(workspaceRoot, packageName) {
   const installed = { ...manifest.dependencies, ...manifest.devDependencies };
   return Object.hasOwn(installed, packageName);
 }
+function ensurePlugin(workspaceRoot, packageName) {
+  if (hasPlugin(workspaceRoot, packageName)) {
+    return;
+  }
+  logger.step(`Installing Nx plugin ${packageName}`);
+  runNx(["add", packageName], workspaceRoot);
+}
+function markPrivate(manifestPath) {
+  const manifest = readJson(manifestPath);
+  writeFileEnsured(manifestPath, toJson({ ...manifest, private: true }));
+}
+function markPublic(manifestPath) {
+  const manifest = readJson(manifestPath);
+  writeFileEnsured(manifestPath, toJson({ ...manifest, publishConfig: { access: "public" } }));
+}
 function ensureAdmZip(workspaceRoot) {
   if (hasPlugin(workspaceRoot, "adm-zip")) {
     return;
@@ -525,7 +540,7 @@ function addGoInternalLib(workspaceRoot, name) {
 
 // src/commands/add/node.ts
 var import_node_path5 = require("path");
-function ensurePlugin(workspaceRoot, packageName) {
+function ensurePlugin2(workspaceRoot, packageName) {
   if (hasPlugin(workspaceRoot, packageName)) {
     return;
   }
@@ -533,7 +548,7 @@ function ensurePlugin(workspaceRoot, packageName) {
   runNx(["add", packageName], workspaceRoot);
 }
 function runNodeApp(workspaceRoot, name, stack, framework) {
-  ensurePlugin(workspaceRoot, "@nx/node");
+  ensurePlugin2(workspaceRoot, "@nx/node");
   runNx(
     [
       "g",
@@ -699,10 +714,6 @@ async function addNpmLib(workspaceRoot, name, options, kindProvided, stack) {
   removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
   registerProjectCommands(workspaceRoot, name, { build: true });
 }
-function markPublic(manifestPath) {
-  const manifest = readJson(manifestPath);
-  writeFileEnsured(manifestPath, toJson({ ...manifest, publishConfig: { access: "public" } }));
-}
 
 // src/commands/add/python.ts
 var import_node_fs4 = require("fs");
@@ -926,13 +937,6 @@ async function addPythonVendor(workspaceRoot, consumer, options, kindProvided) {
 // src/commands/add/reactApp.ts
 var import_node_fs5 = require("fs");
 var import_node_path8 = require("path");
-function ensurePlugin2(workspaceRoot, packageName) {
-  if (hasPlugin(workspaceRoot, packageName)) {
-    return;
-  }
-  logger.step(`Installing Nx plugin ${packageName}`);
-  runNx(["add", packageName], workspaceRoot);
-}
 var REACT_ENVIRONMENTS = ["dev", "uat", "prod"];
 function reactEnvironmentFile(environment) {
   return `# Vite compiles VITE_-prefixed vars into the '${environment}' bundle at build time.
@@ -985,7 +989,7 @@ ${allow}
 `);
 }
 function addReactApp(workspaceRoot, name, stack) {
-  ensurePlugin2(workspaceRoot, "@nx/react");
+  ensurePlugin(workspaceRoot, "@nx/react");
   runNx(
     [
       "g",
@@ -1011,9 +1015,73 @@ function addReactApp(workspaceRoot, name, stack) {
   registerProjectCommands(workspaceRoot, name, { build: true, start: `nx run ${name}:serve` });
 }
 
+// src/commands/add/reactLib.ts
+var import_node_path9 = require("path");
+var WRONG_TYPES_PATH = "./dist/index.esm.d.ts";
+var ACTUAL_TYPES_PATH = "./dist/index.d.ts";
+function repairTypesPath(manifestPath) {
+  const manifest = readJson(manifestPath);
+  if (manifest.types === WRONG_TYPES_PATH) {
+    manifest.types = ACTUAL_TYPES_PATH;
+  }
+  const dot = manifest.exports?.["."];
+  if (typeof dot === "object" && dot.types === WRONG_TYPES_PATH) {
+    dot.types = ACTUAL_TYPES_PATH;
+  }
+  writeFileEnsured(manifestPath, toJson(manifest));
+}
+var REACT_LIB_BUNDLER = "rollup";
+async function addReactLib(workspaceRoot, name, options, kindProvided, stack) {
+  ensurePlugin(workspaceRoot, "@nx/react");
+  const scope = options.scope ?? (kindProvided ? defaultScope(workspaceRoot) : await promptText("npm scope for the published package", defaultScope(workspaceRoot)));
+  runNx(
+    [
+      "g",
+      "@nx/react:library",
+      `packages/${name}`,
+      `--name=${name}`,
+      "--publishable",
+      `--importPath=${scope}/${name}`,
+      `--bundler=${REACT_LIB_BUNDLER}`,
+      `--unitTestRunner=${stack.testRunner}`,
+      "--linter=none",
+      "--no-interactive"
+    ],
+    workspaceRoot
+  );
+  const publishableManifest = (0, import_node_path9.join)(workspaceRoot, "packages", name, "package.json");
+  markPublic(publishableManifest);
+  repairTypesPath(publishableManifest);
+  removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
+  registerProjectCommands(workspaceRoot, name, { build: true });
+}
+function addReactInternalLib(workspaceRoot, name, stack) {
+  ensurePlugin(workspaceRoot, "@nx/react");
+  runNx(
+    [
+      "g",
+      "@nx/react:library",
+      `libs/${name}`,
+      `--name=${name}`,
+      `--bundler=${REACT_LIB_BUNDLER}`,
+      `--unitTestRunner=${stack.testRunner}`,
+      "--linter=none",
+      "--no-interactive"
+    ],
+    workspaceRoot
+  );
+  const privateManifest = (0, import_node_path9.join)(workspaceRoot, "libs", name, "package.json");
+  markPrivate(privateManifest);
+  repairTypesPath(privateManifest);
+  removeGeneratedEslintConfig(workspaceRoot, `libs/${name}`);
+  registerProjectCommands(workspaceRoot, name, { build: true });
+}
+
 // src/commands/add.ts
 var PROJECT_KINDS = [
   "react-app",
+  "react-lib",
+  "react-internal-lib",
   "node-app",
   "node-function-app",
   "npm-lib",
@@ -1033,12 +1101,12 @@ var PROJECT_KINDS = [
 ];
 async function runAdd(kind, name, options) {
   const workspaceRoot = process.cwd();
-  if (!fileExists((0, import_node_path9.join)(workspaceRoot, "nx.json"))) {
+  if (!fileExists((0, import_node_path10.join)(workspaceRoot, "nx.json"))) {
     throw new Error("No nx.json found here. Run `add` from the workspace root.");
   }
   const stack = readWorkspaceStack(workspaceRoot);
   const kindProvided = kind !== void 0;
-  const resolvedKind = kind ?? await (0, import_prompts4.select)({
+  const resolvedKind = kind ?? await (0, import_prompts5.select)({
     message: "What kind of project?",
     choices: PROJECT_KINDS.map((value) => ({ name: value, value }))
   });
@@ -1049,6 +1117,14 @@ async function runAdd(kind, name, options) {
       addReactApp(workspaceRoot, resolvedName, stack);
       break;
     }
+    case "react-lib": {
+      await addReactLib(workspaceRoot, resolvedName, options, kindProvided, stack);
+      break;
+    }
+    case "react-internal-lib": {
+      addReactInternalLib(workspaceRoot, resolvedName, stack);
+      break;
+    }
     case "node-app": {
       addNodeApp(workspaceRoot, resolvedName, stack, options.framework);
       break;
@@ -1074,7 +1150,7 @@ async function runAdd(kind, name, options) {
         ],
         workspaceRoot
       );
-      markPrivate((0, import_node_path9.join)(workspaceRoot, "libs", resolvedName, "package.json"));
+      markPrivate((0, import_node_path10.join)(workspaceRoot, "libs", resolvedName, "package.json"));
       removeGeneratedEslintConfig(workspaceRoot, `libs/${resolvedName}`);
       registerProjectCommands(workspaceRoot, resolvedName, { build: true });
       break;
@@ -1150,28 +1226,24 @@ function syncProjectReferences(workspaceRoot) {
 }
 function readWorkspaceStack(workspaceRoot) {
   const nxJson = readJson(
-    (0, import_node_path9.join)(workspaceRoot, "nx.json")
+    (0, import_node_path10.join)(workspaceRoot, "nx.json")
   );
   const stack = nxJson.mnci?.stack;
   return {
     testRunner: stack?.testRunner === "vitest" ? "vitest" : "jest"
   };
 }
-function markPrivate(manifestPath) {
-  const manifest = readJson(manifestPath);
-  writeFileEnsured(manifestPath, toJson({ ...manifest, private: true }));
-}
 
 // src/commands/interactive.ts
-var import_node_path13 = require("path");
-var import_prompts7 = require("@inquirer/prompts");
+var import_node_path14 = require("path");
+var import_prompts8 = require("@inquirer/prompts");
 
 // src/commands/new.ts
-var import_node_path11 = require("path");
+var import_node_path12 = require("path");
 
 // src/overlay.ts
 var import_node_fs6 = require("fs");
-var import_node_path10 = require("path");
+var import_node_path11 = require("path");
 var DEFAULT_STACK = { testRunner: "jest" };
 var PRETTIER_VERSION = "^3.8.1";
 var TS_COMPILER_DEPENDENCIES = {
@@ -1378,7 +1450,7 @@ function mnciConfig(options) {
   };
 }
 function readMnciConfig(workspaceRoot) {
-  const nxJson = readJson((0, import_node_path10.join)(workspaceRoot, "nx.json"));
+  const nxJson = readJson((0, import_node_path11.join)(workspaceRoot, "nx.json"));
   return nxJson.mnci ?? {};
 }
 function pythonPublishUrl(registry) {
@@ -1828,7 +1900,7 @@ updates:
 var NX_SCAFFOLDING_TO_REMOVE = [".prettierrc", ".vscode"];
 function removeNxScaffolding(workspaceRoot) {
   for (const entry of NX_SCAFFOLDING_TO_REMOVE) {
-    (0, import_node_fs6.rmSync)((0, import_node_path10.join)(workspaceRoot, entry), { recursive: true, force: true });
+    (0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, entry), { recursive: true, force: true });
   }
   removeProjectEslintConfigs(workspaceRoot);
 }
@@ -1837,11 +1909,11 @@ function removeProjectEslintConfigs(workspaceRoot) {
     cwd: workspaceRoot
   });
   for (const match of matches) {
-    (0, import_node_fs6.rmSync)((0, import_node_path10.join)(workspaceRoot, match), { force: true });
+    (0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, match), { force: true });
   }
 }
 function applyOverlay(workspaceRoot, options) {
-  const nxJsonPath = (0, import_node_path10.join)(workspaceRoot, "nx.json");
+  const nxJsonPath = (0, import_node_path11.join)(workspaceRoot, "nx.json");
   const nxJson = readJson(nxJsonPath);
   const generators = {
     ...nxJson.generators,
@@ -1851,7 +1923,7 @@ function applyOverlay(workspaceRoot, options) {
   const mnci = { ...nxJson.mnci, ...mnciConfig(options) };
   const patched = withEslintPlugin(withReleaseConfig(nxJson, options.ci));
   writeFileEnsured(nxJsonPath, toJson({ ...patched, generators, sync, mnci }));
-  const manifestPath = (0, import_node_path10.join)(workspaceRoot, "package.json");
+  const manifestPath = (0, import_node_path11.join)(workspaceRoot, "package.json");
   const manifest = readJson(manifestPath);
   const scripts = {
     ...manifest.scripts,
@@ -1869,34 +1941,34 @@ function applyOverlay(workspaceRoot, options) {
     manifestPath,
     toJson({ ...manifest, name: `${options.scope}/source`, scripts, devDependencies: devDeps })
   );
-  writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".npmrc"), npmrcContent(options.registry, options.scope));
-  writeFileEnsured((0, import_node_path10.join)(workspaceRoot, "commitlint.config.mjs"), COMMITLINT_CONFIG);
-  const hookPath = (0, import_node_path10.join)(workspaceRoot, ".husky/commit-msg");
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".npmrc"), npmrcContent(options.registry, options.scope));
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "commitlint.config.mjs"), COMMITLINT_CONFIG);
+  const hookPath = (0, import_node_path11.join)(workspaceRoot, ".husky/commit-msg");
   writeFileEnsured(hookPath, COMMIT_MSG_HOOK);
   markExecutable(hookPath);
-  writeFileEnsured((0, import_node_path10.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG);
-  writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".prettierrc.json"), PRETTIER_CONFIG);
-  writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".prettierignore"), PRETTIER_IGNORE);
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG);
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierrc.json"), PRETTIER_CONFIG);
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierignore"), PRETTIER_IGNORE);
   removeNxScaffolding(workspaceRoot);
-  const codeWorkspacePath = (0, import_node_path10.join)(workspaceRoot, `${options.workspaceName}.code-workspace`);
+  const codeWorkspacePath = (0, import_node_path11.join)(workspaceRoot, `${options.workspaceName}.code-workspace`);
   const existing = readCodeWorkspace(codeWorkspacePath);
   writeFileEnsured(codeWorkspacePath, vscodeWorkspace(options.workspaceName, existing?.tasks));
   if (options.workspaceName !== "undefined") {
-    (0, import_node_fs6.rmSync)((0, import_node_path10.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
+    (0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
   }
   const publishUrl = pythonPublishUrl(options.registry);
   if (options.ci === "azure" || options.ci === "both") {
     writeFileEnsured(
-      (0, import_node_path10.join)(workspaceRoot, "azure-pipelines.yml"),
+      (0, import_node_path11.join)(workspaceRoot, "azure-pipelines.yml"),
       azurePipelinesYaml(options.agent, options.variableGroup, publishUrl, options.registry.kind)
     );
   }
   if (options.ci === "github" || options.ci === "both") {
     writeFileEnsured(
-      (0, import_node_path10.join)(workspaceRoot, ".github/workflows/ci.yml"),
+      (0, import_node_path11.join)(workspaceRoot, ".github/workflows/ci.yml"),
       githubActionsYaml(options.agent, publishUrl, options.registry.kind, options.ci)
     );
-    writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".github/dependabot.yml"), DEPENDABOT_CONFIG);
+    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".github/dependabot.yml"), DEPENDABOT_CONFIG);
   }
 }
 
@@ -1965,7 +2037,7 @@ async function runNew(name, options) {
     ],
     process.cwd()
   );
-  const workspaceRoot = (0, import_node_path11.join)(process.cwd(), workspaceName);
+  const workspaceRoot = (0, import_node_path12.join)(process.cwd(), workspaceName);
   logger.step(
     "Applying MoNecromanCI overlay (VS Code workspace, release config, .npmrc, commitlint, pipeline, stack)"
   );
@@ -1984,9 +2056,8 @@ async function runNew(name, options) {
   runPrettier(workspaceRoot);
   logger.success("Done. Next steps:");
   logger.info(`  cd ${workspaceName}`);
-  logger.info(
-    "  mnci add react-app web        # or: node-app, node-function-app, npm-lib, internal-lib,"
-  );
+  logger.info("  mnci add react-app web        # or: react-lib, react-internal-lib, node-app,");
+  logger.info("                                 #     node-function-app, npm-lib, internal-lib,");
   logger.info(
     "                                 #     python-app, python-function-app, python-lib, python-internal-lib,"
   );
@@ -2001,7 +2072,7 @@ async function runNew(name, options) {
 
 // src/commands/upgrade.ts
 var import_node_fs7 = require("fs");
-var import_node_path12 = require("path");
+var import_node_path13 = require("path");
 function resolveRegistry2(options, persisted) {
   if (options.registry === "azure-artifacts" || options.organization && options.artifactsFeed) {
     const persistedAzure = persisted?.kind === "azure-artifacts" ? persisted : void 0;
@@ -2038,7 +2109,7 @@ function resolveWorkspaceName(workspaceRoot, persisted) {
     }
   } catch {
   }
-  return (0, import_node_path12.basename)(workspaceRoot);
+  return (0, import_node_path13.basename)(workspaceRoot);
 }
 function resolveOverlayOptions(workspaceRoot, options, persisted) {
   const scope = options.scope ?? persisted.scope;
@@ -2076,7 +2147,7 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
   };
 }
 function runUpgrade(workspaceRoot, options) {
-  if (!fileExists((0, import_node_path12.join)(workspaceRoot, "nx.json"))) {
+  if (!fileExists((0, import_node_path13.join)(workspaceRoot, "nx.json"))) {
     throw new Error(
       `No nx.json found in ${workspaceRoot} \u2014 this does not look like an Nx workspace. Run 'mnci upgrade' from the workspace root.`
     );
@@ -2093,14 +2164,14 @@ function runUpgrade(workspaceRoot, options) {
 
 // src/commands/interactive.ts
 async function runInteractive() {
-  const inWorkspace = fileExists((0, import_node_path13.join)(process.cwd(), "nx.json"));
+  const inWorkspace = fileExists((0, import_node_path14.join)(process.cwd(), "nx.json"));
   const newChoice = { name: "Create a new monorepo", value: "new" };
   const addChoice = { name: "Add a project to this workspace", value: "add" };
   const upgradeChoice = {
     name: "Upgrade this workspace (re-apply the latest overlay)",
     value: "upgrade"
   };
-  const action = await (0, import_prompts7.select)({
+  const action = await (0, import_prompts8.select)({
     message: "What would you like to do?",
     choices: inWorkspace ? [addChoice, upgradeChoice, newChoice] : [newChoice, addChoice, upgradeChoice]
   });
@@ -2115,7 +2186,7 @@ async function runInteractive() {
 
 // src/util/versionChecker.ts
 var import_node_fs8 = require("fs");
-var import_node_path14 = require("path");
+var import_node_path15 = require("path");
 var import_cross_spawn2 = __toESM(require("cross-spawn"));
 var PACKAGE_NAME = "@mnci/cli";
 var REGISTRY_TIMEOUT_MS = 2e3;
@@ -2171,7 +2242,7 @@ function releaseTriple(version) {
 }
 function readCliVersion(packageDirectory) {
   try {
-    const manifestPath = (0, import_node_path14.join)(packageDirectory, "..", "package.json");
+    const manifestPath = (0, import_node_path15.join)(packageDirectory, "..", "package.json");
     const manifest = JSON.parse((0, import_node_fs8.readFileSync)(manifestPath, "utf8"));
     return manifest.version ?? "0.0.0";
   } catch {