@mnci/cli 4.10.3 → 4.10.5

package/dist/cli.js

@@ -449,7 +449,30 @@ function releaseConfig(ci) {
       // Set here at `new` time it wins: the generator only fills this in when
       // absent (it spreads the existing release.version over its default). Both
       // globs are listed; `nx run-many` no-ops cleanly when one matches nothing.
-      preVersionCommand: "npx nx run-many -t build --projects=packages/*,python-packages/*"
+      preVersionCommand: "npx nx run-many -t build --projects=packages/*,python-packages/*",
+      // The lock file resync is OFF, and the reason is that it cannot succeed
+      // on the one release where it would matter.
+      //
+      // It is not `preVersionCommand` that does this, despite the name it gets
+      // reported under: `@nx/js`'s `afterAllProjectsVersioned` hook shells
+      // `npm install --package-lock-only` once every project has been versioned.
+      // That command resolves the whole tree against the registry, so the first
+      // release of two NEW interdependent packages 404s — package A declares a
+      // dependency on package B at the version this very run is about to
+      // publish, and B does not exist on the registry yet. Measured on a real
+      // workspace releasing `@scope/cli` and `@scope/studio` together.
+      //
+      // Turning it off costs nothing here, because mnci releases are tag-only:
+      // `git.commit` is `false`, so the refreshed lock file is written into an
+      // ephemeral CI checkout and then thrown away without ever being committed.
+      // It was never protecting anything. That it goes stale is not a new
+      // condition either — every manifest on disk is already stale by design for
+      // exactly the same reason, which is why `fallbackCurrentVersionResolver`
+      // is `'disk'` and why a tagless clone makes a dry run silently wrong.
+      //
+      // A workspace that DOES want the lock file refreshed should commit the
+      // bump too (`git.commit: true`), at which point this can be dropped.
+      versionActionsOptions: { skipLockFileUpdate: true }
     },
     changelog: githubReleases ? {
       workspaceChangelog: false,
@@ -573,13 +596,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 +1880,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 +2110,45 @@ function projectTask(name, kind) {
   const base = { label: `${name}: ${kind}`, type: "npm", script, problemMatcher: [] };
   return kind === "start" ? { ...base, isBackground: true } : { ...base, group: kind };
 }
+function renameScaffoldPlaceholder(projectRoot, name) {
+  const placeholder = (0, import_node_path3.join)(projectRoot, "src", "lib", `${name}.ts`);
+  if (!(0, import_node_fs3.existsSync)(placeholder)) {
+    return;
+  }
+  (0, import_node_fs3.renameSync)(placeholder, (0, import_node_path3.join)(projectRoot, "src", "lib", `${name}.use-case.ts`));
+  const spec = (0, import_node_path3.join)(projectRoot, "src", "lib", `${name}.spec.ts`);
+  if ((0, import_node_fs3.existsSync)(spec)) {
+    const renamed = (0, import_node_path3.join)(projectRoot, "src", "lib", `${name}.use-case.spec.ts`);
+    (0, import_node_fs3.renameSync)(spec, renamed);
+    writeFileEnsured(
+      renamed,
+      (0, import_node_fs3.readFileSync)(renamed, "utf8").replaceAll(`./${name}'`, () => `./${name}.use-case'`)
+    );
+  }
+  const barrel = (0, import_node_path3.join)(projectRoot, "src", "index.ts");
+  if ((0, import_node_fs3.existsSync)(barrel)) {
+    writeFileEnsured(
+      barrel,
+      (0, import_node_fs3.readFileSync)(barrel, "utf8").replaceAll(`./lib/${name}'`, () => `./lib/${name}.use-case'`)
+    );
+  }
+}
+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 +2165,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);
@@ -3231,6 +3280,7 @@ async function addNpmLib(workspaceRoot, name, options, kindProvided, stack) {
       repairPublishableManifest(manifestPath);
       repairDeclarationSpecifiers(projectRoot);
       writeProjectReadme(projectRoot, `${scope}/${name}`, stack.testRunner);
+      renameScaffoldPlaceholder(projectRoot, name);
       removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
       removeLocalRegistryScaffolding(workspaceRoot);
       registerProjectCommands(workspaceRoot, name, { build: true });
@@ -4674,6 +4724,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);
@@ -4713,6 +4764,7 @@ async function runAdd(kind, name, options) {
         workspaceRoot
       );
       markPrivate((0, import_node_path18.join)(workspaceRoot, "libs", resolvedName, "package.json"));
+      renameScaffoldPlaceholder((0, import_node_path18.join)(workspaceRoot, "libs", resolvedName), resolvedName);
       removeGeneratedEslintConfig(workspaceRoot, `libs/${resolvedName}`);
       registerProjectCommands(workspaceRoot, resolvedName, { build: true });
       break;