From d6cdd2ea85ecce6eb31d1b1cc12bc6d80403a5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E8=89=AF?= <1204183885@qq.com> Date: Mon, 22 Jun 2020 16:44:39 +0800 Subject: [PATCH 1/4] fix(table): typo (#2463) * fix(table): typo * fix: indent of package.json --- .eslintignore | 1 - .prettierignore | 1 - components/_util/responsiveObserve.js | 2 +- components/_util/store/connect.jsx | 8 +- components/_util/wave.jsx | 2 +- package.json | 428 +++++++++++++------------- 6 files changed, 220 insertions(+), 222 deletions(-) diff --git a/.eslintignore b/.eslintignore index 1014441b9..5484d7a9c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,3 @@ es/ lib/ _site/ dist/ -package.json diff --git a/.prettierignore b/.prettierignore index c73a42d2e..e2f5232d5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ **/*.svg -package.json lib/ es/ dist/ diff --git a/components/_util/responsiveObserve.js b/components/_util/responsiveObserve.js index 88a29c774..2d5fccd2e 100644 --- a/components/_util/responsiveObserve.js +++ b/components/_util/responsiveObserve.js @@ -84,7 +84,7 @@ const responsiveObserve = { }; this.dispatch(pointMap); }, - // Keep a empty destory to avoid triggering unmatch when unregister + // Keep a empty destroy to avoid triggering unmatch when unregister destroy() {}, }), ); diff --git a/components/_util/store/connect.jsx b/components/_util/store/connect.jsx index e6efe9623..792a0a279 100644 --- a/components/_util/store/connect.jsx +++ b/components/_util/store/connect.jsx @@ -11,7 +11,7 @@ function getDisplayName(WrappedComponent) { const defaultMapStateToProps = () => ({}); export default function connect(mapStateToProps) { const shouldSubscribe = !!mapStateToProps; - const finnalMapStateToProps = mapStateToProps || defaultMapStateToProps; + const finalMapStateToProps = mapStateToProps || defaultMapStateToProps; return function wrapWithConnect(WrappedComponent) { const tempProps = omit(WrappedComponent.props || {}, ['store']); const props = { @@ -30,13 +30,13 @@ export default function connect(mapStateToProps) { this.store = this.storeContext.store; this.preProps = omit(getOptionProps(this), ['__propsSymbol__']); return { - subscribed: finnalMapStateToProps(this.store.getState(), this.$props), + subscribed: finalMapStateToProps(this.store.getState(), this.$props), }; }, watch: { __propsSymbol__() { if (mapStateToProps && mapStateToProps.length === 2) { - this.subscribed = finnalMapStateToProps(this.store.getState(), this.$props); + this.subscribed = finalMapStateToProps(this.store.getState(), this.$props); } }, }, @@ -53,7 +53,7 @@ export default function connect(mapStateToProps) { return; } const props = omit(getOptionProps(this), ['__propsSymbol__']); - const nextSubscribed = finnalMapStateToProps(this.store.getState(), props); + const nextSubscribed = finalMapStateToProps(this.store.getState(), props); if ( !shallowEqual(this.preProps, props) || !shallowEqual(this.subscribed, nextSubscribed) diff --git a/components/_util/wave.jsx b/components/_util/wave.jsx index ae7776204..e36bd5e6d 100644 --- a/components/_util/wave.jsx +++ b/components/_util/wave.jsx @@ -54,7 +54,7 @@ export default { const attributeName = this.getAttributeName(); node.removeAttribute(attributeName); node.setAttribute(attributeName, 'true'); - // Not white or transparnt or grey + // Not white or transparent or grey styleForPesudo = styleForPesudo || document.createElement('style'); if ( waveColor && diff --git a/package.json b/package.json index cbeafca5d..944a0e7f7 100644 --- a/package.json +++ b/package.json @@ -1,216 +1,216 @@ { - "name": "ant-design-vue", - "version": "1.6.2", - "title": "Ant Design Vue", - "description": "An enterprise-class UI design language and Vue-based implementation", - "keywords": [ - "ant", - "design", - "antd", - "vue", - "vueComponent", - "component", - "components", - "ui", - "framework", - "frontend" - ], - "main": "lib/index.js", - "module": "es/index.js", - "typings": "types/index.d.ts", - "files": [ - "dist", - "lib", - "es", - "types", - "scripts" - ], - "scripts": { - "dev": "webpack-dev-server", - "start": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js", - "test": "cross-env NODE_ENV=test jest --config .jest.js", - "compile": "node antd-tools/cli/run.js compile", - "pub": "node antd-tools/cli/run.js pub", - "pub-with-ci": "node antd-tools/cli/run.js pub-with-ci", - "prepublish": "node antd-tools/cli/run.js guard", - "pre-publish": "node ./scripts/prepub", - "prettier": "prettier -c --write '**/*'", - "pretty-quick": "pretty-quick", - "dist": "node antd-tools/cli/run.js dist", - "lint": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./components", - "lint:site": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./antdv-demo", - "lint:docs": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue,.md ./antdv-demo/docs/**/demo/**", - "lint:style": "stylelint \"{site,components}/**/*.less\" --syntax less", - "codecov": "codecov", - "postinstall": "node scripts/postinstall || echo \"ignore\"" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/vueComponent/ant-design-vue.git" - }, - "license": "MIT", - "bugs": { - "url": "https://github.com/vueComponent/ant-design-vue/issues" - }, - "homepage": "https://www.antdv.com/", - "peerDependencies": { - "vue": ">=2.6.0", - "vue-template-compiler": ">=2.6.0" - }, - "devDependencies": { - "@commitlint/cli": "^8.0.0", - "@commitlint/config-conventional": "^8.0.0", - "@octokit/rest": "^16.0.0", - "@vue/cli-plugin-eslint": "^4.0.0", - "@vue/server-test-utils": "1.0.0-beta.16", - "@vue/test-utils": "1.0.0-beta.16", - "acorn": "^7.0.0", - "autoprefixer": "^9.6.0", - "axios": "^0.19.0", - "babel-cli": "^6.26.0", - "babel-core": "^6.26.0", - "babel-eslint": "^10.0.1", - "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-jest": "^23.6.0", - "babel-loader": "^7.1.2", - "babel-plugin-import": "^1.1.1", - "babel-plugin-inline-import-data-uri": "^1.0.1", - "babel-plugin-istanbul": "^6.0.0", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-plugin-syntax-jsx": "^6.18.0", - "babel-plugin-transform-class-properties": "^6.24.1", - "babel-plugin-transform-decorators": "^6.24.1", - "babel-plugin-transform-decorators-legacy": "^1.3.4", - "babel-plugin-transform-es3-member-expression-literals": "^6.22.0", - "babel-plugin-transform-es3-property-literals": "^6.22.0", - "babel-plugin-transform-object-assign": "^6.22.0", - "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-plugin-transform-runtime": "~6.23.0", - "babel-plugin-transform-vue-jsx": "^3.7.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.6.1", - "case-sensitive-paths-webpack-plugin": "^2.1.2", - "chalk": "^3.0.0", - "cheerio": "^1.0.0-rc.2", - "codecov": "^3.0.0", - "colorful": "^2.1.0", - "commander": "^4.0.0", - "compare-versions": "^3.3.0", - "cross-env": "^7.0.0", - "css-loader": "^3.0.0", - "deep-assign": "^2.0.0", - "enquire-js": "^0.2.1", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.1", - "eslint-plugin-html": "^6.0.0", - "eslint-plugin-markdown": "^2.0.0-alpha.0", - "eslint-plugin-vue": "^6.2.2", - "fetch-jsonp": "^1.1.3", - "fs-extra": "^8.0.0", - "glob": "^7.1.2", - "gulp": "^4.0.1", - "gulp-babel": "^7.0.0", - "gulp-strip-code": "^0.1.4", - "html-webpack-plugin": "^3.2.0", - "husky": "^4.0.0", - "istanbul-instrumenter-loader": "^3.0.0", - "jest": "^24.0.0", - "jest-serializer-vue": "^2.0.0", - "jest-transform-stub": "^2.0.0", - "js-base64": "^2.4.8", - "json-templater": "^1.2.0", - "jsonp": "^0.2.1", - "less": "^3.9.0", - "less-loader": "^6.0.0", - "less-plugin-npm-import": "^2.1.0", - "lint-staged": "^10.0.0", - "marked": "0.3.18", - "merge2": "^1.2.1", - "mini-css-extract-plugin": "^0.9.0", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "mockdate": "^2.0.2", - "nprogress": "^0.2.0", - "optimize-css-assets-webpack-plugin": "^5.0.1", - "postcss": "^7.0.6", - "postcss-loader": "^3.0.0", - "prettier": "^1.18.2", - "pretty-quick": "^2.0.0", - "querystring": "^0.2.0", - "raw-loader": "^4.0.0", - "reqwest": "^2.0.5", - "rimraf": "^3.0.0", - "rucksack-css": "^1.0.2", - "selenium-server": "^3.0.1", - "semver": "^7.0.0", - "style-loader": "^1.0.0", - "stylelint": "^13.0.0", - "stylelint-config-prettier": "^8.0.0", - "stylelint-config-standard": "^19.0.0", - "terser-webpack-plugin": "^3.0.3", - "through2": "^3.0.0", - "url-loader": "^3.0.0", - "vue": "^2.6.11", - "vue-antd-md-loader": "^1.1.0", - "vue-clipboard2": "0.3.1", - "vue-draggable-resizable": "^2.1.0", - "vue-eslint-parser": "^7.0.0", - "vue-i18n": "^8.3.2", - "vue-infinite-scroll": "^2.0.2", - "vue-jest": "^2.5.0", - "vue-loader": "^15.6.2", - "vue-router": "^3.0.1", - "vue-server-renderer": "^2.6.11", - "vue-template-compiler": "^2.6.11", - "vue-virtual-scroller": "^1.0.0", - "vuex": "^3.1.0", - "webpack": "^4.28.4", - "webpack-cli": "^3.2.1", - "webpack-dev-server": "^3.1.14", - "webpack-merge": "^4.1.1", - "webpackbar": "^4.0.0", - "xhr-mock": "^2.5.1" - }, - "dependencies": { - "@ant-design/icons": "^2.1.1", - "@ant-design/icons-vue": "^2.0.0", - "add-dom-event-listener": "^1.0.2", - "array-tree-filter": "^2.1.0", - "async-validator": "^3.0.3", - "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-runtime": "6.x", - "classnames": "^2.2.5", - "component-classes": "^1.2.6", - "dom-align": "^1.10.4", - "dom-closest": "^0.2.0", - "dom-scroll-into-view": "^2.0.0", - "enquire.js": "^2.1.6", - "intersperse": "^1.0.0", - "is-mobile": "^2.2.1", - "is-negative-zero": "^2.0.0", - "ismobilejs": "^1.0.0", - "json2mq": "^0.2.0", - "lodash": "^4.17.5", - "moment": "^2.21.0", - "mutationobserver-shim": "^0.3.2", - "node-emoji": "^1.10.0", - "omit.js": "^1.0.0", - "raf": "^3.4.0", - "resize-observer-polyfill": "^1.5.1", - "shallow-equal": "^1.0.0", - "shallowequal": "^1.0.2", - "vue-ref": "^2.0.0", - "warning": "^4.0.0" - }, - "sideEffects": [ - "site/*", - "components/style.js", - "components/**/style/*", - "*.vue", - "*.md", - "dist/*", - "es/**/style/*", - "lib/**/style/*", - "*.less" - ] + "name": "ant-design-vue", + "version": "1.6.2", + "title": "Ant Design Vue", + "description": "An enterprise-class UI design language and Vue-based implementation", + "keywords": [ + "ant", + "design", + "antd", + "vue", + "vueComponent", + "component", + "components", + "ui", + "framework", + "frontend" + ], + "main": "lib/index.js", + "module": "es/index.js", + "typings": "types/index.d.ts", + "files": [ + "dist", + "lib", + "es", + "types", + "scripts" + ], + "scripts": { + "dev": "webpack-dev-server", + "start": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js", + "test": "cross-env NODE_ENV=test jest --config .jest.js", + "compile": "node antd-tools/cli/run.js compile", + "pub": "node antd-tools/cli/run.js pub", + "pub-with-ci": "node antd-tools/cli/run.js pub-with-ci", + "prepublish": "node antd-tools/cli/run.js guard", + "pre-publish": "node ./scripts/prepub", + "prettier": "prettier -c --write '**/*'", + "pretty-quick": "pretty-quick", + "dist": "node antd-tools/cli/run.js dist", + "lint": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./components", + "lint:site": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue ./antdv-demo", + "lint:docs": "eslint -c ./.eslintrc --fix --ext .jsx,.js,.vue,.md ./antdv-demo/docs/**/demo/**", + "lint:style": "stylelint \"{site,components}/**/*.less\" --syntax less", + "codecov": "codecov", + "postinstall": "node scripts/postinstall || echo \"ignore\"" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/vueComponent/ant-design-vue.git" + }, + "license": "MIT", + "bugs": { + "url": "https://github.com/vueComponent/ant-design-vue/issues" + }, + "homepage": "https://www.antdv.com/", + "peerDependencies": { + "vue": ">=2.6.0", + "vue-template-compiler": ">=2.6.0" + }, + "devDependencies": { + "@commitlint/cli": "^8.0.0", + "@commitlint/config-conventional": "^8.0.0", + "@octokit/rest": "^16.0.0", + "@vue/cli-plugin-eslint": "^4.0.0", + "@vue/server-test-utils": "1.0.0-beta.16", + "@vue/test-utils": "1.0.0-beta.16", + "acorn": "^7.0.0", + "autoprefixer": "^9.6.0", + "axios": "^0.19.0", + "babel-cli": "^6.26.0", + "babel-core": "^6.26.0", + "babel-eslint": "^10.0.1", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-jest": "^23.6.0", + "babel-loader": "^7.1.2", + "babel-plugin-import": "^1.1.1", + "babel-plugin-inline-import-data-uri": "^1.0.1", + "babel-plugin-istanbul": "^6.0.0", + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-plugin-syntax-jsx": "^6.18.0", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-plugin-transform-decorators-legacy": "^1.3.4", + "babel-plugin-transform-es3-member-expression-literals": "^6.22.0", + "babel-plugin-transform-es3-property-literals": "^6.22.0", + "babel-plugin-transform-object-assign": "^6.22.0", + "babel-plugin-transform-object-rest-spread": "^6.26.0", + "babel-plugin-transform-runtime": "~6.23.0", + "babel-plugin-transform-vue-jsx": "^3.7.0", + "babel-polyfill": "^6.26.0", + "babel-preset-env": "^1.6.1", + "case-sensitive-paths-webpack-plugin": "^2.1.2", + "chalk": "^3.0.0", + "cheerio": "^1.0.0-rc.2", + "codecov": "^3.0.0", + "colorful": "^2.1.0", + "commander": "^4.0.0", + "compare-versions": "^3.3.0", + "cross-env": "^7.0.0", + "css-loader": "^3.0.0", + "deep-assign": "^2.0.0", + "enquire-js": "^0.2.1", + "eslint": "^6.8.0", + "eslint-config-prettier": "^6.10.1", + "eslint-plugin-html": "^6.0.0", + "eslint-plugin-markdown": "^2.0.0-alpha.0", + "eslint-plugin-vue": "^6.2.2", + "fetch-jsonp": "^1.1.3", + "fs-extra": "^8.0.0", + "glob": "^7.1.2", + "gulp": "^4.0.1", + "gulp-babel": "^7.0.0", + "gulp-strip-code": "^0.1.4", + "html-webpack-plugin": "^3.2.0", + "husky": "^4.0.0", + "istanbul-instrumenter-loader": "^3.0.0", + "jest": "^24.0.0", + "jest-serializer-vue": "^2.0.0", + "jest-transform-stub": "^2.0.0", + "js-base64": "^2.4.8", + "json-templater": "^1.2.0", + "jsonp": "^0.2.1", + "less": "^3.9.0", + "less-loader": "^6.0.0", + "less-plugin-npm-import": "^2.1.0", + "lint-staged": "^10.0.0", + "marked": "0.3.18", + "merge2": "^1.2.1", + "mini-css-extract-plugin": "^0.9.0", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "mockdate": "^2.0.2", + "nprogress": "^0.2.0", + "optimize-css-assets-webpack-plugin": "^5.0.1", + "postcss": "^7.0.6", + "postcss-loader": "^3.0.0", + "prettier": "^1.18.2", + "pretty-quick": "^2.0.0", + "querystring": "^0.2.0", + "raw-loader": "^4.0.0", + "reqwest": "^2.0.5", + "rimraf": "^3.0.0", + "rucksack-css": "^1.0.2", + "selenium-server": "^3.0.1", + "semver": "^7.0.0", + "style-loader": "^1.0.0", + "stylelint": "^13.0.0", + "stylelint-config-prettier": "^8.0.0", + "stylelint-config-standard": "^19.0.0", + "terser-webpack-plugin": "^3.0.3", + "through2": "^3.0.0", + "url-loader": "^3.0.0", + "vue": "^2.6.11", + "vue-antd-md-loader": "^1.1.0", + "vue-clipboard2": "0.3.1", + "vue-draggable-resizable": "^2.1.0", + "vue-eslint-parser": "^7.0.0", + "vue-i18n": "^8.3.2", + "vue-infinite-scroll": "^2.0.2", + "vue-jest": "^2.5.0", + "vue-loader": "^15.6.2", + "vue-router": "^3.0.1", + "vue-server-renderer": "^2.6.11", + "vue-template-compiler": "^2.6.11", + "vue-virtual-scroller": "^1.0.0", + "vuex": "^3.1.0", + "webpack": "^4.28.4", + "webpack-cli": "^3.2.1", + "webpack-dev-server": "^3.1.14", + "webpack-merge": "^4.1.1", + "webpackbar": "^4.0.0", + "xhr-mock": "^2.5.1" + }, + "dependencies": { + "@ant-design/icons": "^2.1.1", + "@ant-design/icons-vue": "^2.0.0", + "add-dom-event-listener": "^1.0.2", + "array-tree-filter": "^2.1.0", + "async-validator": "^3.0.3", + "babel-helper-vue-jsx-merge-props": "^2.0.3", + "babel-runtime": "6.x", + "classnames": "^2.2.5", + "component-classes": "^1.2.6", + "dom-align": "^1.10.4", + "dom-closest": "^0.2.0", + "dom-scroll-into-view": "^2.0.0", + "enquire.js": "^2.1.6", + "intersperse": "^1.0.0", + "is-mobile": "^2.2.1", + "is-negative-zero": "^2.0.0", + "ismobilejs": "^1.0.0", + "json2mq": "^0.2.0", + "lodash": "^4.17.5", + "moment": "^2.21.0", + "mutationobserver-shim": "^0.3.2", + "node-emoji": "^1.10.0", + "omit.js": "^1.0.0", + "raf": "^3.4.0", + "resize-observer-polyfill": "^1.5.1", + "shallow-equal": "^1.0.0", + "shallowequal": "^1.0.2", + "vue-ref": "^2.0.0", + "warning": "^4.0.0" + }, + "sideEffects": [ + "site/*", + "components/style.js", + "components/**/style/*", + "*.vue", + "*.md", + "dist/*", + "es/**/style/*", + "lib/**/style/*", + "*.less" + ] } From 6abca32bd51460394fce061f17866ecdfb4d4b62 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 23 Jun 2020 14:15:33 +0800 Subject: [PATCH 2/4] Update FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 255326104..eb88ba6ff 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,5 @@ custom: [ "https://www.paypal.me/tangjinzhou", "https://qn.antdv.com/alipay-and-wechat.png", + "https://www.buymeacoffee.com/antdv" ] From 35f529bc9a492d55e5209a5db48f16cae812a9cc Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 25 Jun 2020 12:04:03 +0800 Subject: [PATCH 3/4] chore: update issue and workfolw --- .github/ISSUE_TEMPLATE.md | 16 ---------------- ...---please-use-new-issue-ant-design-vue---.md | 11 ----------- .github/ISSUE_TEMPLATE/config.yml | 17 +++++++++++++++++ .github/workflows/test.yml | 2 +- antdv-demo | 2 +- 5 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 874e7754d..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md b/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md deleted file mode 100644 index 235cefe3d..000000000 --- a/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: '⚠️ Please use issue-helper ⚠️' -about: The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately. -labels: ---- - -The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately. - ---- - -注意：不是用 https://vuecomponent.github.io/issue-helper/ 或 http://ant-design-vue.gitee.io/issue-helper/ 创建的 issue 会被立即关闭。 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..10110137a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,17 @@ +blank_issues_enabled: false +contact_links: + - name: Create new issue + url: https://vuecomponent.github.io/issue-helper/ + about: Please use the following link to create a new issue. + - name: Patreon + url: https://www.patreon.com/tangjinzhou + about: Love Ant Design Vue? Please consider supporting us via Patreon. + - name: Open Collective + url: https://opencollective.com/ant-design-vue/donate + about: Love Ant Design Vue? Please consider supporting us via Open Collective. + - name: Paypal + url: https://www.paypal.me/tangjinzhou + about: Love Ant Design Vue? Please consider supporting us via Paypal. + - name: 支付宝/微信 赞助 + url: https://qn.antdv.com/alipay-and-wechat.png + about: Ant Design Vue 的健康持续发展需要您的支持，🙏 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f53cdd1b..24c58f5d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,7 +103,7 @@ jobs: - name: Checkout submodules uses: actions/checkout@v2 with: - repository: tangjinzhou/antdv-demo + repository: git@github.com:tangjinzhou/antdv-demo.git token: ${{ secrets.ACCESS_TOKEN }} path: antdv-demo diff --git a/antdv-demo b/antdv-demo index f3b049411..3024b0a52 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit f3b049411f17e556d8795f40d41bfadb471ae630 +Subproject commit 3024b0a52d631bdb76683ca2f47e39f60687b1fc From 1adb927f73176c53e2036d4d16de5452bb2e71ca Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 25 Jun 2020 17:10:46 +0800 Subject: [PATCH 4/4] test: update snap --- .github/workflows/codecov.yml | 1 + .github/workflows/test.yml | 3 ++- .../locale-provider/__tests__/__snapshots__/index.test.js.snap | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6706e4c0c..135820499 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -50,6 +50,7 @@ jobs: repository: tangjinzhou/antdv-demo token: ${{ secrets.ACCESS_TOKEN }} path: antdv-demo + submodules: true - name: restore cache from package-lock.json uses: actions/cache@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24c58f5d6..6c67b8bf2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,9 +103,10 @@ jobs: - name: Checkout submodules uses: actions/checkout@v2 with: - repository: git@github.com:tangjinzhou/antdv-demo.git + repository: tangjinzhou/antdv-demo token: ${{ secrets.ACCESS_TOKEN }} path: antdv-demo + submodules: true - name: restore cache from package-lock.json uses: actions/cache@v1 diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index 9e84bfb56..0980f5c2d 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -21414,7 +21414,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
Th09
+
Thg 09