Revert "fix(plugin-history-sync): revive journaled loader data"

This reverts commit 4658829.

Author: ENvironmentSet

extensions/plugin-history-sync/src/HistoryEntryJournal.ts

@@ -4,7 +4,7 @@ import {
   identityEquals,
   identityOfState,
 } from "./BrowserHistoryEntryModel";
-import { reviveState, type State } from "./historyState";
+import type { State } from "./historyState";
 
 const JOURNAL_STORAGE_KEY = "@stackflow/plugin-history-sync::entry-journal";
 const JOURNAL_FORMAT_VERSION = 1;
@@ -150,10 +150,6 @@ export class HistoryEntryJournal {
     }
 
     const entries = new Map(payload.entries);
-    for (const record of entries.values()) {
-      reviveState(record.state);
-    }
-
     const currentRecord = entries.get(expectedIndex);
 
     if (

extensions/plugin-history-sync/src/historyState.ts

@@ -23,83 +23,6 @@ interface SerializedState {
   flattedState: string;
 }
 
-type SerializedInspectablePromise =
-  | {
-      status: "pending";
-    }
-  | {
-      status: "fulfilled";
-      value: unknown;
-    }
-  | {
-      status: "rejected";
-      reason: unknown;
-    };
-
-type SyncInspectablePromiseLike<T> = Promise<T> & SerializedInspectablePromise;
-
-function isRecord(input: unknown): input is Record<string, unknown> {
-  return typeof input === "object" && input !== null;
-}
-
-function isSerializedInspectablePromise(
-  input: unknown,
-): input is SerializedInspectablePromise {
-  if (!isRecord(input) || typeof input.status !== "string") {
-    return false;
-  }
-
-  return (
-    input.status === "pending" ||
-    input.status === "fulfilled" ||
-    input.status === "rejected"
-  );
-}
-
-function reviveInspectablePromise(
-  input: SerializedInspectablePromise,
-): SyncInspectablePromiseLike<unknown> {
-  if (input.status === "fulfilled") {
-    return Object.assign(Promise.resolve(input.value), {
-      status: input.status,
-      value: input.value,
-    });
-  }
-
-  if (input.status === "rejected") {
-    const promise = Promise.reject(input.reason);
-    void promise.catch(() => undefined);
-
-    return Object.assign(promise, {
-      status: input.status,
-      reason: input.reason,
-    });
-  }
-
-  return Object.assign(new Promise<never>(() => undefined), {
-    status: input.status,
-  });
-}
-
-function reviveActivityContext(input: unknown): void {
-  if (!isRecord(input) || !("loaderData" in input)) {
-    return;
-  }
-
-  const loaderData = input.loaderData;
-
-  if (isSerializedInspectablePromise(loaderData)) {
-    input.loaderData = reviveInspectablePromise(loaderData);
-  }
-}
-
-export function reviveState(state: State): State {
-  reviveActivityContext(state.activity.context);
-  reviveActivityContext(state.activity.enteredBy.activityContext);
-
-  return state;
-}
-
 function serializeState(state: State): SerializedState {
   return {
     _TAG: STATE_TAG,
@@ -125,9 +48,7 @@ function isSerializedState(input: unknown): input is SerializedState {
 
 export function parseState(input: unknown): State | null {
   try {
-    return isSerializedState(input)
-      ? reviveState(parse(input.flattedState))
-      : null;
+    return isSerializedState(input) ? parse(input.flattedState) : null;
   } catch {
     return null;
   }

extensions/plugin-history-sync/src/historySyncPlugin.blocker.spec.tsx

@@ -1,5 +1,5 @@
 /** @jest-environment jsdom */
-import { type ActivityLoaderArgs, defineConfig } from "@stackflow/config";
+import { defineConfig } from "@stackflow/config";
 import type { Stack, StackflowActions } from "@stackflow/core";
 import {
   type BlockedNavigation,
@@ -9,7 +9,7 @@ import {
 } from "@stackflow/plugin-blocker";
 import { basicRendererPlugin } from "@stackflow/plugin-renderer-basic";
 import type { StackflowReactPlugin } from "@stackflow/react";
-import { stackflow, useLoaderData } from "@stackflow/react";
+import { stackflow } from "@stackflow/react";
 import { act, cleanup, render } from "@testing-library/react";
 import { createBrowserHistory } from "history";
 import { historySyncPlugin } from "./historySyncPlugin";
@@ -43,49 +43,19 @@ type SessionStorageAccess = SessionStorageShim | null | "throw";
 let currentBlocker: BlockerControls | null = null;
 let restoreSessionStorage: (() => void) | null = null;
 
-function homeLoader() {
-  return {
-    cards: ["home"],
-  };
-}
-
-function articleLoader({ params }: ActivityLoaderArgs<"Article">) {
-  return {
-    recommenderCards: [params.articleId],
-  };
-}
-
 function Home() {
-  const { cards } = useLoaderData<typeof homeLoader>();
-
-  return (
-    <div data-testid="activity">
-      home
-      {cards.map((card) => (
-        <span key={card}>{card}</span>
-      ))}
-    </div>
-  );
+  return <div data-testid="activity">home</div>;
 }
 
 function Article() {
-  const { recommenderCards } = useLoaderData<typeof articleLoader>();
-
   useBlocker({
     shouldBlock: (action) => currentBlocker?.shouldBlock(action) ?? false,
     onBlocked: (blockedNavigation, actions) => {
       currentBlocker?.onBlocked(blockedNavigation, actions);
     },
   });
 
-  return (
-    <div data-testid="activity">
-      article
-      {recommenderCards.map((card) => (
-        <span key={card}>{card}</span>
-      ))}
-    </div>
-  );
+  return <div data-testid="activity">article</div>;
 }
 
 function path(browserWindow: Window) {
@@ -379,8 +349,8 @@ async function renderHarness({
   const config = defineConfig({
     transitionDuration: 0,
     activities: [
-      { name: "Home", route: "/home", loader: homeLoader },
-      { name: "Article", route: "/articles/:articleId", loader: articleLoader },
+      { name: "Home", route: "/home" },
+      { name: "Article", route: "/articles/:articleId" },
     ],
   });