Open platform to collect and prioritize feedback
tooling: replace react-loadable with react lazy (#646)
Guilherme Oenningb7d3c09be512
diff --git a/package-lock.json b/package-lock.jsonindex 81c2224a1..67fc747e0 100644--- a/package-lock.json+++ b/package-lock.json@@ -152,16 +152,6 @@"@types/react": "*"}},- "@types/react-loadable": {- "version": "5.4.1",- "resolved": "https://registry.npmjs.org/@types/react-loadable/-/react-loadable-5.4.1.tgz",- "integrity": "sha512-nBvsWjPfBHepN5LoK/wgaunZSK9LmkKsPYum+/QrEKzUAb1yoe1/dwqTH6ZrinHDjru9LgjvXOqek9hvbq4Skw==",- "dev": true,- "requires": {- "@types/react": "*",- "@types/webpack": "*"- }- },"@types/react-textarea-autosize": {"version": "4.3.3","resolved": "https://registry.npmjs.org/@types/react-textarea-autosize/-/react-textarea-autosize-4.3.3.tgz",@@ -171,39 +161,12 @@"@types/react": "*"}},- "@types/tapable": {- "version": "1.0.4",- "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz",- "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==",- "dev": true- },"@types/tough-cookie": {"version": "2.3.4","resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.4.tgz","integrity": "sha512-Set5ZdrAaKI/qHdFlVMgm/GsAv/wkXhSTuZFkJ+JI7HK+wIkIlOaUXSXieIvJ0+OvGIqtREFoE+NHJtEq0gtEw==","dev": true},- "@types/uglify-js": {- "version": "3.0.4",- "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz",- "integrity": "sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ==",- "dev": true,- "requires": {- "source-map": "^0.6.1"- }- },- "@types/webpack": {- "version": "4.4.18",- "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.18.tgz",- "integrity": "sha512-BWm0KlzpZnKcnnuhcIxiGnBSgkOy9A2XpQTRYf5qZ1y2P2moLJ6jz+/smK/k3oT6vAVslBKVJAaOHE60sDvvjA==",- "dev": true,- "requires": {- "@types/node": "*",- "@types/tapable": "*",- "@types/uglify-js": "*",- "source-map": "^0.6.0"- }- },"@webassemblyjs/ast": {"version": "1.7.11","resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",@@ -7921,14 +7884,6 @@"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz","integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="},- "react-loadable": {- "version": "5.5.0",- "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz",- "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==",- "requires": {- "prop-types": "^15.5.0"- }- },"react-test-renderer": {"version": "16.6.1","resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.6.1.tgz",diff --git a/package.json b/package.jsonindex 6ef22a121..64031071d 100644--- a/package.json+++ b/package.json@@ -8,7 +8,6 @@"react": "16.6.3","react-dom": "16.6.3","react-icons": "3.2.2",- "react-loadable": "5.5.0","react-textarea-autosize": "7.0.4","react-toastify": "4.4.3","tslib": "1.9.3"@@ -23,7 +22,6 @@"@types/puppeteer": "1.10.0","@types/react": "16.7.4","@types/react-dom": "16.0.9",- "@types/react-loadable": "5.4.1","@types/react-textarea-autosize": "4.3.3","css-loader": "1.0.1","dotenv": "6.1.0",diff --git a/public/AsyncPages.tsx b/public/AsyncPages.tsxindex 2993bd9bb..6037216de 100644--- a/public/AsyncPages.tsx+++ b/public/AsyncPages.tsx@@ -1,146 +1,39 @@-import React from "react";-import Loadable from "react-loadable";+import { lazy } from "react";-import { Loader } from "@fider/components/common/Loader";+export const AsyncHomePage = lazy(() => import("@fider/pages/Home/Home.page"));-const Loading = () => (- <div className="page">- <Loader />- </div>+export const AsyncShowPostPage = lazy(() => import("@fider/pages/ShowPost/ShowPost.page"));++export const AsyncManageMembersPage = lazy(() => import("@fider/pages/Administration/pages/ManageMembers.page"));++export const AsyncManageTagsPage = lazy(() => import("@fider/pages/Administration/pages/ManageTags.page"));++export const AsyncPrivacySettingsPage = lazy(() => import("@fider/pages/Administration/pages/PrivacySettings.page"));++export const AsyncExportPage = lazy(() => import("@fider/pages/Administration/pages/Export.page"));++export const AsyncInvitationsPage = lazy(() => import("@fider/pages/Administration/pages/Invitations.page"));++export const AsyncManageAuthenticationPage = lazy(() =>+ import("@fider/pages/Administration/pages/ManageAuthentication.page"));-export const AsyncHomePage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Home/Home.page");- return module.HomePage;- },- loading: () => <Loading />-});--export const AsyncShowPostPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/ShowPost/ShowPost.page");- return module.ShowPostPage;- },- loading: () => <Loading />-});--export const AsyncManageMembersPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/ManageMembers.page");- return module.ManageMembersPage;- },- loading: () => <Loading />-});--export const AsyncManageTagsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/ManageTags.page");- return module.ManageTagsPage;- },- loading: () => <Loading />-});--export const AsyncPrivacySettingsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/PrivacySettings.page");- return module.PrivacySettingsPage;- },- loading: () => <Loading />-});--export const AsyncExportPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/Export.page");- return module.ExportPage;- },- loading: () => <Loading />-});--export const AsyncInvitationsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/Invitations.page");- return module.InvitationsPage;- },- loading: () => <Loading />-});--export const AsyncManageAuthenticationPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/ManageAuthentication.page");- return module.ManageAuthenticationPage;- },- loading: () => <Loading />-});--export const AsyncAdvancedSettingsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/AdvancedSettings.page");- return module.AdvancedSettingsPage;- },- loading: () => <Loading />-});--export const AsyncGeneralSettingsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/Administration/pages/GeneralSettings.page");- return module.GeneralSettingsPage;- },- loading: () => <Loading />-});--export const AsyncSignInPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/SignIn/SignIn.page");- return module.SignInPage;- },- loading: () => <Loading />-});--export const AsyncSignUpPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/SignUp/SignUp.page");- return module.SignUpPage;- },- loading: () => <Loading />-});--export const AsyncCompleteSignInProfilePage = Loadable({- loader: async () => {- const module = await import("@fider/pages/CompleteSignInProfile/CompleteSignInProfile.page");- return module.CompleteSignInProfilePage;- },- loading: () => <Loading />-});--export const AsyncMyNotificationsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/MyNotifications/MyNotifications.page");- return module.MyNotificationsPage;- },- loading: () => <Loading />-});--export const AsyncMySettingsPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/MySettings/MySettings.page");- return module.MySettingsPage;- },- loading: () => <Loading />-});--export const AsyncOAuthEchoPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/OAuthEcho/OAuthEcho.page");- return module.OAuthEchoPage;- },- loading: () => <Loading />-});--export const AsyncUIToolkitPage = Loadable({- loader: async () => {- const module = await import("@fider/pages/UI/UIToolkit.page");- return module.UIToolkitPage;- },- loading: () => <Loading />-});+export const AsyncAdvancedSettingsPage = lazy(() => import("@fider/pages/Administration/pages/AdvancedSettings.page"));++export const AsyncGeneralSettingsPage = lazy(() => import("@fider/pages/Administration/pages/GeneralSettings.page"));++export const AsyncSignInPage = lazy(() => import("@fider/pages/SignIn/SignIn.page"));++export const AsyncSignUpPage = lazy(() => import("@fider/pages/SignUp/SignUp.page"));++export const AsyncCompleteSignInProfilePage = lazy(() =>+ import("@fider/pages/CompleteSignInProfile/CompleteSignInProfile.page")+);++export const AsyncMyNotificationsPage = lazy(() => import("@fider/pages/MyNotifications/MyNotifications.page"));++export const AsyncMySettingsPage = lazy(() => import("@fider/pages/MySettings/MySettings.page"));++export const AsyncOAuthEchoPage = lazy(() => import("@fider/pages/OAuthEcho/OAuthEcho.page"));++export const AsyncUIToolkitPage = lazy(() => import("@fider/pages/UI/UIToolkit.page"));diff --git a/public/index.tsx b/public/index.tsxindex 2c3fc28a2..a4c35bf5c 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -1,11 +1,17 @@-import React from "react";+import React, { Suspense } from "react";import ReactDOM from "react-dom";import { resolveRootComponent } from "@fider/router";-import { Header, Footer } from "@fider/components/common";+import { Header, Footer, Loader } from "@fider/components/common";import { ErrorBoundary } from "@fider/components";import { classSet, Fider, actions, navigator } from "@fider/services";import { IconContext } from "react-icons";+const Loading = () => (+ <div className="page">+ <Loader />+ </div>+);+import "@fider/assets/styles/main.scss";const logProductionError = (err: Error) => {@@ -51,7 +57,7 @@ window.addEventListener("error", (evt: ErrorEvent) => {<ErrorBoundary onError={logProductionError}><IconContext.Provider value={{ className: "icon" }}>{config.showHeader && <Header />}- {React.createElement(config.component, fider.session.props)}+ <Suspense fallback={<Loading />}>{React.createElement(config.component, fider.session.props)}</Suspense>{config.showHeader && <Footer />}</IconContext.Provider></ErrorBoundary>,diff --git a/public/pages/Administration/pages/AdvancedSettings.page.tsx b/public/pages/Administration/pages/AdvancedSettings.page.tsxindex 814dac461..1a91e6dfc 100644--- a/public/pages/Administration/pages/AdvancedSettings.page.tsx+++ b/public/pages/Administration/pages/AdvancedSettings.page.tsx@@ -16,7 +16,7 @@ interface AdvancedSettingsPageState {error?: Failure;}-export class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPageProps, AdvancedSettingsPageState> {+export default class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPageProps, AdvancedSettingsPageState> {public id = "p-admin-advanced";public name = "advanced";public icon = FaStar;diff --git a/public/pages/Administration/pages/Export.page.tsx b/public/pages/Administration/pages/Export.page.tsxindex 96f58d902..c34363e4f 100644--- a/public/pages/Administration/pages/Export.page.tsx+++ b/public/pages/Administration/pages/Export.page.tsx@@ -4,7 +4,7 @@ import { Button, Form, Field } from "@fider/components";import { FaRegFileExcel } from "react-icons/fa";import { AdminBasePage } from "../components/AdminBasePage";-export class ExportPage extends AdminBasePage<{}, {}> {+export default class ExportPage extends AdminBasePage<{}, {}> {public id = "p-admin-export";public name = "export";public icon = FaRegFileExcel;diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsxindex 47199842a..3189340dd 100644--- a/public/pages/Administration/pages/GeneralSettings.page.tsx+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx@@ -29,7 +29,7 @@ interface GeneralSettingsPageState {error?: Failure;}-export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps, GeneralSettingsPageState> {+export default class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps, GeneralSettingsPageState> {private fileSelector?: HTMLInputElement | null;public id = "p-admin-general";diff --git a/public/pages/Administration/pages/Invitations.page.tsx b/public/pages/Administration/pages/Invitations.page.tsxindex 63b8b9ada..6297202e4 100644--- a/public/pages/Administration/pages/Invitations.page.tsx+++ b/public/pages/Administration/pages/Invitations.page.tsx@@ -14,7 +14,7 @@ interface InvitationsPageState {error?: Failure;}-export class InvitationsPage extends AdminBasePage<{}, InvitationsPageState> {+export default class InvitationsPage extends AdminBasePage<{}, InvitationsPageState> {public id = "p-admin-invitations";public name = "invitations";public icon = FaEnvelope;diff --git a/public/pages/Administration/pages/ManageAuthentication.page.tsx b/public/pages/Administration/pages/ManageAuthentication.page.tsxindex 8e71e4b80..18c3709cc 100644--- a/public/pages/Administration/pages/ManageAuthentication.page.tsx+++ b/public/pages/Administration/pages/ManageAuthentication.page.tsx@@ -18,7 +18,7 @@ interface ManageAuthenticationPageState {editing?: OAuthConfig;}-export class ManageAuthenticationPage extends AdminBasePage<+export default class ManageAuthenticationPage extends AdminBasePage<ManageAuthenticationPageProps,ManageAuthenticationPageState> {diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex 6d968c1bd..f7ec11d75 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -66,7 +66,7 @@ const UserListItem = (props: UserListItemProps) => {);};-export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, ManageMembersPageState> {+export default class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, ManageMembersPageState> {public id = "p-admin-members";public name = "members";public icon = FaUsers;diff --git a/public/pages/Administration/pages/ManageTags.page.tsx b/public/pages/Administration/pages/ManageTags.page.tsxindex afd60f515..f306da692 100644--- a/public/pages/Administration/pages/ManageTags.page.tsx+++ b/public/pages/Administration/pages/ManageTags.page.tsx@@ -30,7 +30,7 @@ const tagSorter = (t1: Tag, t2: Tag) => {return 0;};-export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTagsPageState> {+export default class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTagsPageState> {public id = "p-admin-tags";public name = "tags";public icon = FaTags;diff --git a/public/pages/Administration/pages/PrivacySettings.page.tsx b/public/pages/Administration/pages/PrivacySettings.page.tsxindex 1fd225259..0dfcdf39e 100644--- a/public/pages/Administration/pages/PrivacySettings.page.tsx+++ b/public/pages/Administration/pages/PrivacySettings.page.tsx@@ -10,7 +10,7 @@ interface PrivacySettingsPageState {isPrivate: boolean;}-export class PrivacySettingsPage extends AdminBasePage<{}, PrivacySettingsPageState> {+export default class PrivacySettingsPage extends AdminBasePage<{}, PrivacySettingsPageState> {public id = "p-admin-privacy";public name = "privacy";public icon = FaKey;diff --git a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsxindex 163151308..b969a5c0c 100644--- a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx+++ b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx@@ -1,7 +1,7 @@import React from "react";-import { HomePage, HomePageProps } from "../Home";-import { SignInPage } from "../SignIn";+import HomePage, { HomePageProps } from "../Home/Home.page";+import SignInPage from "../SignIn/SignIn.page";import { Modal, Button, Form, Input, LegalFooter } from "@fider/components";import { actions, Failure, querystring, Fider } from "@fider/services";@@ -10,7 +10,7 @@ interface CompleteSignInProfilePageState {error?: Failure;}-export class CompleteSignInProfilePage extends React.Component<HomePageProps, CompleteSignInProfilePageState> {+export default class CompleteSignInProfilePage extends React.Component<HomePageProps, CompleteSignInProfilePageState> {private key: string;constructor(props: HomePageProps) {diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsxindex 6e2580c08..756a15ddd 100644--- a/public/pages/Home/Home.page.tsx+++ b/public/pages/Home/Home.page.tsx@@ -34,7 +34,7 @@ const defaultWelcomeMessage = `We'd love to hear what you're thinking about.What can we do better? This is the place for you to vote, discuss and share ideas.`;-export class HomePage extends React.Component<HomePageProps, HomePageState> {+export default class HomePage extends React.Component<HomePageProps, HomePageState> {constructor(props: HomePageProps) {super(props);this.state = {diff --git a/public/pages/MyNotifications/MyNotifications.page.tsx b/public/pages/MyNotifications/MyNotifications.page.tsxindex 485f53e63..143d75a15 100644--- a/public/pages/MyNotifications/MyNotifications.page.tsx+++ b/public/pages/MyNotifications/MyNotifications.page.tsx@@ -16,7 +16,7 @@ interface MyNotificationsPageState {recent: Notification[];}-export class MyNotificationsPage extends React.Component<MyNotificationsPageProps, MyNotificationsPageState> {+export default class MyNotificationsPage extends React.Component<MyNotificationsPageProps, MyNotificationsPageState> {constructor(props: MyNotificationsPageProps) {super(props);diff --git a/public/pages/MySettings/MySettings.page.tsx b/public/pages/MySettings/MySettings.page.tsxindex a00501518..eabfa4184 100644--- a/public/pages/MySettings/MySettings.page.tsx+++ b/public/pages/MySettings/MySettings.page.tsx@@ -24,7 +24,7 @@ interface MySettingsPageProps {userSettings: UserSettings;}-export class MySettingsPage extends React.Component<MySettingsPageProps, MySettingsPageState> {+export default class MySettingsPage extends React.Component<MySettingsPageProps, MySettingsPageState> {constructor(props: MySettingsPageProps) {super(props);this.state = {diff --git a/public/pages/OAuthEcho/OAuthEcho.page.tsx b/public/pages/OAuthEcho/OAuthEcho.page.tsxindex f7e9c46c9..23189652a 100644--- a/public/pages/OAuthEcho/OAuthEcho.page.tsx+++ b/public/pages/OAuthEcho/OAuthEcho.page.tsx@@ -19,7 +19,7 @@ const ok = <FaCheckCircle className="check" />;const error = <FaTimesCircle className="error" />;const warn = <FaExclamationTriangle className="warn" />;-export class OAuthEchoPage extends React.Component<OAuthEchoPageProps, {}> {+export default class OAuthEchoPage extends React.Component<OAuthEchoPageProps, {}> {public componentDidMount() {navigator.replaceState("/");}diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsxindex 78ad221dc..0510ca565 100644--- a/public/pages/ShowPost/ShowPost.page.tsx+++ b/public/pages/ShowPost/ShowPost.page.tsx@@ -40,7 +40,7 @@ interface ShowPostPageState {error?: Failure;}-export class ShowPostPage extends React.Component<ShowPostPageProps, ShowPostPageState> {+export default class ShowPostPage extends React.Component<ShowPostPageProps, ShowPostPageState> {constructor(props: ShowPostPageProps) {super(props);diff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsxindex c0a78d145..59b8f7d3b 100644--- a/public/pages/SignIn/SignIn.page.tsx+++ b/public/pages/SignIn/SignIn.page.tsx@@ -4,7 +4,7 @@ import React from "react";import { SignInControl, TenantLogo, LegalNotice } from "@fider/components";import { notify, Fider } from "@fider/services";-export class SignInPage extends React.Component<{}, {}> {+export default class SignInPage extends React.Component<{}, {}> {private onEmailSent = (email: string) => {notify.success(<span>diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsxindex b0a33a171..4051175a7 100644--- a/public/pages/SignUp/SignUp.page.tsx+++ b/public/pages/SignUp/SignUp.page.tsx@@ -24,7 +24,7 @@ interface SignUpPageState {};}-export class SignUpPage extends React.Component<{}, SignUpPageState> {+export default class SignUpPage extends React.Component<{}, SignUpPageState> {private user?: OAuthUser;constructor(props: {}) {diff --git a/public/pages/UI/UIToolkit.page.tsx b/public/pages/UI/UIToolkit.page.tsxindex fa18de74f..378230a4b 100644--- a/public/pages/UI/UIToolkit.page.tsx+++ b/public/pages/UI/UIToolkit.page.tsx@@ -51,7 +51,7 @@ interface UIToolkitPageState {error?: Failure;}-export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {+export default class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {constructor(props: {}) {super(props);this.state = {};diff --git a/webpack.config.js b/webpack.config.jsindex 916057c6e..013da8163 100755--- a/webpack.config.js+++ b/webpack.config.js@@ -46,7 +46,6 @@ module.exports = {"tslib","marked","react-textarea-autosize",- "react-loadable","react-icons/lib"],},