@mnci/cli 4.40.5 → 4.40.7

package/dist/cli.js

@@ -4464,6 +4464,28 @@ function setGoModulePath(workspaceRoot, projectDir) {
   const rewritten = (0, import_node_fs18.readFileSync)(goModPath, "utf8").replace(/^module\s+\S+/m, () => `module ${prefix}/${projectDir}`);
   writeFileEnsured(goModPath, rewritten);
 }
+var GO_DIRECTIVE_CEILING = "1.24";
+function exceedsGoCeiling(version) {
+  const [major, minor] = version.split(".").map(Number);
+  const [ceilingMajor, ceilingMinor] = GO_DIRECTIVE_CEILING.split(".").map(Number);
+  return major > ceilingMajor || major === ceilingMajor && minor > ceilingMinor;
+}
+function clampGoDirective(filePath) {
+  if (!fileExists(filePath)) {
+    return;
+  }
+  const before = (0, import_node_fs18.readFileSync)(filePath, "utf8");
+  const directive = /^go\s+(\d+\.\d+(?:\.\d+)?)/m.exec(before);
+  if (directive === null || !exceedsGoCeiling(directive[1])) {
+    return;
+  }
+  const after = before.replace(/^go\s+\d+\.\d+(?:\.\d+)?/m, () => `go ${GO_DIRECTIVE_CEILING}`).replace(/^toolchain\s+\S+(?:\r?\n){1,2}/m, "");
+  writeFileEnsured(filePath, after);
+}
+function pinGoDirective(workspaceRoot, projectDir) {
+  clampGoDirective((0, import_node_path17.join)(workspaceRoot, projectDir, "go.mod"));
+  clampGoDirective((0, import_node_path17.join)(workspaceRoot, "go.work"));
+}
 function writeGoAppExample(workspaceRoot, projectDir) {
   const goModPath = (0, import_node_path17.join)(workspaceRoot, projectDir, "go.mod");
   const modulePath = fileExists(goModPath) ? /^module\s+(\S+)/m.exec((0, import_node_fs18.readFileSync)(goModPath, "utf8"))?.[1] : void 0;
@@ -4654,6 +4676,7 @@ function addGoApp(workspaceRoot, name, options = {}) {
     workspaceRoot
   );
   setGoModulePath(workspaceRoot, `apps/${name}`);
+  pinGoDirective(workspaceRoot, `apps/${name}`);
   if (options.web === void 0) {
     writeGoAppExample(workspaceRoot, `apps/${name}`);
   }
@@ -4696,6 +4719,7 @@ function addGoFunctionApp(workspaceRoot, name) {
     workspaceRoot
   );
   setGoModulePath(workspaceRoot, `apps/${name}`);
+  pinGoDirective(workspaceRoot, `apps/${name}`);
   writeGoAppExample(workspaceRoot, `apps/${name}`);
   addProjectJsonTargets((0, import_node_path17.join)(workspaceRoot, "apps", name, "project.json"), {
     "build": goBuildTarget(name),
@@ -4721,6 +4745,7 @@ function addGoLib(workspaceRoot, name) {
     workspaceRoot
   );
   setGoModulePath(workspaceRoot, `packages/${name}`);
+  pinGoDirective(workspaceRoot, `packages/${name}`);
   addProjectJsonTargets((0, import_node_path17.join)(workspaceRoot, "packages", name, "project.json"), {
     test: goTestTarget(),
     lint: goLintTarget()
@@ -4746,6 +4771,7 @@ function addGoInternalLib(workspaceRoot, name) {
     workspaceRoot
   );
   setGoModulePath(workspaceRoot, `libs/${name}`);
+  pinGoDirective(workspaceRoot, `libs/${name}`);
   addProjectJsonTargets((0, import_node_path17.join)(workspaceRoot, "libs", name, "project.json"), {
     test: goTestTarget(),
     lint: goLintTarget()
@@ -5200,6 +5226,10 @@ function sourceMapCapableCompiler(indent) {
   ].join("\n");
 }
 var ROLLUP_ARG_ONE_BOUNDARY = ["  },", "  {", ""].join("\n");
+var ROLLUP_ARG_ONE_BOUNDARY_ONE_LINE = /^ {2}\},[ \t]*\{[ \t]*$/m;
+function withBoundaryOnTwoLines(config) {
+  return config.replace(ROLLUP_ARG_ONE_BOUNDARY_ONE_LINE, () => ROLLUP_ARG_ONE_BOUNDARY.replace(/\n$/, ""));
+}
 var ROLLUP_ARG_ONE_WITH_SOURCE_MAPS = [
   "    // Added by MoNecromanCI: without this rollup emits no .js.map at all, so",
   "    // a breakpoint in a .ts file can never bind. Not published - see `files`.",
@@ -5212,12 +5242,13 @@ function hasRollupSourceMaps(config) {
   return /sourceMap\s*:\s*true\b/.test(config);
 }
 function canRepairRollupConfig(config) {
-  return config.includes(ROLLUP_ARG_ONE_BOUNDARY);
+  return config.includes(ROLLUP_ARG_ONE_BOUNDARY) || ROLLUP_ARG_ONE_BOUNDARY_ONE_LINE.test(config);
 }
-function withRollupSourceMaps(config) {
-  if (hasRollupSourceMaps(config) || !canRepairRollupConfig(config)) {
-    return config;
+function withRollupSourceMaps(original) {
+  if (hasRollupSourceMaps(original) || !canRepairRollupConfig(original)) {
+    return original;
   }
+  const config = withBoundaryOnTwoLines(original);
   const withCompiler = config.replace(
     GENERATED_COMPILER_PATTERN,
     (_match, indent) => sourceMapCapableCompiler(indent)
@@ -5378,6 +5409,17 @@ function withUpgradedDeclarationSpecifierPlugin(config) {
   const [start, end] = span;
   return `${config.slice(0, start)}${DECLARATION_SPECIFIER_PLUGIN}${config.slice(end)}`;
 }
+var PLUGINS_ARRAY_OPEN = /^ {4}plugins\s*:\s*\[[ \t]*$/m;
+function canAddDeclarationSpecifierPlugin(config) {
+  return !hasDeclarationSpecifierPlugin(config) && !config.includes(ROLLUP_CONFIG_PLACEHOLDER) && PLUGINS_ARRAY_OPEN.test(config);
+}
+function withDeclarationSpecifierPlugin(config) {
+  if (!canAddDeclarationSpecifierPlugin(config)) {
+    return config;
+  }
+  return config.replace(PLUGINS_ARRAY_OPEN, (opening) => `${opening}
+${DECLARATION_SPECIFIER_PLUGIN},`);
+}
 
 // src/rollup-library/repair-rollup-config.use-case.ts
 function repairRollupSourceMaps(workspaceRoot) {
@@ -5419,11 +5461,33 @@ function repairDeclarationSpecifiers(projectRoot) {
   }
   const config = (0, import_node_fs22.readFileSync)(configPath, "utf8");
   if (!config.includes(ROLLUP_CONFIG_PLACEHOLDER)) {
+    const repaired = withRollupSourceMaps(withDeclarationSpecifierPlugin(config));
+    if (repaired !== config) {
+      writeFileEnsured(configPath, repaired);
+    } else if (!hasDeclarationSpecifierPlugin(config)) {
+      logger.warn(`${configPath} has a shape mnci does not recognise, so its source maps and declaration repairs were not applied; \`mnci doctor\` names what to add by hand`);
+    }
     return;
   }
   const withDtsFix = config.split(ROLLUP_CONFIG_PLACEHOLDER).join(ROLLUP_CONFIG_WITH_DTS_FIX);
   writeFileEnsured(configPath, withRollupSourceMaps(withDtsFix));
 }
+function addMissingDeclarationSpecifierPlugins(workspaceRoot) {
+  const changed = [];
+  const configs = (0, import_node_fs22.globSync)(["packages/*/rollup.config.cjs", "libs/*/rollup.config.cjs"], {
+    cwd: workspaceRoot
+  });
+  for (const relativePath of configs) {
+    const configPath = (0, import_node_path22.join)(workspaceRoot, relativePath);
+    const before = (0, import_node_fs22.readFileSync)(configPath, "utf8");
+    const after = withDeclarationSpecifierPlugin(before);
+    if (after !== before) {
+      writeFileEnsured(configPath, after);
+      changed.push(relativePath.replaceAll("\\", "/"));
+    }
+  }
+  return changed;
+}
 
 // src/rollup-library/rollup-config.repository.ts
 var import_node_fs23 = require("fs");
@@ -8186,7 +8250,7 @@ function checkRollupSourceMaps(workspaceRoot) {
         check: `source maps enabled in ${relativePath}`,
         ok: hasRollupSourceMaps(resolveRollupConfigText(configPath)),
         detail: "rollup emits no .js.map without it, so a breakpoint in a .ts file can never bind",
-        remedy: canRepairRollupConfig(config) ? "run `mnci upgrade`, which adds it to every rollup config" : "this config delegates via require() to a shared base mnci does not own \u2014 add `sourceMap: true` to withNx's first argument there by hand; `mnci upgrade` cannot repair a config in this shape"
+        remedy: canRepairRollupConfig(config) ? "run `mnci upgrade`, which adds it to every rollup config" : "mnci does not recognise the shape of this config (it edits the boundary between withNx's two arguments, which is not here; a config that delegates via require() to a shared base is one such shape) \u2014 add `sourceMap: true` to withNx's first argument by hand; `mnci upgrade` cannot repair a config in this shape"
       }
     ];
   });
@@ -8207,15 +8271,11 @@ function checkDeclarationSpecifiers(workspaceRoot) {
           check: `${relativePath} normalises declaration specifiers`,
           ok: false,
           detail: "no mnci-normalise-declaration-specifiers plugin \u2014 the emitted .d.ts files keep the extensionless imports tsconfig.lib.json allows, which a nodenext consumer cannot resolve",
-          // Deliberately NOT `mnci upgrade`, which would send the user in a
-          // circle: `upgradeDeclarationSpecifierPlugins` only rewrites a
-          // plugin that is already there, and `repairDeclarationSpecifiers`
-          // is anchored on the generator's own placeholder comment, which a
-          // config in this state no longer has. Verified by running the
-          // command against exactly this shape — it no-ops. Naming a command
-          // that silently does nothing is the failure mode this file's own
-          // source-map check already goes out of its way to avoid.
-          remedy: "add the plugin to withNx's second argument by hand (copy it from a freshly `mnci add npm-lib`'d project) \u2014 `mnci upgrade` only updates a plugin that is already present, it cannot restore a missing one"
+          // `mnci upgrade` adds the plugin only to a config whose second argument already has a
+          // `plugins` array (what @nx/react:library writes). For any other shape it would no-op, and
+          // naming a command that silently does nothing is the failure mode the source-map check
+          // above goes out of its way to avoid, so the remedy depends on the shape.
+          remedy: canAddDeclarationSpecifierPlugin((0, import_node_fs29.readFileSync)(configPath, "utf8")) ? "run `mnci upgrade`, which adds the plugin to the plugins array of withNx's second argument" : "add the plugin to withNx's second argument by hand (copy it from a freshly `mnci add npm-lib`'d project) \u2014 mnci does not recognise the shape of this config, so `mnci upgrade` cannot add it"
         }
       ];
     }
@@ -8919,6 +8979,13 @@ function runUpgrade(workspaceRoot, options) {
     logger.step("Registering the Go plugin in nx.json, so Nx can see which Go project imports which");
     logger.detail("updated nx.json");
   }
+  const addedDtsPlugins = addMissingDeclarationSpecifierPlugins(workspaceRoot);
+  if (addedDtsPlugins.length > 0) {
+    logger.step("Adding the declaration-specifier plugin to rollup configs that lacked it");
+    for (const path of addedDtsPlugins) {
+      logger.detail(`updated ${path}`);
+    }
+  }
   const upgradedDtsPlugins = upgradeDeclarationSpecifierPlugins(workspaceRoot);
   if (upgradedDtsPlugins.length > 0) {
     logger.step("Upgrading declaration specifiers to resolve under nodenext");