fix: use merge-stream replace combinestream

moligit · Mar 10, 2020 · 79aa0e6 · 79aa0e6
1 parent 5dd98a0
commit 79aa0e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/packages/ykfe-utils/package.json b/packages/ykfe-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ykfe-utils",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "utils for ykfe",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -14,8 +14,10 @@
   },
   "author": "zhangyuang",
   "dependencies": {
+    "@types/merge-stream": "^1.1.2",
     "axios": "^0.19.0",
     "lodash.clonedeepwith": "^4.5.0",
+    "merge-stream": "^2.0.0",
     "path-to-regexp": "^6.1.0",
     "rax": "^1.1.1",
     "rax-server-renderer": "^1.1.6",

diff --git a/packages/ykfe-utils/src/renderToStream.ts b/packages/ykfe-utils/src/renderToStream.ts
@@ -1,5 +1,6 @@
 import { Context } from 'midway'
-import { getVersion, ReadableString, combineStream } from './utils'
+import mergeStream from 'merge-stream'
+import { getVersion, ReadableString } from './utils'
 import { renderLayout } from './renderLayout'
 import { useCdn } from './useCdn'
 import { Config } from './interface/config'
@@ -51,7 +52,7 @@ const renderToStream = async (ctx: Context, config: Config) => {
   } else {
     const doctypeStream = new ReadableString('<!DOCTYPE html>')
      // @ts-ignore
-    return combineStream(doctypeStream, stream)
+    return mergeStream(doctypeStream, stream)
   }
 }
 

diff --git a/packages/ykfe-utils/src/utils/index.ts b/packages/ykfe-utils/src/utils/index.ts
@@ -47,19 +47,10 @@ class ReadableString extends Readable {
   }
 }
 
-const combineStream = function () {
-  const writeableStream = new PassThrough()
-  Array.prototype.slice.call(arguments).forEach(readableStream => {
-    readableStream.pipe(writeableStream)
-  })
-  return writeableStream
-}
-
 export {
     resolveDir,
     logGreen,
     reactToStream,
     getVersion,
-    ReadableString,
-    combineStream
+    ReadableString
 }