Skip to content

Commit 6598a33

Browse files
committed
Merge branch 'main' into ck.unhandledRejection2
2 parents 7d48c7e + 269d6aa commit 6598a33

File tree

284 files changed

+9024
-3546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+9024
-3546
lines changed

.babelrc-deno.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

.babelrc-npm.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

.babelrc.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/node_modules
66
/reports
77
/npmDist
8+
/npmEsmDist
89
/denoDist
910
/websiteDist
1011

.eslintrc.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rules:
3838
node/no-exports-assign: error
3939
node/no-extraneous-import: error
4040
node/no-extraneous-require: error
41-
node/no-missing-import: [error, { allowModules: ['graphql'] }]
41+
node/no-missing-import: off # Blocked by https://github.com/mysticatea/eslint-plugin-node/issues/248
4242
node/no-missing-require: error
4343
node/no-new-require: error
4444
node/no-path-concat: error
@@ -84,7 +84,7 @@ rules:
8484

8585
# Static analysis
8686
# https://github.com/benmosher/eslint-plugin-import#static-analysis
87-
import/no-unresolved: [error, { ignore: ['graphql'] }]
87+
import/no-unresolved: off # blocked by https://github.com/import-js/eslint-plugin-import/issues/2170
8888
import/named: error
8989
import/default: error
9090
import/namespace: error
@@ -130,7 +130,6 @@ rules:
130130
import/extensions:
131131
- error
132132
- ignorePackages
133-
- ts: never # TODO: remove once TS supports extensions
134133
import/order: [error, { newlines-between: always-and-inside-groups }]
135134
import/newline-after-import: error
136135
import/prefer-default-export: off
@@ -144,7 +143,7 @@ rules:
144143
import/dynamic-import-chunkname: off
145144

146145
##############################################################################
147-
# `eslint-plugin-simple-import-sort` rule list based on `v2.25.x`
146+
# `eslint-plugin-simple-import-sort` rule list based on `v8.0.x`
148147
# https://github.com/lydell/eslint-plugin-simple-import-sort
149148
##############################################################################
150149
simple-import-sort/imports:
@@ -179,7 +178,7 @@ rules:
179178
simple-import-sort/exports: off # TODO
180179

181180
##############################################################################
182-
# ESLint builtin rules list based on `v8.21.x`
181+
# ESLint builtin rules list based on `v8.23.x`
183182
##############################################################################
184183

185184
# Possible Errors
@@ -474,6 +473,10 @@ rules:
474473
yield-star-spacing: off
475474

476475
overrides:
476+
- files:
477+
- 'integrationTests/node-esm/**/*.js'
478+
parserOptions:
479+
sourceType: module
477480
- files: '**/*.ts'
478481
parser: '@typescript-eslint/parser'
479482
parserOptions:
@@ -493,7 +496,7 @@ overrides:
493496
tsdoc/syntax: error
494497

495498
##########################################################################
496-
# `@typescript-eslint/eslint-plugin` rule list based on `v5.33.x`
499+
# `@typescript-eslint/eslint-plugin` rule list based on `v5.37.x`
497500
##########################################################################
498501

499502
# Supported Rules
@@ -696,8 +699,11 @@ overrides:
696699
node: true
697700
rules:
698701
node/no-sync: off
702+
node/no-extraneous-import: [error, { allowModules: ['graphql'] }]
699703
import/no-unresolved: off
704+
import/no-namespace: off
700705
import/no-nodejs-modules: off
706+
import/no-extraneous-dependencies: off
701707
- files: 'resources/**'
702708
env:
703709
node: true
@@ -735,7 +741,6 @@ overrides:
735741
version: detect
736742
rules:
737743
node/no-unpublished-require: off
738-
node/no-missing-import: off
739744
import/no-default-export: off
740745
import/no-commonjs: off
741746
import/no-nodejs-modules: off

.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,25 @@ jobs:
154154
- name: Run Tests with coverage
155155
run: npm run testonly:cover
156156

157+
codeql:
158+
name: Run CodeQL security scan
159+
runs-on: ubuntu-latest
160+
permissions:
161+
security-events: write
162+
steps:
163+
- name: Checkout repo
164+
uses: actions/checkout@v3
165+
with:
166+
persist-credentials: false
167+
168+
- name: Initialize CodeQL
169+
uses: github/codeql-action/init@v2
170+
with:
171+
languages: 'javascript, typescript'
172+
173+
- name: Perform CodeQL analysis
174+
uses: github/codeql-action/analyze@v2
175+
157176
build-npm-dist:
158177
name: Build 'npmDist' artifact
159178
runs-on: ubuntu-latest

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: publish-pr-on-npm
22
on:
33
workflow_call:
44
inputs:
5-
pullRequestJSON:
5+
pull_request_json:
66
description: String that contain JSON payload for `pull_request` event.
77
required: true
88
type: string
99
secrets:
10-
NPM_CANARY_PR_PUBLISH_TOKEN:
10+
npm_canary_pr_publish_token:
1111
description: NPM token to publish canary release.
1212
required: true
1313
jobs:
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v3
1919
with:
2020
persist-credentials: false
21-
ref: ${{ fromJSON(inputs.pullRequestJSON).merge_commit_sha }}
21+
ref: ${{ fromJSON(inputs.pull_request_json).merge_commit_sha }}
2222

2323
- name: Setup Node.js
2424
uses: actions/setup-node@v3
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Modify NPM package to be canary release
6666
env:
67-
PULL_REQUEST_JSON: ${{ inputs.pullRequestJSON }}
67+
PULL_REQUEST_JSON: ${{ inputs.pull_request_json }}
6868
uses: actions/github-script@v6
6969
with:
7070
script: |
@@ -105,7 +105,7 @@ jobs:
105105
- name: Publish NPM package
106106
run: npm publish --ignore-scripts ./npmDist
107107
env:
108-
NODE_AUTH_TOKEN: ${{ secrets.NPM_CANARY_PR_PUBLISH_TOKEN }}
108+
NODE_AUTH_TOKEN: ${{ secrets.npm_canary_pr_publish_token }}
109109

110110
- name: Upload replyMessage
111111
uses: actions/upload-artifact@v3

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: run-benchmark
22
on:
33
workflow_call:
44
inputs:
5-
pullRequestJSON:
5+
pull_request_json:
66
description: String that contain JSON payload for `pull_request` event.
77
required: true
88
type: string
@@ -15,11 +15,11 @@ jobs:
1515
uses: actions/checkout@v3
1616
with:
1717
persist-credentials: false
18-
ref: ${{ fromJSON(inputs.pullRequestJSON).merge_commit_sha }}
18+
ref: ${{ fromJSON(inputs.pull_request_json).merge_commit_sha }}
1919

2020
- name: Deepen cloned repo
2121
env:
22-
BASE_SHA: ${{ fromJSON(inputs.pullRequestJSON).base.sha }}
22+
BASE_SHA: ${{ fromJSON(inputs.pull_request_json).base.sha }}
2323
run: 'git fetch --depth=1 origin "$BASE_SHA:refs/tags/BASE"'
2424

2525
- name: Setup Node.js

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: ubuntu-latest
5757
outputs:
5858
cmd: ${{ steps.parse-cmd.outputs.cmd }}
59-
pullRequestJSON: ${{ steps.parse-cmd.outputs.pullRequestJSON }}
59+
pull_request_json: ${{ steps.parse-cmd.outputs.pull_request_json }}
6060
steps:
6161
- uses: actions/github-script@v6
6262
with:
@@ -76,23 +76,23 @@ jobs:
7676
7777
const { url } = context.payload.issue.pull_request;
7878
const { data } = await github.request(url);
79-
core.setOutput('pullRequestJSON', JSON.stringify(data, null, 2));
79+
core.setOutput('pull_request_json', JSON.stringify(data, null, 2));
8080
8181
cmd-publish-pr-on-npm:
8282
needs: [accept-cmd]
8383
if: needs.accept-cmd.outputs.cmd == 'publish-pr-on-npm'
8484
uses: ./.github/workflows/cmd-publish-pr-on-npm.yml
8585
with:
86-
pullRequestJSON: ${{ needs.accept-cmd.outputs.pullRequestJSON }}
86+
pull_request_json: ${{ needs.accept-cmd.outputs.pull_request_json }}
8787
secrets:
88-
NPM_CANARY_PR_PUBLISH_TOKEN: ${{ secrets.NPM_CANARY_PR_PUBLISH_TOKEN }}
88+
npm_canary_pr_publish_token: ${{ secrets.npm_canary_pr_publish_token }}
8989

9090
cmd-run-benchmark:
9191
needs: [accept-cmd]
9292
if: needs.accept-cmd.outputs.cmd == 'run-benchmark'
9393
uses: ./.github/workflows/cmd-run-benchmark.yml
9494
with:
95-
pullRequestJSON: ${{ needs.accept-cmd.outputs.pullRequestJSON }}
95+
pull_request_json: ${{ needs.accept-cmd.outputs.pull_request_json }}
9696

9797
respond-to-cmd:
9898
needs:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
/node_modules
1414
/reports
1515
/npmDist
16+
/npmEsmDist
1617
/denoDist
1718
/websiteDist

0 commit comments

Comments
 (0)