diff --git a/build.gradle b/build.gradle index add17cca..0214a839 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { allprojects { group = 'com.xiaomi.thain' - version = '1.3.0' + version = '1.3.0-beta.0' apply plugin: 'java' apply plugin: 'org.jetbrains.kotlin.jvm' diff --git a/readme.md b/readme.md index ca02c30d..b76a0cf1 100644 --- a/readme.md +++ b/readme.md @@ -46,7 +46,7 @@ Thain has completed backend management system which supports depending, re-run, 1. Run ```shell - java -jar thain-server/build/libs/thain-server-1.3.0.jar + java -jar thain-server/build/libs/thain-server-1.3.0-beta.0.jar ``` 1. Open [localhost:9900](http://localhost:9900) to see the effect diff --git a/readme_zh.md b/readme_zh.md index 473c8361..a72b8f4a 100644 --- a/readme_zh.md +++ b/readme_zh.md @@ -47,7 +47,7 @@ Thain 提供了任务调度与执行的一整套解决方案,在小米集团 1. Run ```shell - java -jar thain-server/build/libs/thain-server-1.3.0.jar + java -jar thain-server/build/libs/thain-server-1.3.0-beta.0.jar ``` 1. 打开 [localhost:9900](http://localhost:9900) 就可以看到效果了 diff --git a/thain-fe/package-lock.json b/thain-fe/package-lock.json index 9673d6a7..ab923e15 100644 --- a/thain-fe/package-lock.json +++ b/thain-fe/package-lock.json @@ -36,15 +36,14 @@ } }, "@ant-design/pro-layout": { - "version": "4.9.11", - "resolved": "https://registry.npm.taobao.org/@ant-design/pro-layout/download/@ant-design/pro-layout-4.9.11.tgz", - "integrity": "sha1-BaGtuYXuvVn+APgdkkLMjj79qGo=", + "version": "4.10.0", + "resolved": "https://registry.npm.taobao.org/@ant-design/pro-layout/download/@ant-design/pro-layout-4.10.0.tgz", + "integrity": "sha1-PH/BjG8agFG3l1B/4po77+mkq2c=", "requires": { - "antd": "^3.23.6", + "antd": "^3.26.3", "classnames": "^2.2.6", - "hash.js": "^1.1.7", "history": "^4.10.1", - "lodash": "^4.17.10", + "lodash.isequal": "^4.5.0", "memoize-one": "^5.1.1", "omit.js": "^1.0.0", "path-to-regexp": "2.4.0", @@ -84,7 +83,7 @@ }, "@antv/component": { "version": "0.3.8", - "resolved": "https://registry.npm.taobao.org/@antv/component/download/@antv/component-0.3.8.tgz", + "resolved": "https://registry.npm.taobao.org/@antv/component/download/@antv/component-0.3.8.tgz?cache=0&sync_timestamp=1576810922773&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40antv%2Fcomponent%2Fdownload%2F%40antv%2Fcomponent-0.3.8.tgz", "integrity": "sha1-Z37NO1AmkH1Mtw2QgpUdfDwrVDQ=", "requires": { "@antv/attr": "~0.1.2", @@ -1333,22 +1332,22 @@ } }, "@emotion/is-prop-valid": { - "version": "0.8.5", - "resolved": "https://registry.npm.taobao.org/@emotion/is-prop-valid/download/@emotion/is-prop-valid-0.8.5.tgz", - "integrity": "sha1-LdoHkfDq+hK3oKWzmFhAXMe96YM=", + "version": "0.8.6", + "resolved": "https://registry.npm.taobao.org/@emotion/is-prop-valid/download/@emotion/is-prop-valid-0.8.6.tgz", + "integrity": "sha1-R1dkbwpY6d7GFMR8g45xR9iMJjw=", "requires": { - "@emotion/memoize": "0.7.3" + "@emotion/memoize": "0.7.4" } }, "@emotion/memoize": { - "version": "0.7.3", - "resolved": "https://registry.npm.taobao.org/@emotion/memoize/download/@emotion/memoize-0.7.3.tgz", - "integrity": "sha1-W2scEdam3d8fL8mW90zzshlkTXg=" + "version": "0.7.4", + "resolved": "https://registry.npm.taobao.org/@emotion/memoize/download/@emotion/memoize-0.7.4.tgz", + "integrity": "sha1-Gb8PWvGRSREcQNmLsM+CEZ9dnus=" }, "@emotion/unitless": { - "version": "0.7.4", - "resolved": "https://registry.npm.taobao.org/@emotion/unitless/download/@emotion/unitless-0.7.4.tgz", - "integrity": "sha1-qHtLBOWuFKiNSOvvFQFfa30fVnc=" + "version": "0.7.5", + "resolved": "https://registry.npm.taobao.org/@emotion/unitless/download/@emotion/unitless-0.7.5.tgz", + "integrity": "sha1-dyESkcGQCnALinjPr9oxYNdpSe0=" }, "@jest/console": { "version": "24.9.0", @@ -1924,9 +1923,9 @@ "dev": true }, "@types/react": { - "version": "16.9.16", - "resolved": "https://registry.npm.taobao.org/@types/react/download/@types/react-16.9.16.tgz?cache=0&sync_timestamp=1575895075608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Freact%2Fdownload%2F%40types%2Freact-16.9.16.tgz", - "integrity": "sha1-TxJRVwcUix9TqOqkNB2uXf77Bm0=", + "version": "16.9.17", + "resolved": "https://registry.npm.taobao.org/@types/react/download/@types/react-16.9.17.tgz?cache=0&sync_timestamp=1576825978233&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Freact%2Fdownload%2F%40types%2Freact-16.9.17.tgz", + "integrity": "sha1-WPDMDp7CQl0UQd17YjQhqGeqJT4=", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -2040,7 +2039,7 @@ }, "@typescript-eslint/eslint-plugin": { "version": "1.13.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-1.13.0.tgz?cache=0&sync_timestamp=1576745406378&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Feslint-plugin%2Fdownload%2F%40typescript-eslint%2Feslint-plugin-1.13.0.tgz", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-1.13.0.tgz", "integrity": "sha1-Iv7ZsW3f60Av17zeVjB4IPbrxJ8=", "requires": { "@typescript-eslint/experimental-utils": "1.13.0", @@ -2062,7 +2061,7 @@ }, "@typescript-eslint/experimental-utils": { "version": "1.13.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-1.13.0.tgz?cache=0&sync_timestamp=1576745598084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fexperimental-utils%2Fdownload%2F%40typescript-eslint%2Fexperimental-utils-1.13.0.tgz", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-1.13.0.tgz", "integrity": "sha1-sIxg14DABn3i+0SwS0MvVAE4MB4=", "requires": { "@types/json-schema": "^7.0.3", @@ -2094,7 +2093,7 @@ "dependencies": { "@typescript-eslint/experimental-utils": { "version": "2.12.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.12.0.tgz?cache=0&sync_timestamp=1576745598084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fexperimental-utils%2Fdownload%2F%40typescript-eslint%2Fexperimental-utils-2.12.0.tgz", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.12.0.tgz", "integrity": "sha1-4Kdv+2KT4Fh0hAihkZIeRTwx1A0=", "requires": { "@types/json-schema": "^7.0.3", @@ -2104,7 +2103,7 @@ }, "@typescript-eslint/typescript-estree": { "version": "2.12.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.12.0.tgz?cache=0&sync_timestamp=1576745596578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Ftypescript-estree%2Fdownload%2F%40typescript-eslint%2Ftypescript-estree-2.12.0.tgz", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.12.0.tgz?cache=0&sync_timestamp=1576982358769&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Ftypescript-estree%2Fdownload%2F%40typescript-eslint%2Ftypescript-estree-2.12.0.tgz", "integrity": "sha1-vZ5UfM/9F9+rDDqwlHyAyOLrkUw=", "requires": { "debug": "^4.1.1", @@ -2142,7 +2141,7 @@ }, "@typescript-eslint/typescript-estree": { "version": "1.13.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-1.13.0.tgz?cache=0&sync_timestamp=1576745596578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Ftypescript-estree%2Fdownload%2F%40typescript-eslint%2Ftypescript-estree-1.13.0.tgz", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-1.13.0.tgz?cache=0&sync_timestamp=1576982358769&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Ftypescript-estree%2Fdownload%2F%40typescript-eslint%2Ftypescript-estree-1.13.0.tgz", "integrity": "sha1-gUDxfQ9gwDYZeY8dYouENJE9wy4=", "requires": { "lodash.unescape": "4.0.1", @@ -2224,7 +2223,7 @@ }, "eslint": { "version": "5.16.0", - "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1575161102132&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz", + "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz", "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=", "requires": { "@babel/code-frame": "^7.0.0", @@ -2951,7 +2950,7 @@ }, "eslint": { "version": "5.16.0", - "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1575161102132&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz", + "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz", "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=", "requires": { "@babel/code-frame": "^7.0.0", @@ -3739,12 +3738,13 @@ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "array-includes": { - "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/array-includes/download/array-includes-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-includes%2Fdownload%2Farray-includes-3.1.0.tgz", - "integrity": "sha1-SKkp70xrsfptxKksmwI6JhsMpAQ=", + "version": "3.1.1", + "resolved": "https://registry.npm.taobao.org/array-includes/download/array-includes-3.1.1.tgz", + "integrity": "sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g=", "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.0" + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" } }, "array-map": { @@ -3787,25 +3787,6 @@ "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.13.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.16.3", - "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.16.3.tgz", - "integrity": "sha1-UkkNl4+W/5+J7BW1zyRDBKW8oWE=", - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" - } - } } }, "array.prototype.flat": { @@ -4114,7 +4095,7 @@ }, "babel-plugin-istanbul": { "version": "5.2.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-istanbul/download/babel-plugin-istanbul-5.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/babel-plugin-istanbul/download/babel-plugin-istanbul-5.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-istanbul%2Fdownload%2Fbabel-plugin-istanbul-5.2.0.tgz", "integrity": "sha1-30reg9iXqS3wacTZolzyZxKTyFQ=", "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -5588,9 +5569,9 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codemirror": { - "version": "5.49.2", - "resolved": "https://registry.npm.taobao.org/codemirror/download/codemirror-5.49.2.tgz?cache=0&sync_timestamp=1571639076367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcodemirror%2Fdownload%2Fcodemirror-5.49.2.tgz", - "integrity": "sha1-yE/a8RsZgD+CiwxnBgx7xtFUzK0=" + "version": "5.50.0", + "resolved": "https://registry.npm.taobao.org/codemirror/download/codemirror-5.50.0.tgz", + "integrity": "sha1-rqzRjyJXNbF8urmJCO2s6H/tzas=" }, "collapse-white-space": { "version": "1.0.5", @@ -7423,7 +7404,7 @@ "dependencies": { "immer": { "version": "2.1.5", - "resolved": "https://registry.npm.taobao.org/immer/download/immer-2.1.5.tgz", + "resolved": "https://registry.npm.taobao.org/immer/download/immer-2.1.5.tgz?cache=0&sync_timestamp=1576862104951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimmer%2Fdownload%2Fimmer-2.1.5.tgz", "integrity": "sha1-A4mUdFXFosekfx5vQVydGmKh6+0=" } } @@ -7567,45 +7548,46 @@ "integrity": "sha1-aNYITKsbB5dnVA2A5Wo5tCPkq/Q=" }, "enzyme": { - "version": "3.10.0", - "resolved": "https://registry.npm.taobao.org/enzyme/download/enzyme-3.10.0.tgz", - "integrity": "sha1-chjjR8SndG4TP46WSq2ko1I0UvY=", - "requires": { - "array.prototype.flat": "^1.2.1", - "cheerio": "^1.0.0-rc.2", - "function.prototype.name": "^1.1.0", + "version": "3.11.0", + "resolved": "https://registry.npm.taobao.org/enzyme/download/enzyme-3.11.0.tgz", + "integrity": "sha1-cdaAxYD+k0n29axsd1vD5rennCg=", + "requires": { + "array.prototype.flat": "^1.2.3", + "cheerio": "^1.0.0-rc.3", + "enzyme-shallow-equal": "^1.0.1", + "function.prototype.name": "^1.1.2", "has": "^1.0.3", - "html-element-map": "^1.0.0", - "is-boolean-object": "^1.0.0", - "is-callable": "^1.1.4", - "is-number-object": "^1.0.3", - "is-regex": "^1.0.4", - "is-string": "^1.0.4", + "html-element-map": "^1.2.0", + "is-boolean-object": "^1.0.1", + "is-callable": "^1.1.5", + "is-number-object": "^1.0.4", + "is-regex": "^1.0.5", + "is-string": "^1.0.5", "is-subset": "^0.1.1", "lodash.escape": "^4.0.1", "lodash.isequal": "^4.5.0", - "object-inspect": "^1.6.0", - "object-is": "^1.0.1", + "object-inspect": "^1.7.0", + "object-is": "^1.0.2", "object.assign": "^4.1.0", - "object.entries": "^1.0.4", - "object.values": "^1.0.4", - "raf": "^3.4.0", + "object.entries": "^1.1.1", + "object.values": "^1.1.1", + "raf": "^3.4.1", "rst-selector-parser": "^2.2.3", - "string.prototype.trim": "^1.1.2" + "string.prototype.trim": "^1.2.1" } }, "enzyme-adapter-react-16": { - "version": "1.15.1", - "resolved": "https://registry.npm.taobao.org/enzyme-adapter-react-16/download/enzyme-adapter-react-16-1.15.1.tgz?cache=0&sync_timestamp=1570766984099&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenzyme-adapter-react-16%2Fdownload%2Fenzyme-adapter-react-16-1.15.1.tgz", - "integrity": "sha1-itVTMr5wkdxTol19OLNIX8K6UNU=", + "version": "1.15.2", + "resolved": "https://registry.npm.taobao.org/enzyme-adapter-react-16/download/enzyme-adapter-react-16-1.15.2.tgz?cache=0&sync_timestamp=1576800893519&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenzyme-adapter-react-16%2Fdownload%2Fenzyme-adapter-react-16-1.15.2.tgz", + "integrity": "sha1-sW2y8OpCTVioCPnfhqtiEolaRQE=", "requires": { - "enzyme-adapter-utils": "^1.12.1", - "enzyme-shallow-equal": "^1.0.0", + "enzyme-adapter-utils": "^1.13.0", + "enzyme-shallow-equal": "^1.0.1", "has": "^1.0.3", "object.assign": "^4.1.0", - "object.values": "^1.1.0", + "object.values": "^1.1.1", "prop-types": "^15.7.2", - "react-is": "^16.10.2", + "react-is": "^16.12.0", "react-test-renderer": "^16.0.0-0", "semver": "^5.7.0" }, @@ -7618,16 +7600,16 @@ } }, "enzyme-adapter-utils": { - "version": "1.12.1", - "resolved": "https://registry.npm.taobao.org/enzyme-adapter-utils/download/enzyme-adapter-utils-1.12.1.tgz", - "integrity": "sha1-6Cjg0Djise+kuWGc6JYib4XJ3Yg=", + "version": "1.13.0", + "resolved": "https://registry.npm.taobao.org/enzyme-adapter-utils/download/enzyme-adapter-utils-1.13.0.tgz", + "integrity": "sha1-AciF3eIRS0aQv3QfjclM7jBg63g=", "requires": { "airbnb-prop-types": "^2.15.0", - "function.prototype.name": "^1.1.1", + "function.prototype.name": "^1.1.2", "object.assign": "^4.1.0", - "object.fromentries": "^2.0.1", + "object.fromentries": "^2.0.2", "prop-types": "^15.7.2", - "semver": "^5.7.0" + "semver": "^5.7.1" }, "dependencies": { "semver": { @@ -7638,12 +7620,12 @@ } }, "enzyme-shallow-equal": { - "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/enzyme-shallow-equal/download/enzyme-shallow-equal-1.0.0.tgz", - "integrity": "sha1-2ORgNJXm6ieQOO7wWkv0iHtV3Gk=", + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/enzyme-shallow-equal/download/enzyme-shallow-equal-1.0.1.tgz", + "integrity": "sha1-ev4D2zgBybdt6EQGlAlkEqjZ1J4=", "requires": { "has": "^1.0.3", - "object-is": "^1.0.1" + "object-is": "^1.0.2" } }, "errlop": { @@ -7684,21 +7666,21 @@ } }, "es-abstract": { - "version": "1.17.0-next.1", - "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.0-next.1.tgz", - "integrity": "sha1-lKzJPiCwWm6W2stasvHLOoH8IXI=", + "version": "1.17.0", + "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.0.tgz", + "integrity": "sha1-9CpRfQA2pVkduyxGNZHci7UDCbE=", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", "object-inspect": "^1.7.0", "object-keys": "^1.1.1", "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" } }, "es-to-primitive": { @@ -7767,9 +7749,9 @@ } }, "eslint": { - "version": "6.7.2", - "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.7.2.tgz?cache=0&sync_timestamp=1575161102132&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-6.7.2.tgz", - "integrity": "sha1-wXcHykrXstivmGoz/rpx4Yqf7NE=", + "version": "6.8.0", + "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.8.0.tgz", + "integrity": "sha1-YiYtZylzn5J1cjgkMC+yJ8jJP/s=", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -8426,7 +8408,7 @@ }, "eslint-plugin-unicorn": { "version": "8.0.2", - "resolved": "https://registry.npm.taobao.org/eslint-plugin-unicorn/download/eslint-plugin-unicorn-8.0.2.tgz?cache=0&sync_timestamp=1575105183888&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-unicorn%2Fdownload%2Feslint-plugin-unicorn-8.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/eslint-plugin-unicorn/download/eslint-plugin-unicorn-8.0.2.tgz", "integrity": "sha1-ofYZLDmRbXOFwFf3mpX/zfR/RjY=", "requires": { "clean-regexp": "^1.0.0", @@ -8458,9 +8440,9 @@ "integrity": "sha1-eTIMknsMXA09PSt2yLSkiPJbuvk=" }, "eslint-rule-docs": { - "version": "1.1.170", - "resolved": "https://registry.npm.taobao.org/eslint-rule-docs/download/eslint-rule-docs-1.1.170.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-rule-docs%2Fdownload%2Feslint-rule-docs-1.1.170.tgz", - "integrity": "sha1-CMgqqpPhbtX84FcOaRm4RYBC2Q8=" + "version": "1.1.171", + "resolved": "https://registry.npm.taobao.org/eslint-rule-docs/download/eslint-rule-docs-1.1.171.tgz", + "integrity": "sha1-pMdUcnPuxgzvIAbqGKEeR7lMf5I=" }, "eslint-scope": { "version": "3.7.1", @@ -9249,7 +9231,7 @@ }, "fork-ts-checker-webpack-plugin": { "version": "3.1.1", - "resolved": "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-3.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffork-ts-checker-webpack-plugin%2Fdownload%2Ffork-ts-checker-webpack-plugin-3.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-3.1.1.tgz", "integrity": "sha1-oWQsDT5l9QwswXQunAqA9EH4axk=", "requires": { "babel-code-frame": "^6.22.0", @@ -9493,7 +9475,7 @@ }, "got": { "version": "6.7.1", - "resolved": "https://registry.npm.taobao.org/got/download/got-6.7.1.tgz?cache=0&sync_timestamp=1576156397804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-6.7.1.tgz", + "resolved": "https://registry.npm.taobao.org/got/download/got-6.7.1.tgz?cache=0&sync_timestamp=1576758700726&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-6.7.1.tgz", "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "requires": { "create-error-class": "^3.0.0", @@ -9698,7 +9680,7 @@ }, "got": { "version": "9.6.0", - "resolved": "https://registry.npm.taobao.org/got/download/got-9.6.0.tgz?cache=0&sync_timestamp=1576156397804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-9.6.0.tgz", + "resolved": "https://registry.npm.taobao.org/got/download/got-9.6.0.tgz?cache=0&sync_timestamp=1576758700726&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-9.6.0.tgz", "integrity": "sha1-7fRefWf5lUVwXeH3u+7rEhdl7YU=", "requires": { "@sindresorhus/is": "^0.14.0", @@ -10471,7 +10453,7 @@ }, "immer": { "version": "1.10.0", - "resolved": "https://registry.npm.taobao.org/immer/download/immer-1.10.0.tgz", + "resolved": "https://registry.npm.taobao.org/immer/download/immer-1.10.0.tgz?cache=0&sync_timestamp=1576862104951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimmer%2Fdownload%2Fimmer-1.10.0.tgz", "integrity": "sha1-utZ2BbqcgQJ12R4cKkfUWC6YKG0=" }, "immutability-helper": { @@ -10778,9 +10760,9 @@ } }, "is-boolean-object": { - "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/is-boolean-object/download/is-boolean-object-1.0.0.tgz", - "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=" + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/is-boolean-object/download/is-boolean-object-1.0.1.tgz", + "integrity": "sha1-EO3AkA3RJ2l6kvb5gHx2F9aKxI4=" }, "is-buffer": { "version": "1.1.6", @@ -10788,9 +10770,9 @@ "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" }, "is-callable": { - "version": "1.1.4", - "resolved": "http://registry.npm.taobao.org/is-callable/download/is-callable-1.1.4.tgz", - "integrity": "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU=" + "version": "1.1.5", + "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz", + "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs=" }, "is-ci": { "version": "2.0.0", @@ -11076,9 +11058,9 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, "is-what": { - "version": "3.4.0", - "resolved": "https://registry.npm.taobao.org/is-what/download/is-what-3.4.0.tgz", - "integrity": "sha1-qbP+DCL1LUnv75d/ZA2kTmWj+GY=" + "version": "3.5.0", + "resolved": "https://registry.npm.taobao.org/is-what/download/is-what-3.5.0.tgz", + "integrity": "sha1-xQsOjzAh4LOUEMFZvqQ6VRDZkCc=" }, "is-whitespace-character": { "version": "1.0.3", @@ -11165,7 +11147,7 @@ }, "istanbul-lib-instrument": { "version": "3.3.0", - "resolved": "https://registry.npm.taobao.org/istanbul-lib-instrument/download/istanbul-lib-instrument-3.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/istanbul-lib-instrument/download/istanbul-lib-instrument-3.3.0.tgz?cache=0&sync_timestamp=1577062492583&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fistanbul-lib-instrument%2Fdownload%2Fistanbul-lib-instrument-3.3.0.tgz", "integrity": "sha1-pfY9kfC7wMPkee9MXeAnM17G1jA=", "requires": { "@babel/generator": "^7.4.0", @@ -13259,7 +13241,7 @@ }, "lint-staged": { "version": "9.5.0", - "resolved": "https://registry.npm.taobao.org/lint-staged/download/lint-staged-9.5.0.tgz", + "resolved": "https://registry.npm.taobao.org/lint-staged/download/lint-staged-9.5.0.tgz?cache=0&sync_timestamp=1576833434918&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flint-staged%2Fdownload%2Flint-staged-9.5.0.tgz", "integrity": "sha1-KQ7GBSUq9kbZt01zoPoRg2KwWjM=", "dev": true, "requires": { @@ -13453,7 +13435,7 @@ }, "npm-run-path": { "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-3.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-3.1.0.tgz?cache=0&sync_timestamp=1577053378987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-3.1.0.tgz", "integrity": "sha1-f5G+MX9qRm7+08nymArYpO6LD6U=", "dev": true, "requires": { @@ -14169,7 +14151,7 @@ }, "mdn-browser-compat-data": { "version": "0.0.84", - "resolved": "https://registry.npm.taobao.org/mdn-browser-compat-data/download/mdn-browser-compat-data-0.0.84.tgz?cache=0&sync_timestamp=1576165987141&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-browser-compat-data%2Fdownload%2Fmdn-browser-compat-data-0.0.84.tgz", + "resolved": "https://registry.npm.taobao.org/mdn-browser-compat-data/download/mdn-browser-compat-data-0.0.84.tgz?cache=0&sync_timestamp=1576759843101&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmdn-browser-compat-data%2Fdownload%2Fmdn-browser-compat-data-0.0.84.tgz", "integrity": "sha1-eR0OI4z/V3n65Yn5n1sse4TqRLU=", "requires": { "extend": "3.0.2" @@ -14563,7 +14545,7 @@ }, "mini-css-extract-plugin": { "version": "0.7.0", - "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.7.0.tgz", + "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.7.0.tgz?cache=0&sync_timestamp=1576856689687&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.7.0.tgz", "integrity": "sha1-W6gpD7tBeaQ90nzKREuhUL7nQ6A=", "requires": { "loader-utils": "^1.1.0", @@ -15076,7 +15058,7 @@ }, "npm-run-path": { "version": "2.0.2", - "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577053378987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "requires": { "path-key": "^2.0.0" @@ -17161,9 +17143,9 @@ } }, "rc-input-number": { - "version": "4.5.1", - "resolved": "https://registry.npm.taobao.org/rc-input-number/download/rc-input-number-4.5.1.tgz", - "integrity": "sha1-/LA8HdqLeypp+7cY+cE8ZmyuvXk=", + "version": "4.5.3", + "resolved": "https://registry.npm.taobao.org/rc-input-number/download/rc-input-number-4.5.3.tgz", + "integrity": "sha1-7Ul8cnZY6HDT8qXlp1DR7nEIn0M=", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.0", @@ -17256,7 +17238,7 @@ }, "rc-select": { "version": "9.2.1", - "resolved": "https://registry.npm.taobao.org/rc-select/download/rc-select-9.2.1.tgz?cache=0&sync_timestamp=1576222496084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-select%2Fdownload%2Frc-select-9.2.1.tgz", + "resolved": "https://registry.npm.taobao.org/rc-select/download/rc-select-9.2.1.tgz", "integrity": "sha1-D79HqTPDbh5u92yI+rMvWAKeagE=", "requires": { "babel-runtime": "^6.23.0", @@ -17687,7 +17669,7 @@ }, "fork-ts-checker-webpack-plugin": { "version": "1.1.1", - "resolved": "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-1.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffork-ts-checker-webpack-plugin%2Fdownload%2Ffork-ts-checker-webpack-plugin-1.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-1.1.1.tgz", "integrity": "sha1-yvKiEHePseFxtpk8oKQPm2WJ47c=", "requires": { "babel-code-frame": "^6.22.0", @@ -18887,9 +18869,9 @@ "integrity": "sha1-SPC/Gl6iBRlpKcDZeYtC0e2YRDw=" }, "regjsparser": { - "version": "0.6.1", - "resolved": "https://registry.npm.taobao.org/regjsparser/download/regjsparser-0.6.1.tgz", - "integrity": "sha1-W2soxBjzEu9CiY3Ghlri1Lnw96I=", + "version": "0.6.2", + "resolved": "https://registry.npm.taobao.org/regjsparser/download/regjsparser-0.6.2.tgz", + "integrity": "sha1-/WLHU5kUZ9nR/+Cp9n8npSkCS5Y=", "requires": { "jsesc": "~0.5.0" }, @@ -19449,7 +19431,7 @@ }, "rollup": { "version": "0.25.8", - "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-0.25.8.tgz", + "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-0.25.8.tgz?cache=0&sync_timestamp=1577030653259&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup%2Fdownload%2Frollup-0.25.8.tgz", "integrity": "sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA=", "requires": { "chalk": "^1.1.1", @@ -20655,7 +20637,7 @@ }, "style-loader": { "version": "0.23.1", - "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-0.23.1.tgz", + "resolved": "https://registry.npm.taobao.org/style-loader/download/style-loader-0.23.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstyle-loader%2Fdownload%2Fstyle-loader-0.23.1.tgz", "integrity": "sha1-y5FUYG8+dxq2xKtjcCahBJF02SU=", "requires": { "loader-utils": "^1.1.0", @@ -20669,7 +20651,7 @@ }, "styled-components": { "version": "4.4.1", - "resolved": "https://registry.npm.taobao.org/styled-components/download/styled-components-4.4.1.tgz?cache=0&sync_timestamp=1573595758204&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstyled-components%2Fdownload%2Fstyled-components-4.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/styled-components/download/styled-components-4.4.1.tgz", "integrity": "sha1-4GMeiJ8B22ffTeV2/trKRj8FwvI=", "requires": { "@babel/helper-module-imports": "^7.0.0", @@ -21401,7 +21383,7 @@ }, "superagent": { "version": "3.8.3", - "resolved": "https://registry.npm.taobao.org/superagent/download/superagent-3.8.3.tgz?cache=0&sync_timestamp=1575226455377&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsuperagent%2Fdownload%2Fsuperagent-3.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/superagent/download/superagent-3.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsuperagent%2Fdownload%2Fsuperagent-3.8.3.tgz", "integrity": "sha1-Rg6g29t9WxG8T3jeulZfhqF44Sg=", "requires": { "component-emitter": "^1.2.0", @@ -21562,7 +21544,7 @@ }, "eslint": { "version": "5.16.0", - "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1575161102132&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz", + "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz", "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=", "requires": { "@babel/code-frame": "^7.0.0", @@ -21717,12 +21699,12 @@ }, "tapable": { "version": "1.1.3", - "resolved": "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz", + "resolved": "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1576855832644&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz", "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I=" }, "tape": { "version": "4.12.0", - "resolved": "https://registry.npm.taobao.org/tape/download/tape-4.12.0.tgz", + "resolved": "https://registry.npm.taobao.org/tape/download/tape-4.12.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftape%2Fdownload%2Ftape-4.12.0.tgz", "integrity": "sha1-61OCrF1FD5yFiBmyIzRY5prtpKg=", "requires": { "deep-equal": "~1.1.1", @@ -22414,13 +22396,13 @@ }, "typescript": { "version": "3.7.2", - "resolved": "https://registry.npm.taobao.org/typescript/download/typescript-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftypescript%2Fdownload%2Ftypescript-3.7.2.tgz", + "resolved": "https://registry.npm.taobao.org/typescript/download/typescript-3.7.2.tgz", "integrity": "sha1-J+SJuV+lkJRF6f717kjYFpetGPs=" }, "ua-parser-js": { - "version": "0.7.20", - "resolved": "https://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.20.tgz", - "integrity": "sha1-dScXi4L2pioPJD0flP0w4+PCEJg=" + "version": "0.7.21", + "resolved": "https://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.21.tgz", + "integrity": "sha1-hTz5zpP2QvZxdCc8w0Vlrm8wh3c=" }, "uglify-js": { "version": "2.8.29", @@ -23293,9 +23275,9 @@ }, "dependencies": { "immer": { - "version": "5.0.2", - "resolved": "https://registry.npm.taobao.org/immer/download/immer-5.0.2.tgz", - "integrity": "sha1-NOtQxpq7jASs0PlCJExe7+YqTk4=" + "version": "5.1.0", + "resolved": "https://registry.npm.taobao.org/immer/download/immer-5.1.0.tgz?cache=0&sync_timestamp=1576862104951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimmer%2Fdownload%2Fimmer-5.1.0.tgz", + "integrity": "sha1-ONnrpA27A4m3rnuLmeRmHfDPieM=" } } }, @@ -23688,7 +23670,7 @@ }, "eslint": { "version": "5.16.0", - "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1575161102132&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz", + "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz", "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=", "requires": { "@babel/code-frame": "^7.0.0", diff --git a/thain-fe/package.json b/thain-fe/package.json index 0b1e0f74..bd156d38 100644 --- a/thain-fe/package.json +++ b/thain-fe/package.json @@ -42,14 +42,14 @@ "not ie <= 10" ], "dependencies": { - "@ant-design/pro-layout": "^4.9.11", + "@ant-design/pro-layout": "^4.10.0", "@antv/data-set": "^0.10.2", "antd": "^3.26.3", "bizcharts": "~3.5.6", "braft-editor": "~2.3.8", "braft-extensions": "0.0.20", "classnames": "^2.2.6", - "codemirror": "~5.49.2", + "codemirror": "^5.50.0", "core-js": "^3.6.0", "dva": "~2.6.0-beta.19", "lodash": "~4.17.15", @@ -84,7 +84,7 @@ "@types/history": "^4.7.2", "@types/lodash": "~4.14.148", "@types/qs": "~6.9.0", - "@types/react": "~16.9.16", + "@types/react": "^16.9.17", "@types/react-document-title": "^2.0.3", "@types/react-dom": "~16.9.4", "@types/react-helmet": "^5.0.13", @@ -94,8 +94,8 @@ "check-prettier": "^1.0.3", "cross-env": "~6.0.0", "cross-port-killer": "^1.1.1", - "enzyme": "^3.10.0", - "eslint": "~6.7.2", + "enzyme": "^3.11.0", + "eslint": "^6.8.0", "eslint-config-airbnb": "~18.0.0", "eslint-config-prettier": "~6.7.0", "eslint-plugin-babel": "^5.3.0",