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.

Sign up for GitHub

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

Jump to bottom

Non-breaking: upgrading typescript-eslint group and testing Jest 30 #1627

Merged
merged 8 commits into from
Mar 19, 2024
Merged

Non-breaking: upgrading typescript-eslint group and testing Jest 30 #1627

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e24af81
Adjusting triggering branches.
RobinTail Mar 18, 2024
3c172cc
Bump the typescript-eslint group with 2 updates (#1625)
dependabot[bot] Mar 18, 2024
e2fb092
Merge branch 'master' into prep-v18
RobinTail Mar 18, 2024
50a5373
Supporting `jest` v30 (#1542)
RobinTail Mar 18, 2024
65f679a
Ignoring engines for `devDependencies` only (#1633)
RobinTail Mar 19, 2024
6c8bc1f
Rev: triggering branches
RobinTail Mar 19, 2024
4cc642e
Rev: support of Jest 30 (will wait for prod ready release)
RobinTail Mar 19, 2024
3b7a6e9
CI: adjusting comment and making todo.
RobinTail Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
schedule:
- cron: '26 8 * * 1'

Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ name: Node.js CI

on:
push:
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.0.0, 18.6.0, 18.x, 20.0.0, 20.1.0, 20.x]
node-version: [18.0.0, 18.6.0, 18.12.0, 18.x, 20.0.0, 20.1.0, 20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- name: Get yarn cache dir
Expand All @@ -23,6 +23,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Node.js ${{ matrix.node-version }}
id: setup-node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -34,7 +35,12 @@ jobs:
path: ${{ steps.yarnCache.outputs.dir }}
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
- name: Install dependencies
run: yarn install
# Experimental: Install prod dependencies and then the rest with ignoring engines
run: |
npm pkg delete devDependencies
yarn install
git checkout -- .
yarn install --ignore-engines
- name: Lint
run: yarn lint
- name: Test
Expand All @@ -52,7 +58,15 @@ jobs:
run: yarn test:cjs
- name: ESM test
run: yarn test:esm
- name: Check Jest 30 compatibility
uses: madhead/semver-utils@v4
id: jest30compat
with:
version: ${{ steps.setup-node.outputs.node-version }}
satisfies: '>=18.12.0'
lenient: false # require to parse or fail
- name: Compatibility test
if: steps.jest30compat.outputs.satisfies == 'true'
run: yarn test:compat
- name: Issue 952 # see https://github.com/RobinTail/express-zod-api/issues/952
run: yarn test:952
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/swagger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: OpenAPI Validation

on:
push:
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
branches: [ master, v14, v15, v16 ]
branches: [ master, v15, v16, v17, prep-v18 ]
RobinTail marked this conversation as resolved.
Show resolved Hide resolved


jobs:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"express": "^4.18.2",
"express-fileupload": "^1.4.3",
"http-errors": "^2.0.0",
"jest": ">=28 <30",
"jest": ">=28 <31",
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
"prettier": "^3.1.0",
"typescript": "^5.1.3",
"vitest": "^1.0.4",
Expand Down
4 changes: 2 additions & 2 deletions tests/compat/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"zod": "^3"
},
"devDependencies": {
"jest": "^29.7.0",
"@types/jest": "^29.5.11",
"jest": "^30.0.0-alpha.3",
"@types/jest": "^29.5.12",
RobinTail marked this conversation as resolved.
Show resolved Hide resolved
"@swc/core": "^1.3.100",
"@swc/jest": "^0.2.29"
}
Expand Down
98 changes: 49 additions & 49 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,15 +753,15 @@
integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==

"@typescript-eslint/eslint-plugin@^7.1.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz#5a5fcad1a7baed85c10080d71ad901f98c38d5b7"
integrity sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.3.0.tgz#0435a72422be2842ba302acf022a4104752a614d"
integrity sha512-e65ii0Y/jkqX3GXSBM7v9qt9ufxd4omcWyPVVC/msq/hP+hYC6CddLRvlvclni+u7UcaNYT/QhBYlaMHaR2ixw==
dependencies:
"@eslint-community/regexpp" "^4.5.1"
"@typescript-eslint/scope-manager" "7.2.0"
"@typescript-eslint/type-utils" "7.2.0"
"@typescript-eslint/utils" "7.2.0"
"@typescript-eslint/visitor-keys" "7.2.0"
"@typescript-eslint/scope-manager" "7.3.0"
"@typescript-eslint/type-utils" "7.3.0"
"@typescript-eslint/utils" "7.3.0"
"@typescript-eslint/visitor-keys" "7.3.0"
debug "^4.3.4"
graphemer "^1.4.0"
ignore "^5.2.4"
Expand All @@ -770,72 +770,72 @@
ts-api-utils "^1.0.1"

"@typescript-eslint/parser@^7.1.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a"
integrity sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==
dependencies:
"@typescript-eslint/scope-manager" "7.2.0"
"@typescript-eslint/types" "7.2.0"
"@typescript-eslint/typescript-estree" "7.2.0"
"@typescript-eslint/visitor-keys" "7.2.0"
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.3.0.tgz#ef28a617aa420352f67fc9289d5488085d9a34c0"
integrity sha512-OZcvH8zipGILuxJmtFgzjAJ+bOpWidzEppIRsT2P4ZUrizU0EsPt4hhzDn3lNfM1Hv7slZPTEQGKjUEn/ftQYA==
dependencies:
"@typescript-eslint/scope-manager" "7.3.0"
"@typescript-eslint/types" "7.3.0"
"@typescript-eslint/typescript-estree" "7.3.0"
"@typescript-eslint/visitor-keys" "7.3.0"
debug "^4.3.4"

"@typescript-eslint/scope-manager@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da"
integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==
"@typescript-eslint/scope-manager@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.3.0.tgz#17ded66b72fcd9f582852f093722376d236e1842"
integrity sha512-KlG7xH3J/+nHpZRcYeskO5QVJCnnssxYKBlrj3MoyMONihn3P4xu5jIelrS5YWvBjbytgHmFkzjDApranoYkNA==
dependencies:
"@typescript-eslint/types" "7.2.0"
"@typescript-eslint/visitor-keys" "7.2.0"
"@typescript-eslint/types" "7.3.0"
"@typescript-eslint/visitor-keys" "7.3.0"

"@typescript-eslint/type-utils@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz#7be5c30e9b4d49971b79095a1181324ef6089a19"
integrity sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==
"@typescript-eslint/type-utils@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.3.0.tgz#a818129ce42a8ee1f3706fc6ed4c3f186f14c8bd"
integrity sha512-TyQ19ydo248eFjTfHFSvZbxalFUOxU9o2M6SUk3wOA0yRF1ZiB2VP5iaoLrGKcg7TyUxS4knYIHnE55ih82Cfg==
dependencies:
"@typescript-eslint/typescript-estree" "7.2.0"
"@typescript-eslint/utils" "7.2.0"
"@typescript-eslint/typescript-estree" "7.3.0"
"@typescript-eslint/utils" "7.3.0"
debug "^4.3.4"
ts-api-utils "^1.0.1"

"@typescript-eslint/types@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f"
integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==
"@typescript-eslint/types@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.3.0.tgz#a8bdd65f1b2a92ebc87d6f73a3015863b147fde4"
integrity sha512-oYCBkD0xVxzmZZmYiIWVewyy/q/ugq7PPm4pHhE1IgcT062i96G0Ww3gd8BvUYpk2yvg95q00Hj2CHRLjAuZBA==

"@typescript-eslint/typescript-estree@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556"
integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==
"@typescript-eslint/typescript-estree@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.0.tgz#e16a4def7db3386b5ef3502daec27b89afbdf9c0"
integrity sha512-UF85+bInQZ3olhI/zxv0c2b2SMuymn3t6/lkRkSB239HHxFmPSlmcggOKAjYzqRCdtqhPDftpsV1LlDH66AXrA==
dependencies:
"@typescript-eslint/types" "7.2.0"
"@typescript-eslint/visitor-keys" "7.2.0"
"@typescript-eslint/types" "7.3.0"
"@typescript-eslint/visitor-keys" "7.3.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
minimatch "9.0.3"
semver "^7.5.4"
ts-api-utils "^1.0.1"

"@typescript-eslint/utils@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.2.0.tgz#fc8164be2f2a7068debb4556881acddbf0b7ce2a"
integrity sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==
"@typescript-eslint/utils@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.3.0.tgz#79f59f01a5678947f1bbf656da1c5ddb0e3bc2c7"
integrity sha512-7PKIDoe2ppR1SK56TLv7WQXrdHqEiueVwLVIjdSR4ROY2LprmJenf4+tT8iJIfxrsPzjSJGNeQ7GVmfoYbqrhw==
dependencies:
"@eslint-community/eslint-utils" "^4.4.0"
"@types/json-schema" "^7.0.12"
"@types/semver" "^7.5.0"
"@typescript-eslint/scope-manager" "7.2.0"
"@typescript-eslint/types" "7.2.0"
"@typescript-eslint/typescript-estree" "7.2.0"
"@typescript-eslint/scope-manager" "7.3.0"
"@typescript-eslint/types" "7.3.0"
"@typescript-eslint/typescript-estree" "7.3.0"
semver "^7.5.4"

"@typescript-eslint/visitor-keys@7.2.0":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e"
integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==
"@typescript-eslint/visitor-keys@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.0.tgz#a313b8436575d971ad570353831c0b088721bd64"
integrity sha512-Gz8Su+QjOI5qP8UQ74VqKaTt/BLy23IhCCHLbYxhmNzHCGFHrvfgq4hISZvuqQ690ubkD0746qLcWC647nScuQ==
dependencies:
"@typescript-eslint/types" "7.2.0"
"@typescript-eslint/types" "7.3.0"
eslint-visitor-keys "^3.4.1"

"@ungap/structured-clone@^1.2.0":
Expand Down
Loading