diff --git a/package.json b/package.json index aa5cadd..4077381 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "vue-router": "^4.0.14" }, "devDependencies": { - "@antfu/eslint-config": "^0.20.3", + "@antfu/eslint-config": "^0.20.6", "@iconify-json/fe": "^1.1.1", "@iconify-json/gg": "^1.1.1", "@iconify-json/ic": "^1.1.2", @@ -44,7 +44,7 @@ "sass": "^1.50.0", "star-markdown-css": "^0.3.3", "typescript": "^4.6.3", - "unocss": "^0.31.3", + "unocss": "^0.31.5", "unplugin-auto-import": "^0.7.1", "unplugin-vue-components": "^0.19.3", "vite": "^2.9.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f36b818..7982148 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.3 specifiers: - '@antfu/eslint-config': ^0.20.3 + '@antfu/eslint-config': ^0.20.6 '@gtm-support/vue-gtm': ^1.4.0 '@iconify-json/fe': ^1.1.1 '@iconify-json/gg': ^1.1.1 @@ -28,7 +28,7 @@ specifiers: sass: ^1.50.0 star-markdown-css: ^0.3.3 typescript: ^4.6.3 - unocss: ^0.31.3 + unocss: ^0.31.5 unplugin-auto-import: ^0.7.1 unplugin-vue-components: ^0.19.3 vite: ^2.9.5 @@ -56,7 +56,7 @@ dependencies: vue-router: 4.0.14_vue@3.2.33 devDependencies: - '@antfu/eslint-config': 0.20.3_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config': 0.20.6_eslint@8.13.0+typescript@4.6.3 '@iconify-json/fe': 1.1.1 '@iconify-json/gg': 1.1.1 '@iconify-json/ic': 1.1.2 @@ -77,7 +77,7 @@ devDependencies: sass: 1.50.0 star-markdown-css: 0.3.3 typescript: 4.6.3 - unocss: 0.31.3_vite@2.9.5 + unocss: 0.31.5_vite@2.9.5 unplugin-auto-import: 0.7.1_@vueuse+core@8.2.6+vite@2.9.5 unplugin-vue-components: 0.19.3_vite@2.9.5+vue@3.2.33 vite: 2.9.5_sass@1.50.0 @@ -99,13 +99,13 @@ packages: '@jridgewell/trace-mapping': 0.3.4 dev: true - /@antfu/eslint-config-basic/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-fO2SBoIlT1PJabayQYTKds0VQsTFsFG//FOjXY/OylOxLAnXebkPZK8DGYBDjlcL63k9ZK1rf8KduE4M3cB5/A==} + /@antfu/eslint-config-basic/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-2xeB/7y2mix0UL4rvv2dqMSKJtLpX9a1hfldqpOlTJ8L6ur/4y8C6B7PdmfYeOF7/VzbJs7iOemZ8fwUYa7ufA==} peerDependencies: eslint: '>=7.4.0' dependencies: eslint: 8.13.0 - eslint-plugin-antfu: 0.20.3_eslint@8.13.0+typescript@4.6.3 + eslint-plugin-antfu: 0.20.6_eslint@8.13.0+typescript@4.6.3 eslint-plugin-eslint-comments: 3.2.0_eslint@8.13.0 eslint-plugin-html: 6.2.0 eslint-plugin-import: 2.26.0_eslint@8.13.0 @@ -122,12 +122,12 @@ packages: - typescript dev: true - /@antfu/eslint-config-react/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-BHytPbmETkHekSicPqOasIvdgTQi28SA2yMxWfm4+XClQT/w5ITlvn+tofJD4F3F1VMTdWw7kdtfgbm+20kOZg==} + /@antfu/eslint-config-react/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-E7ezhEdSRZGkhgYcCoCYqwXVIdjF9lHukUlUfDVQ0vkNWwXJ5n899dPIDLbmRjIhAJNfTPTzSDZBKW8+wo+v0g==} peerDependencies: eslint: '>=7.4.0' dependencies: - '@antfu/eslint-config-ts': 0.20.3_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config-ts': 0.20.6_eslint@8.13.0+typescript@4.6.3 eslint: 8.13.0 eslint-plugin-react: 7.29.4_eslint@8.13.0 transitivePeerDependencies: @@ -135,13 +135,13 @@ packages: - typescript dev: true - /@antfu/eslint-config-ts/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-kVegzXfBpyAdSycOQZhd+zQMll7MaBAAeG/mT7FP1QnPWzkoJJq7IC30LIpctdDdDsTHmeRZSxO7rL3SlvsEaA==} + /@antfu/eslint-config-ts/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-Lra8CVoHiZc8hMZ/hQ077Fg40hoNQtF03XkInRwemYCHChpEVoiG7ytLAuUzwMD/sSOcBqlyTb8eRuJwdzlOfg==} peerDependencies: eslint: '>=7.4.0' typescript: '>=3.9' dependencies: - '@antfu/eslint-config-basic': 0.20.3_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config-basic': 0.20.6_eslint@8.13.0+typescript@4.6.3 '@typescript-eslint/eslint-plugin': 5.19.0_f34adc8488d2e4f014fe61432d70cbf2 '@typescript-eslint/parser': 5.19.0_eslint@8.13.0+typescript@4.6.3 eslint: 8.13.0 @@ -150,12 +150,12 @@ packages: - supports-color dev: true - /@antfu/eslint-config-vue/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-FBRJ5qzxMKp8DhURMyuSCoueZWU4Rtd0IgSde1KvPbHMW6Q1kYIK4YNrAvuIzJ06yUYd1vJ962u+XUkIDMJwUQ==} + /@antfu/eslint-config-vue/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-XiShqv24Wpd9zrL9PyYjb9OYNAiZeD1ReYv1SrQ/yXB0Dt3r9Go2UCTZVTF+4vpoETdzMj0aF0jqhx6ZKijjew==} peerDependencies: eslint: '>=7.4.0' dependencies: - '@antfu/eslint-config-ts': 0.20.3_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config-ts': 0.20.6_eslint@8.13.0+typescript@4.6.3 eslint: 8.13.0 eslint-plugin-vue: 8.6.0_eslint@8.13.0 transitivePeerDependencies: @@ -163,13 +163,13 @@ packages: - typescript dev: true - /@antfu/eslint-config/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-noXVlHnyJ4K4KhjXzyTLCQSoRPlEsiuoJFbBzUT7LUQ6VZSEa+0vvnksMCe0whCe9D3zKIyKIy9um2hQJKJbCg==} + /@antfu/eslint-config/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-je2qjyEXqxyioRm80Tn4D2TWutrwlrtW6cKTJ9nw2WVg0oLJV8XQ2Ua8e9lp2rsFcmmb17FQyaaDyL4xCxs/HA==} peerDependencies: eslint: '>=7.4.0' dependencies: - '@antfu/eslint-config-react': 0.20.3_eslint@8.13.0+typescript@4.6.3 - '@antfu/eslint-config-vue': 0.20.3_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config-react': 0.20.6_eslint@8.13.0+typescript@4.6.3 + '@antfu/eslint-config-vue': 0.20.6_eslint@8.13.0+typescript@4.6.3 '@typescript-eslint/eslint-plugin': 5.19.0_f34adc8488d2e4f014fe61432d70cbf2 '@typescript-eslint/parser': 5.19.0_eslint@8.13.0+typescript@4.6.3 eslint: 8.13.0 @@ -1759,14 +1759,14 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@unocss/cli/0.31.3: - resolution: {integrity: sha512-cB8lNOmUlmgf+ws+hQ91nn0HLiezXFLCPWuYLNv3MlCXn8P3IlNgvcpTF5C+L+qj9YSPCRIoQP+blmlF7SbvDQ==} + /@unocss/cli/0.31.5: + resolution: {integrity: sha512-jw6TDDUS2Bo5hAX+QetVV30ptiuQzT5STmGhGLqV/swM1f5UqcMApiq8wba8ef8DIO0RTTCy9lL0jwjGqxf5AQ==} engines: {node: '>=14'} hasBin: true dependencies: - '@unocss/config': 0.31.3 - '@unocss/core': 0.31.3 - '@unocss/preset-uno': 0.31.3 + '@unocss/config': 0.31.5 + '@unocss/core': 0.31.5 + '@unocss/preset-uno': 0.31.5 cac: 6.7.12 chokidar: 3.5.3 colorette: 2.0.16 @@ -1775,108 +1775,108 @@ packages: pathe: 0.2.0 dev: true - /@unocss/config/0.31.3: - resolution: {integrity: sha512-sH1twx4sRMz/lrZD/UiweZlTY3NvgawYUbfS8xHnfk1H5mjP0KQVyRPv/pF8OHGxd3oLeMMJcpHlHWCEobIejA==} + /@unocss/config/0.31.5: + resolution: {integrity: sha512-qnMeIlz6V1ezMJu2fWOL12Tz51+X3dFrHZyOQXEj5KmPSpFWUtlRY+M++zadQeSabRMGK3fdhkjjiu8HcVnfYQ==} engines: {node: '>=14'} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 unconfig: 0.3.3 dev: true - /@unocss/core/0.31.3: - resolution: {integrity: sha512-0xnRatssQzXs44qC9vuvJXBL6vDAEhTOuvH2Yp0cQhowsdrf6W6iC1fw/v8DNr6NJraBOwJIMKcD1nxoiXpNJA==} + /@unocss/core/0.31.5: + resolution: {integrity: sha512-3W/bqqa+xGvoVY+FdlyMikwflCJvKvUAGzQUxQtF+/c5y7iTzMiZDKdDLSDrRLqBZQrseViXXCWEx71UtCRXUg==} dev: true - /@unocss/inspector/0.31.3: - resolution: {integrity: sha512-cBlb0bPObYpWfxhCYtQgU3VVxeU4Jk3qd+m1p7ocXezfNP56dLRAiPoe71vAuGQa9CxHNLaObelGCZtc4zJD0g==} + /@unocss/inspector/0.31.5: + resolution: {integrity: sha512-Qb7oL9rmQyUlf/7sv6C6VkN8InBvdAqrejI1ZeI95d82jOJInrsR8H7iunUKkMUXKXjZ+LY2dHbRV5LeQyPwHA==} dependencies: gzip-size: 6.0.0 sirv: 2.0.2 dev: true - /@unocss/preset-attributify/0.31.3: - resolution: {integrity: sha512-UsbVR7dpXlKBrGC0xY9XrkVzeIltxsE/kenXnQdZ1hAwV8uvqEpbsF3PldBi3+DcXiwnOtPtfsz+RQuU4TUaxw==} + /@unocss/preset-attributify/0.31.5: + resolution: {integrity: sha512-3nEYnP/q4et3neqAat3lbEXCxun8oi2yMxeAdcfzMrrr8ooErTTS6SbKFI1XN+V/hytfAZ5oy3rzt8V1XaG1jg==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 dev: true - /@unocss/preset-icons/0.31.3: - resolution: {integrity: sha512-AQYSw4644wsXZZlACzeJKZqOndv/MoQkuf+ijsslacqd0ThrLBLJhExzYxln10aS2eqA4JCIq8GUCEq/x8YYCw==} + /@unocss/preset-icons/0.31.5: + resolution: {integrity: sha512-mauk1uDqnV8brG+/eXDOdvtmOzfKTuUqq2CCziEvu8jUKMag51hEZOD5T2fnSiki3qp7rUIevx00EfOfNFMqig==} dependencies: '@iconify/utils': 1.0.32 - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 transitivePeerDependencies: - supports-color dev: true - /@unocss/preset-mini/0.31.3: - resolution: {integrity: sha512-c0TIoRYfU1OMGf9OVhaaYBfl+Wm8i9eW3QGlM6KKjFdKphkJ2TBL/5GXZsCUhomZLRBAm0Fs49Sc26bi218vmA==} + /@unocss/preset-mini/0.31.5: + resolution: {integrity: sha512-xsvCaok8+kHHq4FlcISOdzZrbfBJeUS+D66y37TtYbmMvxXtIhuJaP1fBLDNLPsHjpyCQ9dPXpUn0wUH1O4n2A==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 dev: true - /@unocss/preset-typography/0.31.3: - resolution: {integrity: sha512-aLwaaDtPGHQW392kpPQ4zqmqTU9uO80FuhlVbRvtMgYcbRbvtrpdu+FidiNwTg3bAWYYHa9zDSQCoYJMqlrRGg==} + /@unocss/preset-typography/0.31.5: + resolution: {integrity: sha512-ghiuUtT6JVXV9JUca5FTsvfrqUGZ1CPTfCF9TyUZ+01LcDwXPmO4M4tbnWji7gLIK1WQdNaKKm25rDOmf7GA2w==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 dev: true - /@unocss/preset-uno/0.31.3: - resolution: {integrity: sha512-EBIcHPgDpallTh5TYLyCBtQdqla2oXBkpxLnLciuUbL+OBvAlgBRsCGSo1eEO4KTp/QiVt2Orib0k3RwB+jsiw==} + /@unocss/preset-uno/0.31.5: + resolution: {integrity: sha512-frlwJKkO0s/OFehSEuD5vAEEZhrlAuNznNC1o9NTMsw+pZMaiNwpRO92oVZgQ653jGUYh3wvYnB2iES+fr1XKw==} dependencies: - '@unocss/core': 0.31.3 - '@unocss/preset-mini': 0.31.3 - '@unocss/preset-wind': 0.31.3 + '@unocss/core': 0.31.5 + '@unocss/preset-mini': 0.31.5 + '@unocss/preset-wind': 0.31.5 dev: true - /@unocss/preset-web-fonts/0.31.3: - resolution: {integrity: sha512-Oq8vGUBGriHJwYV7vSdGLVkfTfF5+v/PBUVvNVePSS+BBJrixgQmbf7k9V88TutgbJkOnJAiRqT4/g3SlJVK4w==} + /@unocss/preset-web-fonts/0.31.5: + resolution: {integrity: sha512-34DLRY+7gxZb9dYdJwlWVGNGEl69iZIlxLTR9YXCJkGziYhGtoDXI8YVg4wxRIE2fql/hB7kT8k6jNRZNuc2rw==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 axios: 0.26.1 transitivePeerDependencies: - debug dev: true - /@unocss/preset-wind/0.31.3: - resolution: {integrity: sha512-UnfZXW8Gj5u2vZ77kx+OndAPMG9dFSX74vtbfspE5HQM74xURLLz+aF1zQKXnxNS+faLIOCoQoGaS98cZCaWuA==} + /@unocss/preset-wind/0.31.5: + resolution: {integrity: sha512-ZX8NNFeMy+y93n2BUjETvIfbuvezRnuJUPLEIlaWk+PaHEC2Y4kkZ7KK2XWdWDENp8oiS6qoX4pv/x4itng5zA==} dependencies: - '@unocss/core': 0.31.3 - '@unocss/preset-mini': 0.31.3 + '@unocss/core': 0.31.5 + '@unocss/preset-mini': 0.31.5 dev: true - /@unocss/reset/0.31.3: - resolution: {integrity: sha512-0GVHFMDTrXVzMr+sRLcHakDb7JzGAIwVPb/8W6AXcov+Do4+OjyfyFnGWpA6DFcCF7dcQh/g8EJqfDURWtviPg==} + /@unocss/reset/0.31.5: + resolution: {integrity: sha512-IdAEKdeTVwBKteYu/w/qOiUDOrwgORod8NhxQOEJr0xUbZn13A4wKFqiU6jqoY8VXnb4hqddafe6q96LcU6XuA==} dev: true - /@unocss/scope/0.31.3: - resolution: {integrity: sha512-UVNjNPzAAin/Opkr3sLBkXIDXaNboEJB4b+J+ix48Z8/9OsInytrcFqvM531C4SnPHnrmab0s5ykMjGNOHV/5A==} + /@unocss/scope/0.31.5: + resolution: {integrity: sha512-l+ORpB1NFPqFUk+k1SElkrgzYh9YKCSnUEFlrABgCdCNue+JJKBvCNzkORkxWIa/9FaDwWErAP7f5uWbh1dVFg==} dev: true - /@unocss/transformer-directives/0.31.3: - resolution: {integrity: sha512-j9I7xK1KmoQt/H3VyuRTq3PSPRfKksBRQ1W8s8yHJDWfpO5NCPgDXXUZfs8pyqH78Xi/CfXAnNVd6YJ2nPkTJw==} + /@unocss/transformer-directives/0.31.5: + resolution: {integrity: sha512-xT0Ttk8ra1ckSUDy/kTTvs7+9KJ14scDB7T8X5qxPNlNJW2WSTmwe1PbnuikBtg1XYxzJSdbvcHey8TcgCzxWg==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 css-tree: 2.1.0 dev: true - /@unocss/transformer-variant-group/0.31.3: - resolution: {integrity: sha512-H1MED1A58QnrXPMizlrTCzE1FYlKrO+IPoA+aSWeoCgTKFH4u4hYqTJuJns28wXugV7tSuxy9CWwTztZYQQU6Q==} + /@unocss/transformer-variant-group/0.31.5: + resolution: {integrity: sha512-v/l/Im63QXDM2r0Gu+EeK54RC+UQfPspUB1X66oGJQ5UZ15Pu5NKKBoqSA96TOIdtTU9qh52pWEHxh0NffgQbA==} dependencies: - '@unocss/core': 0.31.3 + '@unocss/core': 0.31.5 dev: true - /@unocss/vite/0.31.3_vite@2.9.5: - resolution: {integrity: sha512-bkfo0Yw0Taoh0SXRzm4qq6Kg7xjXlQ95l/09URJ14BjWY8FmRZFE2U73yNxyQHA9Cg7iFZh6vlxkkLyXz+xYdQ==} + /@unocss/vite/0.31.5_vite@2.9.5: + resolution: {integrity: sha512-mwgq4AewdZIjaA+hZ9MgsuYYw6TCiKYZYTFIlQ2NM8CEysTbR27Dg7A+VCVXSy8S7wLK00+L4mxuh8lyBTIg4Q==} peerDependencies: vite: ^2.9.0 dependencies: '@rollup/pluginutils': 4.2.1 - '@unocss/config': 0.31.3 - '@unocss/core': 0.31.3 - '@unocss/inspector': 0.31.3 - '@unocss/scope': 0.31.3 - '@unocss/transformer-directives': 0.31.3 + '@unocss/config': 0.31.5 + '@unocss/core': 0.31.5 + '@unocss/inspector': 0.31.5 + '@unocss/scope': 0.31.5 + '@unocss/transformer-directives': 0.31.5 magic-string: 0.26.1 vite: 2.9.5_sass@1.50.0 dev: true @@ -3297,8 +3297,8 @@ packages: find-up: 2.1.0 dev: true - /eslint-plugin-antfu/0.20.3_eslint@8.13.0+typescript@4.6.3: - resolution: {integrity: sha512-pe9Myxlw6zDPU9Q1Cdj/LJzyJ48qMOyMpmmWwApV0Ei4DVh+jqW/B3r3Jf3zeiaco3yqmL2B0A7fZynQQWsVXg==} + /eslint-plugin-antfu/0.20.6_eslint@8.13.0+typescript@4.6.3: + resolution: {integrity: sha512-1aENz76mpQq3UvzWB9OrXTY+rABxUDa6iySasypqiP2nbgCBodXW5dg0cNLJA255ZAamEGF76HomWPMfoZPy0Q==} dependencies: '@typescript-eslint/utils': 5.19.0_eslint@8.13.0+typescript@4.6.3 transitivePeerDependencies: @@ -6130,23 +6130,23 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unocss/0.31.3_vite@2.9.5: - resolution: {integrity: sha512-qPQHOBgZv6xcN1qIaYbxQuyIQ79wI77mvNeRBw2GUoJL9GF/VVSTxQTWc0bdi13Sj0lfAlTS+CgaUWbMyz8xrA==} + /unocss/0.31.5_vite@2.9.5: + resolution: {integrity: sha512-7aB9vO1F0wyM3UGUqr7V1l5UNJTRKU90RD+euxYFVlhPCB90ve35bUT44qisEbSMWfAtB1dhECPfmrXnGoS0nQ==} engines: {node: '>=14'} dependencies: - '@unocss/cli': 0.31.3 - '@unocss/core': 0.31.3 - '@unocss/preset-attributify': 0.31.3 - '@unocss/preset-icons': 0.31.3 - '@unocss/preset-mini': 0.31.3 - '@unocss/preset-typography': 0.31.3 - '@unocss/preset-uno': 0.31.3 - '@unocss/preset-web-fonts': 0.31.3 - '@unocss/preset-wind': 0.31.3 - '@unocss/reset': 0.31.3 - '@unocss/transformer-directives': 0.31.3 - '@unocss/transformer-variant-group': 0.31.3 - '@unocss/vite': 0.31.3_vite@2.9.5 + '@unocss/cli': 0.31.5 + '@unocss/core': 0.31.5 + '@unocss/preset-attributify': 0.31.5 + '@unocss/preset-icons': 0.31.5 + '@unocss/preset-mini': 0.31.5 + '@unocss/preset-typography': 0.31.5 + '@unocss/preset-uno': 0.31.5 + '@unocss/preset-web-fonts': 0.31.5 + '@unocss/preset-wind': 0.31.5 + '@unocss/reset': 0.31.5 + '@unocss/transformer-directives': 0.31.5 + '@unocss/transformer-variant-group': 0.31.5 + '@unocss/vite': 0.31.5_vite@2.9.5 transitivePeerDependencies: - debug - supports-color diff --git a/src/components/ChooseFood.vue b/src/components/ChooseFood.vue index f7868a7..fd50dd3 100644 --- a/src/components/ChooseFood.vue +++ b/src/components/ChooseFood.vue @@ -29,8 +29,8 @@ const displayedRecipe = computed(() => { } else { const stuffFlag = curStuff.value.some(stuff => item.stuff.includes(stuff)) - const toolFlag = curTools.value.some(tool => item.tools?.includes(tool)) - return stuffFlag || toolFlag + const toolFlag = curTools.value.every(tool => item.tools?.includes(tool)) + return curTools.value.length ? stuffFlag && toolFlag : stuffFlag } }) }) @@ -169,7 +169,7 @@ const { isVisible, show } = useInvisibleElement(recipePanel)

- 🍚 一起下锅的主食（不选也行） + 🍚 主食也要一起下锅吗？（不选也行）