Merge pull request #14 from upsetjs/release/v3.2.0

Release v3.2.0

.github/workflows/ci.yml

@@ -6,14 +6,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - run: npm i -g yarn
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ./.yarn/cache

.github/workflows/create_release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: main
           ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}

.github/workflows/release_helper.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: 16
       - name: Extract version
         id: extract_version
         run: node -pe "'::set-output name=version::' + require('./package.json').version"
@@ -42,14 +42,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 16
       - run: npm i -g yarn
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ./.yarn/cache

.yarnrc.yml

@@ -6,4 +6,4 @@ packageExtensions:
     dependencies:
       eslint-import-resolver-node: "*"
 
-yarnPath: .yarn/releases/yarn-3.1.0.cjs
+yarnPath: .yarn/releases/yarn-3.2.4.cjs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Samuel Gratzl
+Copyright (c) 2021-2022 Samuel Gratzl
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -9,14 +9,14 @@ A [Cytoscape.js](https://js.cytoscape.org) plugin for rendering [Bubblesets](htt
 ## Install
 
 ```sh
-npm install cytoscape cytoscape-bubblesets
+npm install cytoscape cytoscape-layers cytoscape-bubblesets
 ```
 
 ## Usage
 
 see [Samples](./samples) on Github
 
-or at this [![Open in CodePen][codepen]](https://codepen.io/sgratzl/pen/TODO)
+or at this [![Open in CodePen][codepen]](https://codepen.io/sgratzl/pen/RwQdBLY)
 
 ```js
 import cytoscape from 'cytoscape';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cytoscape-bubblesets",
   "description": "Cytoscape.js plugin for rendering bubblesets",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -22,23 +22,24 @@
   },
   "global": "CytoscapeBubbleSets",
   "dependencies": {
-    "@types/cytoscape": "^3.19.0",
-    "@types/lodash.throttle": "^4.1.6",
-    "bubblesets-js": "^2.2.0",
+    "@types/cytoscape": "^3.19.9",
+    "@types/lodash.throttle": "^4.1.7",
+    "bubblesets-js": "^2.3.0",
     "lodash.throttle": "^4.1.1"
   },
   "peerDependencies": {
-    "cytoscape": "^3.20.0",
-    "cytoscape-layers": "^2.2.0"
+    "cytoscape": "^3.23.0",
+    "cytoscape-layers": "^2.3.0"
   },
   "browserslist": [
     "Firefox ESR",
     "last 2 Chrome versions",
     "last 2 Firefox versions"
   ],
   "module": "build/index.js",
-  "main": "build/index.cjs.js",
-  "browser": "build/index.umd.js",
+  "main": "build/index.cjs",
+  "require": "build/index.cjs",
+  "umd": "build/index.umd.js",
   "unpkg": "build/index.umd.min.js",
   "jsdelivr": "build/index.umd.min.js",
   "types": "build/index.d.ts",
@@ -49,39 +50,39 @@
     "src/**/*.tsx"
   ],
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-node-resolve": "^13.0.6",
-    "@rollup/plugin-replace": "^3.0.0",
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@types/jest": "^27.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.3.0",
-    "@typescript-eslint/parser": "^5.3.0",
-    "@yarnpkg/sdks": "^2.5.0",
-    "cytoscape": "^3.20.0",
-    "cytoscape-layers": "^2.2.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",
+    "@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",
+    "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "jest": "^27.3.1",
-    "prettier": "^2.4.1",
+    "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-react-hooks": "^4.6.0",
+    "jest": "^29.3.1",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.59.0",
-    "rollup-plugin-dts": "^4.0.0",
+    "rollup": "^3.2.5",
+    "rollup-plugin-dts": "^5.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "ts-jest": "^27.0.7",
-    "tslib": "^2.3.1",
-    "typedoc": "^0.22.7",
-    "typescript": "^4.4.4"
+    "ts-jest": "^29.0.3",
+    "tslib": "^2.4.1",
+    "typedoc": "^0.23.20",
+    "typescript": "^4.8.4"
   },
   "scripts": {
     "clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\" \"samples/*.js\" \"samples/*.map\"",
@@ -100,5 +101,6 @@
     "eslint:fix": "yarn run eslint --fix",
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
-  }
+  },
+  "packageManager": "yarn@3.2.4"
 }

rollup.config.js → rollup.config.mjs

@@ -13,7 +13,7 @@ const pkg = JSON.parse(fs.readFileSync('./package.json'));
 function resolveYear() {
   // Extract copyrights from the LICENSE.
   const license = fs.readFileSync('./LICENSE', 'utf-8').toString();
-  const matches = Array.from(license.matchAll(/\(c\) (\d+)/gm));
+  const matches = Array.from(license.matchAll(/\(c\) (\d+-\d+)/gm));
   if (!matches || matches.length === 0) {
     return 2021;
   }
@@ -79,19 +79,19 @@ export default function Config(options) {
         },
         buildFormat('cjs') && {
           ...base.output,
-          file: pkg.main,
+          file: pkg.require,
           format: 'cjs',
         },
       ].filter(Boolean),
     },
-    ((buildFormat('umd') && pkg.browser) || (buildFormat('umd-min') && pkg.unpkg)) && {
+    ((buildFormat('umd') && pkg.umd) || (buildFormat('umd-min') && pkg.unpkg)) && {
       ...base,
       input: fs.existsSync(base.input.replace('.ts', '.umd.ts')) ? base.input.replace('.ts', '.umd.ts') : base.input,
       output: [
         buildFormat('umd') &&
-          pkg.browser && {
+          pkg.umd && {
             ...base.output,
-            file: pkg.browser,
+            file: pkg.umd,
             format: 'umd',
             name: pkg.global,
           },