From eb365215764e4cdcd3aac74c4baf37437981f501 Mon Sep 17 00:00:00 2001 From: ThrRip Date: Wed, 16 Oct 2024 06:01:04 +0800 Subject: [PATCH] Opt-in to Nuxt 4 --- app.config.ts => app/app.config.ts | 0 {assets => app/assets}/css/main.css | 0 eslint.config.js | 2 +- nuxt.config.ts | 4 ++++ packages/admin/{ => app}/app.config.ts | 2 +- packages/admin/{ => app}/app.vue | 0 packages/admin/{ => app}/components/LoginModal.vue | 0 .../{ => app}/components/playlist/ChangesList.vue | 0 .../{ => app}/components/playlist/MainList.vue | 0 packages/admin/{ => app}/middleware/entry.global.ts | 0 packages/admin/{ => app}/pages/index.vue | 0 packages/admin/{ => app}/pages/playlist.vue | 0 packages/admin/{ => app}/plugins/fontawesome.ts | 0 packages/admin/nuxt.config.ts | 6 +++++- packages/home/{ => app}/app.config.ts | 2 +- packages/home/{ => app}/app.vue | 0 packages/home/{ => app}/assets/img/profile-pic.avif | Bin packages/home/{ => app}/assets/img/profile-pic.webp | Bin packages/home/{ => app}/plugins/fontawesome.ts | 0 packages/home/nuxt.config.ts | 6 +++++- tailwind.config.ts | 6 +++--- 21 files changed, 20 insertions(+), 8 deletions(-) rename app.config.ts => app/app.config.ts (100%) rename {assets => app/assets}/css/main.css (100%) rename packages/admin/{ => app}/app.config.ts (84%) rename packages/admin/{ => app}/app.vue (100%) rename packages/admin/{ => app}/components/LoginModal.vue (100%) rename packages/admin/{ => app}/components/playlist/ChangesList.vue (100%) rename packages/admin/{ => app}/components/playlist/MainList.vue (100%) rename packages/admin/{ => app}/middleware/entry.global.ts (100%) rename packages/admin/{ => app}/pages/index.vue (100%) rename packages/admin/{ => app}/pages/playlist.vue (100%) rename packages/admin/{ => app}/plugins/fontawesome.ts (100%) rename packages/home/{ => app}/app.config.ts (84%) rename packages/home/{ => app}/app.vue (100%) rename packages/home/{ => app}/assets/img/profile-pic.avif (100%) rename packages/home/{ => app}/assets/img/profile-pic.webp (100%) rename packages/home/{ => app}/plugins/fontawesome.ts (100%) diff --git a/app.config.ts b/app/app.config.ts similarity index 100% rename from app.config.ts rename to app/app.config.ts diff --git a/assets/css/main.css b/app/assets/css/main.css similarity index 100% rename from assets/css/main.css rename to app/assets/css/main.css diff --git a/eslint.config.js b/eslint.config.js index 220a656..274dc73 100644 --- 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 index 83a07af..bf0f9a9 100644 --- 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 b/packages/admin/app/app.config.ts similarity index 84% rename from packages/admin/app.config.ts rename to packages/admin/app/app.config.ts index b7ea4c9..9347256 100644 --- a/packages/admin/app.config.ts +++ b/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 b/packages/admin/app/app.vue similarity index 100% rename from packages/admin/app.vue rename to packages/admin/app/app.vue diff --git a/packages/admin/components/LoginModal.vue b/packages/admin/app/components/LoginModal.vue similarity index 100% rename from packages/admin/components/LoginModal.vue rename to packages/admin/app/components/LoginModal.vue diff --git a/packages/admin/components/playlist/ChangesList.vue b/packages/admin/app/components/playlist/ChangesList.vue similarity index 100% rename from packages/admin/components/playlist/ChangesList.vue rename to packages/admin/app/components/playlist/ChangesList.vue diff --git a/packages/admin/components/playlist/MainList.vue b/packages/admin/app/components/playlist/MainList.vue similarity index 100% rename from packages/admin/components/playlist/MainList.vue rename to packages/admin/app/components/playlist/MainList.vue diff --git a/packages/admin/middleware/entry.global.ts b/packages/admin/app/middleware/entry.global.ts similarity index 100% rename from packages/admin/middleware/entry.global.ts rename to packages/admin/app/middleware/entry.global.ts diff --git a/packages/admin/pages/index.vue b/packages/admin/app/pages/index.vue similarity index 100% rename from packages/admin/pages/index.vue rename to packages/admin/app/pages/index.vue diff --git a/packages/admin/pages/playlist.vue b/packages/admin/app/pages/playlist.vue similarity index 100% rename from packages/admin/pages/playlist.vue rename to packages/admin/app/pages/playlist.vue diff --git a/packages/admin/plugins/fontawesome.ts b/packages/admin/app/plugins/fontawesome.ts similarity index 100% rename from packages/admin/plugins/fontawesome.ts rename to packages/admin/app/plugins/fontawesome.ts diff --git a/packages/admin/nuxt.config.ts b/packages/admin/nuxt.config.ts index 018219b..400f56a 100644 --- 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 b/packages/home/app/app.config.ts similarity index 84% rename from packages/home/app.config.ts rename to packages/home/app/app.config.ts index b7ea4c9..9347256 100644 --- a/packages/home/app.config.ts +++ b/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 b/packages/home/app/app.vue similarity index 100% rename from packages/home/app.vue rename to packages/home/app/app.vue diff --git a/packages/home/assets/img/profile-pic.avif b/packages/home/app/assets/img/profile-pic.avif similarity index 100% rename from packages/home/assets/img/profile-pic.avif rename to packages/home/app/assets/img/profile-pic.avif diff --git a/packages/home/assets/img/profile-pic.webp b/packages/home/app/assets/img/profile-pic.webp similarity index 100% rename from packages/home/assets/img/profile-pic.webp rename to packages/home/app/assets/img/profile-pic.webp diff --git a/packages/home/plugins/fontawesome.ts b/packages/home/app/plugins/fontawesome.ts similarity index 100% rename from packages/home/plugins/fontawesome.ts rename to packages/home/app/plugins/fontawesome.ts diff --git a/packages/home/nuxt.config.ts b/packages/home/nuxt.config.ts index 20459cf..ffccc83 100644 --- 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 index bafb33a..e25da03 100644 --- 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: {