fix: routing FF + safari

KevinBLT · Mar 29, 2024 · 5c1ec17 · 5c1ec17
1 parent 01ee65a
commit 5c1ec17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/packages/@hec.js/ui/lib/src/expression.js b/packages/@hec.js/ui/lib/src/expression.js
@@ -5,7 +5,7 @@
  * @returns {Expression}
  */
 export function expression(text) {
-  const parts = text.matchAll(/([^ {}\s]+)/g),
+  const parts = text.matchAll(/([a-z]+=["'][^'"]+["']|[^{}\s]+)/g),
         exp   = {
           meta: {},
           text: text,

diff --git a/packages/@hec.js/ui/lib/src/plugins/data-route.js b/packages/@hec.js/ui/lib/src/plugins/data-route.js
@@ -7,13 +7,6 @@ export const dataRoutePlugin = {
   select: (node) => node.matches('[data-route]'),
 
   run: async (node, props) => {
-
-    /* -- Polyfill safari -- */
-    if (!('URLPattern' in window)) { // @ts-ignore
-      await import('https://kevinblt.github.io/hec/packages/@hec.js/ui/dist/urlpattnern.min.js');
-    }
-    /* -- -- */
-
     const route       = node.dataset.route,
           placeholder = document.createComment('route: ' + route),
           update      = nodeUpdater(node, placeholder, props);

diff --git a/packages/@hec.js/ui/lib/src/routing.js b/packages/@hec.js/ui/lib/src/routing.js
@@ -1,6 +1,12 @@
 import { onMount } from "./notify.js";
 import { signal } from "./signal.js";
 
+/* -- Polyfill safari -- */
+if (!('URLPattern' in window)) { // @ts-ignore
+  await import('https://kevinblt.github.io/hec/packages/@hec.js/ui/dist/urlpattnern.min.js');
+}
+/* -- -- */
+
 /** @type { import("./signal.js").Signal<{ [key: string]: string }> } */
 export const query  = signal({});
 export const route  = signal(location.pathname);