@itsmrtr/bunkoshelf 1.3.1 → 1.3.2

package/runtime/commands/init.mjs

@@ -5,6 +5,13 @@ import { resolve, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import fs from "fs-extra";
 import { execa } from "execa";
+import {
+  detectPackageManager,
+  getInstallCommand,
+  getPackageManagerVersion,
+  getStartCommand,
+  getUpdateCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const DEFAULT_PORT = 3060;
@@ -36,14 +43,20 @@ export function buildEnv(jwtSecret, provider = "local") {
   return lines.join("\n") + "\n";
 }
 
-function buildPackageJson(name) {
+function buildPackageJson(name, packageManager, packageManagerVersion) {
   return {
     name,
     version: "0.1.0",
     private: true,
+    ...(packageManager === "pnpm" && packageManagerVersion
+      ? {
+          packageManager: `pnpm@${packageManagerVersion}`,
+        }
+      : {}),
     scripts: {
-      start: "bunkoshelf start",
-      update: "bunkoshelf update",
+      bunko: "bunko",
+      start: "bunko shelf",
+      update: "bunko update",
     },
     dependencies: {
       [PACKAGE_NAME]: packageVersion,
@@ -54,6 +67,11 @@ function buildPackageJson(name) {
 export async function init(projectName, options = {}) {
   intro(chalk.bold("▲ Bunko Shelf"));
   const provider = options.cloud ? "cloud" : "local";
+  const packageManager = await detectPackageManager(process.cwd());
+  const packageManagerVersion = getPackageManagerVersion(packageManager);
+  const installCommand = getInstallCommand(packageManager);
+  const startCommand = getStartCommand(packageManager);
+  const updateCommand = getUpdateCommand(packageManager);
 
   const useCurrentDir = projectName === ".";
   let name = useCurrentDir ? undefined : projectName;
@@ -98,14 +116,21 @@ export async function init(projectName, options = {}) {
   progress.start("Creating project...");
   await fs.ensureDir(projectDir);
   await fs.writeFile(join(projectDir, ".env"), buildEnv(generateSecret(), provider));
-  await fs.writeJson(join(projectDir, "package.json"), buildPackageJson(name), {
-    spaces: 2,
-  });
+  await fs.writeJson(
+    join(projectDir, "package.json"),
+    buildPackageJson(name, packageManager, packageManagerVersion),
+    {
+      spaces: 2,
+    }
+  );
   await fs.writeFile(join(projectDir, ".gitignore"), ".env\nnode_modules\n");
   progress.stop("Project created");
 
   progress.start("Installing dependencies...");
-  await execa("npm", ["install"], { cwd: projectDir, stdio: "inherit" });
+  await execa(installCommand.command, installCommand.args, {
+    cwd: projectDir,
+    stdio: "inherit",
+  });
   progress.stop("Dependencies installed");
 
   note(
@@ -118,13 +143,13 @@ export async function init(projectName, options = {}) {
       "",
       "Then start Bunko Shelf:",
       "",
-      `  ${chalk.cyan("npm start")}`,
+      `  ${chalk.cyan(startCommand)}`,
       "",
       `Keep ${chalk.cyan("JWT_SECRET")} configured in production.`,
       "",
       "To update Bunko Shelf later:",
       "",
-      `  ${chalk.cyan("npm run update")}`,
+      `  ${chalk.cyan(updateCommand)}`,
     ].join("\n"),
     "Next steps"
   );

package/runtime/commands/update.mjs

@@ -3,6 +3,10 @@ import chalk from "chalk";
 import { execa } from "execa";
 import fs from "fs-extra";
 import { join } from "node:path";
+import {
+  detectPackageManager,
+  getUpdateDependencyCommand,
+} from "../package-manager.mjs";
 
 const PACKAGE_NAME = "@itsmrtr/bunkoshelf";
 const REPOSITORY_NAME = "martirale/bunkoshelf";
@@ -70,11 +74,13 @@ export async function update(version = "latest") {
 
   const progress = spinner();
   const target = `${PACKAGE_NAME}@${version}`;
+  const packageManager = await detectPackageManager(process.cwd());
+  const updateCommand = getUpdateDependencyCommand(packageManager, target);
 
   progress.start(`Updating ${PACKAGE_NAME} to ${chalk.cyan(version)}...`);
 
   try {
-    await execa("npm", ["install", "--save-exact", target], {
+    await execa(updateCommand.command, updateCommand.args, {
       cwd: process.cwd(),
       stdio: "inherit",
     });
@@ -91,7 +97,12 @@ export async function update(version = "latest") {
     );
 
     try {
-      await execa("npm", ["install", "--save-exact", fallbackTarget], {
+      const fallbackCommand = getUpdateDependencyCommand(
+        packageManager,
+        fallbackTarget
+      );
+
+      await execa(fallbackCommand.command, fallbackCommand.args, {
         cwd: process.cwd(),
         stdio: "inherit",
       });

package/runtime/package-manager.mjs

@@ -0,0 +1,108 @@
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import fs from "fs-extra";
+
+function parsePackageManagerName(value) {
+  if (!value) return null;
+  if (value.startsWith("pnpm@") || value === "pnpm") return "pnpm";
+  if (value.startsWith("npm@") || value === "npm") return "npm";
+  return null;
+}
+
+function parseUserAgentPackageManager(
+  userAgent = process.env.npm_config_user_agent
+) {
+  if (!userAgent) return null;
+
+  const [descriptor] = userAgent.split(" ");
+  const [name, version] = descriptor.split("/");
+  const parsedName = parsePackageManagerName(name);
+
+  if (!parsedName) return null;
+
+  return {
+    name: parsedName,
+    version: version || null,
+  };
+}
+
+async function readProjectPackageManager(projectDir) {
+  const packageJsonPath = join(projectDir, "package.json");
+
+  if (!(await fs.pathExists(packageJsonPath))) {
+    return null;
+  }
+
+  const raw = await readFile(packageJsonPath, "utf8");
+  const parsed = JSON.parse(raw);
+
+  return parsePackageManagerName(parsed.packageManager);
+}
+
+async function readLockfilePackageManager(projectDir) {
+  if (await fs.pathExists(join(projectDir, "pnpm-lock.yaml"))) {
+    return "pnpm";
+  }
+
+  if (await fs.pathExists(join(projectDir, "package-lock.json"))) {
+    return "npm";
+  }
+
+  return null;
+}
+
+export async function detectPackageManager(projectDir) {
+  const projectPackageManager = await readProjectPackageManager(projectDir);
+  if (projectPackageManager) return projectPackageManager;
+
+  const lockfilePackageManager = await readLockfilePackageManager(projectDir);
+  if (lockfilePackageManager) return lockfilePackageManager;
+
+  return parseUserAgentPackageManager()?.name ?? "npm";
+}
+
+export function getPackageManagerVersion(name) {
+  const userAgentPackageManager = parseUserAgentPackageManager();
+
+  if (userAgentPackageManager?.name === name) {
+    return userAgentPackageManager.version;
+  }
+
+  return null;
+}
+
+export function getInstallCommand(name) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["install"],
+    };
+  }
+
+  return {
+    command: "npm",
+    args: ["install"],
+  };
+}
+
+export function getUpdateDependencyCommand(name, target) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["add", "--save-exact", target],
+    };
+  }
+
+  return {
+    command: "npm",
+    args: ["install", "--save-exact", target],
+  };
+}
+
+export function getStartCommand(name) {
+  return name === "pnpm" ? "pnpm bunko shelf" : "npm run bunko -- shelf";
+}
+
+export function getUpdateCommand(name) {
+  return name === "pnpm" ? "pnpm bunko update" : "npm run bunko -- update";
+}

package/dist/.next/static/chunks/0n_-826.ardv3.js

@@ -1 +0,0 @@
-(globalThis.TURBOPACK||(globalThis.TURBOPACK=[])).push(["object"==typeof document?document.currentScript:void 0,22730,e=>{"use strict";var t=e.i(52009);let c=(0,t.createServerReference)("4050d75ac6d35580f2b04a4c395332556d98c94ec4",t.callServer,void 0,t.findSourceMapURL,"getReaderStats");e.s(["getReaderStats",0,c])},89107,e=>{"use strict";let t=(0,e.i(6875).default)("plus",[["path",{d:"M5 12h14",key:"1ays0h"}],["path",{d:"M12 5v14",key:"s699le"}]]);e.s(["PlusIcon",0,t],89107)},45181,e=>{"use strict";let t=(0,e.i(6875).default)("minus",[["path",{d:"M5 12h14",key:"1ays0h"}]]);e.s(["MinusIcon",0,t],45181)},26030,e=>{"use strict";var t=e.i(52009);let c=(0,t.createServerReference)("40f711cddfcd03dbcb36328338cc79c0ad1bbefb65",t.callServer,void 0,t.findSourceMapURL,"sendPush");e.s(["sendPush",0,c])}]);