Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: Add Code Splitting (#596)

Cooper Filby2e486e042ea9
diff --git a/package-lock.json b/package-lock.json
index 6dcf2baa8..64fbcf65c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -150,6 +150,16 @@
"@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",
@@ -159,12 +169,39 @@
"@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.3",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz",
"integrity": "sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==",
"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.17",
+ "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.17.tgz",
+ "integrity": "sha512-f8fHYEhlrSQJ5BHaonyatL11MYwqQ7I6QDVCT41LqIyxR7j9B2uY4cQKxDoWFC9l2NbFGsIhiJBKZ6Y6LMBFLA==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*",
+ "@types/tapable": "*",
+ "@types/uglify-js": "*",
+ "source-map": "^0.6.0"
+ }
+ },
"@webassemblyjs/ast": {
"version": "1.7.8",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz",
@@ -7566,6 +7603,14 @@
"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.5.2",
"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.5.2.tgz",
diff --git a/package.json b/package.json
index 8e080ae38..27a016e5e 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"markdown-it": "8.4.2",
"react": "16.5.2",
"react-dom": "16.5.2",
+ "react-loadable": "^5.5.0",
"react-textarea-autosize": "7.0.4",
"react-toastify": "4.4.0",
"semantic-ui-css": "2.4.0",
@@ -22,6 +23,7 @@
"@types/puppeteer": "1.9.0",
"@types/react": "16.4.16",
"@types/react-dom": "16.0.9",
+ "@types/react-loadable": "^5.4.1",
"@types/react-textarea-autosize": "4.3.3",
"css-loader": "1.0.0",
"dotenv": "6.1.0",
diff --git a/public/AsyncPages.tsx b/public/AsyncPages.tsx
new file mode 100644
index 000000000..2993bd9bb
--- /dev/null
+++ b/public/AsyncPages.tsx
@@ -0,0 +1,146 @@
+import React from "react";
+import Loadable from "react-loadable";
+
+import { Loader } from "@fider/components/common/Loader";
+
+const Loading = () => (
+ <div className="page">
+ <Loader />
+ </div>
+);
+
+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 />
+});
diff --git a/public/components/ErrorBoundary.tsx b/public/components/ErrorBoundary.tsx
index 791099c0a..329a94b3f 100644
--- a/public/components/ErrorBoundary.tsx
+++ b/public/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { ErrorPage } from "@fider/pages";
+import { ErrorPage } from "@fider/pages/Error/Error.page";
interface ErrorBoundaryProps {
onError?: (err: Error) => void;
diff --git a/public/index.tsx b/public/index.tsx
index fcf9c7cb5..f87fc2d4b 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -1,3 +1,8 @@
+const fider = Fider.initialize();
+
+__webpack_nonce__ = Fider.session.contextID;
+__webpack_public_path__ = `${Fider.settings.globalAssetsURL}/assets/`;
+
import React from "react";
import ReactDOM from "react-dom";
import { resolveRootComponent } from "@fider/router";
@@ -26,8 +31,6 @@ window.addEventListener("error", (evt: ErrorEvent) => {
});
document.addEventListener("DOMContentLoaded", () => {
- const fider = Fider.initialize();
-
const root = document.getElementById("root");
if (root) {
const config = resolveRootComponent(location.pathname);
diff --git a/public/pages/Home/components/PostFilter.tsx b/public/pages/Home/components/PostFilter.tsx
index 83b0cb88d..dfd7483e2 100644
--- a/public/pages/Home/components/PostFilter.tsx
+++ b/public/pages/Home/components/PostFilter.tsx
@@ -1,10 +1,10 @@
+import "./PostFilter.scss";
+
import React from "react";
import { PostStatus } from "@fider/models";
import { DropDown, DropDownItem } from "@fider/components";
import { Fider } from "@fider/services";
-import "./PostFilter.scss";
-
interface PostFilterProps {
activeView: string;
countPerStatus: { [key: string]: number };
diff --git a/public/pages/Home/components/TagsFilter.tsx b/public/pages/Home/components/TagsFilter.tsx
index f5e4b66dc..d9787d506 100644
--- a/public/pages/Home/components/TagsFilter.tsx
+++ b/public/pages/Home/components/TagsFilter.tsx
@@ -1,10 +1,10 @@
+import "./TagsFilter.scss";
+
import React from "react";
import { Tag } from "@fider/models";
import { ShowTag } from "@fider/components/ShowTag";
import { DropDown, DropDownItem } from "@fider/components";
-import "./TagsFilter.scss";
-
interface TagsFilterProps {
tags: Tag[];
defaultSelection: string[];
diff --git a/public/router.spec.tsx b/public/router.spec.tsx
index 342b4f39a..690d389fd 100644
--- a/public/router.spec.tsx
+++ b/public/router.spec.tsx
@@ -1,14 +1,14 @@
import { resolveRootComponent } from "./router";
-import { HomePage, ShowPostPage, InvitationsPage, GeneralSettingsPage, OAuthEchoPage } from "@fider/pages";
+import * as Pages from "@fider/AsyncPages";
[
- { path: "", expected: HomePage },
- { path: "/posts/123", expected: ShowPostPage },
- { path: "/posts/123/the-slug", expected: ShowPostPage },
+ { path: "", expected: Pages.AsyncHomePage },
+ { path: "/posts/123", expected: Pages.AsyncShowPostPage },
+ { path: "/posts/123/the-slug", expected: Pages.AsyncShowPostPage },
{ path: "/posts" },
- { path: "/admin", expected: GeneralSettingsPage },
- { path: "/admin/invitations", expected: InvitationsPage },
- { path: "/oauth/_name/echo", expected: OAuthEchoPage }
+ { path: "/admin", expected: Pages.AsyncGeneralSettingsPage },
+ { path: "/admin/invitations", expected: Pages.AsyncInvitationsPage },
+ { path: "/oauth/_name/echo", expected: Pages.AsyncOAuthEchoPage }
].forEach(x => {
test(`Router should resolve correct component for path '${x.path}'`, () => {
if (x.expected) {
diff --git a/public/router.tsx b/public/router.tsx
index ba9bb12aa..018a79ca6 100644
--- a/public/router.tsx
+++ b/public/router.tsx
@@ -1,24 +1,6 @@
import React from "react";
-import {
- HomePage,
- SignInPage,
- SignUpPage,
- ManageMembersPage,
- CompleteSignInProfilePage,
- PrivacySettingsPage,
- InvitationsPage,
- ExportPage,
- GeneralSettingsPage,
- AdvancedSettingsPage,
- ManageAuthenticationPage,
- ManageTagsPage,
- OAuthEchoPage,
- ShowPostPage,
- MySettingsPage,
- MyNotificationsPage,
- UIToolkitPage
-} from "@fider/pages";
+import * as Pages from "@fider/AsyncPages";
interface PageConfiguration {
regex: RegExp;
@@ -38,24 +20,24 @@ const route = (path: string, component: any, showHeader: boolean = true): PageCo
};
const pathRegex = [
- route("", HomePage),
- route("/posts/:number*", ShowPostPage),
- route("/admin/members", ManageMembersPage),
- route("/admin/tags", ManageTagsPage),
- route("/admin/privacy", PrivacySettingsPage),
- route("/admin/export", ExportPage),
- route("/admin/invitations", InvitationsPage),
- route("/admin/authentication", ManageAuthenticationPage),
- route("/admin/advanced", AdvancedSettingsPage),
- route("/admin", GeneralSettingsPage),
- route("/signin", SignInPage, false),
- route("/signup", SignUpPage, false),
- route("/signin/verify", CompleteSignInProfilePage),
- route("/invite/verify", CompleteSignInProfilePage),
- route("/notifications", MyNotificationsPage),
- route("/settings", MySettingsPage),
- route("/oauth/:string/echo", OAuthEchoPage, false),
- route("/-/ui", UIToolkitPage)
+ route("", Pages.AsyncHomePage),
+ route("/posts/:number*", Pages.AsyncShowPostPage),
+ route("/admin/members", Pages.AsyncManageMembersPage),
+ route("/admin/tags", Pages.AsyncManageTagsPage),
+ route("/admin/privacy", Pages.AsyncPrivacySettingsPage),
+ route("/admin/export", Pages.AsyncExportPage),
+ route("/admin/invitations", Pages.AsyncInvitationsPage),
+ route("/admin/authentication", Pages.AsyncManageAuthenticationPage),
+ route("/admin/advanced", Pages.AsyncAdvancedSettingsPage),
+ route("/admin", Pages.AsyncGeneralSettingsPage),
+ route("/signin", Pages.AsyncSignInPage, false),
+ route("/signup", Pages.AsyncSignUpPage, false),
+ route("/signin/verify", Pages.AsyncCompleteSignInProfilePage),
+ route("/invite/verify", Pages.AsyncCompleteSignInProfilePage),
+ route("/notifications", Pages.AsyncMyNotificationsPage),
+ route("/settings", Pages.AsyncMySettingsPage),
+ route("/oauth/:string/echo", Pages.AsyncOAuthEchoPage, false),
+ route("/-/ui", Pages.AsyncUIToolkitPage)
];
export const resolveRootComponent = (path: string): PageConfiguration => {
@@ -63,7 +45,7 @@ export const resolveRootComponent = (path: string): PageConfiguration => {
path = path.substring(0, path.length - 1);
}
for (const entry of pathRegex) {
- if (entry.regex.test(path)) {
+ if (entry && entry.regex.test(path)) {
return entry;
}
}
diff --git a/public/tsd.d.ts b/public/tsd.d.ts
index ee4c3e4b0..f994857d9 100644
--- a/public/tsd.d.ts
+++ b/public/tsd.d.ts
@@ -10,6 +10,9 @@ declare global {
__tenant: Tenant;
__settings: SystemSettings;
}
+
+ var __webpack_nonce__: string; // tslint:disable-line
+ var __webpack_public_path__:string; // tslint:disable-line
}
declare var require: (id: string) => any;
diff --git a/webpack.config.js b/webpack.config.js
index 9296b5004..b8e1af86e 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,5 @@
const path = require("path");
+
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
@@ -7,8 +8,8 @@ const isProduction = process.env.NODE_ENV === "production";
const plugins = [
new MiniCssExtractPlugin({
- filename: "css/[name].[hash].css",
- chunkFilename: "css/[name].[hash].css"
+ filename: "css/[name].[chunkhash].css",
+ chunkFilename: "css/[name].[chunkhash].css"
}),
new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true })
];
@@ -22,7 +23,7 @@ module.exports = {
mode: process.env.NODE_ENV || "development",
entry: {
main: "./public/index.tsx",
- vendor: [ "react", "react-dom", "tslib", "markdown-it", "react-textarea-autosize", "react-toastify" ]
+ vendor: [ "react", "react-dom", "tslib", "markdown-it", "react-textarea-autosize", "react-toastify", "react-loadable" ]
},
output: {
path: __dirname + "/dist",