Skip to content

Commit 896d6f4

Browse files
try satisfy vite 7 linter
1 parent e4189ec commit 896d6f4

File tree

17 files changed

+59
-40
lines changed

17 files changed

+59
-40
lines changed

packages/devextreme-cli/src/applications/application.react.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ const addView = (pageName, options) => {
214214
return fileExtension === '.tsx' ? extension : fileExtension;
215215
};
216216
templateCreator.addPageToApp(pageName, pathToPage, pageTemplatePath, getCorrectExtension);
217-
moduleUtils.insertExport(pathToPagesIndex(), componentName, `./${pageName}/${pageName}`);
217+
moduleUtils.insertExport(pathToPagesIndex(), componentName, `./${pageName}/${pageName}`, 'Page');
218218
moduleUtils.insertImport(routingModulePath, './pages', componentName);
219219
insertItemToArray(routingModulePath, navigationData.route);
220220
insertItemToArray(navigationModulePath, navigationData.navigation);

packages/devextreme-cli/src/templates/react/application/src/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { HashRouter as Router } from 'react-router-dom';
22
import './dx-styles.scss';
33
import LoadPanel from 'devextreme-react/load-panel';
44
import { NavigationProvider } from './contexts/navigation';
5-
import { AuthProvider, useAuth } from './contexts/auth';
5+
import { AuthProvider } from './contexts/auth';
6+
import { useAuth } from './contexts/auth-helpers';
67
import { useScreenSizeClass } from './utils/media-query';
78
import Content from './Content';
89
import UnauthenticatedContent from './UnauthenticatedContent';

packages/devextreme-cli/src/templates/react/application/src/Content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Routes, Route, Navigate } from 'react-router-dom';
22
import appInfo from './app-info';
3-
import routes from './app-routes';
3+
import { routes } from './app-routes';
44
import { <%=layout%> as SideNavBarLayout } from './layouts';
55
import { Footer } from './components';
66

packages/devextreme-cli/src/templates/react/application/src/app-routes.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HomePage, TasksPage, ProfilePage } from './pages';
2-
import { withNavigationWatcher } from './contexts/navigation';
2+
import { withNavigationWatcher } from './contexts/navigation-helpers';
33

4-
const routes = [<%=^empty%>
4+
const routeData = [<%=^empty%>
55
{
66
path: '/tasks',
77
element: TasksPage
@@ -16,7 +16,7 @@ const routes = [<%=^empty%>
1616
}
1717
<%=/empty%>];
1818

19-
export default routes.map(route => {
19+
export const routes = routeData.map(route => {
2020
return {
2121
...route,
2222
element: withNavigationWatcher(route.element, route.path)

packages/devextreme-cli/src/templates/react/application/src/components/login-form/LoginForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Form, {
1111
import LoadIndicator from 'devextreme-react/load-indicator';
1212
import Button from 'devextreme-react/button';
1313
import notify from 'devextreme/ui/notify';
14-
import { useAuth } from '../../contexts/auth';
14+
import { useAuth } from '../../contexts/auth-helpers';
1515

1616
import './LoginForm.scss';
1717

packages/devextreme-cli/src/templates/react/application/src/components/side-navigation-menu/SideNavigationMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useCallback, useMemo, useContext } from 'reac
22
import { TreeView<%=#isTypeScript%>, type TreeViewRef<%=/isTypeScript%> } from 'devextreme-react/tree-view';
33
import * as events from 'devextreme-react/common/core/events';
44
import { navigation } from '../../app-navigation';
5-
import { useNavigation } from '../../contexts/navigation';
5+
import { useNavigation } from '../../contexts/navigation-helpers';
66
import { useScreenSize } from '../../utils/media-query';
77
import './SideNavigationMenu.scss';
88
<%=#isTypeScript%>import type { SideNavigationMenuProps } from '../../types';<%=/isTypeScript%>

packages/devextreme-cli/src/templates/react/application/src/components/user-panel/UserPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo, useCallback } from 'react';
22
import { useNavigate } from "react-router-dom";
33
import DropDownButton from 'devextreme-react/drop-down-button';
44
import List from 'devextreme-react/list';
5-
import { useAuth } from '../../contexts/auth';
5+
import { useAuth } from '../../contexts/auth-helpers';
66
import './UserPanel.scss';
77
<%=#isTypeScript%>import type { UserPanelProps } from '../../types';<%=/isTypeScript%>
88

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { useContext } from 'react';
2+
import { AuthContext } from './auth';
3+
4+
const useAuth = () => useContext(AuthContext);
5+
6+
export {
7+
useAuth
8+
}

packages/devextreme-cli/src/templates/react/application/src/contexts/auth.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import React, { useState, useEffect, createContext, useContext, useCallback } from 'react';
1+
import React, { useState, useEffect, useCallback, createContext } from 'react';
22
import { getUser, signIn as sendSignInRequest } from '../api/auth';
33
<%=#isTypeScript%>import type { User, AuthContextType } from '../types';<%=/isTypeScript%>
44

5+
const AuthContext = createContext<%=#isTypeScript%><AuthContextType><%=/isTypeScript%>({ loading: false }<%=#isTypeScript%> as AuthContextType<%=/isTypeScript%>);
6+
57
function AuthProvider(props<%=#isTypeScript%>: React.PropsWithChildren<unknown><%=/isTypeScript%>) {
68
const [user, setUser] = useState<%=#isTypeScript%><User><%=/isTypeScript%>();
79
const [loading, setLoading] = useState(true);
@@ -36,7 +38,7 @@ function AuthProvider(props<%=#isTypeScript%>: React.PropsWithChildren<unknown><
3638
);
3739
}
3840

39-
const AuthContext = createContext<%=#isTypeScript%><AuthContextType><%=/isTypeScript%>({ loading: false }<%=#isTypeScript%> as AuthContextType<%=/isTypeScript%>);
40-
const useAuth = () => useContext(AuthContext);
41-
42-
export { AuthProvider, useAuth }
41+
export {
42+
AuthProvider,
43+
AuthContext,
44+
};
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React, { useContext, useEffect } from 'react';
2+
import { NavigationContext } from './navigation';
3+
4+
const useNavigation = () => useContext(NavigationContext);
5+
6+
function withNavigationWatcher(Component<%=#isTypeScript%>: React.ElementType<%=/isTypeScript%>, path<%=#isTypeScript%>: string<%=/isTypeScript%>) {
7+
const WrappedComponent = function (props<%=#isTypeScript%>: Record<string, unknown><%=/isTypeScript%>) {
8+
const { setNavigationData } = useNavigation();
9+
10+
useEffect(() => {
11+
setNavigationData<%=#isTypeScript%>!<%=/isTypeScript%>({ currentPath: path });
12+
}, [setNavigationData]);
13+
14+
return <Component {...props} />;
15+
}
16+
return <WrappedComponent />;
17+
}
18+
19+
export {
20+
useNavigation,
21+
withNavigationWatcher
22+
}

0 commit comments

Comments
 (0)