gatsby-theme-q3 3.1.5 → 3.2.0

package/CHANGELOG.md

@@ -3,74 +3,86 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [3.1.5](https://github.com/3merge/q/compare/v3.1.4...v3.1.5) (2022-02-01)
+# [3.2.0](https://github.com/3merge/q/compare/v3.1.5...v3.2.0) (2022-02-09)
 
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.1.4](https://github.com/3merge/q/compare/v3.1.3...v3.1.4) (2022-02-01)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-# [3.1.0](https://github.com/3merge/q/compare/v3.0.4...v3.1.0) (2022-01-31)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.0.4](https://github.com/3merge/q/compare/v3.0.3...v3.0.4) (2022-01-29)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.0.3](https://github.com/3merge/q/compare/v3.0.2...v3.0.3) (2022-01-29)
 
+### Features
 
-### Bug Fixes
-
-* major release bugs ([#372](https://github.com/3merge/q/issues/372)) ([d3e0681](https://github.com/3merge/q/commit/d3e0681a8d9ce61558b3aeaabe94ce8bc326dfa7))
-
-
-
-
-
-## [3.0.2](https://github.com/3merge/q/compare/v3.0.1...v3.0.2) (2022-01-28)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [3.0.1](https://github.com/3merge/q/compare/v3.0.0...v3.0.1) (2022-01-28)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-# [3.0.0](https://github.com/3merge/q/compare/v2.3.13...v3.0.0) (2022-01-28)
-
-**Note:** Version bump only for package gatsby-theme-q3
+* text locale editor ([#377](https://github.com/3merge/q/issues/377)) ([e827875](https://github.com/3merge/q/commit/e8278757be7505554376c1d1d78d9b8900fdf35e))
 
 
 
 
 
 
+## [3.1.5](https://github.com/3merge/q/compare/v3.1.4...v3.1.5) (2022-02-01)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.1.4](https://github.com/3merge/q/compare/v3.1.3...v3.1.4) (2022-02-01)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+# [3.1.0](https://github.com/3merge/q/compare/v3.0.4...v3.1.0) (2022-01-31)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.0.4](https://github.com/3merge/q/compare/v3.0.3...v3.0.4) (2022-01-29)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.0.3](https://github.com/3merge/q/compare/v3.0.2...v3.0.3) (2022-01-29)
+
+
+### Bug Fixes
+
+* major release bugs ([#372](https://github.com/3merge/q/issues/372)) ([d3e0681](https://github.com/3merge/q/commit/d3e0681a8d9ce61558b3aeaabe94ce8bc326dfa7))
+
+
+
+
+
+## [3.0.2](https://github.com/3merge/q/compare/v3.0.1...v3.0.2) (2022-01-28)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [3.0.1](https://github.com/3merge/q/compare/v3.0.0...v3.0.1) (2022-01-28)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+# [3.0.0](https://github.com/3merge/q/compare/v2.3.13...v3.0.0) (2022-01-28)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+
 ## [2.3.11](https://github.com/3merge/q/compare/v2.3.10...v2.3.11) (2022-01-18)
 
 **Note:** Version bump only for package gatsby-theme-q3

package/__tests__/config.int.test.js

@@ -2,7 +2,6 @@ import { get } from 'lodash';
 import config from '../gatsby-config';
 
 const CANONICAL = 'gatsby-plugin-canonical-urls';
-const MANIFEST = 'gatsby-plugin-manifest';
 const ROBOTS = 'gatsby-plugin-robots-txt';
 
 const ENV = {
@@ -29,18 +28,8 @@ const checkPlugins = (args = {}, plugin) => {
 
 describe('gatsby-config', () => {
   describe('plugins', () => {
-    it('should error without contentful access token', () => {
-      process.env.URL =
-        'https://development.netlify.3merge.com';
-      expect(() =>
-        config({
-          contentfulSpaceID: '1',
-        }),
-      ).toThrowError();
-    });
-
     it('should include conditional plugins', () =>
-      [CANONICAL, MANIFEST].forEach((name) =>
+      [CANONICAL].forEach((name) =>
         checkPlugins(
           {
             brandingColor: '#FFF',
@@ -52,7 +41,7 @@ describe('gatsby-config', () => {
       ));
 
     it('should exclude conditional plugins', () =>
-      [CANONICAL, MANIFEST].forEach((name) =>
+      [CANONICAL].forEach((name) =>
         checkPlugins({}, name).hasNot(),
       ));
 

package/gatsby-browser.js

@@ -1,4 +1,28 @@
+import axios from 'axios';
+import { last, size } from 'lodash';
+import { getDomain } from 'q3-admin';
+import { browser } from 'q3-ui-helpers';
+
 export {
   wrapPageElement,
   wrapRootElement,
 } from './gatsby-ssr';
+
+export const onClientEntry = async () => {
+  if (!browser.isBrowserReady()) return;
+
+  // set language default
+  axios.defaults.headers['Content-Language'] =
+    window.localStorage.getItem('q3-locale') || 'en';
+
+  // set tenant default
+  const { host } = window.location;
+  const parts = String(host).split('.').reverse();
+
+  if (size(parts) > 1)
+    axios.defaults.headers['X-Session-Tenant'] =
+      last(parts);
+
+  // calls Q3 API
+  await getDomain();
+};

package/gatsby-config.js

@@ -5,8 +5,6 @@ const genKey = (url) =>
   String(url).includes('netlify') ? 'disallow' : 'allow';
 
 module.exports = ({
-  contentfulSpaceID,
-  contentfulAccessToken,
   siteUrl,
   title,
   brandingColor,
@@ -52,19 +50,6 @@ module.exports = ({
     },
   ];
 
-  if (contentfulSpaceID) {
-    if (!contentfulAccessToken)
-      throw new Error('Contentful access token missing');
-
-    plugins.push({
-      resolve: 'gatsby-source-contentful',
-      options: {
-        spaceId: contentfulSpaceID,
-        accessToken: contentfulAccessToken,
-      },
-    });
-  }
-
   if (netlify)
     plugins.push({
       resolve: 'gatsby-plugin-netlify',
@@ -73,20 +58,6 @@ module.exports = ({
       },
     });
 
-  if (title && brandingColor)
-    plugins.push({
-      resolve: 'gatsby-plugin-manifest',
-      options: {
-        short_name: title,
-        start_url: '/',
-        background_color: '#FFF',
-        theme_color: brandingColor,
-        display: 'standalone',
-        name: title,
-        icon,
-      },
-    });
-
   if (siteUrl)
     plugins.push({
       resolve: 'gatsby-plugin-canonical-urls',

package/lib/components/PageWrapper.js

@@ -13,21 +13,13 @@ var _components = require("q3-admin/lib/components");
 
 var _SearchEngine = _interopRequireDefault(require("./SearchEngine"));
 
-var _useLocale = _interopRequireDefault(require("./useLocale"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// cannot conditionally call hooks otherwise
-const Locale = () => {
-  (0, _useLocale.default)();
-  return null;
-};
-
 const PageWrapper = ({
   children,
   includeLoader,
   includeLocale
-}) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_SearchEngine.default, null), includeLoader && /*#__PURE__*/_react.default.createElement(_components.Loader, null), includeLocale && /*#__PURE__*/_react.default.createElement(Locale, null), children);
+}) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_SearchEngine.default, null), includeLoader && /*#__PURE__*/_react.default.createElement(_components.Loader, null), children);
 
 PageWrapper.defaultProps = {
   children: null,

package/lib/components/SearchEngine.js

@@ -3,18 +3,79 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.getStartUrl = exports.generateMetaTitleOptions = exports.generateMetaDescriptionOptions = exports.generateManifest = exports.generateIcons = exports.generateBrand = exports.default = exports.Manifest = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _lodash = require("lodash");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactHelmet = require("react-helmet");
 
+var _q3UiHelpers = require("q3-ui-helpers");
+
 var _useSiteMetaData = _interopRequireDefault(require("./useSiteMetaData"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const withContent = output => content => content && (0, _lodash.isFunction)(output) ? output(content) : [];
+
+const getStartUrl = () => _q3UiHelpers.browser.isBrowserReady() ? (0, _lodash.get)(window, 'location.host') : '';
+
+exports.getStartUrl = getStartUrl;
+const generateMetaDescriptionOptions = withContent(content => [{
+  name: 'description',
+  content
+}, {
+  property: 'og:description',
+  content
+}, {
+  name: 'twitter:description',
+  content
+}]);
+exports.generateMetaDescriptionOptions = generateMetaDescriptionOptions;
+const generateMetaTitleOptions = withContent(content => [{
+  property: 'og:title',
+  content
+}, {
+  name: 'twitter:title',
+  content
+}]);
+exports.generateMetaTitleOptions = generateMetaTitleOptions;
+
+const generateBrand = xs => xs ? `%s | ${xs}` : undefined;
+
+exports.generateBrand = generateBrand;
+
+const generateIcons = (site = {}) => site !== null && site !== void 0 && site.favicon ? [{
+  src: site.favicon,
+  sizes: '512x512',
+  type: 'image/png'
+}] : [];
+
+exports.generateIcons = generateIcons;
+
+const generateManifest = (site = {}) => ({
+  background_color: site.color,
+  description: site.description,
+  display: 'fullscreen',
+  icons: generateIcons(site),
+  name: site.title,
+  start_url: getStartUrl(),
+  short_name: site.brand,
+  theme_color: site.color
+});
+
+exports.generateManifest = generateManifest;
+
+const Manifest = props => (0, _lodash.isObject)(props) ? /*#__PURE__*/_react.default.createElement("link", {
+  rel: "manifest",
+  href: `data:application/manifest+json,${encodeURIComponent(JSON.stringify(props))}`
+}) : null;
+
+exports.Manifest = Manifest;
+
 const SEO = ({
   description,
   lang,
@@ -23,35 +84,24 @@ const SEO = ({
 }) => {
   const site = (0, _useSiteMetaData.default)();
   const metaDescription = description || site.description;
+  const metaTitle = title || site.title;
   return /*#__PURE__*/_react.default.createElement(_reactHelmet.Helmet, {
     htmlAttributes: {
       lang
     },
-    title: title || site.title,
-    titleTemplate: `%s | ${site.brand}`,
-    meta: [{
-      name: 'description',
-      content: metaDescription
-    }, {
-      property: 'og:title',
-      content: title
-    }, {
-      property: 'og:description',
-      content: metaDescription
-    }, {
+    title: metaTitle,
+    titleTemplate: generateBrand((0, _lodash.get)(site, 'brand', 'Q3')),
+    meta: [...generateMetaTitleOptions(metaTitle), ...generateMetaDescriptionOptions(metaDescription), {
       property: 'og:type',
       content: 'website'
     }, {
       name: 'twitter:card',
       content: 'summary'
-    }, {
-      name: 'twitter:title',
-      content: title
-    }, {
-      name: 'twitter:description',
-      content: metaDescription
     }].concat(meta)
-  });
+  }, /*#__PURE__*/_react.default.createElement(Manifest, generateManifest(site)), /*#__PURE__*/_react.default.createElement("link", {
+    rel: "icon",
+    href: site.favicon
+  }));
 };
 
 SEO.defaultProps = {

package/lib/components/Wrapper.js

@@ -13,8 +13,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _q3UiPermissions = _interopRequireDefault(require("q3-ui-permissions"));
 
-var _LocaleBundles = _interopRequireDefault(require("./LocaleBundles"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable import/no-extraneous-dependencies */
@@ -25,13 +23,10 @@ const setBaseUrlForRest = (baseURL = process.env.GATSBY_APP_BASE_URL || 'http://
 
 const Wrapper = ({
   baseURL,
-  children,
-  locale
+  children
 }) => {
   setBaseUrlForRest(baseURL);
-  return /*#__PURE__*/_react.default.createElement(_LocaleBundles.default, {
-    locale: locale
-  }, /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, children));
+  return /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, children);
 };
 
 Wrapper.defaultProps = {

package/lib/components/__tests__/SearchEngine.test.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _SearchEngine = require("../SearchEngine");
+
+jest.mock('q3-ui-locale', () => ({
+  browser: {
+    isBrowserReady: jest.fn()
+  }
+}));
+const host = 'https://google.ca';
+beforeEach(() => {
+  Object.defineProperty(window, 'location', {
+    value: {
+      host
+    }
+  });
+});
+describe('SearchEngine', () => {
+  it('should not render descriptions without content', () => {
+    expect((0, _SearchEngine.generateMetaDescriptionOptions)().length).toBe(0);
+  });
+  it('should render descriptions with content', () => {
+    expect((0, _SearchEngine.generateMetaDescriptionOptions)('foo').length).toBeGreaterThanOrEqual(1);
+  });
+  it('should return host', () => {
+    expect((0, _SearchEngine.getStartUrl)()).toMatch(host);
+  });
+  it('should render favicon', () => {
+    expect((0, _SearchEngine.generateIcons)({
+      favicon: host
+    })).toHaveLength(1);
+  });
+  it('should not render favicon', () => {
+    expect((0, _SearchEngine.generateIcons)({
+      favicon: undefined
+    })).toHaveLength(0);
+  });
+  it('should include template literals', () => {
+    expect((0, _SearchEngine.generateBrand)('3merge')).toMatch('%s | 3merge');
+  });
+});

package/lib/components/useSiteMetaData.js

@@ -9,19 +9,20 @@ var _lodash = require("lodash");
 
 var _gatsby = require("gatsby");
 
-var _default = () => (0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
-      query {
-        site {
-          siteMetadata {
-            appDirectory
-            brand
-            description
-            favicon
-            logo
-            title
+var _useRunTime = _interopRequireDefault(require("gatsby-theme-q3-mui/src/components/useRunTime"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = () => (0, _lodash.merge)((0, _lodash.get)((0, _gatsby.useStaticQuery)((0, _gatsby.graphql)`
+        query {
+          site {
+            siteMetadata {
+              appDirectory
+              description
+              title
+            }
           }
         }
-      }
-    `), 'site.siteMetadata', {});
+      `), 'site.siteMetadata', {}), (0, _useRunTime.default)());
 
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {
@@ -23,24 +23,24 @@
     "gatsby-image": "^3.11.0",
     "gatsby-plugin-canonical-urls": "^4.2.0",
     "gatsby-plugin-force-trailing-slashes": "^1.0.5",
-    "gatsby-plugin-manifest": "^4.2.0",
     "gatsby-plugin-material-ui": "^3.0.1",
     "gatsby-plugin-netlify": "^3.14.0",
     "gatsby-plugin-robots-txt": "^1.6.14",
     "gatsby-plugin-sharp": "^4.2.0",
     "gatsby-plugin-sitemap": "^5.2.0",
-    "gatsby-source-contentful": "^7.0.0",
-    "gatsby-theme-q3-mui": "^3.1.5",
+    "gatsby-theme-q3-mui": "^3.2.0",
     "gatsby-transformer-sharp": "^4.2.0",
     "lodash": "^4.17.20",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "q3-ui-locale": "^3.1.5",
+    "q3-ui-helpers": "^3.2.0",
+    "q3-ui-locale": "^3.2.0",
     "query-string": "^7.0.1",
+    "react-helmet": "^6.1.0",
     "react-share": "^4.3.1",
     "slugify": "^1.6.3",
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "gitHead": "abefd5cfba5c173f7d1df2393657ba25ebbb415f"
+  "gitHead": "e7b26a194d8779024212ba64ca440222c28d82c7"
 }

package/src/components/PageWrapper.jsx

@@ -2,13 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Loader } from 'q3-admin/lib/components';
 import SearchEngine from './SearchEngine';
-import useLocale from './useLocale';
-
-// cannot conditionally call hooks otherwise
-const Locale = () => {
-  useLocale();
-  return null;
-};
 
 const PageWrapper = ({
   children,
@@ -18,7 +11,6 @@ const PageWrapper = ({
   <>
     <SearchEngine />
     {includeLoader && <Loader />}
-    {includeLocale && <Locale />}
     {children}
   </>
 );

package/src/components/SearchEngine.jsx

@@ -1,32 +1,100 @@
 import React from 'react';
+import { get, isFunction, isObject } from 'lodash';
 import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
+import { browser } from 'q3-ui-helpers';
 import useSiteMetaData from './useSiteMetaData';
 
+const withContent = (output) => (content) =>
+  content && isFunction(output) ? output(content) : [];
+
+export const getStartUrl = () =>
+  browser.isBrowserReady()
+    ? get(window, 'location.host')
+    : '';
+
+export const generateMetaDescriptionOptions = withContent(
+  (content) => [
+    {
+      name: 'description',
+      content,
+    },
+    {
+      property: 'og:description',
+      content,
+    },
+    {
+      name: 'twitter:description',
+      content,
+    },
+  ],
+);
+
+export const generateMetaTitleOptions = withContent(
+  (content) => [
+    {
+      property: 'og:title',
+      content,
+    },
+    {
+      name: 'twitter:title',
+      content,
+    },
+  ],
+);
+
+export const generateBrand = (xs) =>
+  xs ? `%s | ${xs}` : undefined;
+
+export const generateIcons = (site = {}) =>
+  site?.favicon
+    ? [
+        {
+          src: site.favicon,
+          sizes: '512x512',
+          type: 'image/png',
+        },
+      ]
+    : [];
+
+export const generateManifest = (site = {}) => ({
+  background_color: site.color,
+  description: site.description,
+  display: 'fullscreen',
+  icons: generateIcons(site),
+  name: site.title,
+  start_url: getStartUrl(),
+  short_name: site.brand,
+  theme_color: site.color,
+});
+
+export const Manifest = (props) =>
+  isObject(props) ? (
+    <link
+      rel="manifest"
+      href={`data:application/manifest+json,${encodeURIComponent(
+        JSON.stringify(props),
+      )}`}
+    />
+  ) : null;
+
 const SEO = ({ description, lang, meta, title }) => {
   const site = useSiteMetaData();
   const metaDescription = description || site.description;
+  const metaTitle = title || site.title;
 
   return (
     <Helmet
       htmlAttributes={{
         lang,
       }}
-      title={title || site.title}
-      titleTemplate={`%s | ${site.brand}`}
+      title={metaTitle}
+      titleTemplate={generateBrand(
+        get(site, 'brand', 'Q3'),
+      )}
       meta={[
-        {
-          name: 'description',
-          content: metaDescription,
-        },
-        {
-          property: 'og:title',
-          content: title,
-        },
-        {
-          property: 'og:description',
-          content: metaDescription,
-        },
+        ...generateMetaTitleOptions(metaTitle),
+        ...generateMetaDescriptionOptions(metaDescription),
         {
           property: 'og:type',
           content: 'website',
@@ -35,16 +103,11 @@ const SEO = ({ description, lang, meta, title }) => {
           name: 'twitter:card',
           content: 'summary',
         },
-        {
-          name: 'twitter:title',
-          content: title,
-        },
-        {
-          name: 'twitter:description',
-          content: metaDescription,
-        },
       ].concat(meta)}
-    />
+    >
+      <Manifest {...generateManifest(site)} />
+      <link rel="icon" href={site.favicon} />
+    </Helmet>
   );
 };
 

package/src/components/Wrapper.jsx

@@ -3,7 +3,6 @@ import React from 'react';
 import axios from 'axios';
 import PropTypes from 'prop-types';
 import AuthProvider from 'q3-ui-permissions';
-import LocaleBundles from './LocaleBundles';
 
 const setBaseUrlForRest = (
   baseURL = process.env.GATSBY_APP_BASE_URL ||
@@ -13,14 +12,9 @@ const setBaseUrlForRest = (
   return axios.defaults;
 };
 
-const Wrapper = ({ baseURL, children, locale }) => {
+const Wrapper = ({ baseURL, children }) => {
   setBaseUrlForRest(baseURL);
-
-  return (
-    <LocaleBundles locale={locale}>
-      <AuthProvider>{children}</AuthProvider>
-    </LocaleBundles>
-  );
+  return <AuthProvider>{children}</AuthProvider>;
 };
 
 Wrapper.defaultProps = {

package/src/components/__tests__/SearchEngine.test.jsx

@@ -0,0 +1,58 @@
+import {
+  generateMetaDescriptionOptions,
+  getStartUrl,
+  generateIcons,
+  generateBrand,
+} from '../SearchEngine';
+
+jest.mock('q3-ui-locale', () => ({
+  browser: {
+    isBrowserReady: jest.fn(),
+  },
+}));
+
+const host = 'https://google.ca';
+
+beforeEach(() => {
+  Object.defineProperty(window, 'location', {
+    value: {
+      host,
+    },
+  });
+});
+
+describe('SearchEngine', () => {
+  it('should not render descriptions without content', () => {
+    expect(generateMetaDescriptionOptions().length).toBe(0);
+  });
+
+  it('should render descriptions with content', () => {
+    expect(
+      generateMetaDescriptionOptions('foo').length,
+    ).toBeGreaterThanOrEqual(1);
+  });
+
+  it('should return host', () => {
+    expect(getStartUrl()).toMatch(host);
+  });
+
+  it('should render favicon', () => {
+    expect(
+      generateIcons({
+        favicon: host,
+      }),
+    ).toHaveLength(1);
+  });
+
+  it('should not render favicon', () => {
+    expect(
+      generateIcons({
+        favicon: undefined,
+      }),
+    ).toHaveLength(0);
+  });
+
+  it('should include template literals', () => {
+    expect(generateBrand('3merge')).toMatch('%s | 3merge');
+  });
+});

package/src/components/useSiteMetaData.js

@@ -1,22 +1,23 @@
-import { get } from 'lodash';
+import { get, merge } from 'lodash';
 import { useStaticQuery, graphql } from 'gatsby';
+import useRunTime from 'gatsby-theme-q3-mui/src/components/useRunTime';
 
 export default () =>
-  get(
-    useStaticQuery(graphql`
-      query {
-        site {
-          siteMetadata {
-            appDirectory
-            brand
-            description
-            favicon
-            logo
-            title
+  merge(
+    get(
+      useStaticQuery(graphql`
+        query {
+          site {
+            siteMetadata {
+              appDirectory
+              description
+              title
+            }
           }
         }
-      }
-    `),
-    'site.siteMetadata',
-    {},
+      `),
+      'site.siteMetadata',
+      {},
+    ),
+    useRunTime(),
   );

package/lib/components/LocaleBundles.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _q3UiLocale = require("q3-ui-locale");
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const registeri18ResourceBundles = contentData => {
-  if (!contentData || !('en' in contentData)) return;
-  Object.entries(contentData).forEach(([key, bundle]) => {
-    Object.entries(bundle).forEach(([namespace, data]) => {
-      _q3UiLocale.i18n.addResourceBundle(key, namespace, data, true, true);
-    });
-  });
-};
-
-const LocaleBundles = ({
-  children,
-  locale
-}) => {
-  registeri18ResourceBundles(locale);
-  return children;
-};
-
-LocaleBundles.defaultProps = {
-  children: null,
-  locale: {}
-};
-LocaleBundles.propTypes = {
-  // eslint-disable-next-line
-  children: _propTypes.default.any,
-  // eslint-disable-next-line
-  locale: _propTypes.default.object
-};
-var _default = LocaleBundles;
-exports.default = _default;

package/lib/components/useLocale.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _q3UiLocale = require("q3-ui-locale");
-
-var _q3UiPermissions = require("q3-ui-permissions");
-
-var _q3UiRest = require("q3-ui-rest");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const useLocale = () => {
-  var _React$useContext, _React$useContext$sta;
-
-  const profile = (_React$useContext = _react.default.useContext(_q3UiPermissions.AuthContext)) === null || _React$useContext === void 0 ? void 0 : (_React$useContext$sta = _React$useContext.state) === null || _React$useContext$sta === void 0 ? void 0 : _React$useContext$sta.profile;
-  const lng = profile === null || profile === void 0 ? void 0 : profile.lang;
-  (0, _q3UiRest.useTimezoneInterceptor)(profile === null || profile === void 0 ? void 0 : profile.timezone);
-
-  _react.default.useEffect(() => {
-    if (lng && _q3UiLocale.i18n.resolvedLanguage) _q3UiLocale.i18n.changeLanguage(lng);
-  }, [lng]);
-};
-
-var _default = useLocale;
-exports.default = _default;

package/src/components/LocaleBundles.jsx

@@ -1,37 +0,0 @@
-import { i18n } from 'q3-ui-locale';
-import PropTypes from 'prop-types';
-
-const registeri18ResourceBundles = (contentData) => {
-  if (!contentData || !('en' in contentData)) return;
-
-  Object.entries(contentData).forEach(([key, bundle]) => {
-    Object.entries(bundle).forEach(([namespace, data]) => {
-      i18n.addResourceBundle(
-        key,
-        namespace,
-        data,
-        true,
-        true,
-      );
-    });
-  });
-};
-
-const LocaleBundles = ({ children, locale }) => {
-  registeri18ResourceBundles(locale);
-  return children;
-};
-
-LocaleBundles.defaultProps = {
-  children: null,
-  locale: {},
-};
-
-LocaleBundles.propTypes = {
-  // eslint-disable-next-line
-  children: PropTypes.any,
-  // eslint-disable-next-line
-  locale: PropTypes.object,
-};
-
-export default LocaleBundles;

package/src/components/useLocale.js

@@ -1,20 +0,0 @@
-import React from 'react';
-import { i18n } from 'q3-ui-locale';
-import { AuthContext } from 'q3-ui-permissions';
-import { useTimezoneInterceptor } from 'q3-ui-rest';
-
-const useLocale = () => {
-  const profile =
-    React.useContext(AuthContext)?.state?.profile;
-
-  const lng = profile?.lang;
-
-  useTimezoneInterceptor(profile?.timezone);
-
-  React.useEffect(() => {
-    if (lng && i18n.resolvedLanguage)
-      i18n.changeLanguage(lng);
-  }, [lng]);
-};
-
-export default useLocale;