react-router 0.0.0-experimental-cb25a21e1 → 0.0.0-experimental-e16afd9b7

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * React Router v0.0.0-experimental-cb25a21e1
+ * React Router v0.0.0-experimental-e16afd9b7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -6428,7 +6428,8 @@ function StreamTransfer(_ref) {
     context,
     identifier,
     reader,
-    textDecoder
+    textDecoder,
+    isAction
   } = _ref;
   // If the user didn't render the <Scripts> component then we don't have to
   // bother streaming anything in
@@ -6438,9 +6439,16 @@ function StreamTransfer(_ref) {
   if (!context.renderMeta.streamCache) {
     context.renderMeta.streamCache = {};
   }
-  let {
-    streamCache
-  } = context.renderMeta;
+  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 promise = streamCache[identifier];
   if (!promise) {
     promise = streamCache[identifier] = reader.read().then(result => {
@@ -6466,13 +6474,13 @@ function StreamTransfer(_ref) {
   } = promise.result;
   let scriptTag = value ? ( /*#__PURE__*/React.createElement("script", {
     dangerouslySetInnerHTML: {
-      __html: "window.__remixContext.streamController.enqueue(" + escapeHtml(JSON.stringify(value)) + ");"
+      __html: "window.__remixContext.streamController" + (isAction ? "Action" : "") + ".enqueue(" + escapeHtml(JSON.stringify(value)) + ");"
     }
   })) : null;
   if (done) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, scriptTag, /*#__PURE__*/React.createElement("script", {
       dangerouslySetInnerHTML: {
-        __html: "window.__remixContext.streamController.close();"
+        __html: "window.__remixContext.streamController" + (isAction ? "Action" : "") + ".close();"
       }
     }));
   } else {
@@ -6480,7 +6488,8 @@ function StreamTransfer(_ref) {
       context: context,
       identifier: identifier + 1,
       reader: reader,
-      textDecoder: textDecoder
+      textDecoder: textDecoder,
+      isAction: isAction
     })));
   }
 }
@@ -6619,8 +6628,18 @@ 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 {
@@ -7120,7 +7139,8 @@ function Scripts(props) {
     manifest,
     serverHandoffString,
     isSpaMode,
-    renderMeta
+    renderMeta,
+    future
   } = useRemixContext();
   let {
     router,
@@ -7143,6 +7163,9 @@ 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, {
@@ -9082,7 +9105,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 ? () => null : undefined
+      loader: route.hasLoader || route.hasClientLoader ? true : undefined
       // We don't need action/shouldRevalidate on these routes since they're
       // for a static render
     });
@@ -9444,14 +9467,50 @@ 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;
-    ssrInfo.stateDecodingPromise = decodeViaTurboStream(stream, window).then(value => {
-      ssrInfo.context.state = value.value;
-      localSsrInfo.stateDecodingPromise.value = true;
-    }).catch(e => {
-      localSsrInfo.stateDecodingPromise.error = e;
-    });
+    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;
+      });
+    }
   }
   if (ssrInfo.stateDecodingPromise.error) {
     throw ssrInfo.stateDecodingPromise.error;
@@ -9656,11 +9715,18 @@ function RemixServer(_ref) {
     router: router,
     context: context.staticHandlerContext,
     hydrate: false
-  }))), context.serverHandoffStream ? ( /*#__PURE__*/React.createElement(React.Suspense, null, /*#__PURE__*/React.createElement(StreamTransfer, {
+  }))), 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
+  }))) : null, context.serverHandoffStream ? ( /*#__PURE__*/React.createElement(React.Suspense, null, /*#__PURE__*/React.createElement(StreamTransfer, {
     context: context,
     identifier: 0,
     reader: context.serverHandoffStream.getReader(),
-    textDecoder: new TextDecoder()
+    textDecoder: new TextDecoder(),
+    isAction: false
   }))) : null);
 }
 
@@ -9681,7 +9747,8 @@ 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
+          v3_relativeSplatPath: (future == null ? void 0 : future.v3_relativeSplatPath) === true,
+          unstable_serverComponents: (future == null ? void 0 : future.unstable_serverComponents) === true
         },
         manifest: {
           routes: {},