@digigov/nextjs 1.0.0-266e80f3 → 1.0.0-3bfc7d37

package/App.js

@@ -2,13 +2,13 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -29,20 +29,28 @@ var _Link = require("@digigov/ui/navigation/Link");
 
 var _Link2 = _interopRequireDefault(require("@digigov/nextjs/Link"));
 
-var _App2 = _interopRequireWildcard(require("@digigov/ui/app/App"));
+var _dynamic = _interopRequireDefault(require("next/dynamic"));
 
 var _i18n = require("@digigov/ui/i18n");
 
 var _reactI18next = require("react-i18next");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2["default"])(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var DigiGOVApp = (0, _dynamic["default"])(function () {
+  return Promise.resolve().then(function () {
+    return _interopRequireWildcard(require('@digigov/ui/app/App'));
+  });
+}, {
+  ssr: false
+});
+
 var _ref = /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
   name: "viewport",
   content: "minimum-scale=1, initial-scale=1, width=device-width"
@@ -59,15 +67,35 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
   }
 
   (0, _createClass2["default"])(DigiGOVNextApp, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      // Remove the server-side injected CSS.
+      var jssStyles = document.querySelector('#jss-server-side');
+
+      if (jssStyles && jssStyles.parentElement) {
+        jssStyles.parentElement.removeChild(jssStyles);
+      }
+
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "updateHtmlLang",
+    value: function updateHtmlLang() {
+      document.documentElement.lang = this.props.i18n.language;
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
           Component = _this$props.Component,
           pageProps = _this$props.pageProps,
           _t = _this$props.t,
-          i18n = _this$props.i18n,
-          _this$props$ssr = _this$props.ssr,
-          ssr = _this$props$ssr === void 0 ? false : _this$props$ssr;
+          i18n = _this$props.i18n;
       return /*#__PURE__*/_react["default"].createElement(_i18n.I18NProvider, {
         t: function t(str) {
           return typeof str === 'string' ? _t(str) : str;
@@ -75,7 +103,7 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
         i18n: i18n
       }, /*#__PURE__*/_react["default"].createElement(_Link.LinkProvider, {
         component: _Link2["default"]
-      }, _ref, ssr ? /*#__PURE__*/_react["default"].createElement(_App2["default"], null, /*#__PURE__*/_react["default"].createElement(Component, pageProps)) : /*#__PURE__*/_react["default"].createElement(_App2.StaticApp, null, /*#__PURE__*/_react["default"].createElement(Component, pageProps))));
+      }, _ref, /*#__PURE__*/_react["default"].createElement(DigiGOVApp, null, /*#__PURE__*/_react["default"].createElement(Component, pageProps))));
     }
   }]);
   return DigiGOVNextApp;

package/es/App.js

@@ -13,9 +13,14 @@ import App from 'next/app';
 import Head from 'next/head';
 import { LinkProvider } from '@digigov/ui/navigation/Link';
 import NextLink from '@digigov/nextjs/Link';
-import DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';
+import dynamic from 'next/dynamic';
 import { I18NProvider } from '@digigov/ui/i18n';
 import { withTranslation } from 'react-i18next';
+var DigiGOVApp = dynamic(function () {
+  return import('@digigov/ui/app/App');
+}, {
+  ssr: false
+});
 
 var _ref = /*#__PURE__*/React.createElement(Head, null, /*#__PURE__*/React.createElement("meta", {
   name: "viewport",
@@ -34,15 +39,35 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
   }
 
   _createClass(DigiGOVNextApp, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      // Remove the server-side injected CSS.
+      var jssStyles = document.querySelector('#jss-server-side');
+
+      if (jssStyles && jssStyles.parentElement) {
+        jssStyles.parentElement.removeChild(jssStyles);
+      }
+
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "updateHtmlLang",
+    value: function updateHtmlLang() {
+      document.documentElement.lang = this.props.i18n.language;
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
           Component = _this$props.Component,
           pageProps = _this$props.pageProps,
           _t = _this$props.t,
-          i18n = _this$props.i18n,
-          _this$props$ssr = _this$props.ssr,
-          ssr = _this$props$ssr === void 0 ? false : _this$props$ssr;
+          i18n = _this$props.i18n;
       return /*#__PURE__*/React.createElement(I18NProvider, {
         t: function t(str) {
           return typeof str === 'string' ? _t(str) : str;
@@ -50,7 +75,7 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
         i18n: i18n
       }, /*#__PURE__*/React.createElement(LinkProvider, {
         component: NextLink
-      }, _ref, ssr ? /*#__PURE__*/React.createElement(DigiGOVApp, null, /*#__PURE__*/React.createElement(Component, pageProps)) : /*#__PURE__*/React.createElement(StaticApp, null, /*#__PURE__*/React.createElement(Component, pageProps))));
+      }, _ref, /*#__PURE__*/React.createElement(DigiGOVApp, null, /*#__PURE__*/React.createElement(Component, pageProps))));
     }
   }]);
 

package/esm/App.js

@@ -13,9 +13,14 @@ import App from 'next/app';
 import Head from 'next/head';
 import { LinkProvider } from '@digigov/ui/navigation/Link';
 import NextLink from '@digigov/nextjs/Link';
-import DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';
+import dynamic from 'next/dynamic';
 import { I18NProvider } from '@digigov/ui/i18n';
 import { withTranslation } from 'react-i18next';
+var DigiGOVApp = dynamic(function () {
+  return import('@digigov/ui/app/App');
+}, {
+  ssr: false
+});
 
 var _ref = /*#__PURE__*/React.createElement(Head, null, /*#__PURE__*/React.createElement("meta", {
   name: "viewport",
@@ -34,15 +39,35 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
   }
 
   _createClass(DigiGOVNextApp, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      // Remove the server-side injected CSS.
+      var jssStyles = document.querySelector('#jss-server-side');
+
+      if (jssStyles && jssStyles.parentElement) {
+        jssStyles.parentElement.removeChild(jssStyles);
+      }
+
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      this.updateHtmlLang();
+    }
+  }, {
+    key: "updateHtmlLang",
+    value: function updateHtmlLang() {
+      document.documentElement.lang = this.props.i18n.language;
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
           Component = _this$props.Component,
           pageProps = _this$props.pageProps,
           _t = _this$props.t,
-          i18n = _this$props.i18n,
-          _this$props$ssr = _this$props.ssr,
-          ssr = _this$props$ssr === void 0 ? false : _this$props$ssr;
+          i18n = _this$props.i18n;
       return /*#__PURE__*/React.createElement(I18NProvider, {
         t: function t(str) {
           return typeof str === 'string' ? _t(str) : str;
@@ -50,7 +75,7 @@ var DigiGOVNextApp = /*#__PURE__*/function (_App) {
         i18n: i18n
       }, /*#__PURE__*/React.createElement(LinkProvider, {
         component: NextLink
-      }, _ref, ssr ? /*#__PURE__*/React.createElement(DigiGOVApp, null, /*#__PURE__*/React.createElement(Component, pageProps)) : /*#__PURE__*/React.createElement(StaticApp, null, /*#__PURE__*/React.createElement(Component, pageProps))));
+      }, _ref, /*#__PURE__*/React.createElement(DigiGOVApp, null, /*#__PURE__*/React.createElement(Component, pageProps))));
     }
   }]);
 

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v1.0.0-266e80f3
+/** @license Digigov v1.0.0-3bfc7d37
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.

package/libs/nextjs/src/App.d.ts

@@ -1,12 +1,11 @@
 import React from 'react';
 import type { AppProps } from '@digigov/ui/app/App';
 import { WithTranslation } from 'react-i18next';
-import { i18n, TFunction } from 'i18next';
+import { i18n } from 'i18next';
 export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
     children?: React.ReactNode;
-    t: TFunction;
+    t: (string: any) => string;
     i18n: i18n;
-    ssr: boolean;
 }
 declare const DigiGOVNextAppWithTranslation: React.ComponentType<import("react-i18next").Omit<DigiGOVNextAppProps & import("next/app").AppInitialProps & {
     Component: import("next").NextComponentType<import("next").NextPageContext, any, {}>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@digigov/nextjs",
-	"version": "1.0.0-266e80f3",
+	"version": "1.0.0-3bfc7d37",
 	"description": "next specific utilities for @digigov apps",
 	"author": "GRNET Developers <devs@lists.grnet.gr>",
 	"license": "BSD-2-Clause",
@@ -10,7 +10,7 @@
 		"main": "dist/index.js"
 	},
 	"peerDependencies": {
-		"@digigov/ui": "1.0.0-266e80f3",
+		"@digigov/ui": "1.0.0-3bfc7d37",
 		"@material-ui/core": "4.11.3",
 		"@material-ui/icons": "4.11.2",
 		"clsx": "1.1.1",

package/src/App.tsx

@@ -3,21 +3,40 @@ import App from 'next/app';
 import Head from 'next/head';
 import { LinkProvider } from '@digigov/ui/navigation/Link';
 import NextLink from '@digigov/nextjs/Link';
-import DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';
+import dynamic from 'next/dynamic';
 import type { AppProps } from '@digigov/ui/app/App';
 import { I18NProvider } from '@digigov/ui/i18n';
 import { withTranslation, WithTranslation } from 'react-i18next';
-import { i18n, TFunction } from 'i18next';
+import { i18n } from 'i18next';
 
+const DigiGOVApp = dynamic(() => import('@digigov/ui/app/App'), {
+  ssr: false,
+}) as React.FC<AppProps>;
 export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
   children?: React.ReactNode;
-  t: TFunction;
+  t: (string) => string;
   i18n: i18n;
-  ssr: boolean;
 }
 class DigiGOVNextApp extends App<DigiGOVNextAppProps> {
+  componentDidMount(): void {
+    // Remove the server-side injected CSS.
+    const jssStyles = document.querySelector('#jss-server-side');
+    if (jssStyles && jssStyles.parentElement) {
+      jssStyles.parentElement.removeChild(jssStyles);
+    }
+    this.updateHtmlLang();
+  }
+
+  componentDidUpdate(): void {
+    this.updateHtmlLang();
+  }
+
+  updateHtmlLang(): void {
+    document.documentElement.lang = this.props.i18n.language;
+  }
+
   render(): React.ReactElement {
-    const { Component, pageProps, t, i18n, ssr = false } = this.props;
+    const { Component, pageProps, t, i18n } = this.props;
     return (
       <I18NProvider
         t={(str) => (typeof str === 'string' ? t(str) : str)}
@@ -30,16 +49,9 @@ class DigiGOVNextApp extends App<DigiGOVNextAppProps> {
               content="minimum-scale=1, initial-scale=1, width=device-width"
             />
           </Head>
-          {
-            ssr ?
-              <DigiGOVApp>
-                <Component {...pageProps} />
-              </DigiGOVApp>
-              : <StaticApp>
-                <Component {...pageProps} />
-              </StaticApp>
-
-          }
+          <DigiGOVApp>
+            <Component {...pageProps} />
+          </DigiGOVApp>
         </LinkProvider>
       </I18NProvider>
     );