@serwist/next 8.4.4 → 9.0.0-preview.1

package/dist/index.worker.d.ts

@@ -0,0 +1,5 @@
+import { defaultCache } from "./worker/defaultCache.js";
+import { type DefinePageRuntimeCachingOptions, type PageRuntimeCaching, definePageRuntimeCaching } from "./worker/definePageRuntimeCaching.js";
+export { defaultCache, definePageRuntimeCaching };
+export type { DefinePageRuntimeCachingOptions, PageRuntimeCaching };
+//# sourceMappingURL=index.worker.d.ts.map

package/dist/index.worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,KAAK,+BAA+B,EAAE,KAAK,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAE/I,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAClD,YAAY,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/{index.browser.cjs → index.worker.js}

@@ -1,6 +1,26 @@
-'use strict';
+const nonNullable = (value)=>value !== null && value !== undefined;
+
+const definePageRuntimeCaching = ({ rscPrefetch, rsc, html })=>{
+    const pageRcs = [
+        rscPrefetch,
+        rsc,
+        html
+    ];
+    if (pageRcs[0]) {
+        if (!pageRcs[0].options) pageRcs[0].options = {};
+        pageRcs[0].options.cacheName = "pages-rsc-prefetch";
+    }
+    if (pageRcs[1]) {
+        if (!pageRcs[1].options) pageRcs[1].options = {};
+        pageRcs[1].options.cacheName = "pages-rsc";
+    }
+    if (pageRcs[2]) {
+        if (!pageRcs[2].options) pageRcs[2].options = {};
+        pageRcs[2].options.cacheName = "pages";
+    }
+    return pageRcs.filter(nonNullable);
+};
 
-// Serwist RuntimeCaching config: https://developers.google.com/web/tools/workbox/reference-docs/latest/module-workbox-build#.RuntimeCachingEntry
 const defaultCache = [
     {
         urlPattern: /^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,
@@ -138,9 +158,6 @@ const defaultCache = [
     },
     {
         urlPattern: ({ sameOrigin, url: { pathname } })=>{
-            // Exclude /api/auth/callback/* to fix OAuth workflow in Safari without having an impact on other environments
-            // The above route is the default for next-auth, you may need to change it if your OAuth workflow has a different callback route
-            // Issue: https://github.com/shadowwalker/next-pwa/issues/131#issuecomment-821894809
             if (!sameOrigin || pathname.startsWith("/api/auth/callback")) {
                 return false;
             }
@@ -160,33 +177,43 @@ const defaultCache = [
             networkTimeoutSeconds: 10
         }
     },
-    {
-        urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-        handler: "NetworkFirst",
-        options: {
-            cacheName: "pages-rsc-prefetch",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
+    ...definePageRuntimeCaching({
+        rscPrefetch: {
+            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && request.headers.get("Next-Router-Prefetch") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+            handler: "NetworkFirst",
+            options: {
+                expiration: {
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                }
             }
-        }
-    },
-    {
-        urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
-        handler: "NetworkFirst",
-        options: {
-            cacheName: "pages-rsc",
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60
+        },
+        rsc: {
+            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("RSC") === "1" && sameOrigin && !pathname.startsWith("/api/"),
+            handler: "NetworkFirst",
+            options: {
+                expiration: {
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                }
+            }
+        },
+        html: {
+            urlPattern: ({ request, url: { pathname }, sameOrigin })=>request.headers.get("Content-Type")?.includes("text/html") && sameOrigin && !pathname.startsWith("/api/"),
+            handler: "NetworkFirst",
+            options: {
+                expiration: {
+                    maxEntries: 32,
+                    maxAgeSeconds: 24 * 60 * 60
+                }
             }
         }
-    },
+    }),
     {
         urlPattern: ({ url: { pathname }, sameOrigin })=>sameOrigin && !pathname.startsWith("/api/"),
         handler: "NetworkFirst",
         options: {
-            cacheName: "pages",
+            cacheName: "others",
             expiration: {
                 maxEntries: 32,
                 maxAgeSeconds: 24 * 60 * 60
@@ -207,4 +234,4 @@ const defaultCache = [
     }
 ];
 
-exports.defaultCache = defaultCache;
+export { defaultCache, definePageRuntimeCaching };

package/dist/internal-types.d.ts

@@ -1,9 +1,15 @@
+import type { Asset, Compilation } from "webpack";
 export type SerwistNextOptionsKey = "self.__SERWIST_SW_ENTRY";
 export interface SerwistNextOptions {
     sw: string;
     scope: string;
-    cacheOnFrontEndNav: boolean;
+    cacheOnNavigation: boolean;
     register: boolean;
     reloadOnOnline: boolean;
     swEntryWorker: string | undefined;
 }
+export interface ExcludeParams {
+    asset: Asset;
+    compilation: Compilation;
+}
+//# sourceMappingURL=internal-types.d.ts.map

package/dist/internal-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["../src/internal-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE9D,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;CAC1B"}

package/dist/sw-entry-worker.d.ts

@@ -5,3 +5,4 @@ export type MessageType = {
     type: "__START_URL_CACHE__";
     url: URL | string;
 };
+//# sourceMappingURL=sw-entry-worker.d.ts.map

package/dist/sw-entry-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sw-entry-worker.d.ts","sourceRoot":"","sources":["../src/sw-entry-worker.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GACnB;IACE,IAAI,EAAE,wBAAwB,CAAC;IAC/B,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;CACnB,GACD;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;CACnB,CAAC"}

package/dist/sw-entry.d.ts

@@ -4,3 +4,4 @@ declare global {
         serwist: Serwist;
     }
 }
+//# sourceMappingURL=sw-entry.d.ts.map

package/dist/sw-entry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sw-entry.d.ts","sourceRoot":"","sources":["../src/sw-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,OAAO,CAAC;KAClB;CACF"}

package/dist/sw-entry.js

@@ -11,8 +11,8 @@ if (typeof window !== "undefined" && "serviceWorker" in navigator && typeof cach
     if (self.__SERWIST_SW_ENTRY.register) {
         window.serwist.register();
     }
-    if (self.__SERWIST_SW_ENTRY.cacheOnFrontEndNav) {
-        const cacheOnFrontEndNav = async (url)=>{
+    if (self.__SERWIST_SW_ENTRY.cacheOnNavigation) {
+        const cacheOnNavigation = async (url)=>{
             if (!window.navigator.onLine || !url) {
                 return;
             }
@@ -24,15 +24,15 @@ if (typeof window !== "undefined" && "serviceWorker" in navigator && typeof cach
         const pushState = history.pushState;
         history.pushState = (...args)=>{
             pushState.apply(history, args);
-            cacheOnFrontEndNav(args[2]);
+            cacheOnNavigation(args[2]);
         };
         const replaceState = history.replaceState;
         history.replaceState = (...args)=>{
             replaceState.apply(history, args);
-            cacheOnFrontEndNav(args[2]);
+            cacheOnNavigation(args[2]);
         };
         window.addEventListener("online", ()=>{
-            cacheOnFrontEndNav(window.location.pathname);
+            cacheOnNavigation(window.location.pathname);
         });
     }
     if (self.__SERWIST_SW_ENTRY.reloadOnOnline) {

package/dist/utils/find-first-truthy.d.ts

@@ -5,3 +5,4 @@
  * @returns
  */
 export declare const findFirstTruthy: <T, U>(arr: T[], fn: (elm: T) => U) => NonNullable<U> | undefined;
+//# sourceMappingURL=find-first-truthy.d.ts.map

package/dist/utils/find-first-truthy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-first-truthy.d.ts","sourceRoot":"","sources":["../../src/utils/find-first-truthy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,eAAe,mEAQ3B,CAAC"}

package/dist/utils/get-content-hash.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" resolution-mode="require"/>
 import type fs from "node:fs";
 export declare const getContentHash: (file: fs.PathOrFileDescriptor, isDev: boolean) => string;
+//# sourceMappingURL=get-content-hash.d.ts.map

package/dist/utils/get-content-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-content-hash.d.ts","sourceRoot":"","sources":["../../src/utils/get-content-hash.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAI9B,eAAO,MAAM,cAAc,SAAU,GAAG,oBAAoB,SAAS,OAAO,WAK3E,CAAC"}

package/dist/utils/get-file-hash.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" resolution-mode="require"/>
 import fs from "node:fs";
 export declare const getFileHash: (file: fs.PathOrFileDescriptor) => string;
+//# sourceMappingURL=get-file-hash.d.ts.map

package/dist/utils/get-file-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-file-hash.d.ts","sourceRoot":"","sources":["../../src/utils/get-file-hash.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,WAAW,SAAU,GAAG,oBAAoB,WAAyE,CAAC"}

package/dist/utils/get-package-version.d.ts

@@ -4,3 +4,4 @@
  * @returns
  */
 export declare const getPackageVersion: (packageName: string) => string | undefined;
+//# sourceMappingURL=get-package-version.d.ts.map

package/dist/utils/get-package-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-package-version.d.ts","sourceRoot":"","sources":["../../src/utils/get-package-version.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAMhE,CAAC"}

package/dist/utils/index.d.ts

@@ -4,3 +4,4 @@ export { getFileHash } from "./get-file-hash.js";
 export { getPackageVersion } from "./get-package-version.js";
 export { loadTSConfig } from "./load-tsconfig.js";
 export * as logger from "./logger.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC"}

package/dist/utils/load-tsconfig.d.ts

@@ -1,2 +1,3 @@
 import type { TsConfigJson as TSConfigJSON } from "type-fest";
 export declare const loadTSConfig: (baseDir: string, relativeTSConfigPath: string | undefined) => TSConfigJSON | undefined;
+//# sourceMappingURL=load-tsconfig.d.ts.map

package/dist/utils/load-tsconfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-tsconfig.d.ts","sourceRoot":"","sources":["../../src/utils/load-tsconfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAI9D,eAAO,MAAM,YAAY,YAAa,MAAM,wBAAwB,MAAM,GAAG,SAAS,KAAG,YAAY,GAAG,SAmBvG,CAAC"}

package/dist/utils/logger.d.ts

@@ -3,3 +3,4 @@ export declare const error: (...message: any[]) => void;
 export declare const warn: (...message: any[]) => void;
 export declare const info: (...message: any[]) => void;
 export declare const event: (...message: any[]) => void;
+//# sourceMappingURL=logger.d.ts.map

package/dist/utils/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAsCA,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,eAAgB,GAAG,EAAE,SAEtC,CAAC;AAEF,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,IAAI,eAAgB,GAAG,EAAE,SAErC,CAAC;AAEF,eAAO,MAAM,KAAK,eAAgB,GAAG,EAAE,SAEtC,CAAC"}

package/dist/utils.d.ts

@@ -2,3 +2,4 @@
 import fs from "node:fs";
 export declare const getFileHash: (file: fs.PathOrFileDescriptor) => string;
 export declare const getContentHash: (file: fs.PathOrFileDescriptor, isDev: boolean) => string;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,eAAO,MAAM,WAAW,SAAU,GAAG,oBAAoB,WAAyE,CAAC;AAEnI,eAAO,MAAM,cAAc,SAAU,GAAG,oBAAoB,SAAS,OAAO,WAK3E,CAAC"}

package/dist/worker/defaultCache.d.ts

@@ -0,0 +1,3 @@
+import type { RuntimeCaching } from "@serwist/sw";
+export declare const defaultCache: RuntimeCaching[];
+//# sourceMappingURL=defaultCache.d.ts.map

package/dist/worker/defaultCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultCache.d.ts","sourceRoot":"","sources":["../../src/worker/defaultCache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,eAAO,MAAM,YAAY,kBA0NG,CAAC"}

package/dist/worker/definePageRuntimeCaching.d.ts

@@ -0,0 +1,16 @@
+import type { RuntimeCaching } from "@serwist/sw";
+export interface PageRuntimeCaching extends Omit<RuntimeCaching, "options"> {
+    options?: Omit<NonNullable<RuntimeCaching["options"]>, "cacheName">;
+}
+export interface DefinePageRuntimeCachingOptions {
+    rscPrefetch?: PageRuntimeCaching;
+    rsc?: PageRuntimeCaching;
+    html?: PageRuntimeCaching;
+}
+/**
+ * Conveniently define three `runtimeCaching` entries for Next.js pages.
+ * @param options
+ * @returns
+ */
+export declare const definePageRuntimeCaching: ({ rscPrefetch, rsc, html }: DefinePageRuntimeCachingOptions) => RuntimeCaching[];
+//# sourceMappingURL=definePageRuntimeCaching.d.ts.map

package/dist/worker/definePageRuntimeCaching.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"definePageRuntimeCaching.d.ts","sourceRoot":"","sources":["../../src/worker/definePageRuntimeCaching.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IACzE,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,+BAA+B;IAC9C,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,GAAG,CAAC,EAAE,kBAAkB,CAAC;IACzB,IAAI,CAAC,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,+BAAgC,+BAA+B,KAAG,cAAc,EAiBpH,CAAC"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@serwist/next",
-  "version": "8.4.4",
+  "version": "9.0.0-preview.1",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
-    "dist",
-    "!dist/dts"
+    "src",
+    "dist"
   ],
   "keywords": [
     "serwist",
@@ -15,77 +15,75 @@
     "web",
     "service-worker"
   ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "author": "Serwist's Team",
   "license": "MIT",
   "repository": "serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
   "homepage": "https://serwist.pages.dev",
-  "module": "./dist/index.js",
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
-    },
-    "./browser": {
-      "import": {
-        "types": "./dist/index.browser.d.ts",
-        "default": "./dist/index.browser.js"
-      },
-      "require": {
-        "types": "./dist/index.browser.d.cts",
-        "default": "./dist/index.browser.cjs"
-      }
-    },
-    "./typings": {
-      "import": {
-        "types": "./dist/sw-entry.d.ts"
-      },
-      "require": {
-        "types": "./dist/sw-entry.d.cts"
-      }
-    },
-    "./package.json": "./package.json"
-  },
   "typesVersions": {
     "*": {
-      "browser": [
-        "./dist/index.browser.d.ts"
+      "worker": [
+        "./dist/index.worker.d.ts"
       ],
       "typings": [
         "./dist/sw-entry.d.ts"
       ]
     }
   },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./worker": {
+      "types": "./dist/index.worker.d.ts",
+      "default": "./dist/index.worker.js"
+    },
+    "./typings": {
+      "types": "./dist/sw-entry.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
   "dependencies": {
+    "chalk": "5.3.0",
     "clean-webpack-plugin": "4.0.0",
     "fast-glob": "3.3.2",
-    "@serwist/build": "8.4.4",
-    "@serwist/webpack-plugin": "8.4.4",
-    "@serwist/window": "8.4.4"
+    "@serwist/build": "9.0.0-preview.1",
+    "@serwist/core": "9.0.0-preview.1",
+    "@serwist/webpack-plugin": "9.0.0-preview.1",
+    "@serwist/window": "9.0.0-preview.1"
   },
   "devDependencies": {
-    "@types/node": "20.10.5",
-    "chalk": "5.3.0",
-    "next": "14.0.4",
+    "@types/node": "20.11.16",
+    "next": "14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "rollup": "4.9.1",
-    "type-fest": "4.8.3",
-    "typescript": "5.4.0-dev.20231226",
-    "webpack": "5.89.0",
-    "@serwist/constants": "8.4.4"
+    "rollup": "4.9.6",
+    "type-fest": "4.10.2",
+    "typescript": "5.4.0-dev.20240203",
+    "webpack": "5.90.1",
+    "@serwist/constants": "9.0.0-preview.1",
+    "@serwist/sw": "9.0.0-preview.1",
+    "@serwist/utils": "9.0.0-preview.1"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
-    "webpack": ">=5.9.0"
+    "typescript": ">=5.0.0",
+    "webpack": ">=5.9.0",
+    "@serwist/sw": "9.0.0-preview.1"
+  },
+  "peerDependenciesMeta": {
+    "@serwist/sw": {
+      "optional": true
+    },
+    "typescript": {
+      "optional": true
+    }
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_ENV=production rollup --config rollup.config.js",