Merge branch 'main' into hack-support

Author: dunnbobcat

.changeset/config.json

@@ -6,6 +6,7 @@
   "access": "public",
   "baseBranch": "main",
   "ignore": [
+    "example-graphiql-vite",
     "example-graphiql-webpack",
     "example-monaco-graphql-nextjs",
     "example-monaco-graphql-react-vite",

.eslintrc.js

@@ -31,6 +31,12 @@ module.exports = {
     '**/CHANGELOG.md',
     'functions/*',
     'packages/vscode-graphql-syntax/tests/__fixtures__/*',
+    // symlinks
+    'packages/graphiql-react/__mocks__/monaco-editor.ts',
+    'packages/graphiql-plugin-doc-explorer/__mocks__/zustand.ts',
+    'packages/graphiql-plugin-doc-explorer/__mocks__/monaco-editor.ts',
+    'packages/graphiql-plugin-history/__mocks__/zustand.ts',
+    'packages/graphiql-plugin-history/__mocks__/monaco-editor.ts',
   ],
   overrides: [
     {
@@ -57,11 +63,11 @@ module.exports = {
         'plugin:import-x/recommended',
         'plugin:import-x/typescript',
         'plugin:react/recommended',
-        'plugin:react-hooks/recommended',
+        'plugin:react-hooks/recommended-legacy',
         'plugin:react/jsx-runtime',
         'prettier',
       ],
-      plugins: ['promise', 'sonarjs', 'unicorn', 'sonar', '@shopify'],
+      plugins: ['promise', 'sonarjs', 'unicorn', '@shopify'],
       globals: {
         atom: false,
         document: false,
@@ -129,6 +135,25 @@ module.exports = {
             property: 'localStorage',
             message: 'Use `localStorage` instead',
           },
+          {
+            object: 'window',
+            property: 'location',
+            message: 'Use `location` instead',
+          },
+          {
+            object: 'window',
+            property: 'navigator',
+            message: 'Use `navigator` instead',
+          },
+          {
+            object: 'window',
+            property: 'getComputedStyle',
+            message: 'Use `getComputedStyle` instead',
+          },
+          {
+            object: 'self',
+            message: 'Use `globalThis` instead',
+          },
         ],
         'no-return-assign': 'error',
         'no-return-await': 'error',
@@ -158,7 +183,7 @@ module.exports = {
         'init-declarations': 'off',
         'no-catch-shadow': 'error',
         'no-label-var': 'error',
-        'no-restricted-globals': 'off',
+        'no-restricted-globals': ['error', 'stop'],
         'no-shadow': 'off',
         '@typescript-eslint/no-shadow': 'error',
         'no-undef-init': 'off',
@@ -167,9 +192,8 @@ module.exports = {
         '@typescript-eslint/no-unused-vars': [
           'error',
           {
-            varsIgnorePattern: '^React$',
+            varsIgnorePattern: '^(React|_)', // allow underscores in destructuring
             argsIgnorePattern: '^_',
-            ignoreRestSiblings: true,
           },
         ],
 
@@ -328,8 +352,9 @@ module.exports = {
         '@typescript-eslint/no-unused-expressions': 'error',
         'sonarjs/no-small-switch': 'error',
         'sonarjs/no-duplicated-branches': 'error',
-        'sonar/prefer-promise-shorthand': 'error',
-        'sonar/no-dead-store': 'error',
+        'sonarjs/prefer-promise-shorthand': 'error',
+        'sonarjs/no-dead-store': 'error',
+        'sonarjs/void-use': 'error',
         'unicorn/prefer-node-protocol': 'error',
         'import-x/no-unresolved': [
           'error',
@@ -348,6 +373,8 @@ module.exports = {
         ],
         'unicorn/no-length-as-slice-end': 'error',
         'unicorn/prefer-string-replace-all': 'error',
+        'unicorn/prefer-array-some': 'error',
+        // '@typescript-eslint/prefer-for-of': 'error', TODO
         'unicorn/no-hex-escape': 'off', // TODO: enable
         // doesn't catch a lot of cases; we use ESLint builtin `no-restricted-syntax` to forbid `.keyCode`
         'unicorn/prefer-keyboard-event-key': 'off',
@@ -356,7 +383,15 @@ module.exports = {
         'unicorn/prefer-dom-node-text-content': 'error',
         quotes: ['error', 'single', { avoidEscape: true }], // Matches Prettier, but also replaces backticks with single quotes
         // TODO: Fix all errors for the following rules included in recommended config
-        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/no-require-imports': 'off',
+        'import-x/no-named-as-default-member': 'off',
+      },
+    },
+    {
+      files: ['packages/{monaco-graphql,graphiql*}/**/*.{ts,tsx,mts,cts}'],
+      excludedFiles: ['packages/graphiql-toolkit/**/*.{ts,tsx}'],
+      rules: {
+        '@typescript-eslint/no-unnecessary-condition': 'error',
       },
     },
     {
@@ -365,13 +400,19 @@ module.exports = {
       excludedFiles: ['**/*.{md,mdx}/*.{ts,tsx}'],
       // extends: ['plugin:@typescript-eslint/recommended-type-checked'],
       rules: {
+        // '@typescript-eslint/no-redundant-type-constituents': 'error',
         '@typescript-eslint/prefer-optional-chain': 'error',
         '@typescript-eslint/no-unnecessary-type-assertion': 'error',
         '@typescript-eslint/no-floating-promises': 'error',
         '@typescript-eslint/non-nullable-type-assertion-style': 'error',
         '@typescript-eslint/consistent-type-assertions': 'error',
         '@typescript-eslint/no-duplicate-type-constituents': 'error',
+        '@typescript-eslint/no-unnecessary-type-conversion': 'error',
+        // '@typescript-eslint/await-thenable': 'error', // TODO
         // TODO: Fix all errors for the following rules included in recommended config
+        '@typescript-eslint/no-deprecated': 'off',
+        '@typescript-eslint/no-unsafe-function-type': 'off',
+
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/ban-ts-comment': 'off',
@@ -381,12 +422,35 @@ module.exports = {
         '@typescript-eslint/no-namespace': 'off',
       },
       parserOptions: {
-        project: [
-          'packages/*/tsconfig.json',
-          'examples/*/tsconfig.json',
-          'packages/graphiql/cypress/tsconfig.json',
-          'tsconfig.eslint.json',
-        ],
+        projectService: {
+          allowDefaultProject: [
+            'examples/monaco-graphql-react-vite/vite.config.ts',
+            'packages/{codemirror-graphql,graphiql-toolkit,graphql-language-service-cli,graphql-language-service,monaco-graphql,vscode-graphql-syntax}/vitest.config.mts',
+
+            'packages/cm6-graphql/__tests__/test.spec.ts',
+            'packages/graphiql/cypress.config.ts',
+            'packages/vscode-graphql-syntax/tests/*.spec.ts',
+            'packages/graphql-language-service-cli/src/__tests__/*.test.ts',
+            'packages/monaco-graphql/test/monaco-editor.test.ts',
+
+            'packages/codemirror-graphql/setup-files.ts',
+            'packages/codemirror-graphql/src/__tests__/testSchema.ts',
+            'packages/codemirror-graphql/src/__tests__/*.test.ts',
+            'packages/codemirror-graphql/src/{variables,utils,results}/__tests__/*.test.ts',
+
+            'packages/graphql-language-service/benchmark/index.ts',
+            'packages/graphql-language-service/src/{utils,parser,interface}/__tests__/*.test.ts',
+            'packages/graphql-language-service/src/parser/__tests__/OnlineParserUtils.ts',
+
+            'packages/graphql-language-service-server/src/__tests__/*.{spec,test}.ts',
+            'packages/graphql-language-service-server/src/__tests__/__utils__/utils.ts',
+            'packages/graphql-language-service-server/src/__tests__/__utils__/MockProject.ts',
+
+            'packages/vscode-graphql-syntax/tests/__utilities__/serializer.ts',
+            'packages/vscode-graphql-syntax/tests/__utilities__/utilities.ts',
+          ],
+          maximumDefaultProjectFileMatchCount_THIS_WILL_SLOW_DOWN_LINTING: 100,
+        },
       },
     },
     // Cypress plugin, global, etc., only for cypress directory
@@ -454,16 +518,15 @@ module.exports = {
       },
     },
     {
-      // Rule prefer await to then without React packages because it's ugly to have `async IIFE` inside `useEffect`
+      // Rule to prefer await to then without React packages because it's ugly to have `async IIFE` inside `useEffect`
       files: ['packages/**'],
       excludedFiles: ['packages/graphiql/**', 'packages/graphiql-react/**'],
       rules: {
         'promise/prefer-await-to-then': 'error',
       },
     },
     {
-      files: ['packages/graphiql-react/**'],
-      plugins: ['react-compiler'],
+      files: ['packages/{graphiql-react,graphiql}/**/*.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-restricted-imports': [
           'error',
@@ -473,7 +536,8 @@ module.exports = {
             importNames: ['memo', 'useCallback', 'useMemo'],
           },
         ],
-        'react-compiler/react-compiler': 'error',
+        'react-hooks/react-compiler': 'error',
+        '@typescript-eslint/no-deprecated': 'error',
       },
     },
     {
@@ -501,6 +565,12 @@ module.exports = {
         'mdx/code-blocks': true,
       },
     },
+    {
+      files: ['**/*.d.ts'],
+      rules: {
+        'no-var': 'off',
+      },
+    },
     {
       // ❗ALWAYS LAST
       // Rules for codeblocks inside Markdown/MDX
@@ -513,8 +583,9 @@ module.exports = {
         'no-undef': 'off',
         'react/jsx-no-undef': 'off',
         'react-hooks/rules-of-hooks': 'off',
-        'sonar/no-dead-store': 'off',
+        'sonarjs/no-dead-store': 'off',
         '@typescript-eslint/no-restricted-imports': 'off',
+        '@typescript-eslint/no-unnecessary-condition': 'off',
       },
     },
   ],

.gitattributes

@@ -11,3 +11,5 @@
 *.css text eol=lf
 *.sh text eol=lf
 *.yml text eol=lf
+
+.yarn/releases/*.cjs export-ignore binary linguist-generated

.github/workflows/pr-graphql-compat-check.yml

@@ -4,8 +4,7 @@ on:
     # only on merge to main.
     # it's rare that this workflow would
     # show us an error, but when it does it's important!
-    branches:
-      - main
+    branches: [main]
     # don't run this regression suite if we don't need to
     paths-ignore:
       - '**.md'

.github/workflows/pr.yml

@@ -36,11 +36,9 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     needs: [install]
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-
       - id: cache-modules
         uses: actions/cache@v4
         with:
@@ -109,18 +107,15 @@ jobs:
     name: Vitest Unit Tests
     runs-on: ubuntu-latest
     needs: [build]
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-
       - id: cache-modules
         uses: actions/cache@v4
         with:
           path: |
             **/node_modules
           key: modules-${{ github.sha }}
-
       - uses: actions/cache@v4
         with:
           key: build-${{ github.sha }}
@@ -131,11 +126,9 @@ jobs:
     name: ESLint
     runs-on: ubuntu-latest
     needs: [build]
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-
       - id: cache-modules
         uses: actions/cache@v4
         with:
@@ -148,11 +141,29 @@ jobs:
           path: ${{ env.BUILD-CACHE-LIST }}
       - run: yarn eslint
 
+  types-check:
+    name: Types Check
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - id: cache-modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            **/node_modules
+          key: modules-${{ github.sha }}
+      - uses: actions/cache@v4
+        with:
+          key: build-${{ github.sha }}
+          path: ${{ env.BUILD-CACHE-LIST }}
+      - run: yarn types:check
+
   e2e:
     name: Cypress
     runs-on: ubuntu-latest
     needs: [build]
-
     steps:
       - uses: actions/checkout@v4
       - id: cache-modules

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [main, graphiql-v4]
+    branches: [main, graphiql-5]
 permissions: {}
 jobs:
   release:

.gitignore

@@ -5,6 +5,10 @@
 .secrets
 *.log
 
+.yarn/*
+!.yarn/releases/*
+!.yarn/plugins/*
+
 node_modules/
 coverage/
 .nyc_output
@@ -28,6 +32,7 @@ package-lock.json
 
 vite.config.d.ts
 vite.config.js
+tsconfig.vitest-temp.json
 
 .next/
 .turbo/
@@ -41,12 +46,8 @@ packages/codemirror-graphql/*.d.ts
 packages/codemirror-graphql/*.map
 !packages/codemirror-graphql/*.config.js
 
-packages/graphiql/index.html
-packages/graphiql/dev.html
-packages/graphiql/analyzer.html
-packages/graphiql/graphiql*.js
-packages/graphiql/*.css
-packages/graphiql/*.map
 packages/graphiql/cypress/screenshots/
+packages/graphiql/cypress/downloads/
+packages/graphiql/cypress/videos/
 packages/graphiql/typedoc/
 packages/graphiql/webpack/

.vscode/settings.json

@@ -11,5 +11,6 @@
     "coverage.xml",
     "jacoco.xml",
     "coverage.cobertura.xml"
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }