npm - @plank-cms/plank - Versions diffs - 0.27.3 → 0.27.4 - Mend

@plank-cms/plank 0.27.3 → 0.27.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/admin/assets/{index-CrCKvadB.js → index-PC7ZVO5D.js} +1 -1
package/dist/admin/index.html +1 -1
package/dist/index.js +120 -22
package/dist/{server-5JMBMGIN.js → server-BVXQ6LEC.js} +42 -5
package/package.json +4 -4

package/dist/admin/index.html CHANGED Viewed

@@ -12,7 +12,7 @@
       href="https://fonts.googleapis.com/css2?family=Google+Sans:ital,opsz,wght@0,17..18,400..700;1,17..18,400..700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="/admin/assets/index-CrCKvadB.js"></script>
+    <script type="module" crossorigin src="/admin/assets/index-PC7ZVO5D.js"></script>
     <link rel="stylesheet" crossorigin href="/admin/assets/index-BTElP7oS.css">
   </head>
   <body>

package/dist/index.js CHANGED Viewed

@@ -4,10 +4,96 @@
 import { intro, outro, text, spinner, note, isCancel, cancel } from "@clack/prompts";
 import chalk from "chalk";
 import { randomBytes } from "crypto";
-import { resolve, join } from "path";
-import fs from "fs-extra";
+import { resolve, join as join2 } from "path";
+import fs2 from "fs-extra";
 import { execa } from "execa";
-var PACKAGE_VERSION = "0.27.3";
+// src/packageManager.ts
+import { readFile } from "fs/promises";
+import { join } from "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;
+}
+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";
+}
+function getPackageManagerVersion(name) {
+  const userAgentPackageManager = parseUserAgentPackageManager();
+  if (userAgentPackageManager?.name === name) {
+    return userAgentPackageManager.version;
+  }
+  return null;
+}
+function getInstallCommand(name) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["install"]
+    };
+  }
+  return {
+    command: "npm",
+    args: ["install"]
+  };
+}
+function getUpdateDependencyCommand(name, target) {
+  if (name === "pnpm") {
+    return {
+      command: "pnpm",
+      args: ["add", "--save-exact", target]
+    };
+  }
+  return {
+    command: "npm",
+    args: ["install", "--save-exact", target]
+  };
+}
+function getStartScriptCommand(name) {
+  return name === "pnpm" ? "pnpm start" : "npm start";
+}
+function getUpdateScriptCommand(name) {
+  return name === "pnpm" ? "pnpm run update" : "npm run update";
+}
+// src/commands/init.ts
+var PACKAGE_VERSION = "0.27.4";
 function generateSecret() {
   return randomBytes(32).toString("hex");
 }
@@ -19,11 +105,15 @@ function buildEnv(jwtSecret, encryptionKey) {
     `PLANK_PORT=5500`
   ].join("\n") + "\n";
 }
-function buildPackageJson(name) {
+function buildPackageJson(name, packageManager) {
+  const packageManagerVersion = getPackageManagerVersion(packageManager);
   return {
     name,
     version: "0.1.0",
     private: true,
+    ...packageManager === "pnpm" && packageManagerVersion ? {
+      packageManager: `pnpm@${packageManagerVersion}`
+    } : {},
     scripts: {
       start: "plank start",
       update: "plank update"
@@ -58,22 +148,28 @@ async function init(projectName) {
     }
   }
   const projectDir = useCurrentDir ? process.cwd() : resolve(process.cwd(), name);
-  if (!useCurrentDir && await fs.pathExists(projectDir)) {
-    const entries = await fs.readdir(projectDir);
+  if (!useCurrentDir && await fs2.pathExists(projectDir)) {
+    const entries = await fs2.readdir(projectDir);
     if (entries.length > 0) {
       cancel(`Directory "${name}" already exists and is not empty.`);
       process.exit(1);
     }
   }
   const s = spinner();
+  const packageManager = await detectPackageManager(projectDir);
+  const installCommand = getInstallCommand(packageManager);
+  const startCommand = getStartScriptCommand(packageManager);
+  const updateCommand = getUpdateScriptCommand(packageManager);
   s.start("Creating project...");
-  await fs.ensureDir(projectDir);
-  await fs.writeFile(join(projectDir, ".env"), buildEnv(generateSecret(), generateSecret()));
-  await fs.writeJSON(join(projectDir, "package.json"), buildPackageJson(name), { spaces: 2 });
-  await fs.writeFile(join(projectDir, ".gitignore"), ".env\nnode_modules\n");
+  await fs2.ensureDir(projectDir);
+  await fs2.writeFile(join2(projectDir, ".env"), buildEnv(generateSecret(), generateSecret()));
+  await fs2.writeJSON(join2(projectDir, "package.json"), buildPackageJson(name, packageManager), {
+    spaces: 2
+  });
+  await fs2.writeFile(join2(projectDir, ".gitignore"), ".env\nnode_modules\n");
   s.stop("Project created");
   s.start("Installing dependencies...");
-  await execa("npm", ["install"], { cwd: projectDir });
+  await execa(installCommand.command, installCommand.args, { cwd: projectDir });
   s.stop("Dependencies installed");
   note(
     [
@@ -88,11 +184,11 @@ async function init(projectName) {
       `${chalk.yellow("Important:")} keep ${chalk.cyan("PLANK_JWT_SECRET")} and ${chalk.cyan("PLANK_ENCRYPTION_KEY")} set in production.`,
       "",
       ...!useCurrentDir ? [`  ${chalk.cyan(`cd ${name}`)}`, ""] : [],
-      `  ${chalk.cyan("npm start")}`,
+      `  ${chalk.cyan(startCommand)}`,
       "",
       `To update Plank later:`,
       "",
-      `  ${chalk.cyan("npm run update")}`
+      `  ${chalk.cyan(updateCommand)}`
     ].join("\n"),
     "Next steps"
   );
@@ -102,11 +198,11 @@ async function init(projectName) {
 // src/commands/start.ts
 import { config } from "dotenv";
 import { fileURLToPath } from "url";
-import { dirname, join as join2, resolve as resolve2 } from "path";
+import { dirname, join as join3, resolve as resolve2 } from "path";
 async function start() {
   config({ path: resolve2(process.cwd(), ".env") });
-  process.env.PLANK_ADMIN_DIST = join2(dirname(fileURLToPath(import.meta.url)), "admin");
-  const { start: startServer } = await import("./server-5JMBMGIN.js");
+  process.env.PLANK_ADMIN_DIST = join3(dirname(fileURLToPath(import.meta.url)), "admin");
+  const { start: startServer } = await import("./server-BVXQ6LEC.js");
   await startServer();
 }
@@ -166,17 +262,17 @@ async function publishScheduled() {
 import { intro as intro2, outro as outro2, spinner as spinner2 } from "@clack/prompts";
 import chalk2 from "chalk";
 import { execa as execa2 } from "execa";
-import fs2 from "fs-extra";
-import { join as join3 } from "path";
+import fs3 from "fs-extra";
+import { join as join4 } from "path";
 var PACKAGE_NAME = "@plank-cms/plank";
 async function update(version = "latest") {
   intro2(chalk2.bold("\u25B2 Plank CMS"));
-  const packageJsonPath = join3(process.cwd(), "package.json");
-  const hasPackageJson = await fs2.pathExists(packageJsonPath);
+  const packageJsonPath = join4(process.cwd(), "package.json");
+  const hasPackageJson = await fs3.pathExists(packageJsonPath);
   if (!hasPackageJson) {
     throw new Error("No package.json found in the current directory.");
   }
-  const packageJson = await fs2.readJSON(packageJsonPath);
+  const packageJson = await fs3.readJSON(packageJsonPath);
   const dependencies = {
     ...packageJson.dependencies,
     ...packageJson.devDependencies
@@ -186,9 +282,11 @@ async function update(version = "latest") {
   }
   const s = spinner2();
   const target = `${PACKAGE_NAME}@${version}`;
+  const packageManager = await detectPackageManager(process.cwd());
+  const updateCommand = getUpdateDependencyCommand(packageManager, target);
   s.start(`Updating ${PACKAGE_NAME} to ${chalk2.cyan(version)}...`);
   try {
-    await execa2("npm", ["install", "--save-exact", target], {
+    await execa2(updateCommand.command, updateCommand.args, {
       cwd: process.cwd(),
       stdio: "inherit"
     });

package/dist/{server-5JMBMGIN.js → server-BVXQ6LEC.js} RENAMED Viewed

@@ -650,7 +650,7 @@ function validate(contentType, payload) {
 import express from "express";
 import cors from "cors";
 import helmet from "helmet";
-import { join as join4, dirname as dirname2 } from "path";
+import { join as join5, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 // ../core/dist/routes/auth.js
@@ -4929,10 +4929,10 @@ async function updateNamespaceSettings(req, res) {
 // ../core/dist/lib/version.js
 import { readFile as readFile2 } from "fs/promises";
+import { join as join4 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var PACKAGE_NAME = "@plank-cms/plank";
 var CHANGELOG_BASE_URL = "https://github.com/plank-cms/plank/releases";
-var UPDATE_COMMAND = "npm run update";
 var REGISTRY_URL = `https://registry.npmjs.org/${encodeURIComponent(PACKAGE_NAME)}/latest`;
 var CACHE_TTL_MS = 1e3 * 60 * 30;
 var packageJsonUrl = new URL("../../package.json", import.meta.url);
@@ -4957,6 +4957,41 @@ function compareVersions(a2, b3) {
 function getChangelogUrl(version) {
   return version ? `${CHANGELOG_BASE_URL}/tag/${version}` : CHANGELOG_BASE_URL;
 }
+function getUpdateCommandForPackageManager(packageManager) {
+  return packageManager === "pnpm" ? "pnpm run update" : "npm run update";
+}
+async function detectProjectPackageManager() {
+  try {
+    const raw = await readFile2(join4(process.cwd(), "package.json"), "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed.packageManager?.startsWith("pnpm@") || parsed.packageManager === "pnpm") {
+      return "pnpm";
+    }
+    if (parsed.packageManager?.startsWith("npm@") || parsed.packageManager === "npm") {
+      return "npm";
+    }
+  } catch {
+    return await detectPackageManagerFromLockfiles();
+  }
+  return await detectPackageManagerFromLockfiles();
+}
+async function hasLockfile(filename) {
+  try {
+    await readFile2(join4(process.cwd(), filename), "utf8");
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function detectPackageManagerFromLockfiles() {
+  if (await hasLockfile("pnpm-lock.yaml")) {
+    return "pnpm";
+  }
+  if (await hasLockfile("package-lock.json")) {
+    return "npm";
+  }
+  return null;
+}
 async function readCurrentVersion() {
   const packageJsonPath = fileURLToPath2(packageJsonUrl);
   const raw = await readFile2(packageJsonPath, "utf8");
@@ -4968,6 +5003,7 @@ async function getVersionCheck() {
     return cachedVersionCheck.value;
   }
   const currentVersion = await readCurrentVersion();
+  const packageManager = await detectProjectPackageManager();
   let latestVersion = null;
   try {
     const response = await fetch(REGISTRY_URL, {
@@ -4981,13 +5017,14 @@ async function getVersionCheck() {
       latestVersion = payload.version ?? null;
     }
   } catch {
+    latestVersion = null;
   }
   const value = {
     currentVersion,
     latestVersion,
     updateAvailable: latestVersion ? compareVersions(latestVersion, currentVersion) > 0 : false,
     changelogUrl: getChangelogUrl(latestVersion),
-    updateCommand: UPDATE_COMMAND,
+    updateCommand: getUpdateCommandForPackageManager(packageManager),
     checkedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
   cachedVersionCheck = {
@@ -5772,9 +5809,9 @@ if (isDev) {
   app.get("/admin/*path", (_req, res) => res.redirect(adminDevUrl));
   app.get("/admin", (_req, res) => res.redirect(adminDevUrl));
 } else {
-  const adminDist = process.env.PLANK_ADMIN_DIST ?? join4(dirname2(fileURLToPath3(import.meta.url)), "../public/admin");
+  const adminDist = process.env.PLANK_ADMIN_DIST ?? join5(dirname2(fileURLToPath3(import.meta.url)), "../public/admin");
   app.use("/admin", express.static(adminDist));
-  app.get("/admin/*path", (_req, res) => res.sendFile(join4(adminDist, "index.html")));
+  app.get("/admin/*path", (_req, res) => res.sendFile(join5(adminDist, "index.html")));
 }
 app.use(errorHandler);
 var app_default = app;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@plank-cms/plank",
-  "version": "0.27.3",
+  "version": "0.27.4",
   "description": "Self-hosted headless CMS. Deploy in minutes on your own infrastructure.",
   "type": "module",
   "files": [
@@ -55,9 +55,9 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "tsup": "^8.5.0",
-    "@plank-cms/core": "0.27.3",
-    "@plank-cms/db": "0.27.3",
-    "@plank-cms/schema": "0.27.3"
+    "@plank-cms/db": "0.27.4",
+    "@plank-cms/core": "0.27.4",
+    "@plank-cms/schema": "0.27.4"
   },
   "scripts": {
     "build": "tsup",