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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.0.3-pre.0
+ * @remix-run/router v1.0.3-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -115,6 +115,10 @@
         return typeof to === "string" ? to : createPath(to);
       },
 
+      encodeLocation(location) {
+        return location;
+      },
+
       push(to, state) {
         action = exports.Action.Push;
         let nextLocation = createMemoryLocation(to, state);
@@ -372,6 +376,14 @@
 
     return parsedPath;
   }
+  function createURL(location) {
+    // window.location.origin is "null" (the literal string value) in Firefox
+    // under certain conditions, notably when serving from a local HTML file
+    // See https://bugzilla.mozilla.org/show_bug.cgi?id=878297
+    let base = typeof window !== "undefined" && typeof window.location !== "undefined" && window.location.origin !== "null" ? window.location.origin : "unknown://unknown";
+    let href = typeof location === "string" ? location : createPath(location);
+    return new URL(href, base);
+  }
 
   function getUrlBasedHistory(getLocation, createHref, validateLocation, options) {
     if (options === void 0) {
@@ -462,6 +474,16 @@
         return createHref(window, to);
       },
 
+      encodeLocation(location) {
+        // Encode a Location the same way window.location would
+        let url = createURL(createPath(location));
+        return _extends({}, location, {
+          pathname: url.pathname,
+          search: url.search,
+          hash: url.hash
+        });
+      },
+
       push,
       replace,
 
@@ -550,9 +572,12 @@
     let matches = null;
 
     for (let i = 0; matches == null && i < branches.length; ++i) {
-      matches = matchRouteBranch(branches[i], // incoming pathnames are always encoded from either window.location or
-      // from route.navigate, but we want to match against the unencoded paths
-      // in the route definitions
+      matches = matchRouteBranch(branches[i], // Incoming pathnames are generally encoded from either window.location
+      // or from router.navigate, but we want to match against the unencoded
+      // paths in the route definitions.  Memory router locations won't be
+      // encoded here but there also shouldn't be anything to decode so this
+      // should be a safe operation.  This avoids needing matchRoutes to be
+      // history-aware.
       safelyDecodeURI(pathname));
     }
 
@@ -1484,12 +1509,7 @@
       // the same encoding we'd get from a history.pushState/window.location read
       // without having to touch history
 
-      let url = createURL(createPath(location));
-      location = _extends({}, location, {
-        pathname: url.pathname,
-        search: url.search,
-        hash: url.hash
-      });
+      location = init.history.encodeLocation(location);
       let historyAction = (opts && opts.replace) === true || submission != null ? exports.Action.Replace : exports.Action.Push;
       let preventScrollReset = opts && "preventScrollReset" in opts ? opts.preventScrollReset === true : undefined;
       return await startNavigation(historyAction, location, {
@@ -2562,8 +2582,6 @@
       let result;
 
       if (!actionMatch.route.action) {
-        let href = createServerHref(new URL(request.url));
-
         if (isRouteRequest) {
           throw createRouterErrorResponse(null, {
             status: 405,
@@ -2571,7 +2589,7 @@
           });
         }
 
-        result = getMethodNotAllowedResult(href);
+        result = getMethodNotAllowedResult(request.url);
       } else {
         result = await callLoaderOrAction("action", request, actionMatch, matches, undefined, // Basename not currently supported in static handlers
         true, isRouteRequest);
@@ -2755,7 +2773,7 @@
         path,
         submission: {
           formMethod: opts.formMethod,
-          formAction: createServerHref(parsePath(path)),
+          formAction: stripHashFromPath(path),
           formEncType: opts && opts.formEncType || "application/x-www-form-urlencoded",
           formData: opts.formData
         }
@@ -3035,7 +3053,7 @@
   }
 
   function createRequest(location, signal, submission) {
-    let url = createURL(location).toString();
+    let url = createURL(stripHashFromPath(location)).toString();
     let init = {
       signal
     };
@@ -3228,7 +3246,7 @@
   }
 
   function getMethodNotAllowedResult(path) {
-    let href = typeof path === "string" ? path : createServerHref(path);
+    let href = typeof path === "string" ? path : createPath(path);
     console.warn("You're trying to submit to a route that does not have an action.  To " + "fix this, please add an `action` function to the route for " + ("[" + href + "]"));
     return {
       type: ResultType.error,
@@ -3245,11 +3263,13 @@
         return result;
       }
     }
-  } // Create an href to represent a "server" URL without the hash
-
+  }
 
-  function createServerHref(location) {
-    return (location.pathname || "") + (location.search || "");
+  function stripHashFromPath(path) {
+    let parsedPath = typeof path === "string" ? parsePath(path) : path;
+    return createPath(_extends({}, parsedPath, {
+      hash: ""
+    }));
   }
 
   function isHashChangeOnly(a, b) {
@@ -3367,12 +3387,6 @@
 
     let pathMatches = getPathContributingMatches(matches);
     return pathMatches[pathMatches.length - 1];
-  }
-
-  function createURL(location) {
-    let base = typeof window !== "undefined" && typeof window.location !== "undefined" ? window.location.origin : "unknown://unknown";
-    let href = typeof location === "string" ? location : createServerHref(location);
-    return new URL(href, base);
   } //#endregion
 
   exports.AbortedDeferredError = AbortedDeferredError;