@serwist/build 8.4.0 → 8.4.1

package/dist/index.cjs

@@ -10,11 +10,9 @@ var fse = require('fs-extra');
 var betterAjvErrors = require('@apideck/better-ajv-errors');
 var Ajv = require('ajv');
 var sourceMap = require('source-map');
-var objectStringify = require('stringify-object');
-var stripComments = require('strip-comments');
 
 const errors = {
-    "unable-to-get-rootdir": `Unable to get the root directory of your web app.`,
+    "unable-to-get-rootdir": "Unable to get the root directory of your web app.",
     "no-extension": commonTags.oneLine`Unable to detect a usable extension for a file in your web
     app directory.`,
     "invalid-file-manifest-name": commonTags.oneLine`The File Manifest Name must have at least one
@@ -135,7 +133,7 @@ function getFileHash(file) {
         const buffer = fse.readFileSync(file);
         return getStringHash(buffer);
     } catch (err) {
-        throw new Error(errors["unable-to-get-file-hash"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-get-file-hash"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
 }
 
@@ -147,7 +145,7 @@ function getFileSize(file) {
         }
         return stat.size;
     } catch (err) {
-        throw new Error(errors["unable-to-get-file-size"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-get-file-size"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
 }
 
@@ -161,14 +159,14 @@ function getFileDetails({ globDirectory, globFollow, globIgnores, globPattern })
             ignore: globIgnores
         });
     } catch (err) {
-        throw new Error(errors["unable-to-glob-files"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-glob-files"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
     if (globbedFiles.length === 0) {
-        warning = errors["useless-glob-pattern"] + " " + JSON.stringify({
+        warning = `${errors["useless-glob-pattern"]} ${JSON.stringify({
             globDirectory,
             globPattern,
             globIgnores
-        }, null, 2);
+        }, null, 2)}`;
     }
     const globbedFileDetails = [];
     for (const file of globbedFiles){
@@ -345,7 +343,7 @@ function maximumSizeTransform(maximumFileSizeToCacheInBytes) {
             if (entry.size <= maximumFileSizeToCacheInBytes) {
                 return true;
             }
-            warnings.push(`${entry.url} is ${prettyBytes(entry.size)}, and won't ` + `be precached. Configure maximumFileSizeToCacheInBytes to change ` + `this limit.`);
+            warnings.push(`${entry.url} is ${prettyBytes(entry.size)}, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.`);
             return false;
         });
         return {
@@ -479,6 +477,7 @@ async function transformManifest({ additionalPrecacheEntries, dontCacheBustURLsM
     let size = 0;
     for (const manifestEntry of transformedManifest){
         size += manifestEntry.size || 0;
+        // biome-ignore lint/performance/noDelete: I don't understand this part yet.
         delete manifestEntry.size;
     }
     return {
@@ -1405,7 +1404,7 @@ const validateViteInjectManifestOptions = (input)=>{
 */ // Adapted from https://github.com/lydell/source-map-url/blob/master/source-map-url.js
 // See https://github.com/GoogleChrome/workbox/issues/3019
 const innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/;
-const regex = RegExp("(?:" + "/\\*" + "(?:\\s*\r?\n(?://)?)?" + "(?:" + innerRegex.source + ")" + "\\s*" + "\\*/" + "|" + "//(?:" + innerRegex.source + ")" + ")" + "\\s*");
+const regex = RegExp(`(?:/\\*(?:\\s*\r?\n(?://)?)?(?:${innerRegex.source})\\s*\\*/|//(?:${innerRegex.source}))\\s*`);
 function getSourceMapURL(srcContents) {
     const match = srcContents.match(regex);
     return match ? match[1] || match[2] || "" : null;
@@ -1604,7 +1603,7 @@ function translateURLToSourcemapPaths(url, swSrc, swDest) {
         try {
             await fse.mkdirp(upath.dirname(file));
         } catch (error) {
-            throw new Error(errors["unable-to-make-sw-directory"] + ` '${error instanceof Error && error.message ? error.message : ""}'`);
+            throw new Error(`${errors["unable-to-make-sw-directory"]} '${error instanceof Error && error.message ? error.message : ""}'`);
         }
         await fse.writeFile(file, contents);
     }
@@ -1617,19 +1616,6 @@ function translateURLToSourcemapPaths(url, swSrc, swDest) {
     };
 }
 
-function stringifyWithoutComments(obj) {
-    return objectStringify(obj, {
-        // See https://github.com/yeoman/stringify-object#transformobject-property-originalresult
-        transform: (_obj, _prop, str)=>{
-            if (typeof _prop !== "symbol" && typeof _obj[_prop] === "function") {
-                // Can't typify correctly stripComments
-                return stripComments(str); // eslint-disable-line
-            }
-            return str;
-        }
-    });
-}
-
 exports.stringify = stringify;
 exports.errors = errors;
 exports.escapeRegExp = escapeRegExp;
@@ -1639,7 +1625,6 @@ exports.getSourceMapURL = getSourceMapURL;
 exports.injectManifest = injectManifest;
 exports.rebasePath = rebasePath;
 exports.replaceAndUpdateSourceMap = replaceAndUpdateSourceMap;
-exports.stringifyWithoutComments = stringifyWithoutComments;
 exports.transformManifest = transformManifest;
 exports.translateURLToSourcemapPaths = translateURLToSourcemapPaths;
 exports.validateInjectManifestOptions = validateInjectManifestOptions;

package/dist/index.d.cts

@@ -7,9 +7,8 @@ import { getFileManifestEntries } from "./lib/get-file-manifest-entries.js";
 import { getSourceMapURL } from "./lib/get-source-map-url.js";
 import { rebasePath } from "./lib/rebase-path.js";
 import { replaceAndUpdateSourceMap } from "./lib/replace-and-update-source-map.js";
-import { stringifyWithoutComments } from "./lib/stringify-without-comments.js";
 import { transformManifest } from "./lib/transform-manifest.js";
 import { translateURLToSourcemapPaths } from "./lib/translate-url-to-sourcemap-paths.js";
 import { validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions } from "./lib/validate-options.js";
-export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, stringify, stringifyWithoutComments, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions, };
+export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, stringify, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions, };
 export * from "./types.js";

package/dist/index.d.ts

@@ -7,9 +7,8 @@ import { getFileManifestEntries } from "./lib/get-file-manifest-entries.js";
 import { getSourceMapURL } from "./lib/get-source-map-url.js";
 import { rebasePath } from "./lib/rebase-path.js";
 import { replaceAndUpdateSourceMap } from "./lib/replace-and-update-source-map.js";
-import { stringifyWithoutComments } from "./lib/stringify-without-comments.js";
 import { transformManifest } from "./lib/transform-manifest.js";
 import { translateURLToSourcemapPaths } from "./lib/translate-url-to-sourcemap-paths.js";
 import { validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions } from "./lib/validate-options.js";
-export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, stringify, stringifyWithoutComments, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions, };
+export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, stringify, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions, };
 export * from "./types.js";

package/dist/index.js

@@ -9,11 +9,9 @@ import fse from 'fs-extra';
 import { betterAjvErrors } from '@apideck/better-ajv-errors';
 import Ajv from 'ajv';
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map';
-import objectStringify from 'stringify-object';
-import stripComments from 'strip-comments';
 
 const errors = {
-    "unable-to-get-rootdir": `Unable to get the root directory of your web app.`,
+    "unable-to-get-rootdir": "Unable to get the root directory of your web app.",
     "no-extension": oneLine`Unable to detect a usable extension for a file in your web
     app directory.`,
     "invalid-file-manifest-name": oneLine`The File Manifest Name must have at least one
@@ -134,7 +132,7 @@ function getFileHash(file) {
         const buffer = fse.readFileSync(file);
         return getStringHash(buffer);
     } catch (err) {
-        throw new Error(errors["unable-to-get-file-hash"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-get-file-hash"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
 }
 
@@ -146,7 +144,7 @@ function getFileSize(file) {
         }
         return stat.size;
     } catch (err) {
-        throw new Error(errors["unable-to-get-file-size"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-get-file-size"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
 }
 
@@ -160,14 +158,14 @@ function getFileDetails({ globDirectory, globFollow, globIgnores, globPattern })
             ignore: globIgnores
         });
     } catch (err) {
-        throw new Error(errors["unable-to-glob-files"] + ` '${err instanceof Error && err.message ? err.message : ""}'`);
+        throw new Error(`${errors["unable-to-glob-files"]} '${err instanceof Error && err.message ? err.message : ""}'`);
     }
     if (globbedFiles.length === 0) {
-        warning = errors["useless-glob-pattern"] + " " + JSON.stringify({
+        warning = `${errors["useless-glob-pattern"]} ${JSON.stringify({
             globDirectory,
             globPattern,
             globIgnores
-        }, null, 2);
+        }, null, 2)}`;
     }
     const globbedFileDetails = [];
     for (const file of globbedFiles){
@@ -344,7 +342,7 @@ function maximumSizeTransform(maximumFileSizeToCacheInBytes) {
             if (entry.size <= maximumFileSizeToCacheInBytes) {
                 return true;
             }
-            warnings.push(`${entry.url} is ${prettyBytes(entry.size)}, and won't ` + `be precached. Configure maximumFileSizeToCacheInBytes to change ` + `this limit.`);
+            warnings.push(`${entry.url} is ${prettyBytes(entry.size)}, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.`);
             return false;
         });
         return {
@@ -478,6 +476,7 @@ async function transformManifest({ additionalPrecacheEntries, dontCacheBustURLsM
     let size = 0;
     for (const manifestEntry of transformedManifest){
         size += manifestEntry.size || 0;
+        // biome-ignore lint/performance/noDelete: I don't understand this part yet.
         delete manifestEntry.size;
     }
     return {
@@ -1404,7 +1403,7 @@ const validateViteInjectManifestOptions = (input)=>{
 */ // Adapted from https://github.com/lydell/source-map-url/blob/master/source-map-url.js
 // See https://github.com/GoogleChrome/workbox/issues/3019
 const innerRegex = /[#@] sourceMappingURL=([^\s'"]*)/;
-const regex = RegExp("(?:" + "/\\*" + "(?:\\s*\r?\n(?://)?)?" + "(?:" + innerRegex.source + ")" + "\\s*" + "\\*/" + "|" + "//(?:" + innerRegex.source + ")" + ")" + "\\s*");
+const regex = RegExp(`(?:/\\*(?:\\s*\r?\n(?://)?)?(?:${innerRegex.source})\\s*\\*/|//(?:${innerRegex.source}))\\s*`);
 function getSourceMapURL(srcContents) {
     const match = srcContents.match(regex);
     return match ? match[1] || match[2] || "" : null;
@@ -1603,7 +1602,7 @@ function translateURLToSourcemapPaths(url, swSrc, swDest) {
         try {
             await fse.mkdirp(upath.dirname(file));
         } catch (error) {
-            throw new Error(errors["unable-to-make-sw-directory"] + ` '${error instanceof Error && error.message ? error.message : ""}'`);
+            throw new Error(`${errors["unable-to-make-sw-directory"]} '${error instanceof Error && error.message ? error.message : ""}'`);
         }
         await fse.writeFile(file, contents);
     }
@@ -1616,17 +1615,4 @@ function translateURLToSourcemapPaths(url, swSrc, swDest) {
     };
 }
 
-function stringifyWithoutComments(obj) {
-    return objectStringify(obj, {
-        // See https://github.com/yeoman/stringify-object#transformobject-property-originalresult
-        transform: (_obj, _prop, str)=>{
-            if (typeof _prop !== "symbol" && typeof _obj[_prop] === "function") {
-                // Can't typify correctly stripComments
-                return stripComments(str); // eslint-disable-line
-            }
-            return str;
-        }
-    });
-}
-
-export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, stringifyWithoutComments, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions };
+export { errors, escapeRegExp, getFileManifestEntries, getManifest, getSourceMapURL, injectManifest, rebasePath, replaceAndUpdateSourceMap, transformManifest, translateURLToSourcemapPaths, validateInjectManifestOptions, validateViteInjectManifestOptions, validateWebpackInjectManifestOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/build",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "type": "module",
   "description": "A module that integrates into your build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -49,32 +49,29 @@
     "glob": "10.3.10",
     "rollup": "4.9.1",
     "source-map": "0.8.0-beta.0",
-    "stringify-object": "5.0.0",
-    "strip-comments": "2.0.1",
     "upath": "2.0.1",
-    "@serwist/background-sync": "8.4.0",
-    "@serwist/broadcast-update": "8.4.0",
-    "@serwist/cacheable-response": "8.4.0",
-    "@serwist/core": "8.4.0",
-    "@serwist/expiration": "8.4.0",
-    "@serwist/google-analytics": "8.4.0",
-    "@serwist/precaching": "8.4.0",
-    "@serwist/routing": "8.4.0"
+    "@serwist/background-sync": "8.4.1",
+    "@serwist/broadcast-update": "8.4.1",
+    "@serwist/cacheable-response": "8.4.1",
+    "@serwist/core": "8.4.1",
+    "@serwist/expiration": "8.4.1",
+    "@serwist/google-analytics": "8.4.1",
+    "@serwist/precaching": "8.4.1",
+    "@serwist/routing": "8.4.1"
   },
   "devDependencies": {
     "@types/common-tags": "1.8.4",
     "@types/fs-extra": "11.0.4",
     "@types/node": "20.10.5",
     "@types/stringify-object": "4.0.5",
-    "@types/strip-comments": "2.0.4",
     "pretty-bytes": "6.1.1",
     "type-fest": "4.8.3",
-    "@serwist/constants": "8.4.0"
+    "@serwist/constants": "8.4.1"
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_OPTIONS='--max-old-space-size=4096' NODE_ENV=production rollup --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch",
-    "lint": "eslint src --ext ts,tsx,js,jsx,cjs,mjs",
+    "lint": "biome lint ./src",
     "typecheck": "tsc"
   }
 }

package/dist/lib/stringify-without-comments.d.ts

@@ -1,3 +0,0 @@
-export declare function stringifyWithoutComments(obj: {
-    [key: string]: any;
-}): string;