chore: upgrade deps

.vscode/settings.json

@@ -80,5 +80,6 @@
     "json",
     "jsonc",
     "yaml"
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

README.md

@@ -73,8 +73,6 @@ docker stop cook
 感谢以下小伙伴为本项目提供的数据支持和 QA ！
 
 - [Runny](https://weibo.com/runny)
-- 山竹太凉
-- leo
 - 麒麟
 - 晴方啾
 - 课代表阿伟

app.config.ts

@@ -0,0 +1,5 @@
+export default defineAppConfig({
+  theme: {
+    primaryColor: '#ababab',
+  },
+})

components/FAQItem.vue

@@ -10,7 +10,7 @@ defineProps<{
 <template>
   <Disclosure v-slot="{ open }" :default-open="defaultOpen" as="div" class="mt-2">
     <DisclosureButton
-      class="w-full flex justify-between rounded-lg bg-blue-100 px-4 py-2 text-left text-sm font-medium text-blue-900 hover:bg-blue-200 focus:outline-none focus-visible:ring focus-visible:ring-blue-500 focus-visible:ring-opacity-75"
+      class="w-full flex justify-between rounded-lg bg-blue-100 px-4 py-2 text-left text-sm text-blue-900 font-medium hover:bg-blue-200 focus:outline-none focus-visible:ring focus-visible:ring-blue-500 focus-visible:ring-opacity-75"
     >
       <span>{{ title }}</span>
       <div

components/RandomRecipe.vue

@@ -16,7 +16,7 @@ const { random, randomRecipes } = useRandomRecipe(count)
     </button>
   </div>
 
-  <button cursor-pointer class="inline-flex inline-flex items-center justify-center rounded-md border-none bg-blue-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-blue-500 focus-visible:outline-2 focus-visible:outline-blue-600 focus-visible:outline-offset-2 focus-visible:outline" @click="random">
+  <button cursor-pointer class="inline-flex inline-flex items-center justify-center rounded-md border-none bg-blue-600 px-3 py-1.5 text-sm text-white font-semibold leading-6 shadow-sm hover:bg-blue-500 focus-visible:outline-2 focus-visible:outline-blue-600 focus-visible:outline-offset-2 focus-visible:outline" @click="random">
     <div class="transition" hover="text-blue-500" i-ri-refresh-line mr-1 inline-flex />
     <div>随机一下</div>
   </button>

components/RecipePanel.vue

@@ -56,7 +56,7 @@ const showTooltip = computed(() => !selectedStuff.value.length && !curTool.value
           <br>
           <div m="t-1">
             <span>欢迎来</span>
-            <a class="font-bold text-blue-600 dark:text-blue-400" href="https://docs.qq.com/sheet/DQk1vdkhFV0twQVNS?tab=uykkic" target="_blank">这里</a>
+            <a class="text-blue-600 font-bold dark:text-blue-400" href="https://docs.qq.com/sheet/DQk1vdkhFV0twQVNS?tab=uykkic" target="_blank">这里</a>
             <span>反馈新的菜谱！</span>
           </div>
         </div>

components/Switch.vue

@@ -43,22 +43,22 @@ defineProps<{
   left: 0;
   right: 0;
   bottom: 0;
-  -webkit-transition: .4s;
+  -webkit-transition: 0.4s;
-  transition: .4s;
+  transition: 0.4s;
 }
 
 $size: 20px;
 
 .slider:before {
   position: absolute;
-  content: "";
+  content: '';
   height: $size;
   width: $size;
   left: 4px;
   bottom: 4px;
   background-color: white;
-  -webkit-transition: .4s;
+  -webkit-transition: 0.4s;
-  transition: .4s;
+  transition: 0.4s;
 }
 
 input:checked + .slider {

components/recipe/RecipeTable.vue

@@ -40,7 +40,9 @@ defineProps<{
   font-size: 0.8rem;
 }
 
-tr, th, td {
+tr,
+th,
+td {
   border: 1px solid black;
 }
 </style>

eslint.config.js

@@ -1,7 +1,8 @@
 import antfu from '@antfu/eslint-config'
-import unocss from '@unocss/eslint-config/flat'
 
 export default antfu(
-  {},
+  {
-  unocss,
+    unocss: true,
+    formatters: true,
+  },
 )

netlify.toml

@@ -1,10 +1,10 @@
-[build.environment]
-  NODE_VERSION = "16"
-
 [build]
 publish = "dist"
 command = "pnpm run build"
 
+[build.environment]
+NODE_VERSION = "16"
+
 [[redirects]]
 from = "/*"
 to = "/index.html"

nuxt.config.ts

@@ -6,6 +6,9 @@ Object.assign(process.env, {
   VITE_COMMIT_REF: process.env.CF_PAGES_COMMIT_SHA || '',
 })
 
+// add build time to env
+import.meta.env.VITE_APP_BUILD_TIME = new Date().toISOString()
+
 export default defineNuxtConfig({
   ssr: false,
 
@@ -13,9 +16,10 @@ export default defineNuxtConfig({
     '@vueuse/nuxt',
     '@unocss/nuxt',
     '@pinia/nuxt',
+
+    '@nuxt/test-utils/module',
     '@nuxtjs/color-mode',
     '@vite-pwa/nuxt',
-    'nuxt-vitest',
 
     '@zadigetvoltaire/nuxt-gtm',
 
@@ -26,7 +30,8 @@ export default defineNuxtConfig({
     // when using generate, payload js assets included in sw precache manifest
     // but missing on offline, disabling extraction it until fixed
     payloadExtraction: false,
-    inlineSSRStyles: false,
+    // inlineSSRStyles: false,
+    renderJsonPayloads: true,
     typedPages: true,
   },
 

package.json

@@ -2,21 +2,22 @@
   "type": "module",
   "version": "1.2.2",
   "private": true,
-  "packageManager": "pnpm@8.10.2",
+  "packageManager": "pnpm@8.14.3",
   "engines": {
     "node": ">=14"
   },
   "scripts": {
-    "build": "npm run convert && cross-env VITE_APP_BUILD_TIME=$(date +%s) nuxi build",
+    "build": "npm run convert && nuxt build",
-    "build:static": "npm run convert && cross-env VITE_APP_BUILD_TIME=$(date +%s) nuxi generate",
+    "build:static": "npm run convert && nuxt generate",
     "convert": "tsx scripts/convert.ts",
-    "dev": "cross-env VITE_APP_BUILD_TIME=$(date +%s) nuxi dev --host",
+    "dev": "nuxt dev --host",
     "dev:pwa": "VITE_PLUGIN_PWA=true nuxi dev",
-    "generate": "nuxi generate",
+    "generate": "nuxt generate",
     "start:generate": "npx serve .output/public",
     "start": "node .output/server/index.mjs",
     "lint": "eslint .",
-    "postinstall": "nuxi prepare && npm run convert",
+    "postinstall": "nuxt prepare && npm run convert",
+    "preview": "serve dist",
     "preview-https": "serve dist",
     "release": "bumpp",
     "test": "vitest",
@@ -27,43 +28,45 @@
     "vue-about-me": "^1.2.7"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^1.1.1",
+    "@antfu/eslint-config": "^2.6.3",
-    "@headlessui/vue": "^1.7.16",
+    "@headlessui/vue": "^1.7.17",
-    "@iconify-json/carbon": "^1.1.21",
+    "@iconify-json/carbon": "^1.1.28",
-    "@iconify-json/fe": "^1.1.7",
+    "@iconify-json/fe": "^1.1.10",
-    "@iconify-json/gg": "^1.1.6",
+    "@iconify-json/gg": "^1.1.9",
-    "@iconify-json/ic": "^1.1.14",
+    "@iconify-json/ic": "^1.1.17",
-    "@iconify-json/mdi": "^1.1.55",
+    "@iconify-json/mdi": "^1.1.64",
-    "@iconify-json/ri": "^1.1.12",
+    "@iconify-json/ri": "^1.1.19",
-    "@iconify-json/twemoji": "^1.1.12",
+    "@iconify-json/twemoji": "^1.1.15",
-    "@nuxt/devtools": "^1.0.2",
+    "@nuxt/devtools": "^1.0.8",
-    "@nuxtjs/color-mode": "^3.3.0",
+    "@nuxt/test-utils": "^3.10.0",
+    "@nuxtjs/color-mode": "^3.3.2",
     "@pinia/nuxt": "^0.5.1",
     "@pinia/testing": "^0.1.3",
-    "@unocss/eslint-config": "^0.57.3",
+    "@unocss/eslint-config": "^0.58.4",
-    "@unocss/nuxt": "^0.57.3",
+    "@unocss/nuxt": "^0.58.4",
-    "@vite-pwa/nuxt": "^0.2.1",
+    "@vite-pwa/nuxt": "^0.4.0",
-    "@vue/test-utils": "^2.4.1",
+    "@vue/test-utils": "^2.4.4",
-    "@vueuse/nuxt": "^10.6.0",
+    "@vueuse/nuxt": "^10.7.2",
-    "@yunlefun/vue": "0.0.8-beta.4",
+    "@yunlefun/vue": "^0.0.9",
     "@zadigetvoltaire/nuxt-gtm": "^0.0.13",
-    "bumpp": "^9.2.0",
+    "bumpp": "^9.3.0",
     "consola": "^3.2.3",
-    "cross-env": "^7.0.3",
     "dexie": "^3.2.4",
-    "eslint": "^8.53.0",
+    "eslint": "^8.56.0",
-    "fake-indexeddb": "^5.0.1",
+    "eslint-plugin-format": "^0.1.0",
-    "happy-dom": "^12.10.3",
+    "fake-indexeddb": "^5.0.2",
-    "jsdom": "^22.1.0",
+    "happy-dom": "^13.3.1",
-    "nuxt": "^3.8.1",
+    "jsdom": "^24.0.0",
-    "nuxt-vitest": "^0.11.3",
+    "nuxt": "^3.9.3",
+    "nuxt-vitest": "^0.11.5",
     "pinia": "^2.1.7",
-    "sass": "^1.69.5",
+    "sass": "^1.70.0",
+    "serve": "^14.2.1",
     "star-markdown-css": "^0.4.2",
-    "tsx": "^4.1.1",
+    "tsx": "^4.7.0",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
-    "unocss": "^0.57.3",
+    "unocss": "^0.58.4",
-    "vitest": "^0.34.6",
+    "vitest": "^1.2.2",
-    "vue-tsc": "^1.8.22"
+    "vue-tsc": "^1.8.27"
   }
 }

pages/help.vue

@@ -137,12 +137,6 @@
           <li>
             <a href="https://weibo.com/runny" target="_blank">Runny</a>
           </li>
-          <li>
-            山竹太凉
-          </li>
-          <li>
-            leo
-          </li>
           <li>
             麒麟
           </li>

styles/css-vars.scss

@@ -26,5 +26,7 @@
 // cook custom
 :root {
   --cook-bottom-menu-padding-bottom: 20px;
-  --cook-bottom-menu-height: calc(64px + var(--cook-bottom-menu-padding-bottom));
+  --cook-bottom-menu-height: calc(
+    64px + var(--cook-bottom-menu-padding-bottom)
+  );
 }

styles/index.scss

@@ -12,7 +12,6 @@ body,
   background: var(--c-bg);
 }
 
-
 input:focus {
   outline: none;
 }
@@ -55,11 +54,12 @@ button {
   }
 }
 
-hr {opacity: 0.1;}
+hr {
+  opacity: 0.1;
+}
 
 .tag {
   margin: 4px;
   padding: 2px 4px;
   // border: 1px solid var(--c-text);
 }
-

vitest.nuxt.config.ts

@@ -1,4 +1,4 @@
-import { defineVitestConfig } from 'nuxt-vitest/config'
+import { defineVitestConfig } from '@nuxt/test-utils/config'
 
 export default defineVitestConfig({
   test: {