Merge pull request #1058 from wellyshen/refactor/render-html-types

Refactor: refine `renderHTML` types & `store` type
wellyshen · Apr 26, 2021 · 113d3f1 · 113d3f1
2 parents 7775dc6 + a2c5985
commit 113d3f1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-cool-starter",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "private": true,
   "description": "A starter boilerplate for a universal web application with the best development experience and best practices.",
   "license": "MIT",

diff --git a/src/server/renderHtml.ts b/src/server/renderHtml.ts
@@ -1,11 +1,13 @@
+import { ChunkExtractor } from "@loadable/server";
+import { HelmetData } from "react-helmet";
 import serialize from "serialize-javascript";
 import { minify } from "html-minifier";
 
 export default (
-  head: Record<string, any>,
-  extractor: Record<string, any>,
+  head: HelmetData,
+  extractor: ChunkExtractor,
   htmlContent: string,
-  initialState: Record<string, unknown>
+  initialState: typeof window.__INITIAL_STATE__
 ): any => {
   const html = `
     <!doctype html>

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -6,7 +6,7 @@ import { routerMiddleware } from "connected-react-router";
 import createRootReducer from "./rootReducer";
 
 interface Arg {
-  initialState?: Record<string, unknown>;
+  initialState?: typeof window.__INITIAL_STATE__;
   url?: string;
 }