upgrade deps, nuxt 4 ready, change nuxt structure

k2so-dev · Jul 8, 2024 · 7e7194d · 7e7194d
1 parent 7b216ae
commit 7e7194d
Show file tree

Hide file tree

Showing 37 changed files with 24 additions and 36 deletions.
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,6 +1,11 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  srcDir: 'nuxt/',
+  compatibilityDate: '2024-07-03',
+  rootDir: 'nuxt/',
+
+  future: {
+    compatibilityVersion: 4,
+  },
 
   /**
    * Manually disable nuxt telemetry.
@@ -21,7 +26,8 @@ export default defineNuxtConfig({
 
   app: {
     head: {
-      title: 'Laravel/Nuxt Boilerplate',
+      title: 'Home',
+      titleTemplate: '%s | LaravelNuxt Boilerplate',
       meta: [
         { charset: 'utf-8' },
         { name: 'viewport', content: 'width=device-width, initial-scale=1' },
@@ -57,10 +63,10 @@ export default defineNuxtConfig({
 
   image: {
     domains: [
-      import.meta.env.API_URL || 'http://127.0.0.1:8000'
+      import.meta.env.APP_URL || 'http://127.0.0.1:8000'
     ],
     alias: {
-      api: import.meta.env.API_URL || 'http://127.0.0.1:8000'
+      api: import.meta.env.APP_URL || 'http://127.0.0.1:8000'
     }
   },
 
@@ -69,7 +75,7 @@ export default defineNuxtConfig({
       crossOriginEmbedderPolicy: 'unsafe-none',
       crossOriginOpenerPolicy: 'same-origin-allow-popups',
       contentSecurityPolicy: {
-        "img-src": ["'self'", "data:", "https://*", import.meta.env.API_URL || 'http://127.0.0.1:8000'],
+        "img-src": ["'self'", "data:", "https://*", import.meta.env.APP_URL || 'http://127.0.0.1:8000'],
       },
     },
   },
@@ -91,9 +97,9 @@ export default defineNuxtConfig({
   runtimeConfig: {
     apiLocal: import.meta.env.API_LOCAL_URL,
     public: {
-      apiBase: import.meta.env.API_URL,
+      apiBase: import.meta.env.APP_URL,
       apiPrefix: '/api/v1',
-      storageBase: import.meta.env.API_URL + '/storage/',
+      storageBase: import.meta.env.APP_URL + '/storage/',
       providers: {
         google: {
           name: "Google",

diff --git a/nuxt/app.config.ts → nuxt/app/app.config.ts b/nuxt/app.config.ts → nuxt/app/app.config.ts
diff --git a/nuxt/app.vue → nuxt/app/app.vue b/nuxt/app.vue → nuxt/app/app.vue
diff --git a/nuxt/assets/css/main.css → nuxt/app/assets/css/main.css b/nuxt/assets/css/main.css → nuxt/app/assets/css/main.css
diff --git a/nuxt/components/account/UpdatePassword.vue → ...app/components/account/UpdatePassword.vue b/nuxt/components/account/UpdatePassword.vue → ...app/components/account/UpdatePassword.vue
diff --git a/nuxt/components/account/UpdateProfile.vue → .../app/components/account/UpdateProfile.vue b/nuxt/components/account/UpdateProfile.vue → .../app/components/account/UpdateProfile.vue
diff --git a/nuxt/components/app/Footer.vue → nuxt/app/components/app/Footer.vue b/nuxt/components/app/Footer.vue → nuxt/app/components/app/Footer.vue
diff --git a/nuxt/components/app/Header.vue → nuxt/app/components/app/Header.vue b/nuxt/components/app/Header.vue → nuxt/app/components/app/Header.vue
diff --git a/nuxt/components/app/Logo.vue → nuxt/app/components/app/Logo.vue b/nuxt/components/app/Logo.vue → nuxt/app/components/app/Logo.vue
diff --git a/nuxt/components/app/Theme.vue → nuxt/app/components/app/Theme.vue b/nuxt/components/app/Theme.vue → nuxt/app/components/app/Theme.vue
diff --git a/nuxt/components/auth/ForgotPassword.vue → nuxt/app/components/auth/ForgotPassword.vue b/nuxt/components/auth/ForgotPassword.vue → nuxt/app/components/auth/ForgotPassword.vue
diff --git a/nuxt/components/auth/Login.vue → nuxt/app/components/auth/Login.vue b/nuxt/components/auth/Login.vue → nuxt/app/components/auth/Login.vue
diff --git a/nuxt/components/auth/Register.vue → nuxt/app/components/auth/Register.vue b/nuxt/components/auth/Register.vue → nuxt/app/components/auth/Register.vue
diff --git a/nuxt/components/input/UploadImage.vue → nuxt/app/components/input/UploadImage.vue b/nuxt/components/input/UploadImage.vue → nuxt/app/components/input/UploadImage.vue
diff --git a/nuxt/components/modal/Demo.vue → nuxt/app/components/modal/Demo.vue b/nuxt/components/modal/Demo.vue → nuxt/app/components/modal/Demo.vue
diff --git a/nuxt/error.vue → nuxt/app/error.vue b/nuxt/error.vue → nuxt/app/error.vue
diff --git a/nuxt/index.d.ts → nuxt/app/index.d.ts b/nuxt/index.d.ts → nuxt/app/index.d.ts
diff --git a/nuxt/middleware/auth.ts → nuxt/app/middleware/auth.ts b/nuxt/middleware/auth.ts → nuxt/app/middleware/auth.ts
diff --git a/nuxt/middleware/guest.ts → nuxt/app/middleware/guest.ts b/nuxt/middleware/guest.ts → nuxt/app/middleware/guest.ts
diff --git a/nuxt/middleware/role-admin.ts → nuxt/app/middleware/role-admin.ts b/nuxt/middleware/role-admin.ts → nuxt/app/middleware/role-admin.ts
diff --git a/nuxt/middleware/role-user.ts → nuxt/app/middleware/role-user.ts b/nuxt/middleware/role-user.ts → nuxt/app/middleware/role-user.ts
diff --git a/nuxt/middleware/verified.ts → nuxt/app/middleware/verified.ts b/nuxt/middleware/verified.ts → nuxt/app/middleware/verified.ts
diff --git a/nuxt/pages/account.vue → nuxt/app/pages/account.vue b/nuxt/pages/account.vue → nuxt/app/pages/account.vue
diff --git a/nuxt/pages/account/devices.vue → nuxt/app/pages/account/devices.vue b/nuxt/pages/account/devices.vue → nuxt/app/pages/account/devices.vue
diff --git a/nuxt/pages/account/general.vue → nuxt/app/pages/account/general.vue b/nuxt/pages/account/general.vue → nuxt/app/pages/account/general.vue
diff --git a/nuxt/pages/account/index.vue → nuxt/app/pages/account/index.vue b/nuxt/pages/account/index.vue → nuxt/app/pages/account/index.vue
diff --git a/nuxt/pages/auth/forgot.vue → nuxt/app/pages/auth/forgot.vue b/nuxt/pages/auth/forgot.vue → nuxt/app/pages/auth/forgot.vue
diff --git a/nuxt/pages/auth/login.vue → nuxt/app/pages/auth/login.vue b/nuxt/pages/auth/login.vue → nuxt/app/pages/auth/login.vue
diff --git a/nuxt/pages/auth/register.vue → nuxt/app/pages/auth/register.vue b/nuxt/pages/auth/register.vue → nuxt/app/pages/auth/register.vue
diff --git a/nuxt/pages/auth/reset/[token].vue → nuxt/app/pages/auth/reset/[token].vue b/nuxt/pages/auth/reset/[token].vue → nuxt/app/pages/auth/reset/[token].vue
diff --git a/nuxt/pages/auth/verify.vue → nuxt/app/pages/auth/verify.vue b/nuxt/pages/auth/verify.vue → nuxt/app/pages/auth/verify.vue
diff --git a/nuxt/pages/index.vue → nuxt/app/pages/index.vue b/nuxt/pages/index.vue → nuxt/app/pages/index.vue
diff --git a/nuxt/plugins/app.ts → nuxt/app/plugins/app.ts b/nuxt/plugins/app.ts → nuxt/app/plugins/app.ts
diff --git a/nuxt/stores/auth.ts → nuxt/app/stores/auth.ts b/nuxt/stores/auth.ts → nuxt/app/stores/auth.ts
diff --git a/nuxt/server/tsconfig.json b/nuxt/server/tsconfig.json
diff --git a/package.json b/package.json
@@ -3,28 +3,27 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "serve": "cross-env PORT=3000 HOST=127.0.0.1 node .output/server/index.mjs",
+    "serve": "node nuxt/.output/server/index.mjs",
     "build": "nuxi cleanup && nuxi build",
     "cleanup": "nuxi cleanup",
-    "dev": "nuxt dev --port=3000 --host=127.0.0.1",
+    "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
-    "api": "php artisan octane:start --watch --port=8000 --host=127.0.0.1"
+    "api": "php artisan octane:start --watch"
   },
   "devDependencies": {
-    "@iconify-json/heroicons": "^1.1.20",
+    "@iconify-json/heroicons": "^1.1.21",
     "@iconify/vue": "^4.1.2",
-    "@nuxt/devtools": "^1.3.1",
+    "@nuxt/devtools": "^1.3.9",
     "@nuxt/image": "^1.7.0",
-    "@nuxt/ui": "^2.16.0",
+    "@nuxt/ui": "^2.17.0",
     "@pinia/nuxt": "^0.5.1",
     "chokidar": "^3.6.0",
-    "cross-env": "^7.0.3",
     "dayjs-nuxt": "^2.1.9",
-    "nuxt": "^3.11.2",
+    "nuxt": "^3.12.3",
     "nuxt-security": "^1.4.3",
-    "vue": "^3.4.27",
-    "vue-router": "^4.3.2"
+    "vue": "^3.4.31",
+    "vue-router": "^4.4.0"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,21 +1,7 @@
 {
   // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json",
-  "exclude": [
-    "./app",
-    "./bootstrap",
-    "./config",
-    "./database",
-    "./public",
-    "./resources",
-    "./routes",
-    "./storage",
-    "./tests",
-    "./vendor"
-  ],
+  "extends": "./nuxt/.nuxt/tsconfig.json",
   "compilerOptions": {
-    "types": [
-      "vite/client"
-    ]
+    "module": "ESNext"
   }
 }