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

chore: upgrade jest #56909

Merged
merged 28 commits into from
Oct 19, 2023
Merged

chore: upgrade jest #56909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f44dfb0
chore: upgrade `jest`
balazsorban44 Oct 16, 2023
bd5c7de
install jest-environment-jsdom
balazsorban44 Oct 16, 2023
66525d4
revert snapshot change
balazsorban44 Oct 16, 2023
fb0ded9
fix jest types
balazsorban44 Oct 16, 2023
b6cb19c
update comment
balazsorban44 Oct 16, 2023
234c9be
Merge branch 'canary' into chore/upgrade-jest
balazsorban44 Oct 17, 2023
6a5cf4b
Merge branch 'canary' into chore/upgrade-jest
balazsorban44 Oct 17, 2023
d65917c
revert to Jest 28
balazsorban44 Oct 17, 2023
6789d5d
back to 29
balazsorban44 Oct 17, 2023
841e228
update snapshots
balazsorban44 Oct 17, 2023
2ae08c9
revert some lock file changes
balazsorban44 Oct 17, 2023
078b377
update more snapshots
balazsorban44 Oct 17, 2023
8d29d05
update snapshot
balazsorban44 Oct 17, 2023
e8a275d
update snapshots
balazsorban44 Oct 17, 2023
830e9a1
update snapshot
balazsorban44 Oct 17, 2023
ba0822c
more snapshots
balazsorban44 Oct 17, 2023
45b8d3c
more snapshot updates
balazsorban44 Oct 17, 2023
cb5d39b
more snapshot updates
balazsorban44 Oct 17, 2023
7667385
fix snapshot
balazsorban44 Oct 17, 2023
1e31f26
revert
balazsorban44 Oct 17, 2023
d83c1ec
update snapshot
balazsorban44 Oct 17, 2023
32ba2a0
revert
balazsorban44 Oct 17, 2023
03bcec3
revert
balazsorban44 Oct 17, 2023
c42fea1
revert
balazsorban44 Oct 17, 2023
fc115a0
Merge branch 'canary' into chore/upgrade-jest
kodiakhq[bot] Oct 17, 2023
2d4162b
Merge branch 'canary' into chore/upgrade-jest
balazsorban44 Oct 18, 2023
ecea735
Merge branch 'canary' into chore/upgrade-jest
balazsorban44 Oct 19, 2023
4918739
Merge branch 'canary' into chore/upgrade-jest
kodiakhq[bot] Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ const customJestConfig = {
modulePathIgnorePatterns: ['/\\.next/'],
modulePaths: ['<rootDir>/lib'],
transformIgnorePatterns: ['/next[/\\\\]dist/', '/\\.next/'],
globals: {
AbortSignal: global.AbortSignal,
},
Comment on lines -20 to -22
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can get rid of this thanks to https://jestjs.io/blog/2022/04/25/jest-28#all-nodejs-globals

moduleNameMapper: {
'@next/font/(.*)': '@next/font/$1',
},
Expand Down
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"@types/glob": "7.1.1",
"@types/html-validator": "5.0.3",
"@types/http-proxy": "1.17.3",
"@types/jest": "27.4.1",
"@types/jest": "29.5.5",
"@types/node": "20.2.5",
"@types/node-fetch": "2.6.1",
"@types/react": "18.2.28",
Expand Down Expand Up @@ -158,8 +158,9 @@
"image-size": "0.9.3",
"is-animated": "2.0.2",
"isomorphic-unfetch": "3.0.0",
"jest": "27.0.6",
"jest-extended": "1.2.1",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-extended": "4.0.2",
"jest-junit": "16.0.0",
"json5": "2.2.3",
"ky": "0.19.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/font/src/local/loader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('next/font/local loader', () => {

expect(css).toMatchInlineSnapshot(`
"@font-face {
font-feature-settings: \\"smcp\\" on;
font-feature-settings: "smcp" on;
ascent-override: 90%;
font-family: myFont;
src: url(/_next/static/media/my-font.woff2) format('woff2');
Expand Down
4 changes: 2 additions & 2 deletions packages/next/src/build/webpack/loaders/metadata/resolve-route-data.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ describe('resolveRouteData', () => {
},
])
).toMatchInlineSnapshot(`
"<?xml version=\\"1.0\\" encoding=\\"UTF-8\\"?>
<urlset xmlns=\\"http://www.sitemaps.org/schemas/sitemap/0.9\\">
"<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://example.com</loc>
<lastmod>2021-01-01</lastmod>
Expand Down
8 changes: 4 additions & 4 deletions packages/next/src/client/components/router-reducer/fill-cache-with-data-property.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ describe('fillCacheWithDataProperty', () => {
)

expect(cache).toMatchInlineSnapshot(`
Object {
{
"data": null,
"parallelRoutes": Map {
"children" => Map {
"linking" => Object {
"linking" => {
"data": null,
"parallelRoutes": Map {
"children" => Map {
"" => Object {
"" => {
"data": null,
"parallelRoutes": Map {},
"status": "READY",
Expand All @@ -96,7 +96,7 @@ describe('fillCacheWithDataProperty', () => {
Linking
</React.Fragment>,
},
"dashboard" => Object {
"dashboard" => {
"data": Promise {
"status": "pending",
},
Expand Down