Skip to content

Commit eb2aa24

Browse files
committed
Merge tag 'v3.2.4' into main
2 parents 39030e7 + a1bd6bf commit eb2aa24

15 files changed

+8111
-7906
lines changed

.babelrc

+24-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
"@babel/preset-flow"
55
],
66
"plugins": [
7-
"@babel/plugin-transform-flow-strip-types"
8-
]
7+
"@babel/plugin-transform-flow-strip-types",
8+
],
9+
"env": {
10+
"test": {
11+
"plugins": [
12+
["module-resolver", {
13+
"root": ["./__tests__"],
14+
"alias": {
15+
"^axobject-query/src/(.*)": "./lib/\\1",
16+
}
17+
}]
18+
]
19+
},
20+
"development": {
21+
"plugins": [
22+
["module-resolver", {
23+
"root": ["./src"],
24+
"alias": {
25+
"^axobject-query/src/(.*)": "./src/\\1",
26+
}
27+
}]
28+
]
29+
},
30+
}
931
}

.eslintrc

-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
],
2626
"extends": [
2727
"eslint:recommended",
28-
"plugin:jest/recommended"
2928
],
3029
"env": {
31-
"mocha": true,
3230
"node": true
3331
}
3432
}

.github/workflows/test.yml

+23-57
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,46 @@
11
name: CI
22
on:
3-
push:
4-
branches:
5-
- main
6-
- "!dependabot/**"
7-
pull_request:
8-
workflow_dispatch:
3+
[push, pull_request, workflow_dispatch]
4+
95
jobs:
10-
jest:
11-
name: Jest (Node v${{ matrix.node }})
12-
runs-on: ubuntu-latest
13-
strategy:
14-
fail-fast: false
15-
matrix:
16-
node: [14, 16, 17]
17-
steps:
18-
- name: Checkout
19-
uses: actions/checkout@v3
20-
- name: Load Node version ${{ matrix.node }}
21-
uses: actions/setup-node@v3
22-
with:
23-
node-version: ${{ matrix.node }}
24-
cache: npm
25-
- name: Npm Install
26-
run: npm ci
27-
- name: Run Jest
28-
run: npm run test:ci
29-
- name: Run Coveralls
30-
uses: coverallsapp/[email protected]
31-
if: matrix.node == '16'
32-
with:
33-
github-token: ${{ secrets.GITHUB_TOKEN }}
34-
path-to-lcov: ./reports/lcov.info
6+
tests:
7+
uses: ljharb/actions/.github/workflows/node.yml@a840bfaa7e24d260a9f451baa97ca172fdb327af
8+
with:
9+
range: '>= 0.8'
10+
type: majors
11+
build-command: npm run build:tests
12+
build-output-dir: __tests-built__,lib
13+
command: npm run tests-built
14+
3515
flow:
3616
name: Flow type checking
3717
runs-on: ubuntu-latest
3818
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v3
41-
- name: Load Node
42-
uses: actions/setup-node@v3
19+
- uses: actions/checkout@v4
20+
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
4321
with:
44-
cache: npm
45-
- name: Npm Install
46-
run: npm ci
22+
use-npm-ci: true
4723
- name: Flow type check
4824
run: npm run flow
25+
4926
eslint:
50-
name: ESLint (Node v${{ matrix.node }})
27+
name: ESLint
5128
runs-on: ubuntu-latest
52-
strategy:
53-
matrix:
54-
node: [16]
5529
steps:
56-
- name: Checkout
57-
uses: actions/checkout@v3
58-
- name: Load Node version ${{ matrix.node }}
59-
uses: actions/setup-node@v3
30+
- uses: actions/checkout@v4
31+
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
6032
with:
61-
node-version: ${{ matrix.node }}
62-
cache: npm
63-
- name: Npm Install
64-
run: npm ci
33+
use-npm-ci: true
6534
- name: Run ESLint
6635
run: npm run lint
36+
6737
diff-breakUpAriaJSON:
6838
name: Compare JSON to src output
6939
runs-on: ubuntu-latest
7040
steps:
71-
- name: Checkout
72-
uses: actions/checkout@v3
73-
- name: Load Node version
74-
uses: actions/setup-node@v3
41+
- uses: actions/checkout@v4
42+
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
7543
with:
76-
cache: npm
77-
- name: Npm Install
78-
run: npm ci
44+
use-npm-ci: true
7945
- name: Run diff check for the breakUpAriaJSON script
8046
run: node scripts/buildModelModules.js && git diff --exit-code -- src

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ node_modules/
22
lib/
33
reports/
44
docs/
5+
.nyc_output/
6+
coverage/
7+
__tests-built__/

.nycrc

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"all": true,
3+
"check-coverage": false,
4+
"reporter": ["text-summary", "text", "html", "json"],
5+
"lines": 86,
6+
"statements": 85.93,
7+
"functions": 82.43,
8+
"branches": 76.06,
9+
"exclude": [
10+
"coverage",
11+
"test"
12+
]
13+
}

CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,20 @@ Commit 22915be contains a substantial audit and update of the project to match t
100100

101101
- f250e99 Update package-lock.json
102102

103+
## 3.2.2
104+
105+
This release restores backwards compatibility that was broken in v3.2.0.
106+
107+
- 3a89d8c [Deps] switch from dequal to deep-equal-json
108+
109+
## 3.2.3
110+
111+
- b14728f Remove deep-equal-json as a dep from the project (#357)
112+
113+
## 3.2.4
114+
115+
- 93366fa [meta] add `prepack` step so build is not forgotten
116+
103117
## 4.0.0
104118

105119
This major release requires Node 6+.

0 commit comments

Comments
 (0)