Skip to content

Commit 04c942e

Browse files
committed
Merge branch 'canary' into tsconfig-module-nodenext-node16
2 parents fed2784 + c0986ee commit 04c942e

File tree

9 files changed

+3
-86
lines changed

9 files changed

+3
-86
lines changed

.prettierignore_staged

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
**/_next/**
33
**/dist/**
44
packages/next-swc/crates/**
5-
packages/next/compiled/**/*
5+
packages/next/src/compiled/**/*
66
packages/next/bundles/webpack/packages/*.runtime.js
77
lerna.json
88
packages/next-codemod/transforms/__testfixtures__/**/*

examples/with-jest-babel/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"@testing-library/react": "13.2.0",
1818
"@testing-library/user-event": "14.2.0",
1919
"@types/react": "18.0.9",
20+
"@types/testing-library__jest-dom": "5.14.5",
2021
"babel-jest": "28.1.0",
2122
"identity-obj-proxy": "3.0.0",
2223
"jest": "28.1.0",

examples/with-jest/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"@testing-library/react": "13.2.0",
1818
"@testing-library/user-event": "14.2.0",
1919
"@types/react": "18.0.9",
20+
"@types/testing-library__jest-dom": "5.14.5",
2021
"jest": "28.1.0",
2122
"jest-environment-jsdom": "28.1.0",
2223
"typescript": "4.6.4"

test/e2e/app-dir/app-typescript/app/@test/inner/page.tsx

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/e2e/app-dir/app-typescript/app/layout.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/e2e/app-dir/app-typescript/next.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/e2e/app-dir/app-typescript/package.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

test/e2e/app-dir/app-typescript/pages/index.tsx

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/e2e/app-dir/app-typescript/tsconfig.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)