persist still not working

package.json

@@ -38,7 +38,7 @@
     "build-docs": "rimraf packages/graphiql/typedoc && typedoc packages",
     "build:nontsc": "yarn wsrun:noexamples --exclude-missing --serial build",
     "build:clean": "yarn tsc --clean",
-    "build:watch": "yarn tsc --watch",
+    "build:watch": "yarn wsrun:noexamples --done-criteria '\"Build success in|built in\"' -t dev",
     "build-demo": "wsrun -m build-demo",
     "watch": "yarn build:watch",
     "watch-vscode": "yarn tsc && yarn workspace vscode-graphql compile",

packages/graphiql-react/src/provider.tsx

@@ -80,36 +80,34 @@
   variables,
   visiblePlugin,
 }: GraphiQLProviderProps) {
-  const store = useMemo(
-    () =>
-      createGraphiQLStore({
-        defaultQuery,
-        defaultHeaders,
-        defaultTabs,
-        externalFragments,
-        fetcher,
-        getDefaultFieldNames,
-        headers,
-        inputValueDeprecation,
-        introspectionQueryName,
-        onEditOperationName,
-        onSchemaChange,
-        onTabChange,
-        schema,
-        schemaDescription,
-        shouldPersistHeaders,
-        validationRules,
-        dangerouslyAssumeSchemaIsValid,
-        fetchOptions,
-      }),
-    [defaultQuery],
-  );
+  const store = useRef(
+    createGraphiQLStore({
+      defaultQuery,
+      defaultHeaders,
+      defaultTabs,
+      externalFragments,
+      fetcher,
+      getDefaultFieldNames,
+      headers,
+      inputValueDeprecation,
+      introspectionQueryName,
+      onEditOperationName,
+      onSchemaChange,
+      onTabChange,
+      schema,
+      schemaDescription,
+      shouldPersistHeaders,
+      validationRules,
+      dangerouslyAssumeSchemaIsValid,
+      fetchOptions,
+    }),
+  ).current;
 
   const state = useStore(store);
 
   useEffect(() => {
     state.schema.introspect();
-  }, [state.execution.fetcher]);
+  }, [fetcher]);
   return (
     <GraphiQLStoreContext.Provider value={store}>
       <StorageContextProvider storage={storage}>

packages/graphiql-toolkit/src/zustand/store.ts

@@ -32,11 +32,35 @@ const middlewares = (
   return createStore<GraphiQLState>()(
     immer(
       devtools(
-        // fn,
-        persist(fn, {
-          storage: createJSONStorage(() => storage),
-          name: 'graphiql',
-        }),
+        fn,
+        // TODO: more issues with persist middleware
+        // persist(fn, {
+        //   storage: createJSONStorage(() => storage),
+        //   name: 'graphiql',
+        //   onRehydrateStorage: state => {
+        //     return {
+        //       ...state,
+        //       editor: {
+        //         ...state,
+
+        //       }
+        //     }
+        //   // partialize: state => {
+        //   //   const {
+        //   //     editor: {
+        //   //       queryEditor,
+        //   //       variableEditor,
+        //   //       headerEditor,
+        //   //       responseEditor,
+        //   //       ...editorState
+        //   //     },
+        //   //   } = state;
+        //   //   console.log(state);
+        //   //   return {
+        //   //     editor: editorState,
+        //   //   };
+        //   // },
+        // }),
       ),
     ),
   );