Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.7.1 #9

Merged
merged 2 commits into from
May 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,8 @@
const pkg = require('./package.json');

module.exports = {
plugins: [
// '@typescript-eslint',
'prettier',
],
extends: [
// 'airbnb-typescript',
'react-app',
// 'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'prettier',
],
plugins: ['prettier'],
extends: ['airbnb-typescript', 'react-app', 'plugin:prettier/recommended', 'prettier'],
parserOptions: {
project: './tsconfig.eslint.json',
},
Expand Down
768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs

This file was deleted.

785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ packageExtensions:
dependencies:
eslint-import-resolver-node: "*"

yarnPath: .yarn/releases/yarn-3.1.1.cjs
yarnPath: .yarn/releases/yarn-3.2.0.cjs
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module.exports = {
testEnvironment: 'jsdom',
preset: 'ts-jest',
preset: 'ts-jest/presets/js-with-ts-esm',
rootDir: './src',
testRegex: '((\\.|/)(test|spec))\\.tsx?$',
};
65 changes: 33 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "chartjs-chart-venn",
"description": "Chart.js module for venn diagrams",
"version": "3.7.0",
"version": "3.7.1",
"author": {
"name": "Samuel Gratzl",
"email": "sam@sgratzl.com",
Expand Down Expand Up @@ -34,51 +34,52 @@
"src/**/*.ts"
],
"peerDependencies": {
"chart.js": "^3.7.0"
"chart.js": "^3.7.1"
},
"browserslist": [
"Firefox ESR",
"last 2 Chrome versions",
"last 2 Firefox versions"
],
"devDependencies": {
"@rollup/plugin-commonjs": "^21.0.1",
"@chiogen/rollup-plugin-terser": "^7.0.2",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-replace": "^3.0.1",
"@rollup/plugin-typescript": "^8.3.0",
"@rollup/plugin-node-resolve": "^13.2.1",
"@rollup/plugin-replace": "^4.0.0",
"@rollup/plugin-typescript": "^8.3.2",
"@types/d3-selection": "^3.0.1",
"@types/jest": "^27.4.0",
"@types/jest": "^27.4.1",
"@types/jest-image-snapshot": "^4.3.1",
"@types/node": "^17.0.16",
"@typescript-eslint/eslint-plugin": "^5.11.0",
"@typescript-eslint/parser": "^5.11.0",
"@yarnpkg/sdks": "^2.5.0",
"canvas": "^2.9.0",
"@types/node": "^17.0.31",
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"@yarnpkg/sdks": "^2.6.0",
"canvas": "^2.9.1",
"canvas-5-polyfill": "^0.1.5",
"chart.js": "^3.7.0",
"eslint": "^8.8.0",
"eslint-config-airbnb-typescript": "^16.1.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^7.0.0",
"chart.js": "^3.7.1",
"eslint": "^8.14.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.5.0",
"jest": "^27.5.1",
"jest-environment-jsdom": "^27.5.1",
"jest-image-snapshot": "^4.5.1",
"prettier": "^2.5.1",
"prettier": "^2.6.2",
"rimraf": "^3.0.2",
"rollup": "^2.67.1",
"rollup": "^2.71.1",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-dts": "^4.1.0",
"rollup-plugin-terser": "^7.0.2",
"ts-jest": "^27.1.3",
"tslib": "^2.3.1",
"typedoc": "^0.22.11",
"typescript": "^4.5.5"
"rollup-plugin-dts": "^4.2.1",
"ts-jest": "^27.1.4",
"tslib": "^2.4.0",
"typedoc": "^0.22.15",
"typescript": "^4.6.4"
},
"scripts": {
"clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\"",
Expand All @@ -87,9 +88,9 @@
"start": "yarn run watch",
"watch": "rollup -c -w",
"build": "rollup -c",
"test": "jest --passWithNoTests",
"test:watch": "jest --passWithNoTests --watch",
"test:coverage": "jest --passWithNoTests --coverage",
"test": "jest --passWithNoTests --detectOpenHandles --forceExit",
"test:watch": "yarn run test --watch",
"test:coverage": "yarn run test --coverage",
"samples": "yarn tsc samples/type_test.ts",
"lint": "yarn run eslint && yarn run prettier",
"fix": "yarn run eslint:fix && yarn run prettier:write",
Expand All @@ -103,5 +104,5 @@
"dependencies": {
"@upsetjs/venn.js": "^1.4.2"
},
"packageManager": "yarn@3.1.1"
"packageManager": "yarn@3.2.0"
}
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import resolve from '@rollup/plugin-node-resolve';
import cleanup from 'rollup-plugin-cleanup';
import dts from 'rollup-plugin-dts';
import typescript from '@rollup/plugin-typescript';
import { terser } from 'rollup-plugin-terser';
import { terser } from '@chiogen/rollup-plugin-terser';
import replace from '@rollup/plugin-replace';
import json from '@rollup/plugin-json';

Expand Down
2 changes: 1 addition & 1 deletion samples/data.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Venn Diagram Chart</title>
<script src="https://unpkg.com/chart.js@3.7.0"></script>
<script src="https://unpkg.com/chart.js@3.7.1"></script>
<script src="../build/index.umd.js"></script>
</head>

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>Venn Diagram Chart</title>
<script src="https://unpkg.com/chart.js@3.7.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/default_esm.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<script type="importmap-shim">
{
"imports": {
"chart.js": "https://unpkg.com/chart.js@3.7.0?module",
"chart.js": "https://unpkg.com/chart.js@3.7.1?module",
"@upsetjs/venn.js": "https://unpkg.com/@upsetjs/venn.js?module",
"chartjs-chart-venn": "../build/index.js"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/euler.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Euler Diagram Chart</title>
<script src="https://unpkg.com/chart.js@3.7.0"></script>
<script src="https://unpkg.com/chart.js@3.7.1"></script>
<script src="https://unpkg.com/@upsetjs/venn.js"></script>
<script src="../build/index.umd.js"></script>
<style>
Expand Down
2 changes: 1 addition & 1 deletion samples/styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Venn Diagram Chart</title>
<script src="https://unpkg.com/chart.js@3.7.0/dist/chart.js"></script>
<script src="https://unpkg.com/chart.js@3.7.1/dist/chart.js"></script>
<script src="../build/index.umd.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion samples/venn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Venn Diagram Chart</title>
<script src="https://unpkg.com/chart.js@3.7.0"></script>
<script src="https://unpkg.com/chart.js@3.7.1"></script>
<script src="../build/index.umd.js"></script>
<style>
@media (prefers-color-scheme: dark) {
Expand Down
Loading