.changeset/config.json

@@ -6,7 +6,5 @@
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
-  "ignore": [
-    "@graphql-tools/website"
-  ]
+  "ignore": ["@graphql-tools/website"]
 }

.eslintrc.json

@@ -1,14 +1,10 @@
 {
+  "reportUnusedDisableDirectives": true,
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "project": "./tsconfig.json"
   },
-  "extends": [
-    "eslint:recommended",
-    "standard",
-    "prettier",
-    "plugin:@typescript-eslint/recommended"
-  ],
+  "extends": ["eslint:recommended", "standard", "prettier", "plugin:@typescript-eslint/recommended"],
   "plugins": ["@typescript-eslint"],
   "rules": {
     "no-empty": "off",
@@ -35,18 +31,15 @@
     "@typescript-eslint/interface-name-prefix": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "default-param-last": "off",
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.ts", "**/*.spec.ts"]}]
+    "import/no-extraneous-dependencies": ["error", { "devDependencies": ["**/*.test.ts", "**/*.spec.ts"] }]
   },
   "env": {
     "es6": true,
     "node": true
   },
   "overrides": [
     {
-      "files": [
-        "**/{test,tests,testing}/**/*.{ts,js}",
-        "*.{spec,test}.{ts,js}"
-      ],
+      "files": ["**/{test,tests,testing}/**/*.{ts,js}", "*.{spec,test}.{ts,js}"],
       "env": {
         "jest": true
       },
@@ -65,7 +58,7 @@
     "packages/loaders/code-file/tests/test-files",
     "packages/loaders/git/tests/test-files"
   ],
-  "globals":{
+  "globals": {
     "BigInt": true
   }
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,6 +4,7 @@ about: Create a bug report to help us improve
 ---
 
 **Describe the bug**
+
 <!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
@@ -12,6 +13,7 @@ Steps to reproduce the behavior:
 <!-- Adding a codesandbox can help us understand the bug better and speed up things -->
 
 **Expected behavior**
+
 <!-- A clear and concise description of what you expected to happen. -->
 
 **Environment:**
@@ -21,4 +23,5 @@ Steps to reproduce the behavior:
 - NodeJS:
 
 **Additional context**
+
 <!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,18 +1,20 @@
 ---
 name: Feature Request
 about: Suggest an idea for the core of this project
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
 
 <!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
+
 <!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
+
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
+
 <!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,13 +7,14 @@
 
 🚨 **IMPORTANT: Please do not create a Pull Request without creating an issue first.**
 
-*Any change needs to be discussed before proceeding. Failure to do so may result in the rejection of the pull request.*
+_Any change needs to be discussed before proceeding. Failure to do so may result in the rejection of the pull request._
 
 ## Description
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
 Related # (issue)
+
 <!--
   Please do not use "Fixed" or "Resolves". Keep "Related" as-is.
 -->
@@ -39,6 +40,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] Test B
 
 **Test Environment**:
+
 - OS:
 - `@graphql-tools/...`:
 - NodeJS:

.github/workflows/benchmark.yml

@@ -22,9 +22,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-17-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-17-15-yarn
+            ${{ runner.os }}-17-16-yarn
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Build packages

.github/workflows/canary.yml

@@ -44,9 +44,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-17-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-17-15-yarn-
+            ${{ runner.os }}-17-16-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Release Canary

.github/workflows/codeql-analysis.yml

@@ -9,14 +9,14 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   analyze:
@@ -30,40 +30,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: ['javascript']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/release.yml

@@ -33,9 +33,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-17-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-17-15-yarn-
+            ${{ runner.os }}-17-16-yarn-
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Create Release Pull Request or Publish to npm

.github/workflows/tests.yml

@@ -7,6 +7,27 @@ on:
   pull_request: {}
 
 jobs:
+  prettier-check:
+    name: 🧹 Prettier Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v2
+      - name: Use Node
+        uses: actions/setup-node@master
+        with:
+          node-version: 17
+      - name: Cache Yarn
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ${{runner.os}}-17-16-yarn-${{hashFiles('yarn.lock')}}
+          restore-keys: |
+            ${{runner.os}}-17-16-yarn
+      - name: Install Dependencies using Yarn
+        run: yarn install --ignore-engines && git checkout yarn.lock
+      - name: Prettier Check
+        run: yarn prettier:check
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -21,9 +42,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-17-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-17-15-yarn
+            ${{ runner.os }}-17-16-yarn
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Lint
@@ -36,7 +57,7 @@ jobs:
         graphql_version:
           - 14
           - 15
-          - 16.0.0-rc.6
+          - 16
     steps:
       - name: Checkout Master
         uses: actions/checkout@v2
@@ -67,7 +88,7 @@ jobs:
         graphql_version:
           - 14
           - 15
-          - 16.0.0-rc.6
+          - 16
         include:
           - node-version: 14
             os: windows-latest
@@ -115,9 +136,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-17-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-17-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-17-15-yarn
+            ${{ runner.os }}-17-16-yarn
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Build Packages
@@ -138,9 +159,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16-15-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16-15-yarn
+            ${{ runner.os }}-16-16-yarn
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Build Packages

.prettierignore

@@ -1,4 +1,24 @@
 dist
-tests
-tests
-spec
+packages/import/tests/schema/fixtures/import-duplicate/all.graphql
+packages/import/tests/schema/fixtures/imports-only/all.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/1/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/2/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/3/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/4/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/5/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/6/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/7/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/8/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/9/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/10/index.graphql
+packages/import/tests/schema/fixtures/multiple-directories-with-master-schema/index.graphql
+packages/import/tests/schema/fixtures/multiple-imports/schema.graphql
+packages/import/tests/schema/fixtures/multiple-levels-master-schema/level1.graphql
+packages/load/tests/loaders/documents/test-invalid-syntax/invalid-syntax.query.graphql
+packages/load/tests/loaders/schema/test-files/error.ts
+packages/load/tests/loaders/schema/test-files/schema-dir/invalid.graphql
+packages/loaders/git/tests/test-files/type-defs-invalid.graphql
+packages/loaders/json-file/tests/test-files/failing/malformed.json
+website/.next
+website/out
+CHANGELOG.md

.prettierrc

@@ -5,9 +5,10 @@
   "arrowParens": "avoid",
   "overrides": [
     {
-      "files": "*.flow.js",
+      "files": "*.{md,mdx}",
       "options": {
-        "parser": "flow"
+        "semi": false,
+        "trailingComma": "none"
       }
     }
   ]

.vscode/settings.json

@@ -12,12 +12,12 @@
   "files.exclude": {
     "**/.git": true,
     "**/.DS_Store": true,
-    "**/node_modules": true,
+    "**/node_modules": false,
     "test-lib": true,
     "lib": true,
     "coverage": true,
     "npm": true,
-    "**/dist": true
+    "**/dist": false
   },
   "typescript.tsdk": "node_modules/typescript/lib"
 }