@serwist/build 8.0.2 → 8.0.4

package/dist/index.js

@@ -4,7 +4,6 @@ import crypto from 'crypto';
 import { glob } from 'glob';
 import upath from 'upath';
 import fse from 'fs-extra';
-import prettyBytes from 'pretty-bytes';
 import { betterAjvErrors } from '@apideck/better-ajv-errors';
 import Ajv from 'ajv';
 import stringify from 'fast-json-stable-stringify';
@@ -231,6 +230,110 @@ function additionalPrecacheEntriesTransform(additionalPrecacheEntries) {
     };
 }
 
+const BYTE_UNITS = [
+    'B',
+    'kB',
+    'MB',
+    'GB',
+    'TB',
+    'PB',
+    'EB',
+    'ZB',
+    'YB'
+];
+const BIBYTE_UNITS = [
+    'B',
+    'KiB',
+    'MiB',
+    'GiB',
+    'TiB',
+    'PiB',
+    'EiB',
+    'ZiB',
+    'YiB'
+];
+const BIT_UNITS = [
+    'b',
+    'kbit',
+    'Mbit',
+    'Gbit',
+    'Tbit',
+    'Pbit',
+    'Ebit',
+    'Zbit',
+    'Ybit'
+];
+const BIBIT_UNITS = [
+    'b',
+    'kibit',
+    'Mibit',
+    'Gibit',
+    'Tibit',
+    'Pibit',
+    'Eibit',
+    'Zibit',
+    'Yibit'
+];
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/ const toLocaleString = (number, locale, options)=>{
+    let result = number;
+    if (typeof locale === 'string' || Array.isArray(locale)) {
+        result = number.toLocaleString(locale, options);
+    } else if (locale === true || options !== undefined) {
+        result = number.toLocaleString(undefined, options);
+    }
+    return result;
+};
+function prettyBytes(number, options) {
+    if (!Number.isFinite(number)) {
+        throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+    }
+    options = {
+        bits: false,
+        binary: false,
+        space: true,
+        ...options
+    };
+    const UNITS = options.bits ? options.binary ? BIBIT_UNITS : BIT_UNITS : options.binary ? BIBYTE_UNITS : BYTE_UNITS;
+    const separator = options.space ? ' ' : '';
+    if (options.signed && number === 0) {
+        return ` 0${separator}${UNITS[0]}`;
+    }
+    const isNegative = number < 0;
+    const prefix = isNegative ? '-' : options.signed ? '+' : '';
+    if (isNegative) {
+        number = -number;
+    }
+    let localeOptions;
+    if (options.minimumFractionDigits !== undefined) {
+        localeOptions = {
+            minimumFractionDigits: options.minimumFractionDigits
+        };
+    }
+    if (options.maximumFractionDigits !== undefined) {
+        localeOptions = {
+            maximumFractionDigits: options.maximumFractionDigits,
+            ...localeOptions
+        };
+    }
+    if (number < 1) {
+        const numberString = toLocaleString(number, options.locale, localeOptions);
+        return prefix + numberString + separator + UNITS[0];
+    }
+    const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
+    number /= (options.binary ? 1024 : 1000) ** exponent;
+    if (!localeOptions) {
+        number = number.toPrecision(3);
+    }
+    const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+    const unit = UNITS[exponent];
+    return prefix + numberString + separator + unit;
+}
+
 function maximumSizeTransform(maximumFileSizeToCacheInBytes) {
     return (originalManifest)=>{
         const warnings = [];

package/dist/index.old.cjs

@@ -6,7 +6,6 @@ var crypto = require('crypto');
 var glob = require('glob');
 var upath = require('upath');
 var fse = require('fs-extra');
-var prettyBytes = require('pretty-bytes');
 var betterAjvErrors = require('@apideck/better-ajv-errors');
 var Ajv = require('ajv');
 var stringify = require('fast-json-stable-stringify');
@@ -233,6 +232,110 @@ function additionalPrecacheEntriesTransform(additionalPrecacheEntries) {
     };
 }
 
+const BYTE_UNITS = [
+    'B',
+    'kB',
+    'MB',
+    'GB',
+    'TB',
+    'PB',
+    'EB',
+    'ZB',
+    'YB'
+];
+const BIBYTE_UNITS = [
+    'B',
+    'KiB',
+    'MiB',
+    'GiB',
+    'TiB',
+    'PiB',
+    'EiB',
+    'ZiB',
+    'YiB'
+];
+const BIT_UNITS = [
+    'b',
+    'kbit',
+    'Mbit',
+    'Gbit',
+    'Tbit',
+    'Pbit',
+    'Ebit',
+    'Zbit',
+    'Ybit'
+];
+const BIBIT_UNITS = [
+    'b',
+    'kibit',
+    'Mibit',
+    'Gibit',
+    'Tibit',
+    'Pibit',
+    'Eibit',
+    'Zibit',
+    'Yibit'
+];
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/ const toLocaleString = (number, locale, options)=>{
+    let result = number;
+    if (typeof locale === 'string' || Array.isArray(locale)) {
+        result = number.toLocaleString(locale, options);
+    } else if (locale === true || options !== undefined) {
+        result = number.toLocaleString(undefined, options);
+    }
+    return result;
+};
+function prettyBytes(number, options) {
+    if (!Number.isFinite(number)) {
+        throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+    }
+    options = {
+        bits: false,
+        binary: false,
+        space: true,
+        ...options
+    };
+    const UNITS = options.bits ? options.binary ? BIBIT_UNITS : BIT_UNITS : options.binary ? BIBYTE_UNITS : BYTE_UNITS;
+    const separator = options.space ? ' ' : '';
+    if (options.signed && number === 0) {
+        return ` 0${separator}${UNITS[0]}`;
+    }
+    const isNegative = number < 0;
+    const prefix = isNegative ? '-' : options.signed ? '+' : '';
+    if (isNegative) {
+        number = -number;
+    }
+    let localeOptions;
+    if (options.minimumFractionDigits !== undefined) {
+        localeOptions = {
+            minimumFractionDigits: options.minimumFractionDigits
+        };
+    }
+    if (options.maximumFractionDigits !== undefined) {
+        localeOptions = {
+            maximumFractionDigits: options.maximumFractionDigits,
+            ...localeOptions
+        };
+    }
+    if (number < 1) {
+        const numberString = toLocaleString(number, options.locale, localeOptions);
+        return prefix + numberString + separator + UNITS[0];
+    }
+    const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
+    number /= (options.binary ? 1024 : 1000) ** exponent;
+    if (!localeOptions) {
+        number = number.toPrecision(3);
+    }
+    const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+    const unit = UNITS[exponent];
+    return prefix + numberString + separator + unit;
+}
+
 function maximumSizeTransform(maximumFileSizeToCacheInBytes) {
     return (originalManifest)=>{
         const warnings = [];

package/dist/index.old.d.cts

@@ -0,0 +1,9 @@
+import { getManifest } from "./get-manifest.js";
+import { injectManifest } from "./inject-manifest.js";
+import { escapeRegExp } from "./lib/escape-regexp.js";
+import { getSourceMapURL } from "./lib/get-source-map-url.js";
+import { replaceAndUpdateSourceMap } from "./lib/replace-and-update-source-map.js";
+import { transformManifest } from "./lib/transform-manifest.js";
+import { validateWebpackInjectManifestOptions } from "./lib/validate-options.js";
+export { escapeRegExp, getManifest, getSourceMapURL, injectManifest, replaceAndUpdateSourceMap, transformManifest, validateWebpackInjectManifestOptions, };
+export * from "./types.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/build",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "type": "module",
   "description": "A module that integrates into your build process, helping you generate a manifest of local files that should be precached.",
   "files": [
@@ -29,9 +29,14 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.old.cjs",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.old.d.cts",
+        "default": "./dist/index.old.cjs"
+      }
     },
     "./package.json": "./package.json"
   },
@@ -40,32 +45,31 @@
     "ajv": "8.12.0",
     "common-tags": "1.8.2",
     "fast-json-stable-stringify": "2.1.0",
-    "fs-extra": "11.1.1",
-    "fsevents": "2.3.3",
+    "fs-extra": "11.2.0",
     "glob": "10.3.10",
-    "pretty-bytes": "6.1.1",
     "rollup": "3.28.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.0.2",
-    "@serwist/broadcast-update": "8.0.2",
-    "@serwist/cacheable-response": "8.0.2",
-    "@serwist/core": "8.0.2",
-    "@serwist/expiration": "8.0.2",
-    "@serwist/google-analytics": "8.0.2",
-    "@serwist/precaching": "8.0.2",
-    "@serwist/routing": "8.0.2"
+    "@serwist/background-sync": "8.0.4",
+    "@serwist/broadcast-update": "8.0.4",
+    "@serwist/cacheable-response": "8.0.4",
+    "@serwist/core": "8.0.4",
+    "@serwist/expiration": "8.0.4",
+    "@serwist/google-analytics": "8.0.4",
+    "@serwist/precaching": "8.0.4",
+    "@serwist/routing": "8.0.4"
   },
   "devDependencies": {
-    "@types/common-tags": "1.8.3",
-    "@types/fs-extra": "11.0.2",
-    "@types/node": "20.8.7",
-    "@types/stringify-object": "4.0.3",
-    "@types/strip-comments": "2.0.3",
-    "type-fest": "4.4.0",
-    "@serwist/constants": "8.0.2"
+    "@types/common-tags": "1.8.4",
+    "@types/fs-extra": "11.0.4",
+    "@types/node": "20.10.4",
+    "@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.0.4"
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_OPTIONS='--max-old-space-size=4096' NODE_ENV=production rollup --config rollup.config.js",