gatsby-theme-q3 2.2.2 → 2.3.4

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.4](https://github.com/3merge/q/compare/v2.3.3...v2.3.4) (2021-12-10)
+
+
+### Bug Fixes
+
+* notistack ([4e40fa1](https://github.com/3merge/q/commit/4e40fa10a8c05ad07978b0f9dfcdb9317f67e712))
+
+
+
+
+
+## [2.3.2](https://github.com/3merge/q/compare/v2.3.1...v2.3.2) (2021-12-09)
+
+**Note:** Version bump only for package gatsby-theme-q3
+
+
+
+
+
+## [2.3.1](https://github.com/3merge/q/compare/v2.3.0...v2.3.1) (2021-12-09)
+
+
+### Bug Fixes
+
+* forward all config ([c4c512d](https://github.com/3merge/q/commit/c4c512da530866327940d56dba3976764cf53293))
+
+
+
+
+
+# [2.3.0](https://github.com/3merge/q/compare/v2.2.2...v2.3.0) (2021-12-09)
+
+
+### Features
+
+* theme for prevent unstyled load ([#361](https://github.com/3merge/q/issues/361)) ([a1f1535](https://github.com/3merge/q/commit/a1f15358262b40829d3e1312864a1c0d08c778dc))
+
+
+
+
+
 ## [2.2.2](https://github.com/3merge/q/compare/v2.2.1...v2.2.2) (2021-12-09)
 
 **Note:** Version bump only for package gatsby-theme-q3

package/gatsby-config.js

@@ -12,12 +12,12 @@ module.exports = ({
   brandingColor,
   icon,
   netlify,
+  ...options
 }) => {
   const plugins = [
     {
-      resolve: require.resolve(
-        './src/plugins/gatsby-local-top-layout',
-      ),
+      resolve: 'gatsby-theme-q3-mui',
+      options,
     },
     'gatsby-plugin-material-ui',
     'gatsby-plugin-force-trailing-slashes',

package/lib/components/LocaleBundles.js

@@ -0,0 +1,42 @@
+"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/Wrapper.js

@@ -11,10 +11,10 @@ var _axios = _interopRequireDefault(require("axios"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _q3UiForms = _interopRequireDefault(require("q3-ui-forms"));
-
 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 */
@@ -24,13 +24,14 @@ const setBaseUrlForRest = (baseURL = process.env.GATSBY_APP_BASE_URL || 'http://
 };
 
 const Wrapper = ({
+  baseURL,
   children,
-  baseURL
+  locale
 }) => {
   setBaseUrlForRest(baseURL);
-  return /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, /*#__PURE__*/_react.default.createElement(_q3UiForms.default, {
-    preventDuplicate: true
-  }, children));
+  return /*#__PURE__*/_react.default.createElement(_LocaleBundles.default, {
+    locale: locale
+  }, /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, children));
 };
 
 Wrapper.defaultProps = {
@@ -38,7 +39,9 @@ Wrapper.defaultProps = {
 };
 Wrapper.propTypes = {
   baseURL: _propTypes.default.string,
-  children: _propTypes.default.node.isRequired
+  children: _propTypes.default.node.isRequired,
+  // eslint-disable-next-line
+  locale: _propTypes.default.object.isRequired
 };
 var _default = Wrapper;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "2.2.2",
+  "version": "2.3.4",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {
@@ -29,15 +29,17 @@
     "gatsby-plugin-sharp": "^4.2.0",
     "gatsby-plugin-sitemap": "^5.2.0",
     "gatsby-source-contentful": "^7.0.0",
+    "gatsby-theme-q3-mui": "^2.3.4",
     "gatsby-transformer-sharp": "^4.2.0",
     "lodash": "^4.17.20",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
+    "q3-ui-locale": "^2.3.2",
     "query-string": "^7.0.1",
     "react-share": "^4.3.1",
     "slugify": "^1.6.3",
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "gitHead": "57057a3cc44effedb0abd4635d3aee6f1eaf866c"
+  "gitHead": "93a43d911ce0af48809ba3142404363c70932573"
 }

package/src/components/LocaleBundles.jsx

@@ -0,0 +1,37 @@
+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/Wrapper.jsx

@@ -2,8 +2,8 @@
 import React from 'react';
 import axios from 'axios';
 import PropTypes from 'prop-types';
-import FormProviders from 'q3-ui-forms';
 import AuthProvider from 'q3-ui-permissions';
+import LocaleBundles from './LocaleBundles';
 
 const setBaseUrlForRest = (
   baseURL = process.env.GATSBY_APP_BASE_URL ||
@@ -13,15 +13,13 @@ const setBaseUrlForRest = (
   return axios.defaults;
 };
 
-const Wrapper = ({ children, baseURL }) => {
+const Wrapper = ({ baseURL, children, locale }) => {
   setBaseUrlForRest(baseURL);
 
   return (
-    <AuthProvider>
-      <FormProviders preventDuplicate>
-        {children}
-      </FormProviders>
-    </AuthProvider>
+    <LocaleBundles locale={locale}>
+      <AuthProvider>{children}</AuthProvider>
+    </LocaleBundles>
   );
 };
 
@@ -32,6 +30,9 @@ Wrapper.defaultProps = {
 Wrapper.propTypes = {
   baseURL: PropTypes.string,
   children: PropTypes.node.isRequired,
+
+  // eslint-disable-next-line
+  locale: PropTypes.object.isRequired,
 };
 
 export default Wrapper;

package/lib/plugins/gatsby-local-top-layout/gatsby-browser.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "wrapRootElement", {
-  enumerable: true,
-  get: function () {
-    return _gatsbySsr.wrapRootElement;
-  }
-});
-
-var _gatsbySsr = require("./gatsby-ssr");

package/lib/plugins/gatsby-local-top-layout/gatsby-ssr.js

@@ -1,72 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.wrapRootElement = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _q3Ui = _interopRequireDefault(require("q3-ui"));
-
-var _q3UiLocale = require("q3-ui-locale");
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint-disable import/prefer-default-export, import/no-extraneous-dependencies, react/prop-types, react/jsx-filename-extension */
-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
-};
-
-const Wrapper = ({
-  children,
-  locale,
-  ...providerProps
-}) => /*#__PURE__*/_react.default.createElement(_q3Ui.default, providerProps, /*#__PURE__*/_react.default.createElement(LocaleBundles, {
-  locale: locale
-}, children));
-
-Wrapper.propTypes = {
-  children: _propTypes.default.node.isRequired,
-  // eslint-disable-next-line
-  locale: _propTypes.default.object.isRequired,
-  // eslint-disable-next-line
-  theme: _propTypes.default.object.isRequired
-};
-
-const wrapRootElement = ({
-  element
-}, {
-  locale,
-  ...providerProps
-}) => /*#__PURE__*/_react.default.createElement(_q3Ui.default, providerProps, /*#__PURE__*/_react.default.createElement(LocaleBundles, {
-  locale: locale
-}, element));
-
-exports.wrapRootElement = wrapRootElement;

package/lib/plugins/gatsby-local-top-layout/index.js

@@ -1,2 +0,0 @@
-// noop
-"use strict";

package/lib/plugins/gatsby-local-top-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "gatsby-local-top-layout",
-  "private": true,
-  "main": "index.js"
-}

package/src/plugins/gatsby-local-top-layout/gatsby-browser.js

@@ -1 +0,0 @@
-export { wrapRootElement } from './gatsby-ssr';

package/src/plugins/gatsby-local-top-layout/gatsby-ssr.js

@@ -1,67 +0,0 @@
-/* eslint-disable import/prefer-default-export, import/no-extraneous-dependencies, react/prop-types, react/jsx-filename-extension */
-import React from 'react';
-import Provider from 'q3-ui';
-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,
-};
-
-const Wrapper = ({
-  children,
-  locale,
-  ...providerProps
-}) => (
-  <Provider {...providerProps}>
-    <LocaleBundles locale={locale}>
-      {children}
-    </LocaleBundles>
-  </Provider>
-);
-
-Wrapper.propTypes = {
-  children: PropTypes.node.isRequired,
-  // eslint-disable-next-line
-  locale: PropTypes.object.isRequired,
-  // eslint-disable-next-line
-  theme: PropTypes.object.isRequired,
-};
-
-export const wrapRootElement = (
-  { element },
-  { locale, ...providerProps },
-) => (
-  <Provider {...providerProps}>
-    <LocaleBundles locale={locale}>{element}</LocaleBundles>
-  </Provider>
-);

package/src/plugins/gatsby-local-top-layout/index.js

@@ -1 +0,0 @@
-// noop

package/src/plugins/gatsby-local-top-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "gatsby-local-top-layout",
-  "private": true,
-  "main": "index.js"
-}