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

feat: support Jest 27 #926

Merged
merged 1 commit into from
May 27, 2021
Merged

feat: support Jest 27 #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [12.x, 14.x, 15.x, 16.x]
node-version: [12.x, 14.x]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
needs: prepare-yarn-cache
Expand Down
2 changes: 1 addition & 1 deletion e2e/with-babel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"dependencies": {
"@babel/core": "^7.13.15",
"@babel/preset-env": "^7.13.15",
"babel-jest": "27.0.0-next.8"
"babel-jest": "^27.0.0"
},
"jest": {
"globals": {
Expand Down
5,135 changes: 1,875 additions & 3,260 deletions e2e/with-babel/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

1,263 changes: 643 additions & 620 deletions examples/example-app-v10/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/example-app-v10/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/compiler-cli": "~10.2.5",
"@angular/language-service": "~10.2.5",
"@types/jest": "^26.0.23",
"jest": "^27.0.0-next.9",
"jest": "^27.0.0",
"ts-node": "^9.1.1",
"typescript": "~4.0.7"
}
Expand Down
1,233 changes: 610 additions & 623 deletions examples/example-app-v11/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/example-app-v11/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/compiler-cli": "~11.2.10",
"@types/jest": "^26.0.23",
"@types/node": "^12.11.1",
"jest": "^27.0.0-next.9",
"jest": "^27.0.0",
"ts-node": "~8.3.0",
"typescript": "~4.1.5"
}
Expand Down
1,237 changes: 609 additions & 628 deletions examples/example-app-v12/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/example-app-v12/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/compiler-cli": "~12.0.0",
"@types/jest": "^26.0.23",
"@types/node": "^12.11.1",
"jest": "^27.0.0-next.9",
"jest": "^27.0.0",
"ts-node": "~8.3.0",
"typescript": "~4.2.4"
}
Expand Down
1,275 changes: 649 additions & 626 deletions examples/example-app-v9/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/example-app-v9/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@angular/compiler-cli": "~9.1.13",
"@angular/language-service": "~9.1.13",
"@types/jest": "^26.0.23",
"jest": "^27.0.0-next.9",
"jest": "^27.0.0",
"ts-node": "^9.1.1",
"typescript": "~3.8.3"
}
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
"update-examples": "node scripts/upgrade-examples-deps.js"
},
"dependencies": {
"jest-environment-jsdom": "27.0.0-next.9",
"pretty-format": "27.0.0-next.9",
"ts-jest": "27.0.0-next.12"
"jest-environment-jsdom": "^27.0.0",
"pretty-format": "^27.0.0",
"ts-jest": "^27.0.0"
},
"peerDependencies": {
"jest": "27.0.0-next.9"
"jest": "^27.0.0"
},
"optionalDependencies": {
"webpack": "5.36.2"
Expand All @@ -70,9 +70,9 @@
"@angular/platform-browser-dynamic": "^11.2.12",
"@commitlint/cli": "^12.1.1",
"@commitlint/config-angular": "^12.1.1",
"@jest/globals": "27.0.0-next.9",
"@jest/transform": "27.0.0-next.9",
"@jest/types": "27.0.0-next.8",
"@jest/globals": "^27.0.1",
"@jest/transform": "^27.0.1",
"@jest/types": "^27.0.1",
"@types/jest": "^26.0.23",
"@types/node": "^14.14.44",
"@types/semver": "^7.3.5",
Expand All @@ -90,7 +90,7 @@
"glob": "^7.1.6",
"glob-gitignore": "^1.0.14",
"husky": "^6.0.0",
"jest": "27.0.0-next.9",
"jest": "^27.0.1",
"jest-snapshot-serializer-raw": "^1.2.0",
"lint-staged": "^10.5.4",
"pinst": "^2.1.6",
Expand Down
8 changes: 7 additions & 1 deletion scripts/upgrade-examples-deps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ exampleAppsToRun.forEach((projectPath, i) => {

execa.sync('npm', ['ci']);

const args = ['update', `@angular/cli@${ngVersion}`, `@angular/core@${ngVersion}`, 'jest@next', '@types/jest@latest'];
const args = [
'update',
`@angular/cli@${ngVersion}`,
`@angular/core@${ngVersion}`,
'jest@latest',
'@types/jest@latest',
];
if (ngVersion !== 9 && ngVersion !== 10) {
args.push('zone.js@latest');
}
Expand Down
Loading