Skip to content

Commit 8322584

Browse files
fix: inconsistent build runtime
fix #42
1 parent addf609 commit 8322584

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

src/client/components/ClientOnly.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function ClientOnly({
1616
const isBrowser = useIsBrowser()
1717

1818
if (isBrowser) {
19-
if (typeof children !== 'function' && import.meta.env.DEV) {
19+
if (typeof children !== 'function' && process.env.NODE_ENV === 'development') {
2020
throw new Error(
2121
`vite-react-ssg error: The children of <ClientOnly> must be a "render function", e.g. <ClientOnly>{() => <span>{window.location.href}</span>}</ClientOnly>.
2222
Current type: ${isValidElement(children) ? 'React element' : typeof children}`,

src/client/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function ViteReactSSG(
2222
getStyleCollector = null,
2323
} = options
2424

25-
if (import.meta.env.DEV && ssrWhenDev !== undefined)
25+
if (process.env.NODE_ENV === 'development' && ssrWhenDev !== undefined)
2626
console.warn('[vite-react-ssg] `ssrWhenDev` option is no longer needed. If you want to use csr, just replace `vite-react-ssg dev` with `vite`.')
2727

2828
const isClient = typeof window !== 'undefined'
@@ -110,7 +110,7 @@ export function ViteReactSSG(
110110
</HelmetProvider>
111111
)
112112
const isSSR = document.querySelector('[data-server-rendered=true]') !== null
113-
if (!isSSR && import.meta.env.DEV) {
113+
if (!isSSR && process.env.NODE_ENV === 'development') {
114114
const root = ReactDOMCreateRoot(container)
115115
React.startTransition(() => {
116116
root.render(app)
@@ -132,7 +132,7 @@ export function ViteReactSSG(
132132
return route
133133
}
134134
const loader: RouteRecord['loader'] = async ({ request }) => {
135-
if (import.meta.env.DEV) {
135+
if (process.env.NODE_ENV === 'development') {
136136
const routeId = encodeURIComponent(route.id!)
137137
const dataQuery = `_data=${routeId}`
138138
const url = request.url.includes('?') ? `${request.url}&${dataQuery}` : `${request.url}?${dataQuery}`

src/client/single-page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function ViteReactSSG(
2020
getStyleCollector = null,
2121
} = options
2222

23-
if (import.meta.env.DEV && ssrWhenDev !== undefined)
23+
if (process.env.NODE_ENV === 'development' && ssrWhenDev !== undefined)
2424
console.warn('[vite-react-ssg] `ssrWhenDev` option is no longer needed. If you want to use csr, just replace `vite-react-ssg dev` with `vite`.')
2525

2626
const isClient = typeof window !== 'undefined'
@@ -89,7 +89,7 @@ export function ViteReactSSG(
8989
</HelmetProvider>
9090
) as ReactNode
9191
const isSSR = document.querySelector('[data-server-rendered=true]') !== null
92-
if (!isSSR && import.meta.env.DEV) {
92+
if (!isSSR && process.env.NODE_ENV === 'development') {
9393
const root = ReactDOMCreateRoot(container)
9494
React.startTransition(() => {
9595
root.render(app)

src/client/tanstack.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function Experimental_ViteReactSSG(
3838
getStyleCollector = null,
3939
} = options
4040

41-
if (import.meta.env.DEV && ssrWhenDev !== undefined)
41+
if (process.env.NODE_ENV === 'development' && ssrWhenDev !== undefined)
4242
console.warn('[vite-react-ssg] `ssrWhenDev` option is no longer needed. If you want to use csr, just replace `vite-react-ssg dev` with `vite`.')
4343

4444
const isClient = typeof window !== 'undefined'
@@ -75,7 +75,7 @@ export function Experimental_ViteReactSSG(
7575
// eslint-disable-next-line ts/no-empty-object-type
7676
node.options.loader = async (ctx: LoaderFnContext<any, {}, {}, {}, AnyContext, AnyContext>) => {
7777
let pathname = ctx.location.pathname
78-
if (import.meta.env.DEV) {
78+
if (process.env.NODE_ENV === 'development') {
7979
const routeId = encodeURIComponent(node.id)
8080
const dataQuery = `_data=${routeId}`
8181
const href = ctx.location.href
@@ -171,7 +171,7 @@ export function Experimental_ViteReactSSG(
171171

172172
const { router } = await createRoot(true)
173173
const isSSR = document.querySelector('[data-server-rendered=true]') !== null
174-
if (!isSSR && import.meta.env.DEV) {
174+
if (!isSSR && process.env.NODE_ENV === 'development') {
175175
const root = ReactDOMCreateRoot(container)
176176
React.startTransition(() => {
177177
root.render(

src/node/build.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ export async function build(ssgOptions: Partial<ViteReactSSGOptions> = {}, viteC
9898
},
9999
customLogger: clientLogger,
100100
mode: config.mode,
101-
ssr: { noExternal: ['vite-react-ssg'] },
102101
}))
103102

104103
if (mock) {
@@ -137,7 +136,6 @@ export async function build(ssgOptions: Partial<ViteReactSSGOptions> = {}, viteC
137136
},
138137
},
139138
mode: config.mode,
140-
ssr: { noExternal: ['vite-react-ssg', 'vite-react-ssg/tanstack'] },
141139
}))
142140

143141
const prefix = (format === 'esm' && process.platform === 'win32') ? 'file://' : ''

src/node/dev.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ export async function dev(ssgOptions: Partial<ViteReactSSGOptions> = {}, viteCon
6161
}),
6262
],
6363
},
64-
{
65-
ssr: { noExternal: ['vite-react-ssg'] },
66-
},
64+
{},
6765
),
6866
)
6967
await viteServer.listen()

0 commit comments

Comments
 (0)