create-nextjs-cms 0.9.6 → 0.9.7

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 create-nextjs-cms
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 create-nextjs-cms
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,71 +1,71 @@
-# Create Nextjs CMS
-
-The best and official way to create a nextjs-cms project with all the necessary configuration and dependencies.
-
-## Installation
-
-You can create a new cms project interactively by running:
-
-```bash
-npx create-nextjs-cms
-# or
-yarn create nextjs-cms
-# or
-pnpm create nextjs-cms
-# or
-bun create nextjs-cms
-```
-
-## Project Structure
-
-After running `create-nextjs-cms`, you'll have a fully configured nextjs-cms project with:
-
-- ✅ Next.js application setup
-- ✅ CMS configuration files
-- ✅ Database configuration
-- ✅ TypeScript configuration
-- ✅ All necessary dependencies
-- ✅ Example sections and fields
-- ✅ Development scripts
-
-## Next Steps
-
-After creating your project:
-
-```bash
-cd my-cms-app
-pnpm dev 
-```
-
-Then visit `http://localhost:3000` to see your CMS in action!
-
-## Requirements
-
-- Node.js 18+ 
-- A package manager (pnpm, npm, yarn, or bun)
-
-## Troubleshooting
-
-### Directory already exists
-
-If you try to create a project in a directory that already exists, you'll get an error. Either:
-- Choose a different directory name
-- Use `.` to create in the current directory (must be empty)
-
-### Installation fails
-
-If automatic dependency installation fails, you can manually install:
-
-```bash
-cd my-cms-app
-pnpm install 
-```
-
-### Template not found
-
-If you see an error about the template directory not being found, ensure you're using the published version of the package from npm, not a local development version.
-
-
-## License
-
-MIT License - see LICENSE file for details.
+# Create Nextjs CMS
+
+The best and official way to create a nextjs-cms project with all the necessary configuration and dependencies.
+
+## Installation
+
+You can create a new cms project interactively by running:
+
+```bash
+npx create-nextjs-cms
+# or
+yarn create nextjs-cms
+# or
+pnpm create nextjs-cms
+# or
+bun create nextjs-cms
+```
+
+## Project Structure
+
+After running `create-nextjs-cms`, you'll have a fully configured nextjs-cms project with:
+
+- ✅ Next.js application setup
+- ✅ CMS configuration files
+- ✅ Database configuration
+- ✅ TypeScript configuration
+- ✅ All necessary dependencies
+- ✅ Example sections and fields
+- ✅ Development scripts
+
+## Next Steps
+
+After creating your project:
+
+```bash
+cd my-cms-app
+pnpm dev 
+```
+
+Then visit `http://localhost:3000` to see your CMS in action!
+
+## Requirements
+
+- Node.js 18+ 
+- A package manager (pnpm, npm, yarn, or bun)
+
+## Troubleshooting
+
+### Directory already exists
+
+If you try to create a project in a directory that already exists, you'll get an error. Either:
+- Choose a different directory name
+- Use `.` to create in the current directory (must be empty)
+
+### Installation fails
+
+If automatic dependency installation fails, you can manually install:
+
+```bash
+cd my-cms-app
+pnpm install 
+```
+
+### Template not found
+
+If you see an error about the template directory not being found, ensure you're using the published version of the package from npm, not a local development version.
+
+
+## License
+
+MIT License - see LICENSE file for details.

package/dist/helpers/check-directory.d.ts

@@ -2,5 +2,6 @@ export declare const resolveDirectory: (appName: string) => Promise<{
     targetDir: string;
     projectName: string;
     targetIsCwd: boolean;
+    targetExistedBefore: boolean;
 }>;
 //# sourceMappingURL=check-directory.d.ts.map

package/dist/helpers/check-directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-directory.d.ts","sourceRoot":"","sources":["../../src/helpers/check-directory.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,gBAAgB,GACzB,SAAS,MAAM,KAChB,OAAO,CAAC;IACP,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;CACvB,CAwCA,CAAA"}
+{"version":3,"file":"check-directory.d.ts","sourceRoot":"","sources":["../../src/helpers/check-directory.ts"],"names":[],"mappings":"AA2HA,eAAO,MAAM,gBAAgB,GACzB,SAAS,MAAM,KAChB,OAAO,CAAC;IACP,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,OAAO,CAAA;IACpB,mBAAmB,EAAE,OAAO,CAAA;CAC/B,CAqCA,CAAA"}

package/dist/helpers/check-directory.js

@@ -6,6 +6,85 @@ import fs from 'fs-extra';
 import { isEmptyDir } from './utils.js';
 import * as p from '@clack/prompts';
 import chalk from 'chalk';
+import ora from 'ora';
+const abortInstallation = () => {
+    p.cancel('Aborting installation');
+    process.exit(1);
+};
+const abortDirectoryCleanup = (targetDir, error) => {
+    p.log.error(`Failed to empty ${targetDir === process.cwd() ? 'the current directory' : `"${targetDir}"`}.`);
+    p.log.message('Some files may already have been deleted.');
+    p.log.message(`Please review and clean this directory manually: ${targetDir}`);
+    p.log.message(`Reason: ${error instanceof Error ? error.message : 'Unknown error'}`);
+    return abortInstallation();
+};
+const getDirectoryEntriesToDelete = async (targetDir, keepGit) => {
+    const entries = await fs.readdir(targetDir);
+    return entries.filter((entry) => !(keepGit && entry === '.git'));
+};
+const emptyDirectory = async (targetDir, entries, onEntryDeleted) => {
+    let deletedCount = 0;
+    for (const entry of entries) {
+        await fs.remove(path.join(targetDir, entry));
+        deletedCount += 1;
+        onEntryDeleted?.(deletedCount, entries.length);
+    }
+};
+const runDirectoryCleanup = async ({ targetDir, targetIsCwd, keepGit, }) => {
+    const spinnerText = keepGit
+        ? `Emptying ${targetIsCwd ? 'the current directory' : `"${targetDir}"`} and keeping .git...`
+        : `Emptying ${targetIsCwd ? 'the current directory' : `"${targetDir}"`}...`;
+    const successMessage = keepGit
+        ? `Emptied ${targetIsCwd ? 'the current directory' : `"${targetDir}"`} and kept ${chalk.green('.git')}.`
+        : `Emptied ${targetIsCwd ? 'the current directory' : `"${targetDir}"`}.`;
+    const entriesToDelete = await getDirectoryEntriesToDelete(targetDir, keepGit);
+    const spinner = ora(entriesToDelete.length > 0 ? `${spinnerText} (0/${entriesToDelete.length})` : spinnerText).start();
+    try {
+        await emptyDirectory(targetDir, entriesToDelete, (deletedCount, totalCount) => {
+            spinner.text = `${spinnerText} (${deletedCount}/${totalCount})`;
+        });
+    }
+    catch (error) {
+        spinner.stop();
+        abortDirectoryCleanup(targetDir, error);
+    }
+    spinner.stop();
+    p.log.info(successMessage);
+};
+const promptForNonEmptyDirectoryAction = async (targetDir, targetIsCwd) => {
+    if (targetIsCwd) {
+        p.log.error('Current directory is not empty.');
+        p.log.message(chalk.gray('Tip: You can also specify a directory name like this: \n') +
+            chalk.green('pnpm create nextjs-cms ') +
+            chalk.italic.magenta('my-app'));
+    }
+    else {
+        p.log.error(`Directory "${targetDir}" is not empty.`);
+    }
+    p.log.message('Choose how you want to proceed:');
+    const action = await p.select({
+        message: 'How would you like to proceed?',
+        initialValue: 'abort',
+        options: [
+            { value: 'abort', label: 'Abort' },
+            { value: 'empty', label: 'Empty directory ⚠️', hint: 'Delete everything in the target directory' },
+            {
+                value: 'empty-keep-git',
+                label: 'Empty directory and keep .git folder ⚠️',
+                hint: 'Delete everything except the root .git folder',
+            },
+            {
+                value: 'continue',
+                label: 'Continue anyway ⚠️',
+                hint: 'Existing files may be overwritten and the app may be unstable',
+            },
+        ],
+    });
+    if (p.isCancel(action) || action === 'abort') {
+        abortInstallation();
+    }
+    return action;
+};
 export const resolveDirectory = async (appName) => {
     // Resolve target path from the caller's CWD
     const rawTarget = expandHome(appName);
@@ -13,35 +92,31 @@ export const resolveDirectory = async (appName) => {
     // Derive package name from final path
     const projectName = basename(targetDir);
     const targetIsCwd = path.normalize(targetDir) === path.normalize(process.cwd());
-    if (targetIsCwd) {
-        // Using current directory (".")
-        if (!(await fs.pathExists(targetDir))) {
-            await fs.ensureDir(targetDir);
-        }
-        else if (!(await isEmptyDir(targetDir))) {
-            p.log.error('Current directory is not empty. Choose an empty folder or a new directory name.');
-            p.log.message(chalk.gray('Tip: You can also specify a directory name like this: \n') +
-                chalk.green('pnpm create nextjs-cms ') +
-                chalk.italic.magenta('my-app'));
-            p.log.message(' ');
-            process.exit(1);
-        }
+    const targetExistedBefore = await fs.pathExists(targetDir);
+    if (!targetExistedBefore) {
+        await fs.ensureDir(targetDir);
     }
-    else {
-        if (await fs.pathExists(targetDir)) {
-            if (!(await isEmptyDir(targetDir))) {
-                p.log.error(`Directory "${targetDir}" is not empty.`);
-                p.log.message('Please choose an empty directory or a different directory name.');
-                process.exit(1);
-            }
-        }
-        else {
-            await fs.ensureDir(targetDir);
+    else if (!(await isEmptyDir(targetDir))) {
+        const action = await promptForNonEmptyDirectoryAction(targetDir, targetIsCwd);
+        switch (action) {
+            case 'empty':
+                await runDirectoryCleanup({ targetDir, targetIsCwd, keepGit: false });
+                break;
+            case 'empty-keep-git':
+                await runDirectoryCleanup({ targetDir, targetIsCwd, keepGit: true });
+                break;
+            case 'continue':
+                p.log.warn('Continuing in a non-empty directory. Existing files may be overwritten.');
+                break;
+            default:
+                action;
+                break;
         }
     }
     return {
         targetDir,
         projectName,
         targetIsCwd,
+        targetExistedBefore,
     };
 };

package/dist/helpers/utils.js

@@ -4,22 +4,22 @@ import os from 'node:os';
 import { randomBytes } from 'node:crypto';
 import { log } from '@clack/prompts';
 import chalk from 'chalk';
-export const TITLE_TEXT = `
-                           _
-        ___ _ __ ___  __ _| |_ ___
-       / __| '__/ _ \\/ _\\\` | __/ _ \\
-      | (__| | |  __/ (_| | ||  __/
-       \\___|_|  \\___|\\__,_|\\__\\___|
-                          _    _
-          _ __   _____  _| |_ (_)___
-         | '_ \\ / _ \\ \\/ / __|| / __|
-         | | | |  __/>  <| |_ | \\__ \\
-         |_| |_|\\___/_/\\_\\__|/ |___/
-                            |__/
-                ___ _ __ ___  ___
-               / __| '_ \\\` _ \\/ __|
-              | (__| | | | | \\__ \\
-               \\___|_| |_| |_|___/
+export const TITLE_TEXT = `
+                           _
+        ___ _ __ ___  __ _| |_ ___
+       / __| '__/ _ \\/ _\\\` | __/ _ \\
+      | (__| | |  __/ (_| | ||  __/
+       \\___|_|  \\___|\\__,_|\\__\\___|
+                          _    _
+          _ __   _____  _| |_ (_)___
+         | '_ \\ / _ \\ \\/ / __|| / __|
+         | | | |  __/>  <| |_ | \\__ \\
+         |_| |_|\\___/_/\\_\\__|/ |___/
+                            |__/
+                ___ _ __ ___  ___
+               / __| '_ \\\` _ \\/ __|
+              | (__| | | | | \\__ \\
+               \\___|_| |_| |_|___/
 `;
 /** Expand ~ to home */
 export function expandHome(p) {

package/dist/index.js

@@ -21,7 +21,7 @@ async function createNextjsCms() {
     // Run CLI to get user input
     const { appName, sectionsToAdd, git /*, databaseProvider*/ } = await runCli();
     // Resolve directory
-    const { targetDir, projectName, targetIsCwd } = await resolveDirectory(appName);
+    const { targetDir, projectName, targetIsCwd, targetExistedBefore } = await resolveDirectory(appName);
     try {
         // Detect package manager
         const preferredPM = detectPackageManager();
@@ -63,14 +63,19 @@ async function createNextjsCms() {
         p.outro(chalk.red(`❌ Failed to create project: ${error instanceof Error ? error.message : 'Unknown error'}`));
         // Clean up partial installation on error
         if ((await fs.pathExists(targetDir)) && !targetIsCwd) {
-            p.log.info('🧹 Cleaning up partial installation...');
-            try {
-                await fs.remove(targetDir);
-                p.log.success('✅ Cleanup completed.');
+            if (targetExistedBefore) {
+                p.log.warn('Project creation failed in a pre-existing directory. Existing files were left in place.');
             }
-            catch {
-                p.log.error('⚠️ Could not clean up partial installation.');
-                p.log.message(`   Please manually remove: ${targetDir}`);
+            else {
+                p.log.info('🧹 Cleaning up partial installation...');
+                try {
+                    await fs.remove(targetDir);
+                    p.log.success('✅ Cleanup completed.');
+                }
+                catch {
+                    p.log.error('⚠️ Could not clean up partial installation.');
+                    p.log.message(`   Please manually remove: ${targetDir}`);
+                }
             }
         }
         process.exit(1);

package/dist/lib/create-project.js

@@ -22,7 +22,7 @@ export const createProject = async ({ targetDir, sectionsToAdd, projectName, pre
                 !rel.startsWith('.turbo') &&
                 !rel.includes('tsconfig.tsbuildinfo'));
         },
-        // Overwrite is safe since target is ensured empty (or new)
+        // Overwrite is intentional because the target is new, user-approved, or was explicitly emptied
         overwrite: true,
         errorOnExist: false,
     });