@solidjs/router 0.14.4 → 0.14.6

package/dist/data/cache.js

@@ -62,7 +62,7 @@ export function cache(fn, name) {
                     const data = e && (e.router.data || (e.router.data = {}));
                     if (data && key in data)
                         return data[key];
-                    if (Array.isArray(dataOnly) && !dataOnly.includes(key)) {
+                    if (Array.isArray(dataOnly) && !matchKey(key, dataOnly)) {
                         data[key] = undefined;
                         return Promise.resolve();
                     }

package/dist/data/events.js

@@ -49,7 +49,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 resolve: false,
                 replace: a.hasAttribute("replace"),
                 scroll: !a.hasAttribute("noscroll"),
-                state: state && JSON.parse(state)
+                state: state ? JSON.parse(state) : undefined
             });
         }
         function handleAnchorPreload(evt) {

package/dist/index.js

@@ -132,12 +132,12 @@ function createMatcher(path, partial, matchFilters) {
     const matchFilter = s => matchFilters === undefined ? undefined : matchFilters[s];
     for (let i = 0; i < len; i++) {
       const segment = segments[i];
-      const locSegment = locSegments[i];
       const dynamic = segment[0] === ":";
-      const key = dynamic ? segment.slice(1) : segment;
+      const locSegment = dynamic ? locSegments[i] : locSegments[i].toLowerCase();
+      const key = dynamic ? segment.slice(1) : segment.toLowerCase();
       if (dynamic && matchSegment(locSegment, matchFilter(key))) {
         match.params[key] = locSegment;
-      } else if (dynamic || !matchSegment(locSegment, segment)) {
+      } else if (dynamic || !matchSegment(locSegment, key)) {
         return null;
       }
       match.path += `/${locSegment}`;
@@ -154,9 +154,7 @@ function createMatcher(path, partial, matchFilters) {
   };
 }
 function matchSegment(input, filter) {
-  const isEqual = s => s.localeCompare(input, undefined, {
-    sensitivity: "base"
-  }) === 0;
+  const isEqual = s => s === input;
   if (filter === undefined) {
     return true;
   } else if (typeof filter === "string") {
@@ -821,17 +819,6 @@ function dataOnly(event, routerState, branches) {
 function intercept([value, setValue], get, set) {
   return [get ? () => get(value()) : value, set ? v => setValue(set(v)) : setValue];
 }
-function querySelector(selector) {
-  if (selector === "#") {
-    return null;
-  }
-  // Guard against selector being an invalid CSS selector
-  try {
-    return document.querySelector(selector);
-  } catch (e) {
-    return null;
-  }
-}
 function createRouter(config) {
   let ignore = false;
   const wrap = value => typeof value === "string" ? {
@@ -860,7 +847,7 @@ function bindEvent(target, type, handler) {
   return () => target.removeEventListener(type, handler);
 }
 function scrollToHash(hash, fallbackTop) {
-  const el = querySelector(`#${hash}`);
+  const el = hash && document.getElementById(hash);
   if (el) {
     el.scrollIntoView();
   } else if (fallbackTop) {
@@ -939,7 +926,7 @@ function cache(fn, name) {
         if (dataOnly) {
           const data = e && (e.router.data || (e.router.data = {}));
           if (data && key in data) return data[key];
-          if (Array.isArray(dataOnly) && !dataOnly.includes(key)) {
+          if (Array.isArray(dataOnly) && !matchKey(key, dataOnly)) {
             data[key] = undefined;
             return Promise.resolve();
           }
@@ -1225,7 +1212,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
         resolve: false,
         replace: a.hasAttribute("replace"),
         scroll: !a.hasAttribute("noscroll"),
-        state: state && JSON.parse(state)
+        state: state ? JSON.parse(state) : undefined
       });
     }
     function handleAnchorPreload(evt) {

package/dist/routers/createRouter.js

@@ -3,18 +3,6 @@ import { createRouterComponent } from "./components.jsx";
 function intercept([value, setValue], get, set) {
     return [get ? () => get(value()) : value, set ? (v) => setValue(set(v)) : setValue];
 }
-function querySelector(selector) {
-    if (selector === "#") {
-        return null;
-    }
-    // Guard against selector being an invalid CSS selector
-    try {
-        return document.querySelector(selector);
-    }
-    catch (e) {
-        return null;
-    }
-}
 export function createRouter(config) {
     let ignore = false;
     const wrap = (value) => (typeof value === "string" ? { value } : value);
@@ -43,7 +31,7 @@ export function bindEvent(target, type, handler) {
     return () => target.removeEventListener(type, handler);
 }
 export function scrollToHash(hash, fallbackTop) {
-    const el = querySelector(`#${hash}`);
+    const el = hash && document.getElementById(hash);
     if (el) {
         el.scrollIntoView();
     }

package/dist/utils.js

@@ -57,13 +57,13 @@ export function createMatcher(path, partial, matchFilters) {
         const matchFilter = (s) => matchFilters === undefined ? undefined : matchFilters[s];
         for (let i = 0; i < len; i++) {
             const segment = segments[i];
-            const locSegment = locSegments[i];
             const dynamic = segment[0] === ":";
-            const key = dynamic ? segment.slice(1) : segment;
+            const locSegment = dynamic ? locSegments[i] : locSegments[i].toLowerCase();
+            const key = dynamic ? segment.slice(1) : segment.toLowerCase();
             if (dynamic && matchSegment(locSegment, matchFilter(key))) {
                 match.params[key] = locSegment;
             }
-            else if (dynamic || !matchSegment(locSegment, segment)) {
+            else if (dynamic || !matchSegment(locSegment, key)) {
                 return null;
             }
             match.path += `/${locSegment}`;
@@ -81,7 +81,7 @@ export function createMatcher(path, partial, matchFilters) {
     };
 }
 function matchSegment(input, filter) {
-    const isEqual = (s) => s.localeCompare(input, undefined, { sensitivity: "base" }) === 0;
+    const isEqual = (s) => s === input;
     if (filter === undefined) {
         return true;
     }

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.14.4",
+  "version": "0.14.6",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",