You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2020/12/30 03:33:50 UTC
[incubator-dolphinscheduler] branch dev updated: [Fix-4335][UI] Fix
IE 9-11 not supported
This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new cedc906 [Fix-4335][UI] Fix IE 9-11 not supported
new 2e44f4c Merge pull request #4336 from chengshiwen/ie-fix
cedc906 is described below
commit cedc906d1342793e1250cfbc85eb684a8ce5e310
Author: chengshiwen <ch...@gmail.com>
AuthorDate: Tue Dec 29 18:28:27 2020 +0800
[Fix-4335][UI] Fix IE 9-11 not supported
---
dolphinscheduler-ui/.babelrc | 10 +++++++++-
dolphinscheduler-ui/build/config.js | 2 +-
dolphinscheduler-ui/package.json | 12 +++++++++++-
dolphinscheduler-ui/src/js/conf/home/index.js | 1 +
dolphinscheduler-ui/src/js/conf/login/index.js | 1 +
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui/.babelrc b/dolphinscheduler-ui/.babelrc
index aeb5ba2..5fe8580 100644
--- a/dolphinscheduler-ui/.babelrc
+++ b/dolphinscheduler-ui/.babelrc
@@ -5,7 +5,15 @@
"debug": false,
"useBuiltIns": true,
"targets": {
- "browsers": [ "ie > 8", "last 2 version", "safari >= 9" ]
+ "browsers": [
+ "> 1%",
+ "last 2 versions",
+ "ie >= 9",
+ "edge >= 12",
+ "firefox >= 28",
+ "chrome >= 29",
+ "opera >= 17"
+ ]
},
"production": {
"plugins": ["transform-remove-console"]
diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js
index 77de5b6..1186066 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -47,7 +47,7 @@ const jsEntry = (() => {
parts.shift()
let modules = parts.join('/')
let entry = moduleName(modules)
- obj[entry] = val
+ obj[entry] = ['babel-polyfill', val]
})
return obj
})()
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index eb1c7e1..609dd10 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -48,6 +48,7 @@
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
+ "babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"copy-webpack-plugin": "^4.5.2",
"cross-env": "^5.2.0",
@@ -86,5 +87,14 @@
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2"
- }
+ },
+ "browserslist": [
+ "> 1%",
+ "last 2 versions",
+ "ie >= 9",
+ "edge >= 12",
+ "firefox >= 28",
+ "chrome >= 29",
+ "opera >= 17"
+ ]
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index 3809f18..8db055a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -17,6 +17,7 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import 'babel-polyfill'
import Vue from 'vue'
import ElementUI from 'element-ui'
import locale from 'element-ui/lib/locale/lang/en'
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 2f3aa04..652c80f 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -18,6 +18,7 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
+import 'babel-polyfill'
import Vue from 'vue'
import ElementUI from 'element-ui'
import locale from 'element-ui/lib/locale/lang/en'