Skip to content

Commit e6ed93d

Browse files
remaining SSR errors
1 parent 41f3cdc commit e6ed93d

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

packages/devextreme-cli/src/templates/nextjs/application/src/components/header/Header.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import Toolbar, { Item } from 'devextreme-react/toolbar';
22
import Button from 'devextreme-react/button';
33
import UserPanel from '@/components/user-panel/UserPanel';
44
import './Header.scss';
5-
import { Template } from 'devextreme-react/core/template';
65
import { ThemeSwitcher } from '@/components/theme-switcher/ThemeSwitcher';
76
<%=#isTypeScript%>import type { HeaderProps } from '@/types';<%=/isTypeScript%>
87

8+
const renderMenuItem = () => <UserPanel menuMode='list' />;
9+
910
export default function Header({ menuToggleEnabled, title, toggleMenu }<%=#isTypeScript%>: HeaderProps<%=/isTypeScript%>) {
1011
return (
1112
<header className={'header-component'}>
@@ -29,13 +30,9 @@ export default function Header({ menuToggleEnabled, title, toggleMenu }<%=#isTyp
2930
>
3031
<ThemeSwitcher />
3132
</Item>
32-
<Item location='after' locateInMenu='auto' menuItemTemplate='userPanelTemplate'>
33+
<Item location='after' locateInMenu='auto' menuItemRender={renderMenuItem}>
3334
<UserPanel menuMode='context' />
3435
</Item>
35-
<Template name='userPanelTemplate'>
36-
<UserPanel menuMode='list' />
37-
</Template>
38-
3936
</Toolbar>
4037
</header>
4138
)}

packages/devextreme-cli/src/templates/nextjs/application/src/utils/media-query.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ const unsubscribe = (handler<%=#isTypeScript%>: Handle<%=/isTypeScript%>) => {
4848

4949
function getScreenSize() {
5050
return {
51-
isXSmall: xSmallMedia.matches,
52-
isSmall: smallMedia.matches,
53-
isMedium: mediumMedia.matches,
54-
isLarge: largeMedia.matches
51+
isXSmall: xSmallMedia?.matches,
52+
isSmall: smallMedia?.matches,
53+
isMedium: mediumMedia?.matches,
54+
isLarge: largeMedia?.matches
5555
};
5656
}

packages/devextreme-cli/testing/env.nextjs.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ function getConfig({ engine, template, fileExtension, templateExtension, transpi
4848
forceNoCmd: true
4949
});
5050

51-
fs.writeFileSync(path.join(appPath, '.env'), 'SKIP_PREFLIGHT_CHECK=true' + EOL + 'BROWSER=none');
51+
const envFilePath = path.join(appPath, '.env');
52+
let envContent = 'SKIP_PREFLIGHT_CHECK=true' + EOL + 'BROWSER=none';
53+
54+
if(fs.existsSync(envFilePath)) {
55+
envContent += EOL + fs.readFileSync(envFilePath).toString();
56+
}
57+
58+
fs.writeFileSync(envFilePath, envContent);
5259
};
5360

5461
config.setLayout = (layoutName) => {

0 commit comments

Comments
 (0)