create-next-rkk 2.0.2 → 2.0.3

package/dist/index.d.ts

@@ -4,4 +4,21 @@ export declare function validateProjectName(name: string): {
     reason?: string;
 };
 export declare function cleanupProjectDir(projectPath: string): void;
+/**
+ * Detect which package manager is available, preferring pnpm → yarn → npm.
+ * Returns the binary name ('pnpm' | 'yarn' | 'npm').
+ */
+export declare function detectPackageManager(): 'pnpm' | 'yarn' | 'npm';
+/**
+ * Build the `create-next-app` scaffold command for a given package manager.
+ * Matches the exact defaults that `pnpm create next-app@latest --yes` uses:
+ *   - TypeScript
+ *   - ESLint
+ *   - No Tailwind
+ *   - NO --src-dir  (app/ lives at project root)
+ *   - App Router or Pages Router based on user choice
+ *   - import alias @/*
+ *   - --yes skips all interactive prompts
+ */
+export declare function buildCreateCommand(pm: 'pnpm' | 'yarn' | 'npm', targetDir: string, typescript: boolean, router: 'app' | 'pages'): string;
 export declare function runCli(argv?: string[]): Promise<void>;

package/dist/index.js

@@ -39,6 +39,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateProjectName = validateProjectName;
 exports.cleanupProjectDir = cleanupProjectDir;
+exports.detectPackageManager = detectPackageManager;
+exports.buildCreateCommand = buildCreateCommand;
 exports.runCli = runCli;
 const commander_1 = require("commander");
 const inquirer_1 = __importDefault(require("inquirer"));
@@ -69,10 +71,91 @@ function cleanupProjectDir(projectPath) {
         fs.rmSync(projectPath, { recursive: true, force: true });
     }
 }
+/**
+ * Detect which package manager is available, preferring pnpm → yarn → npm.
+ * Returns the binary name ('pnpm' | 'yarn' | 'npm').
+ */
+function detectPackageManager() {
+    for (const pm of ['pnpm', 'yarn']) {
+        const result = (0, child_process_1.spawnSync)(pm, ['--version'], { encoding: 'utf8', shell: true });
+        if (result.status === 0)
+            return pm;
+    }
+    return 'npm';
+}
+/**
+ * Build the `create-next-app` scaffold command for a given package manager.
+ * Matches the exact defaults that `pnpm create next-app@latest --yes` uses:
+ *   - TypeScript
+ *   - ESLint
+ *   - No Tailwind
+ *   - NO --src-dir  (app/ lives at project root)
+ *   - App Router or Pages Router based on user choice
+ *   - import alias @/*
+ *   - --yes skips all interactive prompts
+ */
+function buildCreateCommand(pm, targetDir, typescript, router) {
+    const tsFlag = typescript ? '--typescript' : '--js';
+    const routerFlag = router === 'app' ? '--app' : '--no-app';
+    if (pm === 'pnpm') {
+        return [
+            'pnpm',
+            'create',
+            'next-app@latest',
+            targetDir,
+            '--yes',
+            tsFlag,
+            '--eslint',
+            '--no-tailwind',
+            routerFlag,
+            '--no-src-dir',
+            '--import-alias', '@/*',
+        ].join(' ');
+    }
+    if (pm === 'yarn') {
+        return [
+            'yarn',
+            'create',
+            'next-app',
+            targetDir,
+            tsFlag,
+            '--eslint',
+            '--no-tailwind',
+            routerFlag,
+            '--no-src-dir',
+            '--import-alias', '@/*',
+            '--yes',
+        ].join(' ');
+    }
+    // npm / npx
+    return [
+        'npx',
+        '--yes',
+        'create-next-app@latest',
+        targetDir,
+        '--yes',
+        tsFlag,
+        '--eslint',
+        '--no-tailwind',
+        routerFlag,
+        '--no-src-dir',
+        '--import-alias', '@/*',
+    ].join(' ');
+}
+/**
+ * Build the install command for rkk-next.
+ */
+function buildInstallCommand(pm) {
+    if (pm === 'pnpm')
+        return 'pnpm add rkk-next';
+    if (pm === 'yarn')
+        return 'yarn add rkk-next';
+    return 'npm install rkk-next --legacy-peer-deps';
+}
 program
     .name('create-next-rkk')
     .description('Create a new Next.js app with rkk-next pre-configured')
-    .version('2.0.2')
+    .version('2.0.3')
     .argument('[project-name]', 'name of your project')
     .action(async (projectName) => {
     console.log(chalk_1.default.bold.cyan('\n🚀 Create RKK Next.js App\n'));
@@ -113,63 +196,48 @@ program
         console.error(chalk_1.default.red(`\nInvalid project name: ${validation.reason}\n`));
         process.exit(1);
     }
+    const pm = detectPackageManager();
     const projectPath = path.join(process.cwd(), targetDir);
     let createdProject = false;
     let activeStep = null;
-    // Step 1: Create Next.js app
     const spinner = (0, ora_1.default)('Creating Next.js application...').start();
     try {
-        // Use create-next-app with all options specified to avoid prompts.
-        // --yes tells npx to auto-install create-next-app without asking.
-        const createNextAppCmd = [
-            'npx',
-            '--yes',
-            'create-next-app@latest',
-            targetDir,
-            answers.typescript ? '--typescript' : '--js',
-            '--eslint',
-            '--no-tailwind',
-            '--src-dir',
-            answers.router === 'app' ? '--app' : '--no-app',
-            '--import-alias', '@/*',
-            '--no-git',
-        ].join(' ');
+        // ── Step 1: Scaffold with create-next-app ──────────────────────────────
+        const createCmd = buildCreateCommand(pm, targetDir, answers.typescript, answers.router);
         activeStep = 'create-app';
-        (0, child_process_1.execSync)(createNextAppCmd, {
+        (0, child_process_1.execSync)(createCmd, {
             stdio: 'inherit',
-            cwd: process.cwd()
+            cwd: process.cwd(),
         });
         spinner.succeed('Next.js application created!');
         createdProject = true;
-        // Verify directory exists
         if (!fs.existsSync(projectPath)) {
-            throw new Error(`Project directory ${targetDir} was not created`);
+            throw new Error(`Project directory "${targetDir}" was not created`);
         }
-        // Step 2: Install rkk-next
+        // ── Step 2: Install rkk-next ───────────────────────────────────────────
         if (answers.installDeps) {
             activeStep = 'install-rkk';
-            spinner.start('Installing rkk-next...');
-            (0, child_process_1.execSync)('npm install rkk-next --legacy-peer-deps', {
+            spinner.start(`Installing rkk-next (via ${pm})...`);
+            (0, child_process_1.execSync)(buildInstallCommand(pm), {
                 stdio: 'inherit',
-                cwd: projectPath
+                cwd: projectPath,
             });
             spinner.succeed('rkk-next installed!');
         }
-        // Step 3: Setup template files
+        // ── Step 3: Inject rkk-next into generated files ───────────────────────
         activeStep = 'setup-templates';
         spinner.start('Setting up rkk-next configuration...');
         setupTemplateFiles(projectPath, answers.router, answers.typescript);
         spinner.succeed('Configuration complete!');
-        // Success message
+        // ── Done ───────────────────────────────────────────────────────────────
         console.log(chalk_1.default.green.bold('\n✨ Success! Created ' + targetDir));
-        console.log(chalk_1.default.cyan('\n📁 Inside your project directory:\n'));
+        console.log(chalk_1.default.cyan('\nGet started:\n'));
         console.log(chalk_1.default.white('  cd ' + targetDir));
         if (!answers.installDeps) {
-            console.log(chalk_1.default.white('  npm install'));
+            console.log(chalk_1.default.white(`  ${pm} install`));
         }
-        console.log(chalk_1.default.white('  npm run dev'));
-        console.log(chalk_1.default.cyan('\n📚 Documentation:'));
-        console.log(chalk_1.default.white('  https://github.com/ROHIT8759/rkk-next\n'));
+        console.log(chalk_1.default.white(`  ${pm === 'npm' ? 'npm run' : pm} dev`));
+        console.log(chalk_1.default.cyan('\n📚 Docs: https://github.com/ROHIT8759/rkk-next\n'));
         console.log(chalk_1.default.yellow('Happy coding! 🎉\n'));
     }
     catch (error) {
@@ -189,112 +257,222 @@ program
         process.exit(1);
     }
 });
+/**
+ * Inject rkk-next features into the scaffolded project.
+ *
+ * Final structure (App Router, matches pnpm create next-app@latest):
+ *
+ *   app/
+ *     layout.tsx
+ *     page.tsx
+ *     globals.css          (kept from scaffold)
+ *     api/
+ *       health/
+ *         route.ts         ← simple health-check
+ *       hello/
+ *         route.ts         ← demo JSON endpoint with rkk middleware
+ *   public/                (kept from scaffold)
+ *   next.config.ts
+ *   tsconfig.json          (kept from scaffold)
+ *   package.json           (kept from scaffold)
+ *   eslint.config.mjs      (kept from scaffold)
+ *   postcss.config.mjs     (kept from scaffold)
+ *   pnpm-lock.yaml         (kept from scaffold)
+ */
 function setupTemplateFiles(projectDir, router, typescript) {
     const ext = typescript ? 'tsx' : 'jsx';
-    const srcDir = path.join(projectDir, 'src');
+    const routeExt = typescript ? 'ts' : 'js';
     if (router === 'pages') {
-        // Setup Pages Router
-        const pagesDir = path.join(srcDir, 'pages');
-        // _app file
-        const appContent = `import type { AppProps } from 'next/app';
-import { reportWebVitals } from 'rkk-next';
-import '../styles/globals.css';
-
-export default function App({ Component, pageProps }: AppProps) {
-  return <Component {...pageProps} />;
-}
-
-export { reportWebVitals };
-`;
-        // index.tsx with rkk-next
-        const indexContent = `import { MetaManager, SmartLink, OptimizedImage } from 'rkk-next';
-
-export default function Home() {
-  return (
-    <>
-      <MetaManager
-        title="Home | My App"
-        description="Built with rkk-next and Next.js"
-        keywords="nextjs, seo, performance"
-      />
-
-      <main style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
-        <h1>Welcome to Your RKK Next.js App!</h1>
-        <p>This app is pre-configured with rkk-next for SEO, performance, and routing optimization.</p>
-        
-        <SmartLink href="/about">
-          Learn More →
-        </SmartLink>
-      </main>
-    </>
-  );
-}
-`;
-        fs.writeFileSync(path.join(pagesDir, `_app.${ext}`), appContent);
-        fs.writeFileSync(path.join(pagesDir, `index.${ext}`), indexContent);
+        // ── Pages Router ────────────────────────────────────────────────────────
+        // Structure:
+        //   pages/
+        //     _app.tsx
+        //     index.tsx
+        //     api/
+        //       health.ts
+        //       hello.ts
+        const pagesDir = path.join(projectDir, 'pages');
+        const pagesApiDir = path.join(pagesDir, 'api');
+        fs.mkdirSync(pagesApiDir, { recursive: true });
+        // pages/_app.tsx
+        fs.writeFileSync(path.join(pagesDir, `_app.${ext}`), `import type { AppProps } from 'next/app';
+import { reportWebVitals } from 'rkk-next';
+import '../styles/globals.css';
+
+export default function App({ Component, pageProps }: AppProps) {
+  return <Component {...pageProps} />;
+}
+
+export { reportWebVitals };
+`);
+        // pages/index.tsx
+        fs.writeFileSync(path.join(pagesDir, `index.${ext}`), `import { MetaManager, SmartLink } from 'rkk-next';
+
+export default function Home() {
+  return (
+    <>
+      <MetaManager
+        title="Home | My App"
+        description="Built with rkk-next and Next.js"
+        keywords="nextjs, seo, performance"
+      />
+      <main style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
+        <h1>Welcome to Your RKK Next.js App!</h1>
+        <p>Pre-configured with rkk-next for SEO, performance, and routing.</p>
+        <SmartLink href="/about">Learn More →</SmartLink>
+      </main>
+    </>
+  );
+}
+`);
+        // pages/api/health.ts
+        fs.writeFileSync(path.join(pagesApiDir, `health.${routeExt}`), `import type { NextApiRequest, NextApiResponse } from 'next';
+import { composeMiddleware, cors, logger } from 'rkk-next';
+
+function handler(_req: NextApiRequest, res: NextApiResponse) {
+  res.status(200).json({ status: 'ok', timestamp: new Date().toISOString() });
+}
+
+export default composeMiddleware(
+  cors(),
+  logger()
+)(handler);
+`);
+        // pages/api/hello.ts
+        fs.writeFileSync(path.join(pagesApiDir, `hello.${routeExt}`), `import type { NextApiRequest, NextApiResponse } from 'next';
+import { composeMiddleware, cors, rateLimit, logger, jsonResponse } from 'rkk-next';
+
+function handler(req: NextApiRequest, res: NextApiResponse) {
+  jsonResponse(res, 200, { message: 'Hello from rkk-next!', method: req.method });
+}
+
+export default composeMiddleware(
+  cors(),
+  rateLimit({ windowMs: 60_000, max: 60 }),
+  logger()
+)(handler);
+`);
     }
     else {
-        // Setup App Router
-        const appDir = path.join(srcDir, 'app');
-        // layout.tsx
-        const layoutContent = `import { generateAppMetadata } from 'rkk-next';
-import './globals.css';
-
-export const metadata = generateAppMetadata({
-  title: 'My RKK App',
-  description: 'Built with rkk-next and Next.js',
-  image: '/og-image.png',
-});
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <html lang="en">
-      <body>{children}</body>
-    </html>
-  );
-}
-`;
-        // page.tsx
-        const pageContent = `import { JsonLd, OptimizedImage } from 'rkk-next';
-import Link from 'next/link';
-
-export default function HomePage() {
-  return (
-    <>
-      <JsonLd
-        type="WebSite"
-        data={{
-          name: "My RKK App",
-          url: "https://myapp.com",
-        }}
-      />
-
-      <main style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
-        <h1>Welcome to Your RKK Next.js App!</h1>
-        <p>This app is pre-configured with rkk-next for SEO, performance, and routing optimization.</p>
-        
-        <Link href="/about">Learn More →</Link>
-      </main>
-    </>
-  );
-}
-`;
-        fs.writeFileSync(path.join(appDir, `layout.${ext}`), layoutContent);
-        fs.writeFileSync(path.join(appDir, `page.${ext}`), pageContent);
+        // ── App Router ──────────────────────────────────────────────────────────
+        // Structure (app/ at project root — NO src/):
+        //   app/
+        //     layout.tsx
+        //     page.tsx
+        //     globals.css        (kept from scaffold)
+        //     api/
+        //       health/
+        //         route.ts
+        //       hello/
+        //         route.ts
+        const appDir = path.join(projectDir, 'app');
+        const apiDir = path.join(appDir, 'api');
+        const healthDir = path.join(apiDir, 'health');
+        const helloDir = path.join(apiDir, 'hello');
+        fs.mkdirSync(healthDir, { recursive: true });
+        fs.mkdirSync(helloDir, { recursive: true });
+        // app/layout.tsx
+        fs.writeFileSync(path.join(appDir, `layout.${ext}`), `import type { Metadata } from 'next';
+import { generateAppMetadata } from 'rkk-next';
+import './globals.css';
+
+export const metadata: Metadata = generateAppMetadata({
+  title: 'My RKK App',
+  description: 'Built with rkk-next and Next.js',
+  image: '/og-image.png',
+});
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
+`);
+        // app/page.tsx
+        fs.writeFileSync(path.join(appDir, `page.${ext}`), `import { JsonLd } from 'rkk-next';
+import Link from 'next/link';
+
+export default function HomePage() {
+  return (
+    <>
+      <JsonLd
+        type="WebSite"
+        data={{
+          name: 'My RKK App',
+          url: 'https://myapp.com',
+        }}
+      />
+      <main style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
+        <h1>Welcome to Your RKK Next.js App!</h1>
+        <p>Pre-configured with rkk-next for SEO, performance, and routing.</p>
+        <Link href="/about">Learn More →</Link>
+      </main>
+    </>
+  );
+}
+`);
+        // app/api/health/route.ts  — GET /api/health
+        fs.writeFileSync(path.join(healthDir, `route.${routeExt}`), `import { NextResponse } from 'next/server';
+
+export const dynamic = 'force-dynamic';
+
+export function GET() {
+  return NextResponse.json(
+    { status: 'ok', timestamp: new Date().toISOString() },
+    { status: 200 }
+  );
+}
+`);
+        // app/api/hello/route.ts  — GET + POST /api/hello (with rkk-next middleware)
+        fs.writeFileSync(path.join(helloDir, `route.${routeExt}`), `import { NextRequest, NextResponse } from 'next/server';
+import { cacheHeaders, SHORT_TERM_CACHE } from 'rkk-next';
+
+export const dynamic = 'force-dynamic';
+
+export function GET(req: NextRequest) {
+  const { searchParams } = new URL(req.url);
+  const name = searchParams.get('name') ?? 'World';
+
+  return NextResponse.json(
+    { message: \`Hello, \${name}! Powered by rkk-next.\` },
+    {
+      status: 200,
+      headers: {
+        // Apply rkk-next short-term cache headers
+        'Cache-Control': SHORT_TERM_CACHE[0].value,
+      },
     }
-    // Create next.config.js with rkk-next
-    const configContent = `/** @type {import('next').NextConfig} */
-const nextConfig = {
-  reactStrictMode: true,
-};
-
-module.exports = nextConfig;
-`;
-    fs.writeFileSync(path.join(projectDir, 'next.config.js'), configContent);
+  );
+}
+
+export async function POST(req: NextRequest) {
+  const body = await req.json().catch(() => ({}));
+  return NextResponse.json(
+    { received: body, timestamp: new Date().toISOString() },
+    { status: 201 }
+  );
+}
+`);
+    }
+    // ── next.config.ts (TypeScript, matches pnpm scaffold) ───────────────────
+    const configTsPath = path.join(projectDir, 'next.config.ts');
+    const configJsPath = path.join(projectDir, 'next.config.js');
+    fs.writeFileSync(configTsPath, `import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {
+  reactStrictMode: true,
+};
+
+export default nextConfig;
+`);
+    if (fs.existsSync(configJsPath))
+        fs.unlinkSync(configJsPath);
 }
 async function runCli(argv = process.argv) {
     await program.parseAsync(argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-rkk",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "CLI tool to create Next.js apps with rkk-next pre-configured",
   "author": "Rohit Kumar Kundu",
   "license": "MIT",