Opt-in to Nuxt 4

ThrRip · Oct 16, 2024 · eb36521 · eb36521
1 parent d7d0d42
commit eb36521
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 8 deletions.
diff --git a/app.config.ts → app/app.config.ts b/app.config.ts → app/app.config.ts
diff --git a/assets/css/main.css → app/assets/css/main.css b/assets/css/main.css → app/assets/css/main.css
diff --git a/eslint.config.js b/eslint.config.js
@@ -37,7 +37,7 @@ export default withNuxt(
     }
   },
   {
-    files: ['packages/*/pages/**/*.vue'],
+    files: ['packages/*/app/pages/**/*.vue'],
     rules: { 'vue/multi-word-component-names': 'off' }
   },
   {

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -13,6 +13,10 @@ export default defineNuxtConfig({
   ],
 
   // Feature flags
+  future: {
+    compatibilityVersion: 4
+  },
+
   compatibilityDate: '2024-07-19',
 
   // Tooling

diff --git a/packages/admin/app.config.ts → packages/admin/app/app.config.ts b/packages/admin/app.config.ts → packages/admin/app/app.config.ts
@@ -6,4 +6,4 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-export { default } from '../../app.config'
+export { default } from '../../../app/app.config'
diff --git a/packages/admin/app.vue → packages/admin/app/app.vue b/packages/admin/app.vue → packages/admin/app/app.vue
diff --git a/packages/admin/components/LoginModal.vue → packages/admin/app/components/LoginModal.vue b/packages/admin/components/LoginModal.vue → packages/admin/app/components/LoginModal.vue
diff --git a/...admin/components/playlist/ChangesList.vue → ...n/app/components/playlist/ChangesList.vue b/...admin/components/playlist/ChangesList.vue → ...n/app/components/playlist/ChangesList.vue
diff --git a/...es/admin/components/playlist/MainList.vue → ...dmin/app/components/playlist/MainList.vue b/...es/admin/components/playlist/MainList.vue → ...dmin/app/components/playlist/MainList.vue
diff --git a/packages/admin/middleware/entry.global.ts → ...ages/admin/app/middleware/entry.global.ts b/packages/admin/middleware/entry.global.ts → ...ages/admin/app/middleware/entry.global.ts
diff --git a/packages/admin/pages/index.vue → packages/admin/app/pages/index.vue b/packages/admin/pages/index.vue → packages/admin/app/pages/index.vue
diff --git a/packages/admin/pages/playlist.vue → packages/admin/app/pages/playlist.vue b/packages/admin/pages/playlist.vue → packages/admin/app/pages/playlist.vue
diff --git a/packages/admin/plugins/fontawesome.ts → packages/admin/app/plugins/fontawesome.ts b/packages/admin/plugins/fontawesome.ts → packages/admin/app/plugins/fontawesome.ts
diff --git a/packages/admin/nuxt.config.ts b/packages/admin/nuxt.config.ts
@@ -34,7 +34,7 @@ export default defineNuxtConfig({
   },
 
   css: [
-    '@/../../assets/css/main.css',
+    '~/../../../app/assets/css/main.css',
     '@fortawesome/fontawesome-svg-core/styles.css'
   ],
 
@@ -56,6 +56,10 @@ export default defineNuxtConfig({
   },
 
   // Feature flags
+  future: {
+    compatibilityVersion: 4
+  },
+
   compatibilityDate: '2024-07-19',
 
   // Nitro

diff --git a/packages/home/app.config.ts → packages/home/app/app.config.ts b/packages/home/app.config.ts → packages/home/app/app.config.ts
@@ -6,4 +6,4 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-export { default } from '../../app.config'
+export { default } from '../../../app/app.config'
diff --git a/packages/home/app.vue → packages/home/app/app.vue b/packages/home/app.vue → packages/home/app/app.vue
diff --git a/packages/home/assets/img/profile-pic.avif → ...ages/home/app/assets/img/profile-pic.avif b/packages/home/assets/img/profile-pic.avif → ...ages/home/app/assets/img/profile-pic.avif
diff --git a/packages/home/assets/img/profile-pic.webp → ...ages/home/app/assets/img/profile-pic.webp b/packages/home/assets/img/profile-pic.webp → ...ages/home/app/assets/img/profile-pic.webp
diff --git a/packages/home/plugins/fontawesome.ts → packages/home/app/plugins/fontawesome.ts b/packages/home/plugins/fontawesome.ts → packages/home/app/plugins/fontawesome.ts
diff --git a/packages/home/nuxt.config.ts b/packages/home/nuxt.config.ts
@@ -34,7 +34,7 @@ export default defineNuxtConfig({
   },
 
   css: [
-    '@/../../assets/css/main.css',
+    '~/../../../app/assets/css/main.css',
     '@fortawesome/fontawesome-svg-core/styles.css'
   ],
 
@@ -49,6 +49,10 @@ export default defineNuxtConfig({
   },
 
   // Feature flags
+  future: {
+    compatibilityVersion: 4
+  },
+
   compatibilityDate: '2024-07-19',
 
   // Nitro

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -13,9 +13,9 @@ import scrollbar from 'tailwind-scrollbar'
 export default {
   content: [
     './nuxt.config.ts',
-    './app.vue',
-    './pages/**/*.vue',
-    './components/**/*.vue'
+    './app/app.vue',
+    './app/pages/**/*.vue',
+    './app/components/**/*.vue'
   ],
   theme: {
     colors: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ export default withNuxt( @@
         }
       },
       {
-        files: ['packages/*/pages/**/*.vue'],
+        files: ['packages/*/app/pages/**/*.vue'],
         rules: { 'vue/multi-word-component-names': 'off' }
       },
       {
@@ Expand Down @@