Skip to content

Commit a065236

Browse files
mbraakmbraak
committed
Merge branch 'dev' into jquery-4
2 parents 01950b6 + f5794a6 commit a065236

28 files changed

+2279
-1835
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ jobs:
1111

1212
steps:
1313
- name: Check out repository code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Setup node
16-
uses: actions/setup-node@v4
16+
uses: actions/setup-node@v5
1717
with:
18-
node-version: "20"
18+
node-version: "22"
1919
- name: Install pnpm
2020
run: npm install -g pnpm
2121
- name: Get pnpm store directory
2222
id: pnpm-cache
2323
run: |
24-
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
24+
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
2525
- uses: actions/cache@v4
2626
name: Setup pnpm cache
2727
with:
28-
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
29-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
30-
restore-keys: |
31-
${{ runner.os }}-pnpm-store-
28+
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
29+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
30+
restore-keys: |
31+
${{ runner.os }}-pnpm-store-
3232
- uses: actions/cache@v4
3333
name: Setup Playwright browsers cache
3434
with:
35-
path: /home/runner/.cache/ms-playwright/
36-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
37-
restore-keys: |
38-
${{ runner.os }}-playwright-
35+
path: /home/runner/.cache/ms-playwright/
36+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
37+
restore-keys: |
38+
${{ runner.os }}-playwright-
3939
- name: Install packages
4040
run: |
4141
pnpm install
@@ -49,9 +49,9 @@ jobs:
4949
run: |
5050
pnpm run tsc
5151
- name: Clean coverage
52-
run: rm -rf .nyc_output && npx jest --clearCache
53-
- name: Run jest tests
54-
run: pnpm run jest
52+
run: rm -rf .nyc_output && rm -rf node_modules/.vite
53+
- name: Run vitest tests
54+
run: pnpm run vitest
5555
- name: Playwright install
5656
run: npx playwright install chromium
5757
- name: Copy vendor files
@@ -63,13 +63,13 @@ jobs:
6363
if: always()
6464
uses: actions/upload-artifact@v4
6565
with:
66-
if-no-files-found: ignore
67-
name: screenshots
68-
path: test-results/
66+
if-no-files-found: ignore
67+
name: screenshots
68+
path: test-results/
6969
- name: Merge coverage
70-
run: cp jest-coverage/coverage-final.json .nyc_output/coverage_jsdom.json
70+
run: cp js-coverage/coverage-final.json .nyc_output/coverage_jsdom.json
7171
- name: Codecov
7272
uses: codecov/codecov-action@v5
7373
with:
74-
directory: .nyc_output
75-
verbose: true
74+
directory: .nyc_output
75+
verbose: true

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: "CodeQL"
22

33
on:
4-
push:
5-
branches: [dev]
6-
pull_request:
7-
branches: [dev]
4+
push:
5+
branches: [dev]
6+
pull_request:
7+
branches: [dev]
88

99
jobs:
1010
analyze:
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Initialize CodeQL
2424
uses: github/codeql-action/init@v3

‎.github/workflows/size.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77

88
steps:
99
- name: Check out repository code
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v5
1111
- name: Setup node
12-
uses: actions/setup-node@v4
12+
uses: actions/setup-node@v5
1313
with:
1414
node-version: "20"
1515
- name: Install pnpm

‎.github/workflows/static.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
name: Deploy static content to Pages
22

33
on:
4-
push:
5-
branches: ["master", "test-docs"]
6-
workflow_dispatch:
4+
push:
5+
branches: ["master", "test-docs"]
6+
workflow_dispatch:
77

88
permissions:
9-
contents: read
10-
pages: write
11-
id-token: write
9+
contents: read
10+
pages: write
11+
id-token: write
1212

1313
concurrency:
14-
group: "pages"
15-
cancel-in-progress: false
14+
group: "pages"
15+
cancel-in-progress: false
1616

1717
jobs:
18-
deploy:
19-
environment:
20-
name: github-pages
21-
url: ${{ steps.deployment.outputs.page_url }}
22-
env:
23-
BUNDLE_GEMFILE: ${{ github.workspace }}/docs/Gemfile
24-
runs-on: ubuntu-latest
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v4
28-
- name: Setup ruby
29-
uses: ruby/setup-ruby@v1
30-
with:
31-
ruby-version: '3.3.6'
32-
- name: Setup node
33-
uses: actions/setup-node@v4
34-
with:
35-
node-version: 20
36-
- name: Install pnpm
37-
run: npm install -g pnpm
38-
- name: Install ruby packages
39-
working-directory: ./docs
40-
run: bundle
41-
- name: Install javascript packages
42-
working-directory: ./docs
43-
run: pnpm install
44-
- name: Build docs css
45-
working-directory: ./docs
46-
run: pnpm run build_docs_css
47-
- name: Jekyll Build
48-
working-directory: ./docs
49-
run: bundle exec jekyll build
50-
- name: Setup Pages
51-
uses: actions/configure-pages@v5
52-
- name: Upload artifact
53-
uses: actions/upload-pages-artifact@v3
54-
with:
55-
path: './docs/_site'
56-
- name: Deploy to GitHub Pages
57-
id: deployment
58-
uses: actions/deploy-pages@v4
18+
deploy:
19+
environment:
20+
name: github-pages
21+
url: ${{ steps.deployment.outputs.page_url }}
22+
env:
23+
BUNDLE_GEMFILE: ${{ github.workspace }}/docs/Gemfile
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v5
28+
- name: Setup ruby
29+
uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: "3.4.5"
32+
- name: Setup node
33+
uses: actions/setup-node@v5
34+
with:
35+
node-version: 22
36+
- name: Install pnpm
37+
run: npm install -g pnpm
38+
- name: Install ruby packages
39+
working-directory: ./docs
40+
run: bundle
41+
- name: Install javascript packages
42+
working-directory: ./docs
43+
run: pnpm install
44+
- name: Build docs css
45+
working-directory: ./docs
46+
run: pnpm run build_docs_css
47+
- name: Jekyll Build
48+
working-directory: ./docs
49+
run: bundle exec jekyll build
50+
- name: Setup Pages
51+
uses: actions/configure-pages@v5
52+
- name: Upload artifact
53+
uses: actions/upload-pages-artifact@v4
54+
with:
55+
path: "./docs/_site"
56+
- name: Deploy to GitHub Pages
57+
id: deployment
58+
uses: actions/deploy-pages@v4

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docs/static/documentation.css
99
docs/static/example.css
1010
docs/static/vendor/
1111
docs/tree.jquery.js
12-
jest-coverage/
12+
js-coverage/
1313
lib/
1414
node_modules/
1515
test-results/

‎config/babel.config.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
2-
"presets": ["@babel/preset-typescript", "@babel/preset-env"],
2+
"presets": [
3+
"@babel/preset-typescript",
4+
[
5+
"@babel/preset-env",
6+
{
7+
"bugfixes": true
8+
}
9+
]
10+
],
311
"env": {
412
"test": {
513
"presets": [
614
"@babel/preset-typescript",
715
"@babel/preset-env"
816
]
917
}
10-
}
18+
},
19+
"targets": "defaults"
1120
}

‎config/babel.coverage.config.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
{
2-
"presets": ["@babel/preset-typescript", "@babel/preset-env"],
3-
"plugins": ["istanbul"]
2+
"presets": [
3+
"@babel/preset-typescript",
4+
[
5+
"@babel/preset-env",
6+
{
7+
"bugfixes": true
8+
}
9+
]
10+
],
11+
"plugins": ["istanbul"],
12+
"targets": "defaults"
413
}

‎config/jest.config.js‎

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

‎config/vitest.config.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { defineConfig } from "vitest/config";
2+
3+
export default defineConfig({
4+
test: {
5+
coverage: {
6+
exclude: ['src/playwright'],
7+
include: ['src/**'],
8+
provider: "istanbul",
9+
reporter: ["json"],
10+
reportsDirectory: "js-coverage"
11+
},
12+
environment: "jsdom",
13+
globals: true,
14+
include: ['src/test/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
15+
setupFiles: [
16+
"./src/test/support/setupTests.ts",
17+
"givens/setup.js",
18+
"jest-extended/all",
19+
],
20+
},
21+
});

‎docs/.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.4.5

0 commit comments

Comments
 (0)