Replace with helper function

hotwired · Dec 15, 2024 · e0ee392 · e0ee392
1 parent 13dd08d
commit e0ee392
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/app/assets/javascripts/hotwire_spark.js b/app/assets/javascripts/hotwire_spark.js
@@ -517,6 +517,9 @@ var HotwireSpark = (function () {
   function nameFromFilePath(path) {
     return path.split("/").pop().split(".")[0];
   }
+  function withoutAssetDigest(path) {
+    return path.replace(/-[a-z0-9]+\.(\w+)$/, ".$1");
+  }
   function urlWithParams(urlString, params) {
     const url = new URL(urlString, window.location.origin);
     Object.entries(params).forEach(_ref => {
@@ -3635,16 +3638,11 @@ var HotwireSpark = (function () {
       });
     }
     #findExistingLinkFor(link) {
-      return this.#cssLinks.find(newLink => {
-        return this.#withoutAssetDigest(link.href) === this.#withoutAssetDigest(newLink.href);
-      });
+      return this.#cssLinks.find(newLink => withoutAssetDigest(link.href) === withoutAssetDigest(newLink.href));
     }
     get #cssLinks() {
       return Array.from(document.querySelectorAll("link[rel='stylesheet']"));
     }
-    #withoutAssetDigest(url) {
-      return url.replace(/-[^-]+\.css.*$/, ".css");
-    }
     #appendNewLink(link) {
       document.head.append(link);
       return link;

diff --git a/app/assets/javascripts/hotwire_spark.min.js b/app/assets/javascripts/hotwire_spark.min.js
diff --git a/app/assets/javascripts/hotwire_spark.min.js.map b/app/assets/javascripts/hotwire_spark.min.js.map
diff --git a/app/javascript/hotwire_spark/helpers.js b/app/javascript/hotwire_spark/helpers.js
@@ -2,9 +2,13 @@ export function nameFromFilePath(path) {
   return path.split("/").pop().split(".")[0]
 }
 
+export function withoutAssetDigest(path) {
+  return path.replace(/-[a-z0-9]+\.(\w+)$/, ".$1");
+}
+
 export function urlWithParams(urlString, params) {
   const url = new URL(urlString, window.location.origin)
-  Object.entries(params).forEach(([key, value]) => {
+  Object.entries(params).forEach(([ key, value ]) => {
     url.searchParams.set(key, value)
   })
   return url.toString()

diff --git a/app/javascript/hotwire_spark/reloaders/css_reloader.js b/app/javascript/hotwire_spark/reloaders/css_reloader.js
@@ -1,5 +1,5 @@
 import { log } from "../logger.js"
-import { cacheBustedUrl, reloadHtmlDocument } from "../helpers.js"
+import { cacheBustedUrl, reloadHtmlDocument, withoutAssetDigest } from "../helpers.js"
 
 export class CssReloader {
   static async reload(...params) {
@@ -53,17 +53,13 @@ export class CssReloader {
   }
 
   #findExistingLinkFor(link) {
-    return this.#cssLinks.find(newLink => this.#withoutAssetDigest(link.href) === this.#withoutAssetDigest(newLink.href))
+    return this.#cssLinks.find(newLink => withoutAssetDigest(link.href) === withoutAssetDigest(newLink.href))
   }
 
   get #cssLinks() {
     return Array.from(document.querySelectorAll("link[rel='stylesheet']"))
   }
 
-  #withoutAssetDigest(url) {
-    return url.replace(/-[^-]+\.css.*$/, ".css")
-  }
-
   #appendNewLink(link) {
     document.head.append(link)
     return link