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

package/dist/router.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.
  *
@@ -116,6 +116,10 @@ function createMemoryHistory(options) {
       return typeof to === "string" ? to : createPath(to);
     },
 
+    encodeLocation(location) {
+      return location;
+    },
+
     push(to, state) {
       action = Action.Push;
       let nextLocation = createMemoryLocation(to, state);
@@ -347,6 +351,14 @@ function parsePath(path) {
 
   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) {
@@ -437,6 +449,16 @@ function getUrlBasedHistory(getLocation, createHref, validateLocation, options)
       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,
 
@@ -518,9 +540,12 @@ function matchRoutes(routes, locationArg, basename) {
   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));
   }
 
@@ -1438,12 +1463,7 @@ function createRouter(init) {
     // 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 ? Action.Replace : Action.Push;
     let preventScrollReset = opts && "preventScrollReset" in opts ? opts.preventScrollReset === true : undefined;
     return await startNavigation(historyAction, location, {
@@ -2516,8 +2536,6 @@ function unstable_createStaticHandler(routes) {
     let result;
 
     if (!actionMatch.route.action) {
-      let href = createServerHref(new URL(request.url));
-
       if (isRouteRequest) {
         throw createRouterErrorResponse(null, {
           status: 405,
@@ -2525,7 +2543,7 @@ function unstable_createStaticHandler(routes) {
         });
       }
 
-      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);
@@ -2709,7 +2727,7 @@ function normalizeNavigateOptions(to, opts, isFetcher) {
       path,
       submission: {
         formMethod: opts.formMethod,
-        formAction: createServerHref(parsePath(path)),
+        formAction: stripHashFromPath(path),
         formEncType: opts && opts.formEncType || "application/x-www-form-urlencoded",
         formData: opts.formData
       }
@@ -2989,7 +3007,7 @@ async function callLoaderOrAction(type, request, match, matches, basename, isSta
 }
 
 function createRequest(location, signal, submission) {
-  let url = createURL(location).toString();
+  let url = createURL(stripHashFromPath(location)).toString();
   let init = {
     signal
   };
@@ -3182,7 +3200,7 @@ function getMethodNotAllowedMatches(routes) {
 }
 
 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,
@@ -3199,11 +3217,13 @@ function findRedirect(results) {
       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) {
@@ -3321,12 +3341,6 @@ function getTargetMatch(matches, location) {
 
   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
 
 export { AbortedDeferredError, Action, ErrorResponse, IDLE_FETCHER, IDLE_NAVIGATION, convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes, getPathContributingMatches as UNSAFE_getPathContributingMatches, createBrowserHistory, createHashHistory, createMemoryHistory, createPath, createRouter, defer, generatePath, getStaticContextFromError, getToPathname, invariant, isRouteErrorResponse, joinPaths, json, matchPath, matchRoutes, normalizePathname, parsePath, redirect, resolvePath, resolveTo, stripBasename, unstable_createStaticHandler, warning };