@mnci/cli 4.10.2 → 4.10.4

package/dist/cli.js

@@ -573,13 +573,9 @@ var ROOT_LINT_TARGET = {
     cwd: "."
   }
 };
-function reactExpressPeerOverride(manifest) {
-  const declared = {
-    ...manifest.dependencies,
-    ...manifest.devDependencies
-  };
-  return declared.express === void 0 ? {} : { "@nx/react": { express: "$express" } };
-}
+var NX_PEER_OVERRIDES = {
+  "@nx/react": { express: ">=4.0.0 <6.0.0" }
+};
 var ESLINT_PEER_OVERRIDES = {
   "eslint-plugin-jsx-a11y": { eslint: "$eslint" },
   // Scoped to EACH named parent, not top-level and not `nx` alone.
@@ -1861,11 +1857,9 @@ function applyOverlay(workspaceRoot, options, onProgress = () => {
     ...manifest.overrides,
     ...ESLINT_PEER_OVERRIDES,
     ...SECURITY_OVERRIDES,
-    // Last, and conditional — see reactExpressPeerOverride. At `mnci new` there
-    // is no express yet, so this is a no-op; `mnci add node-app --framework
-    // express` is what puts express in the root manifest, and syncs the override
-    // itself. This line is what carries it across an `mnci upgrade`.
-    ...reactExpressPeerOverride(manifest)
+    // Static, so it is present before any generator can run an install — see
+    // NX_PEER_OVERRIDES for why the conditional form could never be.
+    ...NX_PEER_OVERRIDES
   };
   const existingNx = manifest.nx;
   const existingTargets = withoutKey(
@@ -2093,8 +2087,22 @@ function projectTask(name, kind) {
   const base = { label: `${name}: ${kind}`, type: "npm", script, problemMatcher: [] };
   return kind === "start" ? { ...base, isBackground: true } : { ...base, group: kind };
 }
+function ensureNxPeerOverrides(workspaceRoot) {
+  const manifestPath = (0, import_node_path3.join)(workspaceRoot, "package.json");
+  if (!(0, import_node_fs3.existsSync)(manifestPath)) {
+    return;
+  }
+  const manifest = readJson(manifestPath);
+  const existing = manifest.overrides ?? {};
+  const overrides = { ...existing, ...NX_PEER_OVERRIDES };
+  if (JSON.stringify(existing) === JSON.stringify(overrides)) {
+    return;
+  }
+  writeFileEnsured(manifestPath, toJson({ ...manifest, overrides }));
+}
 function registerProjectCommands(workspaceRoot, name, commands) {
   removeStaleGitkeeps(workspaceRoot);
+  ensurePythonArtefactsIgnored(workspaceRoot);
   const scripts = {
     [`${name}:qa`]: `nx run ${name}:lint && nx run ${name}:test`
   };
@@ -2111,16 +2119,11 @@ function registerProjectCommands(workspaceRoot, name, commands) {
   const manifestPath = (0, import_node_path3.join)(workspaceRoot, "package.json");
   const manifest = readJson(manifestPath);
   const existingScripts = manifest.scripts ?? {};
-  const overrides = {
-    ...manifest.overrides,
-    ...reactExpressPeerOverride(manifest)
-  };
   writeFileEnsured(
     manifestPath,
     toJson({
       ...manifest,
-      scripts: { ...existingScripts, ...scripts },
-      ...Object.keys(overrides).length > 0 && { overrides }
+      scripts: { ...existingScripts, ...scripts }
     })
   );
   const codeWorkspacePath = findCodeWorkspaceFile(workspaceRoot);
@@ -2712,6 +2715,46 @@ function runNodeApp(workspaceRoot, name, stack, framework) {
     ],
     workspaceRoot
   );
+  const appRoot = (0, import_node_path7.join)(workspaceRoot, "apps", name);
+  separateDeclarationOutput(appRoot);
+  repairAssetMapping(appRoot, name);
+}
+function separateDeclarationOutput(appRoot) {
+  const tsconfigPath = (0, import_node_path7.join)(appRoot, "tsconfig.app.json");
+  if (!fileExists(tsconfigPath)) {
+    return;
+  }
+  const tsconfig = readJson(tsconfigPath);
+  const compilerOptions = tsconfig.compilerOptions ?? {};
+  if (compilerOptions.outDir !== "dist") {
+    return;
+  }
+  writeFileEnsured(
+    tsconfigPath,
+    toJson({
+      ...tsconfig,
+      compilerOptions: {
+        ...compilerOptions,
+        outDir: "out-tsc/app",
+        tsBuildInfoFile: "out-tsc/app/tsconfig.app.tsbuildinfo"
+      }
+    })
+  );
+}
+function repairAssetMapping(appRoot, name) {
+  const manifestPath = (0, import_node_path7.join)(appRoot, "package.json");
+  if (!fileExists(manifestPath)) {
+    return;
+  }
+  const manifest = readJson(manifestPath);
+  const options = manifest.nx?.targets?.build?.options;
+  if (!options || !Array.isArray(options.assets)) {
+    return;
+  }
+  options.assets = options.assets.map(
+    (asset) => typeof asset === "string" ? { input: asset, glob: "**/*", output: asset.replace(`apps/${name}/src/`, "") } : asset
+  );
+  writeFileEnsured(manifestPath, toJson(manifest));
 }
 function nodeAppPackageTarget(name) {
   const zip = `dist/drop/node-app-${name}.zip`;
@@ -2800,7 +2843,7 @@ function repairNodeFunctionAppManifest(nodeFunctionAppRoot, workspaceRoot) {
 function nodeFunctionAppPackageTarget(name) {
   const zip = `dist/drop/node-function-app-${name}.zip`;
   const root = `apps/${name}`;
-  const command = `node -e "const fs=require('node:fs');fs.mkdirSync('dist/drop',{recursive:true});const A=require('adm-zip');const z=new A();z.addLocalFolder('${root}/dist','dist');z.addLocalFile('${root}/host.json');z.addLocalFile('${root}/package.json');z.writeZip('${zip}')"`;
+  const command = String.raw`node -e "const fs=require('node:fs');fs.mkdirSync('dist/drop',{recursive:true});const A=require('adm-zip');const z=new A();z.addLocalFolder('${root}/dist','dist',(e)=>!/\.d\.ts(\.map)?$/.test(e));z.addLocalFile('${root}/host.json');z.addLocalFile('${root}/package.json');z.writeZip('${zip}')"`;
   return {
     executor: "nx:run-commands",
     dependsOn: ["build"],
@@ -2808,6 +2851,15 @@ function nodeFunctionAppPackageTarget(name) {
     options: { command }
   };
 }
+function nodeFunctionAppPruneTarget(name) {
+  const pruned = `apps/${name}/dist/package.json`;
+  const command = String.raw`node -e "const fs=require('node:fs');const root=JSON.parse(fs.readFileSync('package.json','utf8'));const o=root.overrides;if(!o||Object.keys(o).length===0){console.log('No root overrides - nothing to carry into the pruned manifest.');process.exit(0)}const p='${pruned}';if(!fs.existsSync(p)){console.error('Pruned manifest not found at '+p+' - run the prune-lockfile target first.');process.exit(1)}const m=JSON.parse(fs.readFileSync(p,'utf8'));m.overrides={...o,...m.overrides};fs.writeFileSync(p,JSON.stringify(m,null,2)+'\n');console.log('Carried '+Object.keys(o).length+' root override(s) into '+p)"`;
+  return {
+    executor: "nx:run-commands",
+    dependsOn: ["prune-lockfile", "copy-workspace-modules"],
+    options: { command }
+  };
+}
 function nodeFunctionAppStartTarget(name) {
   return {
     executor: "nx:run-commands",
@@ -2835,6 +2887,7 @@ function addNodeFunctionApp(workspaceRoot, name, stack) {
   ensureAdmZip(workspaceRoot);
   addNxTargets((0, import_node_path7.join)(nodeFunctionAppRoot, "package.json"), {
     package: nodeFunctionAppPackageTarget(name),
+    prune: nodeFunctionAppPruneTarget(name),
     start: nodeFunctionAppStartTarget(name)
   });
   removeGeneratedEslintConfig(workspaceRoot, `apps/${name}`);
@@ -4624,6 +4677,7 @@ async function runAdd(kind, name, options) {
   const resolvedName = name ?? await promptText("Project name");
   assertValidProjectName(resolvedName, "Project name");
   const rootDependenciesBefore = rootRuntimeDependencies(workspaceRoot);
+  ensureNxPeerOverrides(workspaceRoot);
   switch (resolvedKind) {
     case "react-app": {
       addReactApp(workspaceRoot, resolvedName, stack);