@merkaly/nuxt 0.10.3 → 0.10.5

package/README.md

@@ -71,7 +71,9 @@ export default defineNuxtConfig({
 ```
 
 The sitemap is only installed for indexable apps and is served at `/sitemap.xml`
-(linked from `robots.txt`).
+(linked from `robots.txt`), a single file for every locale. The `x-default`
+alternate points to `merkaly.i18n.defaultLocale`; the sitemap is installed after
+`@nuxtjs/i18n` so it reads those options.
 
 ## Money formatting
 

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.14.0"
   },
-  "version": "0.10.3",
+  "version": "0.10.5",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, useLogger, createResolver, installModule, addPlugin, addServerHandler, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate, addTemplate } from '@nuxt/kit';
+import { defineNuxtModule, useLogger, createResolver, addPlugin, addServerHandler, addRouteMiddleware, addImportsDir, addComponentsDir, addTypeTemplate, addTemplate } from '@nuxt/kit';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { resolve, dirname } from 'node:path';
 import { defu } from 'defu';
@@ -87,6 +87,12 @@ function buildModuleDependencies(nuxt, options) {
   dependencies["@nuxtjs/robots"] = {
     overrides: { disallow: options.seo?.disallow ?? [] }
   };
+  if (options.seo?.indexable && options.seo.sitemap) {
+    dependencies["@nuxtjs/sitemap"] = {
+      // listed after i18n so it installs later and reads its options
+      overrides: configureSitemap(options)
+    };
+  }
   const logger = useLogger(MODULE_NAME);
   Object.keys(dependencies).forEach((dependency) => {
     logger.info(`Loaded ${dependency} module`);
@@ -130,8 +136,12 @@ function configureI18n(nuxt, options) {
     });
   });
   return {
+    baseUrl: options.seo?.url || void 0,
+    // absolute hreflang and canonical links
     defaultLocale: options.i18n.defaultLocale,
     detectBrowserLanguage: { useCookie: true },
+    locales: options.i18n.locales.map((locale) => ({ code: locale.code, language: locale.language })),
+    // for modules reading i18n options (sitemap); i18n loads them from the hook
     restructureDir: ".",
     strategy: options.i18n.strategy ?? "no_prefix",
     vueI18n
@@ -161,7 +171,9 @@ function configureSitemap(options) {
       })),
       strategy: options.i18n.strategy
     },
-    exclude
+    exclude,
+    sitemaps: false
+    // a single /sitemap.xml with hreflang, not one sitemap per locale
   };
 }
 function configureRuntimeConfig(nuxt, options) {
@@ -316,10 +328,6 @@ const module$1 = defineNuxtModule({
     const resolver = createResolver(import.meta.url);
     configureNuxtOptions(nuxt, options);
     await configureExternalIntegrations(nuxt, logger);
-    if (options.seo?.indexable && options.seo.sitemap) {
-      await installModule("@nuxtjs/sitemap", configureSitemap(options));
-      logger.info("Loaded @nuxtjs/sitemap module");
-    }
     registerRuntimeFeatures(options, resolver);
   }
 });

package/dist/runtime/components/app.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { useRoute } from "#app";
 import { computed } from "vue";
-import { useAuth, useTenant, watchOnce, addRouteMiddleware, useNuxtApp } from "#imports";
+import { useAuth, useTenant, watchOnce, addRouteMiddleware, useNuxtApp, useRuntimeConfig } from "#imports";
 import AuthMiddleware from "../middleware/auth";
 import { useNavigation } from "../composables/useNavigation";
 import AuthError from "./auth/AuthError.vue";
@@ -11,8 +11,10 @@ const $route = useRoute();
 const { clear, error, isLoading, logout, retry } = useAuth();
 const { fromServer } = useTenant();
 const { hook } = useNuxtApp();
+const { public: { merkaly } } = useRuntimeConfig();
 useColorMode({ attribute: "data-bs-theme" });
-const blocking = computed(() => isLoading.value && !fromServer.value);
+const waitsForAuth = merkaly.auth0.requiresAuth || merkaly.auth0.requiresTenant;
+const blocking = computed(() => waitsForAuth && isLoading.value && !fromServer.value);
 watchOnce(isLoading, () => AuthMiddleware($route, $route));
 const { defer, regenerate } = useNavigation();
 addRouteMiddleware("navigation", (to) => defer(to), { global: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkaly/nuxt",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/merkaly-io/nuxt.git"