diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-12-02 23:57:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-03 04:27:13 +0530 |
commit | f64f1b3bd9bec4036748b98ff8ac0f0431749f30 (patch) | |
tree | 33691b4b02a546a7a1665ca29b18e3baa135c9ef | |
parent | 5.6.4-nightly.22 [skip ci] (diff) | |
download | ferdium-app-f64f1b3bd9bec4036748b98ff8ac0f0431749f30.tar.gz ferdium-app-f64f1b3bd9bec4036748b98ff8ac0f0431749f30.tar.zst ferdium-app-f64f1b3bd9bec4036748b98ff8ac0f0431749f30.zip |
chore: upgrade commitlint and eslint-plugin-unicorn to latest (#2295)
- upgrade commitlint and eslint-plugin-unicorn dependencies
- update prepare-code script to run lint:fix instead of lint
- fix unicorn/no-await-expression-member lint issues
- various whitespace formatting fixes due to lint:fix
-rw-r--r-- | package-lock.json | 298 | ||||
-rw-r--r-- | package.json | 8 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 2 | ||||
-rw-r--r-- | src/components/settings/recipes/RecipesDashboard.js | 3 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 4 | ||||
-rw-r--r-- | src/internal-server/app/Controllers/Http/RecipeController.js | 25 | ||||
-rw-r--r-- | src/internal-server/app/Controllers/Http/ServiceController.js | 32 | ||||
-rw-r--r-- | src/internal-server/app/Controllers/Http/UserController.js | 7 | ||||
-rw-r--r-- | src/internal-server/app/Controllers/Http/WorkspaceController.js | 13 | ||||
-rw-r--r-- | src/lib/Menu.js | 11 | ||||
-rw-r--r-- | src/lib/Tray.js | 11 |
11 files changed, 222 insertions, 192 deletions
diff --git a/package-lock.json b/package-lock.json index 32c939ba0..6ca7f7ff5 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -91,8 +91,8 @@ | |||
91 | "@babel/preset-env": "^7.16.0", | 91 | "@babel/preset-env": "^7.16.0", |
92 | "@babel/preset-react": "^7.14.5", | 92 | "@babel/preset-react": "^7.14.5", |
93 | "@babel/register": "^7.15.3", | 93 | "@babel/register": "^7.15.3", |
94 | "@commitlint/cli": "^14.1.0", | 94 | "@commitlint/cli": "^15.0.0", |
95 | "@commitlint/config-conventional": "^14.1.0", | 95 | "@commitlint/config-conventional": "^15.0.0", |
96 | "@formatjs/cli": "^4.4.0", | 96 | "@formatjs/cli": "^4.4.0", |
97 | "@types/color": "^3.0.2", | 97 | "@types/color": "^3.0.2", |
98 | "@types/expect.js": "^0.3.29", | 98 | "@types/expect.js": "^0.3.29", |
@@ -130,7 +130,7 @@ | |||
130 | "eslint-plugin-prettier": "^4.0.0", | 130 | "eslint-plugin-prettier": "^4.0.0", |
131 | "eslint-plugin-react": "^7.27.0", | 131 | "eslint-plugin-react": "^7.27.0", |
132 | "eslint-plugin-react-hooks": "^4.3.0", | 132 | "eslint-plugin-react-hooks": "^4.3.0", |
133 | "eslint-plugin-unicorn": "^38.0.1", | 133 | "eslint-plugin-unicorn": "^39.0.0", |
134 | "expect.js": "^0.3.1", | 134 | "expect.js": "^0.3.1", |
135 | "gulp": "^4.0.2", | 135 | "gulp": "^4.0.2", |
136 | "gulp-babel": "^8.0.0", | 136 | "gulp-babel": "^8.0.0", |
@@ -2284,16 +2284,16 @@ | |||
2284 | "dev": true | 2284 | "dev": true |
2285 | }, | 2285 | }, |
2286 | "node_modules/@commitlint/cli": { | 2286 | "node_modules/@commitlint/cli": { |
2287 | "version": "14.1.0", | 2287 | "version": "15.0.0", |
2288 | "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-14.1.0.tgz", | 2288 | "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-15.0.0.tgz", |
2289 | "integrity": "sha512-Orq62jkl9qAGvjFqhehtAqjGY/duJ8hIRPPIHmGR2jIB96D4VTmazS3ZvqJz2Q9kKr61mLAk/171zm0FVzQCYA==", | 2289 | "integrity": "sha512-Y5xmDCweytqzo4N4lOI2YRiuX35xTjcs8n5hUceBH8eyK0YbwtgWX50BJOH2XbkwEmII9blNhlBog6AdQsqicg==", |
2290 | "dev": true, | 2290 | "dev": true, |
2291 | "dependencies": { | 2291 | "dependencies": { |
2292 | "@commitlint/format": "^14.1.0", | 2292 | "@commitlint/format": "^15.0.0", |
2293 | "@commitlint/lint": "^14.1.0", | 2293 | "@commitlint/lint": "^15.0.0", |
2294 | "@commitlint/load": "^14.1.0", | 2294 | "@commitlint/load": "^15.0.0", |
2295 | "@commitlint/read": "^14.0.0", | 2295 | "@commitlint/read": "^15.0.0", |
2296 | "@commitlint/types": "^14.0.0", | 2296 | "@commitlint/types": "^15.0.0", |
2297 | "lodash": "^4.17.19", | 2297 | "lodash": "^4.17.19", |
2298 | "resolve-from": "5.0.0", | 2298 | "resolve-from": "5.0.0", |
2299 | "resolve-global": "1.0.0", | 2299 | "resolve-global": "1.0.0", |
@@ -2307,9 +2307,9 @@ | |||
2307 | } | 2307 | } |
2308 | }, | 2308 | }, |
2309 | "node_modules/@commitlint/config-conventional": { | 2309 | "node_modules/@commitlint/config-conventional": { |
2310 | "version": "14.1.0", | 2310 | "version": "15.0.0", |
2311 | "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-14.1.0.tgz", | 2311 | "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-15.0.0.tgz", |
2312 | "integrity": "sha512-JuhCqkEv8jyqmd54EpXPsQFpYc/8k7sfP1UziRdEvZSJUCLxz+8Pk4cNS0oF1BtjaWO7ITgXPlIZg47PyApGmg==", | 2312 | "integrity": "sha512-eZBRL8Lk3hMNHp1wUMYj0qrZQEsST1ai7KHR8J1IDD9aHgT7L2giciibuQ+Og7vxVhR5WtYDvh9xirXFVPaSkQ==", |
2313 | "dev": true, | 2313 | "dev": true, |
2314 | "dependencies": { | 2314 | "dependencies": { |
2315 | "conventional-changelog-conventionalcommits": "^4.3.1" | 2315 | "conventional-changelog-conventionalcommits": "^4.3.1" |
@@ -2319,12 +2319,12 @@ | |||
2319 | } | 2319 | } |
2320 | }, | 2320 | }, |
2321 | "node_modules/@commitlint/ensure": { | 2321 | "node_modules/@commitlint/ensure": { |
2322 | "version": "14.1.0", | 2322 | "version": "15.0.0", |
2323 | "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-14.1.0.tgz", | 2323 | "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-15.0.0.tgz", |
2324 | "integrity": "sha512-xrYvFdqVepT3XA1BmSh88eKbvYKtLuQu98QLfgxVmwS99Kj3yW0sT3D7jGvNsynbIx2dhbXofDyubf/DKkpFrQ==", | 2324 | "integrity": "sha512-7DV4iNIald3vycwaWBNGk5FbonaNzOlU8nBe5m5AgU2dIeNKuXwLm+zzJzG27j0Ho56rgz//3F6RIvmsoxY9ZA==", |
2325 | "dev": true, | 2325 | "dev": true, |
2326 | "dependencies": { | 2326 | "dependencies": { |
2327 | "@commitlint/types": "^14.0.0", | 2327 | "@commitlint/types": "^15.0.0", |
2328 | "lodash": "^4.17.19" | 2328 | "lodash": "^4.17.19" |
2329 | }, | 2329 | }, |
2330 | "engines": { | 2330 | "engines": { |
@@ -2332,21 +2332,21 @@ | |||
2332 | } | 2332 | } |
2333 | }, | 2333 | }, |
2334 | "node_modules/@commitlint/execute-rule": { | 2334 | "node_modules/@commitlint/execute-rule": { |
2335 | "version": "14.0.0", | 2335 | "version": "15.0.0", |
2336 | "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-14.0.0.tgz", | 2336 | "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-15.0.0.tgz", |
2337 | "integrity": "sha512-Hh/HLpCBDlrD3Rx2x2pDBx6CU+OtVqGXh7mbFpNihAVx6B0zyZqm/vv0cdwdhfGW5OEn1BhCqHf1ZOvL/DwdWA==", | 2337 | "integrity": "sha512-pyE4ApxjbWhb1TXz5vRiGwI2ssdMMgZbaaheZq1/7WC0xRnqnIhE1yUC1D2q20qPtvkZPstTYvMiRVtF+DvjUg==", |
2338 | "dev": true, | 2338 | "dev": true, |
2339 | "engines": { | 2339 | "engines": { |
2340 | "node": ">=v12" | 2340 | "node": ">=v12" |
2341 | } | 2341 | } |
2342 | }, | 2342 | }, |
2343 | "node_modules/@commitlint/format": { | 2343 | "node_modules/@commitlint/format": { |
2344 | "version": "14.1.0", | 2344 | "version": "15.0.0", |
2345 | "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-14.1.0.tgz", | 2345 | "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-15.0.0.tgz", |
2346 | "integrity": "sha512-sF6engqqHjvxGctWRKjFs/HQeNowlpbVmmoP481b2UMQnVQnjjfXJvQsoLpaqFUvgc2sHM4L85F8BmAw+iHG1w==", | 2346 | "integrity": "sha512-bPhAfqwRhPk92WiuY0ktEJNpRRHSCd+Eg1MdhGyL9Bl3U25E5zvuInA+dNctnzZiOBSH/37ZaD0eOKCpQE6acg==", |
2347 | "dev": true, | 2347 | "dev": true, |
2348 | "dependencies": { | 2348 | "dependencies": { |
2349 | "@commitlint/types": "^14.0.0", | 2349 | "@commitlint/types": "^15.0.0", |
2350 | "chalk": "^4.0.0" | 2350 | "chalk": "^4.0.0" |
2351 | }, | 2351 | }, |
2352 | "engines": { | 2352 | "engines": { |
@@ -2424,12 +2424,12 @@ | |||
2424 | } | 2424 | } |
2425 | }, | 2425 | }, |
2426 | "node_modules/@commitlint/is-ignored": { | 2426 | "node_modules/@commitlint/is-ignored": { |
2427 | "version": "14.0.0", | 2427 | "version": "15.0.0", |
2428 | "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-14.0.0.tgz", | 2428 | "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-15.0.0.tgz", |
2429 | "integrity": "sha512-nJltYjXTa+mk+6SPe35nOZCCvt3Gh5mbDz008KQ4OPcn1GX1NG+pEgz1Kx3agDp/pc+JGnsrr5GV00gygIoloA==", | 2429 | "integrity": "sha512-edtnkf2QZ/7e/YCJDgn1WDw9wfF1WfOitW5YEoSOb4SxjJEb/oE87kxNPZ2j8mnDMuunspcMfGHeg6fRlwaEWg==", |
2430 | "dev": true, | 2430 | "dev": true, |
2431 | "dependencies": { | 2431 | "dependencies": { |
2432 | "@commitlint/types": "^14.0.0", | 2432 | "@commitlint/types": "^15.0.0", |
2433 | "semver": "7.3.5" | 2433 | "semver": "7.3.5" |
2434 | }, | 2434 | }, |
2435 | "engines": { | 2435 | "engines": { |
@@ -2437,29 +2437,29 @@ | |||
2437 | } | 2437 | } |
2438 | }, | 2438 | }, |
2439 | "node_modules/@commitlint/lint": { | 2439 | "node_modules/@commitlint/lint": { |
2440 | "version": "14.1.0", | 2440 | "version": "15.0.0", |
2441 | "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-14.1.0.tgz", | 2441 | "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-15.0.0.tgz", |
2442 | "integrity": "sha512-CApGJEOtWU/CcuPD8HkOR1jdUYpjKutGPaeby9nSFzJhwl/UQOjxc4Nd+2g2ygsMi5l3N4j2sWQYEgccpFC3lA==", | 2442 | "integrity": "sha512-hUi2+Im/2dJ5FBvWnodypTkg+5haCgsDzB0fyMApWLUA1IucYUAqRCQCW5em1Mhk9Crw1pd5YzFNikhIclkqCw==", |
2443 | "dev": true, | 2443 | "dev": true, |
2444 | "dependencies": { | 2444 | "dependencies": { |
2445 | "@commitlint/is-ignored": "^14.0.0", | 2445 | "@commitlint/is-ignored": "^15.0.0", |
2446 | "@commitlint/parse": "^14.0.0", | 2446 | "@commitlint/parse": "^15.0.0", |
2447 | "@commitlint/rules": "^14.1.0", | 2447 | "@commitlint/rules": "^15.0.0", |
2448 | "@commitlint/types": "^14.0.0" | 2448 | "@commitlint/types": "^15.0.0" |
2449 | }, | 2449 | }, |
2450 | "engines": { | 2450 | "engines": { |
2451 | "node": ">=v12" | 2451 | "node": ">=v12" |
2452 | } | 2452 | } |
2453 | }, | 2453 | }, |
2454 | "node_modules/@commitlint/load": { | 2454 | "node_modules/@commitlint/load": { |
2455 | "version": "14.1.0", | 2455 | "version": "15.0.0", |
2456 | "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-14.1.0.tgz", | 2456 | "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-15.0.0.tgz", |
2457 | "integrity": "sha512-p+HbgjhkqLsnxyjOUdEYHztHCp8n2oLVUJTmRPuP5FXLNevh6Gwmxf+NYC2J0sgD084aV2CFi3qu1W4yHWIknA==", | 2457 | "integrity": "sha512-Ak1YPeOhvxmY3ioe0o6m1yLGvUAYb4BdfGgShU8jiTCmU3Mnmms0Xh/kfQz8AybhezCC3AmVTyBLaBZxOHR8kg==", |
2458 | "dev": true, | 2458 | "dev": true, |
2459 | "dependencies": { | 2459 | "dependencies": { |
2460 | "@commitlint/execute-rule": "^14.0.0", | 2460 | "@commitlint/execute-rule": "^15.0.0", |
2461 | "@commitlint/resolve-extends": "^14.1.0", | 2461 | "@commitlint/resolve-extends": "^15.0.0", |
2462 | "@commitlint/types": "^14.0.0", | 2462 | "@commitlint/types": "^15.0.0", |
2463 | "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", | 2463 | "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", |
2464 | "chalk": "^4.0.0", | 2464 | "chalk": "^4.0.0", |
2465 | "cosmiconfig": "^7.0.0", | 2465 | "cosmiconfig": "^7.0.0", |
@@ -2542,21 +2542,21 @@ | |||
2542 | } | 2542 | } |
2543 | }, | 2543 | }, |
2544 | "node_modules/@commitlint/message": { | 2544 | "node_modules/@commitlint/message": { |
2545 | "version": "14.0.0", | 2545 | "version": "15.0.0", |
2546 | "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-14.0.0.tgz", | 2546 | "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-15.0.0.tgz", |
2547 | "integrity": "sha512-316Pum+bwDcZamOQw0DXSY17Dq9EjvL1zKdYIZqneu4lnXN6uFfi53Y/sP5crW6zlLdnuTHe1MnuewXPLHfH1Q==", | 2547 | "integrity": "sha512-L8euabzboKavPuDJsdIYAY2wx97LbiGEYsckMo6NmV8pOun50c8hQx6ouXFSAx4pp+mX9yUGmMiVqfrk2LKDJQ==", |
2548 | "dev": true, | 2548 | "dev": true, |
2549 | "engines": { | 2549 | "engines": { |
2550 | "node": ">=v12" | 2550 | "node": ">=v12" |
2551 | } | 2551 | } |
2552 | }, | 2552 | }, |
2553 | "node_modules/@commitlint/parse": { | 2553 | "node_modules/@commitlint/parse": { |
2554 | "version": "14.0.0", | 2554 | "version": "15.0.0", |
2555 | "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-14.0.0.tgz", | 2555 | "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-15.0.0.tgz", |
2556 | "integrity": "sha512-49qkk0TcwdxJPZUX8MElEzMlRFIL/cg64P4pk8HotFEm2HYdbxxZp6v3cbVw5WOsnRA0frrs+NNoOcIT83ccMQ==", | 2556 | "integrity": "sha512-7fweM67tZfBNS7zw1KTuuT5K2u9nGytUJqFqT/1Ln3Na9cBCsoAqR47mfsNOTlRCgGwakm4xiQ7BpS2gN0OGuw==", |
2557 | "dev": true, | 2557 | "dev": true, |
2558 | "dependencies": { | 2558 | "dependencies": { |
2559 | "@commitlint/types": "^14.0.0", | 2559 | "@commitlint/types": "^15.0.0", |
2560 | "conventional-changelog-angular": "^5.0.11", | 2560 | "conventional-changelog-angular": "^5.0.11", |
2561 | "conventional-commits-parser": "^3.2.2" | 2561 | "conventional-commits-parser": "^3.2.2" |
2562 | }, | 2562 | }, |
@@ -2565,13 +2565,13 @@ | |||
2565 | } | 2565 | } |
2566 | }, | 2566 | }, |
2567 | "node_modules/@commitlint/read": { | 2567 | "node_modules/@commitlint/read": { |
2568 | "version": "14.0.0", | 2568 | "version": "15.0.0", |
2569 | "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-14.0.0.tgz", | 2569 | "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-15.0.0.tgz", |
2570 | "integrity": "sha512-WXXcSLBqwXTqnEmB0lbU2TrayDJ2G3qI/lxy1ianVmpQol8p9BjodAA6bYxtYYHdQFVXUrIsclzFP/naWG+hlQ==", | 2570 | "integrity": "sha512-5yI1o2HKZFVe7RTjL7IhuhHMKar/MDNY34vEHqqz9gMI7BK/rdP8uVb4Di1efl2V0UPnwID0nPKWESjQ8Ti0gw==", |
2571 | "dev": true, | 2571 | "dev": true, |
2572 | "dependencies": { | 2572 | "dependencies": { |
2573 | "@commitlint/top-level": "^14.0.0", | 2573 | "@commitlint/top-level": "^15.0.0", |
2574 | "@commitlint/types": "^14.0.0", | 2574 | "@commitlint/types": "^15.0.0", |
2575 | "fs-extra": "^10.0.0", | 2575 | "fs-extra": "^10.0.0", |
2576 | "git-raw-commits": "^2.0.0" | 2576 | "git-raw-commits": "^2.0.0" |
2577 | }, | 2577 | }, |
@@ -2580,9 +2580,9 @@ | |||
2580 | } | 2580 | } |
2581 | }, | 2581 | }, |
2582 | "node_modules/@commitlint/resolve-extends": { | 2582 | "node_modules/@commitlint/resolve-extends": { |
2583 | "version": "14.1.0", | 2583 | "version": "15.0.0", |
2584 | "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-14.1.0.tgz", | 2584 | "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-15.0.0.tgz", |
2585 | "integrity": "sha512-ko80k6QB6E6/OvGNWy4u7gzzWyluDT3VDNL2kfZaDywsnrYntUKyT4Do97gQ7orttITzj2GRtk3KWClVz4rUUQ==", | 2585 | "integrity": "sha512-7apfRJjgJsKja7lHsPfEFixKjA/fk/UeD3owkOw1174yYu4u8xBDLSeU3IinGPdMuF9m245eX8wo7vLUy+EBSg==", |
2586 | "dev": true, | 2586 | "dev": true, |
2587 | "dependencies": { | 2587 | "dependencies": { |
2588 | "import-fresh": "^3.0.0", | 2588 | "import-fresh": "^3.0.0", |
@@ -2595,15 +2595,15 @@ | |||
2595 | } | 2595 | } |
2596 | }, | 2596 | }, |
2597 | "node_modules/@commitlint/rules": { | 2597 | "node_modules/@commitlint/rules": { |
2598 | "version": "14.1.0", | 2598 | "version": "15.0.0", |
2599 | "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-14.1.0.tgz", | 2599 | "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-15.0.0.tgz", |
2600 | "integrity": "sha512-6jmv414/1JzGzDI/DS+snAMhcL6roQKPdg0WB3kWTWN52EvWXBFm0HIMGt2H/FlRKxozwVXlQN60/1fNIl98xA==", | 2600 | "integrity": "sha512-SqXfp6QUlwBS+0IZm4FEA/NmmAwcFQIkG3B05BtemOVWXQdZ8j1vV6hDwvA9oMPCmUSrrGpHOtZK7HaHhng2yA==", |
2601 | "dev": true, | 2601 | "dev": true, |
2602 | "dependencies": { | 2602 | "dependencies": { |
2603 | "@commitlint/ensure": "^14.1.0", | 2603 | "@commitlint/ensure": "^15.0.0", |
2604 | "@commitlint/message": "^14.0.0", | 2604 | "@commitlint/message": "^15.0.0", |
2605 | "@commitlint/to-lines": "^14.0.0", | 2605 | "@commitlint/to-lines": "^15.0.0", |
2606 | "@commitlint/types": "^14.0.0", | 2606 | "@commitlint/types": "^15.0.0", |
2607 | "execa": "^5.0.0" | 2607 | "execa": "^5.0.0" |
2608 | }, | 2608 | }, |
2609 | "engines": { | 2609 | "engines": { |
@@ -2611,18 +2611,18 @@ | |||
2611 | } | 2611 | } |
2612 | }, | 2612 | }, |
2613 | "node_modules/@commitlint/to-lines": { | 2613 | "node_modules/@commitlint/to-lines": { |
2614 | "version": "14.0.0", | 2614 | "version": "15.0.0", |
2615 | "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-14.0.0.tgz", | 2615 | "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-15.0.0.tgz", |
2616 | "integrity": "sha512-uIXk54oJDuYyLpI208s3+cGmJ323yvSJ9LB7yUDMWUeJi2LgRxE2EBZL995kLQdnoAsBBXcLq+VDyppg5bV/cg==", | 2616 | "integrity": "sha512-mY3MNA9ujPqVpiJjTYG9MDsYCobue5PJFO0MfcIzS1mCVvngH8ZFTPAh1fT5t+t1h876boS88+9WgqjRvbYItw==", |
2617 | "dev": true, | 2617 | "dev": true, |
2618 | "engines": { | 2618 | "engines": { |
2619 | "node": ">=v12" | 2619 | "node": ">=v12" |
2620 | } | 2620 | } |
2621 | }, | 2621 | }, |
2622 | "node_modules/@commitlint/top-level": { | 2622 | "node_modules/@commitlint/top-level": { |
2623 | "version": "14.0.0", | 2623 | "version": "15.0.0", |
2624 | "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-14.0.0.tgz", | 2624 | "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-15.0.0.tgz", |
2625 | "integrity": "sha512-MZDKZfWfl9g4KozgWBGTCrI2cXkMHnBFlhwvEfrAu5G8wd5aL1f2uWEUMnBMjUikmhVj99i1pzge4XFWHQ29wQ==", | 2625 | "integrity": "sha512-7Gz3t7xcuuUw1d1Nou6YLaztzp2Em+qZ6YdCzrqYc+aquca3Vt0O696nuiBDU/oE+tls4Hx2CNpAbWhTgEwB5A==", |
2626 | "dev": true, | 2626 | "dev": true, |
2627 | "dependencies": { | 2627 | "dependencies": { |
2628 | "find-up": "^5.0.0" | 2628 | "find-up": "^5.0.0" |
@@ -2632,9 +2632,9 @@ | |||
2632 | } | 2632 | } |
2633 | }, | 2633 | }, |
2634 | "node_modules/@commitlint/types": { | 2634 | "node_modules/@commitlint/types": { |
2635 | "version": "14.0.0", | 2635 | "version": "15.0.0", |
2636 | "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-14.0.0.tgz", | 2636 | "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-15.0.0.tgz", |
2637 | "integrity": "sha512-sIls1nP2uSbGL466edYlh8mn7O/WP4i3bcvP+2DMhkscRCSgaPhNRWDilhYVsHt2Vu1HTQ27uT0Bj5/Lt2+EcQ==", | 2637 | "integrity": "sha512-OMSLX+QJnyNoTwws54ULv9sOvuw9GdVezln76oyUd4YbMMJyaav62aSXDuCdWyL2sm9hTkSzyEi52PNaIj/vqw==", |
2638 | "dev": true, | 2638 | "dev": true, |
2639 | "dependencies": { | 2639 | "dependencies": { |
2640 | "chalk": "^4.0.0" | 2640 | "chalk": "^4.0.0" |
@@ -12478,9 +12478,9 @@ | |||
12478 | } | 12478 | } |
12479 | }, | 12479 | }, |
12480 | "node_modules/eslint-plugin-unicorn": { | 12480 | "node_modules/eslint-plugin-unicorn": { |
12481 | "version": "38.0.1", | 12481 | "version": "39.0.0", |
12482 | "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-38.0.1.tgz", | 12482 | "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-39.0.0.tgz", |
12483 | "integrity": "sha512-eu4HCg7Bv43nk/hYZoWpLzRo668Nb7swQySn94aohn0heh9KLJ1GOFgVxJndLS8BploMGaClxgsyTNGJrP69yw==", | 12483 | "integrity": "sha512-fd5RK2FtYjGcIx3wra7csIE/wkkmBo22T1gZtRTsLr1Mb+KsFKJ+JOdSqhHXQUrI/JTs/Mon64cEYzTgSCbltw==", |
12484 | "dev": true, | 12484 | "dev": true, |
12485 | "dependencies": { | 12485 | "dependencies": { |
12486 | "@babel/helper-validator-identifier": "^7.14.9", | 12486 | "@babel/helper-validator-identifier": "^7.14.9", |
@@ -33288,16 +33288,16 @@ | |||
33288 | "dev": true | 33288 | "dev": true |
33289 | }, | 33289 | }, |
33290 | "@commitlint/cli": { | 33290 | "@commitlint/cli": { |
33291 | "version": "14.1.0", | 33291 | "version": "15.0.0", |
33292 | "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-14.1.0.tgz", | 33292 | "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-15.0.0.tgz", |
33293 | "integrity": "sha512-Orq62jkl9qAGvjFqhehtAqjGY/duJ8hIRPPIHmGR2jIB96D4VTmazS3ZvqJz2Q9kKr61mLAk/171zm0FVzQCYA==", | 33293 | "integrity": "sha512-Y5xmDCweytqzo4N4lOI2YRiuX35xTjcs8n5hUceBH8eyK0YbwtgWX50BJOH2XbkwEmII9blNhlBog6AdQsqicg==", |
33294 | "dev": true, | 33294 | "dev": true, |
33295 | "requires": { | 33295 | "requires": { |
33296 | "@commitlint/format": "^14.1.0", | 33296 | "@commitlint/format": "^15.0.0", |
33297 | "@commitlint/lint": "^14.1.0", | 33297 | "@commitlint/lint": "^15.0.0", |
33298 | "@commitlint/load": "^14.1.0", | 33298 | "@commitlint/load": "^15.0.0", |
33299 | "@commitlint/read": "^14.0.0", | 33299 | "@commitlint/read": "^15.0.0", |
33300 | "@commitlint/types": "^14.0.0", | 33300 | "@commitlint/types": "^15.0.0", |
33301 | "lodash": "^4.17.19", | 33301 | "lodash": "^4.17.19", |
33302 | "resolve-from": "5.0.0", | 33302 | "resolve-from": "5.0.0", |
33303 | "resolve-global": "1.0.0", | 33303 | "resolve-global": "1.0.0", |
@@ -33305,37 +33305,37 @@ | |||
33305 | } | 33305 | } |
33306 | }, | 33306 | }, |
33307 | "@commitlint/config-conventional": { | 33307 | "@commitlint/config-conventional": { |
33308 | "version": "14.1.0", | 33308 | "version": "15.0.0", |
33309 | "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-14.1.0.tgz", | 33309 | "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-15.0.0.tgz", |
33310 | "integrity": "sha512-JuhCqkEv8jyqmd54EpXPsQFpYc/8k7sfP1UziRdEvZSJUCLxz+8Pk4cNS0oF1BtjaWO7ITgXPlIZg47PyApGmg==", | 33310 | "integrity": "sha512-eZBRL8Lk3hMNHp1wUMYj0qrZQEsST1ai7KHR8J1IDD9aHgT7L2giciibuQ+Og7vxVhR5WtYDvh9xirXFVPaSkQ==", |
33311 | "dev": true, | 33311 | "dev": true, |
33312 | "requires": { | 33312 | "requires": { |
33313 | "conventional-changelog-conventionalcommits": "^4.3.1" | 33313 | "conventional-changelog-conventionalcommits": "^4.3.1" |
33314 | } | 33314 | } |
33315 | }, | 33315 | }, |
33316 | "@commitlint/ensure": { | 33316 | "@commitlint/ensure": { |
33317 | "version": "14.1.0", | 33317 | "version": "15.0.0", |
33318 | "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-14.1.0.tgz", | 33318 | "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-15.0.0.tgz", |
33319 | "integrity": "sha512-xrYvFdqVepT3XA1BmSh88eKbvYKtLuQu98QLfgxVmwS99Kj3yW0sT3D7jGvNsynbIx2dhbXofDyubf/DKkpFrQ==", | 33319 | "integrity": "sha512-7DV4iNIald3vycwaWBNGk5FbonaNzOlU8nBe5m5AgU2dIeNKuXwLm+zzJzG27j0Ho56rgz//3F6RIvmsoxY9ZA==", |
33320 | "dev": true, | 33320 | "dev": true, |
33321 | "requires": { | 33321 | "requires": { |
33322 | "@commitlint/types": "^14.0.0", | 33322 | "@commitlint/types": "^15.0.0", |
33323 | "lodash": "^4.17.19" | 33323 | "lodash": "^4.17.19" |
33324 | } | 33324 | } |
33325 | }, | 33325 | }, |
33326 | "@commitlint/execute-rule": { | 33326 | "@commitlint/execute-rule": { |
33327 | "version": "14.0.0", | 33327 | "version": "15.0.0", |
33328 | "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-14.0.0.tgz", | 33328 | "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-15.0.0.tgz", |
33329 | "integrity": "sha512-Hh/HLpCBDlrD3Rx2x2pDBx6CU+OtVqGXh7mbFpNihAVx6B0zyZqm/vv0cdwdhfGW5OEn1BhCqHf1ZOvL/DwdWA==", | 33329 | "integrity": "sha512-pyE4ApxjbWhb1TXz5vRiGwI2ssdMMgZbaaheZq1/7WC0xRnqnIhE1yUC1D2q20qPtvkZPstTYvMiRVtF+DvjUg==", |
33330 | "dev": true | 33330 | "dev": true |
33331 | }, | 33331 | }, |
33332 | "@commitlint/format": { | 33332 | "@commitlint/format": { |
33333 | "version": "14.1.0", | 33333 | "version": "15.0.0", |
33334 | "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-14.1.0.tgz", | 33334 | "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-15.0.0.tgz", |
33335 | "integrity": "sha512-sF6engqqHjvxGctWRKjFs/HQeNowlpbVmmoP481b2UMQnVQnjjfXJvQsoLpaqFUvgc2sHM4L85F8BmAw+iHG1w==", | 33335 | "integrity": "sha512-bPhAfqwRhPk92WiuY0ktEJNpRRHSCd+Eg1MdhGyL9Bl3U25E5zvuInA+dNctnzZiOBSH/37ZaD0eOKCpQE6acg==", |
33336 | "dev": true, | 33336 | "dev": true, |
33337 | "requires": { | 33337 | "requires": { |
33338 | "@commitlint/types": "^14.0.0", | 33338 | "@commitlint/types": "^15.0.0", |
33339 | "chalk": "^4.0.0" | 33339 | "chalk": "^4.0.0" |
33340 | }, | 33340 | }, |
33341 | "dependencies": { | 33341 | "dependencies": { |
@@ -33391,36 +33391,36 @@ | |||
33391 | } | 33391 | } |
33392 | }, | 33392 | }, |
33393 | "@commitlint/is-ignored": { | 33393 | "@commitlint/is-ignored": { |
33394 | "version": "14.0.0", | 33394 | "version": "15.0.0", |
33395 | "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-14.0.0.tgz", | 33395 | "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-15.0.0.tgz", |
33396 | "integrity": "sha512-nJltYjXTa+mk+6SPe35nOZCCvt3Gh5mbDz008KQ4OPcn1GX1NG+pEgz1Kx3agDp/pc+JGnsrr5GV00gygIoloA==", | 33396 | "integrity": "sha512-edtnkf2QZ/7e/YCJDgn1WDw9wfF1WfOitW5YEoSOb4SxjJEb/oE87kxNPZ2j8mnDMuunspcMfGHeg6fRlwaEWg==", |
33397 | "dev": true, | 33397 | "dev": true, |
33398 | "requires": { | 33398 | "requires": { |
33399 | "@commitlint/types": "^14.0.0", | 33399 | "@commitlint/types": "^15.0.0", |
33400 | "semver": "7.3.5" | 33400 | "semver": "7.3.5" |
33401 | } | 33401 | } |
33402 | }, | 33402 | }, |
33403 | "@commitlint/lint": { | 33403 | "@commitlint/lint": { |
33404 | "version": "14.1.0", | 33404 | "version": "15.0.0", |
33405 | "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-14.1.0.tgz", | 33405 | "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-15.0.0.tgz", |
33406 | "integrity": "sha512-CApGJEOtWU/CcuPD8HkOR1jdUYpjKutGPaeby9nSFzJhwl/UQOjxc4Nd+2g2ygsMi5l3N4j2sWQYEgccpFC3lA==", | 33406 | "integrity": "sha512-hUi2+Im/2dJ5FBvWnodypTkg+5haCgsDzB0fyMApWLUA1IucYUAqRCQCW5em1Mhk9Crw1pd5YzFNikhIclkqCw==", |
33407 | "dev": true, | 33407 | "dev": true, |
33408 | "requires": { | 33408 | "requires": { |
33409 | "@commitlint/is-ignored": "^14.0.0", | 33409 | "@commitlint/is-ignored": "^15.0.0", |
33410 | "@commitlint/parse": "^14.0.0", | 33410 | "@commitlint/parse": "^15.0.0", |
33411 | "@commitlint/rules": "^14.1.0", | 33411 | "@commitlint/rules": "^15.0.0", |
33412 | "@commitlint/types": "^14.0.0" | 33412 | "@commitlint/types": "^15.0.0" |
33413 | } | 33413 | } |
33414 | }, | 33414 | }, |
33415 | "@commitlint/load": { | 33415 | "@commitlint/load": { |
33416 | "version": "14.1.0", | 33416 | "version": "15.0.0", |
33417 | "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-14.1.0.tgz", | 33417 | "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-15.0.0.tgz", |
33418 | "integrity": "sha512-p+HbgjhkqLsnxyjOUdEYHztHCp8n2oLVUJTmRPuP5FXLNevh6Gwmxf+NYC2J0sgD084aV2CFi3qu1W4yHWIknA==", | 33418 | "integrity": "sha512-Ak1YPeOhvxmY3ioe0o6m1yLGvUAYb4BdfGgShU8jiTCmU3Mnmms0Xh/kfQz8AybhezCC3AmVTyBLaBZxOHR8kg==", |
33419 | "dev": true, | 33419 | "dev": true, |
33420 | "requires": { | 33420 | "requires": { |
33421 | "@commitlint/execute-rule": "^14.0.0", | 33421 | "@commitlint/execute-rule": "^15.0.0", |
33422 | "@commitlint/resolve-extends": "^14.1.0", | 33422 | "@commitlint/resolve-extends": "^15.0.0", |
33423 | "@commitlint/types": "^14.0.0", | 33423 | "@commitlint/types": "^15.0.0", |
33424 | "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", | 33424 | "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", |
33425 | "chalk": "^4.0.0", | 33425 | "chalk": "^4.0.0", |
33426 | "cosmiconfig": "^7.0.0", | 33426 | "cosmiconfig": "^7.0.0", |
@@ -33481,38 +33481,38 @@ | |||
33481 | } | 33481 | } |
33482 | }, | 33482 | }, |
33483 | "@commitlint/message": { | 33483 | "@commitlint/message": { |
33484 | "version": "14.0.0", | 33484 | "version": "15.0.0", |
33485 | "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-14.0.0.tgz", | 33485 | "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-15.0.0.tgz", |
33486 | "integrity": "sha512-316Pum+bwDcZamOQw0DXSY17Dq9EjvL1zKdYIZqneu4lnXN6uFfi53Y/sP5crW6zlLdnuTHe1MnuewXPLHfH1Q==", | 33486 | "integrity": "sha512-L8euabzboKavPuDJsdIYAY2wx97LbiGEYsckMo6NmV8pOun50c8hQx6ouXFSAx4pp+mX9yUGmMiVqfrk2LKDJQ==", |
33487 | "dev": true | 33487 | "dev": true |
33488 | }, | 33488 | }, |
33489 | "@commitlint/parse": { | 33489 | "@commitlint/parse": { |
33490 | "version": "14.0.0", | 33490 | "version": "15.0.0", |
33491 | "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-14.0.0.tgz", | 33491 | "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-15.0.0.tgz", |
33492 | "integrity": "sha512-49qkk0TcwdxJPZUX8MElEzMlRFIL/cg64P4pk8HotFEm2HYdbxxZp6v3cbVw5WOsnRA0frrs+NNoOcIT83ccMQ==", | 33492 | "integrity": "sha512-7fweM67tZfBNS7zw1KTuuT5K2u9nGytUJqFqT/1Ln3Na9cBCsoAqR47mfsNOTlRCgGwakm4xiQ7BpS2gN0OGuw==", |
33493 | "dev": true, | 33493 | "dev": true, |
33494 | "requires": { | 33494 | "requires": { |
33495 | "@commitlint/types": "^14.0.0", | 33495 | "@commitlint/types": "^15.0.0", |
33496 | "conventional-changelog-angular": "^5.0.11", | 33496 | "conventional-changelog-angular": "^5.0.11", |
33497 | "conventional-commits-parser": "^3.2.2" | 33497 | "conventional-commits-parser": "^3.2.2" |
33498 | } | 33498 | } |
33499 | }, | 33499 | }, |
33500 | "@commitlint/read": { | 33500 | "@commitlint/read": { |
33501 | "version": "14.0.0", | 33501 | "version": "15.0.0", |
33502 | "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-14.0.0.tgz", | 33502 | "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-15.0.0.tgz", |
33503 | "integrity": "sha512-WXXcSLBqwXTqnEmB0lbU2TrayDJ2G3qI/lxy1ianVmpQol8p9BjodAA6bYxtYYHdQFVXUrIsclzFP/naWG+hlQ==", | 33503 | "integrity": "sha512-5yI1o2HKZFVe7RTjL7IhuhHMKar/MDNY34vEHqqz9gMI7BK/rdP8uVb4Di1efl2V0UPnwID0nPKWESjQ8Ti0gw==", |
33504 | "dev": true, | 33504 | "dev": true, |
33505 | "requires": { | 33505 | "requires": { |
33506 | "@commitlint/top-level": "^14.0.0", | 33506 | "@commitlint/top-level": "^15.0.0", |
33507 | "@commitlint/types": "^14.0.0", | 33507 | "@commitlint/types": "^15.0.0", |
33508 | "fs-extra": "^10.0.0", | 33508 | "fs-extra": "^10.0.0", |
33509 | "git-raw-commits": "^2.0.0" | 33509 | "git-raw-commits": "^2.0.0" |
33510 | } | 33510 | } |
33511 | }, | 33511 | }, |
33512 | "@commitlint/resolve-extends": { | 33512 | "@commitlint/resolve-extends": { |
33513 | "version": "14.1.0", | 33513 | "version": "15.0.0", |
33514 | "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-14.1.0.tgz", | 33514 | "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-15.0.0.tgz", |
33515 | "integrity": "sha512-ko80k6QB6E6/OvGNWy4u7gzzWyluDT3VDNL2kfZaDywsnrYntUKyT4Do97gQ7orttITzj2GRtk3KWClVz4rUUQ==", | 33515 | "integrity": "sha512-7apfRJjgJsKja7lHsPfEFixKjA/fk/UeD3owkOw1174yYu4u8xBDLSeU3IinGPdMuF9m245eX8wo7vLUy+EBSg==", |
33516 | "dev": true, | 33516 | "dev": true, |
33517 | "requires": { | 33517 | "requires": { |
33518 | "import-fresh": "^3.0.0", | 33518 | "import-fresh": "^3.0.0", |
@@ -33522,37 +33522,37 @@ | |||
33522 | } | 33522 | } |
33523 | }, | 33523 | }, |
33524 | "@commitlint/rules": { | 33524 | "@commitlint/rules": { |
33525 | "version": "14.1.0", | 33525 | "version": "15.0.0", |
33526 | "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-14.1.0.tgz", | 33526 | "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-15.0.0.tgz", |
33527 | "integrity": "sha512-6jmv414/1JzGzDI/DS+snAMhcL6roQKPdg0WB3kWTWN52EvWXBFm0HIMGt2H/FlRKxozwVXlQN60/1fNIl98xA==", | 33527 | "integrity": "sha512-SqXfp6QUlwBS+0IZm4FEA/NmmAwcFQIkG3B05BtemOVWXQdZ8j1vV6hDwvA9oMPCmUSrrGpHOtZK7HaHhng2yA==", |
33528 | "dev": true, | 33528 | "dev": true, |
33529 | "requires": { | 33529 | "requires": { |
33530 | "@commitlint/ensure": "^14.1.0", | 33530 | "@commitlint/ensure": "^15.0.0", |
33531 | "@commitlint/message": "^14.0.0", | 33531 | "@commitlint/message": "^15.0.0", |
33532 | "@commitlint/to-lines": "^14.0.0", | 33532 | "@commitlint/to-lines": "^15.0.0", |
33533 | "@commitlint/types": "^14.0.0", | 33533 | "@commitlint/types": "^15.0.0", |
33534 | "execa": "^5.0.0" | 33534 | "execa": "^5.0.0" |
33535 | } | 33535 | } |
33536 | }, | 33536 | }, |
33537 | "@commitlint/to-lines": { | 33537 | "@commitlint/to-lines": { |
33538 | "version": "14.0.0", | 33538 | "version": "15.0.0", |
33539 | "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-14.0.0.tgz", | 33539 | "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-15.0.0.tgz", |
33540 | "integrity": "sha512-uIXk54oJDuYyLpI208s3+cGmJ323yvSJ9LB7yUDMWUeJi2LgRxE2EBZL995kLQdnoAsBBXcLq+VDyppg5bV/cg==", | 33540 | "integrity": "sha512-mY3MNA9ujPqVpiJjTYG9MDsYCobue5PJFO0MfcIzS1mCVvngH8ZFTPAh1fT5t+t1h876boS88+9WgqjRvbYItw==", |
33541 | "dev": true | 33541 | "dev": true |
33542 | }, | 33542 | }, |
33543 | "@commitlint/top-level": { | 33543 | "@commitlint/top-level": { |
33544 | "version": "14.0.0", | 33544 | "version": "15.0.0", |
33545 | "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-14.0.0.tgz", | 33545 | "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-15.0.0.tgz", |
33546 | "integrity": "sha512-MZDKZfWfl9g4KozgWBGTCrI2cXkMHnBFlhwvEfrAu5G8wd5aL1f2uWEUMnBMjUikmhVj99i1pzge4XFWHQ29wQ==", | 33546 | "integrity": "sha512-7Gz3t7xcuuUw1d1Nou6YLaztzp2Em+qZ6YdCzrqYc+aquca3Vt0O696nuiBDU/oE+tls4Hx2CNpAbWhTgEwB5A==", |
33547 | "dev": true, | 33547 | "dev": true, |
33548 | "requires": { | 33548 | "requires": { |
33549 | "find-up": "^5.0.0" | 33549 | "find-up": "^5.0.0" |
33550 | } | 33550 | } |
33551 | }, | 33551 | }, |
33552 | "@commitlint/types": { | 33552 | "@commitlint/types": { |
33553 | "version": "14.0.0", | 33553 | "version": "15.0.0", |
33554 | "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-14.0.0.tgz", | 33554 | "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-15.0.0.tgz", |
33555 | "integrity": "sha512-sIls1nP2uSbGL466edYlh8mn7O/WP4i3bcvP+2DMhkscRCSgaPhNRWDilhYVsHt2Vu1HTQ27uT0Bj5/Lt2+EcQ==", | 33555 | "integrity": "sha512-OMSLX+QJnyNoTwws54ULv9sOvuw9GdVezln76oyUd4YbMMJyaav62aSXDuCdWyL2sm9hTkSzyEi52PNaIj/vqw==", |
33556 | "dev": true, | 33556 | "dev": true, |
33557 | "requires": { | 33557 | "requires": { |
33558 | "chalk": "^4.0.0" | 33558 | "chalk": "^4.0.0" |
@@ -41611,9 +41611,9 @@ | |||
41611 | "dev": true | 41611 | "dev": true |
41612 | }, | 41612 | }, |
41613 | "eslint-plugin-unicorn": { | 41613 | "eslint-plugin-unicorn": { |
41614 | "version": "38.0.1", | 41614 | "version": "39.0.0", |
41615 | "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-38.0.1.tgz", | 41615 | "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-39.0.0.tgz", |
41616 | "integrity": "sha512-eu4HCg7Bv43nk/hYZoWpLzRo668Nb7swQySn94aohn0heh9KLJ1GOFgVxJndLS8BploMGaClxgsyTNGJrP69yw==", | 41616 | "integrity": "sha512-fd5RK2FtYjGcIx3wra7csIE/wkkmBo22T1gZtRTsLr1Mb+KsFKJ+JOdSqhHXQUrI/JTs/Mon64cEYzTgSCbltw==", |
41617 | "dev": true, | 41617 | "dev": true, |
41618 | "requires": { | 41618 | "requires": { |
41619 | "@babel/helper-validator-identifier": "^7.14.9", | 41619 | "@babel/helper-validator-identifier": "^7.14.9", |
diff --git a/package.json b/package.json index 87046aed1..f01fd0d40 100644 --- a/package.json +++ b/package.json | |||
@@ -36,7 +36,7 @@ | |||
36 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", | 36 | "reformat-files": "./node_modules/.bin/prettier --ignore-path .eslintignore --write --require-pragma \"**/*.{js,jsx,scss}\"", |
37 | "apply-branding": "ts-node ./src/i18n/apply-branding.ts", | 37 | "apply-branding": "ts-node ./src/i18n/apply-branding.ts", |
38 | "update-submodules": "git submodule update --remote --force", | 38 | "update-submodules": "git submodule update --remote --force", |
39 | "prepare-code": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding", | 39 | "prepare-code": "npm run lint:fix && npm run reformat-files && npm run manage-translations && npm run apply-branding", |
40 | "link-readme": "ts-node scripts/link-readme.ts", | 40 | "link-readme": "ts-node scripts/link-readme.ts", |
41 | "minify-images": "./scripts/minify-images.sh", | 41 | "minify-images": "./scripts/minify-images.sh", |
42 | "start:server": "ts-node src/internal-server/test.ts", | 42 | "start:server": "ts-node src/internal-server/test.ts", |
@@ -128,8 +128,8 @@ | |||
128 | "@babel/preset-env": "^7.16.0", | 128 | "@babel/preset-env": "^7.16.0", |
129 | "@babel/preset-react": "^7.14.5", | 129 | "@babel/preset-react": "^7.14.5", |
130 | "@babel/register": "^7.15.3", | 130 | "@babel/register": "^7.15.3", |
131 | "@commitlint/cli": "^14.1.0", | 131 | "@commitlint/cli": "^15.0.0", |
132 | "@commitlint/config-conventional": "^14.1.0", | 132 | "@commitlint/config-conventional": "^15.0.0", |
133 | "@formatjs/cli": "^4.4.0", | 133 | "@formatjs/cli": "^4.4.0", |
134 | "@types/color": "^3.0.2", | 134 | "@types/color": "^3.0.2", |
135 | "@types/expect.js": "^0.3.29", | 135 | "@types/expect.js": "^0.3.29", |
@@ -167,7 +167,7 @@ | |||
167 | "eslint-plugin-prettier": "^4.0.0", | 167 | "eslint-plugin-prettier": "^4.0.0", |
168 | "eslint-plugin-react": "^7.27.0", | 168 | "eslint-plugin-react": "^7.27.0", |
169 | "eslint-plugin-react-hooks": "^4.3.0", | 169 | "eslint-plugin-react-hooks": "^4.3.0", |
170 | "eslint-plugin-unicorn": "^38.0.1", | 170 | "eslint-plugin-unicorn": "^39.0.0", |
171 | "expect.js": "^0.3.1", | 171 | "expect.js": "^0.3.1", |
172 | "gulp": "^4.0.2", | 172 | "gulp": "^4.0.2", |
173 | "gulp-babel": "^8.0.0", | 173 | "gulp-babel": "^8.0.0", |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 5381d7c2b..14be37153 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -276,7 +276,7 @@ class TabItem extends Component { | |||
276 | service.isEnabled ? messages.disableService : messages.enableService, | 276 | service.isEnabled ? messages.disableService : messages.enableService, |
277 | ), | 277 | ), |
278 | click: () => (service.isEnabled ? disableService() : enableService()), | 278 | click: () => (service.isEnabled ? disableService() : enableService()), |
279 | accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+S`, | 279 | accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+S`, |
280 | }, | 280 | }, |
281 | { | 281 | { |
282 | label: intl.formatMessage( | 282 | label: intl.formatMessage( |
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index b865bce73..7ec285431 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -51,7 +51,8 @@ const messages = defineMessages({ | |||
51 | }, | 51 | }, |
52 | customRecipeIntro: { | 52 | customRecipeIntro: { |
53 | id: 'settings.recipes.customService.intro', | 53 | id: 'settings.recipes.customService.intro', |
54 | defaultMessage: 'To add a custom service, copy the service recipe folder inside:', | 54 | defaultMessage: |
55 | 'To add a custom service, copy the service recipe folder inside:', | ||
55 | }, | 56 | }, |
56 | openFolder: { | 57 | openFolder: { |
57 | id: 'settings.recipes.customService.openFolder', | 58 | id: 'settings.recipes.customService.openFolder', |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 719c71561..720f2c8a1 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -621,7 +621,9 @@ class EditSettingsScreen extends Component { | |||
621 | default: DEFAULT_APP_SETTINGS.splitMode, | 621 | default: DEFAULT_APP_SETTINGS.splitMode, |
622 | }, | 622 | }, |
623 | splitColumns: { | 623 | splitColumns: { |
624 | label: `${intl.formatMessage(messages.splitColumns)} (${SPLIT_COLUMNS_MIN}-${SPLIT_COLUMNS_MAX})`, | 624 | label: `${intl.formatMessage( |
625 | messages.splitColumns, | ||
626 | )} (${SPLIT_COLUMNS_MIN}-${SPLIT_COLUMNS_MAX})`, | ||
625 | value: settings.all.app.splitColumns, | 627 | value: settings.all.app.splitColumns, |
626 | default: DEFAULT_APP_SETTINGS.splitColumns, | 628 | default: DEFAULT_APP_SETTINGS.splitColumns, |
627 | }, | 629 | }, |
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js index 1b0ac7035..7e35e6831 100644 --- a/src/internal-server/app/Controllers/Http/RecipeController.js +++ b/src/internal-server/app/Controllers/Http/RecipeController.js | |||
@@ -13,8 +13,10 @@ const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`; | |||
13 | class RecipeController { | 13 | class RecipeController { |
14 | // List official and custom recipes | 14 | // List official and custom recipes |
15 | async list({ response }) { | 15 | async list({ response }) { |
16 | const officialRecipes = JSON.parse(await (await fetch(RECIPES_URL)).text()); | 16 | const recipesUrlFetch = await fetch(RECIPES_URL); |
17 | const customRecipesArray = (await Recipe.all()).rows; | 17 | const officialRecipes = JSON.parse(await recipesUrlFetch).text(); |
18 | const allRecipes = await Recipe.all(); | ||
19 | const customRecipesArray = allRecipes.rows; | ||
18 | const customRecipes = customRecipesArray.map(recipe => ({ | 20 | const customRecipes = customRecipesArray.map(recipe => ({ |
19 | id: recipe.recipeId, | 21 | id: recipe.recipeId, |
20 | name: recipe.name, | 22 | name: recipe.name, |
@@ -46,7 +48,8 @@ class RecipeController { | |||
46 | let results; | 48 | let results; |
47 | 49 | ||
48 | if (needle === 'ferdi:custom') { | 50 | if (needle === 'ferdi:custom') { |
49 | const dbResults = (await Recipe.all()).toJSON(); | 51 | const allRecipes = await Recipe.all(); |
52 | const dbResults = allRecipes.toJSON(); | ||
50 | results = dbResults.map(recipe => ({ | 53 | results = dbResults.map(recipe => ({ |
51 | id: recipe.recipeId, | 54 | id: recipe.recipeId, |
52 | name: recipe.name, | 55 | name: recipe.name, |
@@ -56,20 +59,18 @@ class RecipeController { | |||
56 | let remoteResults = []; | 59 | let remoteResults = []; |
57 | // eslint-disable-next-line eqeqeq | 60 | // eslint-disable-next-line eqeqeq |
58 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { | 61 | if (Env.get('CONNECT_WITH_FRANZ') == 'true') { |
59 | remoteResults = JSON.parse( | 62 | const recipesUrlFetch = await fetch( |
60 | await ( | 63 | `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`, |
61 | await fetch( | ||
62 | `${RECIPES_URL}/search?needle=${encodeURIComponent(needle)}`, | ||
63 | ) | ||
64 | ).text(), | ||
65 | ); | 64 | ); |
65 | remoteResults = JSON.parse(await recipesUrlFetch.text()); | ||
66 | } | 66 | } |
67 | 67 | ||
68 | debug('remoteResults:', remoteResults); | 68 | debug('remoteResults:', remoteResults); |
69 | 69 | ||
70 | const localResultsArray = ( | 70 | const recipeQuery = await Recipe.query() |
71 | await Recipe.query().where('name', 'LIKE', `%${needle}%`).fetch() | 71 | .where('name', 'LIKE', `%${needle}%`) |
72 | ).toJSON(); | 72 | .fetch(); |
73 | const localResultsArray = recipeQuery.toJSON(); | ||
73 | const localResults = localResultsArray.map(recipe => ({ | 74 | const localResults = localResultsArray.map(recipe => ({ |
74 | id: recipe.recipeId, | 75 | id: recipe.recipeId, |
75 | name: recipe.name, | 76 | name: recipe.name, |
diff --git a/src/internal-server/app/Controllers/Http/ServiceController.js b/src/internal-server/app/Controllers/Http/ServiceController.js index c4ca5a113..a3add4464 100644 --- a/src/internal-server/app/Controllers/Http/ServiceController.js +++ b/src/internal-server/app/Controllers/Http/ServiceController.js | |||
@@ -34,6 +34,7 @@ class ServiceController { | |||
34 | do { | 34 | do { |
35 | serviceId = uuid(); | 35 | serviceId = uuid(); |
36 | } while ( | 36 | } while ( |
37 | // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member | ||
37 | (await Service.query().where('serviceId', serviceId).fetch()).rows | 38 | (await Service.query().where('serviceId', serviceId).fetch()).rows |
38 | .length > 0 | 39 | .length > 0 |
39 | ); | 40 | ); |
@@ -68,7 +69,8 @@ class ServiceController { | |||
68 | 69 | ||
69 | // List all services a user has created | 70 | // List all services a user has created |
70 | async list({ response }) { | 71 | async list({ response }) { |
71 | const services = (await Service.all()).rows; | 72 | const allServices = await Service.all(); |
73 | const services = allServices.rows; | ||
72 | // Convert to array with all data Franz wants | 74 | // Convert to array with all data Franz wants |
73 | const servicesArray = services.map(service => { | 75 | const servicesArray = services.map(service => { |
74 | const settings = | 76 | const settings = |
@@ -111,8 +113,8 @@ class ServiceController { | |||
111 | size: '2mb', | 113 | size: '2mb', |
112 | }); | 114 | }); |
113 | const { id } = params; | 115 | const { id } = params; |
114 | const service = (await Service.query().where('serviceId', id).fetch()) | 116 | const serviceQuery = await Service.query().where('serviceId', id).fetch(); |
115 | .rows[0]; | 117 | const service = serviceQuery.rows[0]; |
116 | const settings = | 118 | const settings = |
117 | typeof service.settings === 'string' | 119 | typeof service.settings === 'string' |
118 | ? JSON.parse(service.settings) | 120 | ? JSON.parse(service.settings) |
@@ -166,8 +168,8 @@ class ServiceController { | |||
166 | const { id } = params; | 168 | const { id } = params; |
167 | 169 | ||
168 | // Get current settings from db | 170 | // Get current settings from db |
169 | const serviceData = (await Service.query().where('serviceId', id).fetch()) | 171 | const serviceQuery = await Service.query().where('serviceId', id).fetch(); |
170 | .rows[0]; | 172 | const serviceData = serviceQuery.rows[0]; |
171 | 173 | ||
172 | const settings = { | 174 | const settings = { |
173 | ...(typeof serviceData.settings === 'string' | 175 | ...(typeof serviceData.settings === 'string' |
@@ -185,8 +187,10 @@ class ServiceController { | |||
185 | }); | 187 | }); |
186 | 188 | ||
187 | // Get updated row | 189 | // Get updated row |
188 | const service = (await Service.query().where('serviceId', id).fetch()) | 190 | const anotherServiceQuery = await Service.query() |
189 | .rows[0]; | 191 | .where('serviceId', id) |
192 | .fetch(); | ||
193 | const service = anotherServiceQuery.rows[0]; | ||
190 | 194 | ||
191 | return response.send({ | 195 | return response.send({ |
192 | data: { | 196 | data: { |
@@ -218,11 +222,12 @@ class ServiceController { | |||
218 | 222 | ||
219 | for (const service of Object.keys(data)) { | 223 | for (const service of Object.keys(data)) { |
220 | // Get current settings from db | 224 | // Get current settings from db |
221 | const serviceData = ( | 225 | // eslint-disable-next-line no-await-in-loop |
222 | await Service.query() // eslint-disable-line no-await-in-loop | 226 | const serviceQuery = await Service.query() |
223 | .where('serviceId', service) | 227 | .where('serviceId', service) |
224 | .fetch() | 228 | .fetch(); |
225 | ).rows[0]; | 229 | |
230 | const serviceData = serviceQuery.rows[0]; | ||
226 | 231 | ||
227 | const settings = { | 232 | const settings = { |
228 | ...JSON.parse(serviceData.settings), | 233 | ...JSON.parse(serviceData.settings), |
@@ -238,7 +243,8 @@ class ServiceController { | |||
238 | } | 243 | } |
239 | 244 | ||
240 | // Get new services | 245 | // Get new services |
241 | const services = (await Service.all()).rows; | 246 | const allServices = await Service.all(); |
247 | const services = allServices.rows; | ||
242 | // Convert to array with all data Franz wants | 248 | // Convert to array with all data Franz wants |
243 | const servicesArray = services.map(service => { | 249 | const servicesArray = services.map(service => { |
244 | const settings = | 250 | const settings = |
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js index 2ecc8241c..abfbc2470 100644 --- a/src/internal-server/app/Controllers/Http/UserController.js +++ b/src/internal-server/app/Controllers/Http/UserController.js | |||
@@ -1,3 +1,4 @@ | |||
1 | /* eslint-disable no-await-in-loop, unicorn/no-await-expression-member */ | ||
1 | const User = use('App/Models/User'); | 2 | const User = use('App/Models/User'); |
2 | const Service = use('App/Models/Service'); | 3 | const Service = use('App/Models/Service'); |
3 | const Workspace = use('App/Models/Workspace'); | 4 | const Workspace = use('App/Models/Workspace'); |
@@ -230,8 +231,10 @@ class UserController { | |||
230 | auth, | 231 | auth, |
231 | response, | 232 | response, |
232 | }) { | 233 | }) { |
233 | const services = (await Service.all()).toJSON(); | 234 | const allServices = await Service.all(); |
234 | const workspaces = (await Workspace.all()).toJSON(); | 235 | const services = allServices.toJSON(); |
236 | const allWorkspaces = await Workspace.all(); | ||
237 | const workspaces = allWorkspaces.toJSON(); | ||
235 | 238 | ||
236 | const exportData = { | 239 | const exportData = { |
237 | username: 'Ferdi', | 240 | username: 'Ferdi', |
diff --git a/src/internal-server/app/Controllers/Http/WorkspaceController.js b/src/internal-server/app/Controllers/Http/WorkspaceController.js index 528721f13..9ba2b174e 100644 --- a/src/internal-server/app/Controllers/Http/WorkspaceController.js +++ b/src/internal-server/app/Controllers/Http/WorkspaceController.js | |||
@@ -25,11 +25,13 @@ class WorkspaceController { | |||
25 | do { | 25 | do { |
26 | workspaceId = uuid(); | 26 | workspaceId = uuid(); |
27 | } while ( | 27 | } while ( |
28 | // eslint-disable-next-line no-await-in-loop, unicorn/no-await-expression-member | ||
28 | (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows | 29 | (await Workspace.query().where('workspaceId', workspaceId).fetch()).rows |
29 | .length > 0 | 30 | .length > 0 |
30 | ); | 31 | ); |
31 | 32 | ||
32 | const order = (await Workspace.all()).rows.length; | 33 | const allWorkspaces = await Workspace.all(); |
34 | const order = allWorkspaces.rows.length; | ||
33 | const { name } = data; | 35 | const { name } = data; |
34 | delete data.name; | 36 | delete data.name; |
35 | 37 | ||
@@ -76,8 +78,10 @@ class WorkspaceController { | |||
76 | }); | 78 | }); |
77 | 79 | ||
78 | // Get updated row | 80 | // Get updated row |
79 | const workspace = (await Workspace.query().where('workspaceId', id).fetch()) | 81 | const workspaceQuery = await Workspace.query() |
80 | .rows[0]; | 82 | .where('workspaceId', id) |
83 | .fetch(); | ||
84 | const workspace = workspaceQuery.rows[0]; | ||
81 | 85 | ||
82 | return response.send({ | 86 | return response.send({ |
83 | id: workspace.workspaceId, | 87 | id: workspace.workspaceId, |
@@ -118,7 +122,8 @@ class WorkspaceController { | |||
118 | 122 | ||
119 | // List all workspaces a user has created | 123 | // List all workspaces a user has created |
120 | async list({ response }) { | 124 | async list({ response }) { |
121 | const workspaces = (await Workspace.all()).rows; | 125 | const allWorkspaces = await Workspace.all(); |
126 | const workspaces = allWorkspaces.rows; | ||
122 | // Convert to array with all data Franz wants | 127 | // Convert to array with all data Franz wants |
123 | let workspacesArray = []; | 128 | let workspacesArray = []; |
124 | if (workspaces) { | 129 | if (workspaces) { |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 892b2ff3c..8e529d859 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -1,5 +1,11 @@ | |||
1 | import { clipboard } from 'electron'; | 1 | import { clipboard } from 'electron'; |
2 | import { app, Menu, dialog, systemPreferences, getCurrentWindow } from '@electron/remote'; | 2 | import { |
3 | app, | ||
4 | Menu, | ||
5 | dialog, | ||
6 | systemPreferences, | ||
7 | getCurrentWindow, | ||
8 | } from '@electron/remote'; | ||
3 | import { autorun, observable } from 'mobx'; | 9 | import { autorun, observable } from 'mobx'; |
4 | import { defineMessages } from 'react-intl'; | 10 | import { defineMessages } from 'react-intl'; |
5 | import { | 11 | import { |
@@ -950,7 +956,8 @@ class FranzMenu { | |||
950 | click: () => { | 956 | click: () => { |
951 | this.actions.service.setActive({ serviceId: service.id }); | 957 | this.actions.service.setActive({ serviceId: service.id }); |
952 | 958 | ||
953 | if (isMac && i === 0) { // feat(Mac): Open Window with Cmd+1 | 959 | if (isMac && i === 0) { |
960 | // feat(Mac): Open Window with Cmd+1 | ||
954 | getCurrentWindow().restore(); | 961 | getCurrentWindow().restore(); |
955 | } | 962 | } |
956 | }, | 963 | }, |
diff --git a/src/lib/Tray.js b/src/lib/Tray.js index 655dc416f..63382483e 100644 --- a/src/lib/Tray.js +++ b/src/lib/Tray.js | |||
@@ -33,15 +33,20 @@ export default class TrayIcon { | |||
33 | 33 | ||
34 | mainWindow = null; | 34 | mainWindow = null; |
35 | 35 | ||
36 | trayMenuTemplate = (tray) => [ | 36 | trayMenuTemplate = tray => [ |
37 | { | 37 | { |
38 | label: (tray.mainWindow.isVisible() && tray.mainWindow.isFocused()) ? 'Hide Ferdi' : 'Show Ferdi', | 38 | label: |
39 | tray.mainWindow.isVisible() && tray.mainWindow.isFocused() | ||
40 | ? 'Hide Ferdi' | ||
41 | : 'Show Ferdi', | ||
39 | click() { | 42 | click() { |
40 | tray._toggleWindow(); | 43 | tray._toggleWindow(); |
41 | }, | 44 | }, |
42 | }, | 45 | }, |
43 | { | 46 | { |
44 | label: tray.isAppMuted ? 'Enable Notifications && Audio' : 'Disable Notifications && Audio', | 47 | label: tray.isAppMuted |
48 | ? 'Enable Notifications && Audio' | ||
49 | : 'Disable Notifications && Audio', | ||
45 | click() { | 50 | click() { |
46 | if (!tray.mainWindow) return; | 51 | if (!tray.mainWindow) return; |
47 | tray.mainWindow.webContents.send('muteApp'); | 52 | tray.mainWindow.webContents.send('muteApp'); |