Merge a393d5a438 into 07f89d15a9

.vscode/extensions.json

@@ -4,7 +4,6 @@
     "dbaeumer.vscode-eslint",
     "antfu.goto-alias",
     "visualstudioexptteam.vscodeintellicode",
-    "Nuxtr.nuxtr-vscode",
     "esbenp.prettier-vscode",
     "yoavbls.pretty-ts-errors",
     "bradlc.vscode-tailwindcss",

.vscode/settings.json

@@ -3,9 +3,6 @@
   "editor.useTabStops": false,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
-  "nuxtr.vueFiles.style.addStyleTag": false,
-  "nuxtr.piniaFiles.defaultTemplate": "setup",
-  "nuxtr.monorepoMode.DirectoryName": "src",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "always"
   },

src/eslint.config.mjs

@@ -4,9 +4,7 @@ import withNuxt from './.nuxt/eslint.config.mjs';
 export default withNuxt([
   {
     rules: {
-      // https://github.com/nuxt/eslint/issues/590
+      'import/order': 'warn',
-      // 'import/order': 'warn',
-      'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
     },
   },
   eslintConfigPrettier,

src/nuxt.config.ts

@@ -2,10 +2,7 @@ import { fileURLToPath } from 'node:url';
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  future: {
+  compatibilityDate: '2025-07-15',
-    compatibilityVersion: 4,
-  },
-  compatibilityDate: '2025-02-04',
   devtools: { enabled: true },
   modules: [
     '@nuxtjs/i18n',
@@ -76,9 +73,6 @@ export default defineNuxtConfig({
     detectBrowserLanguage: {
       useCookie: true,
     },
-    bundle: {
-      optimizeTranslationDirective: false,
-    },
   },
   nitro: {
     esbuild: {
@@ -87,15 +81,11 @@ export default defineNuxtConfig({
         target: 'es2020',
       },
     },
-    alias: {
-      '#db': fileURLToPath(new URL('./server/database/', import.meta.url)),
-    },
     externals: {
       traceInclude: [fileURLToPath(new URL('./cli/index.ts', import.meta.url))],
     },
   },
   alias: {
-    // for typecheck reasons (https://github.com/nuxt/cli/issues/323)
     '#db': fileURLToPath(new URL('./server/database/', import.meta.url)),
   },
 });

src/package.json

@@ -20,27 +20,27 @@
     "cli:dev": "tsx cli/index.ts"
   },
   "dependencies": {
-    "@eschricht/nuxt-color-mode": "^1.1.5",
+    "@eschricht/nuxt-color-mode": "^1.2.0",
     "@heroicons/vue": "^2.2.0",
-    "@libsql/client": "^0.15.9",
+    "@libsql/client": "^0.15.10",
-    "@nuxtjs/i18n": "^9.5.6",
+    "@nuxtjs/i18n": "^10.0.3",
     "@nuxtjs/tailwindcss": "^6.14.0",
     "@phc/format": "^1.0.0",
-    "@pinia/nuxt": "^0.11.1",
+    "@pinia/nuxt": "^0.11.2",
     "@tailwindcss/forms": "^0.5.10",
-    "apexcharts": "^5.2.0",
+    "apexcharts": "^5.3.1",
-    "argon2": "^0.43.0",
+    "argon2": "^0.43.1",
     "cidr-tools": "^11.0.3",
     "citty": "^0.1.6",
     "consola": "^3.4.2",
     "crc-32": "^1.2.2",
     "debug": "^4.4.1",
-    "drizzle-orm": "^0.44.2",
+    "drizzle-orm": "^0.44.3",
     "ip-bigint": "^8.2.1",
     "is-cidr": "^5.1.1",
     "is-ip": "^5.0.1",
     "js-sha256": "^0.11.1",
-    "nuxt": "^3.17.7",
+    "nuxt": "^4.0.1",
     "otpauth": "^9.4.0",
     "pinia": "^3.0.3",
     "qr": "^0.5.0",
@@ -48,24 +48,25 @@
     "semver": "^7.7.2",
     "tailwindcss": "^3.4.17",
     "timeago.js": "^4.0.2",
-    "vue": "latest",
+    "vue": "^3.5.18",
+    "vue-router": "^4.5.1",
     "vue3-apexcharts": "^1.8.0",
-    "zod": "^4.0.5"
+    "zod": "^4.0.10"
   },
   "devDependencies": {
-    "@nuxt/eslint": "^1.5.2",
+    "@nuxt/eslint": "^1.7.1",
     "@types/debug": "^4.1.12",
     "@types/phc__format": "^1.0.1",
     "@types/semver": "^7.7.0",
     "drizzle-kit": "^0.31.4",
-    "esbuild": "^0.25.6",
+    "esbuild": "^0.25.8",
     "eslint": "^9.31.0",
-    "eslint-config-prettier": "^10.1.5",
+    "eslint-config-prettier": "^10.1.8",
     "prettier": "^3.6.2",
     "prettier-plugin-tailwindcss": "^0.6.14",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
-    "vue-tsc": "^3.0.1"
+    "vue-tsc": "^3.0.4"
   },
   "packageManager": "pnpm@10.13.1"
 }

src/server/database/repositories/client/schema.ts

@@ -1,4 +1,4 @@
-import { sql, relations } from 'drizzle-orm';
+import { sql, relations, type InferSelectModel } from 'drizzle-orm';
 import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
 
 import { oneTimeLink, user, wgInterface } from '../../schema';
@@ -62,3 +62,5 @@ export const clientsRelations = relations(client, ({ one }) => ({
     references: [wgInterface.name],
   }),
 }));
+
+export type ClientType = InferSelectModel<typeof client>;

src/server/database/repositories/client/types.ts

@@ -1,9 +1,5 @@
-import type { InferSelectModel } from 'drizzle-orm';
 import z from 'zod';
-
+import type { ClientType } from './schema';
-import type { client } from './schema';
-
-export type ClientType = InferSelectModel<typeof client>;
 
 export type ClientNextIpType = Pick<ClientType, 'ipv4Address' | 'ipv6Address'>;
 

src/server/database/repositories/user/schema.ts

@@ -1,7 +1,8 @@
-import { sql, relations } from 'drizzle-orm';
+import { sql, relations, type InferSelectModel } from 'drizzle-orm';
 import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
 
 import { client } from '../../schema';
+import type { Role } from '#shared/utils/permissions';
 
 export const user = sqliteTable('users_table', {
   id: int().primaryKey({ autoIncrement: true }),
@@ -25,3 +26,5 @@ export const user = sqliteTable('users_table', {
 export const usersRelations = relations(user, ({ many }) => ({
   clients: many(client),
 }));
+
+export type UserType = InferSelectModel<typeof user>;

src/server/database/repositories/user/service.ts

@@ -1,7 +1,7 @@
 import { eq, sql } from 'drizzle-orm';
 import { TOTP } from 'otpauth';
 import { user } from './schema';
-import type { UserType } from './types';
+import type { UserType } from './schema';
 import type { DBType } from '#db/sqlite';
 
 type LoginResult =

src/server/database/repositories/user/types.ts

@@ -1,8 +1,4 @@
-import type { InferSelectModel } from 'drizzle-orm';
 import z from 'zod';
-import type { user } from './schema';
-
-export type UserType = InferSelectModel<typeof user>;
 
 const username = z
   .string({ message: t('zod.user.username') })
@@ -44,9 +40,7 @@ const name = z
   .pipe(safeStringRefine);
 
 const email = z
-  .string({ message: t('zod.user.email') })
+  .email({ message: t('zod.user.email') })
-  .min(5, t('zod.user.email'))
-  .email({ message: t('zod.user.emailInvalid') })
   .pipe(safeStringRefine)
   .nullable();
 

src/server/utils/handler.ts

@@ -1,5 +1,5 @@
 import type { EventHandlerRequest, EventHandlerResponse, H3Event } from 'h3';
-import type { UserType } from '#db/repositories/user/types';
+import type { UserType } from '#db/repositories/user/schema';
 import type { SetupStepType } from '#db/repositories/general/types';
 import {
   type Permissions,

src/server/utils/session.ts

@@ -1,5 +1,5 @@
 import type { H3Event } from 'h3';
-import type { UserType } from '#db/repositories/user/types';
+import type { UserType } from '#db/repositories/user/schema';
 
 export type WGSession = Partial<{
   userId: ID;

src/server/utils/types.ts

@@ -1,4 +1,4 @@
-import type { ZodSchema } from 'zod';
+import type { ZodType } from 'zod';
 import z from 'zod';
 import type { H3Event, EventHandlerRequest } from 'h3';
 
@@ -62,7 +62,7 @@ export const schemaForType =
   };
 
 export function validateZod<T>(
-  schema: ZodSchema<T>,
+  schema: ZodType<T>,
   event: H3Event<EventHandlerRequest>
 ) {
   return async (data: unknown) => {

src/server/utils/wgHelper.ts

@@ -1,6 +1,6 @@
 import { parseCidr } from 'cidr-tools';
 import { stringifyIp } from 'ip-bigint';
-import type { ClientType } from '#db/repositories/client/types';
+import type { ClientType } from '#db/repositories/client/schema';
 import type { InterfaceType } from '#db/repositories/interface/types';
 import type { UserConfigType } from '#db/repositories/userConfig/types';
 import type { HooksType } from '#db/repositories/hooks/types';

src/shared/utils/permissions.ts

@@ -1,5 +1,5 @@
-import type { ClientType } from '#db/repositories/client/types';
+import type { ClientType } from '#db/repositories/client/schema';
-import type { UserType } from '#db/repositories/user/types';
+import type { UserType } from '#db/repositories/user/schema';
 
 type BrandedRole = {
   readonly __role: unique symbol;

src/tsconfig.json

@@ -1,4 +1,18 @@
 {
   // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json"
+  "files": [],
+  "references": [
+    {
+      "path": "./.nuxt/tsconfig.app.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.server.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.shared.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.node.json"
+    }
+  ]
 }