From 80d5c9dc2d6634f1728aedd8d4668cc37c9c26d2 Mon Sep 17 00:00:00 2001 From: kagawagao Date: Thu, 7 May 2020 17:39:51 +0800 Subject: [PATCH] fix: bump g2plot and fix StackedColumnLine chart name --- .github/workflows/build.yml | 4 +- package-lock.json | 64 +++++++++++++++---------- package.json | 5 +- src/plots/stacked-column-line/index.tsx | 2 +- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c87feba4..7ad9607c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: build -on: [push] +on: [push, pull_request] jobs: build: @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Use Node.js 13 + - name: Use Node.js uses: actions/setup-node@v1.1.0 - name: npm install, test and build run: | diff --git a/package-lock.json b/package-lock.json index a6e162f0..dab786c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,11 +24,11 @@ } }, "@antv/color-util": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@antv/color-util/-/color-util-2.0.4.tgz", - "integrity": "sha512-CM9bIuykFTKPKbp8iDv2hHfY9QoaAOAyqFKWoV7ux1ZlFOA3KfRwcBDJtk0WlMdhzuZyhMGq0sBlxHCs9YBsVQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@antv/color-util/-/color-util-2.0.5.tgz", + "integrity": "sha512-eQktA9YDnWCj03rfjpg0ajvCfRkHXzBzsZa9z94pY6Jb7e3XtPUp7vDpB8KhaKm9GjPtGzQDneh+gnqkEK8mtQ==", "requires": { - "@antv/util": "^2.0.7", + "@antv/util": "^2.0.9", "tslib": "^1.10.0" } }, @@ -70,27 +70,39 @@ "integrity": "sha512-6C6NJOdoNVptCr5y9BVOhKkCgW7LFs/SpcRyAExUeSjAm0zJqcqNkSIRGsXYhj4PJI+CZICHzGwwiSnIsE68Ug==" }, "@antv/g-base": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.4.4.tgz", - "integrity": "sha512-P5qptpFy4QiEiQsESNVxvLJsfJJkTuJyfgchP4tUv/g3Ir6xn3Hj8mFbyjesOJ4/wWyhABYTpekK0HNWr1WiXA==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.4.5.tgz", + "integrity": "sha512-bjirR00iKJnMnCtQ0n1jQe7dLBYhV4QdKbE4eDlFSAqDkoNwJlNvyPwDizxRYA+eMX/fam7V6ubAnuMyS16zaA==", "requires": { "@antv/event-emitter": "^0.1.1", "@antv/g-math": "^0.1.3", - "@antv/matrix-util": "^2.0.4", + "@antv/matrix-util": "^3.0.2", "@antv/path-util": "~2.0.5", "@antv/util": "~2.0.0", "@types/d3-timer": "^1.0.9", "d3-ease": "^1.0.5", "d3-interpolate": "^1.3.2", "d3-timer": "^1.0.9" + }, + "dependencies": { + "@antv/matrix-util": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@antv/matrix-util/-/matrix-util-3.0.3.tgz", + "integrity": "sha512-CWR1+DlW8HYfGxP0/gJejvRPv9TrBB+WPnC7S5VFkwMl28/qYesVqm21Arzl4VFGgdNLD37ET/iSqziONOv7KQ==", + "requires": { + "@antv/util": "^2.0.9", + "gl-matrix": "^3.3.0", + "tslib": "^1.10.0" + } + } } }, "@antv/g-canvas": { - "version": "0.4.9", - "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.4.9.tgz", - "integrity": "sha512-ofhDOAQs8anhnlS/9TLGEqEGiYmVVn/N0kmEDQgW7mNNzYMEbmWVGOIAXZUYcRGs49Du1sEyTjsTv5B9MnvSpw==", + "version": "0.4.10", + "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.4.10.tgz", + "integrity": "sha512-SbuhIGquNVr2FoP6yEQ+FJkT87k3wLOL9XCHzwzR7tWAoI9BAK2B9Pp5Y9P0zRKNJxhMkiHc4Q3xKUWaq5JvMA==", "requires": { - "@antv/g-base": "^0.4.4", + "@antv/g-base": "^0.4.5", "@antv/g-math": "^0.1.3", "@antv/path-util": "~2.0.5", "@antv/util": "~2.0.0", @@ -107,11 +119,11 @@ } }, "@antv/g-svg": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@antv/g-svg/-/g-svg-0.4.4.tgz", - "integrity": "sha512-oHhfT3OhckGpBNlLM+FY5l6ysA044pqJ3CQ/NNqS269PwAXqswu7GbIIDmiy6lUURtaAVgyYxbAddoCnCvZ1Kg==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/@antv/g-svg/-/g-svg-0.4.5.tgz", + "integrity": "sha512-5QeBb1pBKFY9Y5lQ0JaewNfyJV60kcXmN1ZHGICidXSJ2J8nlLELL3iErepGTHh7Zebepe2lyifY3fwR6aC0lQ==", "requires": { - "@antv/g-base": "^0.4.4", + "@antv/g-base": "^0.4.5", "@antv/g-math": "^0.1.3", "@antv/util": "~2.0.0", "detect-browser": "^4.6.0" @@ -139,9 +151,9 @@ } }, "@antv/g2plot": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@antv/g2plot/-/g2plot-1.1.0.tgz", - "integrity": "sha512-P6rpz/3lJfFmq3TFUOD871lwBPj9BqFC7vPUlctk7jnwI8mLNo+3JeTNwR1UuiTd/ztQlJ/cHkwIXXMogqecKg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@antv/g2plot/-/g2plot-1.1.1.tgz", + "integrity": "sha512-5j1V8AlxyfUeHzivMZXdL04bVGsPU+adX5U/zCSIGv/hVwj9PubOjQpaniNMLo7RxU/v7hdMeAi/N6tKknkcgQ==", "requires": { "@antv/component": "~0.5.0", "@antv/coord": "~0.2.4", @@ -183,11 +195,11 @@ } }, "@antv/path-util": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@antv/path-util/-/path-util-2.0.7.tgz", - "integrity": "sha512-1gvgPxYjQ7QGqeFLJC8C3cQd7hP+3GQSdSTKoSSW4Q7nVXdibVx8D521kJe2NkketdKLwsT8gmwJWcu+NU43+w==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@antv/path-util/-/path-util-2.0.8.tgz", + "integrity": "sha512-g5gt12MY1oEzh/j5XfLNRCfJU7E+Us+2yM5Hqc0y8xeWhb5l013XG5BPV37KmOf6WAys9KNxklNniHCZ6SqCKw==", "requires": { - "@antv/util": "^2.0.7", + "@antv/util": "^2.0.9", "tslib": "^1.10.0" } }, @@ -202,9 +214,9 @@ } }, "@antv/util": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/@antv/util/-/util-2.0.8.tgz", - "integrity": "sha512-G9QRygQJ8UNGMi8L1dfMIa4SofbEO+jkXwvRY4ek/MLd04Q01UN0U28JeMFzw6FCKJdxiFu+2uwT/zjoFr3QoQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@antv/util/-/util-2.0.9.tgz", + "integrity": "sha512-JblWzne7msAPDdxkUhEk8zAz0Wd6igKwqymGbvIeyOydGrhBhGjA3nEayFj4IlG+XixCvGFKsCB4yuFS4glRIA==", "requires": { "tslib": "^1.10.0" } diff --git a/package.json b/package.json index 71b479e1..7885fb56 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "build:types": "tsc", "build:docs": "dumi build", "preversion": "npm run build", - "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md" + "version": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md", + "postversion": "npm publish" }, "devDependencies": { "@babel/cli": "^7.8.4", @@ -77,7 +78,7 @@ "react": "^15.0.0 || ^16.0.0" }, "dependencies": { - "@antv/g2plot": "^1.1.0" + "@antv/g2plot": "^1.1.1" }, "husky": { "hooks": { diff --git a/src/plots/stacked-column-line/index.tsx b/src/plots/stacked-column-line/index.tsx index 3fa06d99..3e0cde87 100644 --- a/src/plots/stacked-column-line/index.tsx +++ b/src/plots/stacked-column-line/index.tsx @@ -6,7 +6,7 @@ export type StackedColumnLineChartProps = Omit & StackedColumnLineConfig const StackedColumnLineChart: FC = (props) => { - return + return } export default StackedColumnLineChart