@solidjs/router 0.8.3 → 0.9.0

package/README.md

@@ -4,6 +4,8 @@
 
 # Solid Router [![npm Version](https://img.shields.io/npm/v/@solidjs/router.svg?style=flat-square)](https://www.npmjs.org/package/@solidjs/router)
 
+#### Note: v0.9.0 requires Solid 1.8.4 or later
+
 A router lets you change your view based on the URL in the browser. This allows your "single-page" application to simulate a traditional multipage site. To use Solid Router, you specify components called Routes that depend on the value of the URL (the "path"), and the router handles the mechanism of swapping them in and out.
 
 Solid Router is a universal router for SolidJS - it works whether you're rendering on the client or on the server. It was inspired by and combines paradigms of React Router and the Ember Router. Routes can be defined directly in your app's template using JSX, but you can also pass your route configuration directly as an object. It also supports nested routing, so navigation can change a part of a component, rather than completely replacing it.

package/dist/components.jsx

@@ -1,12 +1,16 @@
 /*@refresh skip*/
 import { children, createMemo, createRoot, mergeProps, on, Show, splitProps } from "solid-js";
-import { isServer } from "solid-js/web";
+import { isServer, getRequestEvent } from "solid-js/web";
 import { pathIntegration, staticIntegration } from "./integration";
 import { createBranches, createRouteContext, createRouterContext, getRouteMatches, RouteContextObj, RouterContextObj, useHref, useLocation, useNavigate, useResolvedPath, useRoute, useRouter } from "./routing";
 import { joinPaths, normalizePath, createMemoObject } from "./utils";
 export const Router = (props) => {
+    let e;
     const { source, url, base, data, out } = props;
-    const integration = source || (isServer ? staticIntegration({ value: url || "" }) : pathIntegration());
+    const integration = source ||
+        (isServer
+            ? staticIntegration({ value: url || ((e = getRequestEvent()) && e.request.url) || "" })
+            : pathIntegration());
     const routerState = createRouterContext(integration, base, data, out);
     return (<RouterContextObj.Provider value={routerState}>{props.children}</RouterContextObj.Provider>);
 };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isServer, delegateEvents, createComponent as createComponent$1, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
+import { isServer, delegateEvents, getRequestEvent, createComponent as createComponent$1, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
 import { createSignal, onCleanup, getOwner, runWithOwner, createMemo, createContext, useContext, untrack, createRenderEffect, createComponent, on, startTransition, resetErrorBoundaries, children, createRoot, Show, mergeProps, splitProps } from 'solid-js';
 
 function bindEvent(target, type, handler) {
@@ -9,6 +9,9 @@ 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);
@@ -614,6 +617,8 @@ function createRouterContext(integration, base = "", data, out) {
           if (output) {
             output.url = resolvedTo;
           }
+          const e = getRequestEvent();
+          e && (e.response = Response.redirect(resolvedTo, 302));
           setSource({
             value: resolvedTo,
             replace,
@@ -758,8 +763,9 @@ function createRouteContext(router, parent, child, match, params) {
   return route;
 }
 
-const _tmpl$ = /*#__PURE__*/template(`<a link></a>`, 2);
+const _tmpl$ = /*#__PURE__*/template(`<a link>`);
 const Router = props => {
+  let e;
   const {
     source,
     url,
@@ -768,7 +774,7 @@ const Router = props => {
     out
   } = props;
   const integration = source || (isServer ? staticIntegration({
-    value: url || ""
+    value: url || (e = getRequestEvent()) && e.request.url || ""
   }) : pathIntegration());
   const routerState = createRouterContext(integration, base, data, out);
   return createComponent$1(RouterContextObj.Provider, {
@@ -891,7 +897,7 @@ function A(props) {
     return props.end ? path === loc : loc.startsWith(path);
   });
   return (() => {
-    const _el$ = _tmpl$.cloneNode(true);
+    const _el$ = _tmpl$();
     spread(_el$, mergeProps$1(rest, {
       get href() {
         return href() || props.href;

package/dist/integration.js

@@ -7,6 +7,9 @@ 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);

package/dist/routing.js

@@ -1,5 +1,5 @@
 import { createComponent, createContext, createMemo, createRenderEffect, createSignal, on, onCleanup, untrack, useContext, startTransition, resetErrorBoundaries } from "solid-js";
-import { isServer, delegateEvents } from "solid-js/web";
+import { isServer, delegateEvents, getRequestEvent } from "solid-js/web";
 import { normalizeIntegration } from "./integration";
 import { createBeforeLeave } from "./lifecycle";
 import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils";
@@ -271,6 +271,8 @@ export function createRouterContext(integration, base = "", data, out) {
                     if (output) {
                         output.url = resolvedTo;
                     }
+                    const e = getRequestEvent();
+                    e && (e.response = Response.redirect(resolvedTo, 302));
                     setSource({ value: resolvedTo, replace, scroll, state: nextState });
                 }
                 else if (beforeLeave.confirm(resolvedTo, options)) {

package/dist/types.d.ts

@@ -1,4 +1,9 @@
 import { Component, JSX } from "solid-js";
+declare module "solid-js/web" {
+    interface RequestEvent {
+        response?: Response;
+    }
+}
 export type Params = Record<string, string>;
 export type SetParams = Record<string, string | number | boolean | null | undefined>;
 export interface Path {
@@ -53,7 +58,7 @@ export type RouteDefinition<S extends string | string[] = any> = {
     element?: JSX.Element;
     preload?: () => void;
 });
-export type MatchFilter = string[] | RegExp | ((s: string) => boolean);
+export type MatchFilter = readonly string[] | RegExp | ((s: string) => boolean);
 export type PathParams<P extends string | readonly string[]> = P extends `${infer Head}/${infer Tail}` ? [...PathParams<Head>, ...PathParams<Tail>] : P extends `:${infer S}?` ? [S] : P extends `:${infer S}` ? [S] : P extends `*${infer S}` ? [S] : [];
 export type MatchFilters<P extends string | readonly string[] = any> = P extends string ? {
     [K in PathParams<P>[number]]?: MatchFilter;

package/package.json

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