check for import.meta.env.SSR instead of import.meta.env.DEV to know… (…

…#409) * check for !import.meta.env.SSR instead of import.meta.env.DEV to know if CSR should hydrateRoot or createRoot * inverse the check * add return statement * Fix React TS error
laravel · Sep 11, 2024 · 2bdef9f · 2bdef9f
1 parent 666ea22
commit 2bdef9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Console/InstallsInertiaStacks.php b/src/Console/InstallsInertiaStacks.php
@@ -379,12 +379,12 @@ protected function configureReactHydrateRootForSsr($path)
                     root.render(<App {...props} />);
             EOT,
             <<<'EOT'
-                    if (import.meta.env.DEV) {
-                        createRoot(el).render(<App {...props} />);
-                        return
+                    if (import.meta.env.SSR) {
+                        hydrateRoot(el, <App {...props} />);
+                        return;
                     }
 
-                    hydrateRoot(el, <App {...props} />);
+                    createRoot(el).render(<App {...props} />);
             EOT,
             $path
         );

diff --git a/stubs/inertia-react-ts/resources/js/ssr.tsx b/stubs/inertia-react-ts/resources/js/ssr.tsx
@@ -14,6 +14,7 @@ createServer((page) =>
         title: (title) => `${title} - ${appName}`,
         resolve: (name) => resolvePageComponent(`./Pages/${name}.tsx`, import.meta.glob('./Pages/**/*.tsx')),
         setup: ({ App, props }) => {
+            // @ts-expect-error
             global.route<RouteName> = (name, params, absolute) =>
                 route(name, params as any, absolute, {
                     // @ts-expect-error