build: upgrade and fix linting

sgratzl · sgratzl · commit 66b375d49835 · 2024-06-08T19:28:38.000-04:00
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,3 @@
-.pnp.js
+.pnp.*
 .yarnrc.yml
 .yarn
diff --git a/eslint.config.cjs b/eslint.config.cjs
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,21 @@
+import js from "@eslint/js";
+import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
+import jest from "eslint-plugin-jest";
+import globals from "globals";
+
+export default [
+  js.configs.recommended,
+  eslintPluginPrettierRecommended,
+  jest.configs['flat/recommended'],
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+    },
+    rules: {
+      "no-console": "off",
+      "no-unused-vars": "warn"
+    }
+  }
+];
diff --git a/examples/boundingbox.html b/examples/boundingbox.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/css_styled.html b/examples/css_styled.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/customLayout.html b/examples/customLayout.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/customLayoutCanvas.html b/examples/customLayoutCanvas.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/customLayoutDistinct.html b/examples/customLayoutDistinct.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/dynamic.html b/examples/dynamic.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/dynamicDistinct.html b/examples/dynamicDistinct.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/interactive.html b/examples/interactive.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/intersection_tooltip.html b/examples/intersection_tooltip.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/medical.html b/examples/medical.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/orientation_order.html b/examples/orientation_order.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/scaled.html b/examples/scaled.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/simple.html b/examples/simple.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/simple_viewbox.html b/examples/simple_viewbox.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/styled.html b/examples/styled.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/styled_centre.html b/examples/styled_centre.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/sublabels.html b/examples/sublabels.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/sublabels_static.html b/examples/sublabels_static.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/venn_venn.html b/examples/venn_venn.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/venn_venn_distinct.html b/examples/venn_venn_distinct.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/examples/weighted.html b/examples/weighted.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
diff --git a/package.json b/package.json
@@ -61,6 +61,7 @@
     "@babel/core": "^7.24.7",
     "@babel/plugin-transform-runtime": "^7.24.7",
     "@babel/preset-env": "^7.24.7",
+    "@eslint/js": "^9.4.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -69,11 +70,12 @@
     "canvas": "^2.11.2",
     "eslint": "^9.4.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-prettier": "^5.1.3",
+    "globals": "^15.4.0",
     "jest": "^29.7.0",
     "jest-image-snapshot": "^6.4.0",
     "prettier": "^3.3.1",
-    "release-it": "^17.3.0",
     "rimraf": "^5.0.7",
     "rollup": "^4.18.0",
     "rollup-plugin-pnp-resolve": "^2.0.0",
diff --git a/src/diagram.js b/src/diagram.js
@@ -2,8 +2,6 @@ import { venn, lossFunction, logRatioLossFunction, normalizeSolution, scaleSolut
 import { intersectionArea, distance, getCenter } from './circleintersection';
 import { nelderMead } from 'fmin';
 
-/*global console:true*/
-
 /**
  * VennDiagram includes an optional `options` parameter containing the following option(s):
  *
@@ -45,19 +43,19 @@ export function VennDiagram(options = {}) {
       options && options.colourScheme
         ? options.colourScheme
         : options && options.colorScheme
-        ? options.colorScheme
-        : [
-            '#1f77b4',
-            '#ff7f0e',
-            '#2ca02c',
-            '#d62728',
-            '#9467bd',
-            '#8c564b',
-            '#e377c2',
-            '#7f7f7f',
-            '#bcbd22',
-            '#17becf',
-          ],
+          ? options.colorScheme
+          : [
+              '#1f77b4',
+              '#ff7f0e',
+              '#2ca02c',
+              '#d62728',
+              '#9467bd',
+              '#8c564b',
+              '#e377c2',
+              '#7f7f7f',
+              '#bcbd22',
+              '#17becf',
+            ],
     colourIndex = 0,
     colours = function (key) {
       if (key in colourMap) {
@@ -308,7 +306,7 @@ export function VennDiagram(options = {}) {
   };
 
   chart.colors = function (_) {
-    if (!arguments.length) return colors;
+    if (!arguments.length) return colours;
     colours = _;
     return chart;
   };
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -.pnp.js
 +.pnp.*
 .yarnrc.yml
 .yarn
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!doctype html>`
`2`	`2`	`<html lang="en">`
`3`	`3`	`<head>`
`4`	`4`	`<meta charset="utf-8" />`