ublo-lib 1.8.11 → 1.8.13

package/es/common/components/analytics.js

@@ -1,5 +1,11 @@
 import { useEffect } from "react";
-import { useUbloContext } from "ublo/with-ublo";
+import getConfig from "next/config";
+const {
+  publicRuntimeConfig
+} = getConfig();
+const {
+  gaAccount
+} = publicRuntimeConfig;
 const loadGTag = id => new Promise(resolve => {
   const script = document.createElement("script");
   script.src = `https://www.googletagmanager.com/gtag/js?id=${id}`;
@@ -10,12 +16,6 @@ const Analytics = ({
   consent,
   gaAccountOverride
 }) => {
-  const {
-    config
-  } = useUbloContext();
-  const {
-    gaAccount
-  } = config;
   const gaId = gaAccountOverride || gaAccount;
   useEffect(() => {
     const startGTag = async () => {

package/es/common/components/cookie-consent/cookie-consent.js

@@ -1,23 +1,26 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
+import getConfig from "next/config";
 import classnames from "classnames";
-import { useUbloContext } from "ublo/with-ublo";
 import * as Messages from "./messages";
 import Button from "dt-design-system/es/button";
 import css from "./cookie-consent.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+const {
+  publicRuntimeConfig
+} = getConfig();
+const {
+  gaAccount
+} = publicRuntimeConfig;
 const COOKIE_STORAGE = "cookie_allowed";
 const CookieConsent = ({
   lang,
   consent,
   updateConsent
 }) => {
-  const {
-    config
-  } = useUbloContext();
   const [mounted, setMounted] = React.useState(false);
-  const isEnabled = config.gaAccount;
+  const isEnabled = Boolean(gaAccount);
   const cookieAllowed = value => () => {
     updateConsent(value);
   };

package/es/common/components/error-404/error-404.js

@@ -1,8 +1,9 @@
 import * as React from "react";
+import { useUbloContext } from "ublo/with-ublo";
 import classnames from "classnames";
 import Button from "dt-design-system/es/button";
 import { useGoal } from "../plausible";
-import Message from "./messages";
+import message from "./messages";
 import css from "./error-404.module.css";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -11,6 +12,15 @@ const Error404 = ({
   className
 }) => {
   useGoal("404 error");
+  const {
+    lang: ubloLang
+  } = useUbloContext();
+  const [lang, setLang] = React.useState(ubloLang);
+  React.useEffect(() => {
+    if (!lang) {
+      setLang(document.documentElement.getAttribute("lang") || "en");
+    }
+  }, [lang]);
   const classes = classnames(css.error, className);
   return _jsxs("div", {
     className: classes,
@@ -21,21 +31,15 @@ const Error404 = ({
       className: css.inner,
       children: [_jsx("div", {
         className: css.title,
-        children: _jsx(Message, {
-          id: "title"
-        })
+        children: message(lang, "title")
       }), _jsx("div", {
         className: css.tagline,
-        children: _jsx(Message, {
-          id: "tagline"
-        })
+        children: message(lang, "tagline")
       }), _jsx(Button, {
         tag: "a",
         className: css.button,
         href: "/",
-        children: _jsx(Message, {
-          id: "button"
-        })
+        children: message(lang, "button")
       }), _jsx("div", {
         className: css.errorCode,
         children: "404"

package/es/common/components/error-404/messages.js

@@ -1,4 +1,3 @@
-import { useUbloContext } from "ublo/with-ublo";
 const messages = {
   fr: {
     title: "Erreur",
@@ -11,16 +10,7 @@ const messages = {
     button: "Back to home page"
   }
 };
-const message = (lang, id) => {
+export default function message(lang, id) {
   const _lang = lang === "fr" ? "fr" : "en";
   return messages[_lang]?.[id] || `??${id}??`;
-};
-export const Message = ({
-  id
-}) => {
-  const {
-    lang
-  } = useUbloContext();
-  return message(lang, id);
-};
-export default Message;
+}

package/es/common/components/plausible/hooks/use-plausible.js

@@ -1,20 +1,20 @@
 import * as React from "react";
-import { useUbloContext } from "ublo/with-ublo";
+import getConfig from "next/config";
 import load from "../services/load";
 import sendGoal from "../services/send-goal";
+const {
+  publicRuntimeConfig
+} = getConfig();
+const {
+  plausibleDomain
+} = publicRuntimeConfig;
 const usePlausible = overridenDomain => {
   const [loaded, setLoaded] = React.useState(false);
-  const {
-    config
-  } = useUbloContext();
-  const {
-    plausibleDomain
-  } = config;
   React.useEffect(() => {
     if (!overridenDomain && !plausibleDomain) return;
     load();
     setLoaded(true);
-  }, [overridenDomain, plausibleDomain]);
+  }, [overridenDomain]);
   return [loaded, setLoaded];
 };
 const useGoal = (goal, props, overridenDomain) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.8.11",
+  "version": "1.8.13",
   "peerDependencies": {
     "dt-design-system": "^2.1.0",
     "next": "^12.0.0 || ^13.0.0",