dbeaver/pro#6783 refactor: plugins bundles

webapp/packages/core-administration/package.json

@@ -12,7 +12,8 @@
   "description": "",
   "license": "Apache-2.0",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./module": "./lib/module.js"
   },
   "scripts": {
     "build": "tsc -b",
@@ -34,14 +35,15 @@
     "@cloudbeaver/core-settings": "workspace:*",
     "@cloudbeaver/core-storage": "workspace:*",
     "@cloudbeaver/core-utils": "workspace:*",
-    "@dbeaver/js-helpers": "workspace:^",
+    "@dbeaver/js-helpers": "workspace:*",
     "mobx": "^6",
     "tslib": "^2"
   },
   "devDependencies": {
     "@cloudbeaver/core-cli": "workspace:*",
     "@cloudbeaver/tsconfig": "workspace:*",
     "@dbeaver/cli": "workspace:*",
+    "rimraf": "^6",
     "typescript": "^5"
   }
 }

webapp/packages/core-administration/src/index.ts

@@ -7,7 +7,6 @@
  */
 
 import './module.js';
-export * from './manifest.js';
 export * from './AdministrationItem/AdministrationItemService.js';
 export * from './AdministrationItem/filterConfigurationWizard.js';
 export * from './AdministrationItem/IAdministrationItem.js';

webapp/packages/core-administration/src/module.ts

@@ -14,7 +14,7 @@ import { AdministrationScreenService } from './AdministrationScreen/Administrati
 import { AdministrationLocaleService } from './AdministrationLocaleService.js';
 import { AdministrationItemService } from './AdministrationItem/AdministrationItemService.js';
 
-ModuleRegistry.add({
+export default ModuleRegistry.add({
   name: '@cloudbeaver/core-administration',
 
   configure: serviceCollection => {

webapp/packages/core-app/package.json

@@ -12,7 +12,8 @@
   "description": "",
   "license": "Apache-2.0",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./module": "./lib/module.js"
   },
   "scripts": {
     "build": "tsc -b",
@@ -35,7 +36,7 @@
     "@cloudbeaver/core-ui": "workspace:*",
     "@cloudbeaver/core-utils": "workspace:*",
     "@cloudbeaver/core-version": "workspace:*",
-    "@dbeaver/ui-kit": "workspace:^",
+    "@dbeaver/ui-kit": "workspace:*",
     "mobx": "^6",
     "mobx-react-lite": "^4",
     "react": "^19",
@@ -46,6 +47,7 @@
     "@cloudbeaver/core-cli": "workspace:*",
     "@cloudbeaver/tsconfig": "workspace:*",
     "@types/react": "^19",
+    "rimraf": "^6",
     "typescript": "^5",
     "typescript-plugin-css-modules": "^5"
   }

webapp/packages/core-app/src/index.ts

@@ -15,6 +15,3 @@ export * from './AppLocaleService.js';
 
 // components
 export * from './BodyLazy.js';
-
-// Interfaces
-export * from './manifest.js';

webapp/packages/core-app/src/module.ts

@@ -11,7 +11,7 @@ import { AppScreenService } from './AppScreen/AppScreenService.js';
 import { AppScreenBootstrap } from './AppScreen/AppScreenBootstrap.js';
 import { AppLocaleService } from './AppLocaleService.js';
 
-ModuleRegistry.add({
+export default ModuleRegistry.add({
   name: '@cloudbeaver/core-app',
 
   configure: serviceCollection => {

webapp/packages/core-authentication/package.json

@@ -13,6 +13,7 @@
   "license": "Apache-2.0",
   "exports": {
     ".": "./lib/index.js",
+    "./module": "./lib/module.js",
     "./*": "./lib/*"
   },
   "scripts": {
@@ -34,17 +35,19 @@
     "@cloudbeaver/core-settings": "workspace:*",
     "@cloudbeaver/core-storage": "workspace:*",
     "@cloudbeaver/core-utils": "workspace:*",
-    "@dbeaver/js-helpers": "workspace:^",
+    "@dbeaver/js-helpers": "workspace:*",
     "mobx": "^6",
     "tslib": "^2"
   },
   "devDependencies": {
     "@cloudbeaver/core-cli": "workspace:*",
+    "@cloudbeaver/core-root": "workspace:*",
     "@cloudbeaver/core-sdk": "workspace:*",
+    "@cloudbeaver/core-settings": "workspace:*",
     "@cloudbeaver/tests-runner": "workspace:*",
     "@cloudbeaver/tsconfig": "workspace:*",
     "@dbeaver/cli": "workspace:*",
-    "@dbeaver/react-tests": "workspace:^",
+    "@dbeaver/react-tests": "workspace:*",
     "msw": "^2",
     "rimraf": "^6",
     "typescript": "^5",

webapp/packages/core-authentication/src/index.ts

@@ -8,7 +8,6 @@
 
 import './module.js';
 
-export * from './manifest.js';
 export * from './ELMRole.js';
 export * from './AppAuthService.js';
 export * from './AUTH_PROVIDER_LOCAL_ID.js';

webapp/packages/core-authentication/src/module.ts

@@ -31,7 +31,7 @@ import { AuthConfigurationsResource } from './AuthConfigurationsResource.js';
 import { AuthConfigurationParametersResource } from './AuthConfigurationParametersResource.js';
 import { AppAuthService } from './AppAuthService.js';
 
-ModuleRegistry.add({
+export default ModuleRegistry.add({
   name: '@cloudbeaver/core-authentication',
 
   configure: serviceCollection => {

webapp/packages/core-blocks/package.json

@@ -12,7 +12,8 @@
   "description": "",
   "license": "Apache-2.0",
   "exports": {
-    ".": "./lib/index.js"
+    ".": "./lib/index.js",
+    "./module": "./lib/module.js"
   },
   "scripts": {
     "build": "tsc -b",
@@ -57,13 +58,14 @@
     "@cloudbeaver/tests-runner": "workspace:*",
     "@cloudbeaver/tsconfig": "workspace:*",
     "@dbeaver/cli": "workspace:*",
-    "@dbeaver/react-tests": "workspace:^",
+    "@dbeaver/react-tests": "workspace:*",
     "@testing-library/jest-dom": "^6",
     "@testing-library/react": "^16",
     "@types/react": "^19",
     "mobx": "^6",
     "react": "^19",
     "react-dom": "^19",
+    "rimraf": "^6",
     "typescript": "^5",
     "typescript-plugin-css-modules": "^5",
     "vitest": "^3"

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

@@ -5,9 +5,9 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import type React from 'react';
+import { use } from 'react';
 
-import { App, useService } from '@cloudbeaver/core-di';
+import { AppContext } from '@cloudbeaver/core-di';
 import { clsx } from '@dbeaver/ui-kit';
 
 import style from './AppRefreshButton.module.css';
@@ -17,10 +17,14 @@ interface IProps {
 }
 
 export const AppRefreshButton: React.FC<IProps> = function AppRefreshButton({ className }) {
-  const app = useService(App);
+  const app = use(AppContext);
+
+  if (!app) {
+    return null;
+  }
 
   function refresh() {
-    app.restart();
+    app?.restart();
   }
 
   return (

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

@@ -19,6 +19,7 @@
   display: flex;
   margin: auto;
   padding: 16px 24px;
+  gap: 8px;
   flex-direction: column;
   align-items: center;
 }
@@ -29,4 +30,17 @@
 .details {
   padding: 8px 16px;
   white-space: pre-wrap;
+  font-size: 14px;
+
+  & summary {
+    cursor: pointer;
+    margin-bottom: 8px;
+  }
+
+  & code {
+    display: block;
+    font-size: 12px;
+    overflow: auto;
+    height: 250px;
+  }
 }

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

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -36,11 +36,19 @@ export const DisplayError = observer<Props>(function DisplayError({ root, childr
         {root && <AppRefreshButton />}
         {children}
         {error && (
-          <div className={s(styles, { details: true })}>
-            {error.toString()}
-            {stack && <br />}
-            {stack}
-          </div>
+          <details className={s(styles, { details: true })}>
+            <summary>Details</summary>
+            <p>
+              {error.toString()}
+              {stack && (
+                <>
+                  <br />
+                  <br />
+                </>
+              )}
+              <code>{stack}</code>
+            </p>
+          </details>
         )}
       </div>
     </div>

webapp/packages/core-blocks/src/index.ts

@@ -10,20 +10,20 @@
 
 export * from './AuthenticationProviderLoader.js';
 export * from './useAuthenticationAction.js';
 export * from './CommonDialog/CommonDialog/CommonDialogBody.js';
 export * from './CommonDialog/CommonDialog/CommonDialogFooter.js';
 export * from './CommonDialog/CommonDialog/CommonDialogHeader.js';
 export * from './CommonDialog/CommonDialog/CommonDialogWrapper.js';
 export * from './CommonDialog/ConfirmationDialog.js';
 export { default as ConfirmationDialogStyles } from './CommonDialog/ConfirmationDialog.module.css';
 export * from './CommonDialog/ConfirmationDialogDelete.js';
 export * from './CommonDialog/RenameDialog.js';
 export * from './CommonDialog/DialogsPortal.js';
 
 export * from './ErrorDetailsDialog/ErrorDetailsDialog.js';
 
 export * from './ComponentsRegistry/CRegistryLoader.js';
 export * from './ComponentsRegistry/registry.js';
 export * from './ComponentsRegistry/CRegistryList.js';
 export * from './ComponentsRegistry/IComponentsTreeNodeValidator.js';
 export * from './ComponentsRegistry/useParentProps.js';
@@ -251,7 +251,6 @@
 export * from './useListKeyboardNavigation.js';
 export * from './useMergeRefs.js';
 export * from './usePasswordValidation.js';
-export * from './manifest.js';
 export * from './importLazyComponent.js';
 export * from './ClickableLoader.js';
 export * from './FormControls/TagsComboboxLoader.js';

webapp/packages/core-blocks/src/module.ts

@@ -9,7 +9,7 @@
 import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di';
 import { BlocksLocaleService } from './BlocksLocaleService.js';
 
-ModuleRegistry.add({
+export default ModuleRegistry.add({
   name: '@cloudbeaver/core-blocks',
 
   configure: serviceCollection => {

webapp/packages/core-blocks/src/useS.ts

@@ -46,7 +46,16 @@
   const stylesRef = useRef<ComponentStyle[]>([]);
   const [patch, forceUpdate] = useState(0);
   const loadedStyles = useRef<BaseStyles[]>([]);
-  const themeService = useService(ThemeService);
+  let themeService: ThemeService | undefined;
+
+  try {
+    // this service not required, in some cases we don't have services initialized and need to show basic UI
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    themeService = useService(ThemeService);
+  } catch {
+    themeService = undefined;
+  }
+
   const [currentThemeId, setCurrentThemeId] = useState(() => themeService?.themeId);
   const lastThemeRef = useRef<string | undefined>(currentThemeId);
   const filteredStyles = themeService
@@ -111,7 +120,7 @@
     }
   });
 
   const styles = useMemo(() => combineStyles(loadedStyles.current), [patch, loadedStyles.current]);
 
   return styles as ExtractStyles<T>; // todo this method is called in each rerender
 }