@merkaly/nuxt 0.10.3 → 0.10.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module.json +1 -1
- package/dist/module.mjs +2 -0
- package/dist/runtime/components/app.vue +4 -2
- package/package.json +1 -1
package/dist/module.json
CHANGED
package/dist/module.mjs
CHANGED
|
@@ -130,6 +130,8 @@ function configureI18n(nuxt, options) {
|
|
|
130
130
|
});
|
|
131
131
|
});
|
|
132
132
|
return {
|
|
133
|
+
baseUrl: options.seo?.url || void 0,
|
|
134
|
+
// absolute hreflang and canonical links
|
|
133
135
|
defaultLocale: options.i18n.defaultLocale,
|
|
134
136
|
detectBrowserLanguage: { useCookie: true },
|
|
135
137
|
restructureDir: ".",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<script setup>
|
|
2
2
|
import { useRoute } from "#app";
|
|
3
3
|
import { computed } from "vue";
|
|
4
|
-
import { useAuth, useTenant, watchOnce, addRouteMiddleware, useNuxtApp } from "#imports";
|
|
4
|
+
import { useAuth, useTenant, watchOnce, addRouteMiddleware, useNuxtApp, useRuntimeConfig } from "#imports";
|
|
5
5
|
import AuthMiddleware from "../middleware/auth";
|
|
6
6
|
import { useNavigation } from "../composables/useNavigation";
|
|
7
7
|
import AuthError from "./auth/AuthError.vue";
|
|
@@ -11,8 +11,10 @@ const $route = useRoute();
|
|
|
11
11
|
const { clear, error, isLoading, logout, retry } = useAuth();
|
|
12
12
|
const { fromServer } = useTenant();
|
|
13
13
|
const { hook } = useNuxtApp();
|
|
14
|
+
const { public: { merkaly } } = useRuntimeConfig();
|
|
14
15
|
useColorMode({ attribute: "data-bs-theme" });
|
|
15
|
-
const
|
|
16
|
+
const waitsForAuth = merkaly.auth0.requiresAuth || merkaly.auth0.requiresTenant;
|
|
17
|
+
const blocking = computed(() => waitsForAuth && isLoading.value && !fromServer.value);
|
|
16
18
|
watchOnce(isLoading, () => AuthMiddleware($route, $route));
|
|
17
19
|
const { defer, regenerate } = useNavigation();
|
|
18
20
|
addRouteMiddleware("navigation", (to) => defer(to), { global: true });
|