modern-cms 1.1.4 → 1.1.6

package/README.md

@@ -84,7 +84,7 @@ npm run dev
 
 Then open the web app at the URL you chose (default `http://localhost:3000`) and log in at `/admin` with the admin email/password from the wizard.
 
-> **Prefer yarn for the scaffolded project too?** `yarn install` works fine, and `dev`/`db:migrate`/`db:seed` all run correctly (they use `tsx`, which doesn't type-check). The one caveat: yarn's dependency hoisting can occasionally produce a duplicate `@types/express`, which shows up as spurious TypeScript errors only if you run `npm run build` or `tsc` directly — running `npm install` once resolves it.
+> **Prefer yarn for the scaffolded project too?** `yarn install` works fine, and `dev`/`build`/`db:migrate`/`db:seed` all run correctly. A stray duplicate `@types/express` (pulled in by `@types/multer`'s unpinned `"*"` dependency range) used to break `tsc`/`npm run build` under both npm and yarn — the generated `package.json` now pins it via `overrides` (npm) and `resolutions` (yarn), so a fresh install with either tool is clean.
 >
 > **Logged in with the wrong password?** The admin user is only created the *first* time `db:seed` runs — editing `.env` afterward doesn't retroactively change it. Run `npm run db:reset-admin && npm run db:seed` to delete and recreate it from the current `.env` values.
 

package/bin/modern-cms.js

@@ -40,10 +40,10 @@ function onCancel() {
 }
 
 async function main() {
-  console.log("\nmodern-cms — self-hosted drag-and-drop website CMS\n");
+  console.log("\n🚀 modern-cms — self-hosted drag-and-drop website CMS\n");
 
   const { targetDir } = await prompts(
-    { type: "text", name: "targetDir", message: "Where should the project be created?", initial: "./modern-cms-app" },
+    { type: "text", name: "targetDir", message: "📁 Where should the project be created?", initial: "./modern-cms-app" },
     { onCancel }
   );
   const dest = path.resolve(process.cwd(), targetDir);
@@ -52,19 +52,20 @@ async function main() {
     process.exit(1);
   }
 
-  console.log(`\nCopying project files into ${dest} ...`);
+  console.log(`\n📦 Copying project files into ${dest} ...`);
   copyDir(TEMPLATE_DIR, dest);
 
   // --- Database ---
+  console.log("\n🗄️  Database");
   const db = await prompts(
     [
       {
         type: "select",
         name: "engine",
-        message: "Database",
+        message: "Database engine",
         choices: [
-          { title: "PostgreSQL", value: "postgresql" },
-          { title: "MySQL", value: "mysql" },
+          { title: "🐘 PostgreSQL", value: "postgresql" },
+          { title: "🐬 MySQL", value: "mysql" },
         ],
       },
       { type: "text", name: "host", message: "Database host", initial: "localhost" },
@@ -92,6 +93,7 @@ async function main() {
   }
 
   // --- Ports ---
+  console.log("\n🔌 Ports");
   const ports = await prompts(
     [
       { type: "text", name: "webPort", message: "Web app port", initial: "3000" },
@@ -101,15 +103,16 @@ async function main() {
   );
 
   // --- Storage ---
+  console.log("\n☁️  File storage");
   const { provider } = await prompts(
     {
       type: "select",
       name: "provider",
-      message: "File storage (AWS S3, Azure Blob Storage, or Cloudinary)",
+      message: "Storage provider",
       choices: [
-        { title: "AWS S3 (or any S3-compatible: MinIO, R2, Spaces...)", value: "s3" },
-        { title: "Azure Blob Storage", value: "azure" },
-        { title: "Cloudinary", value: "cloudinary" },
+        { title: "🪣 AWS S3 (or any S3-compatible: MinIO, R2, Spaces...)", value: "s3" },
+        { title: "🔷 Azure Blob Storage", value: "azure" },
+        { title: "🌤️  Cloudinary", value: "cloudinary" },
       ],
     },
     { onCancel }
@@ -160,6 +163,7 @@ async function main() {
 
   // --- Site / admin (necessary extras beyond what was asked for: the app needs to
   // know its own public URLs, and the CMS needs an initial admin login) ---
+  console.log("\n👤 Site & admin account");
   const site = await prompts(
     [
       { type: "text", name: "siteUrl", message: "Public site URL", initial: `http://localhost:${ports.webPort}` },
@@ -190,11 +194,11 @@ async function main() {
   fs.writeFileSync(path.join(dest, ".env"), rootEnv);
 
   if (!site.adminPassword) {
-    console.log(`\nGenerated admin password: ${adminPassword}\n(save this — it's only shown once)`);
+    console.log(`\n🔑 Generated admin password: ${adminPassword}\n   (save this — it's only shown once)`);
   }
 
-  console.log("\nDone! Generated .env files for apps/api and apps/web.\n");
-  console.log("Next steps:");
+  console.log("\n✅ Done! Generated .env files for apps/api and apps/web.\n");
+  console.log("👉 Next steps:");
   console.log(`  cd ${targetDir}`);
   console.log("  npm install");
   if (usesDbPush(db.engine)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modern-cms",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Self-hosted, drag-and-drop website CMS (Next.js + Express + Prisma). Interactive installer scaffolds a full project with your choice of PostgreSQL/MySQL and AWS S3/Azure Blob/Cloudinary storage.",
   "type": "module",
   "bin": {

package/template/README.md

@@ -60,7 +60,7 @@ npm run db:seed
 npm run dev
 ```
 
-> **Using yarn to install the scaffolded project itself?** `yarn install` works fine, and `npm run dev` / `db:migrate` / `db:seed` all run correctly under a yarn-installed `node_modules` (they invoke `tsx`, which doesn't type-check). The one thing to watch for: yarn's dependency hoisting can occasionally produce a duplicate `@types/express` in the tree, which shows up as spurious TypeScript errors *only* if you run `npm run build` or `tsc` directly. If that happens, running `npm install` once (even alongside your yarn workflow) resolves it — that's yarn's hoisting, not a bug in the project.
+> **Using yarn to install the scaffolded project itself?** `yarn install` works fine — `npm run dev` / `build` / `db:migrate` / `db:seed` all run correctly under a yarn-installed `node_modules`. (Earlier versions of this README blamed a duplicate `@types/express` type error on "yarn's hoisting" — that diagnosis was wrong. The real cause is that `@types/multer` depends on `@types/express@"*"`, which both npm and yarn will happily resolve to a stray v5 copy alongside the project's pinned v4, breaking `tsc`/`npm run build` under either package manager. The root `package.json`'s `overrides` + `resolutions` fields pin that nested dependency to v4 for both, so this no longer happens with a fresh install.)
 
 See [`packages/modern-cms/README.md`](packages/modern-cms/README.md) for the full prompt-by-prompt reference and configuration details.
 

package/template/apps/api/src/index.ts

@@ -2,6 +2,7 @@ import express from "express";
 import cors from "cors";
 import cookieParser from "cookie-parser";
 import { env } from "./env.js";
+import { initStorage } from "./lib/storage/index.js";
 import { securityHeaders } from "./middleware/securityHeaders.js";
 import { authRouter } from "./routes/auth.routes.js";
 import { pagesRouter } from "./routes/pages.routes.js";
@@ -61,6 +62,8 @@ app.use((err: any, _req: express.Request, res: express.Response, _next: express.
   res.status(err.status ?? 500).json({ error: err.message ?? "Internal server error" });
 });
 
+initStorage();
+
 app.listen(env.port, () => {
   console.log(`pg-cms API listening on http://localhost:${env.port}`);
 });

package/template/apps/api/src/lib/storage/index.ts

@@ -6,7 +6,21 @@ import { createCloudinaryStorage } from "./cloudinary.js";
 
 let cached: StorageProvider | null = null;
 
+// Printed once, at first upload/delete — tells you exactly where files are actually
+// going (bucket/container/cloud + folder), since that's the #1 source of "my upload
+// succeeded but I can't find the file" confusion when double-checking the wrong place.
+function logActiveProvider() {
+  if (env.storageProvider === "azure") {
+    console.log(`[storage] Using Azure Blob Storage — container "${env.azure!.container}"`);
+  } else if (env.storageProvider === "cloudinary") {
+    console.log(`[storage] Using Cloudinary — cloud "${env.cloudinary!.cloudName}", folder "${env.cloudinary!.folder}"`);
+  } else {
+    console.log(`[storage] Using S3 — bucket "${env.s3!.bucket}" at ${env.s3!.endpoint}`);
+  }
+}
+
 function build(): StorageProvider {
+  logActiveProvider();
   if (env.storageProvider === "azure") return createAzureStorage();
   if (env.storageProvider === "cloudinary") return createCloudinaryStorage();
   return createS3Storage();
@@ -16,6 +30,12 @@ function getStorage(): StorageProvider {
   return (cached ??= build());
 }
 
+/** Called once at server boot so the active provider/destination is visible in the
+ * logs immediately, rather than only appearing after the first upload. */
+export function initStorage(): void {
+  getStorage();
+}
+
 export async function uploadBuffer(key: string, buffer: Buffer, contentType: string): Promise<string> {
   return getStorage().upload(key, buffer, contentType);
 }

package/template/package.json

@@ -9,6 +9,14 @@
     "packages/*",
     "apps/*"
   ],
+  "overrides": {
+    "@types/multer": {
+      "@types/express": "^4.17.21"
+    }
+  },
+  "resolutions": {
+    "**/@types/multer/**/@types/express": "^4.17.21"
+  },
   "scripts": {
     "dev": "concurrently -n api,web -c blue,green \"npm run dev -w apps/api\" \"npm run dev -w apps/web\"",
     "dev:api": "npm run dev -w apps/api",