@djangocfg/nextjs 2.1.542 → 2.1.543

package/dist/config/index.d.mts

@@ -182,7 +182,17 @@ declare function resolveCspVendors(vendors: readonly string[] | undefined, warnU
  * ```
  */
 
-interface BaseNextConfigOptions {
+/**
+ * Second argument Next.js passes to the `webpack` hook. Derived from Next's own
+ * signature rather than re-declared, so it tracks upstream.
+ */
+type WebpackContext = Parameters<NonNullable<NextConfig['webpack']>>[1];
+/**
+ * DjangoCFG-specific options. Every other Next.js option passes through via the
+ * `NextConfig` half of `BaseNextConfigOptions`; the keys redeclared here are
+ * omitted from it because this package narrows or re-purposes them.
+ */
+interface DjangoCfgNextOptions {
     /** Static build path (used when NEXT_PUBLIC_STATIC_BUILD=true) */
     isDefaultCfgAdmin?: boolean;
     /** Additional transpile packages (merged with defaults) */
@@ -314,11 +324,7 @@ interface BaseNextConfigOptions {
     /** Turbopack configuration (Next.js 16+ default bundler) */
     turbopack?: NextConfig['turbopack'];
     /** Custom webpack configuration function (called after base webpack logic) */
-    webpack?: (config: Configuration, options: {
-        isServer: boolean;
-        dev: boolean;
-        [key: string]: any;
-    }) => Configuration | void;
+    webpack?: (config: Configuration, options: WebpackContext) => Configuration | void;
     /** Custom experimental options (merged with defaults) */
     experimental?: NextConfig['experimental'];
     /** Custom env variables (merged with defaults) */
@@ -329,9 +335,11 @@ interface BaseNextConfigOptions {
     headers?: NextConfig['headers'];
     /** Additional rewrites */
     rewrites?: NextConfig['rewrites'];
-    /** Override any Next.js config option */
-    [key: string]: any;
 }
+/**
+ * DjangoCFG options plus every remaining Next.js config option.
+ */
+type BaseNextConfigOptions = DjangoCfgNextOptions & Omit<NextConfig, keyof DjangoCfgNextOptions>;
 /**
  * Create base Next.js configuration with standard DjangoCFG settings
  *
@@ -354,7 +362,12 @@ declare const DEFAULT_OPTIMIZE_PACKAGES: readonly ["@djangocfg/ui-core", "@djang
  *
  * Recursively merges objects, replacing arrays instead of merging them.
  */
-declare function deepMerge<T extends Record<string, any>>(target: T, source: Partial<T>): T;
+/**
+ * `T extends object` rather than `Record<string, unknown>`: call sites pass
+ * Next.js config interfaces, which have declared keys and no index signature —
+ * they are not assignable to `Record<string, unknown>`.
+ */
+declare function deepMerge<T extends object>(target: T, source: Partial<T>): T;
 
 /**
  * Environment Variable Utilities

package/dist/config/index.mjs

@@ -349,7 +349,7 @@ function addCompressionPlugins(config, options = {}) {
       );
     }
     return true;
-  } catch (error) {
+  } catch {
     return false;
   }
 }
@@ -557,7 +557,7 @@ async function installSinglePackage(pkg, pm, index, total) {
   const spinner = createSpinner(`${chalk.dim(progress)} Installing ${chalk.cyan(pkg.name)}...`);
   spinner.start();
   return new Promise((resolve) => {
-    const [cmd, ...args] = command.split(" ");
+    const [cmd = pm, ...args] = command.split(" ");
     const proc = spawn(cmd, args, {
       shell: true,
       cwd: process.cwd(),
@@ -593,13 +593,13 @@ async function installPackagesWithProgress(packages) {
   console.log(chalk.bold(`  Installing ${total} package${total > 1 ? "s" : ""}...`));
   console.log("");
   let successCount = 0;
-  let failedPackages = [];
-  for (let i = 0; i < packages.length; i++) {
-    const success = await installSinglePackage(packages[i], pm, i, total);
+  const failedPackages = [];
+  for (const [i, pkg] of packages.entries()) {
+    const success = await installSinglePackage(pkg, pm, i, total);
     if (success) {
       successCount++;
     } else {
-      failedPackages.push(packages[i].name);
+      failedPackages.push(pkg.name);
     }
   }
   console.log("");
@@ -964,12 +964,12 @@ async function updatePackagesWithProgress(packages) {
   console.log("");
   let successCount = 0;
   const failedPackages = [];
-  for (let i = 0; i < packages.length; i++) {
-    const success = await updateSinglePackage(packages[i], pm, i, total);
+  for (const [i, pkg] of packages.entries()) {
+    const success = await updateSinglePackage(pkg, pm, i, total);
     if (success) {
       successCount++;
     } else {
-      failedPackages.push(packages[i].name);
+      failedPackages.push(pkg.name);
     }
   }
   console.log("");
@@ -1225,22 +1225,17 @@ function resetDevStartupState() {
 }
 
 // src/config/utils/deepMerge.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function deepMerge(target, source) {
   const output = { ...target };
-  for (const key in source) {
-    if (source[key] === void 0) continue;
-    if (Array.isArray(source[key])) {
-      output[key] = source[key];
-    } 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]);
-      } else {
-        output[key] = source[key];
-      }
-    } else {
-      output[key] = source[key];
-    }
+  for (const key of Object.keys(source)) {
+    const sourceValue = source[key];
+    if (sourceValue === void 0) continue;
+    const targetValue = output[key];
+    const merged = isPlainObject(sourceValue) && isPlainObject(targetValue) ? deepMerge(targetValue, sourceValue) : sourceValue;
+    output[key] = merged;
   }
   return output;
 }
@@ -1450,23 +1445,28 @@ function createBaseNextConfig(options = {}) {
       return config;
     }
   };
-  const {
-    i18n: i18nOptions,
-    pwa: pwaOptions,
-    transpilePackages,
-    optimizePackageImports,
-    isDefaultCfgAdmin,
-    checkUpdates,
-    autoUpdate,
-    forceCheckWorkspace,
-    checkPackages: checkPackages2,
-    autoInstall,
-    allowIframeFrom,
-    dpop,
-    stripe,
-    csp,
-    ...nextConfigOptions
-  } = options;
+  const { i18n: i18nOptions, pwa: pwaOptions } = options;
+  const DJANGOCFG_ONLY_KEYS = [
+    "i18n",
+    "pwa",
+    "transpilePackages",
+    "optimizePackageImports",
+    "isDefaultCfgAdmin",
+    "checkUpdates",
+    "autoUpdate",
+    "forceCheckWorkspace",
+    "checkPackages",
+    "autoInstall",
+    "allowIframeFrom",
+    "dpop",
+    "stripe",
+    "csp"
+  ];
+  const nextConfigOptions = Object.fromEntries(
+    Object.entries(options).filter(
+      ([key]) => !DJANGOCFG_ONLY_KEYS.includes(key)
+    )
+  );
   let finalConfig = deepMerge(baseConfig, nextConfigOptions);
   if (pwaOptions) {
     finalConfig = withPWA(finalConfig, pwaOptions);