Skip to content

Commit

Permalink
Merge pull request #14 from sgratzl/release/v3.6.0
Browse files Browse the repository at this point in the history
Release v3.6.0
  • Loading branch information
sgratzl authored Nov 3, 2021
2 parents a8c412b + a6536f1 commit 2fdbbdf
Show file tree
Hide file tree
Showing 29 changed files with 2,267 additions and 1,676 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2.1.5
- uses: actions/setup-node@v2
with:
node-version: 14
- run: npm i -g yarn
- run: yarn set version 2
- run: cat .yarnrc_patch.yml >> .yarnrc.yml
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
uses: actions/cache@v2.1.4
uses: actions/cache@v2
with:
path: ./.yarn
key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
path: |
./.yarn/cache
./.yarn/unplugged
key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn2-
${{ runner.os }}-yarn2-v4
- run: yarn install
- run: yarn build
- run: yarn lint
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
base: main
title: Release ${{ steps.version.outputs.next_tag }}
labels: chore
reviewers: sgratzl
assignees: sgratzl
body: |
Releasing ${{ steps.version.outputs.next_tag }}.
30 changes: 9 additions & 21 deletions .github/workflows/release_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
- uses: actions/setup-node@v2.1.5
- uses: actions/setup-node@v2
with:
node-version: 14
- run: npm i -g yarn
- run: yarn set version 2
- run: cat .yarnrc_patch.yml >> .yarnrc.yml
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
uses: actions/cache@v2.1.4
uses: actions/cache@v2
with:
path: ./.yarn
key: ${{ runner.os }}-yarn2-${{ hashFiles('**/yarn.lock') }}
path: |
./.yarn/cache
./.yarn/unplugged
key: ${{ runner.os }}-yarn2-v4-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn2-
${{ runner.os }}-yarn2-v4
- run: yarn install
- run: yarn build
- run: yarn pack
Expand Down Expand Up @@ -85,17 +85,5 @@ jobs:
- name: Reset dev branch
run: |
git fetch origin main:main
git reset --hard main
- name: Create pull request into dev
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.PRIVATE_PAT }}
branch: bot/sync-main-dev
commit-message: 'chore: sync main-dev'
base: dev
title: 'chore: sync main->dev'
labels: chore
reviewers: sgratzl
assignees: sgratzl
body: |
Syncing Main->Dev.
git merge main
git push
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ npm-debug.log*
/coverage
/node_modules
.npm
/.yarnrc.yml
/.yarn
/.pnp.*
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/versions
.pnp.*

# Build files
/.tmp
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/.pnp.cjs
/.pnp*
/.yarnrc.yml
/.yarn
/build
Expand Down
17 changes: 0 additions & 17 deletions .release-it.json

This file was deleted.

768 changes: 768 additions & 0 deletions .yarn/releases/yarn-3.1.0.cjs

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
packageExtensions:
eslint-module-utils@*:
dependencies:
eslint-import-resolver-node: "*"

yarnPath: .yarn/releases/yarn-3.1.0.cjs
4 changes: 0 additions & 4 deletions .yarnrc_patch.yml

This file was deleted.

6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,8 @@ new BoxPlotChart(ctx, {

```sh
npm i -g yarn
yarn set version 2
cat .yarnrc_patch.yml >> .yarnrc.yml
yarn install
yarn pnpify --sdk vscode
yarn sdks vscode
```

### Common commands
Expand All @@ -125,8 +123,6 @@ yarn lint
yarn fix
yarn build
yarn docs
yarn release
yarn release:pre
```

## Credits
Expand Down
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sgratzl/chartjs-chart-boxplot",
"description": "Chart.js module for charting boxplots and violin charts",
"version": "3.5.1",
"version": "3.6.0",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -50,7 +50,7 @@
"src/**/*.tsx"
],
"peerDependencies": {
"chart.js": "^3.5.0"
"chart.js": "^3.6.0"
},
"browserslist": [
"Firefox ESR",
Expand All @@ -61,41 +61,41 @@
"@sgratzl/boxplots": "^1.2.2"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^20.0.0",
"@rollup/plugin-node-resolve": "^13.0.4",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-node-resolve": "^13.0.6",
"@rollup/plugin-replace": "^3.0.0",
"@rollup/plugin-typescript": "^8.2.5",
"@types/jest": "^26.0.24",
"@rollup/plugin-typescript": "^8.3.0",
"@types/jest": "^27.0.2",
"@types/jest-image-snapshot": "^4.3.1",
"@types/node": "^16.4.13",
"@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.29.0",
"@yarnpkg/pnpify": "^2.4.0",
"@types/node": "^16.11.6",
"@typescript-eslint/eslint-plugin": "^5.3.0",
"@typescript-eslint/parser": "^5.3.0",
"@yarnpkg/sdks": "^2.5.0",
"canvas": "^2.8.0",
"canvas-5-polyfill": "^0.1.5",
"chart.js": "^3.5.0",
"eslint": "^7.32.0",
"eslint-config-airbnb-typescript": "^12.3.1",
"chart.js": "^3.6.0",
"eslint": "^8.1.0",
"eslint-config-airbnb-typescript": "^14.0.1",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.9.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.26.1",
"eslint-plugin-react-hooks": "^4.2.0",
"jest": "^27.0.6",
"jest": "^27.3.1",
"jest-image-snapshot": "^4.5.1",
"prettier": "^2.3.2",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
"rollup": "^2.56.0",
"rollup": "^2.59.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-dts": "^3.0.2",
"rollup-plugin-dts": "^4.0.0",
"rollup-plugin-terser": "^7.0.2",
"ts-jest": "^27.0.4",
"tslib": "^2.3.0",
"typedoc": "^0.21.5",
"typescript": "^4.3.5"
"ts-jest": "^27.0.7",
"tslib": "^2.3.1",
"typedoc": "^0.22.7",
"typescript": "^4.4.4"
},
"scripts": {
"clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
Expand All @@ -116,9 +116,9 @@
"prepare": "yarn run build"
},
"dependenciesMeta": {
"chart.js@3.5.0": {
"chart.js@3.6.0": {
"unplugged": true
}
},
"packageManager": "yarn@3.0.0"
"packageManager": "yarn@3.1.0"
}
2 changes: 1 addition & 1 deletion samples/animation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/datalimits.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/datastructures.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions samples/default_esm.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<script type="importmap-shim">
{
"imports": {
"chart.js": "https://unpkg.com/chart.js@3.5.0?module",
"chart.js/helpers": "https://unpkg.com/chart.js@3.5.0/helpers/helpers.esm.js?module",
"chart.js": "https://unpkg.com/chart.js@3.6.0?module",
"chart.js/helpers": "https://unpkg.com/chart.js@3.6.0/helpers/helpers.esm.js?module",
"@sgratzl/boxplots": "https://unpkg.com/@sgratzl/boxplots?module",
"@sgratzl/chartjs-chart-boxplot": "../build/index.js"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/empty.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/fivenum.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/horizontalBoxplot.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Horizontal Bar Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/horizontalViolin.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Violin Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/hybrid.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="./utils.js"></script>
</head>
Expand Down
2 changes: 1 addition & 1 deletion samples/items.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/large_numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/logarithm.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/mediancolor.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/minmax.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Box Plot Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion samples/violin.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Violin Chart</title>
<script src="https://unpkg.com/chart.js@3.5.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.6.0/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
<script src="https://unpkg.com/d3-random@latest/dist/d3-random.min.js"></script>
<script src="./utils.js"></script>
Expand Down
Loading

0 comments on commit 2fdbbdf

Please sign in to comment.