Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions crates/next-api/src/additional_roots.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ use turbo_tasks::{
FxIndexMap, NonLocalValue, OperationValue, OperationVc, ReadRef, ResolvedVc, Vc,
};
use turbo_tasks_fs::{
DiskFileSystem, DiskFileSystemMap, DiskWatcherConfig, DiskWatcherRecursiveMode, FileSystemPath,
canonicalize_to_rcstr,
DiskFileSystem, DiskFileSystemMap, DiskWatcherConfig, FileSystemPath, canonicalize_to_rcstr,
};
use turbopack_core::issue::{Issue, IssueSeverity, IssueStage, PlainIssue, StyledString};

Expand Down Expand Up @@ -194,12 +193,7 @@ pub(crate) async fn create_additional_root_file_systems(
RcStr::from(format!("@{}", additional_root.key)),
canonical_root,
Vec::new(),
DiskWatcherConfig {
// we assume that most files in an additional root won't be read, so a recursive
// watcher may be more expensive than we'd like, always use a non-recursive watcher.
recursive_mode: Some(DiskWatcherRecursiveMode::NonRecursive),
..watcher_config
},
watcher_config,
map,
);
roots_by_name.insert(
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
]
}
},
"version": "16.4.0-canary.51"
"version": "16.4.0-canary.52"
}
2 changes: 1 addition & 1 deletion packages/create-next-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-next-app",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"keywords": [
"react",
"next",
Expand Down
2 changes: 1 addition & 1 deletion packages/devlow-bench/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vercel/devlow-bench",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "Benchmarking tool for the developer workflow",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-next",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "ESLint configuration used by Next.js.",
"license": "MIT",
"repository": {
Expand All @@ -12,7 +12,7 @@
"dist"
],
"dependencies": {
"@next/eslint-plugin-next": "16.4.0-canary.51",
"@next/eslint-plugin-next": "16.4.0-canary.52",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.32.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-internal/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@next/eslint-plugin-internal",
"private": true,
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "ESLint plugin for working on Next.js.",
"exports": {
".": "./src/eslint-plugin-internal.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/eslint-plugin-next",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "ESLint plugin for Next.js.",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/font/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@next/font",
"private": true,
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"repository": {
"url": "vercel/next.js",
"directory": "packages/font"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-bundle-analyzer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/bundle-analyzer",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"main": "index.js",
"types": "index.d.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/codemod",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-env/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/env",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"keywords": [
"react",
"next",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-mdx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/mdx",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"main": "index.js",
"license": "MIT",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/next-playwright/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/playwright",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-playwright"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-plugin-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/plugin-storybook",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-plugin-storybook"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-polyfill-module/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/polyfill-module",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
"main": "dist/polyfill-module.js",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-polyfill-nomodule/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/polyfill-nomodule",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "A polyfill for non-dead, nomodule browsers.",
"main": "dist/polyfill-nomodule.js",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-routing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/routing",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"keywords": [
"react",
"next",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-rspack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-rspack",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"repository": {
"url": "vercel/next.js",
"directory": "packages/next-rspack"
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/swc",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"private": true,
"files": [
"native/"
Expand Down
14 changes: 7 additions & 7 deletions packages/next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "The React Framework",
"main": "./dist/server/next.js",
"license": "MIT",
Expand Down Expand Up @@ -100,7 +100,7 @@
]
},
"dependencies": {
"@next/env": "16.4.0-canary.51",
"@next/env": "16.4.0-canary.52",
"@swc/helpers": "0.5.23",
"baseline-browser-mapping": "^2.9.19",
"caniuse-lite": "^1.0.30001579",
Expand Down Expand Up @@ -164,11 +164,11 @@
"@modelcontextprotocol/sdk": "1.18.1",
"@mswjs/interceptors": "0.42.5",
"@napi-rs/triples": "1.2.0",
"@next/font": "16.4.0-canary.51",
"@next/polyfill-module": "16.4.0-canary.51",
"@next/polyfill-nomodule": "16.4.0-canary.51",
"@next/react-refresh-utils": "16.4.0-canary.51",
"@next/swc": "16.4.0-canary.51",
"@next/font": "16.4.0-canary.52",
"@next/polyfill-module": "16.4.0-canary.52",
"@next/polyfill-nomodule": "16.4.0-canary.52",
"@next/react-refresh-utils": "16.4.0-canary.52",
"@next/swc": "16.4.0-canary.52",
"@opentelemetry/api": "1.6.0",
"@playwright/test": "1.61.0",
"@rspack/core": "1.6.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-refresh-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/react-refresh-utils",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"description": "An experimental package providing utilities for React Refresh.",
"repository": {
"url": "vercel/next.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/third-parties/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@next/third-parties",
"version": "16.4.0-canary.51",
"version": "16.4.0-canary.52",
"repository": {
"url": "vercel/next.js",
"directory": "packages/third-parties"
Expand All @@ -26,7 +26,7 @@
"third-party-capital": "1.0.20"
},
"devDependencies": {
"next": "16.4.0-canary.51",
"next": "16.4.0-canary.52",
"outdent": "0.8.0",
"prettier": "2.5.1",
"typescript": "6.0.2"
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions test/e2e/500-page/500-page-build.test.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { isNextDev, nextTestSetup } from 'e2e-utils'
import { nextTestSetup } from 'e2e-utils'

// This test exercises `next build` outputs and `next start` behaviour, so it
// is meaningless in dev mode where the dev server bypasses production build
// artifacts (e.g. statically prerendered 500.html from getStaticProps).
;(isNextDev ? describe.skip : describe)('500 Page build validation', () => {
const { next, skipped } = nextTestSetup({
// TODO(deploy-test-completion): Re-enable this suite in deploy mode.
// It likely expects a local build failure instead of a successful deployment.
// @force-gate !deploy
// @force-gate !dev
describe('500 Page build validation', () => {
const { next } = nextTestSetup({
files: __dirname,
skipStart: true,
skipDeployment: true,
})
if (skipped) return

const gip500Err =
/`pages\/500` can not have getInitialProps\/getServerSideProps/
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/app-dir-export/test/dynamic-missing-gsp.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { isNextDev } from 'e2e-utils'
import { runTests } from './utils'

// These cases patch fixture files and manually run local builds.
// @force-gate !deploy
describe('app dir - with output export - dynamic missing gsp', () => {
describe('should error when dynamic route is missing generateStaticParams', () => {
runTests({
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/app-dir-export/test/dynamicapiroute.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { runTests } from './utils'

// These cases patch fixture files and manually run local builds.
// @force-gate !deploy
describe('app dir - with output export - dynamic api route', () => {
describe.each([
{
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/app-dir-export/test/dynamicpage.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { runTests } from './utils'

// These cases patch fixture files and manually run local builds.
// @force-gate !deploy
describe('app dir - with output export - dynamic api route', () => {
describe.each([
{ dynamicPage: 'undefined' },
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/app-dir-export/test/trailing-slash.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { runTests } from './utils'

// These cases patch fixture files and manually run local builds.
// @force-gate !deploy
describe('app dir - with output export - trailing slash', () => {
describe.each([{ trailingSlash: false }, { trailingSlash: true }])(
"should work in prod with trailingSlash '$trailingSlash'",
Expand Down
6 changes: 1 addition & 5 deletions test/e2e/app-dir-export/test/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,11 @@ export function runTests({
| 'set wrong param'
expectedErrMsg?: string | RegExp
}) {
let { next, skipped, isNextDev } = nextTestSetup({
let { next, isNextDev } = nextTestSetup({
files: join(__dirname, '..'),
skipDeployment: true,
skipStart: true,
disableAutoSkewProtection: true,
})
if (skipped) {
return
}

beforeAll(async () => {
if (trailingSlash !== undefined) {
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/app-dir/actions/app-action-export.test.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { nextTestSetup } from 'e2e-utils'

// TODO(deploy-test-completion): Re-enable this suite in deploy mode.
// It likely asserts local CLI or runtime output that deploy tests do not expose.
// @force-gate !deploy
describe('app-dir action handling - next export', () => {
const { next, isNextStart, skipped } = nextTestSetup({
const { next, isNextStart } = nextTestSetup({
files: __dirname,
skipStart: true,
skipDeployment: true,
dependencies: {
nanoid: '4.0.1',
'server-only': 'latest',
},
})
if (skipped) return

if (!isNextStart) {
it('skip test for development mode', () => {})
Expand Down
Loading
Loading