Merge pull request #42 from xibman/v2

feat!(opting nuxt 4): opting Nuxt 4 apply new Directory Structure
xibman · Jan 4, 2025 · e9cb1cb · e9cb1cb
2 parents 90e5fed + 7128234
commit e9cb1cb
Show file tree

Hide file tree

Showing 40 changed files with 12 additions and 4 deletions.
diff --git a/docs/app.config.ts → docs/app/app.config.ts b/docs/app.config.ts → docs/app/app.config.ts
diff --git a/docs/app.vue → docs/app/app.vue b/docs/app.vue → docs/app/app.vue
diff --git a/docs/components/OgImage/OgImageDocs.vue → docs/app/components/OgImage/OgImageDocs.vue b/docs/components/OgImage/OgImageDocs.vue → docs/app/components/OgImage/OgImageDocs.vue
diff --git a/docs/components/TheFooter.vue → docs/app/components/TheFooter.vue b/docs/components/TheFooter.vue → docs/app/components/TheFooter.vue
diff --git a/docs/components/TheHeader.vue → docs/app/components/TheHeader.vue b/docs/components/TheHeader.vue → docs/app/components/TheHeader.vue
diff --git a/docs/error.vue → docs/app/error.vue b/docs/error.vue → docs/app/error.vue
diff --git a/docs/layouts/docs.vue → docs/app/layouts/docs.vue b/docs/layouts/docs.vue → docs/app/layouts/docs.vue
diff --git a/docs/pages/[...slug].vue → docs/app/pages/[...slug].vue b/docs/pages/[...slug].vue → docs/app/pages/[...slug].vue
diff --git a/docs/pages/index.vue → docs/app/pages/index.vue b/docs/pages/index.vue → docs/app/pages/index.vue
diff --git a/docs/pages/playground.vue → docs/app/pages/playground.vue b/docs/pages/playground.vue → docs/app/pages/playground.vue
diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts
@@ -15,6 +15,10 @@ export default defineNuxtConfig({
   routeRules: {
     '/api/search.json': { prerender: true },
   },
+  future: {
+    compatibilityVersion: 4,
+    typescriptBundlerResolution: true,
+  },
   compatibilityDate: '2024-12-24',
   typescript: { strict: false },
   hooks: {

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -12,7 +12,7 @@ export default createConfigForNuxt({
     typescript: true,
   },
   dirs: {
-    src: ['./playground', './docs'],
+    src: ['./playground/app', './docs/app'],
   },
 }).append([
   ...eslintPluginJsonc.configs['flat/recommended-with-jsonc'],

diff --git a/playground/app.vue → playground/app/app.vue b/playground/app.vue → playground/app/app.vue
diff --git a/playground/components/VLocalSwitcher.vue → playground/app/components/VLocalSwitcher.vue b/playground/components/VLocalSwitcher.vue → playground/app/components/VLocalSwitcher.vue
diff --git a/playground/components/VNavigation.vue → playground/app/components/VNavigation.vue b/playground/components/VNavigation.vue → playground/app/components/VNavigation.vue
diff --git a/playground/pages/complex.vue → playground/app/pages/complex.vue b/playground/pages/complex.vue → playground/app/pages/complex.vue
diff --git a/playground/pages/index.vue → playground/app/pages/index.vue b/playground/pages/index.vue → playground/app/pages/index.vue
diff --git a/playground/pages/overload.vue → playground/app/pages/overload.vue b/playground/pages/overload.vue → playground/app/pages/overload.vue
diff --git a/playground/schema/index.ts → playground/app/schema/index.ts b/playground/schema/index.ts → playground/app/schema/index.ts
diff --git a/playground/schema/login.schema.ts → playground/app/schema/login.schema.ts b/playground/schema/login.schema.ts → playground/app/schema/login.schema.ts
diff --git a/playground/schema/user.schema.ts → playground/app/schema/user.schema.ts b/playground/schema/user.schema.ts → playground/app/schema/user.schema.ts
diff --git a/playground/schema/website.schema.ts → playground/app/schema/website.schema.ts b/playground/schema/website.schema.ts → playground/app/schema/website.schema.ts
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -1,12 +1,16 @@
 export default defineNuxtConfig({
   modules: ['../src/module', '@nuxtjs/i18n', '@nuxt/ui'],
   devtools: { enabled: true },
+  future: {
+    compatibilityVersion: 4,
+    typescriptBundlerResolution: true,
+  },
   compatibilityDate: '2024-12-24',
 
   i18n: {
     defaultDirection: 'ltr',
     defaultLocale: 'en-GB',
-    langDir: './locales',
+    langDir: 'locales',
     lazy: true,
     locales: [
       {

diff --git a/src/module.ts b/src/module.ts
@@ -87,7 +87,7 @@ export default defineNuxtModule<ModuleOptions>().with({
           : [],
       ).map(({ code }) => code)
 
-      const languageFiles = await readdir(resolve('./runtime/locales'))
+      const languageFiles = await readdir(resolve('./runtime/i18n/locales'))
 
       const locales = languageFiles.reduce<LocaleObject[]>((acc, file) => {
         const code
@@ -102,7 +102,7 @@ export default defineNuxtModule<ModuleOptions>().with({
 
       nuxt.hook('i18n:registerModule', (register) => {
         register({
-          langDir: resolve('./runtime/locales'),
+          langDir: resolve('./runtime/i18n/locales'),
           locales,
         })
       })

diff --git a/src/runtime/locales/cs-CZ.json → src/runtime/i18n/locales/cs-CZ.json b/src/runtime/locales/cs-CZ.json → src/runtime/i18n/locales/cs-CZ.json
diff --git a/src/runtime/locales/de-DE.json → src/runtime/i18n/locales/de-DE.json b/src/runtime/locales/de-DE.json → src/runtime/i18n/locales/de-DE.json
diff --git a/src/runtime/locales/en-GB.json → src/runtime/i18n/locales/en-GB.json b/src/runtime/locales/en-GB.json → src/runtime/i18n/locales/en-GB.json
diff --git a/src/runtime/locales/es-ES.json → src/runtime/i18n/locales/es-ES.json b/src/runtime/locales/es-ES.json → src/runtime/i18n/locales/es-ES.json
diff --git a/src/runtime/locales/fa-IR.json → src/runtime/i18n/locales/fa-IR.json b/src/runtime/locales/fa-IR.json → src/runtime/i18n/locales/fa-IR.json
diff --git a/src/runtime/locales/fr-FR.json → src/runtime/i18n/locales/fr-FR.json b/src/runtime/locales/fr-FR.json → src/runtime/i18n/locales/fr-FR.json
diff --git a/src/runtime/locales/hu-HU.json → src/runtime/i18n/locales/hu-HU.json b/src/runtime/locales/hu-HU.json → src/runtime/i18n/locales/hu-HU.json
diff --git a/src/runtime/locales/id-ID.json → src/runtime/i18n/locales/id-ID.json b/src/runtime/locales/id-ID.json → src/runtime/i18n/locales/id-ID.json
diff --git a/src/runtime/locales/it-IT.json → src/runtime/i18n/locales/it-IT.json b/src/runtime/locales/it-IT.json → src/runtime/i18n/locales/it-IT.json
diff --git a/src/runtime/locales/pt-PT.json → src/runtime/i18n/locales/pt-PT.json b/src/runtime/locales/pt-PT.json → src/runtime/i18n/locales/pt-PT.json
diff --git a/src/runtime/locales/ru-RU.json → src/runtime/i18n/locales/ru-RU.json b/src/runtime/locales/ru-RU.json → src/runtime/i18n/locales/ru-RU.json
diff --git a/src/runtime/locales/sk-SK.json → src/runtime/i18n/locales/sk-SK.json b/src/runtime/locales/sk-SK.json → src/runtime/i18n/locales/sk-SK.json
diff --git a/src/runtime/locales/tr-TR.json → src/runtime/i18n/locales/tr-TR.json b/src/runtime/locales/tr-TR.json → src/runtime/i18n/locales/tr-TR.json
diff --git a/src/runtime/locales/uk-UA.json → src/runtime/i18n/locales/uk-UA.json b/src/runtime/locales/uk-UA.json → src/runtime/i18n/locales/uk-UA.json
diff --git a/src/runtime/locales/zh-CN.json → src/runtime/i18n/locales/zh-CN.json b/src/runtime/locales/zh-CN.json → src/runtime/i18n/locales/zh-CN.json
diff --git a/src/runtime/locales/zh-TW.json → src/runtime/i18n/locales/zh-TW.json b/src/runtime/locales/zh-TW.json → src/runtime/i18n/locales/zh-TW.json