@serwist/next 9.0.0 → 9.0.2

package/README.md

@@ -1 +1 @@
-This module's documentation can be found at https://serwist.pages.dev/docs/next
+This module's documentation can be found at https://serwist.pages.dev/docs/next.

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

@@ -1 +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"}
+{"version":3,"file":"sw-entry.d.ts","sourceRoot":"","sources":["../src/sw-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAM1C,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,OAAO,EAAE,OAAO,CAAC;KAClB;CACF"}

package/dist/sw-entry.js

@@ -1,14 +1,16 @@
 import { Serwist } from '@serwist/window';
+import { isCurrentPageOutOfScope } from '@serwist/window/internal';
 
 if (typeof window !== "undefined" && "serviceWorker" in navigator && typeof caches !== "undefined") {
+    const scope = self.__SERWIST_SW_ENTRY.scope;
     let swEntryWorker;
     if (self.__SERWIST_SW_ENTRY.swEntryWorker) {
         swEntryWorker = new Worker(self.__SERWIST_SW_ENTRY.swEntryWorker);
     }
     window.serwist = new Serwist(window.location.origin + self.__SERWIST_SW_ENTRY.sw, {
-        scope: self.__SERWIST_SW_ENTRY.scope
+        scope
     });
-    if (self.__SERWIST_SW_ENTRY.register) {
+    if (self.__SERWIST_SW_ENTRY.register && !isCurrentPageOutOfScope(scope)) {
         window.serwist.register();
     }
     if (self.__SERWIST_SW_ENTRY.cacheOnNavigation) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -65,10 +65,10 @@
     "chalk": "5.3.0",
     "glob": "10.3.12",
     "zod": "3.22.4",
-    "@serwist/build": "9.0.0",
-    "@serwist/webpack-plugin": "9.0.0",
-    "@serwist/window": "9.0.0",
-    "serwist": "9.0.0"
+    "@serwist/build": "9.0.2",
+    "@serwist/webpack-plugin": "9.0.2",
+    "@serwist/window": "9.0.2",
+    "serwist": "9.0.2"
   },
   "devDependencies": {
     "@types/node": "20.12.7",
@@ -79,8 +79,8 @@
     "type-fest": "4.15.0",
     "typescript": "5.5.0-dev.20240415",
     "webpack": "5.91.0",
-    "@serwist/configs": "9.0.0",
-    "@serwist/utils": "9.0.0"
+    "@serwist/configs": "9.0.2",
+    "@serwist/utils": "9.0.2"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
@@ -92,7 +92,7 @@
     }
   },
   "scripts": {
-    "build": "rimraf dist && cross-env NODE_ENV=production rollup --config rollup.config.js",
+    "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch",
     "lint": "biome lint ./src",
     "typecheck": "tsc"

package/src/sw-entry.ts

@@ -1,4 +1,5 @@
 import { Serwist } from "@serwist/window";
+import { isCurrentPageOutOfScope } from "@serwist/window/internal";
 
 import type { SerwistNextOptions } from "./internal-types.js";
 import type { MessageType } from "./sw-entry-worker.js";
@@ -16,17 +17,17 @@ declare const self: Window &
   };
 
 if (typeof window !== "undefined" && "serviceWorker" in navigator && typeof caches !== "undefined") {
+  const scope = self.__SERWIST_SW_ENTRY.scope;
+
   let swEntryWorker: Worker | undefined;
 
   if (self.__SERWIST_SW_ENTRY.swEntryWorker) {
     swEntryWorker = new Worker(self.__SERWIST_SW_ENTRY.swEntryWorker);
   }
 
-  window.serwist = new Serwist(window.location.origin + self.__SERWIST_SW_ENTRY.sw, {
-    scope: self.__SERWIST_SW_ENTRY.scope,
-  });
+  window.serwist = new Serwist(window.location.origin + self.__SERWIST_SW_ENTRY.sw, { scope });
 
-  if (self.__SERWIST_SW_ENTRY.register) {
+  if (self.__SERWIST_SW_ENTRY.register && !isCurrentPageOutOfScope(scope)) {
     window.serwist.register();
   }