fg-devkit 1.12.6 → 1.12.8

package/scripts/sync-node-toolchain.mjs

@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+/**
+ * Align Node toolchain files in the current repository with policy.toolchain.node.
+ *
+ * Updates .nvmrc (creates if missing), .node-version (only if present), package.json engines.node
+ * (when policy defines engines), Dockerfile/Dockerfile.local base images, Jenkinsfile agent image,
+ * and GitHub Actions workflow node-version fields.
+ *
+ * Policy path: first CLI argument, or default under fg-devkit/configs/.
+ *
+ * Usage:
+ *   pnpm exec fg-devkit sync-node-toolchain [policy-file] [--dry-run]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import {
+  collectNodeToolchainPolicyViolations,
+  resolveExpectedNodePolicy,
+} from './dependency-policy-toolchain.mjs'
+import { syncNodeToolchainInRepo } from './node-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+
+const cwd = process.cwd()
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const cliArgs = process.argv.slice(2).filter((a) => a !== '--dry-run')
+const dryRun = process.argv.includes('--dry-run')
+const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, ['node', 'sync-node-toolchain.mjs', ...cliArgs])
+
+if (!fs.existsSync(policyPath)) {
+  console.error(`[sync-node-toolchain] Could not find dependency policy: ${policyPath}`)
+  process.exit(1)
+}
+
+const policy = JSON.parse(fs.readFileSync(policyPath, 'utf8'))
+const policyErrors = collectNodeToolchainPolicyViolations(policy)
+if (policyErrors.length > 0) {
+  console.error('[sync-node-toolchain] Invalid node toolchain policy:')
+  for (const err of policyErrors) {
+    console.error(`- ${err}`)
+  }
+  process.exit(1)
+}
+
+if (!resolveExpectedNodePolicy(policy, fgDevkitRoot)) {
+  console.log('[sync-node-toolchain] No toolchain.node policy defined; nothing to sync')
+  process.exit(0)
+}
+
+const changes = syncNodeToolchainInRepo(cwd, policy, { dryRun, fgDevkitRoot })
+
+if (changes.length === 0) {
+  console.log('[sync-node-toolchain] Node toolchain already matches policy')
+  process.exit(0)
+}
+
+const prefix = dryRun ? '[sync-node-toolchain] DRY RUN ' : '[sync-node-toolchain] '
+console.log(`${prefix}Updated Node toolchain:`)
+for (const change of changes) {
+  console.log(`- ${change}`)
+}

package/scripts/sync-pnpm-toolchain.mjs

@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+/**
+ * Align pnpm packageManager and all pnpm@x.y.z pins in the current repository with policy.toolchain.packageManager.
+ *
+ * Usage:
+ *   pnpm exec fg-devkit sync-pnpm-toolchain [policy-file] [--dry-run]
+ */
+
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+import {
+  collectToolchainPolicyViolations,
+  resolveExpectedPackageManager,
+} from './dependency-policy-toolchain.mjs'
+import { syncPnpmToolchainInRepo } from './pnpm-toolchain-sync.mjs'
+import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
+
+const cwd = process.cwd()
+const scriptDir = path.dirname(fileURLToPath(import.meta.url))
+const fgDevkitRoot = path.resolve(scriptDir, '..')
+const cliArgs = process.argv.slice(2).filter((a) => a !== '--dry-run')
+const dryRun = process.argv.includes('--dry-run')
+const policyPath = resolveDependencyPolicyPath(scriptDir, cwd, ['node', 'sync-pnpm-toolchain.mjs', ...cliArgs])
+
+if (!fs.existsSync(policyPath)) {
+  console.error(`[sync-pnpm-toolchain] Could not find dependency policy: ${policyPath}`)
+  process.exit(1)
+}
+
+const policy = JSON.parse(fs.readFileSync(policyPath, 'utf8'))
+const policyErrors = collectToolchainPolicyViolations(policy)
+if (policyErrors.length > 0) {
+  console.error('[sync-pnpm-toolchain] Invalid toolchain policy:')
+  for (const err of policyErrors) {
+    console.error(`- ${err}`)
+  }
+  process.exit(1)
+}
+
+const packageManager = resolveExpectedPackageManager(policy, fgDevkitRoot)
+if (!packageManager) {
+  console.log('[sync-pnpm-toolchain] No toolchain.packageManager policy defined; nothing to sync')
+  process.exit(0)
+}
+
+const changes = syncPnpmToolchainInRepo(cwd, packageManager, { dryRun })
+
+if (changes.length === 0) {
+  console.log('[sync-pnpm-toolchain] pnpm toolchain already matches policy')
+  process.exit(0)
+}
+
+const prefix = dryRun ? '[sync-pnpm-toolchain] DRY RUN ' : '[sync-pnpm-toolchain] '
+console.log(`${prefix}Updated pnpm toolchain:`)
+for (const change of changes) {
+  console.log(`- ${change}`)
+}

package/scripts/sync-scaffold-vue-deps.mjs

@@ -15,9 +15,12 @@ import { fileURLToPath } from 'node:url'
 import { resolveDependencyPolicyPath } from './resolve-dependency-policy-path.mjs'
 import {
   extractPnpmVersion,
+  resolveExpectedNodePolicy,
   resolveExpectedPackageManager,
   syncPolicyToolchainFromFgDevkit,
 } from './dependency-policy-toolchain.mjs'
+import { syncDockerfileNodeImages } from './node-toolchain-sync.mjs'
+import { syncDockerfilePnpmVersion } from './pnpm-toolchain-sync.mjs'
 
 /**
  * @param {{ fgDevkitRoot: string, policyPath: string }} options
@@ -75,12 +78,16 @@ export function syncScaffoldVueDepsFromPolicy(options) {
     const pnpmVersion = extractPnpmVersion(expectedPackageManager)
     if (pnpmVersion && fs.existsSync(dockerfilePath)) {
       const dockerfile = fs.readFileSync(dockerfilePath, 'utf8')
-      const updatedDockerfile = dockerfile.replace(
-        /corepack prepare pnpm@[^\s]+ --activate/,
-        `corepack prepare pnpm@${pnpmVersion} --activate`,
+      const { content: pnpmUpdated, changed: pnpmChanged } = syncDockerfilePnpmVersion(
+        dockerfile,
+        pnpmVersion,
       )
-      if (updatedDockerfile !== dockerfile) {
-        fs.writeFileSync(dockerfilePath, updatedDockerfile)
+      const nodePolicy = resolveExpectedNodePolicy(policy, fgDevkitRoot)
+      const finalDockerfile = nodePolicy
+        ? syncDockerfileNodeImages(pnpmUpdated, nodePolicy.nvmrc, nodePolicy.dockerTag).content
+        : pnpmUpdated
+      if (pnpmChanged || finalDockerfile !== dockerfile) {
+        fs.writeFileSync(dockerfilePath, finalDockerfile)
         console.log('[sync-scaffold-vue-deps] Updated', dockerfilePath)
       }
     }

package/scaffold/vue/Dockerfile.local

@@ -1,16 +0,0 @@
-FROM node:22-bookworm AS build
-WORKDIR /src
-COPY . /src
-RUN corepack enable && corepack prepare pnpm@11.9.0 --activate
-RUN pnpm install
-RUN pnpm build
-
-FROM nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-ENV CONFIG_FILE_PATH=/usr/share/nginx/html/config.json
-COPY --from=build /src/dist /usr/share/nginx/html
-COPY nginx/*.conf /etc/nginx/conf.d/
-COPY start-container.sh /usr/local/bin/start-container
-RUN chmod +x /usr/local/bin/start-container
-ENTRYPOINT ["start-container"]
-CMD ["nginx"]