Merge branch 'canary' into tsconfig-module-nodenext-node16

vercel · Jan 4, 2023 · 04c942e · 04c942e
2 parents fed2784 + c0986ee
commit 04c942e
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 86 deletions.
diff --git a/.prettierignore_staged b/.prettierignore_staged
@@ -2,7 +2,7 @@
 **/_next/**
 **/dist/**
 packages/next-swc/crates/**
-packages/next/compiled/**/*
+packages/next/src/compiled/**/*
 packages/next/bundles/webpack/packages/*.runtime.js
 lerna.json
 packages/next-codemod/transforms/__testfixtures__/**/*

diff --git a/examples/with-jest-babel/package.json b/examples/with-jest-babel/package.json
@@ -17,6 +17,7 @@
     "@testing-library/react": "13.2.0",
     "@testing-library/user-event": "14.2.0",
     "@types/react": "18.0.9",
+    "@types/testing-library__jest-dom": "5.14.5",
     "babel-jest": "28.1.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "28.1.0",

diff --git a/examples/with-jest/package.json b/examples/with-jest/package.json
@@ -17,6 +17,7 @@
     "@testing-library/react": "13.2.0",
     "@testing-library/user-event": "14.2.0",
     "@types/react": "18.0.9",
+    "@types/testing-library__jest-dom": "5.14.5",
     "jest": "28.1.0",
     "jest-environment-jsdom": "28.1.0",
     "typescript": "4.6.4"

diff --git a/test/e2e/app-dir/app-typescript/app/@test/inner/page.tsx b/test/e2e/app-dir/app-typescript/app/@test/inner/page.tsx
diff --git a/test/e2e/app-dir/app-typescript/app/layout.tsx b/test/e2e/app-dir/app-typescript/app/layout.tsx
diff --git a/test/e2e/app-dir/app-typescript/next.config.js b/test/e2e/app-dir/app-typescript/next.config.js
diff --git a/test/e2e/app-dir/app-typescript/package.json b/test/e2e/app-dir/app-typescript/package.json
diff --git a/test/e2e/app-dir/app-typescript/pages/index.tsx b/test/e2e/app-dir/app-typescript/pages/index.tsx
diff --git a/test/e2e/app-dir/app-typescript/tsconfig.json b/test/e2e/app-dir/app-typescript/tsconfig.json