From 03b860a6a79c8e22bc61444072b53789c1f816fb Mon Sep 17 00:00:00 2001 From: Kodai Aoyama Date: Fri, 13 May 2022 00:19:26 +0900 Subject: [PATCH] update and replace ui dependencies --- README.ja.md | 2 +- README.md | 38 +-- ui/package-lock.json | 227 +++++++++--------- ui/package.json | 12 +- ui/src/index.jsx | 5 +- ui/src/rete.jsx | 10 +- .../rete/controls/EditableJsonComponent.jsx | 2 +- ui/src/rete/controls/EditableSqlComponent.jsx | 2 +- ui/src/rete/controls/EditableUrlComponent.jsx | 2 +- ui/src/rete/controls/PathControl.jsx | 4 +- .../template/EditableHandlebarsComponent.jsx | 2 +- .../template/EditablePugComponent.jsx | 2 +- 12 files changed, 158 insertions(+), 150 deletions(-) diff --git a/README.ja.md b/README.ja.md index e8caa7c..739ac74 100644 --- a/README.ja.md +++ b/README.ja.md @@ -205,7 +205,7 @@ TUNA-Mayonnaise（ツナマヨ）は、多くのOSSによって成り立って | [react-dom](https://www.npmjs.com/package/react-dom) | MIT License | | [react-modal](https://www.npmjs.com/package/react-modal) | MIT License | | [react-simple-code-editor](https://www.npmjs.com/package/react-simple-code-editor) | MIT License | - | [react-toastify](https://www.npmjs.com/package/react-toastify) | MIT License | + | [react-hot-toast](https://www.npmjs.com/package/react-hot-toast) | MIT License | | [regenerator-runtime](https://www.npmjs.com/package/regenerator-runtime) | MIT License | | [rete](https://www.npmjs.com/package/rete) | MIT License | | [rete-area-plugin](https://www.npmjs.com/package/rete-area-plugin) | ISC | diff --git a/README.md b/README.md index 7bcbb57..4a27573 100644 --- a/README.md +++ b/README.md @@ -18,20 +18,28 @@ TUNA-Mayonnaise is a CommandLineTool to generate and serve JSON/HTML on the node
CLICK -- [Why](#why) -- [Get Started](#get-started) - - [Install](#install) - - [Usage](#usage) -- [Tool Features](#tool-features) - - [Template Engine](#template-engine) - - [API](#api) - - [Database](#database) -- [API Features](#api-features) - - [Monitoring](#monitoring) -- [Dependencies](#dependencies) - - [BACKEND Dependencies](#backend-dependencies) - - [FRONTEND Dependencies](#frontend-dependencies) - - [FRONTEND DEV Dependencies](#frontend-dev-dependencies) +- [!tuna-mayonnaise](#) + - [Table of Contents](#table-of-contents) + - [Why](#why) + - [Get Started](#get-started) + - [Install](#install) + - [For MacOS (Homebrew)](#for-macos-homebrew) + - [For Others (Binary Releases)](#for-others-binary-releases) + - [Usage](#usage) + - [1. Launch a tool on your browser](#1-launch-a-tool-on-your-browser) + - [2. Serve your JSON/HTML](#2-serve-your-jsonhtml) + - [Tool Features](#tool-features) + - [Template Engine](#template-engine) + - [API](#api) + - [Database](#database) + - [Connection Options](#connection-options) + - [TLS / SSL](#tls--ssl) + - [API Features](#api-features) + - [Monitoring](#monitoring) + - [Dependencies](#dependencies) + - [BACKEND Dependencies](#backend-dependencies) + - [FRONTEND Dependencies](#frontend-dependencies) + - [FRONTEND DEV Dependencies](#frontend-dev-dependencies)
@@ -208,7 +216,7 @@ TUNA-Mayonnaise stands on the shoulder of many great open source libraries, in l | [react-dom](https://www.npmjs.com/package/react-dom) | MIT License | | [react-modal](https://www.npmjs.com/package/react-modal) | MIT License | | [react-simple-code-editor](https://www.npmjs.com/package/react-simple-code-editor) | MIT License | - | [react-toastify](https://www.npmjs.com/package/react-toastify) | MIT License | + | [react-hot-toast](https://www.npmjs.com/package/react-hot-toast) | MIT License | | [regenerator-runtime](https://www.npmjs.com/package/regenerator-runtime) | MIT License | | [rete](https://www.npmjs.com/package/rete) | MIT License | | [rete-area-plugin](https://www.npmjs.com/package/rete-area-plugin) | ISC | diff --git a/ui/package-lock.json b/ui/package-lock.json index 1c251e7..c122556 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -16,9 +16,9 @@ "prismjs": "1.28.0", "react": "18.1.0", "react-dom": "18.1.0", + "react-hot-toast": "2.2.0", "react-modal": "3.15.1", "react-simple-code-editor": "0.11.0", - "react-toastify": "^8.2.0", "regenerator-runtime": "0.13.9", "rete": "1.4.7", "rete-area-plugin": "0.2.1", @@ -34,24 +34,24 @@ }, "devDependencies": { "@vitejs/plugin-react": "1.3.2", - "eslint": "8.14.0", + "eslint": "8.15.0", "eslint-config-airbnb": "19.0.4", "eslint-config-prettier": "8.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-jsx-a11y": "6.5.1", "eslint-plugin-react": "7.29.4", "eslint-plugin-react-hooks": "^4.5.0", - "husky": "7.0.4", + "husky": "8.0.1", "lint-staged": "12.4.1", "prettier": "2.6.2", "rollup-plugin-visualizer": "5.6.0", - "stylelint": "14.8.1", + "stylelint": "14.8.2", "stylelint-config-prettier": "9.0.3", "stylelint-config-recommended": "7.0.0", "stylelint-order": "5.0.0", "stylelint-prettier": "2.0.0", - "vite": "2.9.7", - "vite-plugin-externals": "0.4.0" + "vite": "2.9.9", + "vite-plugin-externals": "0.5.0" }, "engines": { "node": "18", @@ -478,19 +478,19 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", - "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz", + "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.1", + "espree": "^9.3.2", "globals": "^13.9.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, "engines": { @@ -498,9 +498,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", - "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", + "version": "13.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", + "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1112,14 +1112,6 @@ "node": ">=6" } }, - "node_modules/clsx": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", - "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==", - "engines": { - "node": ">=6" - } - }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -1825,12 +1817,12 @@ } }, "node_modules/eslint": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", - "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz", + "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.2.2", + "@eslint/eslintrc": "^1.2.3", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -1841,7 +1833,7 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.1", + "espree": "^9.3.2", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1857,7 +1849,7 @@ "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "regexpp": "^3.2.0", @@ -2273,13 +2265,13 @@ } }, "node_modules/espree": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", - "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", + "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", "dev": true, "dependencies": { - "acorn": "^8.7.0", - "acorn-jsx": "^5.3.1", + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -2733,6 +2725,14 @@ "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", "dev": true }, + "node_modules/goober": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.9.tgz", + "integrity": "sha512-PAtnJbrWtHbfpJUIveG5PJIB6Mc9Kd0gimu9wZwPyA+wQUSeOeA4x4Ug16lyaaUUKZ/G6QEH1xunKOuXP1F4Vw==", + "peerDependencies": { + "csstype": "^3.0.10" + } + }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -2870,15 +2870,15 @@ } }, "node_modules/husky": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", - "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", "dev": true, "bin": { "husky": "lib/bin.js" }, "engines": { - "node": ">=12" + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/typicode" @@ -3379,9 +3379,9 @@ } }, "node_modules/known-css-properties": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", - "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz", + "integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==", "dev": true }, "node_modules/language-subtag-registry": { @@ -4499,6 +4499,21 @@ "react": "^18.1.0" } }, + "node_modules/react-hot-toast": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.2.0.tgz", + "integrity": "sha512-248rXw13uhf/6TNDVzagX+y7R8J183rp7MwUMNkcrBRyHj/jWOggfXTGlM8zAOuh701WyVW+eUaWG2LeSufX9g==", + "dependencies": { + "goober": "^2.1.1" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": ">=16", + "react-dom": ">=16" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -4545,18 +4560,6 @@ "react-dom": "^16.0.0" } }, - "node_modules/react-toastify": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz", - "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==", - "dependencies": { - "clsx": "^1.1.1" - }, - "peerDependencies": { - "react": ">=16", - "react-dom": ">=16" - } - }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -5314,9 +5317,9 @@ "dev": true }, "node_modules/stylelint": { - "version": "14.8.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.1.tgz", - "integrity": "sha512-0YxTop3wTeEVmQWhS7jjLFaBkvfPmffRiJ6eFIDlK++f3OklaobTYFJu32E5u/cIrFLbcW52pLqrYpihA/y0/w==", + "version": "14.8.2", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz", + "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==", "dev": true, "dependencies": { "balanced-match": "^2.0.0", @@ -5337,14 +5340,14 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.24.0", + "known-css-properties": "^0.25.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.13", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", @@ -5831,9 +5834,9 @@ } }, "node_modules/vite": { - "version": "2.9.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.7.tgz", - "integrity": "sha512-5hH7aNQe8rJiTTqCtPNX/6mIKlGw+1wg8UXwAxDIIN8XaSR+Zx3GT2zSu7QKa1vIaBqfUODGh3vpwY8r0AW/jw==", + "version": "2.9.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.9.tgz", + "integrity": "sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==", "dev": true, "dependencies": { "esbuild": "^0.14.27", @@ -5868,9 +5871,9 @@ } }, "node_modules/vite-plugin-externals": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/vite-plugin-externals/-/vite-plugin-externals-0.4.0.tgz", - "integrity": "sha512-Z4VQq88ACTOa1ANu+tBYmVPwHswytR5v0t1aAcRRTThBY/VN5D86cf2m2tcXZVtWQ9z9QK6NmhuNTR8QL1fIhw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/vite-plugin-externals/-/vite-plugin-externals-0.5.0.tgz", + "integrity": "sha512-y7SPpHGLSk5ELCbK0SBRJrEr2OuPFxCOKIVkrFECukp9w8hZwh3teCHo2U2UmJ8UHKUP7BoOhTw2DFRbq3GJfQ==", "dev": true, "dependencies": { "acorn": "^8.4.0", @@ -6434,26 +6437,26 @@ } }, "@eslint/eslintrc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", - "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz", + "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.1", + "espree": "^9.3.2", "globals": "^13.9.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, "dependencies": { "globals": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", - "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", + "version": "13.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", + "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -6901,11 +6904,6 @@ "is-regexp": "^2.0.0" } }, - "clsx": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", - "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" - }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -7353,12 +7351,12 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", - "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz", + "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.2.2", + "@eslint/eslintrc": "^1.2.3", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -7369,7 +7367,7 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.1", + "espree": "^9.3.2", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -7385,7 +7383,7 @@ "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "regexpp": "^3.2.0", @@ -7688,13 +7686,13 @@ "dev": true }, "espree": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", - "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", + "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", "dev": true, "requires": { - "acorn": "^8.7.0", - "acorn-jsx": "^5.3.1", + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" } }, @@ -8043,6 +8041,11 @@ "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", "dev": true }, + "goober": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.9.tgz", + "integrity": "sha512-PAtnJbrWtHbfpJUIveG5PJIB6Mc9Kd0gimu9wZwPyA+wQUSeOeA4x4Ug16lyaaUUKZ/G6QEH1xunKOuXP1F4Vw==" + }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -8133,9 +8136,9 @@ "dev": true }, "husky": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", - "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", "dev": true }, "ignore": { @@ -8478,9 +8481,9 @@ "dev": true }, "known-css-properties": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", - "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz", + "integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==", "dev": true }, "language-subtag-registry": { @@ -9283,6 +9286,14 @@ "scheduler": "^0.22.0" } }, + "react-hot-toast": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.2.0.tgz", + "integrity": "sha512-248rXw13uhf/6TNDVzagX+y7R8J183rp7MwUMNkcrBRyHj/jWOggfXTGlM8zAOuh701WyVW+eUaWG2LeSufX9g==", + "requires": { + "goober": "^2.1.1" + } + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -9315,14 +9326,6 @@ "resolved": "https://registry.npmjs.org/react-simple-code-editor/-/react-simple-code-editor-0.11.0.tgz", "integrity": "sha512-xGfX7wAzspl113ocfKQAR8lWPhavGWHL3xSzNLeseDRHysT+jzRBi/ExdUqevSMos+7ZtdfeuBOXtgk9HTwsrw==" }, - "react-toastify": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz", - "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==", - "requires": { - "clsx": "^1.1.1" - } - }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -9889,9 +9892,9 @@ "dev": true }, "stylelint": { - "version": "14.8.1", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.1.tgz", - "integrity": "sha512-0YxTop3wTeEVmQWhS7jjLFaBkvfPmffRiJ6eFIDlK++f3OklaobTYFJu32E5u/cIrFLbcW52pLqrYpihA/y0/w==", + "version": "14.8.2", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz", + "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==", "dev": true, "requires": { "balanced-match": "^2.0.0", @@ -9912,14 +9915,14 @@ "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.24.0", + "known-css-properties": "^0.25.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.13", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", @@ -10286,9 +10289,9 @@ } }, "vite": { - "version": "2.9.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.7.tgz", - "integrity": "sha512-5hH7aNQe8rJiTTqCtPNX/6mIKlGw+1wg8UXwAxDIIN8XaSR+Zx3GT2zSu7QKa1vIaBqfUODGh3vpwY8r0AW/jw==", + "version": "2.9.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.9.tgz", + "integrity": "sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==", "dev": true, "requires": { "esbuild": "^0.14.27", @@ -10299,9 +10302,9 @@ } }, "vite-plugin-externals": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/vite-plugin-externals/-/vite-plugin-externals-0.4.0.tgz", - "integrity": "sha512-Z4VQq88ACTOa1ANu+tBYmVPwHswytR5v0t1aAcRRTThBY/VN5D86cf2m2tcXZVtWQ9z9QK6NmhuNTR8QL1fIhw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/vite-plugin-externals/-/vite-plugin-externals-0.5.0.tgz", + "integrity": "sha512-y7SPpHGLSk5ELCbK0SBRJrEr2OuPFxCOKIVkrFECukp9w8hZwh3teCHo2U2UmJ8UHKUP7BoOhTw2DFRbq3GJfQ==", "dev": true, "requires": { "acorn": "^8.4.0", diff --git a/ui/package.json b/ui/package.json index 45ea6ce..493b3a3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -17,9 +17,9 @@ "prismjs": "1.28.0", "react": "18.1.0", "react-dom": "18.1.0", + "react-hot-toast": "2.2.0", "react-modal": "3.15.1", "react-simple-code-editor": "0.11.0", - "react-toastify": "^8.2.0", "regenerator-runtime": "0.13.9", "rete": "1.4.7", "rete-area-plugin": "0.2.1", @@ -35,24 +35,24 @@ }, "devDependencies": { "@vitejs/plugin-react": "1.3.2", - "eslint": "8.14.0", + "eslint": "8.15.0", "eslint-config-airbnb": "19.0.4", "eslint-config-prettier": "8.5.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-jsx-a11y": "6.5.1", "eslint-plugin-react": "7.29.4", "eslint-plugin-react-hooks": "^4.5.0", - "husky": "7.0.4", + "husky": "8.0.1", "lint-staged": "12.4.1", "prettier": "2.6.2", "rollup-plugin-visualizer": "5.6.0", - "stylelint": "14.8.1", + "stylelint": "14.8.2", "stylelint-config-prettier": "9.0.3", "stylelint-config-recommended": "7.0.0", "stylelint-order": "5.0.0", "stylelint-prettier": "2.0.0", - "vite": "2.9.7", - "vite-plugin-externals": "0.4.0" + "vite": "2.9.9", + "vite-plugin-externals": "0.5.0" }, "overrides": { "rete-context-menu-plugin": { diff --git a/ui/src/index.jsx b/ui/src/index.jsx index bc6d269..9fc82f8 100644 --- a/ui/src/index.jsx +++ b/ui/src/index.jsx @@ -1,7 +1,6 @@ import "regenerator-runtime/runtime"; import Modal from "react-modal"; -import { ToastContainer } from "react-toastify"; -import "react-toastify/dist/ReactToastify.css"; +import { Toaster } from "react-hot-toast"; import "./styles.css"; import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; @@ -9,7 +8,7 @@ import { createEditor } from "./rete"; const App = () => (
- + { - import("react-toastify").then(({ toast }) => - toast.error("NOT CONNECTED :(") - ); + import("react-hot-toast").then((_) => _.toast.error("NOT CONNECTED :(")); }; editor.use(ContextMenuPlugin, { searchBar: false, @@ -134,8 +132,8 @@ export async function createEditor(container) { }) .then((res) => { res.ok - ? import("react-toastify").then(({ toast }) => - toast.success("SAVED :)") + ? import("react-hot-toast").then((_) => + _.toast.success("SAVED :)") ) : errorHandlerOnSave(); }) @@ -245,7 +243,7 @@ export async function createEditor(container) { if (data !== null) { await editor.fromJSON(data); - import("react-toastify").then(({ toast }) => toast.success("RESUMED :)")); + import("react-hot-toast").then((_) => _.toast.success("RESUMED :)")); } else { const endpoint = await components[0].createNode(); endpoint.position = [1000, 200]; diff --git a/ui/src/rete/controls/EditableJsonComponent.jsx b/ui/src/rete/controls/EditableJsonComponent.jsx index 1e7ae2a..5124dea 100644 --- a/ui/src/rete/controls/EditableJsonComponent.jsx +++ b/ui/src/rete/controls/EditableJsonComponent.jsx @@ -12,7 +12,7 @@ export const EditableJsonComponent = ({ value, onChange }) => { const [stack, setStack] = useState(null); useInterval(() => { if (stack !== null) { - import("react-toastify").then(({ toast }) => toast.error(stack)); + import("react-hot-toast").then((_) => _.toast.error(stack)); setStack(null); } }, 10000); diff --git a/ui/src/rete/controls/EditableSqlComponent.jsx b/ui/src/rete/controls/EditableSqlComponent.jsx index 67b81c3..80a69ee 100644 --- a/ui/src/rete/controls/EditableSqlComponent.jsx +++ b/ui/src/rete/controls/EditableSqlComponent.jsx @@ -12,7 +12,7 @@ export const EditableSqlComponent = ({ value, onChange }) => { const [stack, setStack] = useState(null); useInterval(() => { if (stack !== null) { - import("react-toastify").then(({ toast }) => toast.error(stack)); + import("react-hot-toast").then((_) => _.toast.error(stack)); setStack(null); } }, 10000); diff --git a/ui/src/rete/controls/EditableUrlComponent.jsx b/ui/src/rete/controls/EditableUrlComponent.jsx index 3fa63b9..9f400ed 100644 --- a/ui/src/rete/controls/EditableUrlComponent.jsx +++ b/ui/src/rete/controls/EditableUrlComponent.jsx @@ -11,7 +11,7 @@ export const EditableUrlComponent = ({ value, onChange }) => { const [stack, setStack] = useState(null); useInterval(() => { if (stack !== null) { - import("react-toastify").then(({ toast }) => toast.error(stack)); + import("react-hot-toast").then((_) => _.toast.error(stack)); setStack(null); } }, 10000); diff --git a/ui/src/rete/controls/PathControl.jsx b/ui/src/rete/controls/PathControl.jsx index 2840047..2b07462 100644 --- a/ui/src/rete/controls/PathControl.jsx +++ b/ui/src/rete/controls/PathControl.jsx @@ -50,8 +50,8 @@ export class PathControl extends Rete.Control { this.props.warn = true; } else if (v === "/metrics" || v === "/health") { this.props.warn = true; - import("react-toastify").then(({ toast }) => - toast.error("this Path is reserved, use another Path.") + import("react-hot-toast").then((_) => + _.toast.error("this Path is reserved, use another Path.") ); } else { this.props.warn = false; diff --git a/ui/src/rete/controls/template/EditableHandlebarsComponent.jsx b/ui/src/rete/controls/template/EditableHandlebarsComponent.jsx index 3ca002e..8baac23 100644 --- a/ui/src/rete/controls/template/EditableHandlebarsComponent.jsx +++ b/ui/src/rete/controls/template/EditableHandlebarsComponent.jsx @@ -13,7 +13,7 @@ export const EditableHandlebarsComponent = ({ value, onChange }) => { const [stack, setStack] = useState(null); useInterval(() => { if (stack !== null) { - import("react-toastify").then(({ toast }) => toast.error(stack)); + import("react-hot-toast").then((_) => _.toast.error(stack)); setStack(null); } }, 10000); diff --git a/ui/src/rete/controls/template/EditablePugComponent.jsx b/ui/src/rete/controls/template/EditablePugComponent.jsx index 8c2d0b5..d94277a 100644 --- a/ui/src/rete/controls/template/EditablePugComponent.jsx +++ b/ui/src/rete/controls/template/EditablePugComponent.jsx @@ -15,7 +15,7 @@ export const EditablePugComponent = ({ value, onChange }) => { const [stack, setStack] = useState(null); useInterval(() => { if (stack !== null) { - import("react-toastify").then(({ toast }) => toast.error(stack)); + import("react-hot-toast").then((_) => _.toast.error(stack)); setStack(null); } }, 10000);