Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge v3.2.2 backport into main #356

Merged
merged 14 commits into from
Jul 15, 2024
26 changes: 24 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,28 @@
"@babel/preset-flow"
],
"plugins": [
"@babel/plugin-transform-flow-strip-types"
]
"@babel/plugin-transform-flow-strip-types",
],
"env": {
"test": {
"plugins": [
["module-resolver", {
"root": ["./__tests__"],
"alias": {
"^axobject-query/src/(.*)": "./lib/\\1",
}
}]
]
},
"development": {
"plugins": [
["module-resolver", {
"root": ["./src"],
"alias": {
"^axobject-query/src/(.*)": "./src/\\1",
}
}]
]
},
}
}
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

13 changes: 11 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@
"plugins": [
"flowtype"
],
"ignorePatterns": [
"lib/",
"node_modules/",
"reports/",
"node_modules.nosync/",
"__tests-built__",
"coverage/",
".nyc_output/",
"flow-typed/",
"flow/",
],
"overrides": [
{
"files": [
Expand All @@ -25,10 +36,8 @@
],
"extends": [
"eslint:recommended",
"plugin:jest/recommended"
],
"env": {
"mocha": true,
"node": true
}
}
Expand Down
88 changes: 31 additions & 57 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,80 +1,54 @@
name: CI
on:
push:
branches:
- main
- "!dependabot/**"
pull_request:
workflow_dispatch:
[push, pull_request, workflow_dispatch]

jobs:
jest:
name: Jest (Node v${{ matrix.node }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node: [14, 16, 17]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Load Node version ${{ matrix.node }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: npm
- name: Npm Install
run: npm ci
- name: Run Jest
run: npm run test:ci
- name: Run Coveralls
uses: coverallsapp/[email protected]
if: matrix.node == '16'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./reports/lcov.info
tests:
uses: ljharb/actions/.github/workflows/node.yml@a840bfaa7e24d260a9f451baa97ca172fdb327af
with:
range: '>= 0.8'
type: majors
build-command: npm run build:tests
build-output-dir: __tests-built__,lib
command: npm run tests-built

flow:
name: Flow type checking
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Load Node
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
with:
cache: npm
- name: Npm Install
run: npm ci
use-npm-ci: true
- name: Flow type check
run: npm run flow

eslint:
name: ESLint (Node v${{ matrix.node }})
name: ESLint
runs-on: ubuntu-latest
strategy:
matrix:
node: [16]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Load Node version ${{ matrix.node }}
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
with:
node-version: ${{ matrix.node }}
cache: npm
- name: Npm Install
run: npm ci
use-npm-ci: true
- name: Run ESLint
run: npm run lint

diff-breakUpAriaJSON:
name: Compare JSON to src output
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Load Node version
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: ljharb/actions/node/install@a840bfaa7e24d260a9f451baa97ca172fdb327af
with:
cache: npm
- name: Npm Install
run: npm ci
use-npm-ci: true
- name: Run diff check for the breakUpAriaJSON script
run: node scripts/buildModelModules.js && git diff --exit-code -- src

finisher:
name: all checks
needs: [tests, flow, eslint, diff-breakUpAriaJSON]
runs-on: ubuntu-latest
steps:
- run: true

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ node_modules/
lib/
reports/
docs/
.nyc_output/
coverage/
__tests-built__/
13 changes: 13 additions & 0 deletions .nycrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"all": true,
"check-coverage": false,
"reporter": ["text-summary", "text", "html", "json"],
"lines": 86,
"statements": 85.93,
"functions": 82.43,
"branches": 76.06,
"exclude": [
"coverage",
"test"
]
}
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,20 @@ Commit 22915be contains a substantial audit and update of the project to match t

- f250e99 Update package-lock.json

## 3.2.2

This release restores backwards compatibility that was broken in v3.2.0.

- 3a89d8c [Deps] switch from dequal to deep-equal-json

## 3.2.3

- b14728f Remove deep-equal-json as a dep from the project (#357)

## 3.2.4

- 93366fa [meta] add `prepack` step so build is not forgotten

## 4.0.0

This major release requires Node 6+.
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
**NOTICE: The API for AXObject Query is very much under development until a major version release. Please be aware that data structures might change in minor version releases before 1.0.0 is released.**

# AXObject Query

![CI](https://github.com/A11yance/axobject-query/workflows/CI/badge.svg)
Expand Down
Loading
Loading