diff --git a/docs/zh-CN/components/icon.md b/docs/zh-CN/components/icon.md
index 605f8e36e..173f83e41 100755
--- a/docs/zh-CN/components/icon.md
+++ b/docs/zh-CN/components/icon.md
@@ -8,7 +8,7 @@ icon:
order: 50
---
-> 在 React 项目中使用 Icon 需要引入 `font-awesome@4.7.0`，然后在代码中 `import 'font-awesome/css/font-awesome.css'`，还有相关的 webpack 配置，具体请参考 [amis-react-starter](https://github.com/aisuda/amis-react-starter) 里的配置
+> 在 React 项目中使用 Icon 需要引入 `@fortawesome/fontawesome-free`，然后在代码中 `import '@fortawesome/fontawesome-free/css/all.css'`，还有相关的 webpack 配置，具体请参考 [amis-react-starter](https://github.com/aisuda/amis-react-starter) 里的配置
## 基本使用
diff --git a/examples/index.html b/examples/index.html
index 18f978495..98c1081b1 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -11,7 +11,8 @@
/>
-
+
+
diff --git a/examples/mobile.html b/examples/mobile.html
index 0ffb3193c..9d5f66de0 100644
--- a/examples/mobile.html
+++ b/examples/mobile.html
@@ -10,7 +10,8 @@
content="width=device-width, initial-scale=1, maximum-scale=1"
/>
-
+
+
diff --git a/examples/sdk-placeholder.html b/examples/sdk-placeholder.html
index 060023662..e2aac80fe 100644
--- a/examples/sdk-placeholder.html
+++ b/examples/sdk-placeholder.html
@@ -1,7 +1,7 @@
-
+
diff --git a/fis-conf.js b/fis-conf.js
index 4e97b25c0..936c9fc39 100644
--- a/fis-conf.js
+++ b/fis-conf.js
@@ -182,6 +182,20 @@ fis.match('*.html:jsx', {
isMod: false
});
+// 这些用了 esm
+fis.match(
+ '{echarts/extension/**.js,zrender/**.js,ansi-to-react/lib/index.js}',
+ {
+ parser: fis.plugin('typescript', {
+ sourceMap: false,
+ importHelpers: true,
+ esModuleInterop: true,
+ emitDecoratorMetadata: false,
+ experimentalDecorators: false
+ })
+ }
+);
+
fis.hook('node_modules', {
shimProcess: false,
shimGlobal: false,
diff --git a/package.json b/package.json
index 9b4663204..01701f8e0 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
"classnames": "2.2.5",
"dom-helpers": "^3.3.1",
"downshift": "3.1.4",
- "echarts": "5.0.0",
+ "echarts": "5.0.2",
"echarts-stat": "^1.2.0",
"exceljs": "^4.2.0",
"file-saver": "^2.0.2",
@@ -87,6 +87,7 @@
"video-react": "0.14.1"
},
"devDependencies": {
+ "@fortawesome/fontawesome-free": "^5.15.3",
"@types/async": "^2.0.45",
"@types/classnames": "^2.2.3",
"@types/dom-helpers": "^3.4.1",
@@ -135,7 +136,6 @@
"fis3-postpackager-loader": "^2.1.12",
"fis3-prepackager-stand-alone-pack": "^1.0.0",
"fis3-preprocessor-js-require-css": "^0.1.3",
- "font-awesome": "4.7.0",
"fs-walk": "0.0.2",
"glob": "^7.1.6",
"history": "4.7.2",