@serwist/next 9.0.0-preview.20 → 9.0.0-preview.24

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAInE;;;;GAIG;AACH,QAAA,MAAM,eAAe,gBAAiB,qBAAqB,mBAAkB,UAAU,KAAK,UAwN3F,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAIvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAInE;;;;GAIG;AACH,QAAA,MAAM,eAAe,gBAAiB,qBAAqB,mBAAkB,UAAU,KAAK,UAoN3F,CAAC;AAEF,eAAe,eAAe,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,qBAAqB,IAAI,aAAa,EAAE,6BAA6B,IAAI,qBAAqB,EAAE,CAAC"}

package/dist/index.js

@@ -118,7 +118,6 @@ const withSerwistInit = (userOptions)=>{
                 if (!config.plugins) {
                     config.plugins = [];
                 }
-                event(`Compiling for ${options.isServer ? "server" : "client (static)"}...`);
                 const _sw = path.posix.join(basePath, swUrl);
                 const _scope = path.posix.join(scope, "/");
                 config.plugins.push(new webpack.DefinePlugin({
@@ -156,10 +155,9 @@ const withSerwistInit = (userOptions)=>{
                 };
                 if (!options.isServer) {
                     if (!register) {
-                        info("Service worker won't be automatically registered as per the config, please call the following code in componentDidMount or useEffect:");
-                        info("  window.serwist.register()");
+                        info("The service worker will not be automatically registered, please call 'window.serwist.register()' in 'componentDidMount' or 'useEffect'.");
                         if (!tsConfigJson?.compilerOptions?.types?.includes("@serwist/next/typings")) {
-                            info("You may also want to add '@serwist/next/typings' to compilerOptions.types in your tsconfig.json/jsconfig.json.");
+                            info("You may also want to add '@serwist/next/typings' to your TypeScript/JavaScript configuration file at 'compilerOptions.types'.");
                         }
                     }
                     const { swSrc: userSwSrc, swDest: userSwDest, additionalPrecacheEntries, exclude, manifestTransforms = [], ...otherBuildOptions } = buildOptions;
@@ -206,9 +204,7 @@ const withSerwistInit = (userOptions)=>{
                     config.plugins.push(new webpack.DefinePlugin({
                         "self.__SERWIST_SW_ENTRY.swEntryWorker": swEntryPublicPath && `'${swEntryPublicPath}'`
                     }));
-                    info(`Service worker: ${swDest}`);
-                    info(`  URL: ${_sw}`);
-                    info(`  Scope: ${_scope}`);
+                    event(`Bundling the service worker script with the URL '${_sw}' and the scope '${_scope}'...`);
                     let resolvedManifestEntries = additionalPrecacheEntries;
                     if (!resolvedManifestEntries) {
                         const publicScan = globSync(globPublicPatterns, {

package/dist/index.worker.js

@@ -1,5 +1,5 @@
-import { ExpirationPlugin, RangeRequestsPlugin } from '@serwist/sw/plugins';
-import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from '@serwist/sw/strategies';
+import { ExpirationPlugin, RangeRequestsPlugin } from 'serwist/plugins';
+import { CacheFirst, StaleWhileRevalidate, NetworkFirst } from 'serwist/strategies';
 
 const PAGES_CACHE_NAME = {
     rscPrefetch: "pages-rsc-prefetch",

package/dist/worker/defaultCache.d.ts

@@ -1,4 +1,4 @@
-import type { RuntimeCaching } from "@serwist/sw";
+import type { RuntimeCaching } from "serwist";
 /**
  * The default, recommended list of caching strategies for applications
  * built with Next.js.

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/next",
-  "version": "9.0.0-preview.20",
+  "version": "9.0.0-preview.24",
   "type": "module",
   "description": "A module that integrates Serwist into your Next.js application.",
   "files": [
@@ -63,25 +63,24 @@
   },
   "dependencies": {
     "chalk": "5.3.0",
-    "glob": "10.3.10",
+    "glob": "10.3.12",
     "zod": "3.22.4",
-    "@serwist/build": "9.0.0-preview.20",
-    "@serwist/core": "9.0.0-preview.20",
-    "@serwist/sw": "9.0.0-preview.20",
-    "@serwist/webpack-plugin": "9.0.0-preview.20",
-    "@serwist/window": "9.0.0-preview.20"
+    "@serwist/build": "9.0.0-preview.24",
+    "@serwist/webpack-plugin": "9.0.0-preview.24",
+    "@serwist/window": "9.0.0-preview.24",
+    "serwist": "9.0.0-preview.24"
   },
   "devDependencies": {
-    "@types/node": "20.11.30",
+    "@types/node": "20.12.4",
     "next": "14.1.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "rollup": "4.13.0",
-    "type-fest": "4.13.1",
-    "typescript": "5.5.0-dev.20240323",
+    "rollup": "4.14.0",
+    "type-fest": "4.15.0",
+    "typescript": "5.5.0-dev.20240404",
     "webpack": "5.91.0",
-    "@serwist/constants": "9.0.0-preview.20",
-    "@serwist/utils": "9.0.0-preview.20"
+    "@serwist/constants": "9.0.0-preview.24",
+    "@serwist/utils": "9.0.0-preview.24"
   },
   "peerDependencies": {
     "next": ">=14.0.0",

package/src/index.ts

@@ -53,8 +53,6 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
         config.plugins = [];
       }
 
-      logger.event(`Compiling for ${options.isServer ? "server" : "client (static)"}...`);
-
       const _sw = path.posix.join(basePath, swUrl);
       const _scope = path.posix.join(scope, "/");
 
@@ -92,13 +90,13 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
       if (!options.isServer) {
         if (!register) {
           logger.info(
-            "Service worker won't be automatically registered as per the config, please call the following code in componentDidMount or useEffect:",
+            "The service worker will not be automatically registered, please call 'window.serwist.register()' in 'componentDidMount' or 'useEffect'.",
           );
 
-          logger.info("  window.serwist.register()");
-
           if (!tsConfigJson?.compilerOptions?.types?.includes("@serwist/next/typings")) {
-            logger.info("You may also want to add '@serwist/next/typings' to compilerOptions.types in your tsconfig.json/jsconfig.json.");
+            logger.info(
+              "You may also want to add '@serwist/next/typings' to your TypeScript/JavaScript configuration file at 'compilerOptions.types'.",
+            );
           }
         }
 
@@ -161,9 +159,7 @@ const withSerwistInit = (userOptions: InjectManifestOptions): ((nextConfig?: Nex
           } satisfies Record<`${SerwistNextOptionsKey}.${Extract<keyof SerwistNextOptions, "swEntryWorker">}`, string | undefined>),
         );
 
-        logger.info(`Service worker: ${swDest}`);
-        logger.info(`  URL: ${_sw}`);
-        logger.info(`  Scope: ${_scope}`);
+        logger.event(`Bundling the service worker script with the URL '${_sw}' and the scope '${_scope}'...`);
 
         // Precache files in public folder
         let resolvedManifestEntries = additionalPrecacheEntries;

package/src/worker/defaultCache.ts

@@ -1,6 +1,6 @@
-import type { RuntimeCaching } from "@serwist/sw";
-import { ExpirationPlugin, RangeRequestsPlugin } from "@serwist/sw/plugins";
-import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "@serwist/sw/strategies";
+import type { RuntimeCaching } from "serwist";
+import { ExpirationPlugin, RangeRequestsPlugin } from "serwist/plugins";
+import { CacheFirst, NetworkFirst, StaleWhileRevalidate } from "serwist/strategies";
 
 import { PAGES_CACHE_NAME } from "./constants.js";