Skip to content

Commit 7681e7b

Browse files
Merge branch 'dev' of https://github.com/DevExpress/devextreme-cli into dev_ng_use_standalone
2 parents 372591d + 4b191fe commit 7681e7b

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

packages/devextreme-cli/src/templates/nextjs/application/src/app/actions/auth.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ import { createSession, deleteSession } from '@/app/lib/session'
55

66
export async function signUp(email<%=#isTypeScript%>: string<%=/isTypeScript%>, password<%=#isTypeScript%>: string<%=/isTypeScript%>) {
77
try {
8-
// Create a user in the database
8+
// 1. Check if the user exists in the database and return isOk: false if so;
9+
// 2. Otherwise, add the user to the database.
910
console.log(email, password);
1011

11-
await signIn(email, password);
12-
1312
return {
1413
isOk: true,
1514
}

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ScrollView<%=#isTypeScript%>, ScrollViewRef<%=/isTypeScript%> } from 'd
55
import Toolbar, { Item } from 'devextreme-react/toolbar';
66
import React, { useState, useCallback, useRef } from 'react';
77
import { useRouter } from 'next/navigation';
8-
import { Header, SideNavigationMenu, Footer } from '@/components';
8+
import { Header, SideNavigationMenu } from '@/components';
99
import './side-nav-inner-toolbar.scss';
1010
import { useScreenSize } from '@/utils/media-query';
1111
import { Template } from 'devextreme-react/core/template';
@@ -84,15 +84,15 @@ export default function SideNavInnerToolbar({ title, children }<%=#isTypeScript%
8484
<ScrollView ref={scrollViewRef} className={'layout-body with-footer'}>
8585
<div className={'content'}>
8686
{React.Children.map(children, (item) => {
87-
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== Footer) {
87+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== "footer") {
8888
return item;
8989
}
9090
return null;
9191
})}
9292
</div>
9393
<div className={'content-block'}>
9494
{React.Children.map(children, (item) => {
95-
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === Footer) {
95+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === "footer") {
9696
return item;
9797
}
9898
return null;

packages/devextreme-cli/src/templates/nextjs/application/src/layouts/side-nav-outer-toolbar/side-nav-outer-toolbar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Drawer from 'devextreme-react/drawer';
33
import { ScrollView<%=#isTypeScript%>, ScrollViewRef<%=/isTypeScript%> } from 'devextreme-react/scroll-view';
44
import React, { useState, useCallback, useRef } from 'react';
55
import { useRouter } from 'next/navigation';
6-
import { Header, SideNavigationMenu, Footer } from '@/components';
6+
import { Header, SideNavigationMenu } from '@/components';
77
import './side-nav-outer-toolbar.scss';
88
import { useScreenSize } from '@/utils/media-query';
99
import { Template } from 'devextreme-react/core/template';
@@ -83,15 +83,15 @@ router.push(itemData.path);
8383
<ScrollView ref={scrollViewRef} className={'with-footer'}>
8484
<div className={'content'}>
8585
{React.Children.map(children, (item) => {
86-
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== Footer) {
86+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type !== "footer") {
8787
return item;
8888
}
8989
return null;
9090
})}
9191
</div>
9292
<div className={'content-block'}>
9393
{React.Children.map(children, (item) => {
94-
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === Footer) {
94+
if (<%=#isTypeScript%>React.isValidElement(item) && <%=/isTypeScript%>item.type === "footer") {
9595
return item;
9696
}
9797
return null;

packages/devextreme-cli/src/utility/latest-versions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const packageJson = require('../../package.json');
22
module.exports = {
3-
'devextreme': '24.2.6',
4-
'devextreme-react': '24.2.6',
5-
'devextreme-vue': '24.2.6',
3+
'devextreme': '24.2.7',
4+
'devextreme-react': '24.2.7',
5+
'devextreme-vue': '24.2.7',
66
'create-vite': '6.4.1',
77
'create-next-app': '15.3.1',
88
'jose': '6.0.10',

packages/devextreme-cli/testing/app-template.test.shared.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ module.exports = (env, { port = 8080, urls = {} } = {}) => {
125125
await page.waitForTimeout(3000);
126126
}
127127

128-
// The footer text is antialiased differently in Angular and React,
128+
// TODO: The footer text is antialiased differently in Angular and React,
129129
// so we are hiding the footer before taking screenshots to prevent
130130
// false failures. Moving forward, we need to investigate the cause
131131
// of this effect.
@@ -267,7 +267,8 @@ module.exports = (env, { port = 8080, urls = {} } = {}) => {
267267

268268
it('Create account page', async() => {
269269
// NOTE: Test only once
270-
if(!isDefaultLayout) {
270+
// TODO: investigate failure in material
271+
if(!isDefaultLayout || theme === 'material') {
271272
return;
272273
}
273274

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// TODO: implement
22
export const latestVersions = {
3-
'devextreme': '24.2.6',
4-
'devextreme-angular': '24.2.6',
3+
'devextreme': '24.2.7',
4+
'devextreme-angular': '24.2.7',
55
'devextreme-cli': 'latest'
66
};

0 commit comments

Comments
 (0)