feat: bootstrap.util.ts

- mv bootstrap logic to util
denchiklut · Dec 29, 2022 · 1b4ae2a · 1b4ae2a
1 parent a908401
commit 1b4ae2a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/src/client/index.tsx b/src/client/index.tsx
@@ -1,16 +1,11 @@
 import { BrowserRouter } from 'react-router-dom'
-import { createRoot, hydrateRoot } from 'react-dom/client'
-import { loadableReady } from '@loadable/component'
+import { bootstrap } from 'client/utils'
 import { App } from '@shared/app'
 
-loadableReady(() => {
-	const container = document.getElementById('root') as HTMLElement
-	const AppContainer = (
-		<BrowserRouter>
-			<App />
-		</BrowserRouter>
-	)
+const AppContainer = () => (
+	<BrowserRouter>
+		<App />
+	</BrowserRouter>
+)
 
-	if (IS_SPA) createRoot(container).render(AppContainer)
-	else hydrateRoot(container, AppContainer)
-})
+bootstrap(<AppContainer />)
diff --git a/src/client/utils/bootstrap.util.ts b/src/client/utils/bootstrap.util.ts
@@ -0,0 +1,10 @@
+import type { ReactNode } from 'react'
+import { loadableReady } from '@loadable/component'
+import { createRoot, hydrateRoot } from 'react-dom/client'
+
+export const bootstrap = (app: ReactNode) => {
+	const container = document.getElementById('root') as HTMLElement
+
+	if (IS_SPA) createRoot(container).render(app)
+	else loadableReady(() => hydrateRoot(container, app))
+}
diff --git a/src/client/utils/index.ts b/src/client/utils/index.ts
@@ -1 +1,2 @@
 export * from './lazy.util'
+export * from './bootstrap.util'
diff --git a/src/server/middleware/render/render.util.ts b/src/server/middleware/render/render.util.ts
@@ -15,7 +15,7 @@ export const getHtml = (reactHtml: string, chunkExtractor: ChunkExtractor) => {
     <head>
         <meta charset='UTF-8'>
         <title>SSR app</title>
-  		<link rel='icon' href='favicon.ico' />
+  		<link rel='icon' href='/favicon.ico' />
   		<meta content='width=device-width, initial-scale=1' name='viewport' />
         ${linkTags}
         ${styleTags}
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from './lazy.util'
		export * from './bootstrap.util'