[WIP] Migrate React Context to Zustand

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-plugin-explorer/vite.config.mts.timestamp-1725035378569-c270892aab468.mjs

@@ -0,0 +1,146 @@
+// vite.config.mts
+import { createRequire } from "node:module";
+import { defineConfig } from "file:///home/rikki/projects/graphiql/node_modules/vite/dist/node/index.js";
+import react from "file:///home/rikki/projects/graphiql/node_modules/@vitejs/plugin-react/dist/index.mjs";
+import svgr from "file:///home/rikki/projects/graphiql/node_modules/vite-plugin-svgr/dist/index.js";
+import dts from "file:///home/rikki/projects/graphiql/node_modules/vite-plugin-dts/dist/index.mjs";
+
+// package.json
+var package_default = {
+  name: "@graphiql/plugin-explorer",
+  version: "4.0.0-alpha.2",
+  repository: {
+    type: "git",
+    url: "https://github.com/graphql/graphiql",
+    directory: "packages/graphiql-plugin-explorer"
+  },
+  main: "dist/index.js",
+  module: "dist/index.mjs",
+  types: "dist/index.d.ts",
+  license: "MIT",
+  keywords: [
+    "react",
+    "graphql",
+    "graphiql",
+    "plugin",
+    "explorer"
+  ],
+  files: [
+    "dist"
+  ],
+  exports: {
+    "./package.json": "./package.json",
+    "./style.css": "./dist/style.css",
+    ".": {
+      import: "./dist/index.mjs",
+      require: "./dist/index.js",
+      types: "./dist/index.d.ts"
+    }
+  },
+  scripts: {
+    dev: "vite build --watch",
+    build: "vite build && UMD=true vite build",
+    postbuild: "cp src/graphiql-explorer.d.ts dist/graphiql-explorer.d.ts",
+    prebuild: "yarn types:check",
+    "types:check": "tsc --noEmit"
+  },
+  dependencies: {
+    "graphiql-explorer": "^0.9.0"
+  },
+  peerDependencies: {
+    "@graphiql/react": "^1.0.0-alpha.0",
+    graphql: "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2",
+    react: "^16.8.0 || ^17 || ^18",
+    "react-dom": "^16.8.0 || ^17 || ^18"
+  },
+  devDependencies: {
+    "@graphiql/react": "^1.0.0-alpha.3",
+    "@vitejs/plugin-react": "^4.3.1",
+    graphql: "^17.0.0-alpha.7",
+    react: "^18.2.0",
+    "react-dom": "^18.2.0",
+    typescript: "^4.6.3",
+    vite: "^5.4.0",
+    "vite-plugin-dts": "^4.0.1",
+    "vite-plugin-svgr": "^4.2.0"
+  }
+};
+
+// vite.config.mts
+var __vite_injected_original_import_meta_url = "file:///home/rikki/projects/graphiql/packages/graphiql-plugin-explorer/vite.config.mts";
+var IS_UMD = process.env.UMD === "true";
+var vite_config_default = defineConfig({
+  plugins: [
+    react({ jsxRuntime: "classic" }),
+    svgr({
+      exportAsDefault: true,
+      svgrOptions: {
+        titleProp: true
+      }
+    }),
+    !IS_UMD && [dts({ rollupTypes: true }), htmlPlugin()]
+  ],
+  build: {
+    minify: IS_UMD ? "terser" : false,
+    // avoid clean cjs/es builds
+    emptyOutDir: !IS_UMD,
+    lib: {
+      entry: "src/index.tsx",
+      fileName: "index",
+      name: "GraphiQLPluginExplorer",
+      formats: IS_UMD ? ["umd"] : ["cjs", "es"]
+    },
+    rollupOptions: {
+      external: [
+        // Exclude peer dependencies and dependencies from bundle
+        ...Object.keys(package_default.peerDependencies),
+        ...IS_UMD ? [] : Object.keys(package_default.dependencies)
+      ],
+      output: {
+        chunkFileNames: "[name].[format].js",
+        globals: {
+          "@graphiql/react": "GraphiQL.React",
+          graphql: "GraphiQL.GraphQL",
+          react: "React",
+          "react-dom": "ReactDOM"
+        }
+      }
+    },
+    commonjsOptions: {
+      esmExternals: true,
+      requireReturnsDefault: "auto"
+    }
+  }
+});
+function htmlPlugin() {
+  const require2 = createRequire(__vite_injected_original_import_meta_url);
+  const graphiqlPath = require2.resolve("graphiql/package.json").replace("/package.json", "");
+  const htmlForVite = `<link rel="stylesheet" href="${graphiqlPath}/src/style.css" />
+<script type="module">
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import GraphiQL from '${graphiqlPath}/src/cdn';
+import * as GraphiQLPluginExplorer from './src';
+
+Object.assign(globalThis, { React, ReactDOM, GraphiQL, GraphiQLPluginExplorer });
+</script>`;
+  return {
+    name: "html-replace-umd-with-src",
+    transformIndexHtml: {
+      order: "pre",
+      handler(html) {
+        const start = "</style>";
+        const end = "<body>";
+        const contentToReplace = html.slice(
+          html.indexOf(start) + start.length,
+          html.indexOf(end)
+        );
+        return html.replace(contentToReplace, htmlForVite);
+      }
+    }
+  };
+}
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mts", "package.json"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/home/rikki/projects/graphiql/packages/graphiql-plugin-explorer\";const __vite_injected_original_filename = \"/home/rikki/projects/graphiql/packages/graphiql-plugin-explorer/vite.config.mts\";const __vite_injected_original_import_meta_url = \"file:///home/rikki/projects/graphiql/packages/graphiql-plugin-explorer/vite.config.mts\";import { createRequire } from 'node:module';\nimport { defineConfig, PluginOption } from 'vite';\nimport react from '@vitejs/plugin-react';\nimport svgr from 'vite-plugin-svgr';\nimport dts from 'vite-plugin-dts';\nimport packageJSON from './package.json';\n\nconst IS_UMD = process.env.UMD === 'true';\n\nexport default defineConfig({\n  plugins: [\n    react({ jsxRuntime: 'classic' }),\n    svgr({\n      exportAsDefault: true,\n      svgrOptions: {\n        titleProp: true,\n      },\n    }),\n    !IS_UMD && [dts({ rollupTypes: true }), htmlPlugin()],\n  ],\n  build: {\n    minify: IS_UMD\n      ? 'terser' // produce better bundle size than esbuild\n      : false,\n    // avoid clean cjs/es builds\n    emptyOutDir: !IS_UMD,\n    lib: {\n      entry: 'src/index.tsx',\n      fileName: 'index',\n      name: 'GraphiQLPluginExplorer',\n      formats: IS_UMD ? ['umd'] : ['cjs', 'es'],\n    },\n    rollupOptions: {\n      external: [\n        // Exclude peer dependencies and dependencies from bundle\n        ...Object.keys(packageJSON.peerDependencies),\n        ...(IS_UMD ? [] : Object.keys(packageJSON.dependencies)),\n      ],\n      output: {\n        chunkFileNames: '[name].[format].js',\n        globals: {\n          '@graphiql/react': 'GraphiQL.React',\n          graphql: 'GraphiQL.GraphQL',\n          react: 'React',\n          'react-dom': 'ReactDOM',\n        },\n      },\n    },\n    commonjsOptions: {\n      esmExternals: true,\n      requireReturnsDefault: 'auto',\n    },\n  },\n});\n\nfunction htmlPlugin(): PluginOption {\n  const require = createRequire(import.meta.url);\n\n  const graphiqlPath = require\n    .resolve('graphiql/package.json')\n    .replace('/package.json', '');\n\n  const htmlForVite = `<link rel=\"stylesheet\" href=\"${graphiqlPath}/src/style.css\" />\n<script type=\"module\">\nimport React from 'react';\nimport ReactDOM from 'react-dom/client';\nimport GraphiQL from '${graphiqlPath}/src/cdn';\nimport * as GraphiQLPluginExplorer from './src';\n\nObject.assign(globalThis, { React, ReactDOM, GraphiQL, GraphiQLPluginExplorer });\n</script>`;\n\n  return {\n    name: 'html-replace-umd-with-src',\n    transformIndexHtml: {\n      order: 'pre',\n      handler(html) {\n        const start = '</style>';\n        const end = '<body>';\n        const contentToReplace = html.slice(\n          html.indexOf(start) + start.length,\n          html.indexOf(end),\n        );\n        return html.replace(contentToReplace, htmlForVite);\n      },\n    },\n  };\n}\n", "{\n  \"name\": \"@graphiql/plugin-explorer\",\n  \"version\": \"4.0.0-alpha.2\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/graphql/graphiql\",\n    \"directory\": \"packages/graphiql-plugin-explorer\"\n  },\n  \"main\": \"dist/index.js\",\n  \"module\": \"dist/index.mjs\",\n  \"types\": \"dist/index.d.ts\",\n  \"license\": \"MIT\",\n  \"keywords\": [\n    \"react\",\n    \"graphql\",\n    \"graphiql\",\n    \"plugin\",\n    \"explorer\"\n  ],\n  \"files\": [\n    \"dist\"\n  ],\n  \"exports\": {\n    \"./package.json\": \"./package.json\",\n    \"./style.css\": \"./dist/style.css\",\n    \".\": {\n      \"import\": \"./dist/index.mjs\",\n      \"require\": \"./dist/index.js\",\n      \"types\": \"./dist/index.d.ts\"\n    }\n  },\n  \"scripts\": {\n    \"dev\": \"vite build --watch\",\n    \"build\": \"vite build && UMD=true vite build\",\n    \"postbuild\": \"cp src/graphiql-explorer.d.ts dist/graphiql-explorer.d.ts\",\n    \"prebuild\": \"yarn types:check\",\n    \"types:check\": \"tsc --noEmit\"\n  },\n  \"dependencies\": {\n    \"graphiql-explorer\": \"^0.9.0\"\n  },\n  \"peerDependencies\": {\n    \"@graphiql/react\": \"^1.0.0-alpha.0\",\n    \"graphql\": \"^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2\",\n    \"react\": \"^16.8.0 || ^17 || ^18\",\n    \"react-dom\": \"^16.8.0 || ^17 || ^18\"\n  },\n  \"devDependencies\": {\n    \"@graphiql/react\": \"^1.0.0-alpha.3\",\n    \"@vitejs/plugin-react\": \"^4.3.1\",\n    \"graphql\": \"^17.0.0-alpha.7\",\n    \"react\": \"^18.2.0\",\n    \"react-dom\": \"^18.2.0\",\n    \"typescript\": \"^4.6.3\",\n    \"vite\": \"^5.4.0\",\n    \"vite-plugin-dts\": \"^4.0.1\",\n    \"vite-plugin-svgr\": \"^4.2.0\"\n  }\n}\n"],
  "mappings": "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",
  "names": ["require"]
}


packages/graphiql-react/package.json

@@ -61,7 +61,8 @@
     "get-value": "^3.0.1",
     "graphql-language-service": "^5.3.0",
     "markdown-it": "^14.1.0",
-    "set-value": "^4.1.0"
+    "set-value": "^4.1.0",
+    "zustand": "^4.5.5"
   },
   "devDependencies": {
     "@babel/helper-string-parser": "^7.19.4",

packages/graphiql-react/src/editor/__tests__/tabs.spec.ts → packages/graphiql-react/src/editor/__tests__/tabs.spec.ts.disabled

@@ -1,12 +1,13 @@
-import { StorageAPI } from '@graphiql/toolkit';
+import { StorageAPI, getDefaultTabState } from '@graphiql/toolkit';
 import {
   createTab,
   fuzzyExtractOperationName,
-  getDefaultTabState,
   clearHeadersFromTabs,
   STORAGE_KEY,
 } from '../tabs';
 
+// TODO: move to toolkit
+
 describe('createTab', () => {
   it('creates with default title', () => {
     expect(createTab({})).toEqual(

packages/graphiql-react/src/editor/completion.ts

@@ -1,4 +1,4 @@
 import type { Editor, EditorChange } from 'codemirror';
 import type { IHint } from 'codemirror-graphql/hint';
 import {
   GraphQLNamedType,
@@ -12,13 +12,14 @@
 import { markdown } from '../markdown';
 import { DOC_EXPLORER_PLUGIN, PluginContextType } from '../plugin';
 import { importCodeMirror } from './common';
+import { CodeMirrorEditor } from '@graphiql/toolkit';
 
 /**
  * Render a custom UI for CodeMirror's hint which includes additional info
  * about the type and description for the selected context.
  */
 export function onHasCompletion(
-  _cm: Editor,
+  _cm: CodeMirrorEditor,
   data: EditorChange | undefined,
   schema: GraphQLSchema | null | undefined,
   explorer: ExplorerContextType | null,

packages/graphiql-react/src/editor/components/header-editor.tsx

@@ -17,10 +17,7 @@ type HeaderEditorProps = UseHeaderEditorArgs & {
 };
 
 export function HeaderEditor({ isHidden, ...hookArgs }: HeaderEditorProps) {
-  const { headerEditor } = useEditorContext({
-    nonNull: true,
-    caller: HeaderEditor,
-  });
+  const { headerEditor } = useEditorContext();
   const ref = useHeaderEditor(hookArgs, HeaderEditor);
 
   useEffect(() => {

packages/graphiql-react/src/editor/components/variable-editor.tsx

@@ -19,10 +19,7 @@ type VariableEditorProps = UseVariableEditorArgs & {
 };
 
 export function VariableEditor({ isHidden, ...hookArgs }: VariableEditorProps) {
-  const { variableEditor } = useEditorContext({
-    nonNull: true,
-    caller: VariableEditor,
-  });
+  const { variableEditor } = useEditorContext();
   const ref = useVariableEditor(hookArgs, VariableEditor);
 
   useEffect(() => {