@serwist/webpack-plugin 9.0.4 → 9.0.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Google LLC, 2019 ShadowWalker w@weiw.io https://weiw.io, 2023 Serwist
+Copyright (c) 2018-2023 Google LLC, 2019-2023 ShadowWalker w@weiw.io https://weiw.io, 2020-2023 Anthony Fu <https://github.com/antfu>, 2023-PRESENT Serwist
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.js

@@ -222,18 +222,10 @@ class InjectManifest {
         });
     }
     async performChildCompilation(compilation, parentCompiler) {
-        const outputOptions = {
+        const childCompiler = compilation.createChildCompiler(this.constructor.name, {
             filename: this.config.swDest
-        };
-        const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
-        childCompiler.context = parentCompiler.context;
-        childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-        childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-        if (Array.isArray(this.config.webpackCompilationPlugins)) {
-            for (const plugin of this.config.webpackCompilationPlugins){
-                plugin.apply(childCompiler);
-            }
-        }
+        }, this.config.webpackCompilationPlugins);
+        new this.webpack.webworker.WebWorkerTemplatePlugin().apply(childCompiler);
         new this.webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
         await new Promise((resolve, reject)=>{
             childCompiler.runAsChild((error, _entries, childCompilation)=>{

package/dist/inject-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAW3F;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,6BAA6B,CAAC;IAChD,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;gBACS,MAAM,EAAE,qBAAqB;IAOzC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;YACW,kBAAkB;IAwChC;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA6B/B;;;;;OAKG;YACW,uBAAuB;IAqCrC;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;YACW,UAAU;IAiBxB;;;;OAIG;YACW,SAAS;CAmDxB"}
+{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAe,QAAQ,EAAoC,MAAM,SAAS,CAAC;AACvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAW3F;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,6BAA6B,CAAC;IAChD,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,OAAO,CAAiB;IAEhC;;OAEG;gBACS,MAAM,EAAE,qBAAqB;IAOzC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;YACW,kBAAkB;IAwChC;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IA6B/B;;;;;OAKG;YACW,uBAAuB;IA8BrC;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAKtB;;;;;OAKG;YACW,UAAU;IAiBxB;;;;OAIG;YACW,SAAS;CAmDxB"}

package/dist/lib/types.d.ts

@@ -1,5 +1,6 @@
 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";
 export interface WebpackPartial {
     /**
      * One or more chunk names whose corresponding output files should be included
@@ -44,7 +45,7 @@ export interface InjectPartial {
      * Optional webpack plugins that will be used when compiling the `swSrc`
      * file. Only valid if `compileSrc` is `true`.
      */
-    webpackCompilationPlugins?: any[];
+    webpackCompilationPlugins?: (WebpackPluginFunction | WebpackPluginInstance)[];
 }
 export type InjectResolved = Require<InjectPartial, "compileSrc">;
 export interface InjectManifestOptions extends BasePartial, WebpackPartial, BaseInjectPartial, OptionalSwDestPartial, 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;AAE9C,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,GAAG,EAAE,CAAC;CACnC;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"}
+{"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,CAAC,qBAAqB,GAAG,qBAAqB,CAAC,EAAE,CAAC;CAC/E;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "9.0.4",
+  "version": "9.0.6",
   "type": "module",
   "description": "A plugin for your webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -11,6 +11,8 @@
     "serwist",
     "serwistjs",
     "webpack",
+    "rspack",
+    "rsbuild",
     "service worker",
     "caching",
     "fetch requests",
@@ -20,7 +22,10 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "author": "Google's Web DevRel Team, Serwist's Team",
+  "author": "Google's Web DevRel Team",
+  "contributors": [
+    "Serwist <ducanh2912.rusty@gmail.com> (https://serwist.pages.dev/)"
+  ],
   "license": "MIT",
   "repository": "https://github.com/serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
@@ -56,16 +61,16 @@
     "pretty-bytes": "6.1.1",
     "upath": "2.0.1",
     "zod": "3.23.8",
-    "@serwist/build": "9.0.4"
+    "@serwist/build": "9.0.6"
   },
   "devDependencies": {
-    "@types/node": "20.14.10",
+    "@types/node": "22.5.0",
     "@types/webpack": "5.28.5",
-    "rollup": "4.18.1",
-    "typescript": "5.5.3",
+    "rollup": "4.21.0",
+    "typescript": "5.5.4",
     "webpack": "5.93.0",
-    "@serwist/utils": "9.0.4",
-    "@serwist/configs": "9.0.4"
+    "@serwist/utils": "9.0.6",
+    "@serwist/configs": "9.0.6"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",

package/src/inject-manifest.ts

@@ -154,21 +154,15 @@ export class InjectManifest {
    * @private
    */
   private async performChildCompilation(compilation: Compilation, parentCompiler: Compiler): Promise<void> {
-    const outputOptions: Parameters<Compilation["createChildCompiler"]>["1"] = {
-      filename: this.config.swDest,
-    };
-
-    const childCompiler = compilation.createChildCompiler(this.constructor.name, outputOptions, []);
+    const childCompiler = compilation.createChildCompiler(
+      this.constructor.name,
+      {
+        filename: this.config.swDest,
+      },
+      this.config.webpackCompilationPlugins,
+    );
 
-    childCompiler.context = parentCompiler.context;
-    childCompiler.inputFileSystem = parentCompiler.inputFileSystem;
-    childCompiler.outputFileSystem = parentCompiler.outputFileSystem;
-
-    if (Array.isArray(this.config.webpackCompilationPlugins)) {
-      for (const plugin of this.config.webpackCompilationPlugins) {
-        plugin.apply(childCompiler);
-      }
-    }
+    new this.webpack.webworker.WebWorkerTemplatePlugin().apply(childCompiler);
 
     new this.webpack.EntryPlugin(parentCompiler.context, this.config.swSrc, this.constructor.name).apply(childCompiler);
 
@@ -183,7 +177,6 @@ export class InjectManifest {
           if (childCompilation?.errors) {
             compilation.errors.push(...childCompilation.errors);
           }
-
           resolve();
         }
       });
@@ -197,7 +190,7 @@ export class InjectManifest {
    * @private
    */
   private addSrcToAssets(compilation: Compilation, parentCompiler: Compiler): void {
-    const source = (parentCompiler.inputFileSystem as any).readFileSync(this.config.swSrc);
+    const source = parentCompiler.inputFileSystem!.readFileSync!(this.config.swSrc);
     compilation.emitAsset(this.config.swDest!, new this.webpack.sources.RawSource(source));
   }
 

package/src/lib/types.ts

@@ -7,6 +7,7 @@ import type {
   OptionalSwDestResolved,
 } from "@serwist/build";
 import type { Require } from "@serwist/utils";
+import type { WebpackPluginFunction, WebpackPluginInstance } from "webpack";
 
 export interface WebpackPartial {
   /**
@@ -57,7 +58,7 @@ export interface InjectPartial {
    * Optional webpack plugins that will be used when compiling the `swSrc`
    * file. Only valid if `compileSrc` is `true`.
    */
-  webpackCompilationPlugins?: any[];
+  webpackCompilationPlugins?: (WebpackPluginFunction | WebpackPluginInstance)[];
 }
 
 export type InjectResolved = Require<InjectPartial, "compileSrc">;