feat: add global options

nuxt-modules · May 4, 2019 · fe6d114 · fe6d114
1 parent 83b398e
commit fe6d114
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 34 deletions.
diff --git a/src/index.js b/src/index.js
@@ -31,7 +31,7 @@ module.exports = function (userOptions) {
   const pluginsPath = join(__dirname, PLUGINS_DIR)
   const templatesPath = join(__dirname, TEMPLATES_DIR)
   const requiredPlugins = ['main', 'routing']
-  const options = { ...DEFAULT_OPTIONS, ...userOptions }
+  const options = { ...DEFAULT_OPTIONS, ...userOptions, ...this.options.i18n }
   // Options that have nested config options must be merged
   // individually with defaults to prevent missing options
   for (const key of NESTED_OPTIONS) {

diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
@@ -4,39 +4,38 @@ module.exports = {
   render: {
     resourceHints: false
   },
-  modules: [
-    ['@@', {
-      seo: true,
-      baseUrl: 'nuxt-app.localhost',
-      locales: [
-        {
-          code: 'en',
-          iso: 'en-US',
-          name: 'English'
+  modules: ['@@'],
+  i18n: {
+    seo: true,
+    baseUrl: 'nuxt-app.localhost',
+    locales: [
+      {
+        code: 'en',
+        iso: 'en-US',
+        name: 'English'
+      },
+      {
+        code: 'fr',
+        iso: 'fr-FR',
+        name: 'Français'
+      }
+    ],
+    defaultLocale: 'en',
+    lazy: false,
+    vueI18n: {
+      messages: {
+        fr: {
+          home: 'Accueil',
+          about: 'À propos',
+          posts: 'Articles'
         },
-        {
-          code: 'fr',
-          iso: 'fr-FR',
-          name: 'Français'
+        en: {
+          home: 'Homepage',
+          about: 'About us',
+          posts: 'Posts'
         }
-      ],
-      defaultLocale: 'en',
-      lazy: false,
-      vueI18n: {
-        messages: {
-          fr: {
-            home: 'Accueil',
-            about: 'À propos',
-            posts: 'Articles'
-          },
-          en: {
-            home: 'Homepage',
-            about: 'About us',
-            posts: 'Posts'
-          }
-        },
-        fallbackLocale: 'en'
-      }
-    }]
-  ]
+      },
+      fallbackLocale: 'en'
+    }
+  }
 }