Merge branch 'main' into ck.unhandledRejection2

.eslintignore

@@ -5,6 +5,7 @@
 /node_modules
 /reports
 /npmDist
+/npmEsmDist
 /denoDist
 /websiteDist
 

.eslintrc.yml

@@ -38,7 +38,7 @@ rules:
   node/no-exports-assign: error
   node/no-extraneous-import: error
   node/no-extraneous-require: error
-  node/no-missing-import: [error, { allowModules: ['graphql'] }]
+  node/no-missing-import: off # Blocked by https://github.com/mysticatea/eslint-plugin-node/issues/248
   node/no-missing-require: error
   node/no-new-require: error
   node/no-path-concat: error
@@ -84,7 +84,7 @@ rules:
 
   # Static analysis
   # https://github.com/benmosher/eslint-plugin-import#static-analysis
-  import/no-unresolved: [error, { ignore: ['graphql'] }]
+  import/no-unresolved: off # blocked by https://github.com/import-js/eslint-plugin-import/issues/2170
   import/named: error
   import/default: error
   import/namespace: error
@@ -130,7 +130,6 @@ rules:
   import/extensions:
     - error
     - ignorePackages
-    - ts: never # TODO: remove once TS supports extensions
   import/order: [error, { newlines-between: always-and-inside-groups }]
   import/newline-after-import: error
   import/prefer-default-export: off
@@ -144,7 +143,7 @@ rules:
   import/dynamic-import-chunkname: off
 
   ##############################################################################
-  # `eslint-plugin-simple-import-sort` rule list based on `v2.25.x`
+  # `eslint-plugin-simple-import-sort` rule list based on `v8.0.x`
   # https://github.com/lydell/eslint-plugin-simple-import-sort
   ##############################################################################
   simple-import-sort/imports:
@@ -179,7 +178,7 @@ rules:
   simple-import-sort/exports: off # TODO
 
   ##############################################################################
-  # ESLint builtin rules list based on `v8.21.x`
+  # ESLint builtin rules list based on `v8.23.x`
   ##############################################################################
 
   # Possible Errors
@@ -474,6 +473,10 @@ rules:
   yield-star-spacing: off
 
 overrides:
+  - files:
+      - 'integrationTests/node-esm/**/*.js'
+    parserOptions:
+      sourceType: module
   - files: '**/*.ts'
     parser: '@typescript-eslint/parser'
     parserOptions:
@@ -493,7 +496,7 @@ overrides:
       tsdoc/syntax: error
 
       ##########################################################################
-      # `@typescript-eslint/eslint-plugin` rule list based on `v5.33.x`
+      # `@typescript-eslint/eslint-plugin` rule list based on `v5.37.x`
       ##########################################################################
 
       # Supported Rules
@@ -696,8 +699,11 @@ overrides:
       node: true
     rules:
       node/no-sync: off
+      node/no-extraneous-import: [error, { allowModules: ['graphql'] }]
       import/no-unresolved: off
+      import/no-namespace: off
       import/no-nodejs-modules: off
+      import/no-extraneous-dependencies: off
   - files: 'resources/**'
     env:
       node: true
@@ -735,7 +741,6 @@ overrides:
         version: detect
     rules:
       node/no-unpublished-require: off
-      node/no-missing-import: off
       import/no-default-export: off
       import/no-commonjs: off
       import/no-nodejs-modules: off

.github/workflows/ci.yml

@@ -154,6 +154,25 @@ jobs:
       - name: Run Tests with coverage
         run: npm run testonly:cover
 
+  codeql:
+    name: Run CodeQL security scan
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: 'javascript, typescript'
+
+      - name: Perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
   build-npm-dist:
     name: Build 'npmDist' artifact
     runs-on: ubuntu-latest

.github/workflows/cmd-publish-pr-on-npm.yml

@@ -2,12 +2,12 @@ name: publish-pr-on-npm
 on:
   workflow_call:
     inputs:
-      pullRequestJSON:
+      pull_request_json:
         description: String that contain JSON payload for `pull_request` event.
         required: true
         type: string
     secrets:
-      NPM_CANARY_PR_PUBLISH_TOKEN:
+      npm_canary_pr_publish_token:
         description: NPM token to publish canary release.
         required: true
 jobs:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           persist-credentials: false
-          ref: ${{ fromJSON(inputs.pullRequestJSON).merge_commit_sha }}
+          ref: ${{ fromJSON(inputs.pull_request_json).merge_commit_sha }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -64,7 +64,7 @@ jobs:
 
       - name: Modify NPM package to be canary release
         env:
-          PULL_REQUEST_JSON: ${{ inputs.pullRequestJSON }}
+          PULL_REQUEST_JSON: ${{ inputs.pull_request_json }}
         uses: actions/github-script@v6
         with:
           script: |
@@ -105,7 +105,7 @@ jobs:
       - name: Publish NPM package
         run: npm publish --ignore-scripts ./npmDist
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_CANARY_PR_PUBLISH_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.npm_canary_pr_publish_token }}
 
       - name: Upload replyMessage
         uses: actions/upload-artifact@v3

.github/workflows/cmd-run-benchmark.yml

@@ -2,7 +2,7 @@ name: run-benchmark
 on:
   workflow_call:
     inputs:
-      pullRequestJSON:
+      pull_request_json:
         description: String that contain JSON payload for `pull_request` event.
         required: true
         type: string
@@ -15,11 +15,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           persist-credentials: false
-          ref: ${{ fromJSON(inputs.pullRequestJSON).merge_commit_sha }}
+          ref: ${{ fromJSON(inputs.pull_request_json).merge_commit_sha }}
 
       - name: Deepen cloned repo
         env:
-          BASE_SHA: ${{ fromJSON(inputs.pullRequestJSON).base.sha }}
+          BASE_SHA: ${{ fromJSON(inputs.pull_request_json).base.sha }}
         run: 'git fetch --depth=1 origin "$BASE_SHA:refs/tags/BASE"'
 
       - name: Setup Node.js

.github/workflows/github-actions-bot.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       cmd: ${{ steps.parse-cmd.outputs.cmd }}
-      pullRequestJSON: ${{ steps.parse-cmd.outputs.pullRequestJSON }}
+      pull_request_json: ${{ steps.parse-cmd.outputs.pull_request_json }}
     steps:
       - uses: actions/github-script@v6
         with:
@@ -76,23 +76,23 @@ jobs:
 
             const { url } = context.payload.issue.pull_request;
             const { data } = await github.request(url);
-            core.setOutput('pullRequestJSON', JSON.stringify(data, null, 2));
+            core.setOutput('pull_request_json', JSON.stringify(data, null, 2));
 
   cmd-publish-pr-on-npm:
     needs: [accept-cmd]
     if: needs.accept-cmd.outputs.cmd == 'publish-pr-on-npm'
     uses: ./.github/workflows/cmd-publish-pr-on-npm.yml
     with:
-      pullRequestJSON: ${{ needs.accept-cmd.outputs.pullRequestJSON }}
+      pull_request_json: ${{ needs.accept-cmd.outputs.pull_request_json }}
     secrets:
-      NPM_CANARY_PR_PUBLISH_TOKEN: ${{ secrets.NPM_CANARY_PR_PUBLISH_TOKEN }}
+      npm_canary_pr_publish_token: ${{ secrets.npm_canary_pr_publish_token }}
 
   cmd-run-benchmark:
     needs: [accept-cmd]
     if: needs.accept-cmd.outputs.cmd == 'run-benchmark'
     uses: ./.github/workflows/cmd-run-benchmark.yml
     with:
-      pullRequestJSON: ${{ needs.accept-cmd.outputs.pullRequestJSON }}
+      pull_request_json: ${{ needs.accept-cmd.outputs.pull_request_json }}
 
   respond-to-cmd:
     needs:

.gitignore

@@ -13,5 +13,6 @@
 /node_modules
 /reports
 /npmDist
+/npmEsmDist
 /denoDist
 /websiteDist

.mocharc.yml

@@ -1,7 +1,7 @@
 fail-zero: true
 throw-deprecation: true
 check-leaks: true
-require:
-  - 'ts-node/register/transpile-only'
 extension:
-  - 'ts'
+  - ts
+node-option:
+  - 'loader=ts-node/esm/transpile-only'

.prettierignore

@@ -6,5 +6,6 @@
 /node_modules
 /reports
 /npmDist
+/npmEsmDist
 /denoDist
 /websiteDist

cspell.yml

@@ -21,6 +21,7 @@ overrides:
       - clsx
       - infima
 
+validateDirectives: true
 ignoreRegExpList:
   - u\{[0-9a-f]{1,8}\}
 

integrationTests/node/index.cjs

@@ -0,0 +1,26 @@
+const assert = require('assert');
+const { readFileSync } = require('fs');
+
+const { graphqlSync } = require('graphql');
+const { buildSchema } = require('graphql/utilities');
+const { version } = require('graphql/version');
+
+assert.deepStrictEqual(
+  version,
+  JSON.parse(readFileSync('./node_modules/graphql/package.json')).version,
+);
+
+const schema = buildSchema('type Query { hello: String }');
+
+const result = graphqlSync({
+  schema,
+  source: '{ hello }',
+  rootValue: { hello: 'world' },
+});
+
+assert.deepStrictEqual(result, {
+  data: {
+    __proto__: null,
+    hello: 'world',
+  },
+});

integrationTests/node/index.js → integrationTests/node/index.mjs

@@ -2,13 +2,13 @@
 import assert from 'assert';
 import { readFileSync } from 'fs';
 
-import { graphqlSync } from 'graphql';
-import { buildSchema } from 'graphql/utilities';
-import { version } from 'graphql/version';
+import { graphqlSync } from 'graphql-esm';
+import { buildSchema } from 'graphql-esm/utilities';
+import { version } from 'graphql-esm/version';
 
 assert.deepStrictEqual(
-  version,
-  JSON.parse(readFileSync('./node_modules/graphql/package.json')).version,
+  version + '+esm',
+  JSON.parse(readFileSync('./node_modules/graphql-esm/package.json')).version,
 );
 
 const schema = buildSchema('type Query { hello: String }');

integrationTests/node/package.json

@@ -6,6 +6,7 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "graphql": "file:../graphql.tgz"
+    "graphql": "file:../graphql.tgz",
+    "graphql-esm": "file:../graphql-esm.tgz"
   }
 }