A local-first personal finance app
Further reduce bundle size by code splitting out pages that are only used on desktop/mobile (#1240)
Jed Foxa97b36ebddb9
diff --git a/packages/desktop-client/src/components/FinancesApp.js b/packages/desktop-client/src/components/FinancesApp.tsxsimilarity index 87%rename from packages/desktop-client/src/components/FinancesApp.jsrename to packages/desktop-client/src/components/FinancesApp.tsxindex bc098f9fca..b8804da5df 100644--- a/packages/desktop-client/src/components/FinancesApp.js+++ b/packages/desktop-client/src/components/FinancesApp.tsx@@ -1,4 +1,4 @@-import React, { useEffect, useMemo } from 'react';+import React, { type ReactElement, useEffect, useMemo } from 'react';import { DndProvider } from 'react-dnd';import { HTML5Backend as Backend } from 'react-dnd-html5-backend';import { connect } from 'react-redux';@@ -30,31 +30,28 @@ import { colors, styles } from '../style';import { ExposeNavigate, StackedRoutes } from '../util/router-tools';import { getIsOutdated, getLatestVersion } from '../util/versions';-import Account from './accounts/Account';-import MobileAccount from './accounts/MobileAccount';-import MobileAccounts from './accounts/MobileAccounts';import BankSyncStatus from './BankSyncStatus';-import Budget from './budget';import { BudgetMonthCountProvider } from './budget/BudgetMonthCountContext';-import MobileBudget from './budget/MobileBudget';import { View } from './common';import FloatableSidebar, { SidebarProvider } from './FloatableSidebar';import GlobalKeys from './GlobalKeys';-import GoCardlessLink from './gocardless/GoCardlessLink';import { ManageRulesPage } from './ManageRulesPage';import Modals from './Modals';import Notifications from './Notifications';import { ManagePayeesPage } from './payees/ManagePayeesPage';import Reports from './reports';-import Schedules from './schedules';-import DiscoverSchedules from './schedules/DiscoverSchedules';-import EditSchedule from './schedules/EditSchedule';-import LinkSchedule from './schedules/LinkSchedule';+import { NarrowAlternate, WideComponent } from './responsive';import PostsOfflineNotification from './schedules/PostsOfflineNotification';import Settings from './settings';import Titlebar, { TitlebarProvider } from './Titlebar';-function NarrowNotSupported({ children, redirectTo = '/budget' }) {+function NarrowNotSupported({+ redirectTo = '/budget',+ children,+}: {+ redirectTo?: string;+ children: ReactElement;+}) {const { isNarrowWidth } = useResponsive();const navigate = useNavigate();useEffect(() => {@@ -66,7 +63,6 @@ function NarrowNotSupported({ children, redirectTo = '/budget' }) {}function StackedRoutesInner({ location }) {- const { isNarrowWidth } = useResponsive();return (<Routes location={location}><Route path="/" element={<Navigate to="/budget" replace />} />@@ -75,21 +71,19 @@ function StackedRoutesInner({ location }) {path="/reports/*"element={<NarrowNotSupported>+ {/* Has its own lazy loading logic */}<Reports /></NarrowNotSupported>}/>- <Route- path="/budget"- element={isNarrowWidth ? <MobileBudget /> : <Budget />}- />+ <Route path="/budget" element={<NarrowAlternate name="Budget" />} /><Routepath="/schedules"element={<NarrowNotSupported>- <Schedules />+ <WideComponent name="Schedules" /></NarrowNotSupported>}/>@@ -98,7 +92,7 @@ function StackedRoutesInner({ location }) {path="/schedule/edit"element={<NarrowNotSupported>- <EditSchedule />+ <WideComponent name="EditSchedule" /></NarrowNotSupported>}/>@@ -106,7 +100,7 @@ function StackedRoutesInner({ location }) {path="/schedule/edit/:id"element={<NarrowNotSupported>- <EditSchedule />+ <WideComponent name="EditSchedule" /></NarrowNotSupported>}/>@@ -114,7 +108,7 @@ function StackedRoutesInner({ location }) {path="/schedule/link"element={<NarrowNotSupported>- <LinkSchedule />+ <WideComponent name="LinkSchedule" /></NarrowNotSupported>}/>@@ -122,7 +116,7 @@ function StackedRoutesInner({ location }) {path="/schedule/discover"element={<NarrowNotSupported>- <DiscoverSchedules />+ <WideComponent name="DiscoverSchedules" /></NarrowNotSupported>}/>@@ -141,7 +135,7 @@ function StackedRoutesInner({ location }) {path="/nordigen/link"element={<NarrowNotSupported>- <GoCardlessLink />+ <WideComponent name="GoCardlessLink" /></NarrowNotSupported>}/>@@ -149,20 +143,17 @@ function StackedRoutesInner({ location }) {path="/gocardless/link"element={<NarrowNotSupported>- <GoCardlessLink />+ <WideComponent name="GoCardlessLink" /></NarrowNotSupported>}/><Routepath="/accounts/:id"- element={isNarrowWidth ? <MobileAccount /> : <Account />}+ element={<NarrowAlternate name="Account" />}/>- <Route- path="/accounts"- element={isNarrowWidth ? <MobileAccounts /> : <Account />}- />+ <Route path="/accounts" element={<NarrowAlternate name="Accounts" />} /></Routes>);}@@ -230,6 +221,8 @@ function RouterBehaviors({ getAccounts }) {useEffect(() => {undo.setUndoState('url', href);}, [href]);++ return null;}function FinancesApp(props) {diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsxindex 1934a56237..ca5b47a990 100644--- a/packages/desktop-client/src/components/Modals.tsx+++ b/packages/desktop-client/src/components/Modals.tsx@@ -37,7 +37,7 @@ export default function Modals() {const syncServerStatus = useSyncServerStatus();- return modalStack+ let modals = modalStack.map(({ name, options }, idx) => {const modalProps = {onClose: actions.popModal,@@ -227,4 +227,8 @@ export default function Modals() {.map((modal, idx) => (<React.Fragment key={modalStack[idx].name}>{modal}</React.Fragment>));++ // fragment needed per TS types+ // eslint-disable-next-line react/jsx-no-useless-fragment+ return <>{modals}</>;}diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsxindex 67287e2ec1..69c6450fd2 100644--- a/packages/desktop-client/src/components/Notifications.tsx+++ b/packages/desktop-client/src/components/Notifications.tsx@@ -4,13 +4,13 @@ import React, {useMemo,type SetStateAction,} from 'react';-import { connect, useSelector } from 'react-redux';+import { useSelector } from 'react-redux';-import { bindActionCreators } from 'redux';+import { type CSSProperties } from 'glamor';-import * as actions from 'loot-core/src/client/actions';import type { NotificationWithId } from 'loot-core/src/client/state-types/notifications';+import { useActions } from '../hooks/useActions';import Loading from '../icons/AnimatedLoading';import Delete from '../icons/v0/Delete';import { styles, colors } from '../style';@@ -220,7 +220,8 @@ function Notification({);}-function Notifications({ removeNotification, style }) {+export default function Notifications({ style }: { style?: CSSProperties }) {+ let { removeNotification } = useActions();let notifications = useSelector(state => state.notifications.notifications);return (<View@@ -249,7 +250,3 @@ function Notifications({ removeNotification, style }) {</View>);}--export default connect(null, dispatch => bindActionCreators(actions, dispatch))(- Notifications,-);diff --git a/packages/desktop-client/src/components/Titlebar.js b/packages/desktop-client/src/components/Titlebar.jsindex 50eaa6245b..8a644b39c4 100644--- a/packages/desktop-client/src/components/Titlebar.js+++ b/packages/desktop-client/src/components/Titlebar.js@@ -281,10 +281,7 @@ function Titlebar({saveGlobalPrefs,savePrefs,localPrefs,- userData,floatingSidebar,- syncError,- setAppState,style,sync,}) {diff --git a/packages/desktop-client/src/components/reports/index.tsx b/packages/desktop-client/src/components/reports/index.tsxindex 4d110091bd..7d3a886f2d 100644--- a/packages/desktop-client/src/components/reports/index.tsx+++ b/packages/desktop-client/src/components/reports/index.tsx@@ -1,44 +1,16 @@-import { useState, useEffect } from 'react';--import AnimatedLoading from '../../icons/AnimatedLoading';-import { colors, styles } from '../../style';-import { Block, View } from '../common';--import type { ReportRouter } from './ReportRouter';+import { View } from '../common';+import { LoadComponent } from '../util/LoadComponent';export default function Reports() {- let [ReportRouterComponent, setReportRouter] = useState<- typeof ReportRouter | null- >(null);-- useEffect(() => {- import(/* webpackChunkName: 'reports' */ './ReportRouter').then(module => {- setReportRouter(() => module.ReportRouter);- });- }, []);-return (<View style={{ flex: 1 }} data-testid="reports-page">- {ReportRouterComponent ? (- <ReportRouterComponent />- ) : (- <View- style={[- {- flex: 1,- gap: 20,- justifyContent: 'center',- alignItems: 'center',- },- styles.delayedFadeIn,- ]}- >- <Block style={{ marginBottom: 20, fontSize: 18 }}>- Loading reports…- </Block>- <AnimatedLoading width={25} color={colors.n1} />- </View>- )}+ <LoadComponent+ name="ReportRouter"+ message="Loading reports..."+ importer={() =>+ import(/* webpackChunkName: 'reports' */ './ReportRouter')+ }+ /></View>);}diff --git a/packages/desktop-client/src/components/responsive/index.tsx b/packages/desktop-client/src/components/responsive/index.tsxnew file mode 100644index 0000000000..570e533aab--- /dev/null+++ b/packages/desktop-client/src/components/responsive/index.tsx@@ -0,0 +1,27 @@+import { useResponsive } from '../../ResponsiveProvider';+import { LoadComponent } from '../util/LoadComponent';++import type * as NarrowComponents from './narrow';+import type * as WideComponents from './wide';++let loadNarrow = () =>+ import(/* webpackChunkName: "narrow-components" */ './narrow');+let loadWide = () => import(/* webpackChunkName: "wide-components" */ './wide');++export function WideComponent({ name }: { name: keyof typeof WideComponents }) {+ return <LoadComponent name={name} importer={loadWide} />;+}++export function NarrowAlternate({+ name,+}: {+ name: keyof typeof WideComponents & keyof typeof NarrowComponents;+}) {+ const { isNarrowWidth } = useResponsive();+ return (+ <LoadComponent+ name={name}+ importer={isNarrowWidth ? loadNarrow : loadWide}+ />+ );+}diff --git a/packages/desktop-client/src/components/responsive/narrow.ts b/packages/desktop-client/src/components/responsive/narrow.tsnew file mode 100644index 0000000000..d3b35e5ef6--- /dev/null+++ b/packages/desktop-client/src/components/responsive/narrow.ts@@ -0,0 +1,4 @@+export { default as Budget } from '../budget/MobileBudget';++export { default as Accounts } from '../accounts/MobileAccounts';+export { default as Account } from '../accounts/MobileAccount';diff --git a/packages/desktop-client/src/components/responsive/wide.ts b/packages/desktop-client/src/components/responsive/wide.tsnew file mode 100644index 0000000000..cca8e725e2--- /dev/null+++ b/packages/desktop-client/src/components/responsive/wide.ts@@ -0,0 +1,11 @@+export { default as Budget } from '../budget';++export { default as Schedules } from '../schedules';+export { default as EditSchedule } from '../schedules/EditSchedule';+export { default as LinkSchedule } from '../schedules/LinkSchedule';+export { default as DiscoverSchedules } from '../schedules/DiscoverSchedules';++export { default as GoCardlessLink } from '../gocardless/GoCardlessLink';++export { default as Accounts } from '../accounts/Account';+export { default as Account } from '../accounts/Account';diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.jsindex 61c3b533e5..032870e190 100644--- a/packages/desktop-client/src/components/transactions/MobileTransaction.js+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js@@ -11,6 +11,7 @@ import { useListBox, useListBoxSection, useOption } from '@react-aria/listbox';import { mergeProps } from '@react-aria/utils';import { Item, Section } from '@react-stately/collections';import { useListState } from '@react-stately/list';+import { css } from 'glamor';import memoizeOne from 'memoize-one';import * as monthUtils from 'loot-core/src/shared/months';@@ -408,8 +409,7 @@ function ListBoxSection({ section, state }) {{section.rendered && (<div{...headingProps}- style={{- ...styles.smallText,+ {...css(styles.smallText, {backgroundColor: colors.n10,borderBottom: `1px solid ${colors.n9}`,borderTop: `1px solid ${colors.n9}`,@@ -422,7 +422,7 @@ function ListBoxSection({ section, state }) {top: '0',width: '100%',zIndex: zIndices.SECTION_HEADING,- }}+ })}>{section.rendered}</div>diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsxnew file mode 100644index 0000000000..956be6ba72--- /dev/null+++ b/packages/desktop-client/src/components/util/LoadComponent.tsx@@ -0,0 +1,54 @@+import { type ComponentType, useEffect, useState } from 'react';++import AnimatedLoading from '../../icons/AnimatedLoading';+import { colors, styles } from '../../style';+import { Block, View } from '../common';++type ProplessComponent = ComponentType<Record<string, never>>;+type LoadComponentProps<K extends string> = {+ name: K;+ message?: string;+ importer: () => Promise<{ [key in K]: ProplessComponent }>;+};+export function LoadComponent<K extends string>(props: LoadComponentProps<K>) {+ // need to set `key` so the component is reloaded when the name changes+ // otherwise the old component will be rendered while the new one is being loaded+ return <LoadComponentInner key={props.name} {...props} />;+}++function LoadComponentInner<K extends string>({+ name,+ message,+ importer,+}: LoadComponentProps<K>) {+ let [Component, setComponent] = useState<ProplessComponent | null>(null);+ useEffect(() => {+ importer().then(module => setComponent(() => module[name]));+ }, [name, importer]);++ if (!Component) {+ return (+ <View+ style={[+ {+ flex: 1,+ gap: 20,+ justifyContent: 'center',+ alignItems: 'center',+ },+ styles.delayedFadeIn,+ ]}+ >+ {message && (+ <Block style={{ marginBottom: 20, fontSize: 18 }}>{message}</Block>+ )}+ <AnimatedLoading width={25} color={colors.n1} />+ </View>+ );+ }++ // console.log(+ // `rendering <${Component.displayName || Component.name} /> as ${name}`,+ // );+ return <Component />;+}diff --git a/packages/desktop-client/src/fonts.scss b/packages/desktop-client/src/fonts.scssindex b36437aff0..7e1ee6cc8b 100644--- a/packages/desktop-client/src/fonts.scss+++ b/packages/desktop-client/src/fonts.scss@@ -1,2 +1,2 @@@use '~inter-ui/variable';-@include variable.all;+@include variable.default;diff --git a/packages/desktop-client/src/style.tsx b/packages/desktop-client/src/style.tsxindex 5e3807eee2..49a7d05a5d 100644--- a/packages/desktop-client/src/style.tsx+++ b/packages/desktop-client/src/style.tsx@@ -176,7 +176,7 @@ export const styles = {'0%': { opacity: 0 },'100%': { opacity: 1 },}),- animationDuration: '0.2s',+ animationDuration: '1s',animationFillMode: 'both',animationDelay: '0.5s',},diff --git a/packages/desktop-client/src/util/withThemeColor.tsx b/packages/desktop-client/src/util/withThemeColor.tsxindex f2615e515c..c146b60aae 100644--- a/packages/desktop-client/src/util/withThemeColor.tsx+++ b/packages/desktop-client/src/util/withThemeColor.tsx@@ -2,6 +2,10 @@ import React, { Component } from 'react';export const withThemeColor = color => WrappedComponent => {class WithThemeColor extends Component {+ static displayName = `withThemeColor(${+ WrappedComponent.displayName || WrappedComponent.name+ })`;+componentDidMount() {setThemeColor(color);}diff --git a/upcoming-release-notes/1240.md b/upcoming-release-notes/1240.mdnew file mode 100644index 0000000000..6f76beeb82--- /dev/null+++ b/upcoming-release-notes/1240.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [j-f1]+---++Avoid downloading code for the desktop UI on mobile and vice versa