Merge pull request #44 from leonialla/main

Fix up type declarations for Nuxt RuntimeConfiguration.
kuizuo · Nov 25, 2024 · 5e9f188 · 5e9f188
2 parents f2c360e + 4d86ea7
commit 5e9f188
Show file tree

Hide file tree

Showing 7 changed files with 9,553 additions and 11,128 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "prettier.enable": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "files.associations": {
     "*.css": "postcss"

diff --git a/components/app/PwaInstall.client.vue b/components/app/PwaInstall.client.vue
diff --git a/config/pwa.ts b/config/pwa.ts
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,5 +1,3 @@
-import { pwa } from './config/pwa'
-
 export default defineNuxtConfig({
   app: {
     keepalive: true,
@@ -41,11 +39,10 @@ export default defineNuxtConfig({
     ['@pinia/nuxt', {
       autoImports: ['defineStore', 'definePiniaStore'],
     }],
-    '@pinia-plugin-persistedstate/nuxt',
+    'pinia-plugin-persistedstate/nuxt',
     '@sidebase/nuxt-auth',
     '@huntersofbook/naive-ui-nuxt',
-    'nuxt-icon',
-    '@vite-pwa/nuxt',
+    '@nuxt/icon',
     '@nuxt/devtools',
   ],
   imports: {
@@ -95,19 +92,16 @@ export default defineNuxtConfig({
   },
   auth: {
     isEnabled: true,
-    enableGlobalAppMiddleware: true,
-    globalMiddlewareOptions: {
-      allow404WithoutAuth: true,
-      addDefaultCallbackUrl: true,
-    },
+    globalAppMiddleware: {
+      isEnabled: true,
+    }
   },
   build: {
     transpile: ['punycode'],
   },
   typescript: {
     shim: false,
   },
-  pwa,
   experimental: {
     renderJsonPayloads: true,
     asyncContext: true,

diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
   "scripts": {
     "build": "nuxi build",
     "dev": "nuxi dev -o",
-    "dev:pwa": "VITE_DEV_PWA=true nuxi dev -o",
     "start": "node .output/server/index.mjs",
     "start:pm2": "pm2 start",
     "preview": "nuxi preview --dotenv .env.production",
@@ -32,48 +31,48 @@
     "release": "bumpp --commit --push --tag"
   },
   "dependencies": {
-    "@prisma/client": "^5.2.0",
-    "easemob-websdk": "^4.2.0",
-    "next-auth": "4.22.5",
-    "tough-cookie": "^4.1.3"
+    "@prisma/client": "^5.22.0",
+    "easemob-websdk": "^4.10.0",
+    "next-auth": "~4.21.1",
+    "tough-cookie": "^5.0.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.40.3",
+    "@antfu/eslint-config": "^3.9.2",
     "@huntersofbook/naive-ui-nuxt": "^1.2.0",
-    "@iconify/json": "^2.2.107",
+    "@iconify/json": "^2.2.276",
     "@kuizuo/utils": "^0.2.0",
-    "@nuxt/content": "^2.8.1",
-    "@nuxt/devtools": "^0.8.2",
-    "@nuxtjs/color-mode": "^3.3.0",
-    "@pinia-plugin-persistedstate/nuxt": "^1.1.1",
-    "@pinia/nuxt": "^0.4.11",
-    "@sidebase/nuxt-auth": "^0.5.0",
-    "@types/async": "^3.2.20",
-    "@types/jsdom": "^21.1.2",
-    "@types/qrcode": "^1.5.1",
-    "@types/tough-cookie": "^4.0.2",
-    "@types/ws": "^8.5.5",
-    "@unocss/nuxt": "^0.55.3",
-    "@vite-pwa/nuxt": "^0.1.0",
-    "@vueuse/integrations": "^10.4.1",
-    "@vueuse/nuxt": "^10.4.1",
-    "async": "^3.2.4",
-    "bumpp": "^8.2.1",
-    "cheerio": "1.0.0-rc.12",
-    "eslint": "^8.48.0",
-    "got": "^12.6.0",
-    "jsdom": "^22.1.0",
+    "@nuxt/content": "^2.13.4",
+    "@nuxt/devtools": "^1.6.1",
+    "@nuxt/icon": "^1.8.2",
+    "@nuxtjs/color-mode": "^3.5.2",
+    "@pinia/nuxt": "^0.7.0",
+    "@sidebase/nuxt-auth": "^0.9.4",
+    "@types/async": "^3.2.24",
+    "@types/jsdom": "^21.1.7",
+    "@types/qrcode": "^1.5.5",
+    "@types/tough-cookie": "^4.0.5",
+    "@types/ws": "^8.5.13",
+    "@unocss/nuxt": "^0.64.1",
+    "@vueuse/integrations": "^11.3.0",
+    "@vueuse/nuxt": "^11.3.0",
+    "async": "^3.2.6",
+    "bumpp": "^9.8.1",
+    "cheerio": "1.0.0",
+    "eslint": "^9.15.0",
+    "got": "^14.4.5",
+    "jsdom": "^25.0.1",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
-    "naive-ui": "^2.34.4",
-    "nuxt": "3.6.5",
-    "nuxt-icon": "^0.5.0",
-    "prisma": "^5.2.0",
-    "qrcode": "^1.5.3",
-    "sass": "^1.66.1",
-    "typescript": "^5.2.2",
-    "vitest": "^0.24.5",
-    "vue-qrcode-reader": "^5.3.4",
-    "ws": "^8.13.0"
+    "naive-ui": "^2.40.1",
+    "nuxt": "3.14.1592",
+    "pinia-plugin-persist": "^1.0.0",
+    "pinia-plugin-persistedstate": "^4.1.3",
+    "prisma": "^5.22.0",
+    "qrcode": "^1.5.4",
+    "sass": "^1.81.0",
+    "typescript": "^5.7.2",
+    "vitest": "^2.1.5",
+    "vue-qrcode-reader": "^5.5.11",
+    "ws": "^8.18.0"
   }
 }