Skip to content

Commit

Permalink
Merge pull request #23 from upsetjs/upgrade
Browse files Browse the repository at this point in the history
build: upgrade dependencies
  • Loading branch information
sgratzl authored Jan 21, 2024
2 parents 9565d08 + c14f96a commit 83de2a9
Show file tree
Hide file tree
Showing 16 changed files with 5,440 additions and 4,694 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- name: Extract version
id: extract_version
run: node -pe "'::set-output name=version::' + require('./package.json').version"
Expand All @@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"eslint.nodePath": ".yarn/sdks",
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
"files.eol": "\n",
"editor.detectIndentation": false,
"editor.tabSize": 2,
Expand Down
801 changes: 0 additions & 801 deletions .yarn/releases/yarn-3.2.4.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.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 @@ -6,4 +6,4 @@ packageExtensions:
dependencies:
eslint-import-resolver-node: "*"

yarnPath: .yarn/releases/yarn-3.2.4.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
68 changes: 36 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
},
"global": "CytoscapeBubbleSets",
"dependencies": {
"@types/cytoscape": "^3.19.9",
"@types/lodash.throttle": "^4.1.7",
"@types/cytoscape": "^3.19.16",
"@types/lodash.throttle": "^4.1.9",
"bubblesets-js": "^2.3.0",
"lodash.throttle": "^4.1.1"
},
Expand All @@ -50,39 +50,43 @@
"src/**/*.tsx"
],
"devDependencies": {
"@babel/core": "^7.20.2",
"@babel/preset-env": "^7.20.2",
"@rollup/plugin-babel": "^6.0.2",
"@rollup/plugin-commonjs": "^23.0.2",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.1",
"@rollup/plugin-typescript": "^9.0.2",
"@types/jest": "^29.2.2",
"@typescript-eslint/eslint-plugin": "^5.42.1",
"@typescript-eslint/parser": "^5.42.1",
"@yarnpkg/sdks": "^2.6.3",
"cytoscape": "^3.23.0",
"cytoscape-layers": "^2.3.0",
"eslint": "^8.27.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.5.0",
"@babel/core": "^7.23.7",
"@babel/preset-env": "^7.23.8",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.5",
"@rollup/plugin-typescript": "^11.1.6",
"@types/jest": "^29.5.11",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@yarnpkg/sdks": "^3.1.0",
"cytoscape": "^3.28.1",
"cytoscape-layers": "^2.4.3",
"eslint": "^8.56.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^29.3.1",
"prettier": "^2.7.1",
"rimraf": "^3.0.2",
"rollup": "^3.2.5",
"rollup-plugin-dts": "^5.0.0",
"jest": "^29.7.0",
"prettier": "^3.2.4",
"rimraf": "^5.0.5",
"rollup": "^4.9.6",
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-terser": "^7.0.2",
"ts-jest": "^29.0.3",
"tslib": "^2.4.1",
"typedoc": "^0.23.20",
"typescript": "^4.8.4"
"ts-jest": "^29.1.1",
"tslib": "^2.6.2",
"typedoc": "^0.25.7",
"typescript": "^5.3.3"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0"
},
"scripts": {
"clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\" \"samples/*.js\" \"samples/*.map\"",
Expand All @@ -102,5 +106,5 @@
"docs": "typedoc src/index.ts",
"prepare": "yarn run build"
},
"packageManager": "yarn@3.2.4"
"packageManager": "yarn@4.0.2"
}
2 changes: 1 addition & 1 deletion samples/bubbleclusters.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title>Sample</title>
Expand Down
2 changes: 1 addition & 1 deletion samples/component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title>Sample</title>
Expand Down
2 changes: 1 addition & 1 deletion samples/default.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title>Sample</title>
Expand Down
2 changes: 1 addition & 1 deletion samples/default_esm.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title>ESM Sample</title>
Expand Down
2 changes: 1 addition & 1 deletion samples/euler.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<title>Sample</title>
Expand Down
10 changes: 5 additions & 5 deletions src/BubbleSetPath.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import type cy from 'cytoscape';
import {
IOutlineOptions,
type IOutlineOptions,
Area,
createLineInfluenceArea,
createGenericInfluenceArea,
createRectangleInfluenceArea,
Rectangle,
Circle,
calculatePotentialOutline,
IRectangle,
IPotentialOptions,
type IRectangle,
type IPotentialOptions,
defaultOptions,
calculateVirtualEdges,
IRoutingOptions,
ILine,
type IRoutingOptions,
type ILine,
Line,
} from 'bubblesets-js';
import throttle from 'lodash.throttle';
Expand Down
4 changes: 2 additions & 2 deletions src/BubbleSetsPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type cy from 'cytoscape';
import { layers, ISVGLayer } from 'cytoscape-layers';
import BubbleSetPath, { IBubbleSetPathOptions } from './BubbleSetPath';
import { layers, type ISVGLayer } from 'cytoscape-layers';
import BubbleSetPath, { type IBubbleSetPathOptions } from './BubbleSetPath';

export interface IBubbleSetsPluginOptions extends IBubbleSetPathOptions {
layer?: ISVGLayer;
Expand Down
10 changes: 5 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"sourceMap": true,
"strict": true,
"removeComments": true,
"importsNotUsedAsValues": "error",
"verbatimModuleSyntax": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"strictBindCallApply": true,
Expand All @@ -26,8 +26,8 @@
"noEmit": true,
"paths": {
"@": ["./src"],
"*": ["*", "node_modules/*"]
}
"*": ["*", "node_modules/*"],
},
},
"include": ["src/**/*.ts", "src/**/*.tsx"],

Expand All @@ -38,6 +38,6 @@
"excludeExternals": true,
"excludePrivate": true,
"includeVersion": true,
"hideGenerator": true
}
"hideGenerator": true,
},
}
Loading

0 comments on commit 83de2a9

Please sign in to comment.