Merge pull request #152 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:release/10.0 to release/10.0

* commit '7734a5cf37f3420f69057e3c76af9acaf59b6564':
  fix: 修改eslint
  fix: 修改eslint
  fix: DEC-12046 修复本地运行时报错的问题

package.json

@@ -19,6 +19,7 @@
     "@babel/core": "7.4.5",
     "@babel/plugin-proposal-class-properties": "^7.5.0",
     "@babel/plugin-proposal-decorators": "7.4.4",
+    "@babel/polyfill": "^7.8.3",
     "@babel/preset-env": "7.4.5",
     "@babel/preset-typescript": "7.3.3",
     "@types/jest": "24.0.11",
@@ -66,8 +67,8 @@
   "scripts": {
     "dev": "cross-env NODE_ENV=mock webpack-dev-server -p --progress --config=webpack/webpack.dev.js --mode development --open",
     "build": "webpack -p --progress --config=webpack/webpack.prod.js --mode production",
-    "eslint": "eslint './*.js' './**/*.js' './**/*.ts'",
+    "eslint": "eslint . --ext .ts",
-    "eslint-fix": "eslint './*.js' './**/*.js' './**/*.ts' --fix",
+    "eslint-fix": "eslint . --ext .ts --fix",
     "const": "javac -encoding UTF-8 -d constants/classes constants/*.java && java -cp constants/classes FRConstantsWriter",
     "i18n": "node ./lib/transform-i18n/transform-i18n.js",
     "test": "jest --passWithNoTests",

webpack/webpack.dev.js

@@ -36,7 +36,7 @@ chokidar
 module.exports = merge(common, {
     devtool: 'eval-source-map',
     entry: {
-        show: ['./src/i18n.ts', './src/request.ts', './src/index.ts'],
+        show: ['babel-polyfill', './src/i18n.ts', './src/request.ts', './src/index.ts'],
     },
     output: {
         path: dirs.DEST,

yarn.lock

@@ -606,10 +606,10 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/polyfill@7.4.4":
+"@babel/polyfill@^7.8.3":
-  version "7.4.4"
+  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.3.tgz#2333fc2144a542a7c07da39502ceeeb3abe4debd"
-  integrity sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==
+  integrity sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
@@ -3054,11 +3054,16 @@ core-js-compat@^3.1.1:
     browserslist "^4.6.6"
     semver "^6.3.0"
 
-core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+core-js@^2.4.0, core-js@^2.5.0:
   version "2.6.9"
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
+core-js@^2.6.5:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"