Resolving merge conflicts: dropped collectFields changes, will re-add in new collectFields.ts file

Author: mjmahone

.eslintrc.yml

@@ -22,6 +22,7 @@ rules:
 
   internal-rules/only-ascii: error
   internal-rules/no-dir-import: error
+  internal-rules/require-to-string-tag: off
 
   ##############################################################################
   # `eslint-plugin-istanbul` rule list based on `v0.1.2`
@@ -149,7 +150,7 @@ rules:
   import/dynamic-import-chunkname: off
 
   ##############################################################################
-  # ESLint builtin rules list based on `v7.27.x`
+  # ESLint builtin rules list based on `v7.29.x`
   ##############################################################################
 
   # Possible Errors
@@ -448,11 +449,19 @@ overrides:
       project: ['tsconfig.json']
     plugins:
       - '@typescript-eslint'
+      - 'eslint-plugin-tsdoc'
     extends:
       - plugin:import/typescript
     rules:
       ##########################################################################
-      # `@typescript-eslint/eslint-plugin` rule list based on `v4.25.x`
+      # `eslint-plugin-tsdoc` rule list based on `v0.2.x`
+      # https://github.com/microsoft/tsdoc/tree/master/eslint-plugin
+      ##########################################################################
+
+      tsdoc/syntax: error
+
+      ##########################################################################
+      # `@typescript-eslint/eslint-plugin` rule list based on `v4.28.x`
       ##########################################################################
 
       # Supported Rules
@@ -593,8 +602,8 @@ overrides:
       '@typescript-eslint/no-use-before-define': off
       '@typescript-eslint/no-duplicate-imports': off # Superseded by `import/no-duplicates`
 
-      # Bellow rules are disabled because coflicts with Prettier, see:
-      # https://github.com/prettier/eslint-config-prettier/blob/master/%40typescript-eslint.js
+      # Below rules are disabled because they conflict with Prettier, see:
+      # https://github.com/prettier/eslint-config-prettier/blob/main/index.js
       '@typescript-eslint/object-curly-spacing': off
       '@typescript-eslint/quotes': off
       '@typescript-eslint/brace-style': off
@@ -610,8 +619,12 @@ overrides:
       '@typescript-eslint/space-before-function-paren': off
       '@typescript-eslint/space-infix-ops': off
       '@typescript-eslint/type-annotation-spacing': off
+  - files: 'src/**'
+    rules:
+      internal-rules/require-to-string-tag: error
   - files: 'src/**/__*__/**'
     rules:
+      internal-rules/require-to-string-tag: off
       node/no-unpublished-import: [error, { allowModules: ['chai', 'mocha'] }]
       import/no-restricted-paths: off
       import/no-extraneous-dependencies: [error, { devDependencies: true }]
@@ -625,6 +638,7 @@ overrides:
     rules:
       node/no-sync: off
       node/no-missing-require: [error, { allowModules: ['graphql'] }]
+      import/no-commonjs: off
       import/no-nodejs-modules: off
       no-console: off
   - files: 'benchmark/**'

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -55,6 +55,24 @@ jobs:
             exit 1
           fi
 
+  checkPackageLock:
+    name: Check health of package-lock.json file
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
+
+      - name: Run npm install
+        run: npm install --package-lock-only --engine-strict --strict-peer-deps
+
+      - name: Check that package-lock.json is in sync with package.json
+        run: git diff --exit-code package-lock.json
+
   integrationTests:
     name: Run integration tests
     runs-on: ubuntu-latest
@@ -63,7 +81,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -83,7 +101,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -109,7 +127,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -145,7 +163,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js v${{ matrix.node_version_to_setup }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node_version_to_setup }}
 
@@ -173,7 +191,7 @@ jobs:
           fetch-depth: 2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -191,6 +209,30 @@ jobs:
       - name: Run Benchmark
         run: 'npm run benchmark -- --revs HEAD HEAD~1'
 
+  diff-npm-package:
+    name: Diff content of NPM package
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
+
+      - name: Generate report
+        run: 'node resources/diff-npm-package.js ${{ github.event.pull_request.base.sha }} HEAD'
+
+      - name: Upload generated report
+        uses: actions/upload-artifact@v2
+        with:
+          name: npm-dist-diff.html
+          path: ./npm-dist-diff.html
+          if-no-files-found: ignore
+
   deploy-to-npm-branch:
     name: Deploy to `npm` branch
     runs-on: ubuntu-latest
@@ -204,7 +246,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 
@@ -240,7 +282,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION_USED_FOR_DEVELOPMENT }}
 

.gitignore

@@ -5,6 +5,7 @@
 # https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 # https://www.gitignore.io/
 
+/diff-npm-package.html
 /.eslintcache
 /node_modules
 /coverage

.mocharc.yml

@@ -2,3 +2,5 @@ throw-deprecation: true
 check-leaks: true
 require:
   - 'resources/ts-register.js'
+extension:
+  - 'ts'

.prettierignore

@@ -1,4 +1,5 @@
 # Copied from '.gitignore', please keep it in sync.
+/diff-npm-package.html
 /.eslintcache
 /node_modules
 /coverage

benchmark/benchmark.js

@@ -274,9 +274,9 @@ async function runBenchmarks(benchmarks, benchmarkProjects) {
 }
 
 function getArguments(argv) {
-  const revsIdx = argv.indexOf('--revs');
-  const revisions = revsIdx === -1 ? [] : argv.slice(revsIdx + 1);
-  const benchmarks = revsIdx === -1 ? argv : argv.slice(0, revsIdx);
+  const revsIndex = argv.indexOf('--revs');
+  const revisions = revsIndex === -1 ? [] : argv.slice(revsIndex + 1);
+  const benchmarks = revsIndex === -1 ? argv : argv.slice(0, revsIndex);
 
   switch (revisions.length) {
     case 0:

cspell.yml

@@ -1,6 +1,7 @@
 language: en
 ignorePaths:
   # Copied from '.gitignore', please keep it in sync.
+  - diff-npm-package.html
   - .eslintcache
   - node_modules
   - coverage
@@ -20,6 +21,9 @@ overrides:
   - filename: '**/docs/APIReference-*.md'
     ignoreRegExpList: ['/href="[^"]*"/']
 
+ignoreRegExpList:
+  - u\{[0-9a-f]{1,8}\}
+
 words:
   - graphiql
   - sublinks

integrationTests/integration-test.js

@@ -42,4 +42,8 @@ describe('Integration Tests', () => {
   it('Should work on all supported node versions', () => {
     testOnNodeProject('node');
   }).timeout(40000);
+
+  it('Should be compatible with Webpack', () => {
+    testOnNodeProject('webpack');
+  }).timeout(40000);
 });

integrationTests/ts/package.json

@@ -10,6 +10,6 @@
     "typescript-4.0": "npm:[email protected]",
     "typescript-4.1": "npm:[email protected]",
     "typescript-4.2": "npm:[email protected]",
-    "typescript-4.3": "npm:typescript@4.2.x"
+    "typescript-4.3": "npm:typescript@4.3.x"
   }
 }

integrationTests/webpack/entry.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { buildSchema, graphqlSync } = require('graphql');
+
+const schema = buildSchema('type Query { hello: String }');
+
+const result = graphqlSync({
+  schema,
+  source: '{ hello }',
+  rootValue: { hello: 'world' },
+});
+
+module.exports = { result };