@djangocfg/nextjs 2.1.35 → 2.1.37

package/dist/config/index.mjs

@@ -14,7 +14,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@djangocfg/nextjs",
-      version: "2.1.35",
+      version: "2.1.37",
       description: "Next.js server utilities: sitemap, health, OG images, contact forms, navigation, config",
       keywords: [
         "nextjs",
@@ -92,18 +92,42 @@ var require_package = __commonJS({
           types: "./dist/scripts/index.d.mts",
           import: "./dist/scripts/index.mjs",
           default: "./dist/scripts/index.mjs"
+        },
+        "./pwa": {
+          types: "./dist/pwa/index.d.mts",
+          import: "./dist/pwa/index.mjs",
+          default: "./dist/pwa/index.mjs"
+        },
+        "./pwa/worker": {
+          types: "./dist/pwa/worker/index.d.mts",
+          import: "./dist/pwa/worker/index.mjs",
+          default: "./dist/pwa/worker/index.mjs"
+        },
+        "./worker": {
+          types: "./dist/pwa/worker/index.d.mts",
+          import: "./dist/pwa/worker/index.mjs",
+          default: "./dist/pwa/worker/index.mjs"
+        },
+        "./pwa/server": {
+          types: "./dist/pwa/server/index.d.mts",
+          import: "./dist/pwa/server/index.mjs",
+          default: "./dist/pwa/server/index.mjs"
+        },
+        "./pwa/server/routes": {
+          types: "./dist/pwa/server/routes.d.mts",
+          import: "./dist/pwa/server/routes.mjs",
+          default: "./dist/pwa/server/routes.mjs"
         }
       },
       files: [
         "dist",
         "src",
-        "bin",
         "README.md",
         "LICENSE"
       ],
       bin: {
         "djangocfg-docs": "./dist/ai/cli.mjs",
-        "nextjs-dev": "./bin/dev-with-browser.js"
+        "djangocfg-pwa": "./dist/pwa/cli.mjs"
       },
       scripts: {
         build: "tsup",
@@ -112,17 +136,21 @@ var require_package = __commonJS({
         lint: "eslint .",
         check: "tsc --noEmit",
         "check-links": "tsx src/scripts/check-links.ts",
-        "ai-docs": "tsx src/ai/cli.ts"
+        "ai-docs": "tsx src/ai/cli.ts",
+        pwa: "tsx src/pwa/cli.ts"
       },
       peerDependencies: {
         next: "^16.0.10"
       },
       dependencies: {
-        "@ducanh2912/next-pwa": "^10.2.9",
+        "@serwist/next": "^9.2.3",
+        "@serwist/sw": "^9.2.3",
         chalk: "^5.3.0",
         conf: "^15.0.2",
         consola: "^3.4.2",
-        semver: "^7.7.3"
+        semver: "^7.7.3",
+        serwist: "^9.2.3",
+        "web-push": "^3.6.7"
       },
       devDependencies: {
         "@djangocfg/imgai": "workspace:*",
@@ -132,6 +160,7 @@ var require_package = __commonJS({
         "@types/react": "19.2.2",
         "@types/react-dom": "19.2.1",
         "@types/semver": "^7.7.1",
+        "@types/web-push": "^3.6.4",
         "@types/webpack": "^5.28.5",
         "@vercel/og": "^0.8.5",
         eslint: "^9.37.0",
@@ -1056,7 +1085,6 @@ function resetUpdaterPreferences() {
 
 // src/config/plugins/devStartup.ts
 var startupDone = false;
-var browserOpened = false;
 var DevStartupPlugin = class {
   constructor(options = {}) {
     this.options = options;
@@ -1067,10 +1095,6 @@ var DevStartupPlugin = class {
         startupDone = true;
         await this.runStartupTasks();
       }
-      if (this.options.openBrowser && !browserOpened) {
-        browserOpened = true;
-        this.openBrowser();
-      }
     });
   }
   async runStartupTasks() {
@@ -1079,6 +1103,7 @@ var DevStartupPlugin = class {
     if (version) {
       console.log(chalk4.dim(`  \u{1F4E6} @djangocfg/nextjs v${version}`));
     }
+    this.checkPWASetup();
     console.log(chalk4.magenta(`  ${AI_DOCS_HINT}
 `));
     if (this.options.checkUpdates !== false) {
@@ -1099,27 +1124,33 @@ var DevStartupPlugin = class {
       });
     }
   }
-  openBrowser() {
-    setTimeout(async () => {
-      try {
-        const { exec } = await import("child_process");
-        const port = process.env.PORT || "3000";
-        const url = `http://localhost:${port}`;
-        const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-        exec(`${command} ${url}`, (error) => {
-          if (error) {
-            console.warn(`Failed to open browser: ${error.message}`);
-          }
-        });
-      } catch (error) {
-        console.warn("Failed to open browser");
+  checkPWASetup() {
+    const fs = __require("fs");
+    const path = __require("path");
+    const cwd = process.cwd();
+    const swPath = path.join(cwd, "app", "sw.ts");
+    const manifestPath = path.join(cwd, "app", "manifest.ts");
+    const hasSW = fs.existsSync(swPath);
+    const hasManifest = fs.existsSync(manifestPath);
+    if (hasSW || hasManifest) {
+      console.log(chalk4.cyan("  \u{1F4F1} PWA Configuration:"));
+      if (hasSW) {
+        console.log(chalk4.green("     \u2713 Service Worker: app/sw.ts"));
+      } else {
+        console.log(chalk4.yellow("     \u26A0 Service Worker: not found"));
+      }
+      if (hasManifest) {
+        console.log(chalk4.green("     \u2713 Manifest: app/manifest.ts"));
+      } else {
+        console.log(chalk4.yellow("     \u26A0 Manifest: not found"));
       }
-    }, 2e3);
+      console.log(chalk4.dim("     \u2192 Check: DevTools \u2192 Application \u2192 Service Workers"));
+      console.log(chalk4.dim("     \u2192 Test push: import from @djangocfg/nextjs/pwa"));
+    }
   }
 };
 function resetDevStartupState() {
   startupDone = false;
-  browserOpened = false;
 }
 
 // src/config/plugins/compression.ts
@@ -1174,276 +1205,33 @@ function isCompressionAvailable() {
   return isPackageInstalled("compression-webpack-plugin");
 }
 
-// src/config/plugins/pwa.ts
+// src/pwa/plugin.ts
 import { consola as consola4 } from "consola";
-function isPWAAvailable() {
-  try {
-    __require.resolve("@ducanh2912/next-pwa");
-    return true;
-  } catch {
-    try {
-      __require.resolve("next-pwa");
-      consola4.warn(
-        "Found legacy next-pwa. Please use @ducanh2912/next-pwa for Next.js 13+ support.\nRun: pnpm remove next-pwa && pnpm add @ducanh2912/next-pwa"
-      );
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}
 function withPWA(nextConfig, options = {}) {
-  if (!isPWAAvailable()) {
-    consola4.error(
-      "@ducanh2912/next-pwa is missing!\nThis is unexpected as it should be installed automatically.\nTry: pnpm install --force\nPWA features will be disabled."
-    );
-    return nextConfig;
-  }
   const isDev2 = process.env.NODE_ENV === "development";
   const defaultOptions = {
-    dest: "public",
+    swSrc: "app/sw.ts",
+    swDest: "public/sw.js",
     disable: options.disable !== void 0 ? options.disable : isDev2,
-    register: true,
-    skipWaiting: true,
-    clientsClaim: true,
-    cleanupOutdatedCaches: true,
-    publicExcludes: ["!noprecache/**/*"],
-    buildExcludes: [/middleware-manifest\.json$/, /build-manifest\.json$/],
-    cacheStartUrl: true,
-    dynamicStartUrl: true,
+    cacheOnNavigation: true,
     reloadOnOnline: true,
     ...options
   };
   try {
-    const withPWAImport = __require("@ducanh2912/next-pwa").default;
-    return withPWAImport(defaultOptions)(nextConfig);
-  } catch {
-    try {
-      const withPWAImport = __require("next-pwa");
-      consola4.warn("Using legacy next-pwa. Upgrade to @ducanh2912/next-pwa for Next.js 13+ support");
-      return withPWAImport(defaultOptions)(nextConfig);
-    } catch (error) {
-      consola4.error("Failed to load next-pwa:", error);
-      return nextConfig;
-    }
-  }
-}
-var defaultRuntimeCaching = [
-  {
-    urlPattern: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
-    handler: "CacheFirst",
-    options: {
-      cacheName: "google-fonts-webfonts",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 365 * 24 * 60 * 60
-        // 1 year
-      }
-    }
-  },
-  {
-    urlPattern: /^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "google-fonts-stylesheets",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 7 * 24 * 60 * 60
-        // 1 week
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-font-assets",
-      expiration: {
-        maxEntries: 4,
-        maxAgeSeconds: 7 * 24 * 60 * 60
-        // 1 week
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-image-assets",
-      expiration: {
-        maxEntries: 64,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\/_next\/image\?url=.+$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "next-image",
-      expiration: {
-        maxEntries: 64,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:mp3|wav|ogg)$/i,
-    handler: "CacheFirst",
-    options: {
-      rangeRequests: true,
-      cacheName: "static-audio-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:mp4)$/i,
-    handler: "CacheFirst",
-    options: {
-      rangeRequests: true,
-      cacheName: "static-video-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:js)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-js-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:css|less)$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "static-style-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-    handler: "StaleWhileRevalidate",
-    options: {
-      cacheName: "next-data",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: /\.(?:json|xml|csv)$/i,
-    handler: "NetworkFirst",
-    options: {
-      cacheName: "static-data-assets",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
-  },
-  {
-    urlPattern: ({ url }) => {
-      const isSameOrigin = self.origin === url.origin;
-      if (!isSameOrigin) return false;
-      const pathname = url.pathname;
-      if (pathname.startsWith("/api/")) return false;
-      return true;
-    },
-    handler: "NetworkFirst",
-    options: {
-      cacheName: "pages",
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60
-        // 24 hours
-      }
-    }
+    const withSerwistInit = __require("@serwist/next").default;
+    const withSerwist = withSerwistInit({
+      swSrc: defaultOptions.swSrc,
+      swDest: defaultOptions.swDest,
+      disable: defaultOptions.disable,
+      cacheOnNavigation: defaultOptions.cacheOnNavigation,
+      reloadOnOnline: defaultOptions.reloadOnOnline,
+      ...defaultOptions.serwistOptions
+    });
+    return withSerwist(nextConfig);
+  } catch (error) {
+    consola4.error("Failed to configure Serwist:", error);
+    return nextConfig;
   }
-];
-function createApiCacheRule(apiUrl, options = {}) {
-  const {
-    strategy = "NetworkFirst",
-    maxAge = 300,
-    maxEntries = 50,
-    cacheName = "api-cache"
-  } = options;
-  return {
-    urlPattern: new RegExp(`^${apiUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/.*`, "i"),
-    handler: strategy,
-    options: {
-      cacheName,
-      expiration: {
-        maxEntries,
-        maxAgeSeconds: maxAge
-      },
-      networkTimeoutSeconds: 10
-    }
-  };
-}
-function createStaticAssetRule(extensions, options = {}) {
-  const {
-    strategy = "CacheFirst",
-    maxAge = 86400,
-    maxEntries = 64,
-    cacheName = "static-assets"
-  } = options;
-  const pattern = extensions.map((ext) => ext.replace(".", "")).join("|");
-  return {
-    urlPattern: new RegExp(`\\.(?:${pattern})$`, "i"),
-    handler: strategy,
-    options: {
-      cacheName,
-      expiration: {
-        maxEntries,
-        maxAgeSeconds: maxAge
-      }
-    }
-  };
-}
-function createCdnCacheRule(cdnUrl, options = {}) {
-  const {
-    strategy = "CacheFirst",
-    maxAge = 2592e3,
-    // 30 days
-    maxEntries = 100,
-    cacheName = "cdn-cache"
-  } = options;
-  return {
-    urlPattern: new RegExp(`^${cdnUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/.*`, "i"),
-    handler: strategy,
-    options: {
-      cacheName,
-      expiration: {
-        maxEntries,
-        maxAgeSeconds: maxAge
-      },
-      cacheableResponse: {
-        statuses: [0, 200]
-      }
-    }
-  };
 }
 
 // src/config/createNextConfig.ts
@@ -1513,6 +1301,9 @@ function createBaseNextConfig(options = {}) {
       ...DEFAULT_TRANSPILE_PACKAGES,
       ...options.transpilePackages || []
     ],
+    // Turbopack configuration (Next.js 16+ default bundler)
+    // Always set turbopack config to silence Next.js 16 warning about webpack config
+    turbopack: options.turbopack || {},
     // Experimental features
     experimental: {
       // Optimize package imports (only in production)
@@ -1530,9 +1321,6 @@ function createBaseNextConfig(options = {}) {
       ...options.experimental
     },
     // Webpack configuration
-    // NOTE: Next.js 16 uses Turbopack by default in dev mode, which doesn't support webpack plugins.
-    // DevStartupPlugin only runs in webpack mode (next dev --webpack).
-    // For Turbopack compatibility, consider using a custom dev script for browser auto-open.
     webpack: (config, webpackOptions) => {
       const { isServer, dev } = webpackOptions;
       if (dev && !isServer) {
@@ -1541,7 +1329,6 @@ function createBaseNextConfig(options = {}) {
         }
         config.plugins.push(
           new DevStartupPlugin({
-            openBrowser: options.openBrowser,
             checkUpdates: options.checkUpdates,
             autoUpdate: options.autoUpdate,
             forceCheckWorkspace: options.forceCheckWorkspace,
@@ -1575,7 +1362,6 @@ function createBaseNextConfig(options = {}) {
   let finalConfig = deepMerge(baseConfig, options);
   delete finalConfig.optimizePackageImports;
   delete finalConfig.isDefaultCfgAdmin;
-  delete finalConfig.openBrowser;
   delete finalConfig.checkUpdates;
   delete finalConfig.autoUpdate;
   delete finalConfig.forceCheckWorkspace;
@@ -1589,98 +1375,6 @@ function createBaseNextConfig(options = {}) {
   delete finalConfig.pwa;
   return finalConfig;
 }
-
-// src/config/utils/manifest.ts
-function createManifestMetadata(config) {
-  return {
-    manifest: "/manifest.json",
-    themeColor: config.themeColor || "#000000",
-    appleWebApp: {
-      capable: true,
-      statusBarStyle: "default",
-      title: config.shortName || config.name
-    },
-    applicationName: config.name,
-    formatDetection: {
-      telephone: false
-    },
-    viewport: {
-      width: "device-width",
-      initialScale: 1,
-      maximumScale: 1
-    }
-  };
-}
-function createManifest(config) {
-  return () => {
-    let manifestIcons;
-    if (Array.isArray(config.icons)) {
-      manifestIcons = config.icons;
-    } else if (config.icons) {
-      const { logo192, logo384, logo512 } = config.icons;
-      manifestIcons = [
-        ...logo192 ? [
-          {
-            src: logo192,
-            sizes: "192x192",
-            type: "image/png",
-            purpose: "maskable"
-          }
-        ] : [],
-        ...logo384 ? [
-          {
-            src: logo384,
-            sizes: "384x384",
-            type: "image/png"
-          }
-        ] : [],
-        ...logo512 ? [
-          {
-            src: logo512,
-            sizes: "512x512",
-            type: "image/png"
-          }
-        ] : []
-      ];
-    } else {
-      manifestIcons = [
-        {
-          src: "/static/logos/192x192.png",
-          sizes: "192x192",
-          type: "image/png",
-          purpose: "maskable"
-        },
-        {
-          src: "/static/logos/384x384.png",
-          sizes: "384x384",
-          type: "image/png"
-        },
-        {
-          src: "/static/logos/512x512.png",
-          sizes: "512x512",
-          type: "image/png"
-        }
-      ];
-    }
-    return {
-      name: config.name,
-      short_name: config.shortName || config.name,
-      description: config.description || config.name,
-      start_url: config.startUrl || "/",
-      scope: config.scope || "/",
-      display: config.display || "standalone",
-      orientation: config.orientation || "portrait",
-      background_color: config.backgroundColor || "#000000",
-      theme_color: config.themeColor || "#ffffff",
-      lang: config.lang || "en",
-      dir: config.dir || "ltr",
-      icons: manifestIcons
-    };
-  };
-}
-function generateManifest(config) {
-  return createManifest(config)();
-}
 export {
   AI_DOCS_HINT,
   DEFAULT_OPTIMIZE_PACKAGES,
@@ -1702,17 +1396,10 @@ export {
   checkForUpdate,
   checkForUpdates,
   checkPackages,
-  createApiCacheRule,
   createBaseNextConfig,
-  createCdnCacheRule,
-  createManifest,
-  createManifestMetadata,
-  createStaticAssetRule,
   deepMerge,
-  defaultRuntimeCaching,
   detectPackageManager,
   fetchLatestVersion,
-  generateManifest,
   getApiUrl,
   getBasePath,
   getCurrentVersion,
@@ -1727,7 +1414,6 @@ export {
   isCI,
   isCompressionAvailable,
   isDev,
-  isPWAAvailable,
   isPackageInstalled,
   isProduction,
   isStaticBuild,
@@ -1735,7 +1421,6 @@ export {
   resetDevStartupState,
   resetInstallerPreferences,
   resetUpdaterPreferences,
-  updatePackagesWithProgress,
-  withPWA
+  updatePackagesWithProgress
 };
 //# sourceMappingURL=index.mjs.map