Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/guard/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ const path = require('path');
const nextConfig = {
typedRoutes: true,
output: 'export',
typescript: {
ignoreBuildErrors: true,
},
staticPageGenerationTimeout: 600,
env: {
API_BASE_URL: process.env.API_BASE_URL,
Expand Down
3 changes: 0 additions & 3 deletions apps/watcher/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ const nextConfig = {
unoptimized: true,
},
output: 'export',
typescript: {
ignoreBuildErrors: true,
},
staticPageGenerationTimeout: 600,
env: {
API_BASE_URL: process.env.API_BASE_URL,
Expand Down
59 changes: 30 additions & 29 deletions apps/watcher/src/app/App.tsx

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file no longer needs changes—we’ve already updated it in another merge request.

@abdolian abdolian Jul 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your branch is not up to date with the latest version of the dev branch. Please update your branch and revert the changes in this file.

Your commit still includes three incorrect files and should only affect apps/guard/next.config.js and apps/watcher/next.config.js.

Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
'use client';

import { Route } from 'next';
import type { Route } from 'next';
import NextImage from 'next/image';
import NextLink from 'next/link';
import { usePathname, useRouter, useSearchParams } from 'next/navigation';
import { PropsWithChildren } from 'react';

/**
* FIXME: import NoSsr from ui-kit
* local:ergo/rosen-bridge/ui#193
*/
import { NoSsr } from '@mui/material';
import {
App as AppBase,
ApiKeyProvider,
FrameworkProvider,
ThemeProvider,
ToastProvider,
NoSsr,
} from '@rosen-bridge/ui-kit';
import { mockMiddlewareFactory } from '@rosen-ui/swr-helpers';
import { SWRConfig } from 'swr';

import { Favicon } from '@/components';
import { mockedData } from '@/mock/mockedData';
import { theme } from '@/theme/theme';
import { UIKitProvider } from '@/uiKitProvider';

import { Sidebar } from './Sidebar';
import { SideBar } from './SideBar';
import { Toolbar } from './Toolbar';

export const App = ({ children }: PropsWithChildren) => {
const pathname = usePathname();
Expand All @@ -32,34 +36,31 @@ export const App = ({ children }: PropsWithChildren) => {
return (
<NoSsr>
<FrameworkProvider
components={{
Anchor: (props) => <NextLink {...props} href={props.href as Route} />,
Image: (props) => <NextImage {...props} />,
}}
router={{
pathname,
search: searchParams.toString(),
push: (href) =>
router.push(href as unknown as Route, { scroll: false }),
push: (href: string) => router.push(href as Route, { scroll: false }),
}}
>
<UIKitProvider>
<ApiKeyProvider>
<ThemeProvider theme={theme}>
<ToastProvider>
<AppBase sidebar={<Sidebar />}>
<Favicon />
<SWRConfig
value={{
use:
process.env.NEXT_PUBLIC_USE_MOCKED_APIS === 'true'
? [mockMiddlewareFactory(mockedData)]
: [],
}}
>
{children}
</SWRConfig>
</AppBase>
</ToastProvider>
</ThemeProvider>
</ApiKeyProvider>
</UIKitProvider>
<ApiKeyProvider>
<AppBase sideBar={<SideBar />} theme={theme} toolbar={<Toolbar />}>
<Favicon />
<SWRConfig
value={{
use:
process.env.NEXT_PUBLIC_USE_MOCKED_APIS === 'true'
? [mockMiddlewareFactory(mockedData)]
: [],
}}
>
{children}
</SWRConfig>
</AppBase>
</ApiKeyProvider>
</FrameworkProvider>
</NoSsr>
);
Expand Down