Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
netil committed Oct 11, 2024
2 parents b37bdb1 + 3d4392a commit 1d26e13
Show file tree
Hide file tree
Showing 57 changed files with 8,559 additions and 12,414 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: npm run lint

- name: Run Test
run: npm run coverage
run: npm run coverage:ci

- name: Coveralls Parallel
uses: coverallsapp/github-action@master
Expand Down
31 changes: 3 additions & 28 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,17 @@
# [3.13.0-next.2](https://github.com/naver/billboard.js/compare/3.13.0-next.1...3.13.0-next.2) (2024-08-13)
# [3.13.0](https://github.com/naver/billboard.js/compare/3.12.4...3.13.0) (2024-08-23)


### Bug Fixes

* **zoom:** Fix zoom wheel interaction ([81ea359](https://github.com/naver/billboard.js/commit/81ea359cb284fe478c4b4c3a0daa2a2806b00416)), closes [#3856](https://github.com/naver/billboard.js/issues/3856)


### Features

* **legend:** Provide original data id in format callback ([5ce41c7](https://github.com/naver/billboard.js/commit/5ce41c74c7e9131539182210feec3a4061afbe83)), closes [#3663](https://github.com/naver/billboard.js/issues/3663)

# [3.13.0-next.1](https://github.com/naver/billboard.js/compare/3.12.4...3.13.0-next.1) (2024-07-25)


### Bug Fixes

* **api:** Fix to return indexed categories ([55c17c6](https://github.com/naver/billboard.js/commit/55c17c6c99fcdaca0ba2a323506709ab3d44e41a)), closes [#3365](https://github.com/naver/billboard.js/issues/3365)
* **bar:** Fix stacking bar position on multiple xs ([216da62](https://github.com/naver/billboard.js/commit/216da626bf5e774575513122e0816f60a64f042a)), closes [#3372](https://github.com/naver/billboard.js/issues/3372)
* **candlestick:** Fix rendering on rotated axis ([17f5058](https://github.com/naver/billboard.js/commit/17f5058a3a6b2acfd5c9ee9c4c9f1d13be102693)), closes [#3387](https://github.com/naver/billboard.js/issues/3387)
* **clip:** Fix x axis hide on title.bottom ([beec1bb](https://github.com/naver/billboard.js/commit/beec1bbdf3f6962dad02ac775a2d13d3b2fbb8eb)), closes [#3364](https://github.com/naver/billboard.js/issues/3364)
* **option:** Fix inconsistency of padding ([0c1ce81](https://github.com/naver/billboard.js/commit/0c1ce8180122b51924077039d928bdbbf677ff87)), closes [#3426](https://github.com/naver/billboard.js/issues/3426)
* **regions:** Mitigate broken dashed lines rendering ([d1df575](https://github.com/naver/billboard.js/commit/d1df575e18c271461fd8a215014b8fad1bd2b897)), closes [#3790](https://github.com/naver/billboard.js/issues/3790)
* **shape:** Fix circleY() undefined error ([f4ac3f1](https://github.com/naver/billboard.js/commit/f4ac3f1cb8e1f87c9bbd998ab66ff97b61080d51)), closes [#3388](https://github.com/naver/billboard.js/issues/3388)
* **subchart, zoom:** Fix returning domain value ([90338ec](https://github.com/naver/billboard.js/commit/90338eced7c9545f2ceb443bebbd857ac58a674c)), closes [#3347](https://github.com/naver/billboard.js/issues/3347)
* **subchart:** Fix handlebar position ([b897cbb](https://github.com/naver/billboard.js/commit/b897cbbcecc43f460566f2eb88fe9a5ee985bcaf)), closes [#3358](https://github.com/naver/billboard.js/issues/3358)
* **title:** fix title text center align ([b254a61](https://github.com/naver/billboard.js/commit/b254a61533620bd7c55648499b1dd8cc22795336)), closes [#3363](https://github.com/naver/billboard.js/issues/3363)
* **tooltip:** Fix tooltip.format.value call ([f7d587d](https://github.com/naver/billboard.js/commit/f7d587de26c6ceb026110328ef6d605f42fa563b)), closes [#3371](https://github.com/naver/billboard.js/issues/3371)
* **tooltip:** Fix tootip display on tooltip.init ([98e6f8b](https://github.com/naver/billboard.js/commit/98e6f8b29d63544ba01fd37564fe2b40d9a04214)), closes [#3369](https://github.com/naver/billboard.js/issues/3369)
* **zoom:** Fix zoom wheel interaction ([81ea359](https://github.com/naver/billboard.js/commit/81ea359cb284fe478c4b4c3a0daa2a2806b00416)), closes [#3856](https://github.com/naver/billboard.js/issues/3856)


### Features

* **api:** Intent to ship subchart method ([976f04a](https://github.com/naver/billboard.js/commit/976f04a93df40bb756bba87c0f0afa5411ac12ba)), closes [#3342](https://github.com/naver/billboard.js/issues/3342)
* **bar:** Enhance bar width to adjust from callback ([4ce74fc](https://github.com/naver/billboard.js/commit/4ce74fc3d3776d7c55e52e332fe89b8f96ee65e9)), closes [#3820](https://github.com/naver/billboard.js/issues/3820)
* **module:** Support dual CJS/ESM package ([437c007](https://github.com/naver/billboard.js/commit/437c007eabc7c7f82ce35eb7f3a2f6bb44438409)), closes [#2202](https://github.com/naver/billboard.js/issues/2202)
* **plugin:** Intent to ship TableView plugin ([215b611](https://github.com/naver/billboard.js/commit/215b611fe68ea37360e8939e9902d489aa502b75)), closes [#1873](https://github.com/naver/billboard.js/issues/1873)
* **legend:** Provide original data id in format callback ([5ce41c7](https://github.com/naver/billboard.js/commit/5ce41c74c7e9131539182210feec3a4061afbe83)), closes [#3663](https://github.com/naver/billboard.js/issues/3663)
* **regions:** Enhance regions rendering ([567b323](https://github.com/naver/billboard.js/commit/567b323ed58701ec06cde183238b6460c0fa4d6e)), closes [#3830](https://github.com/naver/billboard.js/issues/3830) [#3790](https://github.com/naver/billboard.js/issues/3790)
* **regions:** Intent to ship regions.label ([b4e3bc2](https://github.com/naver/billboard.js/commit/b4e3bc29f2e78d6547ce695f9ecc6aadf90c22a9)), closes [#3319](https://github.com/naver/billboard.js/issues/3319)
* **shape:** Intent to ship area-step-range type ([03b9a7d](https://github.com/naver/billboard.js/commit/03b9a7d5c99d605d9cf63fc2d218bcd78d8234ca)), closes [#3776](https://github.com/naver/billboard.js/issues/3776)
* **types:** Add area-step-range chart type ([2a763d2](https://github.com/naver/billboard.js/commit/2a763d2c8c1407f6d65a2f77b5a8fa50dd2062b2))

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ If you have any questions, checkout the previous posts or create a new one at:
- [Issue with 'question' label](https://github.com/naver/billboard.js/issues?utf8=%E2%9C%93&q=label%3Aquestion)

## Supported chart types
<img src="https://naver.github.io/billboard.js/img/chart-types.png?v=14" width=800>
<img src="https://naver.github.io/billboard.js/img/chart-types.png?v=15" width=800>

## Download and Installation

Expand Down
10 changes: 6 additions & 4 deletions demo/chart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,12 @@ var billboardDemo = {
Object.keys(demos).forEach(function(key) {
html.push("<li><h4>" + key + "</h4>");

Object.keys(demos[key]).sort().forEach(function (v, i) {
i === 0 && html.push("<ul>");
html.push("<li><a href='#"+ [key, v].join(".") + "'>" + v + "</a></li>");
});
Object.keys(demos[key])
.sort(Intl.Collator().compare)
.forEach(function (v, i) {
i === 0 && html.push("<ul>");
html.push("<li><a href='#"+ [key, v].join(".") + "'>" + v + "</a></li>");
});

html.push("</ul></li>");
});
Expand Down
36 changes: 35 additions & 1 deletion demo/demo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5691,7 +5691,41 @@ d3.select(".chart_area")
},
clipPath: false
}
}
},
resizeViewBox: [
{
options: {
data: {
columns: [
["sample", 70, 200, 120, 400, 300, 250]
],
type: "bar"
},
resize: {
auto: "viewBox"
}
}
},
{
options: {
size: {
width: 480,
height: 240
},
data: {
columns: [
["data1", 70],
["data2", 170],
["data3", 120]
],
type: "pie"
},
resize: {
auto: "viewBox"
}
}
}
]
},
DonutChartOptions: {
DonutCornerRadius: {
Expand Down
2 changes: 2 additions & 0 deletions eslint.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ export default [
"@typescript-eslint/ban-types": 0,
"@typescript-eslint/no-explicit-any": 0,
"@typescript-eslint/no-this-alias": 0,
"@typescript-eslint/no-unused-expressions": 0,
"@typescript-eslint/no-unsafe-function-type": 0,
"@typescript-eslint/no-unused-vars": [
"error", {
vars: "all",
Expand Down
69 changes: 35 additions & 34 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "billboard.js",
"version": "3.13.0-next.2",
"version": "3.13.0",
"description": "Re-usable easy interface JavaScript chart library, based on D3 v4+",
"homepage": "https://naver.github.io/billboard.js/",
"main": "dist/billboard.js",
Expand Down Expand Up @@ -41,6 +41,7 @@
"loc": "cloc --by-file src",
"test": "vitest",
"coverage": "vitest run",
"coverage:ci": "cross-env NODE_ENV=CI npm run coverage",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"jsdoc": "node ./config/jsdoc.js",
"jsdoc:cmd": "jsdoc -c jsdoc.json",
Expand Down Expand Up @@ -84,8 +85,8 @@
"license": "MIT",
"readmeFilename": "README.md",
"dependencies": {
"@types/d3-selection": "^3.0.0",
"@types/d3-transition": "^3.0.0",
"@types/d3-selection": "^3.0.11",
"@types/d3-transition": "^3.0.9",
"d3-axis": "^3.0.0",
"d3-brush": "^3.0.0",
"d3-drag": "^3.0.0",
Expand All @@ -101,29 +102,29 @@
"d3-zoom": "^3.0.0"
},
"devDependencies": {
"@commitlint/cli": "19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@eslint/js": "^9.8.0",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.7",
"@rollup/plugin-typescript": "^11.1.6",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@eslint/js": "^9.12.0",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-replace": "^6.0.1",
"@rollup/plugin-typescript": "^12.1.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^13.0.0",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@semantic-release/npm": "^12.0.1",
"@semantic-release/release-notes-generator": "^14.0.1",
"@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.0.0",
"@testing-library/react": "^16.0.1",
"@types/d3": "^7.4.3",
"@types/sinon": "^17.0.3",
"@vitest/browser": "^2.0.5",
"@vitest/coverage-istanbul": "^2.0.5",
"@vitest/ui": "^2.0.5",
"@vitest/browser": "^2.1.2",
"@vitest/coverage-istanbul": "^2.1.2",
"@vitest/ui": "^2.1.2",
"better-docs": "^2.7.3",
"clean-webpack-plugin": "^4.0.0",
"cloc": "^2.11.0",
"core-js": "^3.37.1",
"cloc": "2.2.0-cloc",
"core-js": "^3.38.1",
"coveralls": "^3.1.1",
"cross-env": "^7.0.3",
"css-loader": "^7.1.2",
Expand All @@ -134,34 +135,34 @@
"docdash": "^2.0.2",
"dprint": "^0.47.2",
"esbuild-loader": "^4.2.2",
"eslint": "^9.8.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.9.2",
"husky": "^9.1.4",
"eslint": "^9.12.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsdoc": "^50.3.1",
"husky": "^9.1.6",
"jsdoc": "^4.0.3",
"lint-staged": "^15.2.7",
"mini-css-extract-plugin": "^2.9.0",
"playwright": "^1.46.0",
"lint-staged": "^15.2.10",
"mini-css-extract-plugin": "^2.9.1",
"playwright": "^1.47.2",
"regenerator-runtime": "^0.14.1",
"rollup": "^4.19.1",
"rollup-plugin-delete": "^2.0.0",
"sass": "^1.77.8",
"sass-loader": "^16.0.0",
"semantic-release": "^24.0.0",
"rollup": "^4.24.0",
"rollup-plugin-delete": "^2.1.0",
"sass": "^1.79.4",
"sass-loader": "^16.0.2",
"semantic-release": "^24.1.2",
"simulant": "^0.2.2",
"sinon": "^18.0.0",
"sinon": "^19.0.2",
"string-replace-loader": "^3.1.0",
"style-loader": "^4.0.0",
"tslib": "^2.6.3",
"typescript": "5.5.4",
"typescript-eslint": "^7.18.0",
"vitest": "^2.0.5",
"webpack": "^5.93.0",
"tslib": "^2.7.0",
"typescript": "^5.6.2",
"typescript-eslint": "^8.8.1",
"vitest": "^2.1.2",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-clean": "^1.2.5",
"webpack-cli": "^5.1.4",
"webpack-common-shake": "^2.1.0",
"webpack-dev-server": "^5.0.4",
"webpack-dev-server": "^5.1.0",
"webpack-merge": "^6.0.1",
"webpackbar": "^6.0.1",
"write-file-webpack-plugin": "^4.5.1"
Expand Down
51 changes: 26 additions & 25 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"preview": "npm run build:test && vite preview",
"test": "npm run build:test && vitest",
"test:ui": "npm test -- --ui",
"coverage": "npm run build:test && vitest run --coverage",
"coverage": "npm run build:test && vitest run",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook",
"deploy": "npm run coverage && npm run build"
Expand Down Expand Up @@ -48,29 +48,30 @@
"react": ">=16.8.0"
},
"devDependencies": {
"@babel/core": "^7.18.10",
"@playwright/test": "^1.25.1",
"@storybook/addon-actions": "^6.5.10",
"@storybook/addon-console": "^1.2.3",
"@storybook/addon-essentials": "^6.5.10",
"@storybook/addon-interactions": "^6.5.10",
"@storybook/addon-links": "^6.5.10",
"@storybook/builder-vite": "^0.4.0",
"@storybook/react": "^6.5.10",
"@storybook/testing-library": "^0.0.13",
"@types/react": "^18.0.17",
"@types/react-dom": "^18.0.6",
"@vitejs/plugin-react": "^3.1.0",
"@vitest/coverage-c8": "^0.28.3",
"@vitest/ui": "^0.28.3",
"babel-loader": "^9.1.2",
"billboard.js": "^3.5.1",
"jsdom": "^21.1.0",
"playwright": "^1.25.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^4.6.4",
"vite": "^4.1.1",
"vitest": "^0.28.3"
"@babel/core": "^7.25.2",
"@playwright/test": "^1.46.1",
"@storybook/addon-actions": "^8.2.9",
"@storybook/addon-console": "^3.0.0",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-interactions": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/builder-vite": "^8.2.9",
"@storybook/react": "^8.2.9",
"@storybook/testing-library": "^0.2.2",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitest/coverage-c8": "^0.33.0",
"@vitest/coverage-v8": "^2.0.5",
"@vitest/ui": "^2.0.5",
"babel-loader": "^9.1.3",
"billboard.js": "^3.12.4",
"jsdom": "^24.1.1",
"playwright": "^1.46.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vitest": "^2.0.5"
}
}
11 changes: 10 additions & 1 deletion packages/react/vitest.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ export default mergeConfig(viteConfig, defineConfig({
test: {
testTimeout: 3_000,
hookTimeout: 5_000,
globals: true
globals: true,
coverage: {
provider: "istanbul",
reporter: ["text-summary", "html", "lcovonly"],
enabled: true,
include: [
"src/**/**",
],
extension: ["ts"]
}
}
}));
Loading

0 comments on commit 1d26e13

Please sign in to comment.