Cb 5180 remove styles module alias

webapp/package.json

@@ -11,12 +11,12 @@
     ]
   },
   "resolutions": {
-    "@types/react": "^18.2.63",
-    "@types/react-dom": "^18.2.19",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "mobx": "^6.12.0",
-    "mobx-react-lite": "^4.0.5"
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "mobx": "^6.12.3",
+    "mobx-react-lite": "^4.0.7"
   },
   "scripts": {
     "prebuild": "lerna run gql:gen --stream --parallel",
@@ -25,27 +25,27 @@
     "postinstall": "husky"
   },
   "devDependencies": {
-    "@testing-library/dom": "^9.3.4",
-    "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^14.2.1",
+    "@testing-library/dom": "^10.1.0",
+    "@testing-library/jest-dom": "^6.4.5",
+    "@testing-library/react": "^15.0.7",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.63",
-    "@types/react-dom": "^18.2.19",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "concurrently": "^8.2.2",
     "husky": "^9.0.11",
     "lerna": "5.5.4",
-    "mobx": "^6.12.0",
-    "mobx-react-lite": "^4.0.5",
-    "msw": "^2.2.2",
+    "mobx": "^6.12.3",
+    "mobx-react-lite": "^4.0.7",
+    "msw": "^2.3.0",
     "path-browserify": "~1.0.1",
     "prettier": "^3.2.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "reakit": "~1.3.11",
-    "reflect-metadata": "^0.2.1",
-    "rimraf": "~5.0.5",
-    "typescript": "^5.3.3",
+    "reflect-metadata": "^0.2.2",
+    "rimraf": "~5.0.7",
+    "typescript": "^5.4.5",
     "typescript-plugin-css-modules": "^5.1.0"
   },
   "dependencies": {},

webapp/packages/core-administration/package.json

@@ -29,10 +29,10 @@
     "@cloudbeaver/core-sdk": "~0.1.0",
     "@cloudbeaver/core-storage": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
-    "mobx": "^6.12.0"
+    "mobx": "^6.12.3"
   },
   "peerDependencies": {},
   "devDependencies": {
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.5"
   }
 }

webapp/packages/core-app/package.json

@@ -31,13 +31,13 @@
     "@cloudbeaver/core-ui": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
     "@cloudbeaver/core-version": "~0.1.0",
-    "mobx-react-lite": "^4.0.5",
-    "react": "^18.2.0"
+    "mobx-react-lite": "^4.0.7",
+    "react": "^18.3.1"
   },
   "peerDependencies": {},
   "devDependencies": {
-    "@types/react": "^18.2.63",
-    "typescript": "^5.3.3",
+    "@types/react": "^18.3.3",
+    "typescript": "^5.4.5",
     "typescript-plugin-css-modules": "^5.1.0"
   }
 }

webapp/packages/core-app/src/AppScreen/Main.m.css → webapp/packages/core-app/src/AppScreen/Main.module.css

@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 .space {
   composes: theme-typography--body2 theme-background-surface theme-text-on-surface from global;
   display: flex;

webapp/packages/core-app/src/AppScreen/Main.tsx

@@ -11,7 +11,7 @@ import { getComputed, Loader, Pane, ResizerControls, s, Split, useS, useSplitUse
 import { useService } from '@cloudbeaver/core-di';
 import { LeftBarPanelService, SideBarPanel, SideBarPanelService } from '@cloudbeaver/core-ui';
 
-import style from './Main.m.css';
+import style from './Main.module.css';
 import { RightArea } from './RightArea';
 
 export const Main = observer(function Main() {

webapp/packages/core-app/src/AppScreen/RightArea.module.css

@@ -0,0 +1,17 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.loader {
+  height: 100%;
+}
+.slideBox {
+  flex: 1;
+}
+.pane {
+  display: flex;
+  composes: theme-background-surface theme-text-on-surface from global;
+}

webapp/packages/core-app/src/AppScreen/RightArea.tsx

@@ -24,7 +24,7 @@ import { useService } from '@cloudbeaver/core-di';
 import { OptionsPanelService } from '@cloudbeaver/core-ui';
 
 import { AppScreenService } from './AppScreenService';
-import style from './RightArea.m.css';
+import style from './RightArea.module.css';
 
 interface Props {
   className?: string;

webapp/packages/core-app/src/Body.tsx

@@ -19,7 +19,7 @@ import { ThemeService } from '@cloudbeaver/core-theming';
 import { DNDProvider } from '@cloudbeaver/core-ui';
 import { useAppVersion } from '@cloudbeaver/core-version';
 
-import style from './Body.m.css';
+import style from './Body.module.css';
 import { useAppHeight } from './useAppHeight';
 import { useClientActivity } from './useClientActivity';
 

webapp/packages/core-authentication/package.json

@@ -29,7 +29,7 @@
     "@cloudbeaver/core-settings": "~0.1.0",
     "@cloudbeaver/core-storage": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
-    "mobx": "^6.12.0"
+    "mobx": "^6.12.3"
   },
   "peerDependencies": {},
   "devDependencies": {
@@ -42,7 +42,7 @@
     "@cloudbeaver/tests-runner": "~0.1.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@types/jest": "^29.5.12",
-    "msw": "^2.2.2",
-    "typescript": "^5.3.3"
+    "msw": "^2.3.0",
+    "typescript": "^5.4.5"
   }
 }

webapp/packages/core-blocks/package.json

@@ -30,9 +30,9 @@
     "@cloudbeaver/core-theming": "~0.1.0",
     "@cloudbeaver/core-utils": "~0.1.0",
     "go-split": "^3.4.7",
-    "mobx": "^6.12.0",
-    "mobx-react-lite": "^4.0.5",
-    "react": "^18.2.0",
+    "mobx": "^6.12.3",
+    "mobx-react-lite": "^4.0.7",
+    "react": "^18.3.1",
     "reakit": "~1.3.11",
     "reakit-utils": "^0.15.2"
   },
@@ -46,9 +46,9 @@
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.63",
-    "react": "^18.2.0",
-    "typescript": "^5.3.3",
+    "@types/react": "^18.3.3",
+    "react": "^18.3.1",
+    "typescript": "^5.4.5",
     "typescript-plugin-css-modules": "^5.1.0"
   }
 }

webapp/packages/core-blocks/src/ActionIconButton.tsx

@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import style from './ActionIconButton.m.css';
+import style from './ActionIconButton.module.css';
 import { IconButton, type IconButtonProps } from './IconButton';
 import { s } from './s';
 import { useS } from './useS';

webapp/packages/core-blocks/src/AppRefreshButton.m.css → webapp/packages/core-blocks/src/AppRefreshButton.module.css

@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 .button {
   color: white;
   font-weight: 500;

webapp/packages/core-blocks/src/AppRefreshButton.tsx

@@ -10,7 +10,7 @@ import type React from 'react';
 import { App, useService } from '@cloudbeaver/core-di';
 import { clsx } from '@cloudbeaver/core-utils';
 
-import style from './AppRefreshButton.m.css';
+import style from './AppRefreshButton.module.css';
 
 interface IProps {
   className?: string;

webapp/packages/core-blocks/src/Button.m.css → webapp/packages/core-blocks/src/Button.module.css

@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 .buttonLabel {
   composes: theme-button__label from global;
 }

webapp/packages/core-blocks/src/Button.tsx

@@ -8,7 +8,7 @@
 import { observable } from 'mobx';
 import { observer } from 'mobx-react-lite';
 
-import style from './Button.m.css';
+import style from './Button.module.css';
 import { IconOrImage } from './IconOrImage';
 import { Loader } from './Loader/Loader';
 import { s } from './s';

webapp/packages/core-blocks/src/Cell.tsx

@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import style from './Cell.m.css';
+import style from './Cell.module.css';
 import { Container } from './Containers/Container';
 import { s } from './s';
 import { useS } from './useS';

webapp/packages/core-blocks/src/Code.module.css

@@ -0,0 +1,12 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.codeContainer {
+    composes: theme-background-secondary theme-text-on-secondary from global;
+    padding: 16px;
+    border-radius: var(--theme-group-element-radius);
+}

webapp/packages/core-blocks/src/Code.tsx

@@ -5,10 +5,11 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import style from './Code.m.css';
+import { observer } from 'mobx-react-lite';
+
+import style from './Code.module.css';
 import { s } from './s';
 import { useS } from './useS';
-import {observer} from "mobx-react-lite";
 
 interface Props {
   className?: string;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogBody.m.css → webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogBody.module.css

@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 .body {
   flex: 1;
   box-sizing: content-box;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogBody.tsx

@@ -9,7 +9,7 @@ import { observer } from 'mobx-react-lite';
 
 import { s } from '../../s';
 import { useS } from '../../useS';
-import styles from './CommonDialogBody.m.css';
+import styles from './CommonDialogBody.module.css';
 
 interface Props {
   noBodyPadding?: boolean;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogFooter.module.css

@@ -0,0 +1,18 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.footer {
+  flex-shrink: 0;
+  padding: 0 24px 24px 24px;
+  display: flex;
+  z-index: 0;
+  box-sizing: border-box;
+
+  &:empty {
+    display: none;
+  }
+}

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogFooter.tsx

@@ -9,7 +9,7 @@ import { observer } from 'mobx-react-lite';
 
 import { s } from '../../s';
 import { useS } from '../../useS';
-import styles from './CommonDialogFooter.m.css';
+import styles from './CommonDialogFooter.module.css';
 
 interface Props {
   className?: string;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogHeader.tsx

@@ -12,7 +12,7 @@ import { IconOrImage } from '../../IconOrImage';
 import { useTranslate } from '../../localization/useTranslate';
 import { s } from '../../s';
 import { useS } from '../../useS';
-import styles from './CommonDialogHeader.m.css';
+import styles from './CommonDialogHeader.module.css';
 
 interface Props {
   title?: string;

webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx

@@ -14,7 +14,7 @@ import { s } from '../../s';
 import { useFocus } from '../../useFocus';
 import { useS } from '../../useS';
 import { DialogContext } from '../DialogContext';
-import styles from './CommonDialogWrapper.m.css';
+import styles from './CommonDialogWrapper.module.css';
 
 export interface CommonDialogWrapperProps {
   size?: 'small' | 'medium' | 'large';

webapp/packages/core-blocks/src/CommonDialog/ConfirmationDialog.module.css

@@ -0,0 +1,11 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+.footer {
+  align-items: center;
+  gap: 16px;
+}

webapp/packages/core-blocks/src/CommonDialog/ConfirmationDialog.tsx

@@ -17,7 +17,7 @@ import { CommonDialogBody } from './CommonDialog/CommonDialogBody';
 import { CommonDialogFooter } from './CommonDialog/CommonDialogFooter';
 import { CommonDialogHeader } from './CommonDialog/CommonDialogHeader';
 import { CommonDialogWrapper } from './CommonDialog/CommonDialogWrapper';
-import style from './ConfirmationDialog.m.css';
+import style from './ConfirmationDialog.module.css';
 
 export interface ConfirmationDialogPayload {
   icon?: string;