diff options
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | pnpm-lock.yaml | 43 | ||||
-rw-r--r-- | src/api/server/ServerApi.ts | 3 |
3 files changed, 36 insertions, 11 deletions
diff --git a/package.json b/package.json index 38687dafc..bb36128f9 100644 --- a/package.json +++ b/package.json | |||
@@ -61,6 +61,7 @@ | |||
61 | "@adonisjs/shield": "1.1.0", | 61 | "@adonisjs/shield": "1.1.0", |
62 | "@adonisjs/validator": "5.1.0", | 62 | "@adonisjs/validator": "5.1.0", |
63 | "@electron/remote": "2.1.2", | 63 | "@electron/remote": "2.1.2", |
64 | "@emotion/react": "11.11.4", | ||
64 | "@emotion/styled": "11.11.5", | 65 | "@emotion/styled": "11.11.5", |
65 | "@mdi/js": "7.4.47", | 66 | "@mdi/js": "7.4.47", |
66 | "@mdi/react": "1.6.1", | 67 | "@mdi/react": "1.6.1", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc4a105d8..723fe4a7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -41,6 +41,9 @@ dependencies: | |||
41 | '@electron/remote': | 41 | '@electron/remote': |
42 | specifier: 2.1.2 | 42 | specifier: 2.1.2 |
43 | version: 2.1.2(electron@29.3.0) | 43 | version: 2.1.2(electron@29.3.0) |
44 | '@emotion/react': | ||
45 | specifier: 11.11.4 | ||
46 | version: 11.11.4(@types/react@18.2.77)(react@18.2.0) | ||
44 | '@emotion/styled': | 47 | '@emotion/styled': |
45 | specifier: 11.11.5 | 48 | specifier: 11.11.5 |
46 | version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) | 49 | version: 11.11.5(@emotion/react@11.11.4)(@types/react@18.2.77)(react@18.2.0) |
@@ -1038,20 +1041,20 @@ packages: | |||
1038 | resolution: {integrity: sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==} | 1041 | resolution: {integrity: sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==} |
1039 | engines: {node: '>=6.9.0'} | 1042 | engines: {node: '>=6.9.0'} |
1040 | dependencies: | 1043 | dependencies: |
1041 | regenerator-runtime: 0.14.0 | 1044 | regenerator-runtime: 0.14.1 |
1042 | 1045 | ||
1043 | /@babel/runtime@7.23.9: | 1046 | /@babel/runtime@7.23.9: |
1044 | resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==} | 1047 | resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==} |
1045 | engines: {node: '>=6.9.0'} | 1048 | engines: {node: '>=6.9.0'} |
1046 | dependencies: | 1049 | dependencies: |
1047 | regenerator-runtime: 0.14.0 | 1050 | regenerator-runtime: 0.14.0 |
1051 | dev: false | ||
1048 | 1052 | ||
1049 | /@babel/runtime@7.24.4: | 1053 | /@babel/runtime@7.24.4: |
1050 | resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} | 1054 | resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} |
1051 | engines: {node: '>=6.9.0'} | 1055 | engines: {node: '>=6.9.0'} |
1052 | dependencies: | 1056 | dependencies: |
1053 | regenerator-runtime: 0.14.1 | 1057 | regenerator-runtime: 0.14.1 |
1054 | dev: false | ||
1055 | 1058 | ||
1056 | /@babel/template@7.22.15: | 1059 | /@babel/template@7.22.15: |
1057 | resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} | 1060 | resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} |
@@ -1491,10 +1494,10 @@ packages: | |||
1491 | resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} | 1494 | resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==} |
1492 | dependencies: | 1495 | dependencies: |
1493 | '@babel/helper-module-imports': 7.22.15 | 1496 | '@babel/helper-module-imports': 7.22.15 |
1494 | '@babel/runtime': 7.23.9 | 1497 | '@babel/runtime': 7.23.5 |
1495 | '@emotion/hash': 0.9.1 | 1498 | '@emotion/hash': 0.9.1 |
1496 | '@emotion/memoize': 0.8.1 | 1499 | '@emotion/memoize': 0.8.1 |
1497 | '@emotion/serialize': 1.1.4 | 1500 | '@emotion/serialize': 1.1.2 |
1498 | babel-plugin-macros: 3.1.0 | 1501 | babel-plugin-macros: 3.1.0 |
1499 | convert-source-map: 1.9.0 | 1502 | convert-source-map: 1.9.0 |
1500 | escape-string-regexp: 4.0.0 | 1503 | escape-string-regexp: 4.0.0 |
@@ -1555,7 +1558,7 @@ packages: | |||
1555 | '@babel/runtime': 7.24.4 | 1558 | '@babel/runtime': 7.24.4 |
1556 | '@emotion/babel-plugin': 11.11.0 | 1559 | '@emotion/babel-plugin': 11.11.0 |
1557 | '@emotion/cache': 11.11.0 | 1560 | '@emotion/cache': 11.11.0 |
1558 | '@emotion/serialize': 1.1.4 | 1561 | '@emotion/serialize': 1.1.3 |
1559 | '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) | 1562 | '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) |
1560 | '@emotion/utils': 1.2.1 | 1563 | '@emotion/utils': 1.2.1 |
1561 | '@emotion/weak-memoize': 0.3.1 | 1564 | '@emotion/weak-memoize': 0.3.1 |
@@ -1564,6 +1567,26 @@ packages: | |||
1564 | react: 18.2.0 | 1567 | react: 18.2.0 |
1565 | dev: false | 1568 | dev: false |
1566 | 1569 | ||
1570 | /@emotion/serialize@1.1.2: | ||
1571 | resolution: {integrity: sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==} | ||
1572 | dependencies: | ||
1573 | '@emotion/hash': 0.9.1 | ||
1574 | '@emotion/memoize': 0.8.1 | ||
1575 | '@emotion/unitless': 0.8.1 | ||
1576 | '@emotion/utils': 1.2.1 | ||
1577 | csstype: 3.1.3 | ||
1578 | dev: false | ||
1579 | |||
1580 | /@emotion/serialize@1.1.3: | ||
1581 | resolution: {integrity: sha512-iD4D6QVZFDhcbH0RAG1uVu1CwVLMWUkCvAqqlewO/rxf8+87yIBAlt4+AxMiiKPLs5hFc0owNk/sLLAOROw3cA==} | ||
1582 | dependencies: | ||
1583 | '@emotion/hash': 0.9.1 | ||
1584 | '@emotion/memoize': 0.8.1 | ||
1585 | '@emotion/unitless': 0.8.1 | ||
1586 | '@emotion/utils': 1.2.1 | ||
1587 | csstype: 3.1.3 | ||
1588 | dev: false | ||
1589 | |||
1567 | /@emotion/serialize@1.1.4: | 1590 | /@emotion/serialize@1.1.4: |
1568 | resolution: {integrity: sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==} | 1591 | resolution: {integrity: sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==} |
1569 | dependencies: | 1592 | dependencies: |
@@ -3056,8 +3079,8 @@ packages: | |||
3056 | resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} | 3079 | resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} |
3057 | dev: true | 3080 | dev: true |
3058 | 3081 | ||
3059 | /@types/parse-json@4.0.2: | 3082 | /@types/parse-json@4.0.0: |
3060 | resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} | 3083 | resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} |
3061 | dev: false | 3084 | dev: false |
3062 | 3085 | ||
3063 | /@types/plist@3.0.5: | 3086 | /@types/plist@3.0.5: |
@@ -5289,7 +5312,7 @@ packages: | |||
5289 | resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} | 5312 | resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} |
5290 | engines: {node: '>=10'} | 5313 | engines: {node: '>=10'} |
5291 | dependencies: | 5314 | dependencies: |
5292 | '@types/parse-json': 4.0.2 | 5315 | '@types/parse-json': 4.0.0 |
5293 | import-fresh: 3.3.0 | 5316 | import-fresh: 3.3.0 |
5294 | parse-json: 5.2.0 | 5317 | parse-json: 5.2.0 |
5295 | path-type: 4.0.0 | 5318 | path-type: 4.0.0 |
@@ -9302,7 +9325,7 @@ packages: | |||
9302 | resolution: {integrity: sha512-TuDuZ5KrgyjoCIppdPXBMqiGfota55+odM+j2cQ5rt/XKyKmqGB3Whz1F8SN8+60yYGy/Nu5lbRZ+rx8kBIvBw==} | 9325 | resolution: {integrity: sha512-TuDuZ5KrgyjoCIppdPXBMqiGfota55+odM+j2cQ5rt/XKyKmqGB3Whz1F8SN8+60yYGy/Nu5lbRZ+rx8kBIvBw==} |
9303 | engines: {node: '>=10'} | 9326 | engines: {node: '>=10'} |
9304 | dependencies: | 9327 | dependencies: |
9305 | '@babel/runtime': 7.23.9 | 9328 | '@babel/runtime': 7.24.4 |
9306 | chalk: 4.1.2 | 9329 | chalk: 4.1.2 |
9307 | pegjs: 0.10.0 | 9330 | pegjs: 0.10.0 |
9308 | dev: true | 9331 | dev: true |
@@ -11923,10 +11946,10 @@ packages: | |||
11923 | 11946 | ||
11924 | /regenerator-runtime@0.14.0: | 11947 | /regenerator-runtime@0.14.0: |
11925 | resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} | 11948 | resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} |
11949 | dev: false | ||
11926 | 11950 | ||
11927 | /regenerator-runtime@0.14.1: | 11951 | /regenerator-runtime@0.14.1: |
11928 | resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} | 11952 | resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} |
11929 | dev: false | ||
11930 | 11953 | ||
11931 | /regex-not@1.0.2: | 11954 | /regex-not@1.0.2: |
11932 | resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==} | 11955 | resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==} |
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts index ab6866b13..b5dd499ab 100644 --- a/src/api/server/ServerApi.ts +++ b/src/api/server/ServerApi.ts | |||
@@ -379,7 +379,8 @@ export default class ServerApi { | |||
379 | .filter(recipe => recipe.id); | 379 | .filter(recipe => recipe.id); |
380 | 380 | ||
381 | // @ts-expect-error Type 'boolean' is not assignable to type 'ConcatArray<IRecipe>'. | 381 | // @ts-expect-error Type 'boolean' is not assignable to type 'ConcatArray<IRecipe>'. |
382 | this.recipes = [...this.recipes, ...this._getDevRecipes()]; | 382 | // eslint-disable-next-line unicorn/prefer-spread |
383 | this.recipes = this.recipes.concat(this._getDevRecipes()); | ||
383 | 384 | ||
384 | debug('StubServerApi::getInstalledRecipes resolves', this.recipes); | 385 | debug('StubServerApi::getInstalledRecipes resolves', this.recipes); |
385 | return this.recipes; | 386 | return this.recipes; |