From 17f8b6a827cc18e749dd34d559c7fd2fe1762c34 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 20:09:47 +0200
Subject: [PATCH 1/6] some refactoring

---
 .../cypress/e2e/incremental-delivery.cy.ts    |  2 +-
 packages/graphiql/index.html                  |  5 ++--
 .../{test/images => resources}/logo.svg       |  2 +-
 packages/graphiql/test/schema.js              | 30 +++++++++----------
 4 files changed, 20 insertions(+), 19 deletions(-)
 rename packages/graphiql/{test/images => resources}/logo.svg (98%)

diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
index 1ea0c0ed822..e49be931b4b 100644
--- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
+++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
@@ -105,7 +105,7 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => {
       This tests that;
       1. user ({name}) => { name }
       2. user ({age}) => { name, age }
-      3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due the the promise race
+      3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due the promise race
       4. user.friends.0 ({age}) => { name, age, friends: [{name, age}] }
 
       This shows us that we can deep merge defers, deep merge streams, and also deep merge defers inside streams
diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html
index d5365d780f9..03ae2bf951b 100644
--- a/packages/graphiql/index.html
+++ b/packages/graphiql/index.html
@@ -8,6 +8,7 @@
     <style>
       body {
         margin: 0;
+        overflow: hidden; /* in Firefox */
       }
 
       #graphiql {
@@ -25,11 +26,11 @@
     <!--vite-replace-start-->
     <script
       crossorigin
-      src="https://unpkg.com/react@18/umd/react.development.js"
+      src="https://unpkg.com/react@18/umd/react.production.min.js"
     ></script>
     <script
       crossorigin
-      src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"
+      src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
     ></script>
     <script src="/dist/index.umd.js"></script>
     <link href="/dist/style.css" rel="stylesheet" />
diff --git a/packages/graphiql/test/images/logo.svg b/packages/graphiql/resources/logo.svg
similarity index 98%
rename from packages/graphiql/test/images/logo.svg
rename to packages/graphiql/resources/logo.svg
index 8b265562b12..e50db408fa2 100644
--- a/packages/graphiql/test/images/logo.svg
+++ b/packages/graphiql/resources/logo.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" fill="#E10098">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" fill="#e10098">
   <path d="M57.468 302.66l-14.376-8.3 160.15-277.38 14.376 8.3z" />
   <path d="M39.8 272.2h320.3v16.6H39.8z" />
   <path
diff --git a/packages/graphiql/test/schema.js b/packages/graphiql/test/schema.js
index 5d9173a4563..6ecbe04ff31 100644
--- a/packages/graphiql/test/schema.js
+++ b/packages/graphiql/test/schema.js
@@ -130,9 +130,7 @@ const UnionSecond = new GraphQLObjectType({
 const TestUnion = new GraphQLUnionType({
   name: 'TestUnion',
   types: [UnionFirst, UnionSecond],
-  resolveType() {
-    return UnionFirst;
-  },
+  resolveType: () => UnionFirst,
 });
 
 const Greeting = new GraphQLObjectType({
@@ -192,7 +190,7 @@ const Person = new GraphQLObjectType({
     friends: {
       type: new GraphQLList(Person),
       async *resolve(_value, _args) {
-        const names = ['James', 'Mary', 'John', 'Patrica']; // Top 4 names https://www.ssa.gov/oact/babynames/decades/century.html
+        const names = ['James', 'Mary', 'John', 'Patrica']; // Top 4 names https://ssa.gov/oact/babynames/decades/century.html
         for (const name of names) {
           await sleep(100);
           yield { name };
@@ -202,14 +200,16 @@ const Person = new GraphQLObjectType({
   }),
 });
 
-const sleep = async timeout => new Promise(res => setTimeout(res, timeout));
+const sleep = async timeout =>
+  new Promise(resolve => setTimeout(resolve, timeout));
 
 const longDescription = `
-The \`longDescriptionType\` field on the \`Test\` type has a long, verbose, description to test inline field docs.
+The \`longDescriptionType\` field on the \`Test\` type has a long,
+verbose, description to test inline field docs.
 
 > We want to test several \`markdown\` styles!
 
-Check out [Markdown](https://www.markdownguide.org/) by the way.
+Check out [Markdown](https://markdownguide.org) by the way.
 
 Some notes:
 - Lists
@@ -218,14 +218,14 @@ Some notes:
   - and with very very very very very very very very very very long items that span multiple lines
 - you get the gist
 
-To-Do's:
+TO-DO's:
 1. Open GraphiQL
-2. Write a query
+1. Write a query
    1. Maybe add some variables
-   2. Could also add headers
-3. Send the request
+   1. Could also add headers
+1. Send the request
 
-Example quey:
+Example query:
 \`\`\`graphql
 {
   test {
@@ -237,7 +237,7 @@ Example quey:
 
 And we have a cool logo:
 
-![](/images/logo.svg)
+![](/resources/logo.svg)
 `.trim();
 
 const TestType = new GraphQLObjectType({
@@ -306,7 +306,7 @@ const TestType = new GraphQLObjectType({
     image: {
       type: GraphQLString,
       description: 'field that returns an image URI.',
-      resolve: () => '/images/logo.svg',
+      resolve: () => '/resources/logo.svg',
     },
     deprecatedField: {
       type: TestType,
@@ -371,7 +371,7 @@ const TestMutationType = new GraphQLObjectType({
 const TestSubscriptionType = new GraphQLObjectType({
   name: 'SubscriptionType',
   description:
-    'This is a simple subscription type. Learn more at https://www.npmjs.com/package/graphql-ws',
+    'This is a simple subscription type. Learn more at https://npmjs.com/package/graphql-ws',
   fields: {
     message: {
       type: GraphQLString,

From 75b02d9eaa0d7a6354e812df50052498b5824cc5 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 20:19:06 +0200
Subject: [PATCH 2/6] use `right: var(--px-16)` instead of `right: 0` for
 `.graphiql-logo`

---
 .changeset/strong-ears-bake.md           | 5 +++++
 packages/graphiql/cypress/e2e/tabs.cy.ts | 2 +-
 packages/graphiql/index.html             | 2 +-
 packages/graphiql/src/style.css          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/strong-ears-bake.md

diff --git a/.changeset/strong-ears-bake.md b/.changeset/strong-ears-bake.md
new file mode 100644
index 00000000000..8e06291ebab
--- /dev/null
+++ b/.changeset/strong-ears-bake.md
@@ -0,0 +1,5 @@
+---
+'graphiql': patch
+---
+
+use `right: var(--px-16)` instead of `right: 0` for 
diff --git a/packages/graphiql/cypress/e2e/tabs.cy.ts b/packages/graphiql/cypress/e2e/tabs.cy.ts
index eb85755f9ca..f438b9ecd68 100644
--- a/packages/graphiql/cypress/e2e/tabs.cy.ts
+++ b/packages/graphiql/cypress/e2e/tabs.cy.ts
@@ -61,7 +61,7 @@ describe('Tabs', () => {
       query: 'query Foo {image}',
       variablesString: '{"someVar":42}',
       headersString: '{"someHeader":"someValue"}',
-      response: { data: { image: '/images/logo.svg' } },
+      response: { data: { image: '/resources/logo.svg' } },
     });
 
     // Close tab
diff --git a/packages/graphiql/index.html b/packages/graphiql/index.html
index 03ae2bf951b..04073bb4c0e 100644
--- a/packages/graphiql/index.html
+++ b/packages/graphiql/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/test/images/logo.svg" />
+    <link rel="icon" type="image/svg+xml" href="/resources/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>GraphiQL</title>
     <style>
diff --git a/packages/graphiql/src/style.css b/packages/graphiql/src/style.css
index 4fd72deff91..048267bf23e 100644
--- a/packages/graphiql/src/style.css
+++ b/packages/graphiql/src/style.css
@@ -86,7 +86,7 @@ button.graphiql-tab-add {
 /* The GraphiQL logo */
 .graphiql-container .graphiql-logo {
   position: absolute;
-  right: 0;
+  right: var(--px-16);
   color: hsla(var(--color-neutral), var(--alpha-secondary));
   font-size: var(--font-size-h4);
   font-weight: var(--font-weight-medium);

From 7fd4e2d8e2d73f1a3f30a16df789a173279e2148 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 20:20:36 +0200
Subject: [PATCH 3/6] more

---
 packages/graphiql/cypress/e2e/init.cy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graphiql/cypress/e2e/init.cy.ts b/packages/graphiql/cypress/e2e/init.cy.ts
index 15f2b84e39d..d10ee2810b5 100644
--- a/packages/graphiql/cypress/e2e/init.cy.ts
+++ b/packages/graphiql/cypress/e2e/init.cy.ts
@@ -15,7 +15,7 @@ const mockSuccess = {
   data: {
     longDescriptionType: {
       id: 'abc123',
-      image: '/images/logo.svg',
+      image: '/resources/logo.svg',
       hasArgs: '{"defaultValue":"test default value"}',
       test: {
         id: 'abc123',

From d7af6dfe9100479ac67e2d35d8295a34ebf8dfb9 Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 20:50:58 +0200
Subject: [PATCH 4/6] try to fix

---
 .changeset/strong-ears-bake.md                 |  2 +-
 packages/graphiql/test/schema.js               |  3 +--
 .../src/__tests__/MessageProcessor.spec.ts     | 18 +++++++-----------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.changeset/strong-ears-bake.md b/.changeset/strong-ears-bake.md
index 8e06291ebab..45ac76e3ebd 100644
--- a/.changeset/strong-ears-bake.md
+++ b/.changeset/strong-ears-bake.md
@@ -2,4 +2,4 @@
 'graphiql': patch
 ---
 
-use `right: var(--px-16)` instead of `right: 0` for 
+use `right: var(--px-16)` instead of `right: 0` for `.graphiql-logo`
diff --git a/packages/graphiql/test/schema.js b/packages/graphiql/test/schema.js
index 6ecbe04ff31..ab5a58766ec 100644
--- a/packages/graphiql/test/schema.js
+++ b/packages/graphiql/test/schema.js
@@ -204,8 +204,7 @@ const sleep = async timeout =>
   new Promise(resolve => setTimeout(resolve, timeout));
 
 const longDescription = `
-The \`longDescriptionType\` field on the \`Test\` type has a long,
-verbose, description to test inline field docs.
+The \`longDescriptionType\` field on the \`Test\` type has a long, verbose, description to test inline field docs.
 
 > We want to test several \`markdown\` styles!
 
diff --git a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
index 7e6695b1aac..b2db640d486 100644
--- a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
+++ b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
@@ -1,5 +1,4 @@
 import mockfs from 'mock-fs';
-import { join } from 'node:path';
 import { MockFile, MockProject } from './__utils__/MockProject';
 import { FileChangeType } from 'vscode-languageserver';
 import { serializeRange } from './__utils__/utils';
@@ -30,9 +29,7 @@ jest.mock('@whatwg-node/fetch', () => {
 
 const mockSchema = (schema: GraphQLSchema) => {
   const introspectionResult = {
-    data: introspectionFromSchema(schema, {
-      descriptions: true,
-    }),
+    data: introspectionFromSchema(schema, { descriptions: true }),
   };
   return fetchMock.mock({
     matcher: '*',
@@ -45,10 +42,10 @@ const mockSchema = (schema: GraphQLSchema) => {
   });
 };
 
-const defaultFiles = [
+const defaultFiles: MockFile[] = [
   ['query.graphql', 'query { bar ...B }'],
   ['fragments.graphql', 'fragment B on Foo { bar }'],
-] as MockFile[];
+];
 const schemaFile: MockFile = [
   'schema.graphql',
   'type Query { foo: Foo, test: Test }\n\ntype Foo { bar: String }\n\ntype Test { test: Foo }',
@@ -290,7 +287,7 @@ describe('MessageProcessor with config', () => {
     expect(result.diagnostics[0].message).toEqual(
       'Cannot query field "bar" on type "Foo". Did you mean "bad"?',
     );
-    const generatedFile = existsSync(join(genSchemaPath));
+    const generatedFile = existsSync(genSchemaPath);
     // this generated file should not exist because the schema is local!
     expect(generatedFile).toEqual(false);
     // simulating codegen
@@ -406,9 +403,10 @@ describe('MessageProcessor with config', () => {
 
     // ensure that fragment definitions work
     const definitions = await project.lsp.handleDefinitionRequest({
-      textDocument: { uri: project.uri('query.graphql') }, // console.log(project.uri('query.graphql'))
+      textDocument: { uri: project.uri('query.graphql') },
       position: { character: 26, line: 0 },
     });
+
     expect(definitions[0].uri).toEqual(project.uri('fragments.graphql'));
     expect(serializeRange(definitions[0].range)).toEqual({
       start: {
@@ -559,9 +557,7 @@ describe('MessageProcessor with config', () => {
       (await project.lsp._graphQLCache.getSchema('a')).getType('example100'),
     ).toBeTruthy();
     await sleep(1000);
-    const file = await readFile(join(genSchemaPath.replace('default', 'a')), {
-      encoding: 'utf-8',
-    });
+    const file = await readFile(genSchemaPath.replace('default', 'a'), 'utf8');
     expect(file).toContain('example100');
     // add a new typescript file with empty query to the b project
     // and expect autocomplete to only show options for project b

From 3d8525c70214825ac097fc5a7b9b8993f33402ed Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 22:17:33 +0200
Subject: [PATCH 5/6] fix join is not defined

---
 .../src/__tests__/MessageProcessor.spec.ts                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
index b2db640d486..46a3df4c0d9 100644
--- a/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
+++ b/packages/graphql-language-service-server/src/__tests__/MessageProcessor.spec.ts
@@ -388,7 +388,7 @@ describe('MessageProcessor with config', () => {
     expect(await project.lsp._graphQLCache.getSchema('default')).toBeDefined();
 
     // schema file is present and contains schema
-    const file = await readFile(join(genSchemaPath), { encoding: 'utf-8' });
+    const file = await readFile(genSchemaPath, 'utf8');
     expect(file.split('\n').length).toBeGreaterThan(10);
 
     // hover works

From fd1d4936b8c9617aacb22b568ad97032c8f9aadd Mon Sep 17 00:00:00 2001
From: Dimitri POSTOLOV <dmytropostolov@gmail.com>
Date: Wed, 14 Aug 2024 22:24:03 +0200
Subject: [PATCH 6/6] Update
 packages/graphiql/cypress/e2e/incremental-delivery.cy.ts

Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>
---
 packages/graphiql/cypress/e2e/incremental-delivery.cy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
index e49be931b4b..8dcee9bc941 100644
--- a/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
+++ b/packages/graphiql/cypress/e2e/incremental-delivery.cy.ts
@@ -105,7 +105,7 @@ describeOrSkip('IncrementalDelivery support via fetcher', () => {
       This tests that;
       1. user ({name}) => { name }
       2. user ({age}) => { name, age }
-      3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due the promise race
+      3. user.friends.0 ({name}) => { name, age, friends: [{name}] } <- can sometimes happen before 4, due to the promise race
       4. user.friends.0 ({age}) => { name, age, friends: [{name, age}] }
 
       This shows us that we can deep merge defers, deep merge streams, and also deep merge defers inside streams