create-acmekit-app 2.13.46 → 2.13.48

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 2.13.48
+
+### Patch Changes
+
+- changes
+
+- Updated dependencies []:
+  - @acmekit/telemetry@2.13.48
+  - @acmekit/deps@2.13.48
+
+## 2.13.47
+
+### Patch Changes
+
+- changes
+
+- Updated dependencies []:
+  - @acmekit/telemetry@2.13.47
+  - @acmekit/deps@2.13.47
+
 ## 2.13.46
 
 ### Patch Changes

package/dist/utils/clone-repo.js

@@ -6,7 +6,7 @@ import logMessage from "./log-message.js";
 import { execFileSync } from "child_process";
 const REPO_URL = "https://github.com/acmekit/acmekit";
 const BRANCH = "main";
-const DEFAULT_TEMPLATE = "templates/default";
+const DEFAULT_TEMPLATE = "templates/app";
 const PLUGIN_TEMPLATE = "templates/plugin";
 export default async function cloneRepo({ directoryName = "", repoUrl, abortController, verbose = false, isPlugin = false, }) {
     if (repoUrl) {

package/dist/utils/package-manager.js

@@ -1,7 +1,7 @@
 import path from "path";
 import execute from "./execute.js";
 import logMessage from "./log-message.js";
-import { existsSync, rmSync } from "fs";
+import { appendFileSync, existsSync, readFileSync, rmSync } from "fs";
 export default class PackageManager {
     packageManager;
     packageManagerVersion;
@@ -149,6 +149,26 @@ export default class PackageManager {
             }
         }
     }
+    /**
+     * If the project directory is inside an existing pnpm workspace, ensure
+     * `confirmModulesPurge: false` is set in the workspace root's
+     * `pnpm-workspace.yaml` so that `pnpm install` doesn't block on an
+     * interactive purge confirmation prompt.
+     */
+    ensureWorkspaceConfig(cwd) {
+        let dir = path.resolve(cwd);
+        while (dir !== path.dirname(dir)) {
+            dir = path.dirname(dir);
+            const wsFile = path.join(dir, "pnpm-workspace.yaml");
+            if (existsSync(wsFile)) {
+                const content = readFileSync(wsFile, "utf-8");
+                if (!content.includes("confirmModulesPurge")) {
+                    appendFileSync(wsFile, "\nconfirmModulesPurge: false\n");
+                }
+                return;
+            }
+        }
+    }
     async installDependencies(execOptions) {
         if (!this.packageManager) {
             await this.setPackageManager(execOptions);
@@ -157,6 +177,12 @@ export default class PackageManager {
         if (execOptions.cwd && typeof execOptions.cwd === "string") {
             await this.removeLockFiles(execOptions.cwd);
         }
+        // Ensure pnpm workspace config allows non-interactive installs
+        if (this.packageManager === "pnpm" &&
+            execOptions.cwd &&
+            typeof execOptions.cwd === "string") {
+            this.ensureWorkspaceConfig(execOptions.cwd);
+        }
         const commands = {
             yarn: "yarn",
             pnpm: "pnpm install",
@@ -213,7 +239,7 @@ export default class PackageManager {
         }
         const formats = {
             yarn: `yarn acmekit ${command}`,
-            pnpm: `pnpm acmekit ${command}`,
+            pnpm: `pnpm exec acmekit ${command}`,
             npm: `npx acmekit ${command}`,
         };
         const commandStr = formats[this.packageManager || "npm"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-acmekit-app",
-  "version": "2.13.46",
+  "version": "2.13.48",
   "description": "Create a AcmeKit project using a single command.",
   "type": "module",
   "exports": "./dist/index.js",
@@ -14,8 +14,8 @@
     "test": "../../../node_modules/.bin/jest --passWithNoTests src"
   },
   "dependencies": {
-    "@acmekit/deps": "2.13.46",
-    "@acmekit/telemetry": "2.13.46",
+    "@acmekit/deps": "2.13.48",
+    "@acmekit/telemetry": "2.13.48",
     "boxen": "^5.0.1",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",

package/src/utils/__tests__/package-manager.test.ts

@@ -341,6 +341,7 @@ describe("PackageManager", () => {
 
     it("should execute pnpm install when using pnpm", async () => {
       mockExecute.mockResolvedValue({ stdout: "", stderr: "" })
+      mockExistsSync.mockReturnValue(false)
 
       const pm = new PackageManager(processManager)
       pm["packageManager"] = "pnpm"
@@ -537,7 +538,7 @@ describe("PackageManager", () => {
       await pm.runAcmeKitCommand("seed", { cwd: "/test/path" })
 
       expect(mockExecute).toHaveBeenCalledWith(
-        ["pnpm acmekit seed", { cwd: "/test/path" }],
+        ["pnpm exec acmekit seed", { cwd: "/test/path" }],
         { verbose: false }
       )
     })

package/src/utils/clone-repo.ts

@@ -16,7 +16,7 @@ type CloneRepoOptions = {
 
 const REPO_URL = "https://github.com/acmekit/acmekit"
 const BRANCH = "main"
-const DEFAULT_TEMPLATE = "templates/default"
+const DEFAULT_TEMPLATE = "templates/app"
 const PLUGIN_TEMPLATE = "templates/plugin"
 
 export default async function cloneRepo({

package/src/utils/package-manager.ts

@@ -2,7 +2,7 @@ import path from "path"
 import execute, { VerboseOptions } from "./execute.js"
 import logMessage from "./log-message.js"
 import ProcessManager from "./process-manager.js"
-import { existsSync, rmSync } from "fs"
+import { appendFileSync, existsSync, readFileSync, rmSync } from "fs"
 
 export type PackageManagerType = "npm" | "yarn" | "pnpm"
 
@@ -193,6 +193,27 @@ export default class PackageManager {
     }
   }
 
+  /**
+   * If the project directory is inside an existing pnpm workspace, ensure
+   * `confirmModulesPurge: false` is set in the workspace root's
+   * `pnpm-workspace.yaml` so that `pnpm install` doesn't block on an
+   * interactive purge confirmation prompt.
+   */
+  private ensureWorkspaceConfig(cwd: string): void {
+    let dir = path.resolve(cwd)
+    while (dir !== path.dirname(dir)) {
+      dir = path.dirname(dir)
+      const wsFile = path.join(dir, "pnpm-workspace.yaml")
+      if (existsSync(wsFile)) {
+        const content = readFileSync(wsFile, "utf-8")
+        if (!content.includes("confirmModulesPurge")) {
+          appendFileSync(wsFile, "\nconfirmModulesPurge: false\n")
+        }
+        return
+      }
+    }
+  }
+
   async installDependencies(execOptions: Record<string, unknown>) {
     if (!this.packageManager) {
       await this.setPackageManager(execOptions)
@@ -203,6 +224,15 @@ export default class PackageManager {
       await this.removeLockFiles(execOptions.cwd)
     }
 
+    // Ensure pnpm workspace config allows non-interactive installs
+    if (
+      this.packageManager === "pnpm" &&
+      execOptions.cwd &&
+      typeof execOptions.cwd === "string"
+    ) {
+      this.ensureWorkspaceConfig(execOptions.cwd)
+    }
+
     const commands: Record<PackageManagerType, string> = {
       yarn: "yarn",
       pnpm: "pnpm install",
@@ -274,7 +304,7 @@ export default class PackageManager {
 
     const formats: Record<PackageManagerType, string> = {
       yarn: `yarn acmekit ${command}`,
-      pnpm: `pnpm acmekit ${command}`,
+      pnpm: `pnpm exec acmekit ${command}`,
       npm: `npx acmekit ${command}`,
     }