@m2c2kit/build-helpers 0.3.5 → 0.3.7

package/dist/index.d.ts

@@ -29,9 +29,10 @@ import { InputOptions } from 'rollup';
  *
  * @param rootDir - root directory of build, usually "dist" because you
  * usually hash only production builds
+ * @param cwd - current working directory; used only for testing.
  * @returns
  */
-declare function hashM2c2kitAssets(rootDir: string): {
+declare function hashM2c2kitAssets(rootDir: string, cwd?: string): {
     name: string;
     closeBundle: {
         sequential: boolean;

package/dist/index.js

@@ -1,38 +1,9 @@
-import { dirname as dirname_m2c2kit_build_helpers } from 'path';
-import { fileURLToPath as fileURLToPath_m2c2kit_build_helpers} from 'url';
-const __filename = fileURLToPath_m2c2kit_build_helpers(import.meta.url);
-const __dirname = dirname_m2c2kit_build_helpers(__filename);
 import { existsSync, renameSync, readFileSync } from 'fs';
 import { readFile, writeFile } from 'fs/promises';
 import path from 'path';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'url';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
 // Generated using scripts/write-decode-map.ts
 var htmlDecodeTree = new Uint16Array(
 // prettier-ignore
@@ -11158,10 +11129,10 @@ if (!String.prototype.endsWith) {
 }
 
 const OPERATOR_PRECEDENCE = {
-  '||': 3,
+  '||': 2,
+  '??': 3,
   '&&': 4,
   '|': 5,
-  '??': 5,
   '^': 6,
   '&': 7,
   '==': 8,
@@ -11263,6 +11234,14 @@ function expressionNeedsParenthesis(state, node, parentNode, isRightHand) {
     // Exponentiation operator has right-to-left associativity
     return !isRightHand
   }
+  if (
+    nodePrecedence === 13 &&
+    parentNodePrecedence === 13 &&
+    (node.operator === '??' || parentNode.operator === '??')
+  ) {
+    // Nullish coalescing and boolean operators cannot be combined
+    return true
+  }
   if (isRightHand) {
     // Parenthesis are used if both operators have the same precedence
     return (
@@ -12305,349 +12284,358 @@ function generate(node, options) {
   return state.output
 }
 
-/** We use MD5 for hashing, but keep only the first 16 characters. */
 const HASH_CHARACTER_LENGTH = 16;
-/**
- * rollup plugin to hash m2c2kit assets and enable cache busting.
- *
- * @remarks On repeated deployments, a file with the same name may be
- * cached by browsers. Thus, the old file will be used, not the updated
- * one. To enable cache busting, this rollup plugin adds hashes to filenames
- * for m2c2kit assets: index.js, canvaskit.wasm, images, and fonts. This is
- * done by: 1) parsing index.html and finding the links to css and index.js,
- * calculating a hash of these assets, adding a hash to the asset filenames,
- * and updating the links in index.html to reflect the hash. 2) parsing
- * index.js into an AST, finding string literals that are the urls of fonts,
- * images, and canvaskit.wam, calculating a hash of these assets, adding a
- * hash to the asset filenames, and updating the urls to reflect the hash.
- *
- * Note: index.js is transpiled from TypeScript and no longer has types, so
- * finding the asset urls in the AST assumes that there will be no
- * user code with the same structure as the asset urls. In other words:
- * Don't use a define a property named "canvasKitWasmUrl" that refers to
- * a string literal, don't define a property named "fonts" that that refers
- * to an array expression of object expressions with properties named
- * "fontName" and "url", and don't define a property called "images" that
- * refers to an array expression of object expressions with properties named
- * "imageName", "height", "width", and "url". Otherwise, this plugin may alter
- * your code in unexpected ways (although most likely it will simply give
- * warnings, because it's unlikely there will be valid file assets that will
- * be found and hashed).
- *
- * @param rootDir - root directory of build, usually "dist" because you
- * usually hash only production builds
- * @returns
- */
-function hashM2c2kitAssets(rootDir) {
-    const indexHtmlFile = path.join(rootDir, "index.html");
-    const indexJsFile = path.join(rootDir, "index.js");
-    return {
-        name: "hash-m2c2kit-assets",
-        closeBundle: {
-            sequential: true,
-            handler() {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const fileRenames = new Array();
-                    // Parse index.js using acorn and acorn-walk
-                    let indexjs;
-                    try {
-                        indexjs = yield readFile(indexJsFile, "utf-8");
-                    }
-                    catch (_a) {
-                        throw new Error("could not hash m2c2 assets because there was an error reading index.js. This is a fatal problem because index.js is required.");
-                    }
-                    let ast;
-                    try {
-                        ast = parse(indexjs, { ecmaVersion: 2020 });
-                    }
-                    catch (_b) {
-                        throw new Error("could not hash m2c2 assets because there was an error parsing index.js. This is a fatal problem because index.js is not valid JavaScript.");
-                    }
-                    // it was helpful to use https://astexplorer.net/ to understand the AST
-                    ancestor(ast, {
-                        // this code will be run each time the walker visits a literal
-                        Literal(node, ancestors) {
-                            if (ancestors.length >= 2) {
-                                const maybeProperty = ancestors.slice(-2)[0];
-                                if (maybeProperty.type === "Property") {
-                                    const property = maybeProperty;
-                                    if (property.key.type === "Identifier" &&
-                                        property.key.name == "canvasKitWasmUrl") {
-                                        // property is canvasKitWasmUrl
-                                        const literal = node;
-                                        const originalUrlValue = literal.value;
-                                        try {
-                                            const hashedUrlValue = addHashToUrl(originalUrlValue, 
-                                            /**
-                                             * by our convention, the wasm file will be served from
-                                             * the assets directory, so the location is
-                                             * `assets/${canvasKitWasmUrl}` not `${canvasKitWasmUrl}`
-                                             */
-                                            `${rootDir}/assets`);
-                                            literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
-                                            literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
-                                            addFileToFilesToBeRenamed(`${rootDir}/assets`, originalUrlValue, hashedUrlValue, fileRenames);
-                                        }
-                                        catch (_a) {
-                                            console.log(`warning: could not hash canvaskit.wasm resource because it was not found at ${originalUrlValue}`);
-                                        }
-                                    }
-                                }
-                            }
-                            // we'll be looking back 5 levels
-                            if (ancestors.length >= 5) {
-                                const maybeProperty = ancestors.slice(-2)[0];
-                                if (maybeProperty.type === "Property") {
-                                    const property = maybeProperty;
-                                    if (property.key.type === "Identifier" &&
-                                        property.key.name == "url") {
-                                        // property is url
-                                        const maybeObjExpression = ancestors.slice(-3)[0];
-                                        if (maybeObjExpression.type === "ObjectExpression") {
-                                            const objExpression = maybeObjExpression;
-                                            const properties = objExpression.properties
-                                                .filter((p) => p.type === "Property")
-                                                .map((p) => p);
-                                            const identifiers = properties
-                                                .filter((p) => p.key.type === "Identifier")
-                                                .map((p) => p.key.name);
-                                            const urlFontAssetProperties = ["fontName", "url"];
-                                            const propCount = identifiers.filter((i) => urlFontAssetProperties.indexOf(i) !== -1).length;
-                                            if (propCount === 2) {
-                                                // the object expression has the 2 properties
-                                                const maybeArrayExpression = ancestors.slice(-4)[0];
-                                                if (maybeArrayExpression.type === "ArrayExpression") {
-                                                    const maybeProperty = ancestors.slice(-5)[0];
-                                                    if (maybeProperty.type === "Property") {
-                                                        const property = maybeProperty;
-                                                        if (property.key.type === "Identifier" &&
-                                                            property.key.name == "fonts") {
-                                                            // property is fonts
-                                                            const literal = node;
-                                                            const originalUrlValue = literal.value;
-                                                            try {
-                                                                const hashedUrlValue = addHashToUrl(originalUrlValue, rootDir);
-                                                                literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
-                                                                literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
-                                                                addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames);
-                                                            }
-                                                            catch (_b) {
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            // we'll be looking back 5 levels
-                            if (ancestors.length >= 5) {
-                                const maybeProperty = ancestors.slice(-2)[0];
-                                if (maybeProperty.type === "Property") {
-                                    const property = maybeProperty;
-                                    if (property.key.type === "Identifier" &&
-                                        property.key.name == "url") {
-                                        // property is url
-                                        const maybeObjExpression = ancestors.slice(-3)[0];
-                                        if (maybeObjExpression.type === "ObjectExpression") {
-                                            const objExpression = maybeObjExpression;
-                                            const properties = objExpression.properties
-                                                .filter((p) => p.type === "Property")
-                                                .map((p) => p);
-                                            const identifiers = properties
-                                                .filter((p) => p.key.type === "Identifier")
-                                                .map((p) => p.key.name);
-                                            const urlBrowserImageProperties = [
-                                                "imageName",
-                                                "height",
-                                                "width",
-                                                "url",
-                                            ];
-                                            const propCount = identifiers.filter((i) => urlBrowserImageProperties.indexOf(i) !== -1).length;
-                                            if (propCount === 4) {
-                                                // the object expression has the 4 properties
-                                                const maybeArrayExpression = ancestors.slice(-4)[0];
-                                                if (maybeArrayExpression.type === "ArrayExpression") {
-                                                    const maybeProperty = ancestors.slice(-5)[0];
-                                                    if (maybeProperty.type === "Property") {
-                                                        const property = maybeProperty;
-                                                        if (property.key.type === "Identifier" &&
-                                                            property.key.name == "images") {
-                                                            // property is images
-                                                            const literal = node;
-                                                            const originalUrlValue = literal.value;
-                                                            try {
-                                                                const hashedUrlValue = addHashToUrl(originalUrlValue, rootDir);
-                                                                literal.value = literal.value.replace(originalUrlValue, hashedUrlValue);
-                                                                literal.raw = literal.raw.replace(originalUrlValue, hashedUrlValue);
-                                                                addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames);
-                                                            }
-                                                            catch (_c) {
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                    });
-                    const indexJsCode = generate(ast);
-                    yield writeFile(indexJsFile, indexJsCode);
-                    // Parse links in index.html using htmlparser2
-                    // note: if link has attribute hash="false", then hashing
-                    // is skipped for that link
-                    const rawHtml = yield readFile(indexHtmlFile, "utf-8");
-                    const dom = parseDocument(rawHtml);
-                    // handle the css links
-                    const links = selectAll("link", dom);
-                    links
-                        .map((link) => link)
-                        .forEach((link) => {
-                        var _a;
-                        if (link.attribs["href"].endsWith(".css") &&
-                            !(((_a = link.attribs["hash"]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "false")) {
-                            const originalUrl = link.attribs["href"];
+function hashM2c2kitAssets(rootDir, cwd = "") {
+  const indexHtmlFile = path.join(cwd, rootDir, "index.html");
+  const indexJsFile = path.join(cwd, rootDir, "index.js");
+  return {
+    name: "hash-m2c2kit-assets",
+    closeBundle: {
+      sequential: true,
+      async handler() {
+        const fileRenames = new Array();
+        let indexjs;
+        try {
+          indexjs = await readFile(indexJsFile, "utf-8");
+        } catch {
+          throw new Error(
+            "could not hash m2c2 assets because there was an error reading index.js. This is a fatal problem because index.js is required."
+          );
+        }
+        let ast;
+        try {
+          ast = parse(indexjs, { ecmaVersion: 2020 });
+        } catch {
+          throw new Error(
+            "could not hash m2c2 assets because there was an error parsing index.js. This is a fatal problem because index.js is not valid JavaScript."
+          );
+        }
+        ancestor(ast, {
+          // this code will be run each time the walker visits a literal
+          Literal(node, ancestors) {
+            if (ancestors.length >= 2) {
+              const maybeProperty = ancestors.slice(-2)[0];
+              if (maybeProperty.type === "Property") {
+                const property = maybeProperty;
+                if (property.key.type === "Identifier" && property.key.name == "canvasKitWasmUrl") {
+                  const literal = node;
+                  const originalUrlValue = literal.value;
+                  try {
+                    const hashedUrlValue = addHashToUrl(
+                      originalUrlValue,
+                      /**
+                       * by our convention, the wasm file will be served from
+                       * the assets directory, so the location is
+                       * `assets/${canvasKitWasmUrl}` not `${canvasKitWasmUrl}`
+                       */
+                      `${rootDir}/assets`,
+                      cwd
+                    );
+                    literal.value = literal.value.replace(
+                      originalUrlValue,
+                      hashedUrlValue
+                    );
+                    literal.raw = literal.raw.replace(
+                      originalUrlValue,
+                      hashedUrlValue
+                    );
+                    addFileToFilesToBeRenamed(
+                      `${rootDir}/assets`,
+                      originalUrlValue,
+                      hashedUrlValue,
+                      fileRenames
+                    );
+                  } catch {
+                    console.log(
+                      `warning: could not hash canvaskit.wasm resource because it was not found at ${originalUrlValue}`
+                    );
+                  }
+                }
+              }
+            }
+            if (ancestors.length >= 5) {
+              const maybeProperty = ancestors.slice(-2)[0];
+              if (maybeProperty.type === "Property") {
+                const property = maybeProperty;
+                if (property.key.type === "Identifier" && property.key.name == "url") {
+                  const maybeObjExpression = ancestors.slice(-3)[0];
+                  if (maybeObjExpression.type === "ObjectExpression") {
+                    const objExpression = maybeObjExpression;
+                    const properties = objExpression.properties.filter((p) => p.type === "Property").map((p) => p);
+                    const identifiers = properties.filter((p) => p.key.type === "Identifier").map((p) => p.key.name);
+                    const urlFontAssetProperties = ["fontName", "url"];
+                    const propCount = identifiers.filter(
+                      (i) => urlFontAssetProperties.indexOf(i) !== -1
+                    ).length;
+                    if (propCount === 2) {
+                      const maybeArrayExpression = ancestors.slice(-4)[0];
+                      if (maybeArrayExpression.type === "ArrayExpression") {
+                        const maybeProperty2 = ancestors.slice(-5)[0];
+                        if (maybeProperty2.type === "Property") {
+                          const property2 = maybeProperty2;
+                          if (property2.key.type === "Identifier" && property2.key.name == "fonts") {
+                            const literal = node;
+                            const originalUrlValue = literal.value;
+                            const optionsDeclarator = ancestors.slice(
+                              -7
+                            )[0];
+                            const objExpression2 = optionsDeclarator.init;
+                            const properties2 = objExpression2.properties;
+                            const gameIdProperty = properties2.filter(
+                              (p) => p.key.type === "Identifier" && p.key.name == "id"
+                            )[0];
+                            const gameId = gameIdProperty.value.value;
                             try {
-                                link.attribs["href"] = addHashToUrl(link.attribs["href"], rootDir);
-                                addFileToFilesToBeRenamed(rootDir, originalUrl, link.attribs["href"], fileRenames);
-                            }
-                            catch (_b) {
-                                console.log(`warning: could not hash css resource because it was not found at ${link.attribs["href"]}`);
+                              const hashedUrlValue = addHashToUrl(
+                                originalUrlValue,
+                                path.join(rootDir, "assets", gameId),
+                                cwd
+                              );
+                              literal.value = literal.value.replace(
+                                originalUrlValue,
+                                hashedUrlValue
+                              );
+                              literal.raw = literal.raw.replace(
+                                originalUrlValue,
+                                hashedUrlValue
+                              );
+                              addFileToFilesToBeRenamed(
+                                path.join(rootDir, "assets", gameId),
+                                originalUrlValue,
+                                hashedUrlValue,
+                                fileRenames
+                              );
+                            } catch {
                             }
+                          }
                         }
-                    });
-                    // handle the script link to index.js
-                    const scripts = selectAll("script", dom);
-                    scripts
-                        .map((script) => script)
-                        .forEach((script) => {
-                        var _a;
-                        if (script.attribs["src"] === "./index.js" &&
-                            !(((_a = script.attribs["hash"]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "false")) {
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            if (ancestors.length >= 5) {
+              const maybeProperty = ancestors.slice(-2)[0];
+              if (maybeProperty.type === "Property") {
+                const property = maybeProperty;
+                if (property.key.type === "Identifier" && property.key.name == "url") {
+                  const maybeObjExpression = ancestors.slice(-3)[0];
+                  if (maybeObjExpression.type === "ObjectExpression") {
+                    const objExpression = maybeObjExpression;
+                    const properties = objExpression.properties.filter((p) => p.type === "Property").map((p) => p);
+                    const identifiers = properties.filter((p) => p.key.type === "Identifier").map((p) => p.key.name);
+                    const urlBrowserImageProperties = [
+                      "imageName",
+                      "height",
+                      "width",
+                      "url"
+                    ];
+                    const propCount = identifiers.filter(
+                      (i) => urlBrowserImageProperties.indexOf(i) !== -1
+                    ).length;
+                    if (propCount === 4) {
+                      const maybeArrayExpression = ancestors.slice(-4)[0];
+                      if (maybeArrayExpression.type === "ArrayExpression") {
+                        const maybeProperty2 = ancestors.slice(-5)[0];
+                        if (maybeProperty2.type === "Property") {
+                          const property2 = maybeProperty2;
+                          if (property2.key.type === "Identifier" && property2.key.name == "images") {
+                            const literal = node;
+                            const originalUrlValue = literal.value;
+                            const optionsDeclarator = ancestors.slice(
+                              -7
+                            )[0];
+                            const objExpression2 = optionsDeclarator.init;
+                            const properties2 = objExpression2.properties;
+                            const gameIdProperty = properties2.filter(
+                              (p) => p.key.type === "Identifier" && p.key.name == "id"
+                            )[0];
+                            const gameId = gameIdProperty.value.value;
                             try {
-                                const hashedFilename = addHashToUrl("index.js", rootDir);
-                                script.attribs["src"] = "./" + path.basename(hashedFilename);
-                                addFileToFilesToBeRenamed(rootDir, "index.js", hashedFilename, fileRenames);
-                            }
-                            catch (_b) {
-                                console.log(`warning: could not hash index.js because it was not found at ${indexJsFile}`);
+                              const hashedUrlValue = addHashToUrl(
+                                originalUrlValue,
+                                path.join(rootDir, "assets", gameId),
+                                cwd
+                              );
+                              literal.value = literal.value.replace(
+                                originalUrlValue,
+                                hashedUrlValue
+                              );
+                              literal.raw = literal.raw.replace(
+                                originalUrlValue,
+                                hashedUrlValue
+                              );
+                              addFileToFilesToBeRenamed(
+                                path.join(rootDir, "assets", gameId),
+                                originalUrlValue,
+                                hashedUrlValue,
+                                fileRenames
+                              );
+                            } catch {
                             }
+                          }
                         }
-                    });
-                    yield writeFile(indexHtmlFile, render(dom));
-                    fileRenames.forEach((fr) => {
-                        // we must check existsSync because a file may be included twice
-                        if (existsSync(fr.original)) {
-                            renameSync(fr.original, fr.new);
-                        }
-                    });
-                    yield writeHashManifest(rootDir, fileRenames);
-                });
-            },
-        },
-    };
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        });
+        const indexJsCode = generate(ast);
+        await writeFile(indexJsFile, indexJsCode);
+        const rawHtml = await readFile(indexHtmlFile, "utf-8");
+        const dom = parseDocument(rawHtml);
+        const links = selectAll("link", dom);
+        links.map((link) => link).forEach((link) => {
+          if (link.attribs["href"].endsWith(".css") && !(link.attribs["hash"]?.toLowerCase() === "false")) {
+            const originalUrl = link.attribs["href"];
+            try {
+              link.attribs["href"] = addHashToUrl(
+                link.attribs["href"],
+                rootDir,
+                cwd
+              );
+              addFileToFilesToBeRenamed(
+                rootDir,
+                originalUrl,
+                link.attribs["href"],
+                fileRenames
+              );
+            } catch {
+              console.log(
+                `warning: could not hash css resource because it was not found at ${link.attribs["href"]}`
+              );
+            }
+          }
+        });
+        const scripts = selectAll("script", dom);
+        scripts.map((script) => script).forEach((script) => {
+          if (script.attribs["src"] === "./index.js" && !(script.attribs["hash"]?.toLowerCase() === "false")) {
+            try {
+              const hashedFilename = addHashToUrl("index.js", rootDir, cwd);
+              script.attribs["src"] = "./" + path.basename(hashedFilename);
+              addFileToFilesToBeRenamed(
+                rootDir,
+                "index.js",
+                hashedFilename,
+                fileRenames
+              );
+            } catch {
+              console.log(
+                `warning: could not hash index.js because it was not found at ${indexJsFile}`
+              );
+            }
+          }
+        });
+        await writeFile(indexHtmlFile, render(dom));
+        fileRenames.forEach((fr) => {
+          if (existsSync(path.join(cwd, fr.original))) {
+            renameSync(path.join(cwd, fr.original), path.join(cwd, fr.new));
+          }
+        });
+        await writeHashManifest(rootDir, fileRenames, cwd);
+      }
+    }
+  };
 }
 const getFileHash = (filePath) => {
-    const buffer = readFileSync(filePath);
-    const hash = createHash("md5").update(buffer).digest("hex");
-    return hash.slice(0, HASH_CHARACTER_LENGTH);
+  const buffer = readFileSync(filePath);
+  const hash = createHash("md5").update(buffer).digest("hex");
+  return hash.slice(0, HASH_CHARACTER_LENGTH);
+};
+const addHashToUrl = (url, rootDir, cwd = "") => {
+  const ext = path.extname(url);
+  const hash = getFileHash(path.join(cwd, rootDir, url));
+  if (ext) {
+    url = url.replace(ext, `.${hash}${ext}`);
+  } else {
+    url = url + `.${hash}`;
+  }
+  return url;
 };
-const addHashToUrl = (url, rootDir) => {
-    const ext = path.extname(url);
-    const hash = getFileHash(path.join(rootDir, url));
-    if (ext) {
-        url = url.replace(ext, `.${hash}${ext}`);
+async function writeHashManifest(rootDir, fileRenames, cwd = "") {
+  const manifestFilename = path.join(cwd, rootDir, "hash-manifest.json");
+  const manifest = {};
+  fileRenames.forEach((fr) => {
+    let originalName = fr.original.replace(rootDir + path.sep, "");
+    let hashedName = fr.new.replace(rootDir + path.sep, "");
+    if (process.platform === "win32") {
+      originalName = originalName.replace(/\\/g, "/");
+      hashedName = hashedName.replace(/\\/g, "/");
     }
-    else {
-        url = url + `.${hash}`;
-    }
-    return url;
-};
-function writeHashManifest(rootDir, fileRenames) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const manifestFilename = path.join(rootDir, "hash-manifest.json");
-        const manifest = {};
-        fileRenames.forEach((fr) => {
-            let originalName = fr.original.replace(rootDir + path.sep, "");
-            let hashedName = fr.new.replace(rootDir + path.sep, "");
-            if (process.platform === "win32") {
-                originalName = originalName.replace(/\\/g, "/");
-                hashedName = hashedName.replace(/\\/g, "/");
-            }
-            manifest[originalName] = hashedName;
-        });
-        const manifestString = JSON.stringify(manifest, null, 2);
-        yield writeFile(manifestFilename, manifestString);
-    });
+    manifest[originalName] = hashedName;
+  });
+  const manifestString = JSON.stringify(manifest, null, 2);
+  await writeFile(manifestFilename, manifestString);
 }
 function addFileToFilesToBeRenamed(rootDir, originalUrlValue, hashedUrlValue, fileRenames) {
-    const filename = path.join(rootDir, originalUrlValue);
-    const hashedFilename = path.join(rootDir, hashedUrlValue);
-    fileRenames.push({
-        original: filename,
-        new: hashedFilename,
-    });
+  const filename = path.join(rootDir, originalUrlValue);
+  const hashedFilename = path.join(rootDir, hashedUrlValue);
+  fileRenames.push({
+    original: filename,
+    new: hashedFilename
+  });
 }
 
 function makeM2c2kitServiceWorker(rootDir, additionalFiles) {
-    let inputFile = "";
-    return {
-        name: "make-m2c2kit-serviceworker",
-        buildStart: {
-            handler(options) {
-                if (options.input) {
-                    if (typeof options.input === "string") {
-                        inputFile = path.resolve(options.input);
-                    }
-                    else if (Array.isArray(options.input)) {
-                        inputFile = path.resolve(options.input[0]);
-                    }
-                    else {
-                        throw new Error("Could not determine input file when trying to add service worker code.");
-                    }
-                }
-            },
-        },
-        transform: {
-            handler(code, id) {
-                if (id === inputFile) {
-                    if (code.includes("//# sourceMappingURL")) {
-                        code = code.replace("//# sourceMappingURL", serviceWorkerRegistrationCode + "\n//# sourceMappingURL");
-                    }
-                }
-                return code;
-            },
-        },
-        closeBundle: {
-            sequential: true,
-            handler() {
-                return __awaiter(this, void 0, void 0, function* () {
-                    // this is the path of our @m2c2kit/build-helpers package
-                    // our sw.js template is stored under the "assets" folder here
-                    const packageHomeFolderPath = path.dirname(fileURLToPath(import.meta.url));
-                    let swContents = (yield readFile(path.join(packageHomeFolderPath, "assets", "sw.js"))).toString();
-                    const manifestFilename = path.join(rootDir, "hash-manifest.json");
-                    const manifestContents = (yield readFile(manifestFilename)).toString();
-                    const manifest = JSON.parse(manifestContents);
-                    const hashedFilenames = Object.values(manifest);
-                    let replacementString = hashedFilenames.map((f) => `"${f}"`).join(",");
-                    if (additionalFiles) {
-                        replacementString =
-                            replacementString +
-                                "," +
-                                additionalFiles.map((f) => `"${f}"`).join(",");
-                    }
-                    swContents = swContents.replace('"_-_ADDITIONAL_RESOURCES_TO_CACHE_-_"', replacementString);
-                    const swDestinationFilename = path.join(rootDir, "sw.js");
-                    yield writeFile(swDestinationFilename, swContents);
-                });
-            },
-        },
-    };
+  let inputFile = "";
+  return {
+    name: "make-m2c2kit-serviceworker",
+    buildStart: {
+      handler(options) {
+        if (options.input) {
+          if (typeof options.input === "string") {
+            inputFile = path.resolve(options.input);
+          } else if (Array.isArray(options.input)) {
+            inputFile = path.resolve(options.input[0]);
+          } else {
+            throw new Error(
+              "Could not determine input file when trying to add service worker code."
+            );
+          }
+        }
+      }
+    },
+    transform: {
+      handler(code, id) {
+        if (id === inputFile) {
+          if (code.includes("//# sourceMappingURL")) {
+            code = code.replace(
+              "//# sourceMappingURL",
+              serviceWorkerRegistrationCode + "\n//# sourceMappingURL"
+            );
+          }
+        }
+        return code;
+      }
+    },
+    closeBundle: {
+      sequential: true,
+      async handler() {
+        const packageHomeFolderPath = path.dirname(
+          fileURLToPath(import.meta.url)
+        );
+        let swContents = (await readFile(path.join(packageHomeFolderPath, "assets", "sw.js"))).toString();
+        const manifestFilename = path.join(rootDir, "hash-manifest.json");
+        const manifestContents = (await readFile(manifestFilename)).toString();
+        const manifest = JSON.parse(manifestContents);
+        const hashedFilenames = Object.values(manifest);
+        let replacementString = hashedFilenames.map((f) => `"${f}"`).join(",");
+        if (additionalFiles) {
+          replacementString = replacementString + "," + additionalFiles.map((f) => `"${f}"`).join(",");
+        }
+        swContents = swContents.replace(
+          '"_-_ADDITIONAL_RESOURCES_TO_CACHE_-_"',
+          replacementString
+        );
+        const swDestinationFilename = path.join(rootDir, "sw.js");
+        await writeFile(swDestinationFilename, swContents);
+      }
+    }
+  };
 }
 const serviceWorkerRegistrationCode = `const registerServiceWorker = async () => {
   if ("serviceWorker" in navigator) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/build-helpers",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "",
   "module": "dist/index.js",
   "type": "module",
@@ -11,28 +11,29 @@
   ],
   "devDependencies": {
     "@rollup/plugin-commonjs": "25.0.0",
-    "@rollup/plugin-node-resolve": "15.0.2",
-    "@rollup/plugin-typescript": "11.1.1",
+    "@rollup/plugin-node-resolve": "15.1.0",
     "@types/estree": "1.0.1",
     "@types/findup-sync": "4.0.2",
+    "cpy": "10.1.0",
     "cpy-cli": "4.2.0",
     "findup-sync": "5.0.0",
     "rimraf": "5.0.1",
     "rollup": "3.21.0",
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-dts": "5.3.0",
-    "typescript": "5.0.4"
+    "rollup-plugin-esbuild": "5.0.0",
+    "typescript": "5.1.3"
   },
   "scripts": {
-    "build": "npm run clean && rollup -c && cpy assets dist",
+    "build": "npm run clean && tsc && rollup -c",
     "clean": "rimraf build dist .rollup.cache tsconfig.tsbuildinfo",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "cd ../.. && npx env-cmd -f .env.jest jest --selectProjects @m2c2kit/build-helpers"
   },
   "license": "MIT",
   "dependencies": {
     "acorn": "8.8.2",
     "acorn-walk": "8.2.0",
-    "astring": "1.8.4",
+    "astring": "1.8.6",
     "css-select": "5.1.0",
     "dom-serializer": "2.0.0",
     "domhandler": "5.0.3",