Skip to content

Commit 1d46b0e

Browse files
committed
use canary 40
1 parent 2aa3877 commit 1d46b0e

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

packages/nextjs/src/config/util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ export function isTurbopackDefaultForVersion(version: string): boolean {
8989
return true;
9090
}
9191

92-
// For Next.js 15, only canary versions 15.6.0-canary.38+ use turbopack by default
92+
// For Next.js 15, only canary versions 15.6.0-canary.40+ use turbopack by default
9393
// Stable 15.x releases still use webpack by default
9494
if (major === 15 && minor >= 6 && prerelease && prerelease.startsWith('canary.')) {
9595
if (minor >= 7) {
9696
return true;
9797
}
9898
const canaryNumber = parseInt(prerelease.split('.')[1] || '0', 10);
99-
if (canaryNumber >= 38) {
99+
if (canaryNumber >= 40) {
100100
return true;
101101
}
102102
}

packages/nextjs/test/config/util.test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ describe('util', () => {
116116
['18.0.0', 'Next.js 18.0.0'],
117117
['20.0.0', 'Next.js 20.0.0'],
118118

119-
// Next.js 15.6.0-canary.38+ (boundary case)
120-
['15.6.0-canary.38', 'Next.js 15.6.0-canary.38 (exact threshold)'],
121-
['15.6.0-canary.39', 'Next.js 15.6.0-canary.39'],
122-
['15.6.0-canary.40', 'Next.js 15.6.0-canary.40'],
119+
// Next.js 15.6.0-canary.40+ (boundary case)
120+
['15.6.0-canary.40', 'Next.js 15.6.0-canary.40 (exact threshold)'],
121+
['15.6.0-canary.41', 'Next.js 15.6.0-canary.41'],
122+
['15.6.0-canary.42', 'Next.js 15.6.0-canary.42'],
123123
['15.6.0-canary.100', 'Next.js 15.6.0-canary.100'],
124124

125125
// Next.js 15.7+ canary versions
@@ -134,10 +134,10 @@ describe('util', () => {
134134

135135
describe('returns false for versions where webpack is still default', () => {
136136
it.each([
137-
// Next.js 15.6.0-canary.37 and below
138-
['15.6.0-canary.37', 'Next.js 15.6.0-canary.37 (just below threshold)'],
137+
// Next.js 15.6.0-canary.39 and below
138+
['15.6.0-canary.39', 'Next.js 15.6.0-canary.39 (just below threshold)'],
139139
['15.6.0-canary.36', 'Next.js 15.6.0-canary.36'],
140-
['15.6.0-canary.1', 'Next.js 15.6.0-canary.1'],
140+
['15.6.0-canary.38', 'Next.js 15.6.0-canary.38'],
141141
['15.6.0-canary.0', 'Next.js 15.6.0-canary.0'],
142142

143143
// Next.js 15.6.x stable releases (NOT canary)
@@ -198,12 +198,12 @@ describe('util', () => {
198198
expect(() => util.isTurbopackDefaultForVersion(version)).not.toThrow();
199199
});
200200

201-
it('handles canary.38 exactly (boundary)', () => {
202-
expect(util.isTurbopackDefaultForVersion('15.6.0-canary.38')).toBe(true);
201+
it('handles canary.40 exactly (boundary)', () => {
202+
expect(util.isTurbopackDefaultForVersion('15.6.0-canary.40')).toBe(true);
203203
});
204204

205-
it('handles canary.37 exactly (boundary)', () => {
206-
expect(util.isTurbopackDefaultForVersion('15.6.0-canary.37')).toBe(false);
205+
it('handles canary.39 exactly (boundary)', () => {
206+
expect(util.isTurbopackDefaultForVersion('15.6.0-canary.39')).toBe(false);
207207
});
208208
});
209209
});
@@ -238,8 +238,8 @@ describe('util', () => {
238238
expect(util.detectActiveBundler('17.0.0')).toBe('turbopack');
239239
});
240240

241-
it('returns turbopack for Next.js 15.6.0-canary.38+', () => {
242-
expect(util.detectActiveBundler('15.6.0-canary.38')).toBe('turbopack');
241+
it('returns turbopack for Next.js 15.6.0-canary.40+', () => {
242+
expect(util.detectActiveBundler('15.6.0-canary.40')).toBe('turbopack');
243243
expect(util.detectActiveBundler('15.6.0-canary.50')).toBe('turbopack');
244244
});
245245

packages/nextjs/test/config/withSentryConfig.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ describe('withSentryConfig', () => {
325325
});
326326
});
327327

328-
describe('Next.js 15.6.0-canary.38+ defaults to turbopack', () => {
329-
it('uses turbopack config by default for 15.6.0-canary.38', () => {
330-
vi.spyOn(util, 'getNextjsVersion').mockReturnValue('15.6.0-canary.38');
328+
describe('Next.js 15.6.0-canary.40+ defaults to turbopack', () => {
329+
it('uses turbopack config by default for 15.6.0-canary.40', () => {
330+
vi.spyOn(util, 'getNextjsVersion').mockReturnValue('15.6.0-canary.40');
331331

332332
const finalConfig = materializeFinalNextConfig(exportedNextConfig);
333333

@@ -353,8 +353,8 @@ describe('withSentryConfig', () => {
353353
expect(finalConfig.webpack).toBe(exportedNextConfig.webpack);
354354
});
355355

356-
it('uses webpack when --webpack flag is present on 15.6.0-canary.38', () => {
357-
vi.spyOn(util, 'getNextjsVersion').mockReturnValue('15.6.0-canary.38');
356+
it('uses webpack when --webpack flag is present on 15.6.0-canary.40', () => {
357+
vi.spyOn(util, 'getNextjsVersion').mockReturnValue('15.6.0-canary.40');
358358
process.argv.push('--webpack');
359359

360360
const finalConfig = materializeFinalNextConfig(exportedNextConfig);

0 commit comments

Comments
 (0)