@solidjs/router 0.12.3 → 0.12.5

package/README.md

@@ -59,7 +59,7 @@ This sets up a Router that will match on the url to display the desired page
 
 Solid Router allows you to configure your routes using JSX:
 
-1. Add each route to a `<Router>` using the `Route` component, specifying a path and an element or component to render when the user navigates to that path.
+1. Add each route to a `<Router>` using the `Route` component, specifying a path and a component to render when the user navigates to that path.
 
 ```jsx
 import { render } from "solid-js/web";

package/dist/data/cache.js

@@ -73,9 +73,10 @@ export function cache(fn, name) {
             onCleanup(() => cached[3].count--);
         }
         if (cached &&
+            cached[0] &&
             (isServer ||
                 intent === "native" ||
-                (cached[0] && cached[3].count) ||
+                cached[3].count ||
                 Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
             if (tracking) {
                 cached[3].count++;
@@ -113,8 +114,8 @@ export function cache(fn, name) {
         }
         if (isServer) {
             const e = getRequestEvent();
-            e && e.router.dataOnly && (e.router.data[key] = res);
-            return res;
+            if (e && e.router.dataOnly)
+                return (e.router.data[key] = res);
         }
         if (intent !== "preload") {
             res =

package/dist/index.js

@@ -230,7 +230,7 @@ function expandOptionals(pattern) {
 const MAX_REDIRECTS = 100;
 const RouterContextObj = createContext();
 const RouteContextObj = createContext();
-const useRouter = () => invariant(useContext(RouterContextObj), "Make sure your app is wrapped in a <Router />");
+const useRouter = () => invariant(useContext(RouterContextObj), "<A> and 'use' router primitives can be only used inside a Route.");
 const useRoute = () => useContext(RouteContextObj) || useRouter().base;
 const useResolvedPath = path => {
   const route = useRoute();
@@ -913,7 +913,7 @@ function cache(fn, name) {
       tracking = true;
       onCleanup(() => cached[3].count--);
     }
-    if (cached && (isServer || intent === "native" || cached[0] && cached[3].count || Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
+    if (cached && cached[0] && (isServer || intent === "native" || cached[3].count || Date.now() - cached[0] < PRELOAD_TIMEOUT)) {
       if (tracking) {
         cached[3].count++;
         cached[3][0](); // track
@@ -945,8 +945,7 @@ function cache(fn, name) {
     }
     if (isServer) {
       const e = getRequestEvent();
-      e && e.router.dataOnly && (e.router.data[key] = res);
-      return res;
+      if (e && e.router.dataOnly) return e.router.data[key] = res;
     }
     if (intent !== "preload") {
       res = "then" in res ? res.then(handleResponse(false), handleResponse(true)) : handleResponse(false)(res);

package/dist/routing.js

@@ -6,7 +6,7 @@ import { mockBase, createMemoObject, extractSearchParams, invariant, resolvePath
 const MAX_REDIRECTS = 100;
 export const RouterContextObj = createContext();
 export const RouteContextObj = createContext();
-export const useRouter = () => invariant(useContext(RouterContextObj), "Make sure your app is wrapped in a <Router />");
+export const useRouter = () => invariant(useContext(RouterContextObj), "<A> and 'use' router primitives can be only used inside a Route.");
 let TempRoute;
 export const useRoute = () => TempRoute || useContext(RouteContextObj) || useRouter().base;
 export const useResolvedPath = (path) => {

package/package.json

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