@serwist/webpack-plugin 9.0.12 → 9.0.13

package/dist/chunks/perform-child-compilation.js

@@ -1,8 +1,12 @@
 import path from 'node:path';
 
+const toUnix = (p)=>{
+    return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
+};
+
 const relativeToOutputPath = (compilation, originalPath)=>{
     if (path.resolve(originalPath) === path.normalize(originalPath)) {
-        return path.relative(compilation.options.output.path, originalPath);
+        return toUnix(path.relative(compilation.options.output.path, originalPath));
     }
     return originalPath;
 };
@@ -30,4 +34,4 @@ const performChildCompilation = async (compiler, compilation, name, src, dest, p
     });
 };
 
-export { performChildCompilation as p, relativeToOutputPath as r };
+export { performChildCompilation as p, relativeToOutputPath as r, toUnix as t };

package/dist/index.js

@@ -1,13 +1,9 @@
 import path from 'node:path';
-import { transformManifest, getSourceMapURL, stringify, escapeRegExp, replaceAndUpdateSourceMap } from '@serwist/build';
+import { transformManifest, getSourceMapURL, escapeRegExp, replaceAndUpdateSourceMap } from '@serwist/build';
+import { r as relativeToOutputPath, p as performChildCompilation, t as toUnix } from './chunks/perform-child-compilation.js';
 import prettyBytes from 'pretty-bytes';
 import { validationErrorMap, SerwistConfigError } from '@serwist/build/schema';
 import crypto from 'node:crypto';
-import { r as relativeToOutputPath, p as performChildCompilation } from './chunks/perform-child-compilation.js';
-
-const toUnix = (p)=>{
-    return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
-};
 
 const validateInjectManifestOptions = async (input)=>{
     const result = await (await import('./chunks/schema.js')).injectManifestOptions.spa(input, {
@@ -26,7 +22,7 @@ const getAssetHash = (asset)=>{
     if (asset.info?.immutable) {
         return null;
     }
-    return crypto.createHash("md5").update(Buffer.from(asset.source.source())).digest("hex");
+    return crypto.createHash("md5").update(asset.source.source()).digest("hex");
 };
 
 const resolveWebpackURL = (publicPath, ...paths)=>{
@@ -200,7 +196,7 @@ class InjectManifest {
         }
         config.exclude.push(({ asset })=>_generatedAssetNames.has(asset.name));
         const { size, sortedEntries } = await getManifestEntriesFromCompilation(compilation, config);
-        let manifestString = stringify(sortedEntries);
+        let manifestString = JSON.stringify(sortedEntries);
         if (this.config.compileSrc && !(compilation.options?.devtool === "eval-cheap-source-map" && compilation.options.optimization?.minimize)) {
             manifestString = manifestString.replace(/"/g, `'`);
         }

package/dist/lib/relative-to-output-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relative-to-output-path.d.ts","sourceRoot":"","sources":["../../src/lib/relative-to-output-path.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,gBAAgB,MAAM,KAAG,MAQrF,CAAC"}
+{"version":3,"file":"relative-to-output-path.d.ts","sourceRoot":"","sources":["../../src/lib/relative-to-output-path.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,gBAAiB,WAAW,gBAAgB,MAAM,KAAG,MAQrF,CAAC"}

package/dist/lib/types.d.ts

@@ -1,6 +1,11 @@
 import type { BasePartial, BaseResolved, InjectPartial as BaseInjectPartial, InjectResolved as BaseInjectResolved, OptionalSwDestPartial, OptionalSwDestResolved } from "@serwist/build";
 import type { Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+import type { WebpackPluginFunction, WebpackPluginInstance, Asset, Compilation } from "webpack";
+export interface ConditionCallbackOptions {
+    asset: Asset;
+    compilation: Compilation;
+}
+export type ConditionCallback = (options: ConditionCallbackOptions) => boolean;
 export interface WebpackPartial {
     /**
      * One or more chunk names whose corresponding output files should be included
@@ -17,7 +22,7 @@ export interface WebpackPartial {
      * [/\.map$/, /^manifest.*\.js$/]
      * ```
      */
-    exclude?: (string | RegExp | ((arg0: any) => boolean))[];
+    exclude?: (string | RegExp | ConditionCallback)[];
     /**
      * One or more chunk names whose corresponding output files should be excluded
      * from the precache manifest.
@@ -29,7 +34,7 @@ export interface WebpackPartial {
      * [the same rules](https://webpack.js.org/configuration/module/#condition)
      * as webpack's standard `include` option.
      */
-    include?: (string | RegExp | ((arg0: any) => boolean))[];
+    include?: (string | RegExp | ConditionCallback)[];
 }
 export type WebpackResolved = Require<WebpackPartial, "exclude">;
 export interface InjectPartial {

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAE5E,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC;CAC1D;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa;CAAG;AAEtI,MAAM,WAAW,6BAA8B,SAAQ,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,cAAc;CAAG;AAEnJ,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,IAAI,iBAAiB,EAClC,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhG,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC;AAE/E,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;;;;;OASG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC;IAClD;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,iBAAiB,CAAC,EAAE,CAAC;CACnD;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,aAAa;CAAG;AAEtI,MAAM,WAAW,6BAA8B,SAAQ,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,cAAc;CAAG;AAEnJ,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,qBAAqB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "9.0.12",
+  "version": "9.0.13",
   "type": "module",
   "description": "A plugin for your webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -60,16 +60,16 @@
   "dependencies": {
     "pretty-bytes": "6.1.1",
     "zod": "3.24.2",
-    "@serwist/build": "9.0.12"
+    "@serwist/build": "9.0.13"
   },
   "devDependencies": {
-    "@types/node": "22.13.5",
+    "@types/node": "22.14.0",
     "@types/webpack": "5.28.5",
-    "rollup": "4.34.8",
+    "rollup": "4.39.0",
     "typescript": "5.6.3",
     "webpack": "5.98.0",
-    "@serwist/configs": "9.0.12",
-    "@serwist/utils": "9.0.12"
+    "@serwist/configs": "9.0.13",
+    "@serwist/utils": "9.0.13"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

package/src/inject-manifest.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { escapeRegExp, replaceAndUpdateSourceMap, stringify } from "@serwist/build";
+import { escapeRegExp, replaceAndUpdateSourceMap } from "@serwist/build";
 import { toUnix } from "@serwist/utils";
 import prettyBytes from "pretty-bytes";
 import type { Compilation, Compiler, WebpackError, default as Webpack } from "webpack";
@@ -101,7 +101,7 @@ export class InjectManifest {
 
     const { size, sortedEntries } = await getManifestEntriesFromCompilation(compilation, config);
 
-    let manifestString = stringify(sortedEntries);
+    let manifestString = JSON.stringify(sortedEntries);
     if (
       this.config.compileSrc &&
       // See https://github.com/GoogleChrome/workbox/issues/2729

package/src/lib/get-asset-hash.ts

@@ -23,5 +23,5 @@ export const getAssetHash = (asset: Asset): string | null => {
     return null;
   }
 
-  return crypto.createHash("md5").update(Buffer.from(asset.source.source())).digest("hex");
+  return crypto.createHash("md5").update(asset.source.source()).digest("hex");
 };

package/src/lib/relative-to-output-path.ts

@@ -5,6 +5,7 @@
   license that can be found in the LICENSE file or at
   https://opensource.org/licenses/MIT.
 */
+import { toUnix } from "@serwist/utils";
 import path from "node:path";
 import type { Compilation } from "webpack";
 
@@ -20,7 +21,7 @@ import type { Compilation } from "webpack";
 export const relativeToOutputPath = (compilation: Compilation, originalPath: string): string => {
   // See https://github.com/jantimon/html-webpack-plugin/pull/266/files#diff-168726dbe96b3ce427e7fedce31bb0bcR38
   if (path.resolve(originalPath) === path.normalize(originalPath)) {
-    return path.relative(compilation.options.output.path!, originalPath);
+    return toUnix(path.relative(compilation.options.output.path!, originalPath));
   }
 
   // Otherwise, return swDest as-is.

package/src/lib/types.ts

@@ -7,7 +7,14 @@ import type {
   OptionalSwDestResolved,
 } from "@serwist/build";
 import type { Require } from "@serwist/utils";
-import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
+import type { WebpackPluginFunction, WebpackPluginInstance, Asset, Compilation } from "webpack";
+
+export interface ConditionCallbackOptions {
+  asset: Asset;
+  compilation: Compilation;
+};
+
+export type ConditionCallback = (options: ConditionCallbackOptions) => boolean;
 
 export interface WebpackPartial {
   /**
@@ -25,7 +32,7 @@ export interface WebpackPartial {
    * [/\.map$/, /^manifest.*\.js$/]
    * ```
    */
-  exclude?: (string | RegExp | ((arg0: any) => boolean))[];
+  exclude?: (string | RegExp | ConditionCallback)[];
   /**
    * One or more chunk names whose corresponding output files should be excluded
    * from the precache manifest.
@@ -37,7 +44,7 @@ export interface WebpackPartial {
    * [the same rules](https://webpack.js.org/configuration/module/#condition)
    * as webpack's standard `include` option.
    */
-  include?: (string | RegExp | ((arg0: any) => boolean))[];
+  include?: (string | RegExp | ConditionCallback)[];
 }
 
 export type WebpackResolved = Require<WebpackPartial, "exclude">;