@inditextech/docouture-cli 0.1.0-SNAPSHOT.88.1 → 1.0.0

package/build/bin.js

@@ -137,8 +137,9 @@ Example:
   docouture doctor [--dir <path>] [--json]
 
 Check that the environment and site configuration are healthy: Node
-version, the four names that must agree (component name, start page,
-content path, package name), git history, that antora is installed,
+version, that the declared package manager (package.json's packageManager
+field) is installed, the four names that must agree (component name, start
+page, content path, package name), git history, that antora is installed,
 and (advisory only) whether AGENTS.md and the scaffolded skills are
 still present, whether the docs/release label exists, and whether the
 declared branching model (docs/package.json's docouture.branching)

package/build/commands/branch-model.js

@@ -161,6 +161,11 @@ export async function runBranchModel(argv) {
         // there is nothing meaningful to compute either from.
         componentName: 'unused-by-branch-model',
         cliVersion,
+        // .tool-versions (the only template file these two placeholders appear
+        // in) is never re-copied by branch-model — same reasoning as
+        // componentName above.
+        nodeVersion: 'unused-by-branch-model',
+        pnpmToolVersionsLine: 'unused-by-branch-model',
         pmName: pm.pm,
         pmCacheName: pm.cacheName,
         pmLockfile: pm.lockfile,

package/build/commands/doctor.js

@@ -11,7 +11,7 @@ import { getContext } from '../lib/cli-context.js';
 import { theme } from '../lib/theme.js';
 import { readSourceUrl, readStartPageComponent, readStartPath } from '../lib/playbook-yml.js';
 import { detectBranches, inferBranching } from '../lib/branch-detect.js';
-import { checkAgentFilesPresent, checkAntoraAvailable, checkBranchingAgrees, checkGitHasCommit, checkNamesAgree, checkNodeVersion, checkReleaseLabelExists, } from '../lib/doctor-checks.js';
+import { checkAgentFilesPresent, checkAntoraAvailable, checkBranchingAgrees, checkGitHasCommit, checkNamesAgree, checkNodeVersion, checkPackageManagerAvailable, checkReleaseLabelExists, } from '../lib/doctor-checks.js';
 async function readJson(file) {
     try {
         return JSON.parse(await readFile(file, 'utf8'));
@@ -82,6 +82,10 @@ export async function runDoctor(argv) {
     status |= record(report, 'toolchain', nodeResult, 'fail');
     if (!json)
         printResult(nodeResult);
+    const pmResult = await checkPackageManagerAvailable(pkg?.packageManager ?? null);
+    status |= record(report, 'toolchain', pmResult, 'fail');
+    if (!json)
+        printResult(pmResult);
     log('names');
     const playbookFile = join(siteRoot, 'antora-playbook.yml');
     const antoraYmlFile = join(siteRoot, 'src', 'antora.yml');

package/build/commands/new.js

@@ -475,11 +475,20 @@ export async function runNew(argv, io = defaultIO()) {
     // it always matches whatever CLI actually generated it, snapshot/local
     // releases included.
     const { version: cliVersion } = await readCliInfo(import.meta.url, 2);
+    // Whatever Node is actually running this scaffold — same reasoning as
+    // cliVersion above (readCliInfo's own comment), just for the runtime
+    // rather than the CLI package. Written as .tool-versions' `nodejs` line.
+    const nodeVersion = process.version.replace(/^v/, '');
     // The user's own choice (--pm, wizard answer, or the auto-guess computed
     // above if neither was given) — never re-detected against `target`, so
     // whatever was actually chosen/confirmed is what the workflows and
     // printed next-steps agree on.
     const pm = packageManagerPlan(pmChoice);
+    // .tool-versions' second line — present only for a pnpm-scaffolded site
+    // (see TemplateValues.pnpmToolVersionsLine's own comment); pm.packageManagerField
+    // is already the corepack-convention 'pnpm@<version>' string, so this
+    // just reshapes it into asdf/mise's own 'pnpm <version>' line syntax.
+    const pnpmToolVersionsLine = pm.pm === 'pnpm' ? `pnpm ${pm.packageManagerField.split('@')[1]}\n` : '';
     const values = {
         name,
         title,
@@ -494,6 +503,8 @@ export async function runNew(argv, io = defaultIO()) {
         // component-name check when this is the literal 'ROOT'.
         componentName: urlSegment ? name : 'ROOT',
         cliVersion,
+        nodeVersion,
+        pnpmToolVersionsLine,
         pmName: pm.pm,
         pmCacheName: pm.cacheName,
         pmLockfile: pm.lockfile,

package/build/commands/upgrade.js

@@ -119,6 +119,12 @@ export async function runUpgrade(argv) {
         // substituted anywhere upgrade touches.
         componentName: 'unused-by-upgrade',
         cliVersion,
+        // .tool-versions (the only template file these two placeholders appear
+        // in) is never re-copied by upgrade — same reasoning as componentName
+        // above: structurally required by TemplateValues, but nothing
+        // meaningful to compute either from here.
+        nodeVersion: 'unused-by-upgrade',
+        pnpmToolVersionsLine: 'unused-by-upgrade',
         pmName: pm.pm,
         pmCacheName: pm.cacheName,
         pmLockfile: pm.lockfile,

package/build/lib/copy-template.js

@@ -9,6 +9,12 @@ const PLACEHOLDERS = {
     __DOCOUTURE_TITLE__: 'title',
     __DOCOUTURE_COMPONENT_NAME__: 'componentName',
     __DOCOUTURE_CLI_VERSION__: 'cliVersion',
+    __DOCOUTURE_NODE_VERSION__: 'nodeVersion',
+    // Whole-line token, same reasoning as pmSetupStepYaml's own comment below
+    // — the value (or '' for npm) already carries its own trailing newline,
+    // so substituting the token-plus-newline is what lets the line vanish
+    // entirely rather than leaving a blank line in the npm case.
+    '__DOCOUTURE_PNPM_TOOL_VERSIONS_LINE__\n': 'pnpmToolVersionsLine',
     __DOCOUTURE_PM__: 'pmName',
     __DOCOUTURE_PM_CACHE__: 'pmCacheName',
     __DOCOUTURE_LOCKFILE__: 'pmLockfile',

package/build/lib/doctor-checks.js

@@ -37,6 +37,51 @@ export function checkNodeVersion(engineRange, actualVersion) {
         detail: `install Node ${wantMajor} or newer — this is what 'npm run build'/'docouture dev' will actually run under`,
     };
 }
+/**
+ * Confirms the package manager a site actually declares (`package.json`'s
+ * own `packageManager` field, corepack convention, e.g. `pnpm@10.24.0`) is
+ * installed and reachable — `checkNodeVersion` above gets a shortcut
+ * (`docouture` *is* a Node process, so Node's presence is proof positive,
+ * only its version is an open question), but `docouture` doesn't run *as*
+ * npm or pnpm, so their presence has to be checked by actually spawning the
+ * binary. Presence only — no version-match against the declared field is
+ * required, the field just says which binary to look for.
+ *
+ * The `<name>` before `@` is read as-is rather than restricted to a
+ * hardcoded `npm`/`pnpm` allow-list — this is what `docouture new` ever
+ * writes there in practice, but nothing here depends on that being true.
+ */
+export function checkPackageManagerAvailable(packageManagerField) {
+    const label = 'package manager';
+    if (!packageManagerField) {
+        return Promise.resolve({
+            ok: true,
+            label,
+            message: 'no packageManager field declared in package.json — skipping',
+        });
+    }
+    const match = /^([^@\s]+)@/.exec(packageManagerField);
+    const pm = match?.[1];
+    if (!pm) {
+        return Promise.resolve({
+            ok: true,
+            label,
+            message: `could not parse packageManager '${packageManagerField}' — skipping`,
+        });
+    }
+    return new Promise((resolvePromise) => {
+        execFile(pm, ['--version'], { timeout: 10_000 }, (err, stdout) => {
+            resolvePromise(err
+                ? {
+                    ok: false,
+                    label,
+                    message: `'${pm}' is not available on PATH`,
+                    detail: `package.json declares packageManager: '${packageManagerField}' — install ${pm} (or run via corepack)`,
+                }
+                : { ok: true, label, message: `${pm} ${stdout.trim()} is available` });
+        });
+    });
+}
 /**
  * The four names the docs-site-package skill documents as having to agree,
  * or a site builds to zero pages, or dies on "start page not found" — see

package/build/templates/starter/.tool-versions

@@ -0,0 +1,2 @@
+nodejs __DOCOUTURE_NODE_VERSION__
+__DOCOUTURE_PNPM_TOOL_VERSIONS_LINE__

package/build/templates/starter/gitignore

@@ -1,3 +1,4 @@
 node_modules/
 build/
 .DS_Store
+.npmrc

package/build/templates/workflows/docouture-release-preview.yml

@@ -24,7 +24,11 @@ on:
     branches: ['__DOCOUTURE_RELEASE_BRANCH__*']
 
 concurrency:
-  group: release-preview
+  # Scoped per-PR, not just per-workflow: a bare 'release-preview' group name
+  # collides with this monorepo's own code-release_preview.yml, so a label
+  # change firing both workflows at once could have one cancel the other
+  # mid-run even though they preview unrelated releases.
+  group: docouture-release-preview-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 jobs:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inditextech/docouture-cli",
-  "version": "0.1.0-SNAPSHOT.88.1",
+  "version": "1.0.0",
   "description": "Command-line tool for docouture documentation sites: scaffold a new site and set its Antora version outside the monorepo",
   "repository": {
     "type": "git",