fix: fix some bug

Author: vnues

build/client/webpack.base.conf.js

@@ -89,7 +89,8 @@ module.exports = {
     new webpack.DefinePlugin({
       'process.env': JSON.stringify({ NODE_ENV: 'development' }),
       __IS_PROD__: false,
-      __SERVER__: false
+      __SERVER__: false,
+      __IS_WEBPACK__: true
     })
   ],
   optimization: {

src/client/main/route-config.tsx

@@ -8,28 +8,26 @@ export interface IRoute {
 
 let routes: IRoute[] = []
 
-// 这种不能被做到热更新 那么应该reload啊
-// todo 这里有bug
+// TODO 不支持热更新
 function pageNotFound({ staticContext }: any) {
   if (staticContext) {
     staticContext.code = 404
   }
 
   return (
     <div>
-      <p>404页面page22</p>
-      <p>12</p>
+      <p>404页面</p>
     </div>
   )
 }
 try {
-  // if (require.context) {
-  const context = require.context(`../modules`, true, /.*\/routes\.tsx?$/)
-  context.keys().forEach((key: string) => {
-    const route = context(key).default
-    routes = routes.concat(route)
-  })
-  // }
+  if (__IS_WEBPACK__) {
+    const context = require.context(`../modules`, true, /.*\/routes\.tsx?$/)
+    context.keys().forEach((key: string) => {
+      const route = context(key).default
+      routes = routes.concat(route)
+    })
+  }
 } catch (err) {
   console.warn(err.message)
 }

src/client/types/lib.d.ts

@@ -24,3 +24,5 @@ declare module 'isomorphic-style-loader/withStyles'
 declare const __SERVER__: boolean
 
 declare const __IS_PROD__: boolean
+
+declare const __IS_WEBPACK__: boolean

src/server/middlewares/ssr.ts

@@ -26,6 +26,7 @@ export default async (ctx: Koa.Context, next: Koa.Next): Promise<null> => {
     keywords: '默认关键词',
     description: '默认描述'
   }
+  // 添加TDK
   if (page && page.tdk) {
     tdk = page.tdk
   }

tests/__snapshots__/genHtml.spec.js.snap

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`test genHtml Function should return the correct result when call genHtml 1`] = `"<div class=\\"layout-box\\"><h1>koa+react+ssr</h1><div><p>404页面page22</p><p>12</p></div></div>"`;
+exports[`test genHtml Function should return the correct result when call genHtml 1`] = `"<div class=\\"layout-box\\"><div><p>404页面</p></div></div>"`;

tests/components/asyncBundle.spec.jsx

@@ -25,6 +25,7 @@ describe('test AsyncBundle component', () => {
     const { rerender } = render(
       <AsyncBundle load={() => loader}>{Comp => <Comp />}</AsyncBundle>
     )
+    // TODO 这段测试写的不标准 rerender不是这么用的 不是跟enzyme的update方法一样的理解
     await rerender(<AsyncBundle load={() => loader}>{Comp => <Comp />}</AsyncBundle>)
     const element = screen.getByText('component')
     expect(element).toBeInTheDocument()

tests/demo.spec.js

@@ -8,9 +8,7 @@ describe('test genHtml Function', () => {
       console.log('insertCss')
     }
     const { html } = await genHtml('/404', insertCss, store)
-    expect(html).toMatch(
-      `<div class="layout-box"><h1>koa+react+ssr</h1><div><p>404页面page22</p><p>12</p></div></div>`
-    )
+    expect(html).toMatch(`<div class="layout-box"><div><p>404页面</p></div></div>`)
     expect(html).toMatchSnapshot() // 保存快照
   })
 })

tests/genHtml.spec.js

@@ -3,3 +3,5 @@ import '@testing-library/jest-dom'
 import React from 'react'
 // 处理这种情况 https://stackoverflow.com/questions/58070996/how-to-fix-the-warning-uselayouteffect-does-nothing-on-the-server
 React.useLayoutEffect = React.useEffect
+// 模拟非__IS_WEBPACK环境
+global.__IS_WEBPACK__ = false