@djangocfg/nextjs 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/nextjs",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Next.js utilities and components: sitemap, health, OG images, legal pages, error pages",
   "keywords": [
     "nextjs",
@@ -109,14 +109,14 @@
     "next": "^15.4.4",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "@djangocfg/ui": "^1.4.32",
-    "@djangocfg/layouts": "^2.0.2",
-    "@djangocfg/api": "^1.4.32",
+    "@djangocfg/ui": "^1.4.33",
+    "@djangocfg/layouts": "^2.0.3",
+    "@djangocfg/api": "^1.4.33",
     "lucide-react": "^0.469.0"
   },
   "devDependencies": {
-    "@djangocfg/typescript-config": "^1.4.32",
-    "@djangocfg/layouts": "^2.0.2",
+    "@djangocfg/typescript-config": "^1.4.33",
+    "@djangocfg/layouts": "^2.0.3",
     "@types/node": "^24.7.2",
     "@types/react": "19.2.2",
     "@types/react-dom": "19.2.1",

package/src/components/HomePage.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { useEffect } from 'react';
-import { useRouter } from 'next/navigation';
 import { useAuth } from '@djangocfg/layouts';
+import { useRouter } from '@djangocfg/ui/hooks';
 import { Loader2 } from 'lucide-react';
 
 export interface HomePageProps {

package/src/config/base-next-config.ts

@@ -23,6 +23,7 @@
 
 import type { NextConfig } from 'next';
 import type { Configuration as WebpackConfig } from 'webpack';
+import { deepMerge } from './deepMerge';
 
 // ─────────────────────────────────────────────────────────────────────────
 // Standard Environment Variables
@@ -36,10 +37,8 @@ const isDev = process.env.NODE_ENV === 'development';
 // ─────────────────────────────────────────────────────────────────────────
 
 export interface BaseNextConfigOptions {
-  /** Base path for static builds (default: '/cfg/admin') */
-  basePath?: string;
-  /** Static build path - used when NEXT_PUBLIC_STATIC_BUILD=true (overrides basePath for static builds) */
-  staticBuildPath?: string;
+  /** Static build path (used when NEXT_PUBLIC_STATIC_BUILD=true) */
+  isDefaultCfgAdmin?: boolean;
   /** Additional transpile packages (merged with defaults) */
   transpilePackages?: string[];
   /** Additional optimize package imports (merged with defaults) */
@@ -47,7 +46,7 @@ export interface BaseNextConfigOptions {
   /** Custom webpack configuration function (called after base webpack logic) */
   webpack?: (
     config: WebpackConfig,
-    options: { isServer: boolean; dev: boolean; [key: string]: any }
+    options: { isServer: boolean; dev: boolean;[key: string]: any }
   ) => WebpackConfig | void;
   /** Custom experimental options (merged with defaults) */
   experimental?: NextConfig['experimental'];
@@ -57,38 +56,6 @@ export interface BaseNextConfigOptions {
   [key: string]: any;
 }
 
-// ─────────────────────────────────────────────────────────────────────────
-// Deep Merge Helper (simple implementation)
-// ─────────────────────────────────────────────────────────────────────────
-
-function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>): T {
-  const output = { ...target };
-  
-  for (const key in source) {
-    if (source[key] === undefined) continue;
-    
-    // Arrays: replace (don't merge arrays)
-    if (Array.isArray(source[key])) {
-      output[key] = source[key] as any;
-    }
-    // Objects: deep merge
-    else if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
-      const targetValue = output[key];
-      if (targetValue && typeof targetValue === 'object' && !Array.isArray(targetValue)) {
-        output[key] = deepMerge(targetValue, source[key] as any);
-      } else {
-        output[key] = source[key] as any;
-      }
-    }
-    // Primitives: replace
-    else {
-      output[key] = source[key] as any;
-    }
-  }
-  
-  return output;
-}
-
 // ─────────────────────────────────────────────────────────────────────────
 // Base Configuration Factory
 // ─────────────────────────────────────────────────────────────────────────
@@ -102,10 +69,12 @@ function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>)
 export function createBaseNextConfig(
   options: BaseNextConfigOptions = {}
 ): NextConfig {
-  // Determine basePath: staticBuildPath takes precedence for static builds, then basePath, then default
-  const basePath = isStaticBuild 
-    ? (options.staticBuildPath || options.basePath)
-    : (options.basePath || '');
+
+  // If static build not provided, use default for nextjs-admin development
+  const staticBuildPath = options.isDefaultCfgAdmin ? '/cfg/admin' : '/cfg/nextjs-admin';
+  const basePath = isStaticBuild ? staticBuildPath : '';
+  const apiUrl = isStaticBuild ? '' : process.env.NEXT_PUBLIC_API_URL || '';
+  const siteUrl = isStaticBuild ? '' : process.env.NEXT_PUBLIC_SITE_URL || '';
 
   // Base configuration
   const baseConfig: NextConfig = {
@@ -116,8 +85,8 @@ export function createBaseNextConfig(
     ...(isStaticBuild && {
       output: 'export' as const,
       distDir: 'out',
-      basePath,
-      assetPrefix: basePath,
+      basePath: basePath,
+      // assetPrefix: basePath,
       // Fix for Next.js 15.5.4: prevent 500.html generation issue
       // 
       // PROBLEM: In App Router, error.tsx is a client component ('use client')
@@ -139,7 +108,8 @@ export function createBaseNextConfig(
     // Environment variables
     env: {
       NEXT_PUBLIC_BASE_PATH: basePath,
-      NEXT_PUBLIC_API_URL: isStaticBuild ? '' : process.env.NEXT_PUBLIC_API_URL,
+      NEXT_PUBLIC_API_URL: apiUrl,
+      NEXT_PUBLIC_SITE_URL: siteUrl,
       ...options.env,
     },
 
@@ -180,7 +150,7 @@ export function createBaseNextConfig(
     },
 
     // Webpack configuration
-    webpack: (config: WebpackConfig, webpackOptions: { isServer: boolean; dev: boolean; [key: string]: any }) => {
+    webpack: (config: WebpackConfig, webpackOptions: { isServer: boolean; dev: boolean;[key: string]: any }) => {
       const { isServer, dev } = webpackOptions;
 
       // Dev mode optimizations
@@ -209,7 +179,7 @@ export function createBaseNextConfig(
         try {
           // Dynamic import to avoid bundling compression-webpack-plugin
           const CompressionPlugin = require('compression-webpack-plugin');
-          
+
           // Gzip compression
           config.plugins.push(
             new CompressionPlugin({
@@ -255,8 +225,6 @@ export function createBaseNextConfig(
 
   // Cleanup: Remove our custom options that are not part of NextConfig
   // These are internal to BaseNextConfigOptions and should not be in the final config
-  delete (finalConfig as any).basePath;
-  delete (finalConfig as any).staticBuildPath;
   delete (finalConfig as any).optimizePackageImports;
   // Note: We don't delete transpilePackages, experimental, env, webpack
   // as they are valid NextConfig keys and may have been overridden by user

package/src/config/deepMerge.ts

@@ -0,0 +1,33 @@
+
+// ─────────────────────────────────────────────────────────────────────────
+// Deep Merge Helper (simple implementation)
+// ─────────────────────────────────────────────────────────────────────────
+
+export function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>): T {
+    const output = { ...target };
+  
+    for (const key in source) {
+      if (source[key] === undefined) continue;
+  
+      // Arrays: replace (don't merge arrays)
+      if (Array.isArray(source[key])) {
+        output[key] = source[key] as any;
+      }
+      // Objects: deep merge
+      else if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
+        const targetValue = output[key];
+        if (targetValue && typeof targetValue === 'object' && !Array.isArray(targetValue)) {
+          output[key] = deepMerge(targetValue, source[key] as any);
+        } else {
+          output[key] = source[key] as any;
+        }
+      }
+      // Primitives: replace
+      else {
+        output[key] = source[key] as any;
+      }
+    }
+  
+    return output;
+  }
+  

package/src/navigation/index.ts

@@ -6,4 +6,3 @@
 
 export * from './types';
 export * from './utils';
-

package/src/navigation/utils.ts

@@ -10,40 +10,24 @@ import type { RouteDefinition, RouteMetadata, MenuItem } from './types';
 // Route Definition Helper
 // ─────────────────────────────────────────────────────────────────────────
 
-export interface RouteConfig {
-  /** Base path for static builds (optional) */
-  basePath?: string;
-  /** Whether this is a static build (optional, defaults to false) */
-  isStaticBuild?: boolean;
-}
-
 /**
- * Manage base path for routes
- */
-function manageBasePath(path: string, config?: RouteConfig): string {
-  if (!config?.isStaticBuild || !config?.basePath) {
-    return path;
-  }
-  return `${config.basePath}${path}`;
-}
-
-/**
- * Define a route with automatic basePath injection
+ * Define a route with metadata
  *
- * NOTE: For static builds, Next.js automatically prepends basePath to <Link> hrefs,
- * so we don't add it here. For dev mode, we need to add it manually.
+ * IMPORTANT: Next.js automatically handles basePath for <Link> components when
+ * basePath is set in next.config.ts. We should NOT add basePath manually here,
+ * as it would cause double-prefixing in static builds.
+ *
+ * @param path - Route path (e.g., '/dashboard', '/admin/users')
+ * @param metadata - Route metadata (label, icon, etc.)
  */
 export function defineRoute(
   path: string,
   metadata: RouteMetadata,
-  config?: RouteConfig
 ): RouteDefinition {
-  // In static builds, Next.js handles basePath automatically
-  // In dev mode, we need to add it manually for consistency
-  const fullPath = manageBasePath(path, config);
-
+  // Always return path as-is. Next.js will handle basePath automatically
+  // for <Link> components when basePath is set in next.config.ts
   return {
-    path: fullPath,
+    path,
     metadata,
   };
 }
@@ -58,11 +42,11 @@ export function defineRoute(
 export function getUnauthenticatedRedirect(
   path: string,
   authPath: string = '/auth',
-  config?: RouteConfig
 ): string | null {
   if (path.startsWith('/private') || path.startsWith('/admin')) {
-    // In static builds, Next.js handles basePath automatically
-    return manageBasePath(authPath, config);
+    // Return path as-is. Next.js will handle basePath automatically for router.push()
+    // when basePath is set in next.config.ts
+    return authPath;
   }
   return null;
 }
@@ -72,10 +56,10 @@ export function getUnauthenticatedRedirect(
  */
 export function redirectToAuth(
   authPath: string = '/auth',
-  config?: RouteConfig
 ): string {
-  // In static builds, Next.js handles basePath automatically
-  return manageBasePath(authPath, config);
+  // Return path as-is. Next.js will handle basePath automatically for router.push()
+  // when basePath is set in next.config.ts
+  return authPath;
 }
 
 // ─────────────────────────────────────────────────────────────────────────

package/src/og-image/utils/metadata.ts

@@ -93,13 +93,8 @@ function getSiteUrl(): string {
     return process.env.NEXT_PUBLIC_SITE_URL;
   }
   
-  // Fallback to VERCEL_URL if available
-  if (typeof process !== 'undefined' && process.env.VERCEL_URL) {
-    return `https://${process.env.VERCEL_URL}`;
-  }
-  
   // Development fallback
-  return 'http://localhost:3000';
+  return '';
 }
 
 export function generateOgImageMetadata(
@@ -161,8 +156,8 @@ export function generateOgImageMetadata(
       : [metadata.twitter.images]
     : [];
 
-  // Merge with existing metadata
-  return {
+  // Build final metadata object
+  const finalMetadata: Metadata = {
     ...metadata,
     openGraph: {
       ...metadata.openGraph,
@@ -188,6 +183,23 @@ export function generateOgImageMetadata(
       ],
     },
   };
+
+  // Automatically add metadataBase if siteUrl is an absolute URL
+  // metadataBase requires absolute URL - skip if siteUrl is relative path (like /cfg/admin)
+  // Only add if not already set in input metadata
+  if (!finalMetadata.metadataBase && siteUrl) {
+    // Check if siteUrl is an absolute URL (starts with http:// or https://)
+    if (siteUrl.startsWith('http://') || siteUrl.startsWith('https://')) {
+      try {
+        finalMetadata.metadataBase = new URL(siteUrl);
+      } catch (e) {
+        // If URL construction fails, skip metadataBase
+        // This shouldn't happen if we check for http/https, but just in case
+      }
+    }
+  }
+
+  return finalMetadata;
 }
 
 /**