feat: 兼容serverless使用场景

zhangyuang · zhangyuang · commit 1b47abcf1061 · 2019-10-10T21:21:29.000+08:00
diff --git a/packages/ykfe-utils/package.json b/packages/ykfe-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ykfe-utils",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/packages/ykfe-utils/src/renderToStream.js b/packages/ykfe-utils/src/renderToStream.js
@@ -9,9 +9,11 @@ const renderToStream = async (ctx, config) => {
     return string
   }
 
-  if (!global.renderToNodeStream) {
+  if (!global.renderToNodeStream && config.externals) {
     // for this issue https://github.com/ykfe/egg-react-ssr/issues/4
     global.renderToNodeStream = require(baseDir + '/node_modules/react-dom/server').renderToNodeStream
+  } else {
+    global.renderToNodeStream = require('react-dom/server').renderToNodeStream
   }
 
   if (isLocal) {

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@ const renderToStream = async (ctx, config) => {`
`9`	`9`	`return string`
`10`	`10`	`}`
`11`	`11`
`12`		`- if (!global.renderToNodeStream) {`
	`12`	`+ if (!global.renderToNodeStream && config.externals) {`
`13`	`13`	`// for this issue https://github.com/ykfe/egg-react-ssr/issues/4`
`14`	`14`	`global.renderToNodeStream = require(baseDir + '/node_modules/react-dom/server').renderToNodeStream`
	`15`	`+ } else {`
	`16`	`+ global.renderToNodeStream = require('react-dom/server').renderToNodeStream`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`if (isLocal) {`