Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(web): eagerly import new app route views (#6953)

dev-rb39a4649600bf
diff --git a/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts b/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
index ea103f4c90..1c16f51e9b 100644
--- a/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
+++ b/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
@@ -26,45 +26,18 @@ vi.mock('../componentRegistry', () => {
vi.mock('@app/features/agents-view/views/AgentsView', () => {
throw new Error('Route declarations must not eagerly load agent views');
});
-vi.mock('@app/features/calendar-view/calendar-view', () => {
- throw new Error('Route declarations must not eagerly load Calendar views');
-});
-vi.mock('@app/features/channels-view/channels-view', () => {
- throw new Error('Route declarations must not eagerly load channel views');
-});
-vi.mock('@app/features/drive-view/drive-view', () => {
- throw new Error('Route declarations must not eagerly load Drive views');
-});
-vi.mock('@app/features/drive-view/components/DriveDetailView', () => {
- throw new Error('Route declarations must not eagerly load document views');
-});
-vi.mock('@app/features/email-view/email-view', () => {
- throw new Error('Route declarations must not eagerly load email views');
-});
-vi.mock('@app/features/email-view/components/EmailDetailView', () => {
- throw new Error('Route declarations must not eagerly load email details');
-});
vi.mock('@app/features/getting-started', () => {
throw new Error('Route declarations must not eagerly load onboarding views');
});
vi.mock('@app/features/home', () => {
throw new Error('Route declarations must not eagerly load home views');
});
-vi.mock('@app/features/inbox-view/inbox-view', () => {
- throw new Error('Route declarations must not eagerly load inbox views');
-});
vi.mock('@app/features/next-soup/soup-view/soup-view', () => {
throw new Error('Route declarations must not eagerly load Soup views');
});
vi.mock('@app/features/settings/Settings', () => {
throw new Error('Route declarations must not eagerly load settings views');
});
-vi.mock('@app/features/tasks-view/tasks-view', () => {
- throw new Error('Route declarations must not eagerly load task views');
-});
-vi.mock('@app/features/tasks-view/components/TasksDetailView', () => {
- throw new Error('Route declarations must not eagerly load task details');
-});
describe('application route import isolation', () => {
it('routes debug views and canonicalizes their legacy URLs', () => {
@@ -78,7 +51,7 @@ describe('application route import isolation', () => {
}
});
- it('builds and decodes routes without initializing view modules', () => {
+ it('builds and decodes routes without initializing remaining lazy view modules', () => {
const routes = createRoutesManifest(appSplitRoutes);
for (const path of [
['mail'],
diff --git a/apps/web/src/features/channels-view/route.tsx b/apps/web/src/features/channels-view/route.tsx
index 9c8a471996..91377c34cc 100644
--- a/apps/web/src/features/channels-view/route.tsx
+++ b/apps/web/src/features/channels-view/route.tsx
@@ -14,16 +14,11 @@ import { lazy, Show } from 'solid-js';
import { z } from 'zod';
import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
import { channelsSearch } from './channels-route';
+import { ChannelDetailRouteView, ChannelsView } from './channels-view';
const SoupView = lazy(async () => ({
default: (await import('../next-soup/soup-view/soup-view')).SoupView,
}));
-const ChannelsView = lazy(async () => ({
- default: (await import('./channels-view')).ChannelsView,
-}));
-const ChannelDetailRouteView = lazy(async () => ({
- default: (await import('./channels-view')).ChannelDetailRouteView,
-}));
function LegacyChannelsView() {
const preset = getViewPreset('channels');
diff --git a/apps/web/src/features/drive-view/route.tsx b/apps/web/src/features/drive-view/route.tsx
index 4528d3e523..2d1d7c8a1c 100644
--- a/apps/web/src/features/drive-view/route.tsx
+++ b/apps/web/src/features/drive-view/route.tsx
@@ -18,7 +18,8 @@ import type { SetPredicatesInput } from '../next-soup/filters/filter-store/predi
import { mergeQuery } from '../next-soup/filters/filter-store/query-store';
import type { Query } from '../next-soup/filters/filter-store/types';
import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
-import type { DriveViewProps } from './drive-view';
+import { DriveDetailView } from './components/DriveDetailView';
+import { DriveView, type DriveViewProps } from './drive-view';
import { driveDetailTrailSchema } from './primitives/drive-detail-trail';
import {
DRIVE_DOCUMENT_TYPES,
@@ -28,12 +29,6 @@ import {
const SoupView = lazy(async () => ({
default: (await import('../next-soup/soup-view/soup-view')).SoupView,
}));
-const DriveView = lazy(async () => ({
- default: (await import('./drive-view')).DriveView,
-}));
-const DriveDetailView = lazy(async () => ({
- default: (await import('./components/DriveDetailView')).DriveDetailView,
-}));
type DriveRouteViewProps = DriveViewProps & {
initialFilters?: Query;
diff --git a/apps/web/src/features/email-view/route.tsx b/apps/web/src/features/email-view/route.tsx
index 61e6d0fb54..2e46f03282 100644
--- a/apps/web/src/features/email-view/route.tsx
+++ b/apps/web/src/features/email-view/route.tsx
@@ -13,17 +13,13 @@ import { lazy, Show } from 'solid-js';
import { z } from 'zod';
import { URL_PARAMS as EMAIL_URL_PARAMS } from '../email-thread/core/location';
import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { EmailDetailRouteView } from './components/EmailDetailView';
import { emailDetailSearch } from './email-route';
+import { EmailView } from './email-view';
const SoupView = lazy(async () => ({
default: (await import('../next-soup/soup-view/soup-view')).SoupView,
}));
-const EmailView = lazy(async () => ({
- default: (await import('./email-view')).EmailView,
-}));
-const EmailDetailRouteView = lazy(async () => ({
- default: (await import('./components/EmailDetailView')).EmailDetailRouteView,
-}));
function LegacyMailView() {
const preset = getViewPreset('mail');
diff --git a/apps/web/src/features/inbox-view/route.tsx b/apps/web/src/features/inbox-view/route.tsx
index 15580b5240..2b350013dd 100644
--- a/apps/web/src/features/inbox-view/route.tsx
+++ b/apps/web/src/features/inbox-view/route.tsx
@@ -28,6 +28,7 @@ import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { lazy, Show } from 'solid-js';
import { URL_PARAMS as EMAIL_URL_PARAMS } from '../email-thread/core/location';
import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { InboxEntityDetailRouteView } from './components/InboxEntityDetailRouteView';
import {
inboxCalendarLegacyTarget,
inboxDetailParamsFromRoute,
@@ -39,23 +40,15 @@ import {
inboxBaseBlockType,
inboxPreviewRouteParams,
} from './inbox-route-schema';
+import {
+ InboxCalendarRouteView,
+ InboxDetailRouteView,
+ InboxView,
+} from './inbox-view';
const SoupView = lazy(async () => ({
default: (await import('../next-soup/soup-view/soup-view')).SoupView,
}));
-const InboxView = lazy(async () => ({
- default: (await import('./inbox-view')).InboxView,
-}));
-const InboxDetailRouteView = lazy(async () => ({
- default: (await import('./inbox-view')).InboxDetailRouteView,
-}));
-const InboxEntityDetailRouteView = lazy(async () => ({
- default: (await import('./components/InboxEntityDetailRouteView'))
- .InboxEntityDetailRouteView,
-}));
-const InboxCalendarRouteView = lazy(async () => ({
- default: (await import('./inbox-view')).InboxCalendarRouteView,
-}));
type InboxDetailParams = Partial<InboxPreviewRouteParams> & {
channelId?: string;
diff --git a/apps/web/src/features/tasks-view/route.tsx b/apps/web/src/features/tasks-view/route.tsx
index 498dcb7fee..e17845630c 100644
--- a/apps/web/src/features/tasks-view/route.tsx
+++ b/apps/web/src/features/tasks-view/route.tsx
@@ -8,16 +8,12 @@ import { useUserContext } from '@core/context/user';
import { lazy, Show } from 'solid-js';
import { z } from 'zod';
import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { TasksDetailRouteView } from './components/TasksDetailView';
+import { TasksView } from './tasks-view';
const SoupView = lazy(async () => ({
default: (await import('../next-soup/soup-view/soup-view')).SoupView,
}));
-const TasksView = lazy(async () => ({
- default: (await import('./tasks-view')).TasksView,
-}));
-const TasksDetailRouteView = lazy(async () => ({
- default: (await import('./components/TasksDetailView')).TasksDetailRouteView,
-}));
function LegacyTasksView() {
const user = useUserContext();