gatsby-theme-q3 2.1.1 → 2.2.2

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
+
+
+
+
 ## [2.1.1](https://github.com/3merge/q/compare/v2.1.0...v2.1.1) (2021-11-29)
 
 

package/gatsby-config.js

@@ -14,10 +14,21 @@ module.exports = ({
   netlify,
 }) => {
   const plugins = [
+    {
+      resolve: require.resolve(
+        './src/plugins/gatsby-local-top-layout',
+      ),
+    },
     'gatsby-plugin-material-ui',
     'gatsby-plugin-force-trailing-slashes',
     'gatsby-plugin-sitemap',
-    'gatsby-transformer-sharp',
+    {
+      resolve: 'gatsby-transformer-sharp',
+      options: {
+        // The option defaults to true
+        checkSupportedExtensions: true,
+      },
+    },
     'gatsby-plugin-sharp',
     {
       resolve: 'gatsby-plugin-robots-txt',

package/lib/components/Wrapper.js

@@ -7,12 +7,8 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _q3Ui = _interopRequireDefault(require("q3-ui"));
-
 var _axios = _interopRequireDefault(require("axios"));
 
-var _q3UiLocale = require("q3-ui-locale");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _q3UiForms = _interopRequireDefault(require("q3-ui-forms"));
@@ -21,52 +17,20 @@ var _q3UiPermissions = _interopRequireDefault(require("q3-ui-permissions"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// eslint-disable-next-line
-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);
-    });
-  });
-};
-
+/* eslint-disable import/no-extraneous-dependencies */
 const setBaseUrlForRest = (baseURL = process.env.GATSBY_APP_BASE_URL || 'http://localhost:9000') => {
   _axios.default.defaults.baseURL = baseURL;
   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,
-  locale,
-  ...providerProps
+  baseURL
 }) => {
   setBaseUrlForRest(baseURL);
-  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, {
+  return /*#__PURE__*/_react.default.createElement(_q3UiPermissions.default, null, /*#__PURE__*/_react.default.createElement(_q3UiForms.default, {
     preventDuplicate: true
-  }, children))));
+  }, children));
 };
 
 Wrapper.defaultProps = {
@@ -74,11 +38,7 @@ Wrapper.defaultProps = {
 };
 Wrapper.propTypes = {
   baseURL: _propTypes.default.string,
-  children: _propTypes.default.node.isRequired,
-  // eslint-disable-next-line
-  locale: _propTypes.default.object.isRequired,
-  // eslint-disable-next-line
-  theme: _propTypes.default.object.isRequired
+  children: _propTypes.default.node.isRequired
 };
 var _default = Wrapper;
 exports.default = _default;

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

@@ -0,0 +1,13 @@
+"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

@@ -0,0 +1,72 @@
+"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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-q3",
-  "version": "2.1.1",
+  "version": "2.2.2",
   "main": "index.js",
   "license": "MIT",
   "peerDependencies": {
@@ -39,5 +39,5 @@
     "transform-loader": "^0.2.4",
     "yarn": "^1.22.17"
   },
-  "gitHead": "8d369ec6872586ee34c2fd7858ede52bdf286352"
+  "gitHead": "57057a3cc44effedb0abd4635d3aee6f1eaf866c"
 }

package/src/components/Wrapper.jsx

@@ -1,28 +1,10 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import React from 'react';
-import Provider from 'q3-ui';
-// eslint-disable-next-line
 import axios from 'axios';
-import { i18n } from 'q3-ui-locale';
 import PropTypes from 'prop-types';
 import FormProviders from 'q3-ui-forms';
 import AuthProvider from 'q3-ui-permissions';
 
-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 setBaseUrlForRest = (
   baseURL = process.env.GATSBY_APP_BASE_URL ||
     'http://localhost:9000',
@@ -31,41 +13,15 @@ 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,
-  locale,
-  ...providerProps
-}) => {
+const Wrapper = ({ children, baseURL }) => {
   setBaseUrlForRest(baseURL);
 
   return (
-    <Provider {...providerProps}>
-      <LocaleBundles locale={locale}>
-        <AuthProvider>
-          <FormProviders preventDuplicate>
-            {children}
-          </FormProviders>
-        </AuthProvider>
-      </LocaleBundles>
-    </Provider>
+    <AuthProvider>
+      <FormProviders preventDuplicate>
+        {children}
+      </FormProviders>
+    </AuthProvider>
   );
 };
 
@@ -76,12 +32,6 @@ Wrapper.defaultProps = {
 Wrapper.propTypes = {
   baseURL: PropTypes.string,
   children: PropTypes.node.isRequired,
-
-  // eslint-disable-next-line
-  locale: PropTypes.object.isRequired,
-
-  // eslint-disable-next-line
-  theme: PropTypes.object.isRequired,
 };
 
 export default Wrapper;

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

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

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

@@ -0,0 +1,67 @@
+/* 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

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

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

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