nextjs-cms-kit 0.5.38 → 0.5.54

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import dotenv from 'dotenv';
 import program from './lib/program.js';
-// Parse command line arguments first
+import * as p from '@clack/prompts';
 program.parse(process.argv);
-// Now load environment file based on parsed dev flag
+// Load environment file based on parsed dev flag
 if (Boolean(program.opts().dev) === true) {
-    console.log('🔧 Using development environment file...');
+    p.note('🔧 Using development environment file');
     dotenv.config({ path: '.env.development' });
     process.env.NODE_ENV = 'development';
 }

package/dist/lib/program.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../src/lib/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAA;AAqE3C,QAAA,MAAM,OAAO,SAAgB,CAAA;AAoE7B,eAAe,OAAO,CAAA"}
+{"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../src/lib/program.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAA;AA+N3C,QAAA,MAAM,OAAO,SAAgB,CAAA;AAoE7B,eAAe,OAAO,CAAA"}

package/dist/lib/program.js

@@ -1,31 +1,101 @@
 import { Command, Option } from 'commander';
 import chalk from 'chalk';
-import { existsSync, readFileSync } from 'fs';
-import { join } from 'path';
-function isNextjsCmsApp() {
-    const cwd = process.cwd();
+import { readFileSync, existsSync, realpathSync } from 'node:fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
+import process from 'node:process';
+function findPackageJson(startDir) {
+    let dir = startDir ?? process.cwd();
+    while (true) {
+        const candidate = join(dir, 'package.json');
+        if (existsSync(candidate))
+            return candidate;
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return undefined;
+}
+function findConfigFile(startDir) {
+    let dir = startDir ?? process.cwd();
+    while (true) {
+        const candidate = join(dir, 'lz.config.ts');
+        if (existsSync(candidate))
+            return candidate;
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return undefined;
+}
+// Get version dynamically from package.json
+const currentFilePath = fileURLToPath(import.meta.url);
+const currentDir = dirname(currentFilePath);
+const packageJsonPath = join(currentDir, '../../package.json');
+const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+const version = packageJson.version;
+const dependencies = packageJson.dependencies;
+function checkNextjsCmsInstallation() {
+    const requireFromCwd = createRequire(join(process.cwd(), 'index.js'));
     // Check for lz.config.ts file
-    const configFile = join(cwd, 'lz.config.ts');
-    if (!existsSync(configFile)) {
-        return false;
+    const configFile = findConfigFile();
+    if (configFile === undefined) {
+        return { error: 'not-nextjs-cms-app' };
     }
     // Check for nextjs-cms dependency in package.json
-    try {
-        const packageJsonPath = join(cwd, 'package.json');
-        if (!existsSync(packageJsonPath)) {
-            return false;
-        }
-        const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
-        const allDeps = {
-            ...(packageJson.dependencies ?? {}),
-            ...(packageJson.devDependencies ?? {}),
-            ...(packageJson.peerDependencies ?? {}),
+    const pkgPath = findPackageJson();
+    if (pkgPath === undefined) {
+        return { error: 'not-nextjs-cms-app' };
+    }
+    const packageJson = JSON.parse(readFileSync(pkgPath, 'utf8'));
+    const deps = {
+        ...(packageJson.dependencies ?? {}),
+    };
+    const existsInProjectPackageJson = 'nextjs-cms' in deps;
+    if (!existsInProjectPackageJson) {
+        return { error: 'local-not-found' };
+    }
+    const versionInProjectPackageJson = deps['nextjs-cms'];
+    if (versionInProjectPackageJson === undefined) {
+        return { error: 'local-not-found' };
+    }
+    // Hard check for installed version
+    // Resolve whatever the package exports at "." (this IS allowed)
+    const entryPath = requireFromCwd.resolve('nextjs-cms');
+    // Follow symlinks (helps with pnpm layouts)
+    const startPath = realpathSync(entryPath);
+    const installedPackageJson = findPackageJson(startPath);
+    if (installedPackageJson === undefined) {
+        return {
+            error: 'local-needs-update',
+            installedVersion: 'undefined',
+            packageVersion: versionInProjectPackageJson,
+        };
+    }
+    const installedPackageJsonParsed = JSON.parse(readFileSync(installedPackageJson, 'utf8'));
+    const localInstalledVersion = installedPackageJsonParsed?.version ?? undefined;
+    if (localInstalledVersion !== versionInProjectPackageJson) {
+        return {
+            error: 'local-needs-update',
+            installedVersion: localInstalledVersion ?? 'undefined',
+            packageVersion: versionInProjectPackageJson,
         };
-        return 'nextjs-cms' in allDeps;
     }
-    catch {
-        return false;
+    const versionInGlobalPackageJson = dependencies['nextjs-cms'];
+    if (versionInGlobalPackageJson === undefined) {
+        return { error: 'global-not-found' };
     }
+    if (versionInProjectPackageJson !== versionInGlobalPackageJson) {
+        return {
+            error: 'version-mismatch',
+            installedVersion: versionInProjectPackageJson,
+            globalVersion: versionInGlobalPackageJson,
+        };
+    }
+    return true;
 }
 function shouldSkipValidation() {
     const args = process.argv.slice(2); // Remove 'node' and script path
@@ -40,24 +110,55 @@ function validateNextjsCmsApp() {
     if (shouldSkipValidation()) {
         return;
     }
-    if (!isNextjsCmsApp()) {
-        console.error(chalk.red('❌ Error: This command must be run in a nextjs-cms application directory.'));
-        console.error(chalk.gray('Make sure you have:'));
-        console.error(chalk.gray('  - lz.config.ts file'));
-        console.error(chalk.gray('  - nextjs-cms as a dependency in package.json'));
-        console.error(chalk.gray('To create a new nextjs-cms application, run:'));
-        console.error(chalk.gray('  - pnpm create nextjs-cms@latest'));
+    const result = checkNextjsCmsInstallation();
+    if (typeof result === 'object' && 'error' in result) {
+        switch (result.error) {
+            case 'not-nextjs-cms-app':
+                console.error(chalk.red('❌ Error: This command must be run in a nextjs-cms application directory.'));
+                console.error(chalk.gray('Make sure you have:'));
+                console.error(chalk.gray('  - lz.config.ts file'));
+                console.error(chalk.gray('  - nextjs-cms as a dependency in package.json'));
+                console.error(chalk.gray('  - Did you forget to run `pnpm install`?'));
+                console.error('');
+                console.error(chalk.gray('To create a new nextjs-cms application, run:'));
+                console.error(chalk.gray('  - pnpm create nextjs-cms@latest'));
+                break;
+            case 'local-not-found':
+                console.error(chalk.red('❌ Error: nextjs-cms is not a dependency in package.json'));
+                console.error(chalk.gray('Make sure you have:'));
+                console.error(chalk.gray('  - nextjs-cms as a dependency in package.json'));
+                console.error(chalk.gray('  - Did you forget to run `pnpm install`?'));
+                break;
+            case 'global-not-found':
+                console.error(chalk.red('❌ Error: nextjs-cms is not installed globally'));
+                console.error(chalk.gray('  - Please install nextjs-cms-kit globally using `pnpm add -g nextjs-cms-kit`'));
+                break;
+            case 'version-mismatch':
+                console.error(chalk.red('❌ Error: the version of nextjs-cms in the project is different from the version installed globally in nextjs-cms-kit'));
+                console.error(chalk.gray('  - Installed version: ' + result.installedVersion));
+                console.error(chalk.gray('  - Global version: ' + result.globalVersion));
+                console.error(chalk.gray('  - Please run `pnpm remove -g nextjs-cms-kit && pnpm add -g nextjs-cms-kit@' +
+                    result.installedVersion +
+                    '`'));
+                break;
+            case 'local-needs-update':
+                console.error(chalk.red('❌ Error: the version of installed nextjs-cms in your cms is different from the version in package.json'));
+                console.error(chalk.gray('  - Installed version: ' + result.installedVersion));
+                console.error(chalk.gray('  - Package version: ' + result.packageVersion));
+                console.error(chalk.green('  - Please run `pnpm install and try again'));
+                break;
+        }
         process.exit(1);
     }
 }
-// Validate that we're in a nextjs-cms app before proceeding
+// Validate nextjs-cms app and dependencies before proceeding
 validateNextjsCmsApp();
 const program = new Command();
 program
     .name('nextjs-cms-kit')
     .option('-d, --dev', 'use development environment file, use -d/--dev before any command to use the development environment file (e.g. nextjs-cms-kit -d setup)', false)
     .description(chalk.green('nextjs-cms CLI toolkit for managing your nextjs-cms application'))
-    .version('0.4.0')
+    .version(version)
     // Include -v option to show the version number
     .addOption(new Option('-v').hideHelp())
     .enablePositionalOptions();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nextjs-cms-kit",
   "private": false,
-  "version": "0.5.38",
+  "version": "0.5.54",
   "type": "module",
   "bin": {
     "nextjs-cms-kit": "./dist/index.js"
@@ -29,10 +29,8 @@
     "commander": "^14.0.2",
     "dotenv": "^17.2.3",
     "drizzle-zod": "^0.7.0",
-    "mysql2": "^3.12.0"
-  },
-  "peerDependencies": {
-    "nextjs-cms": "0.5.38"
+    "mysql2": "^3.12.0",
+    "nextjs-cms": "0.5.54"
   },
   "devDependencies": {
     "@types/bcrypt": "^6.0.0",
@@ -41,9 +39,9 @@
     "prettier": "^3.3.3",
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
-    "@lzcms/prettier-config": "0.1.0",
+    "@lzcms/eslint-config": "0.3.0",
     "@lzcms/tsconfig": "0.1.0",
-    "@lzcms/eslint-config": "0.3.0"
+    "@lzcms/prettier-config": "0.1.0"
   },
   "prettier": "@lzcms/prettier-config",
   "scripts": {