graphql · dimaMachina · Jun 22, 2023 · Jun 22, 2023 · Jun 22, 2023 · Jun 22, 2023
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -10,6 +10,10 @@
 module.exports = {
   root: true,
   reportUnusedDisableDirectives: true,
+  ignorePatterns: [
+    // CRA example has its own eslint config
+    'examples/graphiql-create-react-app',
+  ],
   overrides: [
     {
       // Rules for all code files

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,29 +1,29 @@
 blank_issues_enabled: true
 contact_links:
-  - name: "📚 Support/Q&A"
+  - name: '📚 Support/Q&A'
     url: https://github.com/graphql/graphiql/discussions/categories/q-a-support
     about: >-
-      Some questions are already answered in our github discussions Q&A section
-      If you don't find an answer, [create a support ticket](ttps://github.com/graphql/graphiql/discussions/new?category=q-a-support)
+      Some questions are already answered in our github discussions Q&A section If you don't find an answer, [create a support ticket](ttps://github.com/graphql/graphiql/discussions/new?category=q-a-support)
 
-  - name: "💬 `graphiql` Discord Support"
+
+  - name: '💬 `graphiql` Discord Support'
     url: https://discord.gg/NP5vbPeUFp
-    about: "`graphiql` Discord Support Channel"
+    about: '`graphiql` Discord Support Channel'
 
-  - name: "💬 `vscode-graphql` Discord Support"
+  - name: '💬 `vscode-graphql` Discord Support'
     url: https://discord.gg/bHrQtxGNzQ
-    about: "`vscode-graphql` Discord Support Channel"
+    about: '`vscode-graphql` Discord Support Channel'
 
-  - name: "💬 GraphQL LSP & CLI Discord Support"
+  - name: '💬 GraphQL LSP & CLI Discord Support'
     url: https://discord.gg/wkQCKwazxj
     about: >-
-      GraphQL LSP (Language Server Protocol) Server Discord Support Channel 
-      For `graphql-language-service-server` and/or `graphql-language-service-cli`
+      GraphQL LSP (Language Server Protocol) Server Discord Support Channel  For `graphql-language-service-server` and/or `graphql-language-service-cli`
+
 
-  - name: "💬 `monaco-graphql` Discord Support"
+  - name: '💬 `monaco-graphql` Discord Support'
     url: https://discord.gg/r4BxrAG6fN
-    about: "`monaco-graphql` Discord Support Channel"
+    about: '`monaco-graphql` Discord Support Channel'
 
-  - name: "💬 `codedemirror-graphql` Discord Support"
+  - name: '💬 `codedemirror-graphql` Discord Support'
     url: https://discord.gg/cffZwk8NJW
-    about: "`codemirror-graphql` Discord Support Channel"
+    about: '`codemirror-graphql` Discord Support Channel'
diff --git a/.github/ISSUE_TEMPLATE/graphiql-bug.yml b/.github/ISSUE_TEMPLATE/graphiql-bug.yml
@@ -1,6 +1,6 @@
 name: GraphiQL 🐞 Bug
 description: File a bug with the graphiql web editor
-title: "[graphiql] <title>"
+title: '[graphiql] <title>'
 labels: [bug, needs triage, graphiql]
 body:
   - type: checkboxes

diff --git a/.github/ISSUE_TEMPLATE/language-server-bug.yml b/.github/ISSUE_TEMPLATE/language-server-bug.yml
@@ -1,6 +1,6 @@
 name: Generic IDE (LSP Server) Bug 🐞
 description: File any non syntax highlighting related bugs in vscode or any IDE lsp runtime (vim, intellij, emacs, sublime, etc), with the `graphql-language-service-server` / `graphql-lsp` CLI
-title: "[lsp-server] 🐞 <title>"
+title: '[lsp-server] 🐞 <title>'
 labels: [bug, lsp-server]
 body:
   - type: checkboxes

diff --git a/.github/ISSUE_TEMPLATE/monaco-graphql-bug.yml b/.github/ISSUE_TEMPLATE/monaco-graphql-bug.yml
@@ -1,6 +1,6 @@
 name: Monaco GraphQL Bug
 description: Report a bug for `monaco-graphql`
-title: "[monaco-graphql] <title>"
+title: '[monaco-graphql] <title>'
 labels: [monaco-graphql, bug, needs triage]
 body:
   - type: checkboxes

diff --git a/.github/ISSUE_TEMPLATE/vscode-graphql-syntax-bug.yml b/.github/ISSUE_TEMPLATE/vscode-graphql-syntax-bug.yml
@@ -1,12 +1,12 @@
 name: VSCode GraphQL Syntax Bug
 description: Report a bug for `vscode-graphql-syntax`
-title: "[vscode-graphql-syntax] <title>"
+title: '[vscode-graphql-syntax] <title>'
 labels: [vscode-graphql-syntax, bug, needs triage]
 body:
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
       description: Please search to see if an issue already exists for the bug you encountered.
       options:
-      - label: I have searched the existing issues
-        required: true
+        - label: I have searched the existing issues
+          required: true
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -27,6 +27,3 @@ jobs:
 
       - name: ESLint
         run: yarn lint
-
-      - name: Prettier Check
-        run: yarn pretty-check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ permissions: {}
 jobs:
   release:
     permissions:
-      contents: write # for changesets/action to git push 
+      contents: write # for changesets/action to git push
     environment: deploy
     name: Release
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -3,33 +3,23 @@
 .*.haste_cache.*
 .DS_Store
 .secrets
-npm-debug.log
-yarn-error.log
+*.log
 
 node_modules/
 coverage/
 .nyc_output
-packages/**/dist/.gitignore
-packages/**/dist/.npmignore
-packages/graphiql/typedoc
-dist
-esm
-cjs
-bundle
+packages/graphiql/typedoc/
+dist/
+esm/
 *.vsix
+*.tsbuildinfo
 
-cypress/screenshots
-lerna-debug.log
-**/tsconfig.tsbuildinfo
-**/*.tsbuildinfo
-
-.yarnrc
 yarn-1.18.0.js
 *.orig
 .idea/
 
 # Local Netlify folder
-.netlify
+.netlify/
 
 examples/*/yarn.lock
 package-lock.json
@@ -40,3 +30,19 @@ vite.config.js
 
 .next/
 .turbo/
+types/
+packages/codemirror-graphql/cm6-legacy/
+packages/codemirror-graphql/results/
+packages/codemirror-graphql/utils/
+packages/codemirror-graphql/variables/
+packages/codemirror-graphql/*.js
+packages/codemirror-graphql/*.d.ts
+packages/codemirror-graphql/*.map
+!packages/codemirror-graphql/*.config.js
+
+packages/graphiql/index.html
+packages/graphiql/analyzer.html
+packages/graphiql/graphiql.*.js
+packages/graphiql/*.css
+packages/graphiql/*.map
+packages/graphiql/cypress/screenshots/
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,12 @@
-js-green-licenses.json
-.changeset
+.changeset/
+
+# ignore working-group dir markdown so it's easier for people to edit from the UI
+working-group/
+packages/codemirror-graphql/src/__tests__/schema-kitchen-sink.graphql
+CHANGELOG.md
+
+# bug in v3 https://github.com/prettier/prettier/issues/14964
+packages/graphql-language-service/benchmark/fixtures/github.graphql
+
+# remove after merge of https://github.com/graphql/graphiql/pull/3256
+*.flow
diff --git a/custom-words.txt b/custom-words.txt
@@ -116,6 +116,8 @@ lezer
 buildhelper
 sonarjs
 svgr
+prettierignore
+pnpm
 
 // identifiers used in code and configs
 acmerc

diff --git a/examples/cm6-graphql-legacy-parcel/src/index.html b/examples/cm6-graphql-legacy-parcel/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <style>

diff --git a/examples/cm6-graphql-parcel/src/index.html b/examples/cm6-graphql-parcel/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <style>

diff --git a/examples/graphiql-cdn/index.html b/examples/graphiql-cdn/index.html
@@ -5,7 +5,7 @@
  *  This source code is licensed under the license found in the
  *  LICENSE file in the root directory of this source tree.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>GraphiQL</title>

diff --git a/examples/graphiql-create-react-app/public/index.html b/examples/graphiql-create-react-app/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/examples/graphiql-parcel/src/index.html b/examples/graphiql-parcel/src/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <style>

diff --git a/examples/monaco-graphql-react-vite/index.html b/examples/monaco-graphql-react-vite/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "build-bundles-clean": "rimraf '{packages,examples,plugins}/**/{bundle,cdn,webpack}' && yarn workspace graphiql run build-bundles-clean",
     "build-clean": "wsrun -m build-clean",
     "build-demo": "wsrun -m -s build-demo",
-    "build-docs": "rimraf 'packages/graphiql/typedoc' && typedoc 'packages'",
+    "build-docs": "rimraf packages/graphiql/typedoc && typedoc packages",
     "build:clean": "yarn tsc --clean && yarn tsc --clean resources/tsconfig.graphiql.json",
     "build:cm6-graphql": "yarn workspace cm6-graphql run build",
     "build:graphiql": "yarn tsc resources/tsconfig.graphiql.json",
@@ -52,7 +52,7 @@
     "dev-graphiql": "yarn workspace graphiql dev",
     "e2e": "yarn run e2e:build && yarn workspace graphiql e2e",
     "e2e:build": "yarn build && yarn workspace graphiql build-bundles-min",
-    "eslint": "NODE_OPTIONS=--max-old-space-size=4096 eslint --max-warnings=0 --cache .",
+    "eslint": "NODE_OPTIONS=--max-old-space-size=4096 eslint --max-warnings=0 --ignore-path .gitignore --cache .",
     "format": "yarn eslint --fix && yarn pretty",
     "jest": "jest --testPathIgnorePatterns cm6-graphql",
     "license-check": "jsgl --local ./",
@@ -63,8 +63,8 @@
     "postbuild": "yarn workspace codemirror-graphql run postbuild",
     "prebuild-bundles": "yarn build-bundles-clean",
     "prepublishOnly": "./scripts/prepublish.sh",
-    "pretty": "node scripts/pretty.js",
-    "pretty-check": "node scripts/pretty.js --check",
+    "pretty": "yarn pretty-check --write",
+    "pretty-check": "prettier --cache --check --ignore-path .gitignore --ignore-path .prettierignore .",
     "ci:version": "yarn changeset version && yarn build && yarn format",
     "release": "yarn build && yarn build-bundles && (wsrun release --exclude-missing --serial --recursive --changedSince main || true) && yarn changeset publish",
     "release:canary": "(node scripts/canary-release.js && yarn build && yarn build-bundles && yarn changeset publish --tag canary) || echo Skipping Canary...",
@@ -102,7 +102,6 @@
     "@types/fetch-mock": "^7.3.2",
     "@types/jest": "^29.5.2",
     "@types/node": "^16.18.4",
-    "@types/prettier": "^2.7.0",
     "@types/ws": "^7.4.0",
     "@typescript-eslint/eslint-plugin": "6.0.0-alpha.159",
     "@typescript-eslint/parser": "6.0.0-alpha.159",
@@ -133,7 +132,7 @@
     "js-green-licenses": "3.0.0",
     "lint-staged": "^10.1.2",
     "mkdirp": "^1.0.4",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0-alpha.12",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.5",
     "typedoc": "^0.19.2",

diff --git a/packages/cm6-graphql/src/helpers.ts b/packages/cm6-graphql/src/helpers.ts
@@ -17,7 +17,10 @@ export interface IPosition {
 }
 
 export class Position implements IPosition {
-  constructor(public line: number, public character: number) {}
+  constructor(
+    public line: number,
+    public character: number,
+  ) {}
 
   setLine(line: number) {
     this.line = line;

diff --git a/packages/codemirror-graphql/.gitignore b/packages/codemirror-graphql/.gitignore
diff --git a/packages/graphiql-plugin-code-exporter/.gitignore b/packages/graphiql-plugin-code-exporter/.gitignore
diff --git a/packages/graphiql-plugin-code-exporter/examples/index.html b/packages/graphiql-plugin-code-exporter/examples/index.html
@@ -5,7 +5,7 @@
  *  This source code is licensed under the license found in the
  *  LICENSE file in the root directory of this source tree.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title></title>