feat(cli): add support for other package managers (#749)

Author: kguzek

.github/workflows/integration-tests.yml

@@ -18,6 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [20, 22, 24]
+        package-manager: [npm, pnpm]
     steps:
       - name: Check out
         uses: actions/checkout@v6
@@ -26,15 +27,27 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
-          cache: npm
+          cache: "npm"
+
+      - name: Set up pnpm
+        if: matrix.package-manager == 'pnpm'
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - name: Install dependencies
         run: npm ci
 
-      - name: Install create-next-app globally
+      - name: Install create-next-app globally (npm)
+        if: matrix.package-manager == 'npm'
         run: npx -y create-next-app@latest --version
 
+      - name: Install create-next-app globally (pnpm)
+        if: matrix.package-manager == 'pnpm'
+        run: pnpm dlx create-next-app@latest --version
+
       - name: Run Vitest integration tests
         run: npm test
         env:
           NODE_VERSION: ${{ matrix.node-version }}
+          PACKAGE_MANAGER: ${{ matrix.package-manager }}

LICENSE2 LICENSE2.mdLICENSE2 renamed to LICENSE2.md

@@ -50,9 +50,9 @@ Aby użyć configu dodaj to pole w `package.json`:
 }
 ```
 
-## Eslint
+## ESLint
 
-Wymagany jest `eslint` w wersji `9` lub nowszej oraz package.json powinien mieć pole
+Wymagany jest `eslint` w wersji `9` oraz package.json powinien mieć pole
 
 ```json
 {
@@ -103,3 +103,15 @@ Testy obejmują:
 - ✅ Weryfikację formatowania kodu
 - ✅ Build aplikacji Next.js
 - ✅ Testowanie warunków błędów
+
+## Prawa autorskie
+
+Copyright © 2024-2026 KN Solvro
+
+Licencja: [MPL v2.0](./LICENSE.md)
+
+Pierwotny twórca: [Bartosz Gotowski](https://github.com/Rei-x)
+
+Utrzymuje: [Konrad Guzek](https://github.com/kguzek)
+
+Stworzone na podstawie projektu [antfu/eslint-config](https://github.com/antfu/eslint-config), którego licencja dostępna jest w pliku [LICENSE2.md](./LICENSE2.md)

README.md

@@ -66,6 +66,7 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
     "@eslint/config-helpers": "^0.4.2",
     "@eslint/js": "^9.37.0",
+    "@solvro/utils": "^1.5.0",
     "@tanstack/eslint-plugin-query": "^5.91.4",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^8.46.0",

package-lock.json

@@ -1,10 +1,10 @@
 import * as p from "@clack/prompts";
 import { Command } from "commander";
-import { getUserAgent } from "package-manager-detector/detect";
 import c from "picocolors";
 
 import packageJsonData from "../../package.json";
 import { BUG_TRACKER_URL } from "../constants";
+import { checkIsNonInteractive } from "../utils/check-is-non-interactive";
 import { confirmProjectType } from "../utils/confirm-project-type";
 import { isGitClean } from "../utils/is-git-clean";
 import { PackageJson } from "../utils/package-json";
@@ -41,39 +41,17 @@ program
 program.parse();
 const options: CliOptions = program.opts();
 
-// Check if running in non-interactive mode (any CLI flags provided)
-const isNonInteractive = process.argv.length > 2;
+const isNonInteractive = checkIsNonInteractive();
 
 async function main() {
   if (!isNonInteractive) {
     p.intro(c.bold(c.bgBlue("  @solvro/config  ")));
   }
 
-  const userAgent = getUserAgent();
-
-  if (userAgent !== "npm") {
-    const packageManager = userAgent ?? "unknown";
-    const warningMessage = `\
-${c.red(c.bold(`⚠️  OSTRZEŻENIE: ${packageManager} nie jest obsługiwany ⚠️`))}
-
-Próbujesz uruchomić ten skrypt ${c.yellow(packageManager)}'em, ale @solvro/config obecnie działa tylko z ${c.green("npm")}'em.
-
-${c.white(`Support dla innych menedżerów pakietów jest planowany w nadchodzących wersjach - ${c.yellow("zagwiazdkuj i spróbuj ponownie wkrótce")}!`)}
-
-${c.white(`W międzyczasie użyj ${c.green("npm")}'a:`)}
-${c.cyan("npx @solvro/config")}`;
-
-    if (isNonInteractive) {
-      console.error(warningMessage);
-    } else {
-      p.cancel(warningMessage);
-    }
-    process.exit(1);
-  }
-
   const packageJson = new PackageJson();
-  // Project directory check
-  await packageJson.load();
+  packageJson.verifyPackageManager();
+  await packageJson.load(); // Project directory check
+  await packageJson.validateUserAgentConsistency();
 
   // Git clean check
   if (options.force !== true && !isGitClean()) {
@@ -140,7 +118,7 @@ ${c.cyan("npx @solvro/config")}`;
 
     if (projectType === "node") {
       p.cancel(
-        `Nie znaleziono ani ${c.magenta("Adonis")}'a, ${c.cyan("React")}'a, ani ${c.white("NestJS")}'a. Musisz ręcznie konfigurować projekt.`,
+        `Nie znaleziono ani ${c.magenta("Adonis")}-a, ${c.cyan("React")}-a, ani ${c.white("NestJS")}-a. Musisz ręcznie konfigurować projekt.`,
       );
       process.exit(1);
     }
@@ -151,7 +129,7 @@ ${c.cyan("npx @solvro/config")}`;
     } else {
       if (!(await packageJson.isESM())) {
         const isConfirmed = await polishConfirm({
-          message: `Twój projekt nie używa ESM (brak type: "module" w package.json). Czy chcesz to dodać? (Wymagane by kontynuować)`,
+          message: `Twój projekt nie używa ESM (brak "type": "module" w package.json). Czy chcesz to dodać? (Wymagane by kontynuować)`,
         });
 
         if (p.isCancel(isConfirmed) || !isConfirmed) {
@@ -209,7 +187,7 @@ ${c.cyan("npx @solvro/config")}`;
         {
           value: "gh-action",
           label: c.bold("GitHub Actions"),
-          hint: "automatyczne testy na Githubie",
+          hint: "automatyczne testy na GitHubie",
         },
         {
           value: "commitlint",
@@ -253,6 +231,9 @@ ${c.cyan("npx @solvro/config")}`;
   }
 
   await packageJson.clearInstall();
+  if (toolsToInstall.includes("prettier")) {
+    await packageJson.localExecute("prettier", "--write", "package.json");
+  }
 
   const printSuccess = isNonInteractive ? console.info : p.outro;
   printSuccess("✅ Konfiguracja zakończona pomyślnie!");

package.json

@@ -17,7 +17,7 @@ export const installCommitLint = async () => {
 
   await writeFile(
     path.join(root, ".husky/commit-msg"),
-    'npx commitlint --edit "$1"\n',
+    `${packageJson.manager.localExecute} commitlint --edit "$1"\n`,
   );
 
   await writeFile(path.join(root, ".commitlintrc.js"), commitlint());

src/cli/index.ts

@@ -22,6 +22,11 @@ export const installGithubActions = async () => {
   await fs.mkdir(ghWorkflowsDirectory, { recursive: true });
 
   const type = await packageJson.getProjectType();
+  const manager = packageJson.manager;
+
+  // Get pnpm version dynamically when using pnpm
+  const pnpmVersion =
+    manager.name === "pnpm" ? await packageJson.getPnpmVersion() : undefined;
 
   const withCommitlint = await packageJson.hasPackage("@commitlint/cli");
 
@@ -38,12 +43,14 @@ export const installGithubActions = async () => {
       adonisCi({
         nodeVersion: "22",
         withCommitlint,
+        manager,
+        pnpmVersion,
       }),
     );
 
     await fs.writeFile(
       path.join(ghWorkflowsDirectory, "db.yml"),
-      adonisMigrationsCi(),
+      adonisMigrationsCi({ nodeVersion: "22", manager, pnpmVersion }),
     );
   }
 
@@ -56,6 +63,8 @@ export const installGithubActions = async () => {
         nodeVersion: "22",
         withCommitlint,
         usingNextJs,
+        manager,
+        pnpmVersion,
       }),
     );
 
@@ -70,6 +79,8 @@ export const installGithubActions = async () => {
       nestjsCi({
         nodeVersion: "22",
         withCommitlint,
+        manager,
+        pnpmVersion,
       }),
     );
   }

src/cli/install-commitlint.ts

@@ -1,14 +1,13 @@
 import assert from "node:assert";
 
-import { $$ } from "../utils/$$";
 import { PackageJson } from "../utils/package-json";
 
 const packageJson = new PackageJson();
 
 export const installHusky = async () => {
   if (!(await packageJson.hasPackage("husky"))) {
     await packageJson.install("husky", { dev: true });
-    await $$`npx husky init`;
+    await packageJson.localExecute("husky", "init");
   }
 
   await packageJson.load();

src/cli/install-ga.ts

@@ -1,6 +1,8 @@
 import assert from "node:assert";
 import { writeFile } from "node:fs/promises";
+import path from "node:path";
 
+import { projectRoot } from "../utils/git-root";
 import { PackageJson } from "../utils/package-json";
 import { installHusky } from "./install-husky";
 
@@ -15,7 +17,10 @@ export const installLintStaged = async () => {
 
   await packageJson.install("lint-staged", { dev: true });
 
-  await writeFile(".husky/pre-commit", "npx lint-staged\n");
+  await writeFile(
+    path.join(projectRoot(), ".husky/pre-commit"),
+    `${packageJson.manager.localExecute} lint-staged\n`,
+  );
 
   packageJson.json["lint-staged"] = {
     "*": "prettier -w --ignore-unknown",