@remix-run/router 1.0.3 → 1.0.4-pre.1

package/dist/utils.d.ts

@@ -35,6 +35,7 @@ export interface RedirectResult {
     status: number;
     location: string;
     revalidate: boolean;
+    external: boolean;
 }
 /**
  * Unsuccessful result from a loader or action
@@ -48,7 +49,8 @@ export interface ErrorResult {
  * Result from a loader or action - potentially successful or unsuccessful
  */
 export declare type DataResult = SuccessResult | DeferredResult | RedirectResult | ErrorResult;
-export declare type FormMethod = "get" | "post" | "put" | "patch" | "delete";
+export declare type SubmissionFormMethod = "post" | "put" | "patch" | "delete";
+export declare type FormMethod = "get" | SubmissionFormMethod;
 export declare type FormEncType = "application/x-www-form-urlencoded" | "multipart/form-data";
 /**
  * @private
@@ -56,7 +58,7 @@ export declare type FormEncType = "application/x-www-form-urlencoded" | "multipa
  * external consumption
  */
 export interface Submission {
-    formMethod: Exclude<FormMethod, "get">;
+    formMethod: SubmissionFormMethod;
     formAction: string;
     formEncType: FormEncType;
     formData: FormData;
@@ -373,7 +375,9 @@ export declare class ErrorResponse {
     status: number;
     statusText: string;
     data: any;
-    constructor(status: number, statusText: string | undefined, data: any);
+    error?: Error;
+    internal: boolean;
+    constructor(status: number, statusText: string | undefined, data: any, internal?: boolean);
 }
 /**
  * Check if the given error is an ErrorResponse generated from a 4xx/5xx

package/history.ts

@@ -127,12 +127,12 @@ export interface History {
 
   /**
    * Encode a location the same way window.history would do (no-op for memory
-   * history) so we ensure our PUSH/REPLAC e navigations for data routers
+   * history) so we ensure our PUSH/REPLACE navigations for data routers
    * behave the same as POP
    *
-   * @param location The incoming location from router.navigate()
+   * @param to Unencoded path
    */
-  encodeLocation(location: Location): Location;
+  encodeLocation(to: To): Path;
 
   /**
    * Pushes a new location onto the history stack, increasing its length by one.
@@ -268,8 +268,13 @@ export function createMemoryHistory(
     createHref(to) {
       return typeof to === "string" ? to : createPath(to);
     },
-    encodeLocation(location) {
-      return location;
+    encodeLocation(to: To) {
+      let path = typeof to === "string" ? parsePath(to) : to;
+      return {
+        pathname: path.pathname || "",
+        search: path.search || "",
+        hash: path.hash || "",
+      };
     },
     push(to, state) {
       action = Action.Push;
@@ -636,11 +641,10 @@ function getUrlBasedHistory(
     createHref(to) {
       return createHref(window, to);
     },
-    encodeLocation(location) {
+    encodeLocation(to) {
       // Encode a Location the same way window.location would
-      let url = createURL(createPath(location));
+      let url = createURL(typeof to === "string" ? to : createPath(to));
       return {
-        ...location,
         pathname: url.pathname,
         search: url.search,
         hash: url.hash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.0.3",
+  "version": "1.0.4-pre.1",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",