Skip to content

Commit 68280b7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into add-static-text-parser
2 parents 96f630f + 41d21eb commit 68280b7

File tree

391 files changed

+30741
-4732
lines changed

Some content is hidden

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

391 files changed

+30741
-4732
lines changed

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
website/build
2+
website/.docusaurus
3+
website/.cache-loader
4+
website/**/*.mdx

.eslintrc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"consistent-this": "error",
3232
"prefer-arrow-callback": "error",
3333
"prefer-const": "error",
34-
"arrow-parens": ["error", "as-needed"],
3534
"arrow-body-style": ["error", "as-needed"],
3635
"no-var": "error",
3736
"no-use-before-define": "error",
@@ -70,6 +69,18 @@
7069
"parserOptions": {
7170
"sourceType": "module"
7271
}
72+
},
73+
{
74+
"files": ["**/**/*.test.*"],
75+
"rules": {
76+
"arrow-parens": ["error", "always"]
77+
}
78+
},
79+
{
80+
"files": ["**/*.mjs"],
81+
"parserOptions": {
82+
"sourceType": "module"
83+
}
7384
}
7485
]
7586
}

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
website/** linguist-documentation

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7+
- package-ecosystem: "npm"
8+
directory: "/website"
9+
schedule:
10+
interval: "daily"

.github/workflows/benchmark.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
node-version: [18.x]
21+
node-version: [20.x]
2222
mysql-version: ["mysql:8.0.18"]
2323
use-compression: [0]
2424
use-tls: [0]
2525

2626
name: Performance regression check
2727

2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030

3131
# - name: Set up MySQL
32-
# run: docker run -d -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_ROOT_PASSWORD=${{ env.MYSQL_PASSWORD }} -e MYSQL_DATABASE=${{ env.MYSQL_DATABASE }} -v $PWD/mysqldata:/var/lib/mysql/ -v $PWD/examples/custom-conf:/etc/mysql/conf.d -v $PWD/examples/ssl/certs:/certs -p ${{ env.MYSQL_PORT }}:3306 ${{ matrix.mysql-version }}
32+
# run: docker run -d -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_ROOT_PASSWORD=${{ env.MYSQL_PASSWORD }} -e MYSQL_DATABASE=${{ env.MYSQL_DATABASE }} -v $PWD/mysqldata:/var/lib/mysql/ -v $PWD/test/fixtures/custom-conf:/etc/mysql/conf.d -v $PWD/test/fixtures/ssl/certs:/certs -p ${{ env.MYSQL_PORT }}:3306 ${{ matrix.mysql-version }}
3333
- name: Set up Node.js ${{ matrix.node-version }}
34-
uses: actions/setup-node@v2
34+
uses: actions/setup-node@v4
3535
with:
3636
node-version: ${{ matrix.node-version }}
37-
37+
3838
- name: Cache dependencies
39-
uses: actions/cache@v2
39+
uses: actions/cache@v4
4040
with:
4141
path: ~/.npm
42-
key: npm-${{ hashFiles('package-lock.json') }}
43-
restore-keys: npm-
44-
42+
key: npm-linux-${{ hashFiles('package-lock.json') }}
43+
restore-keys: npm-linux-
44+
4545
- name: Install npm dependencies
4646
run: npm ci
4747

@@ -68,4 +68,4 @@ jobs:
6868
alert-threshold: '150%'
6969
github-token: ${{ secrets.GITHUB_TOKEN }}
7070
comment-on-alert: true
71-
alert-comment-cc-users: '@sidorares'
71+
alert-comment-cc-users: '@sidorares'

.github/workflows/ci-bun.yml

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

.github/workflows/ci-coverage.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: CI - Coverage
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [ main ]
7+
8+
workflow_dispatch:
9+
10+
env:
11+
MYSQL_PORT: 3306
12+
MYSQL_USER: root
13+
MYSQL_DATABASE: test
14+
15+
jobs:
16+
coverage:
17+
permissions: write-all
18+
runs-on: ubuntu-latest
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
node-version: [20.x]
23+
mysql-version: ["mysql:8.0.33"]
24+
use-compression: [0]
25+
use-tls: [0]
26+
mysql_connection_url_key: [""]
27+
env:
28+
MYSQL_CONNECTION_URL: ${{ secrets[matrix.mysql_connection_url_key] }}
29+
30+
name: Coverage ${{ matrix.node-version }} - DB ${{ matrix.mysql-version }}${{ matrix.mysql_connection_url_key }} - SSL=${{matrix.use-tls}} Compression=${{matrix.use-compression}}
31+
32+
steps:
33+
- uses: actions/checkout@v4
34+
35+
- name: Delete artifacts
36+
uses: jimschubert/delete-artifacts-action@v1
37+
with:
38+
log_level: 'debug'
39+
min_bytes: '0'
40+
pattern: '\.xml'
41+
42+
- name: Set up MySQL
43+
if: ${{ matrix.mysql-version }}
44+
run: docker run -d -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_DATABASE=${{ env.MYSQL_DATABASE }} -v $PWD/mysqldata:/var/lib/mysql/ -v $PWD/test/fixtures/custom-conf:/etc/mysql/conf.d -v $PWD/test/fixtures/ssl/certs:/certs -p ${{ env.MYSQL_PORT }}:3306 ${{ matrix.mysql-version }}
45+
46+
- name: Set up Node.js ${{ matrix.node-version }}
47+
uses: actions/setup-node@v4
48+
with:
49+
node-version: ${{ matrix.node-version }}
50+
51+
- name: Cache dependencies
52+
uses: actions/cache@v4
53+
with:
54+
path: ~/.npm
55+
key: npm-linux-${{ hashFiles('package-lock.json') }}
56+
restore-keys: npm-linux-
57+
58+
- name: Install npm dependencies
59+
run: npm ci
60+
61+
- name: Wait mysql server is ready
62+
if: ${{ matrix.mysql-version }}
63+
run: node tools/wait-up.js
64+
65+
- name: Run tests
66+
run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run coverage-test
67+
68+
- name: get list of coverage files
69+
run: echo "coverage-files=`find coverage | grep xml | paste -s -d\; -`" >> $GITHUB_ENV
70+
71+
- name: ReportGenerator
72+
uses: danielpalme/[email protected]
73+
with:
74+
reports: "${{ env.coverage-files }}"
75+
targetdir: '.'
76+
reporttypes: 'Cobertura'
77+
78+
- name: Debug
79+
run: cat Cobertura.xml
80+
81+
- name: Display coverage
82+
uses: ewjoachim/coverage-comment-action@v1
83+
continue-on-error: true
84+
with:
85+
COVERAGE_FILE: "Cobertura.xml"
86+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)