react-router 0.0.0-experimental-e145538f2 → 0.0.0-experimental-10a6fd0e1

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-e145538f2
+ * React Router v0.0.0-experimental-10a6fd0e1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -6670,7 +6670,6 @@ function StreamTransfer(_ref) {
     identifier,
     reader,
     textDecoder,
-    isAction,
     nonce
   } = _ref;
   // If the user didn't render the <Scripts> component then we don't have to
@@ -6681,16 +6680,9 @@ function StreamTransfer(_ref) {
   if (!context.renderMeta.streamCache) {
     context.renderMeta.streamCache = {};
   }
-  let streamCache = isAction ? context.renderMeta.streamCacheAction : context.renderMeta.streamCache;
-  if (!streamCache) {
-    if (isAction) {
-      context.renderMeta.streamCacheAction = {};
-      streamCache = context.renderMeta.streamCacheAction;
-    } else {
-      context.renderMeta.streamCache = {};
-      streamCache = context.renderMeta.streamCache;
-    }
-  }
+  let {
+    streamCache
+  } = context.renderMeta;
   let promise = streamCache[identifier];
   if (!promise) {
     promise = streamCache[identifier] = reader.read().then(result => {
@@ -6717,14 +6709,14 @@ function StreamTransfer(_ref) {
   let scriptTag = value ? ( /*#__PURE__*/React.createElement("script", {
     nonce: nonce,
     dangerouslySetInnerHTML: {
-      __html: "window.__remixContext.streamController" + (isAction ? "Action" : "") + ".enqueue(" + escapeHtml(JSON.stringify(value)) + ");"
+      __html: "window.__remixContext.streamController.enqueue(" + escapeHtml(JSON.stringify(value)) + ");"
     }
   })) : null;
   if (done) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, scriptTag, /*#__PURE__*/React.createElement("script", {
       nonce: nonce,
       dangerouslySetInnerHTML: {
-        __html: "window.__remixContext.streamController" + (isAction ? "Action" : "") + ".close();"
+        __html: "window.__remixContext.streamController.close();"
       }
     }));
   } else {
@@ -6733,7 +6725,6 @@ function StreamTransfer(_ref) {
       identifier: identifier + 1,
       reader: reader,
       textDecoder: textDecoder,
-      isAction: isAction,
       nonce: nonce
     })));
   }
@@ -6873,18 +6864,8 @@ function singleFetchUrl(reqUrl) {
   return url;
 }
 async function fetchAndDecode(url, init) {
-  var _res$headers$get;
   let res = await fetch(url, init);
   !res.body ? process.env.NODE_ENV !== "production" ? invariant(false, "No response body to decode") : invariant(false) : void 0;
-  if ((_res$headers$get = res.headers.get("Content-Type")) != null && _res$headers$get.includes("text/x-component")) {
-    !res.body ? process.env.NODE_ENV !== "production" ? invariant(false, "No response body to decode") : invariant(false) : void 0;
-    // @ts-expect-error - TODO: Figure out where this comes from
-    let decoded = await window.createFromReadableStream(res.body);
-    return {
-      status: res.status,
-      data: decoded
-    };
-  }
   try {
     let decoded = await decodeViaTurboStream(res.body, window);
     return {
@@ -7396,8 +7377,7 @@ function Scripts(props) {
     manifest,
     serverHandoffString,
     isSpaMode,
-    renderMeta,
-    future
+    renderMeta
   } = useRemixContext();
   let {
     router,
@@ -7420,9 +7400,6 @@ function Scripts(props) {
   let initialScripts = React.useMemo(() => {
     var _manifest$hmr;
     let streamScript = "window.__remixContext.stream = new ReadableStream({" + "start(controller){" + "window.__remixContext.streamController = controller;" + "}" + "}).pipeThrough(new TextEncoderStream());";
-    if (future.unstable_serverComponents && staticContext != null && staticContext.actionData) {
-      streamScript += "window.__remixContext.streamAction = new ReadableStream({" + "start(controller){" + "window.__remixContext.streamControllerAction = controller;" + "}" + "}).pipeThrough(new TextEncoderStream());";
-    }
     let contextScript = staticContext ? "window.__remixContext = " + serverHandoffString + ";" + streamScript : " ";
     let routeModulesScript = !isStatic ? " " : ((_manifest$hmr = manifest.hmr) != null && _manifest$hmr.runtime ? "import " + JSON.stringify(manifest.hmr.runtime) + ";" : "") + "import " + JSON.stringify(manifest.url) + ";\n" + matches.map((match, index) => "import * as route" + index + " from " + JSON.stringify(manifest.routes[match.route.id].module) + ";").join("\n") + "\nwindow.__remixRouteModules = {" + matches.map((match, index) => JSON.stringify(match.route.id) + ":route" + index).join(",") + "};\n\nimport(" + JSON.stringify(manifest.entry.module) + ");";
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("script", _extends({}, props, {
@@ -9518,7 +9495,7 @@ function createServerRoutes(manifest, routeModules, future, isSpaMode, parentId,
       // has a loader/clientLoader, but it won't ever be called during the static
       // render, so just give it a no-op function so we can render down to the
       // proper fallback
-      loader: route.hasLoader || route.hasClientLoader ? true : undefined
+      loader: route.hasLoader || route.hasClientLoader ? () => null : undefined
       // We don't need action/shouldRevalidate on these routes since they're
       // for a static render
     });
@@ -9787,85 +9764,7 @@ function initSsrInfo() {
     };
   }
 }
-let hmrInfo = null;
-if (import.meta &&
-// @ts-expect-error
-import.meta.hot && typeof window !== "undefined" && window.__remixManifest) {
-  let resolve;
-  let routerReadyPromise = new Promise(r => {
-    resolve = r;
-  }).catch(() => {
-    // This is a noop catch handler to avoid unhandled promise rejection warnings
-    // in the console. The promise is never rejected.
-    return undefined;
-  });
-  hmrInfo = {
-    abortController: undefined,
-    routerReadyResolve: resolve,
-    // There's a race condition with HMR where the remix:manifest is signaled before
-    // the router is assigned in the RemixBrowser component. This promise gates the
-    // HMR handler until the router is ready
-    routerReadyPromise
-  };
-  // @ts-expect-error
-  import.meta.hot.accept("remix:manifest", async _ref => {
-    var _hmrInfo$abortControl;
-    let {
-      assetsManifest,
-      needsRevalidation
-    } = _ref;
-    let router = await hmrInfo.routerReadyPromise;
-    // This should never happen, but just in case...
-    if (!router || !ssrInfo || !hmrInfo) {
-      console.error("Failed to accept HMR update because the router/ssrInfo was not ready.");
-      return;
-    }
-    let routeIds = [...new Set(router.state.matches.map(m => m.route.id).concat(Object.keys(ssrInfo.routeModules)))];
-    (_hmrInfo$abortControl = hmrInfo.abortController) == null ? void 0 : _hmrInfo$abortControl.abort();
-    hmrInfo.abortController = new AbortController();
-    let signal = hmrInfo.abortController.signal;
-    // Load new route modules that we've seen.
-    let newRouteModules = Object.assign({}, ssrInfo.routeModules, Object.fromEntries((await Promise.all(routeIds.map(async id => {
-      var _assetsManifest$hmr, _ssrInfo$routeModules, _ssrInfo$routeModules2, _ssrInfo$routeModules3;
-      if (!assetsManifest.routes[id]) {
-        return null;
-      }
-      let imported = await import(assetsManifest.routes[id].module + ("?t=" + ((_assetsManifest$hmr = assetsManifest.hmr) == null ? void 0 : _assetsManifest$hmr.timestamp)));
-      !ssrInfo ? process.env.NODE_ENV !== "production" ? invariant(false, "ssrInfo unavailable for HMR update") : invariant(false) : void 0;
-      return [id, _extends({}, imported, {
-        // react-refresh takes care of updating these in-place,
-        // if we don't preserve existing values we'll loose state.
-        default: imported.default ? ((_ssrInfo$routeModules = ssrInfo.routeModules[id]) == null ? void 0 : _ssrInfo$routeModules.default) || imported.default : imported.default,
-        ErrorBoundary: imported.ErrorBoundary ? ((_ssrInfo$routeModules2 = ssrInfo.routeModules[id]) == null ? void 0 : _ssrInfo$routeModules2.ErrorBoundary) || imported.ErrorBoundary : imported.ErrorBoundary,
-        HydrateFallback: imported.HydrateFallback ? ((_ssrInfo$routeModules3 = ssrInfo.routeModules[id]) == null ? void 0 : _ssrInfo$routeModules3.HydrateFallback) || imported.HydrateFallback : imported.HydrateFallback
-      })];
-    }))).filter(Boolean)));
-    Object.assign(ssrInfo.routeModules, newRouteModules);
-    // Create new routes
-    let routes = createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, assetsManifest.routes, ssrInfo.routeModules, ssrInfo.context.state, ssrInfo.context.future, ssrInfo.context.isSpaMode);
-    // This is temporary API and will be more granular before release
-    router._internalSetRoutes(routes);
-    // Wait for router to be idle before updating the manifest and route modules
-    // and triggering a react-refresh
-    let unsub = router.subscribe(state => {
-      if (state.revalidation === "idle") {
-        unsub();
-        // Abort if a new update comes in while we're waiting for the
-        // router to be idle.
-        if (signal.aborted) return;
-        // Ensure RouterProvider setState has flushed before re-rendering
-        setTimeout(() => {
-          Object.assign(ssrInfo.manifest, assetsManifest);
-          window.$RefreshRuntime$.performReactRefresh();
-        }, 1);
-      }
-    });
-    window.__remixRevalidation = (window.__remixRevalidation || 0) + 1;
-    router.revalidate();
-  });
-}
 function createHydratedRouter() {
-  var _hmrInfo;
   initSsrInfo();
   if (!ssrInfo) {
     throw new Error("You must be using the SSR features of React Router in order to skip " + "passing a `router` prop to `<RouterProvider>`");
@@ -9880,50 +9779,14 @@ function createHydratedRouter() {
   // then only get past here and create the `router` one time
   if (!ssrInfo.stateDecodingPromise) {
     let stream = ssrInfo.context.stream;
-    let streamAction = ssrInfo.context.streamAction;
     !stream ? process.env.NODE_ENV !== "production" ? invariant(false, "No stream found for single fetch decoding") : invariant(false) : void 0;
     ssrInfo.context.stream = undefined;
-    if (ssrInfo.context.future.unstable_serverComponents) {
-      ssrInfo.stateDecodingPromise = Promise.all([
-      // @ts-expect-error - TODO: Get this from somewhere else
-      window.createFromReadableStream(stream), streamAction ?
-      // @ts-expect-error - TODO: Get this from somewhere else
-      window.createFromReadableStream(streamAction) : undefined]).then(_ref2 => {
-        let [loaderPayload, actionPayload] = _ref2;
-        let state = {};
-        for (let routeId of Object.keys(ssrInfo.routeModules)) {
-          if ("error" in loaderPayload[routeId]) {
-            state.errors = state.errors || {};
-            state.errors[routeId] = loaderPayload[routeId].error;
-          } else if ("data" in loaderPayload[routeId]) {
-            state.loaderData = state.loaderData || {};
-            state.loaderData[routeId] = loaderPayload[routeId].data;
-          }
-        }
-        if (actionPayload) {
-          // @ts-expect-error - TODO: Fix types and don't get it off the window directly
-          const actionId = window.__remixContext.serverHandoffActionId;
-          if ("error" in actionPayload) {
-            state.errors = state.errors || {};
-            state.errors[actionId] = actionPayload.error;
-          } else if ("data" in actionPayload) {
-            state.actionData = state.actionData || {};
-            state.actionData[actionId] = actionPayload.data;
-          }
-        }
-        ssrInfo.context.state = state;
-        localSsrInfo.stateDecodingPromise.value = true;
-      }).catch(e => {
-        localSsrInfo.stateDecodingPromise.error = e;
-      });
-    } else {
-      ssrInfo.stateDecodingPromise = decodeViaTurboStream(stream, window).then(value => {
-        ssrInfo.context.state = value.value;
-        localSsrInfo.stateDecodingPromise.value = true;
-      }).catch(e => {
-        localSsrInfo.stateDecodingPromise.error = e;
-      });
-    }
+    ssrInfo.stateDecodingPromise = decodeViaTurboStream(stream, window).then(value => {
+      ssrInfo.context.state = value.value;
+      localSsrInfo.stateDecodingPromise.value = true;
+    }).catch(e => {
+      localSsrInfo.stateDecodingPromise.error = e;
+    });
   }
   if (ssrInfo.stateDecodingPromise.error) {
     throw ssrInfo.stateDecodingPromise.error;
@@ -10000,8 +9863,6 @@ function createHydratedRouter() {
   // @ts-ignore
   router.createRoutesForHMR = createClientRoutesWithHMRRevalidationOptOut;
   window.__remixRouter = router;
-  // Notify that the router is ready for HMR
-  (_hmrInfo = hmrInfo) == null ? void 0 : _hmrInfo.routerReadyResolve(router);
   return router;
 }
 /**
@@ -10134,19 +9995,11 @@ function RemixServer(_ref) {
     router: router,
     context: context.staticHandlerContext,
     hydrate: false
-  }))), context.serverHandoffStreamAction ? ( /*#__PURE__*/React.createElement(React.Suspense, null, /*#__PURE__*/React.createElement(StreamTransfer, {
-    context: context,
-    identifier: 0,
-    reader: context.serverHandoffStreamAction.getReader(),
-    textDecoder: new TextDecoder(),
-    isAction: true,
-    nonce: nonce
-  }))) : null, context.serverHandoffStream ? ( /*#__PURE__*/React.createElement(React.Suspense, null, /*#__PURE__*/React.createElement(StreamTransfer, {
+  }))), context.serverHandoffStream ? ( /*#__PURE__*/React.createElement(React.Suspense, null, /*#__PURE__*/React.createElement(StreamTransfer, {
     context: context,
     identifier: 0,
     reader: context.serverHandoffStream.getReader(),
     textDecoder: new TextDecoder(),
-    isAction: false,
     nonce: nonce
   }))) : null);
 }
@@ -10171,8 +10024,7 @@ function createRemixStub(routes, context) {
       remixContextRef.current = {
         future: {
           v3_fetcherPersist: (future == null ? void 0 : future.v3_fetcherPersist) === true,
-          v3_relativeSplatPath: (future == null ? void 0 : future.v3_relativeSplatPath) === true,
-          unstable_serverComponents: (future == null ? void 0 : future.unstable_serverComponents) === true
+          v3_relativeSplatPath: (future == null ? void 0 : future.v3_relativeSplatPath) === true
         },
         manifest: {
           routes: {},