Merge pull request edp963#1780 from scottsut/fix_array_flat

fix: Array.flat compatibility of dependencies
baby636 · Jun 1, 2020 · 2bc5a78 · 2bc5a78
2 parents b43cffd + 9d2f8f0
commit 2bc5a78
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/webapp/app/app.tsx b/webapp/app/app.tsx
@@ -20,6 +20,7 @@
 
 import '@babel/polyfill'
 import 'url-search-params-polyfill'
+import 'array-flat-polyfill'
 
 import React from 'react'
 import ReactDOM from 'react-dom'

diff --git a/webapp/app/components/RichText/Serializer.ts b/webapp/app/components/RichText/Serializer.ts
@@ -146,9 +146,7 @@ export const deserialize = (el: HTMLElement): Node[] => {
     parent = el.childNodes[0]
   }
 
-  const children: any[] = Array.from(parent.childNodes)
-    .map(deserialize)
-    .reduce((acc, child) => acc.concat(child), [])
+  const children: any[] = Array.from(parent.childNodes).map(deserialize).flat()
 
   if (el.nodeName === 'BODY') {
     return jsx('fragment', {}, children)

diff --git a/webapp/package.json b/webapp/package.json
@@ -62,6 +62,7 @@
     "@babel/polyfill": "^7.8.3",
     "ace-builds": "^1.4.9",
     "antd": "^3.26.15",
+    "array-flat-polyfill": "^1.0.1",
     "axios": "^0.19.0",
     "bootstrap-datepicker": "^1.8.0",
     "chalk": "2.4.2",

diff --git a/webapp/share/app.tsx b/webapp/share/app.tsx
@@ -20,6 +20,7 @@
 
 import '@babel/polyfill'
 import 'url-search-params-polyfill'
+import 'array-flat-polyfill'
 
 import React from 'react'
 import ReactDOM from 'react-dom'