@ykdz/template 0.0.24 → 0.0.26

package/node_modules/@ykdz/template-core/dist/project-github.js

@@ -1,4 +1,4 @@
-import { deploymentCheckEnvironmentNeeds, deploymentCheckTaskName, renderPlaywrightBrowserInstallCommand, } from "./module-graph.js";
+import { renderPlaywrightBrowserInstallCommand, } from "./module-graph.js";
 const defaultCiCapability = {
     workflowName: "Check",
     jobName: "check",
@@ -16,10 +16,10 @@ export function projectCheckWorkflow(options) {
         ...options.environmentPreparation,
     };
     const requiresRustToolchain = environmentPreparation.rustToolchain ||
-        options.checkPlan.environmentNeeds.some((need) => need.kind === "rust-toolchain");
+        options.environment.needs.some((need) => need.kind === "rust-toolchain");
     const taskLayer = options.taskLayer ?? pnpmTaskLayer;
-    const deploymentChecks = options.checkPlan.deploymentChecks ?? [];
-    const needsDocker = deploymentChecks.some((check) => deploymentCheckEnvironmentNeeds(check).some((need) => need.kind === "docker-engine"));
+    const hasDeploymentTask = options.hasDeploymentTask === true;
+    const needsDocker = (options.deploymentEnvironmentNeeds ?? []).some((need) => need.kind === "docker-engine");
     const lines = [
         `name: ${capability.workflowName}`,
         "",
@@ -32,42 +32,38 @@ export function projectCheckWorkflow(options) {
         "jobs:",
         `  ${capability.jobName}:`,
         `    runs-on: ${capability.runner}`,
-        ...(deploymentChecks.length === 0
-            ? []
-            : [
-                "    strategy:",
-                "      matrix:",
-                "        check: [root, deployment]",
-            ]),
+        ...(hasDeploymentTask
+            ? ["    strategy:", "      matrix:", "        check: [root, deployment]"]
+            : []),
         "    steps:",
         "      - uses: actions/checkout@v7",
     ];
     if (environmentPreparation.nodeFromPackageMetadata) {
-        lines.push("      - uses: actions/setup-node@v6", "        with:", "          node-version-file: package.json", "      - run: corepack enable");
+        lines.push("      - uses: actions/setup-node@v7", "        with:", "          node-version-file: package.json", "      - run: corepack enable");
     }
-    if (needsDocker) {
+    if (hasDeploymentTask && needsDocker) {
         lines.push("      - uses: docker/setup-buildx-action@v3", "        if: matrix.check == 'deployment'");
     }
     if (requiresRustToolchain)
         lines.push(...rustCiPreparationLines());
     lines.push(`      - run: ${taskLayer.installCommand}`);
     const checkEnvironmentLines = [];
-    for (const need of options.checkPlan.environmentNeeds) {
-        if (need.kind === "rust-toolchain")
+    for (const need of options.environment.needs) {
+        if (need.kind === "rust-toolchain") {
             continue;
+        }
         checkEnvironmentLines.push(`      - run: ${renderCiEnvironmentNeedCommand(need)}`);
-        if (deploymentChecks.length > 0 && need.kind === "shellcheck-command") {
+        if (hasDeploymentTask && need.kind === "shellcheck-command") {
             checkEnvironmentLines.push("        if: matrix.check == 'root'");
         }
     }
     lines.push(...checkEnvironmentLines);
     lines.push(`      - run: ${taskLayer.checkCommand}`);
-    if (deploymentChecks.length > 0) {
+    if (hasDeploymentTask) {
         lines.push("        if: matrix.check == 'root'");
     }
-    const deploymentCheck = deploymentChecks[0];
-    if (deploymentCheck !== undefined) {
-        lines.push(`      - run: pnpm run ${deploymentCheckTaskName(deploymentCheck)}`, "        if: matrix.check == 'deployment'");
+    if (hasDeploymentTask) {
+        lines.push("      - run: pnpm run check:deployment", "        if: matrix.check == 'deployment'");
     }
     lines.push("");
     return lines.join("\n");
@@ -83,15 +79,14 @@ function rustCiPreparationLines() {
 /** Limited substitutions for the Foundation-owned workflow Template Source. */
 export function projectCheckWorkflowTemplateReplacements(options) {
     const requiresRustToolchain = options.environmentPreparation?.rustToolchain === true ||
-        options.checkPlan.environmentNeeds.some((need) => need.kind === "rust-toolchain");
-    const deploymentChecks = options.checkPlan.deploymentChecks ?? [];
-    const needsDocker = deploymentChecks.some((check) => deploymentCheckEnvironmentNeeds(check).some((need) => need.kind === "docker-engine"));
-    const deploymentCheck = deploymentChecks[0];
-    const environmentSteps = options.checkPlan.environmentNeeds
+        options.environment.needs.some((need) => need.kind === "rust-toolchain");
+    const hasDeploymentTask = options.hasDeploymentTask === true;
+    const needsDocker = (options.deploymentEnvironmentNeeds ?? []).some((need) => need.kind === "docker-engine");
+    const environmentSteps = options.environment.needs
         .filter((need) => need.kind !== "rust-toolchain")
         .map((need) => [
         `      - run: ${renderCiEnvironmentNeedCommand(need)}`,
-        ...(deploymentChecks.length > 0 && need.kind === "shellcheck-command"
+        ...(hasDeploymentTask && need.kind === "shellcheck-command"
             ? ["        if: matrix.check == 'root'"]
             : []),
     ].join("\n"));
@@ -100,18 +95,18 @@ export function projectCheckWorkflowTemplateReplacements(options) {
             ? `\n${rustCiPreparationLines().join("\n")}`
             : "",
         CHECK_ENVIRONMENT_PREPARATION: environmentSteps.length === 0 ? "" : `\n${environmentSteps.join("\n")}`,
-        DEPLOYMENT_MATRIX: deploymentChecks.length === 0
-            ? ""
-            : "\n    strategy:\n      matrix:\n        check: [root, deployment]",
-        DEPLOYMENT_DOCKER_PREPARATION: needsDocker
+        DEPLOYMENT_MATRIX: hasDeploymentTask
+            ? "\n    strategy:\n      matrix:\n        check: [root, deployment]"
+            : "",
+        DEPLOYMENT_DOCKER_PREPARATION: hasDeploymentTask && needsDocker
             ? "\n      - uses: docker/setup-buildx-action@v3\n        if: matrix.check == 'deployment'"
             : "",
-        ROOT_CHECK_CONDITION: deploymentChecks.length === 0
-            ? ""
-            : "\n        if: matrix.check == 'root'",
-        DEPLOYMENT_CHECK: deploymentCheck === undefined
-            ? ""
-            : `\n      - run: pnpm run ${deploymentCheckTaskName(deploymentCheck)}\n        if: matrix.check == 'deployment'`,
+        ROOT_CHECK_CONDITION: hasDeploymentTask
+            ? "\n        if: matrix.check == 'root'"
+            : "",
+        DEPLOYMENT_CHECK: hasDeploymentTask
+            ? "\n      - run: pnpm run check:deployment\n        if: matrix.check == 'deployment'"
+            : "",
     };
 }
 export function projectDependabotConfig(policy) {

package/node_modules/@ykdz/template-core/dist/project-linking-v2.d.ts

@@ -4,7 +4,7 @@ export type ExplicitProjectLinkPlan = {
     readonly manifestDependenciesByPackagePath: ReadonlyMap<string, Readonly<Record<string, "workspace:*">>>;
     /**
      * Build ordering follows the same explicit package relationships as manifest
-     * dependencies.  Turbo resolves ^build:run through the derived workspace
+     * dependencies. Turbo resolves ^build through the derived workspace
      * dependency rather than through Preset or framework vocabulary.
      */
     readonly hasBuildOrdering: boolean;

package/node_modules/@ykdz/template-core/dist/renderer.js

@@ -461,19 +461,27 @@ export async function renderProjectAtomically(options) {
     const parent = path.dirname(targetRoot);
     const stagingRoot = await mkdtemp(path.join(parent, `.${path.basename(targetRoot)}.template-update-`));
     const backupRoot = await mkdtemp(path.join(parent, `.${path.basename(targetRoot)}.template-backup-`));
-    const changedEntries = changedRootEntries(options.operations);
+    const changedPaths = changedOutputPaths(options.operations);
     let committed = false;
     try {
-        await cp(targetRoot, stagingRoot, { recursive: true });
+        await cp(targetRoot, stagingRoot, {
+            recursive: true,
+            filter: generatedDependencyTreeCopyFilter,
+        });
         await renderProject({ ...options, targetRoot: stagingRoot });
-        // Commit only the entries changed by the staged plan.  In particular, do
+        // Commit only the files changed by the staged plan.  In particular, do
         // not rename the target directory: callers commonly run `template add`
         // from that directory, and renaming it leaves their shell on a deleted
-        // inode.  Each entry has a rollback copy before it is made visible.
-        for (const entry of changedEntries) {
-            const current = path.join(targetRoot, entry);
+        // inode.  Each path has a rollback copy before it is made visible.
+        for (const changedPath of changedPaths) {
+            const current = path.join(targetRoot, changedPath);
             try {
-                await cp(current, path.join(backupRoot, entry), { recursive: true });
+                const backup = path.join(backupRoot, changedPath);
+                await mkdir(path.dirname(backup), { recursive: true });
+                await cp(current, backup, {
+                    recursive: true,
+                    filter: generatedDependencyTreeCopyFilter,
+                });
             }
             catch (error) {
                 if (!isNodeError(error) || error.code !== "ENOENT")
@@ -481,16 +489,19 @@ export async function renderProjectAtomically(options) {
             }
         }
         try {
-            for (const entry of changedEntries) {
-                await cp(path.join(stagingRoot, entry), path.join(targetRoot, entry), {
+            for (const changedPath of changedPaths) {
+                const target = path.join(targetRoot, changedPath);
+                await mkdir(path.dirname(target), { recursive: true });
+                await cp(path.join(stagingRoot, changedPath), target, {
                     recursive: true,
                     force: true,
+                    filter: generatedDependencyTreeCopyFilter,
                 });
             }
             committed = true;
         }
         catch (error) {
-            await rollbackStagedEntries({ targetRoot, backupRoot, changedEntries });
+            await rollbackStagedPaths({ targetRoot, backupRoot, changedPaths });
             throw error;
         }
     }
@@ -502,25 +513,31 @@ export async function renderProjectAtomically(options) {
             await rm(stagingRoot, { recursive: true, force: true });
     }
 }
-function changedRootEntries(operations) {
-    const entries = new Set();
+function changedOutputPaths(operations) {
+    const changedPaths = new Set();
     for (const operation of operations) {
         const outputPath = operation.kind === "setExecutable" || operation.kind === "replaceAnchors"
             ? operation.path
             : operation.to;
-        const entry = outputPath.split(/[\\/]/)[0];
-        if (entry !== undefined && entry.length > 0)
-            entries.add(entry);
+        if (outputPath.length > 0)
+            changedPaths.add(path.normalize(outputPath));
     }
-    return [...entries];
+    return [...changedPaths];
 }
-async function rollbackStagedEntries(options) {
-    for (const entry of options.changedEntries) {
-        const target = path.join(options.targetRoot, entry);
-        const backup = path.join(options.backupRoot, entry);
+function generatedDependencyTreeCopyFilter(source) {
+    return !source.split(/[\\/]/).includes("node_modules");
+}
+async function rollbackStagedPaths(options) {
+    for (const changedPath of options.changedPaths) {
+        const target = path.join(options.targetRoot, changedPath);
+        const backup = path.join(options.backupRoot, changedPath);
         await rm(target, { recursive: true, force: true });
         try {
-            await cp(backup, target, { recursive: true });
+            await mkdir(path.dirname(target), { recursive: true });
+            await cp(backup, target, {
+                recursive: true,
+                filter: generatedDependencyTreeCopyFilter,
+            });
         }
         catch (error) {
             if (!isNodeError(error) || error.code !== "ENOENT")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ykdz/template",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "private": false,
   "description": "Project template generator for YKDZ starter projects.",
   "keywords": [

package/node_modules/@ykdz/template-builtin-presets/templates/foundation/.pnpmfile.cts

@@ -1,14 +0,0 @@
-const typeOnlyPeerOwners = new Set(["valibot"]);
-
-function readPackage(pkg: {
-  name?: string;
-  peerDependencies?: Record<string, string>;
-  peerDependenciesMeta?: Record<string, unknown>;
-}) {
-  if (!pkg.name || !typeOnlyPeerOwners.has(pkg.name)) return pkg;
-  delete pkg.peerDependencies?.typescript;
-  delete pkg.peerDependenciesMeta?.typescript;
-  return pkg;
-}
-
-export default { hooks: { readPackage } };