@serwist/webpack-plugin 8.4.4 → 9.0.0-preview.0

package/dist/chunks/relative-to-output-path.js

@@ -0,0 +1,20 @@
+import upath from 'upath';
+
+/**
+ * @param compilation The webpack compilation.
+ * @param path The original path value.
+ *
+ * @returns If path was not absolute, the returns path as-is.
+ * Otherwise, returns path relative to the compilation's output path.
+ *
+ * @private
+ */ const relativeToOutputPath = (compilation, path)=>{
+    // See https://github.com/jantimon/html-webpack-plugin/pull/266/files#diff-168726dbe96b3ce427e7fedce31bb0bcR38
+    if (upath.resolve(path) === upath.normalize(path)) {
+        return upath.relative(compilation.options.output.path, path);
+    }
+    // Otherwise, return swDest as-is.
+    return path;
+};
+
+export { relativeToOutputPath as r };

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 import { InjectManifest } from "./inject-manifest.js";
 export { InjectManifest };
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.internal.d.ts

@@ -1,2 +1,4 @@
 import { ChildCompilationPlugin } from "./lib/child-compilation-plugin.js";
-export { ChildCompilationPlugin };
+import { relativeToOutputPath } from "./lib/relative-to-output-path.js";
+export { ChildCompilationPlugin, relativeToOutputPath };
+//# sourceMappingURL=index.internal.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.internal.d.ts","sourceRoot":"","sources":["../src/index.internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/index.internal.js

@@ -1,5 +1,5 @@
 import webpack from 'webpack';
-import { r as relativeToOutputPath } from './relative-to-output-path.js';
+import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
 import 'upath';
 
 /**
@@ -49,4 +49,4 @@ import 'upath';
     }
 }
 
-export { ChildCompilationPlugin };
+export { ChildCompilationPlugin, relativeToOutputPath };

package/dist/index.js

@@ -3,7 +3,7 @@ import stringify from 'fast-json-stable-stringify';
 import upath from 'upath';
 import webpack from 'webpack';
 import crypto from 'crypto';
-import { r as relativeToOutputPath } from './relative-to-output-path.js';
+import { r as relativeToOutputPath } from './chunks/relative-to-output-path.js';
 
 const BYTE_UNITS = [
     'B',
@@ -140,7 +140,7 @@ function prettyBytes(number, options) {
  * @param paths File paths to join
  * @returns Joined file path
  * @private
- */ function resolveWebpackURL(publicPath, ...paths) {
+ */ const resolveWebpackURL = (publicPath, ...paths)=>{
     // This is a change in webpack v5.
     // See https://github.com/jantimon/html-webpack-plugin/pull/1516
     if (publicPath === "auto") {
@@ -150,7 +150,7 @@ function prettyBytes(number, options) {
         publicPath,
         ...paths
     ].join("");
-}
+};
 
 /**
  * For a given asset, checks whether at least one of the conditions matches.
@@ -162,7 +162,7 @@ function prettyBytes(number, options) {
  * @param conditions
  * @returns Whether or not at least one condition matches.
  * @private
- */ function checkConditions(asset, compilation, conditions = []) {
+ */ const checkConditions = (asset, compilation, conditions = [])=>{
     for (const condition of conditions){
         if (typeof condition === "function") {
             return condition({
@@ -177,7 +177,7 @@ function prettyBytes(number, options) {
     }
     // We'll only get here if none of the conditions applied.
     return false;
-}
+};
 /**
  * Returns the names of all the assets in all the chunks in a chunk group,
  * if provided a chunk group name.
@@ -188,7 +188,7 @@ function prettyBytes(number, options) {
  * @param chunkOrGroup
  * @returns
  * @private
- */ function getNamesOfAssetsInChunkOrGroup(compilation, chunkOrGroup) {
+ */ const getNamesOfAssetsInChunkOrGroup = (compilation, chunkOrGroup)=>{
     const chunkGroup = compilation.namedChunkGroups?.get(chunkOrGroup);
     if (chunkGroup) {
         const assetNames = [];
@@ -203,14 +203,14 @@ function prettyBytes(number, options) {
     }
     // If we get here, there's no chunkGroup or chunk with that name.
     return null;
-}
+};
 /**
  * Returns the names of all the assets in a chunk.
  *
  * @param chunk
  * @returns
  * @private
- */ function getNamesOfAssetsInChunk(chunk) {
+ */ const getNamesOfAssetsInChunk = (chunk)=>{
     const assetNames = [];
     assetNames.push(...chunk.files);
     // This only appears to be set in webpack v5.
@@ -218,7 +218,7 @@ function prettyBytes(number, options) {
         assetNames.push(...chunk.auxiliaryFiles);
     }
     return assetNames;
-}
+};
 /**
  * Filters the set of assets out, based on the configuration options provided:
  * - chunks and excludeChunks, for chunkName-based criteria.
@@ -229,7 +229,7 @@ function prettyBytes(number, options) {
  * @returns The assets that should be included in the manifest,
  * based on the criteria provided.
  * @private
- */ function filterAssets(compilation, config) {
+ */ const filterAssets = (compilation, config)=>{
     const filteredAssets = new Set();
     const assets = compilation.getAssets();
     const allowedAssetNames = new Set();
@@ -287,8 +287,8 @@ function prettyBytes(number, options) {
         filteredAssets.add(asset);
     }
     return filteredAssets;
-}
-async function getManifestEntriesFromCompilation(compilation, config) {
+};
+const getManifestEntriesFromCompilation = async (compilation, config)=>{
     const filteredAssets = filterAssets(compilation, config);
     const { publicPath } = compilation.options.output;
     const fileDetails = Array.from(filteredAssets).map((asset)=>{
@@ -317,7 +317,7 @@ async function getManifestEntriesFromCompilation(compilation, config) {
         size,
         sortedEntries
     };
-}
+};
 
 /**
  * If our bundled swDest file contains a sourcemap, we would invalidate that
@@ -335,7 +335,7 @@ async function getManifestEntriesFromCompilation(compilation, config) {
  * comment pointing to an asset present in the compilation, this will return the
  * name of that asset. Otherwise, it will return undefined.
  * @private
- */ function getSourcemapAssetName(compilation, swContents, swDest) {
+ */ const getSourcemapAssetName = (compilation, swContents, swDest)=>{
     const url = getSourceMapURL(swContents);
     if (url) {
         // Translate the relative URL to what the presumed name for the webpack
@@ -351,7 +351,7 @@ async function getManifestEntriesFromCompilation(compilation, config) {
         }
     }
     return undefined;
-}
+};
 
 // Used to keep track of swDest files written by *any* instance of this plugin.
 // See https://github.com/GoogleChrome/workbox/issues/2181
@@ -508,13 +508,7 @@ const _generatedAssetNames = new Set();
    *
    * @private
    */ async handleMake(compilation, parentCompiler) {
-        try {
-            this.config = validateWebpackInjectManifestOptions(this.config);
-        } catch (error) {
-            if (error instanceof Error) {
-                throw new Error(`Please check your ${this.constructor.name} plugin ` + `configuration:\n${error.message}`);
-            }
-        }
+        this.config = await validateWebpackInjectManifestOptions(this.config);
         this.config.swDest = relativeToOutputPath(compilation, this.config.swDest);
         _generatedAssetNames.add(this.config.swDest);
         if (this.config.compileSrc) {

package/dist/inject-manifest.d.ts

@@ -22,7 +22,7 @@ import webpack from "webpack";
  * });
  * ```
  */
-declare class InjectManifest {
+export declare class InjectManifest {
     protected config: WebpackInjectManifestOptions;
     private alreadyCalled;
     /**
@@ -42,7 +42,11 @@ declare class InjectManifest {
      */
     getManifestEntries(compilation: webpack.Compilation, config: WebpackInjectManifestOptions): Promise<{
         size: number;
-        sortedEntries: import("@serwist/build").ManifestEntry[] | undefined;
+        sortedEntries: {
+            revision: string | null;
+            url: string;
+            integrity?: string | undefined;
+        }[] | undefined;
         manifestString: string;
     }>;
     /**
@@ -79,4 +83,4 @@ declare class InjectManifest {
      */
     addAssets(compilation: webpack.Compilation): Promise<void>;
 }
-export { InjectManifest };
+//# sourceMappingURL=inject-manifest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"inject-manifest.d.ts","sourceRoot":"","sources":["../src/inject-manifest.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAMnE,OAAO,OAAO,MAAM,SAAS,CAAC;AAU9B;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,cAAc;IACzB,SAAS,CAAC,MAAM,EAAE,4BAA4B,CAAC;IAC/C,OAAO,CAAC,aAAa,CAAU;IAE/B;;OAEG;gBACS,MAAM,EAAE,4BAA4B;IAKhD;;;;OAIG;IACH,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;IAcxD;;;;OAIG;IACG,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,4BAA4B;;;;;;;;;IAwC/F;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;IA4BvC;;;;;OAKG;IACG,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiChH;;;;;OAKG;IACH,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;IAMxF;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBnG;;;;OAIG;IACG,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAmDjE"}

package/dist/lib/child-compilation-plugin.d.ts

@@ -18,3 +18,4 @@ export declare class ChildCompilationPlugin implements WebpackPluginInstance {
     apply(compiler: webpack.Compiler): void;
     performChildCompilation(compilation: webpack.Compilation, parentCompiler: webpack.Compiler): Promise<void>;
 }
+//# sourceMappingURL=child-compilation-plugin.d.ts.map

package/dist/lib/child-compilation-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-compilation-plugin.d.ts","sourceRoot":"","sources":["../../src/lib/child-compilation-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,MAAM,WAAW,6BAA6B;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,qBAAqB,EAAE,CAAC;CACnC;AAED;;;;GAIG;AACH,qBAAa,sBAAuB,YAAW,qBAAqB;IAClE,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;gBACjC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAA6B;IAKjE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAO1B,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAiCjH"}

package/dist/lib/get-asset-hash.d.ts

@@ -6,3 +6,4 @@ import type { Asset } from "webpack";
  * @private
  */
 export declare const getAssetHash: (asset: Asset) => string | null;
+//# sourceMappingURL=get-asset-hash.d.ts.map

package/dist/lib/get-asset-hash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-asset-hash.d.ts","sourceRoot":"","sources":["../../src/lib/get-asset-hash.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,KAAK,KAAG,MAAM,GAAG,IASpD,CAAC"}

package/dist/lib/get-manifest-entries-from-compilation.d.ts

@@ -1,6 +1,7 @@
 import type { ManifestEntry, WebpackInjectManifestOptions } from "@serwist/build";
 import type { Compilation } from "webpack";
-export declare function getManifestEntriesFromCompilation(compilation: Compilation, config: WebpackInjectManifestOptions): Promise<{
+export declare const getManifestEntriesFromCompilation: (compilation: Compilation, config: WebpackInjectManifestOptions) => Promise<{
     size: number;
     sortedEntries: ManifestEntry[] | undefined;
 }>;
+//# sourceMappingURL=get-manifest-entries-from-compilation.d.ts.map

package/dist/lib/get-manifest-entries-from-compilation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-manifest-entries-from-compilation.d.ts","sourceRoot":"","sources":["../../src/lib/get-manifest-entries-from-compilation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAe,aAAa,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAE/F,OAAO,KAAK,EAAgB,WAAW,EAAgB,MAAM,SAAS,CAAC;AAwKvE,eAAO,MAAM,iCAAiC,gBAC/B,WAAW,UAChB,4BAA4B;UACnB,MAAM;mBAAiB,aAAa,EAAE,GAAG,SAAS;EAgCpE,CAAC"}

package/dist/lib/get-script-files-for-chunks.d.ts

@@ -1,2 +1,3 @@
 import type { Compilation } from "webpack";
-export declare function getScriptFilesForChunks(compilation: Compilation, chunkNames: Array<string>): Array<string>;
+export declare const getScriptFilesForChunks: (compilation: Compilation, chunkNames: string[]) => string[];
+//# sourceMappingURL=get-script-files-for-chunks.d.ts.map

package/dist/lib/get-script-files-for-chunks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-script-files-for-chunks.d.ts","sourceRoot":"","sources":["../../src/lib/get-script-files-for-chunks.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,SAAS,CAAC;AAIzD,eAAO,MAAM,uBAAuB,gBAAiB,WAAW,cAAc,MAAM,EAAE,KAAG,MAAM,EAwB9F,CAAC"}

package/dist/lib/get-sourcemap-asset-name.d.ts

@@ -16,4 +16,5 @@ import type { Compilation } from "webpack";
  * name of that asset. Otherwise, it will return undefined.
  * @private
  */
-export declare function getSourcemapAssetName(compilation: Compilation, swContents: string, swDest: string): string | undefined;
+export declare const getSourcemapAssetName: (compilation: Compilation, swContents: string, swDest: string) => string | undefined;
+//# sourceMappingURL=get-sourcemap-asset-name.d.ts.map

package/dist/lib/get-sourcemap-asset-name.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-sourcemap-asset-name.d.ts","sourceRoot":"","sources":["../../src/lib/get-sourcemap-asset-name.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,gBAAiB,WAAW,cAAc,MAAM,UAAU,MAAM,KAAG,MAAM,GAAG,SAiB7G,CAAC"}

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

@@ -1,11 +1,12 @@
 import type { Compilation } from "webpack";
 /**
  * @param compilation The webpack compilation.
- * @param swDest The original swDest value.
+ * @param path The original path value.
  *
- * @returns If swDest was not absolute, the returns swDest as-is.
- * Otherwise, returns swDest relative to the compilation's output path.
+ * @returns If path was not absolute, the returns path as-is.
+ * Otherwise, returns path relative to the compilation's output path.
  *
  * @private
  */
-export declare function relativeToOutputPath(compilation: Compilation, swDest: string): string;
+export declare const relativeToOutputPath: (compilation: Compilation, path: string) => string;
+//# sourceMappingURL=relative-to-output-path.d.ts.map

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

@@ -0,0 +1 @@
+{"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,QAAQ,MAAM,KAAG,MAQ7E,CAAC"}

package/dist/lib/resolve-webpack-url.d.ts

@@ -9,4 +9,5 @@
  * @returns Joined file path
  * @private
  */
-export declare function resolveWebpackURL(publicPath: string, ...paths: Array<string>): string;
+export declare const resolveWebpackURL: (publicPath: string, ...paths: string[]) => string;
+//# sourceMappingURL=resolve-webpack-url.d.ts.map

package/dist/lib/resolve-webpack-url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-webpack-url.d.ts","sourceRoot":"","sources":["../../src/lib/resolve-webpack-url.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,eAAgB,MAAM,YAAY,MAAM,EAAE,KAAG,MAO1E,CAAC"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@serwist/webpack-plugin",
-  "version": "8.4.4",
+  "version": "9.0.0-preview.0",
   "type": "module",
   "description": "A plugin for your Webpack build process, helping you generate a manifest of local files that should be precached.",
   "files": [
-    "dist",
-    "!dist/**/dts"
+    "src",
+    "dist"
   ],
   "keywords": [
     "serwist",
@@ -18,15 +18,14 @@
     "file manifest"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "author": "Google's Web DevRel Team, 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",
   "typesVersions": {
     "*": {
@@ -37,41 +36,37 @@
   },
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./internal": {
-      "import": {
-        "types": "./dist/index.internal.d.ts",
-        "default": "./dist/index.internal.js"
-      },
-      "require": {
-        "types": "./dist/index.internal.d.cts",
-        "default": "./dist/index.internal.cjs"
-      }
+      "types": "./dist/index.internal.d.ts",
+      "default": "./dist/index.internal.js"
     },
     "./package.json": "./package.json"
   },
   "dependencies": {
     "fast-json-stable-stringify": "2.1.0",
     "upath": "2.0.1",
-    "@serwist/build": "8.4.4"
-  },
-  "peerDependencies": {
-    "webpack": "4.4.0 || ^5.9.0"
+    "@serwist/build": "9.0.0-preview.0"
   },
   "devDependencies": {
-    "@types/node": "20.10.5",
+    "@types/node": "20.11.16",
     "@types/webpack": "5.28.5",
     "pretty-bytes": "6.1.1",
-    "rollup": "4.9.1",
-    "@serwist/constants": "8.4.4"
+    "rollup": "4.9.6",
+    "typescript": "5.4.0-dev.20240203",
+    "webpack": "5.90.1",
+    "@serwist/constants": "9.0.0-preview.0"
+  },
+  "peerDependencies": {
+    "typescript": ">=5.0.0",
+    "webpack": "4.4.0 || ^5.9.0"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_ENV=production rollup --config rollup.config.js",

package/src/index.internal.ts

@@ -0,0 +1,4 @@
+import { ChildCompilationPlugin } from "./lib/child-compilation-plugin.js";
+import { relativeToOutputPath } from "./lib/relative-to-output-path.js";
+
+export { ChildCompilationPlugin, relativeToOutputPath };

package/src/index.ts

@@ -0,0 +1,11 @@
+/*
+  Copyright 2018 Google LLC
+
+  Use of this source code is governed by an MIT-style
+  license that can be found in the LICENSE file or at
+  https://opensource.org/licenses/MIT.
+*/
+
+import { InjectManifest } from "./inject-manifest.js";
+
+export { InjectManifest };