react-router 0.0.0-experimental-3278f3ca6 → 0.0.0-experimental-312bddb22

package/dist/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-3278f3ca6
+ * React Router v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/index.d.ts

@@ -24,20 +24,15 @@ export { ServerRouter } from "./lib/dom/ssr/server";
 export type { RoutesTestStubProps } from "./lib/dom/ssr/routes-test-stub";
 export { createRoutesStub } from "./lib/dom/ssr/routes-test-stub";
 export { createCookie, isCookie } from "./lib/server-runtime/cookies";
-export { composeUploadHandlers as unstable_composeUploadHandlers, parseMultipartFormData as unstable_parseMultipartFormData, } from "./lib/server-runtime/formData";
 export { createRequestHandler } from "./lib/server-runtime/server";
 export { createSession, createSessionStorage, isSession, } from "./lib/server-runtime/sessions";
 export { createCookieSessionStorage } from "./lib/server-runtime/sessions/cookieStorage";
 export { createMemorySessionStorage } from "./lib/server-runtime/sessions/memoryStorage";
-export { createMemoryUploadHandler as unstable_createMemoryUploadHandler } from "./lib/server-runtime/upload/memoryUploadHandler";
-export { MaxPartSizeExceededError } from "./lib/server-runtime/upload/errors";
 export { setDevServerHooks as unstable_setDevServerHooks } from "./lib/server-runtime/dev";
 export type { IsCookieFunction } from "./lib/server-runtime/cookies";
 export type { CreateRequestHandlerFunction } from "./lib/server-runtime/server";
 export type { IsSessionFunction } from "./lib/server-runtime/sessions";
 export type { HandleDataRequestFunction, HandleDocumentRequestFunction, HandleErrorFunction, ServerBuild, ServerEntryModule, } from "./lib/server-runtime/build";
-export type { UploadHandlerPart, UploadHandler, } from "./lib/server-runtime/formData";
-export type { MemoryUploadHandlerOptions, MemoryUploadHandlerFilterArgs, } from "./lib/server-runtime/upload/memoryUploadHandler";
 export type { Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, } from "./lib/server-runtime/cookies";
 export type { AppLoadContext } from "./lib/server-runtime/data";
 export type { PageLinkDescriptor, HtmlLinkDescriptor, LinkDescriptor, } from "./lib/router/links";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-3278f3ca6
+ * React Router v0.0.0-experimental-312bddb22
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,53 +11,8 @@
 import * as React from 'react';
 import { decode, encode } from 'turbo-stream';
 import { parse, serialize } from 'cookie';
-import { streamMultipart } from '@web3-storage/multipart-parser';
 import { splitCookiesString } from 'set-cookie-parser';
 
-function _asyncIterator(iterable) {
-  var method,
-    async,
-    sync,
-    retry = 2;
-  for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) {
-    if (async && null != (method = iterable[async])) return method.call(iterable);
-    if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable));
-    async = "@@asyncIterator", sync = "@@iterator";
-  }
-  throw new TypeError("Object is not async iterable");
-}
-function AsyncFromSyncIterator(s) {
-  function AsyncFromSyncIteratorContinuation(r) {
-    if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object."));
-    var done = r.done;
-    return Promise.resolve(r.value).then(function (value) {
-      return {
-        value: value,
-        done: done
-      };
-    });
-  }
-  return AsyncFromSyncIterator = function (s) {
-    this.s = s, this.n = s.next;
-  }, AsyncFromSyncIterator.prototype = {
-    s: null,
-    n: null,
-    next: function () {
-      return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments));
-    },
-    return: function (value) {
-      var ret = this.s.return;
-      return void 0 === ret ? Promise.resolve({
-        value: value,
-        done: !0
-      }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments));
-    },
-    throw: function (value) {
-      var thr = this.s.return;
-      return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments));
-    }
-  }, new AsyncFromSyncIterator(s);
-}
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -3878,10 +3833,31 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
   // Don't patch in routes we already know about so that `patch` is idempotent
   // to simplify user-land code. This is useful because we re-call the
   // `patchRoutesOnNavigation` function for matched routes with params.
-  let uniqueChildren = children.filter(a => !childrenToPatch.some(b => a.index === b.index && a.path === b.path && a.caseSensitive === b.caseSensitive));
+  let uniqueChildren = children.filter(newRoute => !childrenToPatch.some(existingRoute => isSameRoute(newRoute, existingRoute)));
   let newRoutes = convertRoutesToDataRoutes(uniqueChildren, mapRouteProperties, [routeId || "_", "patch", String(((_childrenToPatch = childrenToPatch) == null ? void 0 : _childrenToPatch.length) || "0")], manifest);
   childrenToPatch.push(...newRoutes);
 }
+function isSameRoute(newRoute, existingRoute) {
+  // Most optimal check is by id
+  if ("id" in newRoute && "id" in existingRoute && newRoute.id === existingRoute.id) {
+    return true;
+  }
+  // Second is by pathing differences
+  if (!(newRoute.index === existingRoute.index && newRoute.path === existingRoute.path && newRoute.caseSensitive === existingRoute.caseSensitive)) {
+    return false;
+  }
+  // Pathless layout routes are trickier since we need to check children.
+  // If they have no children then they're the same as far as we can tell
+  if ((!newRoute.children || newRoute.children.length === 0) && (!existingRoute.children || existingRoute.children.length === 0)) {
+    return true;
+  }
+  // Otherwise, we look to see if every child in the new route is already
+  // represented in the existing route's children
+  return newRoute.children.every((aChild, i) => {
+    var _existingRoute$childr;
+    return (_existingRoute$childr = existingRoute.children) == null ? void 0 : _existingRoute$childr.some(bChild => isSameRoute(aChild, bChild));
+  });
+}
 /**
  * Execute route.lazy() methods to lazily load route modules (loader, action,
  * shouldRevalidate) and update the routeManifest in place which shares objects
@@ -7249,6 +7225,11 @@ function singleFetchUrl(reqUrl) {
 }
 async function fetchAndDecode(url, init) {
   let res = await fetch(url, init);
+  // If this 404'd without hitting the running server (most likely in a
+  // pre-rendered app using a CDN), then bubble a standard 404 ErrorResponse
+  if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
+    throw new ErrorResponseImpl(404, "Not Found", true);
+  }
   !res.body ? process.env.NODE_ENV !== "production" ? invariant$1(false, "No response body to decode") : invariant$1(false) : void 0;
   try {
     let decoded = await decodeViaTurboStream(res.body, window);
@@ -10372,70 +10353,6 @@ function warnOnceAboutExpiresCookie(name, expires) {
   warnOnce(!expires, "The \"" + name + "\" cookie has an \"expires\" property set. " + "This will cause the expires value to not be updated when the session is committed. " + "Instead, you should set the expires value when serializing the cookie. " + "You can use `commitSession(session, { expires })` if using a session storage object, " + "or `cookie.serialize(\"value\", { expires })` if you're using the cookie directly.");
 }
 
-function composeUploadHandlers() {
-  for (var _len = arguments.length, handlers = new Array(_len), _key = 0; _key < _len; _key++) {
-    handlers[_key] = arguments[_key];
-  }
-  return async part => {
-    for (let handler of handlers) {
-      let value = await handler(part);
-      if (typeof value !== "undefined" && value !== null) {
-        return value;
-      }
-    }
-    return undefined;
-  };
-}
-/**
- * Allows you to handle multipart forms (file uploads) for your app.
- *
- * TODO: Update this comment
- * @see https://remix.run/utils/parse-multipart-form-data
- */
-async function parseMultipartFormData(request, uploadHandler) {
-  let contentType = request.headers.get("Content-Type") || "";
-  let [type, boundary] = contentType.split(/\s*;\s*boundary=/);
-  if (!request.body || !boundary || type !== "multipart/form-data") {
-    throw new TypeError("Could not parse content as FormData.");
-  }
-  let formData = new FormData();
-  let parts = streamMultipart(request.body, boundary);
-  var _iteratorAbruptCompletion = false;
-  var _didIteratorError = false;
-  var _iteratorError;
-  try {
-    for (var _iterator = _asyncIterator(parts), _step; _iteratorAbruptCompletion = !(_step = await _iterator.next()).done; _iteratorAbruptCompletion = false) {
-      let part = _step.value;
-      {
-        if (part.done) break;
-        if (typeof part.filename === "string") {
-          // only pass basename as the multipart/form-data spec recommends
-          // https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-          part.filename = part.filename.split(/[/\\]/).pop();
-        }
-        let value = await uploadHandler(part);
-        if (typeof value !== "undefined" && value !== null) {
-          formData.append(part.name, value);
-        }
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (_iteratorAbruptCompletion && _iterator.return != null) {
-        await _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return formData;
-}
-
 function createEntryRouteModules(manifest) {
   return Object.keys(manifest).reduce((memo, routeId) => {
     memo[routeId] = manifest[routeId].module;
@@ -11618,74 +11535,6 @@ function createMemorySessionStorage(_temp) {
   });
 }
 
-class MaxPartSizeExceededError extends Error {
-  constructor(field, maxBytes) {
-    super("Field \"" + field + "\" exceeded upload size of " + maxBytes + " bytes.");
-    this.field = field;
-    this.maxBytes = maxBytes;
-  }
-}
-
-function createMemoryUploadHandler(_temp) {
-  let {
-    filter,
-    maxPartSize = 3000000
-  } = _temp === void 0 ? {} : _temp;
-  return async _ref => {
-    let {
-      filename,
-      contentType,
-      name,
-      data
-    } = _ref;
-    if (filter && !(await filter({
-      filename,
-      contentType,
-      name
-    }))) {
-      return undefined;
-    }
-    let size = 0;
-    let chunks = [];
-    var _iteratorAbruptCompletion = false;
-    var _didIteratorError = false;
-    var _iteratorError;
-    try {
-      for (var _iterator = _asyncIterator(data), _step; _iteratorAbruptCompletion = !(_step = await _iterator.next()).done; _iteratorAbruptCompletion = false) {
-        let chunk = _step.value;
-        {
-          size += chunk.byteLength;
-          if (size > maxPartSize) {
-            throw new MaxPartSizeExceededError(name, maxPartSize);
-          }
-          chunks.push(chunk);
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (_iteratorAbruptCompletion && _iterator.return != null) {
-          await _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-    if (typeof filename === "string") {
-      return new File(chunks, filename, {
-        type: contentType
-      });
-    }
-    return await new Blob(chunks, {
-      type: contentType
-    }).text();
-  };
-}
-
 function deserializeErrors(errors) {
   if (!errors) return null;
   let entries = Object.entries(errors);
@@ -11722,5 +11571,5 @@ function deserializeErrors(errors) {
   return serialized;
 }
 
-export { Await, BrowserRouter, Form, HashRouter, IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, Link, Links, MaxPartSizeExceededError, MemoryRouter, Meta, NavLink, Navigate, Action as NavigationType, Outlet, PrefetchPageLinks, Route, Router, RouterProvider, Routes, Scripts, ScrollRestoration, ServerRouter, StaticRouter, StaticRouterProvider, DataRouterContext as UNSAFE_DataRouterContext, DataRouterStateContext as UNSAFE_DataRouterStateContext, ErrorResponseImpl as UNSAFE_ErrorResponseImpl, FetchersContext as UNSAFE_FetchersContext, FrameworkContext as UNSAFE_FrameworkContext, LocationContext as UNSAFE_LocationContext, NavigationContext as UNSAFE_NavigationContext, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteContext as UNSAFE_RouteContext, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, ViewTransitionContext as UNSAFE_ViewTransitionContext, createBrowserHistory as UNSAFE_createBrowserHistory, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, createRouter as UNSAFE_createRouter, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getSingleFetchDataStrategy$1 as UNSAFE_getSingleFetchDataStrategy, invariant$2 as UNSAFE_invariant, mapRouteProperties as UNSAFE_mapRouteProperties, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, createBrowserRouter, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createPath, createRequestHandler, createRoutesFromChildren, createRoutesFromChildren as createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, data, generatePath, isCookie, isRouteErrorResponse, isSession, json$1 as json, matchPath, matchRoutes, parsePath, redirect, redirectDocument, renderMatches, replace, resolvePath, HistoryRouter as unstable_HistoryRouter, composeUploadHandlers as unstable_composeUploadHandlers, createMemoryUploadHandler as unstable_createMemoryUploadHandler, parseMultipartFormData as unstable_parseMultipartFormData, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };
+export { Await, BrowserRouter, Form, HashRouter, IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, Link, Links, MemoryRouter, Meta, NavLink, Navigate, Action as NavigationType, Outlet, PrefetchPageLinks, Route, Router, RouterProvider, Routes, Scripts, ScrollRestoration, ServerRouter, StaticRouter, StaticRouterProvider, DataRouterContext as UNSAFE_DataRouterContext, DataRouterStateContext as UNSAFE_DataRouterStateContext, ErrorResponseImpl as UNSAFE_ErrorResponseImpl, FetchersContext as UNSAFE_FetchersContext, FrameworkContext as UNSAFE_FrameworkContext, LocationContext as UNSAFE_LocationContext, NavigationContext as UNSAFE_NavigationContext, RemixErrorBoundary as UNSAFE_RemixErrorBoundary, RouteContext as UNSAFE_RouteContext, ServerMode as UNSAFE_ServerMode, SingleFetchRedirectSymbol as UNSAFE_SingleFetchRedirectSymbol, ViewTransitionContext as UNSAFE_ViewTransitionContext, createBrowserHistory as UNSAFE_createBrowserHistory, createClientRoutes as UNSAFE_createClientRoutes, createClientRoutesWithHMRRevalidationOptOut as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, createRouter as UNSAFE_createRouter, decodeViaTurboStream as UNSAFE_decodeViaTurboStream, deserializeErrors as UNSAFE_deserializeErrors, getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction, getSingleFetchDataStrategy$1 as UNSAFE_getSingleFetchDataStrategy, invariant$2 as UNSAFE_invariant, mapRouteProperties as UNSAFE_mapRouteProperties, shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader, useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery, useScrollRestoration as UNSAFE_useScrollRestoration, createBrowserRouter, createCookie, createCookieSessionStorage, createHashRouter, createMemoryRouter, createMemorySessionStorage, createPath, createRequestHandler, createRoutesFromChildren, createRoutesFromChildren as createRoutesFromElements, createRoutesStub, createSearchParams, createSession, createSessionStorage, createStaticHandler, createStaticRouter, data, generatePath, isCookie, isRouteErrorResponse, isSession, json$1 as json, matchPath, matchRoutes, parsePath, redirect, redirectDocument, renderMatches, replace, resolvePath, HistoryRouter as unstable_HistoryRouter, setDevServerHooks as unstable_setDevServerHooks, usePrompt as unstable_usePrompt, useActionData, useAsyncError, useAsyncValue, useBeforeUnload, useBlocker, useFetcher, useFetchers, useFormAction, useHref, useInRouterContext, useLinkClickHandler, useLoaderData, useLocation, useMatch, useMatches, useNavigate, useNavigation, useNavigationType, useOutlet, useOutletContext, useParams, useResolvedPath, useRevalidator, useRouteError, useRouteLoaderData, useRoutes, useSearchParams, useSubmit, useViewTransitionState };
 //# sourceMappingURL=index.mjs.map