Unverified Commit 3c24a5cb authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: set `window.next.turbopack` instead (#82580)

Closes PACK-5239

https://vercel.slack.com/archives/C04RPSD7EPM/p1753968554253779
parent 623e88e5
import { appBootstrap } from './app-bootstrap' import { appBootstrap } from './app-bootstrap'
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error' import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
window.next.version += '-turbo' window.next.turbopack = true
;(self as any).__webpack_hash__ = '' ;(self as any).__webpack_hash__ = ''
// eslint-disable-next-line @next/internal/typechecked-require // eslint-disable-next-line @next/internal/typechecked-require
......
...@@ -8,7 +8,8 @@ import { connect } from '@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-cl ...@@ -8,7 +8,8 @@ import { connect } from '@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-cl
import type { TurbopackMsgToBrowser } from '../server/dev/hot-reloader-types' import type { TurbopackMsgToBrowser } from '../server/dev/hot-reloader-types'
window.next = { window.next = {
version: `${version}-turbo`, version,
turbopack: true,
// router is initialized later so it has to be live-binded // router is initialized later so it has to be live-binded
get router() { get router() {
return router return router
......
...@@ -9,7 +9,8 @@ import { initialize, version, router, emitter, hydrate } from './' ...@@ -9,7 +9,8 @@ import { initialize, version, router, emitter, hydrate } from './'
import { displayContent } from './dev/fouc' import { displayContent } from './dev/fouc'
window.next = { window.next = {
version: `${version}-turbo`, version,
turbopack: true,
// router is initialized later so it has to be live-binded // router is initialized later so it has to be live-binded
get router() { get router() {
return router return router
......
...@@ -1156,9 +1156,15 @@ describe('Production Usage', () => { ...@@ -1156,9 +1156,15 @@ describe('Production Usage', () => {
const version = await browser.eval('window.next.version') const version = await browser.eval('window.next.version')
expect(version).toBeTruthy() expect(version).toBeTruthy()
expect(version).toBe( expect(version).toBe(
(await next.readJSON('node_modules/next/package.json')).version + (await next.readJSON('node_modules/next/package.json')).version
(process.env.IS_TURBOPACK_TEST ? '-turbo' : '')
) )
const turbopack = await browser.eval('window.next.turbopack')
if (process.env.IS_TURBOPACK_TEST) {
expect(turbopack).toBeTrue()
} else {
expect(turbopack).toBeFalsy()
}
} finally { } finally {
if (browser) { if (browser) {
await browser.close() await browser.close()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment