gatsby-theme-q3 1.43.10 → 2.1.0

package/.eslintrc.js

@@ -1,24 +1,12 @@
 const path = require('path');
 
 module.exports = {
-  extends: [
-    'react-3merge'
-  ],
-  plugins: [
-    'module-resolver'
-  ],
-  rules: {
-    'react/no-array-index-key': 0,
-    'import/prefer-default-export': 0,
-    'import/no-duplicates': 0,
-    'import/extensions': 0,
-    'import/no-named-as-default': 0
-  },
+  extends: ['react-3merge'],
   settings: {
     'import/resolver': {
       'eslint-import-resolver-lerna': {
         packages: path.resolve(__dirname, '../packages'),
       },
     },
-  }
-}
+  },
+};

package/CHANGELOG.md

@@ -3,113 +3,133 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.43.10](https://github.com/3merge/q/compare/v1.43.9...v1.43.10) (2021-11-26)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [1.43.6](https://github.com/3merge/q/compare/v1.43.5...v1.43.6) (2021-11-09)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-# [1.42.0](https://github.com/3merge/q/compare/v1.41.8...v1.42.0) (2021-10-14)
+# [2.1.0](https://github.com/3merge/q/compare/v1.43.11...v2.1.0) (2021-11-29)
 
 
 ### Features
 
-* hook for looking up records by ID ([#350](https://github.com/3merge/q/issues/350)) ([3a73f61](https://github.com/3merge/q/commit/3a73f617a5d9747bd6435b68a238d78de1a4c125))
-
-
-
-
-
-## [1.41.8](https://github.com/3merge/q/compare/v1.41.7...v1.41.8) (2021-10-14)
-
-
-### Bug Fixes
-
-* child props ([331bee7](https://github.com/3merge/q/commit/331bee7e62862d0ce91408883c4b5a0c250199d5))
-
-
-
-
-
-## [1.41.7](https://github.com/3merge/q/compare/v1.41.6...v1.41.7) (2021-10-13)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [1.41.6](https://github.com/3merge/q/compare/v1.41.5...v1.41.6) (2021-10-13)
-
-**Note:** Version bump only for package gatsby-theme-q3
-
-
-
-
-
-## [1.41.4](https://github.com/3merge/q/compare/v1.41.3...v1.41.4) (2021-10-12)
-
-
-### Bug Fixes
-
-* invalid hook ([79641d2](https://github.com/3merge/q/commit/79641d263282868ff7d344dcd74eb340313a5e14))
-
-
-
-
-
-## [1.41.3](https://github.com/3merge/q/compare/v1.41.2...v1.41.3) (2021-10-12)
-
-
-### Bug Fixes
-
-* react dep ([4488a6e](https://github.com/3merge/q/commit/4488a6e2e039eabb34bb072219404cee4cc95e88))
-
-
-
-
-
-## [1.41.2](https://github.com/3merge/q/compare/v1.41.1...v1.41.2) (2021-10-11)
-
-
-### Bug Fixes
-
-* ssr ([3748086](https://github.com/3merge/q/commit/3748086da42bd1f1ecebad74608c3a785bab38d7))
-
-
-
-
-
-# [1.40.0](https://github.com/3merge/q/compare/v1.39.3...v1.40.0) (2021-10-07)
-
-
-### Features
-
-* remember redirect to login ([#348](https://github.com/3merge/q/issues/348)) ([ce98193](https://github.com/3merge/q/commit/ce9819377be5acbd7c5624b30efa9ea31264aef5))
-
-
-
-
-
-## [1.36.7](https://github.com/3merge/q/compare/v1.36.6...v1.36.7) (2021-07-15)
-
-**Note:** Version bump only for package gatsby-theme-q3
+* v2 ([#358](https://github.com/3merge/q/issues/358)) ([8e4a15a](https://github.com/3merge/q/commit/8e4a15a99f1f433b4f5770497e8af971d7663c23))
 
 
 
 
 
 
+# [2.0.0](https://github.com/3merge/q/compare/v1.43.11...v2.0.0) (2021-11-29)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [1.43.10](https://github.com/3merge/q/compare/v1.43.9...v1.43.10) (2021-11-26)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [1.43.6](https://github.com/3merge/q/compare/v1.43.5...v1.43.6) (2021-11-09)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+# [1.42.0](https://github.com/3merge/q/compare/v1.41.8...v1.42.0) (2021-10-14)
+
+
+### Features
+
+* hook for looking up records by ID ([#350](https://github.com/3merge/q/issues/350)) ([3a73f61](https://github.com/3merge/q/commit/3a73f617a5d9747bd6435b68a238d78de1a4c125))
+
+
+
+
+
+## [1.41.8](https://github.com/3merge/q/compare/v1.41.7...v1.41.8) (2021-10-14)
+
+
+### Bug Fixes
+
+* child props ([331bee7](https://github.com/3merge/q/commit/331bee7e62862d0ce91408883c4b5a0c250199d5))
+
+
+
+
+
+## [1.41.7](https://github.com/3merge/q/compare/v1.41.6...v1.41.7) (2021-10-13)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [1.41.6](https://github.com/3merge/q/compare/v1.41.5...v1.41.6) (2021-10-13)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [1.41.4](https://github.com/3merge/q/compare/v1.41.3...v1.41.4) (2021-10-12)
+
+
+### Bug Fixes
+
+* invalid hook ([79641d2](https://github.com/3merge/q/commit/79641d263282868ff7d344dcd74eb340313a5e14))
+
+
+
+
+
+## [1.41.3](https://github.com/3merge/q/compare/v1.41.2...v1.41.3) (2021-10-12)
+
+
+### Bug Fixes
+
+* react dep ([4488a6e](https://github.com/3merge/q/commit/4488a6e2e039eabb34bb072219404cee4cc95e88))
+
+
+
+
+
+## [1.41.2](https://github.com/3merge/q/compare/v1.41.1...v1.41.2) (2021-10-11)
+
+
+### Bug Fixes
+
+* ssr ([3748086](https://github.com/3merge/q/commit/3748086da42bd1f1ecebad74608c3a785bab38d7))
+
+
+
+
+
+# [1.40.0](https://github.com/3merge/q/compare/v1.39.3...v1.40.0) (2021-10-07)
+
+
+### Features
+
+* remember redirect to login ([#348](https://github.com/3merge/q/issues/348)) ([ce98193](https://github.com/3merge/q/commit/ce9819377be5acbd7c5624b30efa9ea31264aef5))
+
+
+
+
+
+## [1.36.7](https://github.com/3merge/q/compare/v1.36.6...v1.36.7) (2021-07-15)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+
 # [1.35.0](https://github.com/3merge/q/compare/v1.34.13...v1.35.0) (2021-06-09)
 
 

package/gatsby-config.js

@@ -14,12 +14,11 @@ module.exports = ({
   netlify,
 }) => {
   const plugins = [
+    'gatsby-plugin-material-ui',
     'gatsby-plugin-force-trailing-slashes',
     'gatsby-plugin-sitemap',
-    'gatsby-plugin-polyfill-io',
-    'gatsby-plugin-material-ui',
-    'gatsby-plugin-sharp',
     'gatsby-transformer-sharp',
+    'gatsby-plugin-sharp',
     {
       resolve: 'gatsby-plugin-robots-txt',
       options: {

package/gatsby-node.js

@@ -1,60 +1,25 @@
-const StringReplacePlugin = require('string-replace-webpack-plugin');
-
 exports.onCreateWebpackConfig = ({
   actions,
-  getConfig,
+  stage,
+  plugins,
 }) => {
-  const config = getConfig();
-  config.node = { fs: 'empty' };
-
-  Object.assign(config.resolve.alias, {
-    'unicode-properties':
-      'unicode-properties/unicode-properties.cjs.js',
-    'pdfkit': 'pdfkit/js/pdfkit.js',
-  });
-
-  Object.assign(config.module, {
-    rules: [
-      ...config.module.rules,
-      {
-        test: /\.ts$/,
-        use: ['ts-loader'],
-      },
-      {
-        enforce: 'pre',
-        test: /unicode-properties[\/\\]unicode-properties/,
-        loader: StringReplacePlugin.replace({
-          replacements: [
-            {
-              pattern:
-                "var fs = _interopDefault(require('fs'));",
-              replacement() {
-                return "var fs = require('fs');";
-              },
-            },
-          ],
-        }),
-      },
-      {
-        test: /unicode-properties[\/\\]unicode-properties/,
-        loader: 'transform-loader?brfs',
+  const config = {
+    resolve: {
+      fallback: {
+        fs: false,
+        path: false,
       },
-      {
-        test: /pdfkit[/\\]js[/\\]/,
-        loader: 'transform-loader?brfs',
-      },
-      {
-        test: /fontkit[\/\\]index.js$/,
-        loader: 'transform-loader?brfs',
-      },
-      {
-        test: /linebreak[\/\\]src[\/\\]linebreaker.js/,
-        loader: 'transform-loader?brfs',
-      },
-    ],
-  });
+    },
+  };
+
+  if (stage === 'build-javascript' || stage === 'develop')
+    config.plugins = [
+      plugins.provide({
+        process: 'process/browser',
+      }),
+    ];
 
-  actions.replaceWebpackConfig(config);
+  actions.setWebpackConfig(config);
 };
 
 exports.onCreateBabelConfig = function onCreateBabelConfig({

package/gatsby-ssr.js

@@ -9,3 +9,12 @@ export const wrapPageElement = ({ element }, plugin) => (
 export const wrapRootElement = ({ element }, plugin) => (
   <Wrapper {...plugin}>{element}</Wrapper>
 );
+
+export const onRenderBody = ({ setPostBodyComponents }) => {
+  setPostBodyComponents([
+    <script
+      key="polyfill-io"
+      src="https://cdn.polyfill.io/v3/polyfill.min.js"
+    />,
+  ]);
+};

package/lib/components/FormBoxContent.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _reactI18next = require("react-i18next");
+var _q3UiLocale = require("q3-ui-locale");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -21,7 +21,7 @@ const FormBoxContent = ({
 }) => {
   const {
     t
-  } = (0, _reactI18next.useTranslation)();
+  } = (0, _q3UiLocale.useTranslation)();
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Typography.default, {
     variant: "h1",
     gutterBottom: true

package/lib/components/RichText.js

@@ -109,9 +109,7 @@ const renderRichText = (json, locale = 'en-CA', sitemap = {}) => {
       [_richTextTypes.BLOCKS.HR]: () => /*#__PURE__*/_react.default.createElement(_Divider.default, null),
       [_richTextTypes.BLOCKS.QUOTE]: (node, children) => /*#__PURE__*/_react.default.createElement("blockquote", null, children),
       [_richTextTypes.BLOCKS.EMBEDDED_ASSET]: node => imageRender(node, locale),
-      [_richTextTypes.BLOCKS.EMBEDDED_ENTRY]: () => {
-        return null;
-      },
+      [_richTextTypes.BLOCKS.EMBEDDED_ENTRY]: () => null,
       [_richTextTypes.INLINES.EMBEDDED_ENTRY]: node => {
         const path = getFromSitemap(node);
         return path ? /*#__PURE__*/_react.default.createElement(_Box.default, {
@@ -146,15 +144,13 @@ const RichText = ({
       allSitePage {
         nodes {
           path
-          context {
-            contentful_id
-          }
+          pageContext
         }
       }
     }
   `);
   return /*#__PURE__*/_react.default.createElement("div", null, renderRichText(json, locale, data.allSitePage.nodes.reduce((acc, next, i) => {
-    acc[(0, _lodash.get)(next, 'context.contentful_id', i)] = next.path;
+    acc[(0, _lodash.get)(next, 'pageContext.contentful_id', i)] = next.path;
     return acc;
   }, {})));
 };

package/lib/components/SearchEngine.js

@@ -15,12 +15,12 @@ var _useSiteMetaData = _interopRequireDefault(require("./useSiteMetaData"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function SEO({
+const SEO = ({
   description,
   lang,
   meta,
   title
-}) {
+}) => {
   const site = (0, _useSiteMetaData.default)();
   const metaDescription = description || site.description;
   return /*#__PURE__*/_react.default.createElement(_reactHelmet.Helmet, {
@@ -52,7 +52,7 @@ function SEO({
       content: metaDescription
     }].concat(meta)
   });
-}
+};
 
 SEO.defaultProps = {
   lang: 'en',

package/lib/components/Wrapper.js

@@ -36,6 +36,25 @@ const setBaseUrlForRest = (baseURL = process.env.GATSBY_APP_BASE_URL || 'http://
   return _axios.default.defaults;
 };
 
+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
+};
+
 const Wrapper = ({
   children,
   baseURL,
@@ -43,10 +62,11 @@ const Wrapper = ({
   ...providerProps
 }) => {
   setBaseUrlForRest(baseURL);
-  registeri18ResourceBundles(locale);
-  return /*#__PURE__*/_react.default.createElement(_q3Ui.default, providerProps, /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, /*#__PURE__*/_react.default.createElement(_q3UiForms.default, {
+  return /*#__PURE__*/_react.default.createElement(_q3Ui.default, providerProps, /*#__PURE__*/_react.default.createElement(LocaleBundles, {
+    locale: locale
+  }, /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, /*#__PURE__*/_react.default.createElement(_q3UiForms.default, {
     preventDuplicate: true
-  }, children)));
+  }, children))));
 };
 
 Wrapper.defaultProps = {

package/lib/components/useLocale.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _i18next = _interopRequireDefault(require("i18next"));
+var _q3UiLocale = require("q3-ui-locale");
 
 var _q3UiPermissions = require("q3-ui-permissions");
 
@@ -23,7 +23,7 @@ const useLocale = () => {
   (0, _q3UiRest.useTimezoneInterceptor)(profile === null || profile === void 0 ? void 0 : profile.timezone);
 
   _react.default.useEffect(() => {
-    if (lng) _i18next.default.changeLanguage(lng);
+    if (lng && _q3UiLocale.i18n.resolvedLanguage) _q3UiLocale.i18n.changeLanguage(lng);
   }, [lng]);
 };
 

package/lib/components/withSuccessOp.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _reactI18next = require("react-i18next");
+var _q3UiLocale = require("q3-ui-locale");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -33,7 +33,7 @@ const withSuccessOp = (Component, msg) => {
     } = props;
     const {
       t
-    } = (0, _reactI18next.useTranslation)();
+    } = (0, _q3UiLocale.useTranslation)();
     return (0, _utils.hasOp)(search) ? /*#__PURE__*/_react.default.createElement(_FormBoxNotice.default, {
       title: msg,
       description: msg

package/lib/pages/login.js

@@ -11,7 +11,7 @@ var _gatsby = require("gatsby");
 
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 
-var _reactI18next = require("react-i18next");
+var _q3UiLocale = require("q3-ui-locale");
 
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
 
@@ -34,7 +34,7 @@ var _default = (0, _withAuthenticate.default)(({
 }) => {
   const {
     t
-  } = (0, _reactI18next.useTranslation)();
+  } = (0, _q3UiLocale.useTranslation)();
   return /*#__PURE__*/_react.default.createElement(_FormBox.default, {
     renderBottom: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_builders.Form, {
       onSubmit: authenticate

package/lib/pages/reverify.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _reactI18next = require("react-i18next");
+var _q3UiLocale = require("q3-ui-locale");
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -37,7 +37,7 @@ const Reverify = ({
 }) => {
   const {
     t
-  } = (0, _reactI18next.useTranslation)();
+  } = (0, _q3UiLocale.useTranslation)();
   if ((0, _utils.hasOp)(search)) return /*#__PURE__*/_react.default.createElement(_FormBoxNotice.default, {
     title: "reverified",
     description: "reverified"

package/package.json

@@ -1,60 +1,43 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "1.43.10",
+  "version": "2.1.0",
   "main": "index.js",
   "license": "MIT",
-  "bin": {
-    "q3": "./bin/deps-sync.js",
-    "material-deps": "./bin/peer-install.js"
-  },
   "peerDependencies": {
-    "@material-ui/core": "^4.10.0",
-    "@material-ui/icons": "^4.5.1",
-    "@material-ui/lab": "^4.0.0-alpha.54",
-    "@material-ui/styles": "^4.10.0"
+    "@material-ui/core": "^4.12.3",
+    "@material-ui/icons": "^4.11.2",
+    "@material-ui/lab": "^4.0.0-alpha.60",
+    "@material-ui/styles": "^4.11.4",
+    "@reach/router": "^1.3.4",
+    "gatsby": "^4.2.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "dependencies": {
     "@babel/plugin-proposal-export-default-from": "^7.16.0",
     "@contentful/gatsby-transformer-contentful-richtext": "^13.1.0",
-    "@contentful/rich-text-react-renderer": "^14.1.2",
-    "@contentful/rich-text-types": "^14.1.2",
-    "@reach/router": "^1.3.4",
+    "@contentful/rich-text-react-renderer": "^15.6.2",
+    "@contentful/rich-text-types": "^15.7.0",
     "add": "^2.0.6",
-    "babel-preset-gatsby": "^0.12.0",
-    "gatsby": "^2.27.5",
-    "gatsby-image": "^2.11.0",
-    "gatsby-link": "^2.6.1",
-    "gatsby-plugin-canonical-urls": "^2.10.0",
+    "gatsby-image": "^3.11.0",
+    "gatsby-plugin-canonical-urls": "^4.2.0",
     "gatsby-plugin-force-trailing-slashes": "^1.0.5",
-    "gatsby-plugin-manifest": "^2.12.0",
-    "gatsby-plugin-material-ui": "^2.1.9",
-    "gatsby-plugin-netlify": "^2.11.0",
-    "gatsby-plugin-offline": "^3.10.0",
-    "gatsby-plugin-polyfill-io": "^1.1.0",
-    "gatsby-plugin-react-helmet": "^3.10.0",
-    "gatsby-plugin-remove-trailing-slashes": "^2.10.0",
-    "gatsby-plugin-robots-txt": "^1.5.5",
-    "gatsby-plugin-sharp": "^2.14.0",
-    "gatsby-plugin-sitemap": "^2.12.0",
-    "gatsby-react-router-scroll": "^3.2.0",
-    "gatsby-source-contentful": "^4.6.0",
-    "gatsby-source-filesystem": "^2.11.0",
-    "gatsby-transformer-sharp": "^2.12.0",
+    "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-transformer-sharp": "^4.2.0",
     "lodash": "^4.17.20",
+    "process": "^0.11.10",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
-    "react": "^17.0.1",
     "react-share": "^4.3.1",
     "slugify": "^1.6.3",
-    "string-replace-webpack-plugin": "^0.1.3",
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "devDependencies": {
-    "child_process": "^1.0.2",
-    "find-yarn-workspace-root": "^2.0.0",
-    "fs": "^0.0.1-security",
-    "path": "^0.12.7"
-  },
-  "gitHead": "387498694663947f873bb1da86f94d78f9684c03"
+  "gitHead": "c98d520b4a2597acb71d87198c4e6af89473e2ce"
 }

package/src/components/FormBoxContent.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'q3-ui-locale';
 import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
 

package/src/components/RichText.jsx

@@ -119,9 +119,7 @@ export const renderRichText = (
       ),
       [BLOCKS.EMBEDDED_ASSET]: (node) =>
         imageRender(node, locale),
-      [BLOCKS.EMBEDDED_ENTRY]: () => {
-        return null;
-      },
+      [BLOCKS.EMBEDDED_ENTRY]: () => null,
       [INLINES.EMBEDDED_ENTRY]: (node) => {
         const path = getFromSitemap(node);
 
@@ -164,9 +162,7 @@ const RichText = ({ json, locale }) => {
       allSitePage {
         nodes {
           path
-          context {
-            contentful_id
-          }
+          pageContext
         }
       }
     }
@@ -178,7 +174,7 @@ const RichText = ({ json, locale }) => {
         json,
         locale,
         data.allSitePage.nodes.reduce((acc, next, i) => {
-          acc[get(next, 'context.contentful_id', i)] =
+          acc[get(next, 'pageContext.contentful_id', i)] =
             next.path;
           return acc;
         }, {}),
@@ -186,6 +182,7 @@ const RichText = ({ json, locale }) => {
     </div>
   );
 };
+
 RichText.propTypes = {
   // eslint-disable-next-line
   json: PropTypes.object,

package/src/components/SearchEngine.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Helmet } from 'react-helmet';
 import useSiteMetaData from './useSiteMetaData';
 
-function SEO({ description, lang, meta, title }) {
+const SEO = ({ description, lang, meta, title }) => {
   const site = useSiteMetaData();
   const metaDescription = description || site.description;
 
@@ -46,7 +46,7 @@ function SEO({ description, lang, meta, title }) {
       ].concat(meta)}
     />
   );
-}
+};
 
 SEO.defaultProps = {
   lang: 'en',

package/src/components/Wrapper.jsx

@@ -31,6 +31,23 @@ const setBaseUrlForRest = (
   return axios.defaults;
 };
 
+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,
+};
+
 const Wrapper = ({
   children,
   baseURL,
@@ -38,15 +55,16 @@ const Wrapper = ({
   ...providerProps
 }) => {
   setBaseUrlForRest(baseURL);
-  registeri18ResourceBundles(locale);
 
   return (
     <Provider {...providerProps}>
-      <AuthProvider>
-        <FormProviders preventDuplicate>
-          {children}
-        </FormProviders>
-      </AuthProvider>
+      <LocaleBundles locale={locale}>
+        <AuthProvider>
+          <FormProviders preventDuplicate>
+            {children}
+          </FormProviders>
+        </AuthProvider>
+      </LocaleBundles>
     </Provider>
   );
 };

package/src/components/useLocale.js

@@ -1,18 +1,19 @@
 import React from 'react';
-import i18n from 'i18next';
+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 profile =
+    React.useContext(AuthContext)?.state?.profile;
 
   const lng = profile?.lang;
 
   useTimezoneInterceptor(profile?.timezone);
 
   React.useEffect(() => {
-    if (lng) i18n.changeLanguage(lng);
+    if (lng && i18n.resolvedLanguage)
+      i18n.changeLanguage(lng);
   }, [lng]);
 };
 

package/src/components/withSuccessOp.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'q3-ui-locale';
 import PropTypes from 'prop-types';
 import { Link } from 'gatsby';
 import Button from '@material-ui/core/Button';

package/src/pages/login.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'gatsby';
 import MuiLink from '@material-ui/core/Button';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'q3-ui-locale';
 import Typography from '@material-ui/core/Typography';
 import Divider from '@material-ui/core/Divider';
 import Grid from '@material-ui/core/Grid';

package/src/pages/reverify.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'q3-ui-locale';
 import PropTypes from 'prop-types';
 import { Link } from 'gatsby';
 import axios from 'axios';

package/bin/deps-sync.js

@@ -1,60 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable import/no-unresolved */
-const path = require('path');
-const fs = require('fs');
-const { execSync } = require('child_process');
-
-const packages = [
-  'q3-admin',
-  'q3-blocks',
-  'q3-components',
-  'q3-ui',
-  'q3-ui-assets',
-  'q3-ui-datatables',
-  'q3-ui-dialog',
-  'q3-ui-exports',
-  'q3-ui-forms',
-  'q3-ui-helpers',
-  'q3-ui-locale',
-  'q3-ui-permissions',
-  'q3-ui-repeater',
-  'q3-ui-rest',
-  'q3-ui-test-utils',
-];
-
-const getPkgDeps = () => {
-  const pkg = fs.readFileSync(
-    path.resolve(process.cwd(), './package.json'),
-    'utf8',
-  );
-
-  return Object.keys(JSON.parse(pkg).dependencies);
-};
-
-const runYarnCmd = (cmd, deps = []) => {
-  if (Array.isArray(deps) && deps.length)
-    execSync(`yarn ${cmd} ${deps.join(' ')}`);
-};
-
-const determineYarnCmd = (deps = []) =>
-  packages.reduce(
-    (acc, next) => {
-      if (deps.includes(next)) {
-        acc.upgrade.push(next);
-      } else {
-        acc.install.push(next);
-      }
-
-      return acc;
-    },
-    {
-      install: [],
-      upgrade: [],
-    },
-  );
-
-const { install, upgrade } = determineYarnCmd(getPkgDeps());
-
-runYarnCmd('add', install);
-runYarnCmd('upgrade --latest', upgrade);

package/bin/peer-install.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable import/no-unresolved */
-const path = require('path');
-const fs = require('fs');
-
-const { merge } = require('lodash');
-const { execSync } = require('child_process');
-const fw = require('find-yarn-workspace-root');
-const packageJson = require('../package.json');
-
-const getWorkspacePeerDeps = () => {
-  const pkg = fs.readFileSync(
-    path.join(fw(process.cwd()), 'package.json'),
-    'utf8',
-  );
-
-  return JSON.parse(pkg).dependencies;
-};
-
-const getSupportedMuiVersions = (deps = []) =>
-  Object.entries(deps).reduce((acc, [key, value]) => {
-    if (key.startsWith('@material-ui')) {
-      Object.assign(acc, {
-        [key]: value,
-      });
-    }
-
-    return acc;
-  }, {});
-
-fs.writeFile(
-  path.resolve(__dirname, '../package.json'),
-  JSON.stringify(
-    merge({
-      ...packageJson,
-      peerDependencies: getSupportedMuiVersions(
-        getWorkspacePeerDeps(),
-      ),
-    }),
-  ),
-  (err) => {
-    // ensure differences are saved
-    if (!err) execSync('yarn install');
-  },
-);