diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json index ce7e4788c2..226cb470ba 100644 --- a/webapp/packages/core-administration/package.json +++ b/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,7 +35,7 @@ "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-storage": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "tslib": "^2" }, @@ -42,6 +43,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-administration/src/index.ts b/webapp/packages/core-administration/src/index.ts index c237b32308..07f3aecce1 100644 --- a/webapp/packages/core-administration/src/index.ts +++ b/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'; diff --git a/webapp/packages/core-administration/src/manifest.ts b/webapp/packages/core-administration/src/manifest.ts deleted file mode 100644 index 632983df02..0000000000 --- a/webapp/packages/core-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreAdministrationManifest: PluginManifest = { - info: { - name: 'Core Administration', - }, -}; diff --git a/webapp/packages/core-administration/src/module.ts b/webapp/packages/core-administration/src/module.ts index e012cce926..488ef4274a 100644 --- a/webapp/packages/core-administration/src/module.ts +++ b/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 => { diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json index ece4e0fc1a..280a545027 100644 --- a/webapp/packages/core-app/package.json +++ b/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" } diff --git a/webapp/packages/core-app/src/index.ts b/webapp/packages/core-app/src/index.ts index 4513ba88f4..b44de29398 100644 --- a/webapp/packages/core-app/src/index.ts +++ b/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'; diff --git a/webapp/packages/core-app/src/manifest.ts b/webapp/packages/core-app/src/manifest.ts deleted file mode 100644 index 561a28ebc1..0000000000 --- a/webapp/packages/core-app/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreAppManifest: PluginManifest = { - info: { - name: 'Core App', - }, -}; diff --git a/webapp/packages/core-app/src/module.ts b/webapp/packages/core-app/src/module.ts index 5bf704a5c9..fb93bccd7d 100644 --- a/webapp/packages/core-app/src/module.ts +++ b/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 => { diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json index 0d5eb82e9b..273671ff11 100644 --- a/webapp/packages/core-authentication/package.json +++ b/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", diff --git a/webapp/packages/core-authentication/src/index.ts b/webapp/packages/core-authentication/src/index.ts index f8fa35786d..fc811be9bf 100644 --- a/webapp/packages/core-authentication/src/index.ts +++ b/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'; diff --git a/webapp/packages/core-authentication/src/manifest.ts b/webapp/packages/core-authentication/src/manifest.ts deleted file mode 100644 index a78c4f8b1a..0000000000 --- a/webapp/packages/core-authentication/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreAuthenticationManifest: PluginManifest = { - info: { - name: 'Core Authentication', - }, -}; diff --git a/webapp/packages/core-authentication/src/module.ts b/webapp/packages/core-authentication/src/module.ts index c7a500c35a..e305873fc5 100644 --- a/webapp/packages/core-authentication/src/module.ts +++ b/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 => { diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index c7c5fe1723..91c39d04e0 100644 --- a/webapp/packages/core-blocks/package.json +++ b/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" diff --git a/webapp/packages/core-blocks/src/AppRefreshButton.tsx b/webapp/packages/core-blocks/src/AppRefreshButton.tsx index 6a01e31c3b..aff85c7dd6 100644 --- a/webapp/packages/core-blocks/src/AppRefreshButton.tsx +++ b/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 = function AppRefreshButton({ className }) { - const app = useService(App); + const app = use(AppContext); + + if (!app) { + return null; + } function refresh() { - app.restart(); + app?.restart(); } return ( diff --git a/webapp/packages/core-blocks/src/DisplayError.module.css b/webapp/packages/core-blocks/src/DisplayError.module.css index a5a26e487a..e6a93c1cbc 100644 --- a/webapp/packages/core-blocks/src/DisplayError.module.css +++ b/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; + } } diff --git a/webapp/packages/core-blocks/src/DisplayError.tsx b/webapp/packages/core-blocks/src/DisplayError.tsx index b7a68a0f22..a097128f5c 100644 --- a/webapp/packages/core-blocks/src/DisplayError.tsx +++ b/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(function DisplayError({ root, childr {root && } {children} {error && ( -
- {error.toString()} - {stack &&
} - {stack} -
+
+ Details +

+ {error.toString()} + {stack && ( + <> +
+
+ + )} + {stack} +

+
)} diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts index 0137386dea..4a25fed9e9 100644 --- a/webapp/packages/core-blocks/src/index.ts +++ b/webapp/packages/core-blocks/src/index.ts @@ -251,7 +251,6 @@ export * from './useUserData.js'; 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'; diff --git a/webapp/packages/core-blocks/src/manifest.ts b/webapp/packages/core-blocks/src/manifest.ts deleted file mode 100644 index f0c4a17165..0000000000 --- a/webapp/packages/core-blocks/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreBlocksManifest: PluginManifest = { - info: { - name: 'Core Blocks', - }, -}; diff --git a/webapp/packages/core-blocks/src/module.ts b/webapp/packages/core-blocks/src/module.ts index 70e758d397..9527e8c29a 100644 --- a/webapp/packages/core-blocks/src/module.ts +++ b/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 => { diff --git a/webapp/packages/core-blocks/src/useS.ts b/webapp/packages/core-blocks/src/useS.ts index fd263564d3..3dae70a50d 100644 --- a/webapp/packages/core-blocks/src/useS.ts +++ b/webapp/packages/core-blocks/src/useS.ts @@ -46,7 +46,16 @@ export function useS(...componentStyles: [...T]): Ex const stylesRef = useRef([]); const [patch, forceUpdate] = useState(0); const loadedStyles = useRef([]); - 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(currentThemeId); const filteredStyles = themeService diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json index cccc6850fd..b7e2c0933a 100644 --- a/webapp/packages/core-bootstrap/package.json +++ b/webapp/packages/core-bootstrap/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", @@ -21,41 +22,10 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-administration": "workspace:*", "@cloudbeaver/core-app": "workspace:*", - "@cloudbeaver/core-authentication": "workspace:*", "@cloudbeaver/core-blocks": "workspace:*", - "@cloudbeaver/core-browser": "workspace:*", - "@cloudbeaver/core-browser-cookies": "workspace:*", - "@cloudbeaver/core-browser-settings": "workspace:*", - "@cloudbeaver/core-client-activity": "workspace:*", - "@cloudbeaver/core-connections": "workspace:*", "@cloudbeaver/core-di": "workspace:*", - "@cloudbeaver/core-dialogs": "workspace:*", - "@cloudbeaver/core-events": "workspace:*", "@cloudbeaver/core-executor": "workspace:*", - "@cloudbeaver/core-links": "workspace:*", - "@cloudbeaver/core-localization": "workspace:*", - "@cloudbeaver/core-navigation-tree": "workspace:*", - "@cloudbeaver/core-product": "workspace:*", - "@cloudbeaver/core-projects": "workspace:*", - "@cloudbeaver/core-resource": "workspace:*", - "@cloudbeaver/core-resource-manager": "workspace:*", - "@cloudbeaver/core-root": "workspace:*", - "@cloudbeaver/core-routing": "workspace:*", - "@cloudbeaver/core-sdk": "workspace:*", - "@cloudbeaver/core-server-localization": "workspace:*", - "@cloudbeaver/core-session-localization": "workspace:*", - "@cloudbeaver/core-settings": "workspace:*", - "@cloudbeaver/core-settings-localization": "workspace:*", - "@cloudbeaver/core-settings-user": "workspace:*", - "@cloudbeaver/core-storage": "workspace:*", - "@cloudbeaver/core-task-manager": "workspace:*", - "@cloudbeaver/core-theming": "workspace:*", - "@cloudbeaver/core-ui": "workspace:*", - "@cloudbeaver/core-version": "workspace:*", - "@cloudbeaver/core-version-update": "workspace:*", - "@cloudbeaver/core-view": "workspace:*", "mobx": "^6", "react": "^19", "react-dom": "^19", @@ -66,6 +36,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", "@types/react-dom": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/core-bootstrap/src/bootstrap.ts b/webapp/packages/core-bootstrap/src/bootstrap.ts index e9eeb37257..327b080d98 100644 --- a/webapp/packages/core-bootstrap/src/bootstrap.ts +++ b/webapp/packages/core-bootstrap/src/bootstrap.ts @@ -7,15 +7,13 @@ */ import { configure } from 'mobx'; -import { App, type PluginManifest } from '@cloudbeaver/core-di'; +import { App, type IModule } from '@cloudbeaver/core-di'; import { executionExceptionContext, SyncExecutor } from '@cloudbeaver/core-executor'; -import { coreManifests } from './manifest.js'; - -export async function bootstrap(plugins: PluginManifest[]): Promise { +export async function bootstrap(modules: IModule[]): Promise { configure({ enforceActions: 'never' }); - const app = new App([...coreManifests, ...plugins]); + const app = new App(modules); (window as any).internalRestartApp = () => app.restart(); let exception: Error | null = null; @@ -26,7 +24,7 @@ export async function bootstrap(plugins: PluginManifest[]): Promise { } const { renderLayout } = await import('./renderLayout.js'); - const render = renderLayout(); + const render = renderLayout(app); const unmountExecutor = new SyncExecutor(); unmountExecutor.addHandler(() => render.unmount()); diff --git a/webapp/packages/core-bootstrap/src/index.ts b/webapp/packages/core-bootstrap/src/index.ts index d40f85d501..372fd54584 100644 --- a/webapp/packages/core-bootstrap/src/index.ts +++ b/webapp/packages/core-bootstrap/src/index.ts @@ -6,8 +6,4 @@ * you may not use this file except in compliance with the License. */ -import { coreManifests } from './manifest.js'; - export * from './bootstrap.js'; - -export default coreManifests; diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts deleted file mode 100644 index 9e200935d0..0000000000 --- a/webapp/packages/core-bootstrap/src/manifest.ts +++ /dev/null @@ -1,83 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import { coreAdministrationManifest } from '@cloudbeaver/core-administration'; -import { coreAppManifest } from '@cloudbeaver/core-app'; -import { coreAuthenticationManifest } from '@cloudbeaver/core-authentication'; -import { coreBlocksManifest } from '@cloudbeaver/core-blocks'; -import { coreBrowserManifest } from '@cloudbeaver/core-browser'; -import { coreBrowserCookiesManifest } from '@cloudbeaver/core-browser-cookies'; -import { coreBrowserSettingsManifest } from '@cloudbeaver/core-browser-settings'; -import { coreClientActivityManifest } from '@cloudbeaver/core-client-activity'; -import { coreConnectionsManifest } from '@cloudbeaver/core-connections'; -import { coreDIManifest, type PluginManifest } from '@cloudbeaver/core-di'; -import { coreDialogsManifest } from '@cloudbeaver/core-dialogs'; -import { coreEventsManifest } from '@cloudbeaver/core-events'; -import { coreLinksManifest } from '@cloudbeaver/core-links'; -import { coreLocalizationManifest } from '@cloudbeaver/core-localization'; -import { coreNavigationTree } from '@cloudbeaver/core-navigation-tree'; -import { coreProductManifest } from '@cloudbeaver/core-product'; -import { coreProjectsManifest } from '@cloudbeaver/core-projects'; -import { coreResourceManifest } from '@cloudbeaver/core-resource'; -import { resourceManagerManifest } from '@cloudbeaver/core-resource-manager'; -import { coreRootManifest } from '@cloudbeaver/core-root'; -import { coreRoutingManifest } from '@cloudbeaver/core-routing'; -import { coreSDKManifest } from '@cloudbeaver/core-sdk'; -import { coreServerLocalization } from '@cloudbeaver/core-server-localization'; -import { coreSessionLocalization } from '@cloudbeaver/core-session-localization'; -import { coreSettingsManifest } from '@cloudbeaver/core-settings'; -import { coreSettingsLocalizationManifest } from '@cloudbeaver/core-settings-localization'; -import { coreSettingsUserManifest } from '@cloudbeaver/core-settings-user'; -import { coreStorageManifest } from '@cloudbeaver/core-storage'; -import { coreTaskManagerManifest } from '@cloudbeaver/core-task-manager'; -import { coreThemingManifest } from '@cloudbeaver/core-theming'; -import { coreUIManifest } from '@cloudbeaver/core-ui'; -import { coreVersionManifest } from '@cloudbeaver/core-version'; -import { coreVersionUpdateManifest } from '@cloudbeaver/core-version-update'; -import { coreViewManifest } from '@cloudbeaver/core-view'; - -export const coreManifests: PluginManifest[] = [ - { - info: { - name: 'DBeaver core', - }, - }, - coreDIManifest, - coreRoutingManifest, // important, should be first because the router starts in load phase first after all plugins register phase - coreBrowserManifest, - coreThemingManifest, - coreLocalizationManifest, - coreSettingsLocalizationManifest, - coreSessionLocalization, - coreServerLocalization, - coreBlocksManifest, - coreSettingsManifest, - coreStorageManifest, - coreEventsManifest, - coreResourceManifest, - coreSDKManifest, - coreRootManifest, - coreLinksManifest, - coreBrowserSettingsManifest, - coreBrowserCookiesManifest, - coreProductManifest, - coreProjectsManifest, - coreAuthenticationManifest, - coreUIManifest, - coreViewManifest, - coreVersionManifest, - coreVersionUpdateManifest, - coreConnectionsManifest, - coreAdministrationManifest, - coreDialogsManifest, - resourceManagerManifest, - coreAppManifest, - coreClientActivityManifest, - coreNavigationTree, - coreSettingsUserManifest, - coreTaskManagerManifest, -]; diff --git a/webapp/packages/core-bootstrap/src/renderLayout.tsx b/webapp/packages/core-bootstrap/src/renderLayout.tsx index 728cbfb2e6..0067083eb1 100644 --- a/webapp/packages/core-bootstrap/src/renderLayout.tsx +++ b/webapp/packages/core-bootstrap/src/renderLayout.tsx @@ -10,7 +10,7 @@ import { createRoot, type Root } from 'react-dom/client'; import { BodyLazy } from '@cloudbeaver/core-app'; import { DisplayError, ErrorBoundary, Loader, s } from '@cloudbeaver/core-blocks'; -import { HideAppLoadingScreen, IServiceProvider, ServiceProvider } from '@cloudbeaver/core-di'; +import { App, AppContext, HideAppLoadingScreen, IServiceProvider, ServiceProvider } from '@cloudbeaver/core-di'; import styles from './renderLayout.module.css'; @@ -21,7 +21,7 @@ interface IRender { unmount(): void; } -export function renderLayout(): IRender { +export function renderLayout(app: App): IRender { let root: Root | undefined; return { @@ -47,16 +47,18 @@ export function renderLayout(): IRender { }, renderApp(serviceProvider: IServiceProvider | null) { this.initRoot().render( - } simple> - - } root> - }> - - - - - - , + + } simple> + + } root> + }> + + + + + + + , ); }, renderError(serviceProvider: IServiceProvider | null, exception?: any) { @@ -64,12 +66,14 @@ export function renderLayout(): IRender { console.error(exception); } this.initRoot().render( - } simple> - - - - - , + + } simple> + + + + + + , ); }, }; diff --git a/webapp/packages/core-bootstrap/tsconfig.json b/webapp/packages/core-bootstrap/tsconfig.json index f7fb79f6be..5ecdad1732 100644 --- a/webapp/packages/core-bootstrap/tsconfig.json +++ b/webapp/packages/core-bootstrap/tsconfig.json @@ -7,113 +7,20 @@ "composite": true }, "references": [ - { - "path": "../core-administration" - }, { "path": "../core-app" }, - { - "path": "../core-authentication" - }, { "path": "../core-blocks" }, - { - "path": "../core-browser" - }, - { - "path": "../core-browser-cookies" - }, - { - "path": "../core-browser-settings" - }, { "path": "../core-cli" }, - { - "path": "../core-client-activity" - }, - { - "path": "../core-connections" - }, { "path": "../core-di" }, - { - "path": "../core-dialogs" - }, - { - "path": "../core-events" - }, { "path": "../core-executor" - }, - { - "path": "../core-links" - }, - { - "path": "../core-localization" - }, - { - "path": "../core-navigation-tree" - }, - { - "path": "../core-product" - }, - { - "path": "../core-projects" - }, - { - "path": "../core-resource" - }, - { - "path": "../core-resource-manager" - }, - { - "path": "../core-root" - }, - { - "path": "../core-routing" - }, - { - "path": "../core-sdk" - }, - { - "path": "../core-server-localization" - }, - { - "path": "../core-session-localization" - }, - { - "path": "../core-settings" - }, - { - "path": "../core-settings-localization" - }, - { - "path": "../core-settings-user" - }, - { - "path": "../core-storage" - }, - { - "path": "../core-task-manager" - }, - { - "path": "../core-theming" - }, - { - "path": "../core-ui" - }, - { - "path": "../core-version" - }, - { - "path": "../core-version-update" - }, - { - "path": "../core-view" } ], "include": [ diff --git a/webapp/packages/core-browser-cookies/package.json b/webapp/packages/core-browser-cookies/package.json index 0341bf3400..d1401c7fd5 100644 --- a/webapp/packages/core-browser-cookies/package.json +++ b/webapp/packages/core-browser-cookies/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", @@ -30,6 +31,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-browser-cookies/src/index.ts b/webapp/packages/core-browser-cookies/src/index.ts index 63290cbdab..21e88eebcb 100644 --- a/webapp/packages/core-browser-cookies/src/index.ts +++ b/webapp/packages/core-browser-cookies/src/index.ts @@ -8,4 +8,3 @@ import './module.js'; export * from './CookiesService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-browser-cookies/src/manifest.ts b/webapp/packages/core-browser-cookies/src/manifest.ts deleted file mode 100644 index 3f37d90390..0000000000 --- a/webapp/packages/core-browser-cookies/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreBrowserCookiesManifest: PluginManifest = { - info: { - name: 'Core Browser Cookies', - }, -}; diff --git a/webapp/packages/core-browser-cookies/src/module.ts b/webapp/packages/core-browser-cookies/src/module.ts index 44f6062d80..28f75f0ff4 100644 --- a/webapp/packages/core-browser-cookies/src/module.ts +++ b/webapp/packages/core-browser-cookies/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { CookiesService } from './CookiesService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-browser-cookies', configure: serviceCollection => { diff --git a/webapp/packages/core-browser-settings/package.json b/webapp/packages/core-browser-settings/package.json index c25c074fe8..2aa4fd245b 100644 --- a/webapp/packages/core-browser-settings/package.json +++ b/webapp/packages/core-browser-settings/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", @@ -32,7 +33,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-browser-settings/src/index.ts b/webapp/packages/core-browser-settings/src/index.ts index 30c811baff..bd99497469 100644 --- a/webapp/packages/core-browser-settings/src/index.ts +++ b/webapp/packages/core-browser-settings/src/index.ts @@ -8,4 +8,3 @@ import './module.js'; export * from './BrowserSettingsService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-browser-settings/src/manifest.ts b/webapp/packages/core-browser-settings/src/manifest.ts deleted file mode 100644 index 5a3462db0c..0000000000 --- a/webapp/packages/core-browser-settings/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreBrowserSettingsManifest: PluginManifest = { - info: { - name: 'Core Browser Settings', - }, -}; diff --git a/webapp/packages/core-browser-settings/src/module.ts b/webapp/packages/core-browser-settings/src/module.ts index 5679a3894e..2440d0662d 100644 --- a/webapp/packages/core-browser-settings/src/module.ts +++ b/webapp/packages/core-browser-settings/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, Dependency, ModuleRegistry, proxy } from '@cloudbeaver/core- import { LocaleService } from './LocaleService.js'; import { BrowserSettingsService } from './BrowserSettingsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-browser-settings', configure: serviceCollection => { diff --git a/webapp/packages/core-browser/package.json b/webapp/packages/core-browser/package.json index 26b6a60c54..4b86251bb0 100644 --- a/webapp/packages/core-browser/package.json +++ b/webapp/packages/core-browser/package.json @@ -14,6 +14,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*": "./lib/*.js" }, "scripts": { @@ -42,6 +43,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vite": "^7" } diff --git a/webapp/packages/core-browser/src/index.ts b/webapp/packages/core-browser/src/index.ts index 7a2c4dadf3..faf1d08f11 100644 --- a/webapp/packages/core-browser/src/index.ts +++ b/webapp/packages/core-browser/src/index.ts @@ -10,6 +10,5 @@ import './module.js'; export * from './IndexedDB/IndexedDBService.js'; export * from './IndexedDB/IndexedDB.js'; export * from './LocalStorageSaveService.js'; -export * from './manifest.js'; export * from './promptForFiles.js'; export * from './ServiceWorkerService.js'; diff --git a/webapp/packages/core-browser/src/manifest.ts b/webapp/packages/core-browser/src/manifest.ts deleted file mode 100644 index fffabc8351..0000000000 --- a/webapp/packages/core-browser/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreBrowserManifest: PluginManifest = { - info: { - name: 'Core Browser', - }, -}; diff --git a/webapp/packages/core-browser/src/module.ts b/webapp/packages/core-browser/src/module.ts index 3296cfe352..2a000a1a17 100644 --- a/webapp/packages/core-browser/src/module.ts +++ b/webapp/packages/core-browser/src/module.ts @@ -12,7 +12,7 @@ import { ServiceWorkerBootstrap } from './ServiceWorkerBootstrap.js'; import { LocalStorageSaveService } from './LocalStorageSaveService.js'; import { IndexedDBService } from './IndexedDB/IndexedDBService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-browser', configure: serviceCollection => { diff --git a/webapp/packages/core-cli/_templates/plugin/new/index.ts.ejs.t b/webapp/packages/core-cli/_templates/plugin/new/index.ts.ejs.t index d7d6e32f2c..1581c6e41e 100644 --- a/webapp/packages/core-cli/_templates/plugin/new/index.ts.ejs.t +++ b/webapp/packages/core-cli/_templates/plugin/new/index.ts.ejs.t @@ -1,8 +1,4 @@ --- to: <%= name %>/src/index.ts --- -import './module.js'; -import { <%= h.changeCase.camel(name) %>Manifest } from './manifest.js'; - -export default <%= h.changeCase.camel(name) %>Manifest; -export { <%= h.changeCase.camel(name) %>Manifest }; \ No newline at end of file +import './module.js'; \ No newline at end of file diff --git a/webapp/packages/core-cli/_templates/plugin/new/manifest.ts.ejs.t b/webapp/packages/core-cli/_templates/plugin/new/manifest.ts.ejs.t deleted file mode 100644 index f55708dbe8..0000000000 --- a/webapp/packages/core-cli/_templates/plugin/new/manifest.ts.ejs.t +++ /dev/null @@ -1,10 +0,0 @@ ---- -to: <%= name %>/src/manifest.ts ---- -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const <%= h.changeCase.camel(name) %>Manifest: PluginManifest = { - info: { - name: '<%= h.changeCase.sentence(name) %>', - }, -}; \ No newline at end of file diff --git a/webapp/packages/core-cli/_templates/plugin/new/module.ts.ejs.t b/webapp/packages/core-cli/_templates/plugin/new/module.ts.ejs.t index b405b93c69..08725ce860 100644 --- a/webapp/packages/core-cli/_templates/plugin/new/module.ts.ejs.t +++ b/webapp/packages/core-cli/_templates/plugin/new/module.ts.ejs.t @@ -4,7 +4,7 @@ to: <%= name %>/src/module.ts import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { <%= h.changeCase.pascal(name) %>Bootstrap } from './<%= h.changeCase.pascal(name) %>Bootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/<%= name %>', configure: serviceCollection => { diff --git a/webapp/packages/core-cli/_templates/plugin/new/package.json.ejs.t b/webapp/packages/core-cli/_templates/plugin/new/package.json.ejs.t index bf8d005620..7f614bb66f 100644 --- a/webapp/packages/core-cli/_templates/plugin/new/package.json.ejs.t +++ b/webapp/packages/core-cli/_templates/plugin/new/package.json.ejs.t @@ -15,7 +15,8 @@ to: <%= name %>/package.json "description": "", "license": "Apache-2.0", "exports": { - ".": "./lib/index.js" + ".": "./lib/index.js", + "./module": "./lib/module.js" }, "scripts": { "build": "tsc -b", diff --git a/webapp/packages/core-cli/package.json b/webapp/packages/core-cli/package.json index db04cb464e..92639aee82 100644 --- a/webapp/packages/core-cli/package.json +++ b/webapp/packages/core-cli/package.json @@ -40,18 +40,17 @@ }, "dependencies": { "glob": "^11", + "js-yaml": "^4", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/tsconfig": "workspace:*", - "@swc/core": "^1", "@types/js-yaml": "^4", "@types/node": "^22", "enquirer": "^2", "execa": "^9", "glob": "^11", "hygen": "^6", - "js-yaml": "^4", "typescript": "^5" } } diff --git a/webapp/packages/core-cli/src/dependency-validator/IGNORED_DEPENDENCIES.ts b/webapp/packages/core-cli/src/dependency-validator/IGNORED_DEPENDENCIES.ts index beebdf32af..71224903cf 100644 --- a/webapp/packages/core-cli/src/dependency-validator/IGNORED_DEPENDENCIES.ts +++ b/webapp/packages/core-cli/src/dependency-validator/IGNORED_DEPENDENCIES.ts @@ -1,8 +1,8 @@ /* * 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. */ -export const IGNORED_DEPENDENCIES = ['tslib']; +export const IGNORED_DEPENDENCIES = ['tslib', 'child_process', 'fs', 'path', 'readline']; diff --git a/webapp/packages/core-cli/src/dependency-validator/KNOWN_PEER_DEPS_MAP.ts b/webapp/packages/core-cli/src/dependency-validator/KNOWN_PEER_DEPS_MAP.ts index c42fe20a7a..35d79e850c 100644 --- a/webapp/packages/core-cli/src/dependency-validator/KNOWN_PEER_DEPS_MAP.ts +++ b/webapp/packages/core-cli/src/dependency-validator/KNOWN_PEER_DEPS_MAP.ts @@ -6,8 +6,9 @@ * you may not use this file except in compliance with the License. */ export const KNOWN_PEER_DEPS_MAP: Record = { + 'react-leaflet': ['leaflet'], 'mobx-react-lite': ['mobx', 'react-dom'], - '@testing-library/react': ['@testing-library/dom', 'react-dom'], + '@testing-library/react': ['@testing-library/jest-dom', 'react-dom'], '@typescript-eslint/eslint-plugin': ['typescript'], 'react-minisearch': ['minisearch'], }; diff --git a/webapp/packages/core-cli/src/dependency-validator/validateDependencies.ts b/webapp/packages/core-cli/src/dependency-validator/validateDependencies.ts index 5d2aa677dd..5275f511aa 100644 --- a/webapp/packages/core-cli/src/dependency-validator/validateDependencies.ts +++ b/webapp/packages/core-cli/src/dependency-validator/validateDependencies.ts @@ -40,6 +40,18 @@ export function validateDependencies(currentPackageRoot: string) { packageLogger.log('info', true, `Analyzing ${currentPackage['name']}`); + const isUseRimraf = Object.values(currentPackage.scripts || {}).some(script => script.includes('rimraf')); + + if (isUseRimraf) { + devDependencies.add('rimraf'); + } + + const isUseDbeaverCli = Object.values(currentPackage.scripts || {}).some(script => script.includes('dbeaver-test')); + + if (isUseDbeaverCli) { + devDependencies.add('@dbeaver/cli'); + } + const isUseCoreCli = Object.values(currentPackage.scripts || {}).some(script => script.includes('core-cli')); if (isUseCoreCli && currentPackage.name !== '@cloudbeaver/core-cli') { @@ -75,6 +87,9 @@ export function validateDependencies(currentPackageRoot: string) { if (isCSSModuleFileRegex) { devDependencies.add('typescript-plugin-css-modules'); } + if (isTestFile) { + devDependencies.add('@dbeaver/react-tests'); + } if (isTSXFileRegex) { if (isTestFile) { diff --git a/webapp/packages/core-client-activity/package.json b/webapp/packages/core-client-activity/package.json index 039979edf7..0f3ab7798d 100644 --- a/webapp/packages/core-client-activity/package.json +++ b/webapp/packages/core-client-activity/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", @@ -31,7 +32,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-client-activity/src/index.ts b/webapp/packages/core-client-activity/src/index.ts index c09b5cde4c..f0ebfe914e 100644 --- a/webapp/packages/core-client-activity/src/index.ts +++ b/webapp/packages/core-client-activity/src/index.ts @@ -8,4 +8,3 @@ import './module.js'; export * from './ClientActivityService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-client-activity/src/manifest.ts b/webapp/packages/core-client-activity/src/manifest.ts deleted file mode 100644 index dff6170aa2..0000000000 --- a/webapp/packages/core-client-activity/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreClientActivityManifest: PluginManifest = { - info: { - name: 'Core Client Activity', - }, -}; diff --git a/webapp/packages/core-client-activity/src/module.ts b/webapp/packages/core-client-activity/src/module.ts index fd79a43c8b..0205ddf5c7 100644 --- a/webapp/packages/core-client-activity/src/module.ts +++ b/webapp/packages/core-client-activity/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { ClientActivityService } from './ClientActivityService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-client-activity', configure: serviceCollection => { diff --git a/webapp/packages/core-connections/package.json b/webapp/packages/core-connections/package.json index 44a7150ebe..61db1437df 100644 --- a/webapp/packages/core-connections/package.json +++ b/webapp/packages/core-connections/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", @@ -37,7 +38,7 @@ "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "react": "^19", "tslib": "^2" @@ -46,6 +47,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-connections/src/index.ts b/webapp/packages/core-connections/src/index.ts index 3fb8a5cf2a..cf3a56fe40 100644 --- a/webapp/packages/core-connections/src/index.ts +++ b/webapp/packages/core-connections/src/index.ts @@ -64,5 +64,3 @@ export * from './useDBDriver.js'; export * from './USER_NAME_PROPERTY_ID.js'; export * from './parseConnectionKey.js'; export * from './DBDriverExpertSettingsResource.js'; - -export { manifest as coreConnectionsManifest } from './manifest.js'; diff --git a/webapp/packages/core-connections/src/manifest.ts b/webapp/packages/core-connections/src/manifest.ts deleted file mode 100644 index d8421e44ec..0000000000 --- a/webapp/packages/core-connections/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Core Connections', - }, -}; diff --git a/webapp/packages/core-connections/src/module.ts b/webapp/packages/core-connections/src/module.ts index 991dbcaf8a..79c173a1b1 100644 --- a/webapp/packages/core-connections/src/module.ts +++ b/webapp/packages/core-connections/src/module.ts @@ -34,7 +34,7 @@ import { ConnectionExecutionContextResource } from './ConnectionExecutionContext import { ConnectionDialectResource } from './ConnectionDialectResource.js'; import { DBDriverExpertSettingsResource } from './DBDriverExpertSettingsResource.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-connections', configure: serviceCollection => { diff --git a/webapp/packages/core-data-context/package.json b/webapp/packages/core-data-context/package.json index c4f40199a2..e56b8f16c5 100644 --- a/webapp/packages/core-data-context/package.json +++ b/webapp/packages/core-data-context/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", @@ -31,6 +32,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-data-context/src/index.ts b/webapp/packages/core-data-context/src/index.ts index fcde8d2d52..c85f418caa 100644 --- a/webapp/packages/core-data-context/src/index.ts +++ b/webapp/packages/core-data-context/src/index.ts @@ -15,4 +15,3 @@ export * from './DataContext/IDataContextProvider.js'; export * from './DataContext/useDataContext.js'; export * from './DataContext/DataContextGetter.js'; export * from './DataContext/useDataContextLink.js'; -export { coreDataContextManifest } from './manifest.js'; diff --git a/webapp/packages/core-data-context/src/manifest.ts b/webapp/packages/core-data-context/src/manifest.ts deleted file mode 100644 index 00763f3f40..0000000000 --- a/webapp/packages/core-data-context/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreDataContextManifest: PluginManifest = { - info: { - name: 'Core Data Context', - }, -}; diff --git a/webapp/packages/core-di/package.json b/webapp/packages/core-di/package.json index f274596a03..8ed015a0ae 100644 --- a/webapp/packages/core-di/package.json +++ b/webapp/packages/core-di/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", @@ -23,9 +24,8 @@ }, "dependencies": { "@cloudbeaver/core-executor": "workspace:*", - "@wroud/di": "^0", + "@wroud/di": "^0.18.3", "@wroud/di-react": "^0", - "mobx": "^6", "react": "^19", "tslib": "^2" }, @@ -33,8 +33,10 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", + "@wroud/di": "^0.18.3", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-di/src/App.ts b/webapp/packages/core-di/src/App.ts index 2e2e30656c..0836277a09 100644 --- a/webapp/packages/core-di/src/App.ts +++ b/webapp/packages/core-di/src/App.ts @@ -11,8 +11,7 @@ import { Executor, type IExecutor } from '@cloudbeaver/core-executor'; import { Bootstrap } from './Bootstrap.js'; import { Dependency } from './Dependency.js'; import { IServiceProvider } from './IServiceProvider.js'; -import type { PluginManifest } from './PluginManifest.js'; -import { ModuleRegistry, ServiceContainerBuilder } from '@wroud/di'; +import { ModuleRegistry, ServiceContainerBuilder, type IModule } from '@wroud/di'; import { IPreloadService } from './IPreloadService.js'; export interface IStartData { @@ -22,13 +21,13 @@ export interface IStartData { export class App { readonly onStart: IExecutor; - private readonly plugins: PluginManifest[]; + private readonly modules: IModule[]; private builder: ServiceContainerBuilder | null; private serviceProvider: IServiceProvider | null; - constructor(plugins: PluginManifest[] = []) { - this.plugins = plugins; + constructor(plugins: IModule[] = []) { + this.modules = plugins; this.onStart = new Executor(undefined, () => true); this.serviceProvider = null; this.builder = null; @@ -58,8 +57,8 @@ export class App { this.builder = null; } - addPlugin(manifest: PluginManifest): void { - this.plugins.push(manifest); + addModule(module: IModule): void { + this.modules.push(module); } getServiceProvider(): IServiceProvider | null { @@ -71,9 +70,23 @@ export class App { if (!this.builder) { this.builder = new ServiceContainerBuilder(); this.builder.addSingleton(App, this); + let modulesToLoad = [...this.modules]; + const requiredModules = new Set(ModuleRegistry); - for (const module of ModuleRegistry) { + if (this.modules.length === 0) { + modulesToLoad = [...requiredModules]; + } + + for (const module of modulesToLoad) { await module.configure(this.builder); + requiredModules.delete(module); + } + + if (requiredModules.size > 0) { + console.warn( + 'Some required modules were not added to the application: ', + [...requiredModules].map(m => m.name).sort((a, b) => a.localeCompare(b)), + ); } await this.builder.validate(); diff --git a/webapp/packages/core-di/src/__tests__/app-init/app-init.test.ts b/webapp/packages/core-di/src/__tests__/app-init/app-init.test.ts index f0a7ab6e78..e84ccd34c1 100644 --- a/webapp/packages/core-di/src/__tests__/app-init/app-init.test.ts +++ b/webapp/packages/core-di/src/__tests__/app-init/app-init.test.ts @@ -8,12 +8,12 @@ import { expect, test } from 'vitest'; import { App } from '../../App.js'; -import { manifest } from './manifest.js'; import { TestBootstrap } from './TestBootstrap.js'; import { TestService } from './TestService.js'; +import testModule from './module.js'; test.skip('App Initialization', async () => { - const app = new App([manifest]); + const app = new App([testModule]); await (app as any).registerServices(); const serviceProvider = app.getServiceProvider()!; diff --git a/webapp/packages/core-di/src/__tests__/app-init/manifest.ts b/webapp/packages/core-di/src/__tests__/app-init/module.ts similarity index 77% rename from webapp/packages/core-di/src/__tests__/app-init/manifest.ts rename to webapp/packages/core-di/src/__tests__/app-init/module.ts index d966d67ee4..2eeb498413 100644 --- a/webapp/packages/core-di/src/__tests__/app-init/manifest.ts +++ b/webapp/packages/core-di/src/__tests__/app-init/module.ts @@ -6,18 +6,11 @@ * you may not use this file except in compliance with the License. */ import { ModuleRegistry, proxy } from '@wroud/di'; -import type { PluginManifest } from '../../PluginManifest.js'; import { TestService } from './TestService.js'; import { TestBootstrap } from './TestBootstrap.js'; import { Bootstrap } from '../../Bootstrap.js'; -export const manifest: PluginManifest = { - info: { - name: 'Sample Manifest', - }, -}; - -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: 'test-manifest', configure(serviceCollection) { serviceCollection.addSingleton(TestService).addSingleton(Bootstrap, proxy(TestBootstrap)).addSingleton(TestBootstrap); diff --git a/webapp/packages/core-di/src/index.ts b/webapp/packages/core-di/src/index.ts index 8a6a78baf7..26aeb467ee 100644 --- a/webapp/packages/core-di/src/index.ts +++ b/webapp/packages/core-di/src/index.ts @@ -16,9 +16,8 @@ export * from './Dependency.js'; export * from './dependencyInjectorContext.js'; export * from './DIService.js'; export * from './injectable.js'; -export * from './PluginManifest.js'; +export * from './useApp.js'; export * from './useService.js'; export * from './IServiceProvider.js'; export * from './AppLoadingScreen/HideAppLoadingScreenLazy.js'; export * from './AppLoadingScreen/displayUpdateStatus.js'; -export { manifest as coreDIManifest } from './manifest.js'; diff --git a/webapp/packages/core-di/src/injectable.ts b/webapp/packages/core-di/src/injectable.ts index e1ba95293e..85ac290d93 100644 --- a/webapp/packages/core-di/src/injectable.ts +++ b/webapp/packages/core-di/src/injectable.ts @@ -5,4 +5,4 @@ * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ -export { injectable, ModuleRegistry, optional, proxy } from '@wroud/di'; +export { injectable, ModuleRegistry, type IModule, optional, proxy } from '@wroud/di'; diff --git a/webapp/packages/core-di/src/manifest.ts b/webapp/packages/core-di/src/manifest.ts deleted file mode 100644 index 4d332dfac9..0000000000 --- a/webapp/packages/core-di/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from './PluginManifest.js'; - -export const manifest: PluginManifest = { - info: { - name: 'Core DI', - }, -}; diff --git a/webapp/packages/core-di/src/PluginManifest.ts b/webapp/packages/core-di/src/useApp.ts similarity index 61% rename from webapp/packages/core-di/src/PluginManifest.ts rename to webapp/packages/core-di/src/useApp.ts index 784149802b..988482e8eb 100644 --- a/webapp/packages/core-di/src/PluginManifest.ts +++ b/webapp/packages/core-di/src/useApp.ts @@ -6,9 +6,7 @@ * you may not use this file except in compliance with the License. */ -export interface PluginManifest { - info: { - name: string; - defaultSettings?: Record; - }; -} +import { createContext } from 'react'; +import type { App } from './App.js'; + +export const AppContext = createContext(null); diff --git a/webapp/packages/core-dialogs/package.json b/webapp/packages/core-dialogs/package.json index e1334ad442..01757d2785 100644 --- a/webapp/packages/core-dialogs/package.json +++ b/webapp/packages/core-dialogs/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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-dialogs/src/index.ts b/webapp/packages/core-dialogs/src/index.ts index 1cc1fee5af..c030c3d234 100644 --- a/webapp/packages/core-dialogs/src/index.ts +++ b/webapp/packages/core-dialogs/src/index.ts @@ -8,4 +8,3 @@ import './module.js'; export * from './CommonDialog/CommonDialogService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-dialogs/src/manifest.ts b/webapp/packages/core-dialogs/src/manifest.ts deleted file mode 100644 index b548a9c663..0000000000 --- a/webapp/packages/core-dialogs/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreDialogsManifest: PluginManifest = { - info: { - name: 'Core Dialogs', - }, -}; diff --git a/webapp/packages/core-dialogs/src/module.ts b/webapp/packages/core-dialogs/src/module.ts index 160e40310f..df87fb5c4a 100644 --- a/webapp/packages/core-dialogs/src/module.ts +++ b/webapp/packages/core-dialogs/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { CommonDialogService } from './CommonDialog/CommonDialogService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-dialogs', configure: serviceCollection => { diff --git a/webapp/packages/core-events/package.json b/webapp/packages/core-events/package.json index e36c70ce25..4f18058c7f 100644 --- a/webapp/packages/core-events/package.json +++ b/webapp/packages/core-events/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,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-events/src/index.ts b/webapp/packages/core-events/src/index.ts index f1297b0f0d..29582c7e91 100644 --- a/webapp/packages/core-events/src/index.ts +++ b/webapp/packages/core-events/src/index.ts @@ -14,4 +14,3 @@ export * from './INotification.js'; export * from './UIError.js'; export * from './ExceptionsCatcherService.js'; export * from './EventsSettingsService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-events/src/manifest.ts b/webapp/packages/core-events/src/manifest.ts deleted file mode 100644 index 9c149bcad2..0000000000 --- a/webapp/packages/core-events/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreEventsManifest: PluginManifest = { - info: { - name: 'Core Events', - }, -}; diff --git a/webapp/packages/core-events/src/module.ts b/webapp/packages/core-events/src/module.ts index 2b9719866d..b755379c7c 100644 --- a/webapp/packages/core-events/src/module.ts +++ b/webapp/packages/core-events/src/module.ts @@ -12,7 +12,7 @@ import { LocaleService } from './LocaleService.js'; import { ExceptionsCatcherService } from './ExceptionsCatcherService.js'; import { EventsSettingsService } from './EventsSettingsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-events', configure: serviceCollection => { diff --git a/webapp/packages/core-executor/package.json b/webapp/packages/core-executor/package.json index bd58da33fb..6efcd90265 100644 --- a/webapp/packages/core-executor/package.json +++ b/webapp/packages/core-executor/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", @@ -29,6 +30,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-extensions/package.json b/webapp/packages/core-extensions/package.json index 3cb8ac131e..62a75695e8 100644 --- a/webapp/packages/core-extensions/package.json +++ b/webapp/packages/core-extensions/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", @@ -26,6 +27,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-links/package.json b/webapp/packages/core-links/package.json index 251630d0d9..626b778ff7 100644 --- a/webapp/packages/core-links/package.json +++ b/webapp/packages/core-links/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", @@ -22,13 +23,13 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-di": "workspace:*", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-links/src/index.ts b/webapp/packages/core-links/src/index.ts index a84737dd77..a017d3219e 100644 --- a/webapp/packages/core-links/src/index.ts +++ b/webapp/packages/core-links/src/index.ts @@ -8,4 +8,3 @@ export * from './WebsiteLinks.js'; export * from './GithubLinks.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-links/src/manifest.ts b/webapp/packages/core-links/src/manifest.ts deleted file mode 100644 index 3a4c09d147..0000000000 --- a/webapp/packages/core-links/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreLinksManifest: PluginManifest = { - info: { - name: 'Core Links', - }, -}; diff --git a/webapp/packages/core-links/tsconfig.json b/webapp/packages/core-links/tsconfig.json index 2f98b7d8db..e229701eed 100644 --- a/webapp/packages/core-links/tsconfig.json +++ b/webapp/packages/core-links/tsconfig.json @@ -12,9 +12,6 @@ }, { "path": "../core-cli" - }, - { - "path": "../core-di" } ], "include": [ diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json index 762eb7b5bc..78476471ea 100644 --- a/webapp/packages/core-localization/package.json +++ b/webapp/packages/core-localization/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", @@ -31,7 +32,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-localization/src/index.ts b/webapp/packages/core-localization/src/index.ts index 0d498664be..85f647b10f 100644 --- a/webapp/packages/core-localization/src/index.ts +++ b/webapp/packages/core-localization/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './LocalizationService.js'; export * from './Locale.js'; export * from './TLocalizationToken.js'; diff --git a/webapp/packages/core-localization/src/manifest.ts b/webapp/packages/core-localization/src/manifest.ts deleted file mode 100644 index ff6b7f08f0..0000000000 --- a/webapp/packages/core-localization/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreLocalizationManifest: PluginManifest = { - info: { - name: 'Core Localization', - }, -}; diff --git a/webapp/packages/core-localization/src/module.ts b/webapp/packages/core-localization/src/module.ts index 7171775d74..2338e89a02 100644 --- a/webapp/packages/core-localization/src/module.ts +++ b/webapp/packages/core-localization/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry, proxy } from '@cloudbeaver/core-di'; import { LocalizationService } from './LocalizationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-localization', configure: serviceCollection => { diff --git a/webapp/packages/core-navigation-tree/package.json b/webapp/packages/core-navigation-tree/package.json index bd3fc46fdc..9846ed2023 100644 --- a/webapp/packages/core-navigation-tree/package.json +++ b/webapp/packages/core-navigation-tree/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,16 +36,16 @@ "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-ui": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", - "@cloudbeaver/tests-runner": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-navigation-tree/src/index.ts b/webapp/packages/core-navigation-tree/src/index.ts index 209dadb425..97b7dfbbc1 100644 --- a/webapp/packages/core-navigation-tree/src/index.ts +++ b/webapp/packages/core-navigation-tree/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './NAVIGATION_TREE_SETTINGS_GROUP.js'; export * from './NavTreeSettingsService.js'; diff --git a/webapp/packages/core-navigation-tree/src/manifest.ts b/webapp/packages/core-navigation-tree/src/manifest.ts deleted file mode 100644 index fa11411172..0000000000 --- a/webapp/packages/core-navigation-tree/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreNavigationTree: PluginManifest = { - info: { - name: 'Core Navigation Tree', - }, -}; diff --git a/webapp/packages/core-navigation-tree/src/module.ts b/webapp/packages/core-navigation-tree/src/module.ts index 33ac19a295..c1c0ee963a 100644 --- a/webapp/packages/core-navigation-tree/src/module.ts +++ b/webapp/packages/core-navigation-tree/src/module.ts @@ -15,7 +15,7 @@ import { DBObjectResource } from './NodesManager/DBObjectResource.js'; import { NavTreeSettingsService } from './NavTreeSettingsService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-navigation-tree', configure: serviceCollection => { diff --git a/webapp/packages/core-navigation-tree/tsconfig.json b/webapp/packages/core-navigation-tree/tsconfig.json index 4b15e4d446..4f2e236ab6 100644 --- a/webapp/packages/core-navigation-tree/tsconfig.json +++ b/webapp/packages/core-navigation-tree/tsconfig.json @@ -57,9 +57,6 @@ }, { "path": "../core-utils" - }, - { - "path": "../tests-runner" } ], "include": [ diff --git a/webapp/packages/core-notifications/package.json b/webapp/packages/core-notifications/package.json index ebf4358e85..37c9e02212 100644 --- a/webapp/packages/core-notifications/package.json +++ b/webapp/packages/core-notifications/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,6 +36,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/core-product/package.json b/webapp/packages/core-product/package.json index 1ad973c36c..7e3c051bea 100644 --- a/webapp/packages/core-product/package.json +++ b/webapp/packages/core-product/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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-product/src/index.ts b/webapp/packages/core-product/src/index.ts index 0a654bfbcf..57f5864970 100644 --- a/webapp/packages/core-product/src/index.ts +++ b/webapp/packages/core-product/src/index.ts @@ -8,4 +8,3 @@ import './module.js'; export * from './ProductSettingsService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-product/src/manifest.ts b/webapp/packages/core-product/src/manifest.ts deleted file mode 100644 index 03d96b5187..0000000000 --- a/webapp/packages/core-product/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreProductManifest: PluginManifest = { - info: { - name: 'Core Product', - }, -}; diff --git a/webapp/packages/core-product/src/module.ts b/webapp/packages/core-product/src/module.ts index 452d4971fc..284f1ae23d 100644 --- a/webapp/packages/core-product/src/module.ts +++ b/webapp/packages/core-product/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { ProductSettingsService } from './ProductSettingsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-product', configure: serviceCollection => { diff --git a/webapp/packages/core-projects/package.json b/webapp/packages/core-projects/package.json index a41b1e317d..170901d829 100644 --- a/webapp/packages/core-projects/package.json +++ b/webapp/packages/core-projects/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", @@ -37,6 +38,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-projects/src/index.ts b/webapp/packages/core-projects/src/index.ts index 4c4d7ac301..ba440db700 100644 --- a/webapp/packages/core-projects/src/index.ts +++ b/webapp/packages/core-projects/src/index.ts @@ -17,4 +17,3 @@ export * from './ProjectInfoResource.js'; export * from './ProjectsService.js'; export * from './NAV_NODE_TYPE_PROJECT.js'; export * from './NavTree/getProjectNodeId.js'; -export { manifest as coreProjectsManifest } from './manifest.js'; diff --git a/webapp/packages/core-projects/src/manifest.ts b/webapp/packages/core-projects/src/manifest.ts deleted file mode 100644 index e2d51eb585..0000000000 --- a/webapp/packages/core-projects/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Core Projects', - }, -}; diff --git a/webapp/packages/core-projects/src/module.ts b/webapp/packages/core-projects/src/module.ts index ba4a04333e..978a6ee591 100644 --- a/webapp/packages/core-projects/src/module.ts +++ b/webapp/packages/core-projects/src/module.ts @@ -12,7 +12,7 @@ import { ProjectInfoResource } from './ProjectInfoResource.js'; import { ProjectInfoEventHandler } from './ProjectInfoEventHandler.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-projects', configure: serviceCollection => { diff --git a/webapp/packages/core-resource-manager/package.json b/webapp/packages/core-resource-manager/package.json index 05d72827bc..eb4da4b303 100644 --- a/webapp/packages/core-resource-manager/package.json +++ b/webapp/packages/core-resource-manager/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", @@ -37,6 +38,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-resource-manager/src/index.ts b/webapp/packages/core-resource-manager/src/index.ts index ad791b7c4b..415d73f314 100644 --- a/webapp/packages/core-resource-manager/src/index.ts +++ b/webapp/packages/core-resource-manager/src/index.ts @@ -20,4 +20,3 @@ export * from './NAV_NODE_TYPE_RM_RESOURCE.js'; export * from './RESOURCES_NODE_PATH.js'; export * from './isRMProjectNode.js'; export * from './isRMResourceNode.js'; -export { resourceManagerManifest } from './manifest.js'; diff --git a/webapp/packages/core-resource-manager/src/manifest.ts b/webapp/packages/core-resource-manager/src/manifest.ts deleted file mode 100644 index f75de3e048..0000000000 --- a/webapp/packages/core-resource-manager/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const resourceManagerManifest: PluginManifest = { - info: { - name: 'Resource Manager Core', - }, -}; diff --git a/webapp/packages/core-resource-manager/src/module.ts b/webapp/packages/core-resource-manager/src/module.ts index a4c0c3e900..8613faca86 100644 --- a/webapp/packages/core-resource-manager/src/module.ts +++ b/webapp/packages/core-resource-manager/src/module.ts @@ -14,7 +14,7 @@ import { ResourceManagerResource } from './ResourceManagerResource.js'; import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-resource-manager', configure: serviceCollection => { diff --git a/webapp/packages/core-resource/package.json b/webapp/packages/core-resource/package.json index 1fca4df296..6387b451aa 100644 --- a/webapp/packages/core-resource/package.json +++ b/webapp/packages/core-resource/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", @@ -22,7 +23,6 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-executor": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "mobx": "^6", @@ -32,8 +32,9 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "mobx": "^6", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-resource/src/index.ts b/webapp/packages/core-resource/src/index.ts index 5ffb0fa53f..0804835ec3 100644 --- a/webapp/packages/core-resource/src/index.ts +++ b/webapp/packages/core-resource/src/index.ts @@ -33,4 +33,3 @@ export * from './Resource/ResourceKeyAlias.js'; export * from './Resource/ResourceKeyList.js'; export * from './Resource/ResourceKeyListAlias.js'; export * from './Resource/ResourceKeyUtils.js'; -export { coreResourceManifest } from './manifest.js'; diff --git a/webapp/packages/core-resource/src/manifest.ts b/webapp/packages/core-resource/src/manifest.ts deleted file mode 100644 index d5282f8543..0000000000 --- a/webapp/packages/core-resource/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreResourceManifest: PluginManifest = { - info: { - name: 'Core Resource', - }, -}; diff --git a/webapp/packages/core-resource/tsconfig.json b/webapp/packages/core-resource/tsconfig.json index 8358241007..8aa931dd6b 100644 --- a/webapp/packages/core-resource/tsconfig.json +++ b/webapp/packages/core-resource/tsconfig.json @@ -16,9 +16,6 @@ { "path": "../core-cli" }, - { - "path": "../core-di" - }, { "path": "../core-executor" }, diff --git a/webapp/packages/core-root/package.json b/webapp/packages/core-root/package.json index 292c29e230..7f7014aef7 100644 --- a/webapp/packages/core-root/package.json +++ b/webapp/packages/core-root/package.json @@ -13,6 +13,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*": "./lib/*" }, "scripts": { @@ -41,7 +42,9 @@ "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/tests-runner": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "@dbeaver/react-tests": "workspace:*", "msw": "^2", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-root/src/index.ts b/webapp/packages/core-root/src/index.ts index a124a17182..7e8d9821bd 100644 --- a/webapp/packages/core-root/src/index.ts +++ b/webapp/packages/core-root/src/index.ts @@ -47,4 +47,3 @@ export * from './WindowEventsService.js'; export * from './ServerLicenseStatusResource.js'; export * from './AsyncTask/AsyncTask.js'; export * from './AsyncTask/AsyncTaskInfoService.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-root/src/manifest.ts b/webapp/packages/core-root/src/manifest.ts deleted file mode 100644 index 201884d152..0000000000 --- a/webapp/packages/core-root/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreRootManifest: PluginManifest = { - info: { - name: 'Core Root', - }, -}; diff --git a/webapp/packages/core-root/src/module.ts b/webapp/packages/core-root/src/module.ts index 5adc65299e..5fd27cb9f2 100644 --- a/webapp/packages/core-root/src/module.ts +++ b/webapp/packages/core-root/src/module.ts @@ -40,7 +40,7 @@ import { DataSynchronizationService } from './DataSynchronization/DataSynchroniz import { AsyncTaskInfoService } from './AsyncTask/AsyncTaskInfoService.js'; import { AsyncTaskInfoEventHandler } from './AsyncTask/AsyncTaskInfoEventHandler.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-root', configure: serviceCollection => { diff --git a/webapp/packages/core-root/tsconfig.json b/webapp/packages/core-root/tsconfig.json index 392f62ff47..e9d5179fed 100644 --- a/webapp/packages/core-root/tsconfig.json +++ b/webapp/packages/core-root/tsconfig.json @@ -11,6 +11,9 @@ "composite": true }, "references": [ + { + "path": "../../common-react/@dbeaver/react-tests" + }, { "path": "../core-cli" }, diff --git a/webapp/packages/core-routing/package.json b/webapp/packages/core-routing/package.json index 2639a2666b..a1d6dc1416 100644 --- a/webapp/packages/core-routing/package.json +++ b/webapp/packages/core-routing/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", @@ -32,6 +33,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-routing/src/index.ts b/webapp/packages/core-routing/src/index.ts index f121e9f952..c255b783f5 100644 --- a/webapp/packages/core-routing/src/index.ts +++ b/webapp/packages/core-routing/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './Screen/IScreen.js'; export * from './Screen/ScreenService.js'; export * from './RouterService.js'; diff --git a/webapp/packages/core-routing/src/manifest.ts b/webapp/packages/core-routing/src/manifest.ts deleted file mode 100644 index a9b09340a1..0000000000 --- a/webapp/packages/core-routing/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreRoutingManifest: PluginManifest = { - info: { - name: 'Core Routing', - }, -}; diff --git a/webapp/packages/core-routing/src/module.ts b/webapp/packages/core-routing/src/module.ts index 4d758d5b9a..e3f1d8856d 100644 --- a/webapp/packages/core-routing/src/module.ts +++ b/webapp/packages/core-routing/src/module.ts @@ -11,7 +11,7 @@ import { WindowsService } from './WindowsService.js'; import { ScreenService } from './Screen/ScreenService.js'; import { RouterService } from './RouterService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-routing', configure: serviceCollection => { diff --git a/webapp/packages/core-sdk/package.json b/webapp/packages/core-sdk/package.json index 7162a10c25..576c361e92 100644 --- a/webapp/packages/core-sdk/package.json +++ b/webapp/packages/core-sdk/package.json @@ -12,7 +12,8 @@ "description": "", "license": "Apache-2.0", "exports": { - ".": "./lib/index.js" + ".": "./lib/index.js", + "./module": "./lib/module.js" }, "scripts": { "clean": "rimraf node_modules", @@ -26,6 +27,7 @@ "dependencies": { "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", + "@graphql-typed-document-node/core": "^3", "axios": "^1", "graphql": "^16", "graphql-request": "^7", @@ -43,10 +45,10 @@ "@graphql-codegen/typescript-graphql-files-modules": "^3", "@graphql-codegen/typescript-graphql-request": "^6", "@graphql-codegen/typescript-operations": "^4", - "@graphql-typed-document-node/core": "^3", "@parcel/watcher": "^2", "graphql": "^16", "graphql-tag": "^2", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-sdk/src/index.ts b/webapp/packages/core-sdk/src/index.ts index c0eaf04622..a5deed93f5 100644 --- a/webapp/packages/core-sdk/src/index.ts +++ b/webapp/packages/core-sdk/src/index.ts @@ -24,5 +24,4 @@ export * from './SDKGraphQLErrorExtensions.js'; export * from './ServerInternalError.js'; export * from './ServiceError.js'; export * from './SessionError.js'; -export * from './manifest.js'; export * from './getObjectPropertyValue.js'; diff --git a/webapp/packages/core-sdk/src/manifest.ts b/webapp/packages/core-sdk/src/manifest.ts deleted file mode 100644 index 10ca267938..0000000000 --- a/webapp/packages/core-sdk/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreSDKManifest: PluginManifest = { - info: { - name: 'Core SDK', - }, -}; diff --git a/webapp/packages/core-sdk/src/module.ts b/webapp/packages/core-sdk/src/module.ts index 7c61b0511e..524dfc0723 100644 --- a/webapp/packages/core-sdk/src/module.ts +++ b/webapp/packages/core-sdk/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { GraphQLService } from './GraphQLService.js'; import { EnvironmentService } from './EnvironmentService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-sdk', configure: serviceCollection => { diff --git a/webapp/packages/core-server-localization/package.json b/webapp/packages/core-server-localization/package.json index be00064066..0542a58838 100644 --- a/webapp/packages/core-server-localization/package.json +++ b/webapp/packages/core-server-localization/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", @@ -31,6 +32,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-server-localization/src/index.ts b/webapp/packages/core-server-localization/src/index.ts index eaf15e0f2e..c465e1ac53 100644 --- a/webapp/packages/core-server-localization/src/index.ts +++ b/webapp/packages/core-server-localization/src/index.ts @@ -7,4 +7,3 @@ */ import './module.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-server-localization/src/manifest.ts b/webapp/packages/core-server-localization/src/manifest.ts deleted file mode 100644 index 20786ba965..0000000000 --- a/webapp/packages/core-server-localization/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreServerLocalization: PluginManifest = { - info: { - name: 'Core Server Localization', - }, -}; diff --git a/webapp/packages/core-server-localization/src/module.ts b/webapp/packages/core-server-localization/src/module.ts index 435e915c90..691e59d469 100644 --- a/webapp/packages/core-server-localization/src/module.ts +++ b/webapp/packages/core-server-localization/src/module.ts @@ -9,7 +9,7 @@ import { Dependency, ModuleRegistry } from '@cloudbeaver/core-di'; import { ServerLocalizationService } from './ServerLocalizationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-server-localization', configure: serviceCollection => { diff --git a/webapp/packages/core-session-localization/package.json b/webapp/packages/core-session-localization/package.json index 819e770ed8..564a28f163 100644 --- a/webapp/packages/core-session-localization/package.json +++ b/webapp/packages/core-session-localization/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", @@ -32,6 +33,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-session-localization/src/index.ts b/webapp/packages/core-session-localization/src/index.ts index eaf15e0f2e..c465e1ac53 100644 --- a/webapp/packages/core-session-localization/src/index.ts +++ b/webapp/packages/core-session-localization/src/index.ts @@ -7,4 +7,3 @@ */ import './module.js'; -export * from './manifest.js'; diff --git a/webapp/packages/core-session-localization/src/manifest.ts b/webapp/packages/core-session-localization/src/manifest.ts deleted file mode 100644 index c4daf3caf1..0000000000 --- a/webapp/packages/core-session-localization/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreSessionLocalization: PluginManifest = { - info: { - name: 'Core Session Localization', - }, -}; diff --git a/webapp/packages/core-session-localization/src/module.ts b/webapp/packages/core-session-localization/src/module.ts index f5263f95d0..13f8326750 100644 --- a/webapp/packages/core-session-localization/src/module.ts +++ b/webapp/packages/core-session-localization/src/module.ts @@ -9,7 +9,7 @@ import { Dependency, ModuleRegistry } from '@cloudbeaver/core-di'; import { SessionLocalizationService } from './SessionLocalizationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-session-localization', configure: serviceCollection => { diff --git a/webapp/packages/core-settings-localization/package.json b/webapp/packages/core-settings-localization/package.json index 65de9ae0c1..a269f45688 100644 --- a/webapp/packages/core-settings-localization/package.json +++ b/webapp/packages/core-settings-localization/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", @@ -33,7 +34,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-settings-localization/src/index.ts b/webapp/packages/core-settings-localization/src/index.ts index 52abfa6074..16ff24fd67 100644 --- a/webapp/packages/core-settings-localization/src/index.ts +++ b/webapp/packages/core-settings-localization/src/index.ts @@ -7,5 +7,4 @@ */ import './module.js'; -export * from './manifest.js'; export * from './SettingsLocalizationService.js'; diff --git a/webapp/packages/core-settings-localization/src/manifest.ts b/webapp/packages/core-settings-localization/src/manifest.ts deleted file mode 100644 index 0cbc2da545..0000000000 --- a/webapp/packages/core-settings-localization/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreSettingsLocalizationManifest: PluginManifest = { - info: { - name: 'Core Settings Localization', - }, -}; diff --git a/webapp/packages/core-settings-localization/src/module.ts b/webapp/packages/core-settings-localization/src/module.ts index 09f57ac40b..ce1eb13971 100644 --- a/webapp/packages/core-settings-localization/src/module.ts +++ b/webapp/packages/core-settings-localization/src/module.ts @@ -12,7 +12,7 @@ import { SettingsLocalizationBootstrap } from './SettingsLocalizationBootstrap.j import { LocalizationSettingsManagerService } from './LocalizationSettingsManagerService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-settings-localization', configure: serviceCollection => { diff --git a/webapp/packages/core-settings-user/package.json b/webapp/packages/core-settings-user/package.json index ca9e9b011f..a4a3f7ec4f 100644 --- a/webapp/packages/core-settings-user/package.json +++ b/webapp/packages/core-settings-user/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", @@ -36,6 +37,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-settings-user/src/index.ts b/webapp/packages/core-settings-user/src/index.ts index 444822fbfd..869bfc3af3 100644 --- a/webapp/packages/core-settings-user/src/index.ts +++ b/webapp/packages/core-settings-user/src/index.ts @@ -7,6 +7,5 @@ */ import './module.js'; -export * from './manifest.js'; export * from './UserSettingsService.js'; diff --git a/webapp/packages/core-settings-user/src/manifest.ts b/webapp/packages/core-settings-user/src/manifest.ts deleted file mode 100644 index e657564c45..0000000000 --- a/webapp/packages/core-settings-user/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreSettingsUserManifest: PluginManifest = { - info: { - name: 'Core User Settings', - }, -}; diff --git a/webapp/packages/core-settings-user/src/module.ts b/webapp/packages/core-settings-user/src/module.ts index 8e26f21daa..eb635453ef 100644 --- a/webapp/packages/core-settings-user/src/module.ts +++ b/webapp/packages/core-settings-user/src/module.ts @@ -11,7 +11,7 @@ import { SettingsUserBootstrap } from './SettingsUserBootstrap.js'; import { UserSettingsService } from './UserSettingsService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-settings-user', configure: serviceCollection => { diff --git a/webapp/packages/core-settings/package.json b/webapp/packages/core-settings/package.json index 0aec6be91f..23152eed2c 100644 --- a/webapp/packages/core-settings/package.json +++ b/webapp/packages/core-settings/package.json @@ -13,6 +13,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*": "./lib/*" }, "scripts": { @@ -27,17 +28,19 @@ "@cloudbeaver/core-executor": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/core-executor": "workspace:*", + "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/tests-runner": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/core-settings/src/index.ts b/webapp/packages/core-settings/src/index.ts index 321a124533..b95ce21e7f 100644 --- a/webapp/packages/core-settings/src/index.ts +++ b/webapp/packages/core-settings/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './createSettingsOverrideResolver.js'; export * from './createSettingsAliasResolver.js'; export * from './SettingsScopeType.js'; diff --git a/webapp/packages/core-settings/src/manifest.ts b/webapp/packages/core-settings/src/manifest.ts deleted file mode 100644 index 143929746e..0000000000 --- a/webapp/packages/core-settings/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreSettingsManifest: PluginManifest = { - info: { - name: 'Core Settings', - }, -}; diff --git a/webapp/packages/core-settings/src/module.ts b/webapp/packages/core-settings/src/module.ts index 0c36b84ccd..7a94ed5551 100644 --- a/webapp/packages/core-settings/src/module.ts +++ b/webapp/packages/core-settings/src/module.ts @@ -13,7 +13,7 @@ import { SettingsProviderService } from './SettingsProviderService.js'; import { SettingsManagerService } from './SettingsManager/SettingsManagerService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-settings', configure: serviceCollection => { diff --git a/webapp/packages/core-storage/package.json b/webapp/packages/core-storage/package.json index 64e38e5aa2..df668925a2 100644 --- a/webapp/packages/core-storage/package.json +++ b/webapp/packages/core-storage/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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-storage/src/index.ts b/webapp/packages/core-storage/src/index.ts index 8b73eaf0ad..76feb694d1 100644 --- a/webapp/packages/core-storage/src/index.ts +++ b/webapp/packages/core-storage/src/index.ts @@ -7,5 +7,4 @@ */ import './module.js'; -export * from './manifest.js'; export * from './StorageService.js'; diff --git a/webapp/packages/core-storage/src/manifest.ts b/webapp/packages/core-storage/src/manifest.ts deleted file mode 100644 index c5afd506ac..0000000000 --- a/webapp/packages/core-storage/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreStorageManifest: PluginManifest = { - info: { - name: 'Core Storage', - }, -}; diff --git a/webapp/packages/core-storage/src/module.ts b/webapp/packages/core-storage/src/module.ts index fd561e1e2b..d526505fbc 100644 --- a/webapp/packages/core-storage/src/module.ts +++ b/webapp/packages/core-storage/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { StorageService } from './StorageService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-storage', configure: serviceCollection => { diff --git a/webapp/packages/core-task-manager/package.json b/webapp/packages/core-task-manager/package.json index feb475dd6f..b75304df70 100644 --- a/webapp/packages/core-task-manager/package.json +++ b/webapp/packages/core-task-manager/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", @@ -30,6 +31,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-task-manager/src/index.ts b/webapp/packages/core-task-manager/src/index.ts index 715b25ad0d..7a4f0cf90a 100644 --- a/webapp/packages/core-task-manager/src/index.ts +++ b/webapp/packages/core-task-manager/src/index.ts @@ -7,10 +7,6 @@ */ import './module.js'; -import { coreTaskManagerManifest } from './manifest.js'; export * from './ITaskDescriptor.js'; export * from './TaskManagerService.js'; - -export { coreTaskManagerManifest }; -export default coreTaskManagerManifest; diff --git a/webapp/packages/core-task-manager/src/manifest.ts b/webapp/packages/core-task-manager/src/manifest.ts deleted file mode 100644 index a73e08d6a6..0000000000 --- a/webapp/packages/core-task-manager/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreTaskManagerManifest: PluginManifest = { - info: { - name: 'Core Task Manager', - }, -}; diff --git a/webapp/packages/core-task-manager/src/module.ts b/webapp/packages/core-task-manager/src/module.ts index c8a1333d66..4f63b9fbcb 100644 --- a/webapp/packages/core-task-manager/src/module.ts +++ b/webapp/packages/core-task-manager/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry } from '@cloudbeaver/core-di'; import { TaskManagerService } from './TaskManagerService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-task-manager', configure: serviceCollection => { diff --git a/webapp/packages/core-theming/package.json b/webapp/packages/core-theming/package.json index 78bb98a702..0a0c508d51 100644 --- a/webapp/packages/core-theming/package.json +++ b/webapp/packages/core-theming/package.json @@ -13,6 +13,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*": "./*" }, "scripts": { @@ -37,7 +38,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@fontsource/roboto": "^5", "@material/button": "^4", "@material/checkbox": "^4", @@ -48,6 +49,7 @@ "@material/switch": "^4", "@material/theme": "^4", "@material/typography": "^4", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/core-theming/src/index.ts b/webapp/packages/core-theming/src/index.ts index 7ba32f0a44..7634ee0b51 100644 --- a/webapp/packages/core-theming/src/index.ts +++ b/webapp/packages/core-theming/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './ComponentStyle.js'; export * from './ThemeService.js'; export * from './themeUtils.js'; diff --git a/webapp/packages/core-theming/src/manifest.ts b/webapp/packages/core-theming/src/manifest.ts deleted file mode 100644 index af2f770c6e..0000000000 --- a/webapp/packages/core-theming/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const coreThemingManifest: PluginManifest = { - info: { - name: 'Core Theming', - }, -}; diff --git a/webapp/packages/core-theming/src/module.ts b/webapp/packages/core-theming/src/module.ts index e9bdbaaf16..e91e8de383 100644 --- a/webapp/packages/core-theming/src/module.ts +++ b/webapp/packages/core-theming/src/module.ts @@ -13,7 +13,7 @@ import { ThemeService } from './ThemeService.js'; import { LocaleService } from './LocaleService.js'; import { SystemThemeService } from './SystemThemeService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-theming', configure: serviceCollection => { diff --git a/webapp/packages/core-ui/package.json b/webapp/packages/core-ui/package.json index 802e3252ba..c55847a5e2 100644 --- a/webapp/packages/core-ui/package.json +++ b/webapp/packages/core-ui/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", @@ -31,7 +32,7 @@ "@cloudbeaver/core-routing": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/core-view": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -45,6 +46,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/core-ui/src/index.ts b/webapp/packages/core-ui/src/index.ts index ebf864b20e..4cd3e12f1f 100644 --- a/webapp/packages/core-ui/src/index.ts +++ b/webapp/packages/core-ui/src/index.ts @@ -92,5 +92,3 @@ export * from './SideBarPanel/SideBarPanelLoader.js'; export * from './SideBarPanel/SideBarPanelService.js'; export * from './Screens/AppScreen/BaseOptionsPanelService.js'; - -export { manifest as coreUIManifest } from './manifest.js'; diff --git a/webapp/packages/core-ui/src/manifest.ts b/webapp/packages/core-ui/src/manifest.ts deleted file mode 100644 index a6445ae9b0..0000000000 --- a/webapp/packages/core-ui/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Core UI', - }, -}; diff --git a/webapp/packages/core-ui/src/module.ts b/webapp/packages/core-ui/src/module.ts index f263780215..b100870282 100644 --- a/webapp/packages/core-ui/src/module.ts +++ b/webapp/packages/core-ui/src/module.ts @@ -16,7 +16,7 @@ import { LocaleService } from './LocaleService.js'; import { ClipboardBootstrap } from './Clipboard/ClipboardBootstrap.js'; import { ClipboardService } from './Clipboard/ClipboardService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-ui', configure: serviceCollection => { diff --git a/webapp/packages/core-utils/package.json b/webapp/packages/core-utils/package.json index a43ad7cc96..b02a677544 100644 --- a/webapp/packages/core-utils/package.json +++ b/webapp/packages/core-utils/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", @@ -29,6 +30,7 @@ "tslib": "^2", "underscore": "^1", "uuid": "^13", + "vitest": "^3", "whatwg-mimetype": "^4", "zod": "^4", "zod-validation-error": "^4" @@ -38,11 +40,12 @@ "@cloudbeaver/tests-runner": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/md5": "^2", "@types/underscore": "^1", "@types/uuid": "^10", "@types/whatwg-mimetype": "^3", + "rimraf": "^6", "typescript": "^5", "vitest": "^3", "zod": "^4" diff --git a/webapp/packages/core-version-update/package.json b/webapp/packages/core-version-update/package.json index e8a2975fa9..857b77fbe8 100644 --- a/webapp/packages/core-version-update/package.json +++ b/webapp/packages/core-version-update/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", @@ -33,6 +34,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-version-update/src/index.ts b/webapp/packages/core-version-update/src/index.ts index ac0f876ae7..6e0ccabd30 100644 --- a/webapp/packages/core-version-update/src/index.ts +++ b/webapp/packages/core-version-update/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export { manifest as coreVersionUpdateManifest } from './manifest.js'; export * from './VersionUpdateService.js'; export * from './BaseUpdateInstruction.js'; diff --git a/webapp/packages/core-version-update/src/manifest.ts b/webapp/packages/core-version-update/src/manifest.ts deleted file mode 100644 index d1a7fb79bb..0000000000 --- a/webapp/packages/core-version-update/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Version update', - }, -}; diff --git a/webapp/packages/core-version-update/src/module.ts b/webapp/packages/core-version-update/src/module.ts index 2a60799110..43185cb97d 100644 --- a/webapp/packages/core-version-update/src/module.ts +++ b/webapp/packages/core-version-update/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { VersionUpdateLocaleService } from './LocaleService.js'; import { VersionUpdateService } from './VersionUpdateService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-version-update', configure: serviceCollection => { diff --git a/webapp/packages/core-version/package.json b/webapp/packages/core-version/package.json index 03c592948b..3a676e984c 100644 --- a/webapp/packages/core-version/package.json +++ b/webapp/packages/core-version/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", @@ -36,6 +37,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", "@types/semver": "^7", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/core-version/src/index.ts b/webapp/packages/core-version/src/index.ts index 672732b906..26505efc07 100644 --- a/webapp/packages/core-version/src/index.ts +++ b/webapp/packages/core-version/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export { manifest as coreVersionManifest } from './manifest.js'; export * from './VersionResource.js'; export * from './VersionService.js'; diff --git a/webapp/packages/core-version/src/manifest.ts b/webapp/packages/core-version/src/manifest.ts deleted file mode 100644 index e42895b56c..0000000000 --- a/webapp/packages/core-version/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'App version', - }, -}; diff --git a/webapp/packages/core-version/src/module.ts b/webapp/packages/core-version/src/module.ts index c8ddceed71..a457b0f071 100644 --- a/webapp/packages/core-version/src/module.ts +++ b/webapp/packages/core-version/src/module.ts @@ -11,7 +11,7 @@ import { VersionService } from './VersionService.js'; import { VersionResource } from './VersionResource.js'; import { VersionLocaleService } from './VersionLocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-version', configure: serviceCollection => { diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json index 3b06b423a9..d665403754 100644 --- a/webapp/packages/core-view/package.json +++ b/webapp/packages/core-view/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", @@ -27,7 +28,7 @@ "@cloudbeaver/core-extensions": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -38,6 +39,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts index afc39bd2e1..5f83863712 100644 --- a/webapp/packages/core-view/src/index.ts +++ b/webapp/packages/core-view/src/index.ts @@ -87,4 +87,3 @@ export * from './View/useActiveView.js'; export * from './View/useCaptureViewContext.js'; export * from './View/View.js'; export * from './View/ViewService.js'; -export { manifest as coreViewManifest } from './manifest.js'; diff --git a/webapp/packages/core-view/src/manifest.ts b/webapp/packages/core-view/src/manifest.ts deleted file mode 100644 index 90b68ad42f..0000000000 --- a/webapp/packages/core-view/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Core View', - }, -}; diff --git a/webapp/packages/core-view/src/module.ts b/webapp/packages/core-view/src/module.ts index 89bc3be9f7..1695c43e39 100644 --- a/webapp/packages/core-view/src/module.ts +++ b/webapp/packages/core-view/src/module.ts @@ -13,7 +13,7 @@ import { LocaleService } from './LocaleService.js'; import { KeyBindingService } from './Action/KeyBinding/KeyBindingService.js'; import { ActionService } from './Action/ActionService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/core-view', configure: serviceCollection => { diff --git a/webapp/packages/plugin-administration/package.json b/webapp/packages/plugin-administration/package.json index 5e69b6e39e..681dcc8a9e 100644 --- a/webapp/packages/plugin-administration/package.json +++ b/webapp/packages/plugin-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", @@ -35,13 +36,12 @@ "@cloudbeaver/core-resource": "workspace:*", "@cloudbeaver/core-root": "workspace:*", "@cloudbeaver/core-routing": "workspace:*", - "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/core-ui": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/core-view": "workspace:*", "@cloudbeaver/plugin-settings-menu": "workspace:*", "@cloudbeaver/plugin-top-app-bar": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -52,6 +52,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-administration/src/index.ts b/webapp/packages/plugin-administration/src/index.ts index 2a05c489f2..da4475e51d 100644 --- a/webapp/packages/plugin-administration/src/index.ts +++ b/webapp/packages/plugin-administration/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { manifest } from './manifest.js'; - -export default manifest; export * from './AdministrationScreen/AdministrationTopAppBar/AdministrationTopAppBarService.js'; export * from './AdministrationScreen/ConfigurationWizard/WizardTopAppBar/WizardTopAppBarService.js'; diff --git a/webapp/packages/plugin-administration/src/manifest.ts b/webapp/packages/plugin-administration/src/manifest.ts deleted file mode 100644 index 105daaf2ca..0000000000 --- a/webapp/packages/plugin-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Authentication', - }, -}; diff --git a/webapp/packages/plugin-administration/src/module.ts b/webapp/packages/plugin-administration/src/module.ts index acd690bce5..8bb21d11d7 100644 --- a/webapp/packages/plugin-administration/src/module.ts +++ b/webapp/packages/plugin-administration/src/module.ts @@ -19,7 +19,7 @@ import { WizardTopAppBarService } from './AdministrationScreen/ConfigurationWiza import { AdministrationScreenServiceBootstrap } from './AdministrationScreen/AdministrationScreenServiceBootstrap.js'; import { AdministrationViewService } from './Administration/AdministrationViewService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-administration/tsconfig.json b/webapp/packages/plugin-administration/tsconfig.json index 75397c1292..a69c36ce8f 100644 --- a/webapp/packages/plugin-administration/tsconfig.json +++ b/webapp/packages/plugin-administration/tsconfig.json @@ -55,9 +55,6 @@ { "path": "../core-routing" }, - { - "path": "../core-sdk" - }, { "path": "../core-ui" }, diff --git a/webapp/packages/plugin-app-logo-administration/package.json b/webapp/packages/plugin-app-logo-administration/package.json index e8ff4964b6..53e6509846 100644 --- a/webapp/packages/plugin-app-logo-administration/package.json +++ b/webapp/packages/plugin-app-logo-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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-app-logo-administration/src/index.ts b/webapp/packages/plugin-app-logo-administration/src/index.ts index e1983eabfc..c465e1ac53 100644 --- a/webapp/packages/plugin-app-logo-administration/src/index.ts +++ b/webapp/packages/plugin-app-logo-administration/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { appLogoAdministrationPlugin } from './manifest.js'; - -export { appLogoAdministrationPlugin }; -export default appLogoAdministrationPlugin; diff --git a/webapp/packages/plugin-app-logo-administration/src/manifest.ts b/webapp/packages/plugin-app-logo-administration/src/manifest.ts deleted file mode 100644 index 99790b16cb..0000000000 --- a/webapp/packages/plugin-app-logo-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const appLogoAdministrationPlugin: PluginManifest = { - info: { - name: 'App Logo Administration plugin', - }, -}; diff --git a/webapp/packages/plugin-app-logo-administration/src/module.ts b/webapp/packages/plugin-app-logo-administration/src/module.ts index ac073574eb..b719e1bf85 100644 --- a/webapp/packages/plugin-app-logo-administration/src/module.ts +++ b/webapp/packages/plugin-app-logo-administration/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { AppLogoAdministrationPluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-app-logo-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-app-logo/package.json b/webapp/packages/plugin-app-logo/package.json index 4127cbe103..ff53b69fe6 100644 --- a/webapp/packages/plugin-app-logo/package.json +++ b/webapp/packages/plugin-app-logo/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", @@ -38,6 +39,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-app-logo/src/LogoLazy.tsx b/webapp/packages/plugin-app-logo/src/LogoLazy.ts similarity index 100% rename from webapp/packages/plugin-app-logo/src/LogoLazy.tsx rename to webapp/packages/plugin-app-logo/src/LogoLazy.ts diff --git a/webapp/packages/plugin-app-logo/src/index.ts b/webapp/packages/plugin-app-logo/src/index.ts index 925e632545..f7b60f2ff2 100644 --- a/webapp/packages/plugin-app-logo/src/index.ts +++ b/webapp/packages/plugin-app-logo/src/index.ts @@ -7,9 +7,5 @@ */ import './module.js'; -import { appLogoPlugin } from './manifest.js'; export * from './LogoLazy.js'; - -export { appLogoPlugin }; -export default appLogoPlugin; diff --git a/webapp/packages/plugin-app-logo/src/manifest.ts b/webapp/packages/plugin-app-logo/src/manifest.ts deleted file mode 100644 index 9e2cf7bc4f..0000000000 --- a/webapp/packages/plugin-app-logo/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const appLogoPlugin: PluginManifest = { - info: { - name: 'App Logo plugin', - }, -}; diff --git a/webapp/packages/plugin-app-logo/src/module.ts b/webapp/packages/plugin-app-logo/src/module.ts index 43be9c5c98..6be65b7cfb 100644 --- a/webapp/packages/plugin-app-logo/src/module.ts +++ b/webapp/packages/plugin-app-logo/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { AppLogoPluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-app-logo', configure: serviceCollection => { diff --git a/webapp/packages/plugin-authentication-administration/package.json b/webapp/packages/plugin-authentication-administration/package.json index f936b84517..90bcffe93a 100644 --- a/webapp/packages/plugin-authentication-administration/package.json +++ b/webapp/packages/plugin-authentication-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", @@ -40,8 +41,8 @@ "@cloudbeaver/core-view": "workspace:*", "@cloudbeaver/plugin-administration": "workspace:*", "@cloudbeaver/plugin-authentication": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", - "@dbeaver/ui-kit": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", + "@dbeaver/ui-kit": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -53,6 +54,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-authentication-administration/src/index.ts b/webapp/packages/plugin-authentication-administration/src/index.ts index dbeb32c0cf..4441479b12 100644 --- a/webapp/packages/plugin-authentication-administration/src/index.ts +++ b/webapp/packages/plugin-authentication-administration/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { manifest } from './manifest.js'; - -export default manifest; export * from './Administration/Users/UsersAdministrationNavigationService.js'; export * from './Administration/Users/UsersTable/CreateUserService.js'; diff --git a/webapp/packages/plugin-authentication-administration/src/manifest.ts b/webapp/packages/plugin-authentication-administration/src/manifest.ts deleted file mode 100644 index 1f53c4fab1..0000000000 --- a/webapp/packages/plugin-authentication-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Authentication Administration', - }, -}; diff --git a/webapp/packages/plugin-authentication-administration/src/module.ts b/webapp/packages/plugin-authentication-administration/src/module.ts index 74567e03af..01d3e93a8e 100644 --- a/webapp/packages/plugin-authentication-administration/src/module.ts +++ b/webapp/packages/plugin-authentication-administration/src/module.ts @@ -30,7 +30,7 @@ import { GrantedConnectionsTabService } from './Administration/Users/Teams/Teams import { TeamsAdministrationNavService } from './Administration/Users/Teams/TeamsAdministrationNavService.js'; import { TeamsAdministrationService } from './Administration/Users/Teams/TeamsAdministrationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-authentication-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-authentication/package.json b/webapp/packages/plugin-authentication/package.json index f89f7e02b7..968ded6b5e 100644 --- a/webapp/packages/plugin-authentication/package.json +++ b/webapp/packages/plugin-authentication/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", @@ -47,6 +48,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-authentication/src/index.ts b/webapp/packages/plugin-authentication/src/index.ts index 99c2ce3e2a..d0a8dd40e8 100644 --- a/webapp/packages/plugin-authentication/src/index.ts +++ b/webapp/packages/plugin-authentication/src/index.ts @@ -7,8 +7,6 @@ */ import './module.js'; -import { manifest } from './manifest.js'; export * from './AuthenticationService.js'; export * from './Dialog/AuthDialogService.js'; -export default manifest; diff --git a/webapp/packages/plugin-authentication/src/manifest.ts b/webapp/packages/plugin-authentication/src/manifest.ts deleted file mode 100644 index 4bb813e8de..0000000000 --- a/webapp/packages/plugin-authentication/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Plugin Authentication', - }, -}; diff --git a/webapp/packages/plugin-authentication/src/module.ts b/webapp/packages/plugin-authentication/src/module.ts index cc6a76b730..fa0c402b40 100644 --- a/webapp/packages/plugin-authentication/src/module.ts +++ b/webapp/packages/plugin-authentication/src/module.ts @@ -13,7 +13,7 @@ import { AuthDialogService } from './Dialog/AuthDialogService.js'; import { AuthenticationService } from './AuthenticationService.js'; import { AuthenticationLocaleService } from './AuthenticationLocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-authentication', configure: serviceCollection => { diff --git a/webapp/packages/plugin-browser/package.json b/webapp/packages/plugin-browser/package.json index 2c7a889ad3..ab09e8d7eb 100644 --- a/webapp/packages/plugin-browser/package.json +++ b/webapp/packages/plugin-browser/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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-browser/src/index.ts b/webapp/packages/plugin-browser/src/index.ts index 2e868acf8f..c465e1ac53 100644 --- a/webapp/packages/plugin-browser/src/index.ts +++ b/webapp/packages/plugin-browser/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { browserPlugin } from './manifest.js'; - -export default browserPlugin; -export { browserPlugin }; diff --git a/webapp/packages/plugin-browser/src/manifest.ts b/webapp/packages/plugin-browser/src/manifest.ts deleted file mode 100644 index 6adb5f23b9..0000000000 --- a/webapp/packages/plugin-browser/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const browserPlugin: PluginManifest = { - info: { name: 'Browser plugin' }, -}; diff --git a/webapp/packages/plugin-browser/src/module.ts b/webapp/packages/plugin-browser/src/module.ts index fea5b4bf04..970f0e74f7 100644 --- a/webapp/packages/plugin-browser/src/module.ts +++ b/webapp/packages/plugin-browser/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, IPreloadService, ModuleRegistry } from '@cloudbeaver/core-di import { PluginBrowserPreloadingBootstrap } from './PluginBrowserPreloadingBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-browser', configure: serviceCollection => { diff --git a/webapp/packages/plugin-codemirror6/package.json b/webapp/packages/plugin-codemirror6/package.json index c9ea1223b3..3c429143eb 100644 --- a/webapp/packages/plugin-codemirror6/package.json +++ b/webapp/packages/plugin-codemirror6/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", @@ -38,7 +39,7 @@ "@codemirror/search": "^6", "@codemirror/state": "^6", "@codemirror/view": "^6", - "@dbeaver/ui-kit": "workspace:^", + "@dbeaver/ui-kit": "workspace:*", "@lezer/common": "^1", "@lezer/highlight": "^1", "mobx": "^6", @@ -52,6 +53,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", "@types/react-dom": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-codemirror6/src/index.ts b/webapp/packages/plugin-codemirror6/src/index.ts index 64f5e2ce8a..65cb9aa6ab 100644 --- a/webapp/packages/plugin-codemirror6/src/index.ts +++ b/webapp/packages/plugin-codemirror6/src/index.ts @@ -39,4 +39,3 @@ export const MSSQLLoader = createComplexLoader(async () => (await import('@codem export const SQLiteLoader = createComplexLoader(async () => (await import('@codemirror/lang-sql')).SQLite); export const CassandraLoader = createComplexLoader(async () => (await import('@codemirror/lang-sql')).Cassandra); export const PLSQLLoader = createComplexLoader(async () => (await import('@codemirror/lang-sql')).PLSQL); -export { manifest as codemirror6Manifest } from './manifest.js'; diff --git a/webapp/packages/plugin-codemirror6/src/manifest.ts b/webapp/packages/plugin-codemirror6/src/manifest.ts deleted file mode 100644 index d208e0fb40..0000000000 --- a/webapp/packages/plugin-codemirror6/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Codemirror 6 Plugin', - }, -}; diff --git a/webapp/packages/plugin-codemirror6/src/module.ts b/webapp/packages/plugin-codemirror6/src/module.ts index 1a0909f585..c19d8aa535 100644 --- a/webapp/packages/plugin-codemirror6/src/module.ts +++ b/webapp/packages/plugin-codemirror6/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-codemirror6', configure: serviceCollection => { diff --git a/webapp/packages/plugin-connection-custom/package.json b/webapp/packages/plugin-connection-custom/package.json index 047162c6f9..f21a402ddb 100644 --- a/webapp/packages/plugin-connection-custom/package.json +++ b/webapp/packages/plugin-connection-custom/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", @@ -48,6 +49,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-connection-custom/src/index.ts b/webapp/packages/plugin-connection-custom/src/index.ts index fd51289924..6488de8843 100644 --- a/webapp/packages/plugin-connection-custom/src/index.ts +++ b/webapp/packages/plugin-connection-custom/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { customConnectionPluginManifest } from './manifest.js'; - -export default customConnectionPluginManifest; export * from './CustomConnectionSettingsService.js'; diff --git a/webapp/packages/plugin-connection-custom/src/manifest.ts b/webapp/packages/plugin-connection-custom/src/manifest.ts deleted file mode 100644 index b8917ac2e0..0000000000 --- a/webapp/packages/plugin-connection-custom/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const customConnectionPluginManifest: PluginManifest = { - info: { - name: 'Custom connection plugin', - }, -}; diff --git a/webapp/packages/plugin-connection-custom/src/module.ts b/webapp/packages/plugin-connection-custom/src/module.ts index 57d2976bc3..76a0fabffd 100644 --- a/webapp/packages/plugin-connection-custom/src/module.ts +++ b/webapp/packages/plugin-connection-custom/src/module.ts @@ -11,7 +11,7 @@ import { LocaleService } from './LocaleService.js'; import { CustomConnectionSettingsService } from './CustomConnectionSettingsService.js'; import { CustomConnectionPluginBootstrap } from './CustomConnectionPluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-connection-custom', configure: serviceCollection => { diff --git a/webapp/packages/plugin-connection-search/package.json b/webapp/packages/plugin-connection-search/package.json index 4ac41f4e3d..ad546e791f 100644 --- a/webapp/packages/plugin-connection-search/package.json +++ b/webapp/packages/plugin-connection-search/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", @@ -47,6 +48,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-connection-search/src/index.ts b/webapp/packages/plugin-connection-search/src/index.ts index ce581e33a2..9f97f4f34b 100644 --- a/webapp/packages/plugin-connection-search/src/index.ts +++ b/webapp/packages/plugin-connection-search/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { connectionSearchPlugin } from './manifest.js'; - -export default connectionSearchPlugin; export * from './ConnectionSearchSettingsService.js'; diff --git a/webapp/packages/plugin-connection-search/src/manifest.ts b/webapp/packages/plugin-connection-search/src/manifest.ts deleted file mode 100644 index 767724ac55..0000000000 --- a/webapp/packages/plugin-connection-search/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const connectionSearchPlugin: PluginManifest = { - info: { - name: 'Search connection plugin', - }, -}; diff --git a/webapp/packages/plugin-connection-search/src/module.ts b/webapp/packages/plugin-connection-search/src/module.ts index 6b3d3dfcfd..86e4719fa4 100644 --- a/webapp/packages/plugin-connection-search/src/module.ts +++ b/webapp/packages/plugin-connection-search/src/module.ts @@ -12,7 +12,7 @@ import { SearchConnectionPluginBootstrap } from './SearchConnectionPluginBootstr import { LocaleService } from './LocaleService.js'; import { ConnectionSearchSettingsService } from './ConnectionSearchSettingsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-connection-search', configure: serviceCollection => { diff --git a/webapp/packages/plugin-connections-administration/package.json b/webapp/packages/plugin-connections-administration/package.json index df0878b57b..d488f8dc2f 100644 --- a/webapp/packages/plugin-connections-administration/package.json +++ b/webapp/packages/plugin-connections-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", @@ -36,7 +37,6 @@ "@cloudbeaver/core-ui": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/plugin-connections": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -47,6 +47,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-connections-administration/src/index.ts b/webapp/packages/plugin-connections-administration/src/index.ts index 4cb153a0b1..c465e1ac53 100644 --- a/webapp/packages/plugin-connections-administration/src/index.ts +++ b/webapp/packages/plugin-connections-administration/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { connectionPlugin } from './manifest.js'; - -export default connectionPlugin; diff --git a/webapp/packages/plugin-connections-administration/src/manifest.ts b/webapp/packages/plugin-connections-administration/src/manifest.ts deleted file mode 100644 index 29b491cd2a..0000000000 --- a/webapp/packages/plugin-connections-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const connectionPlugin: PluginManifest = { - info: { - name: 'Connections Administration plugin', - }, -}; diff --git a/webapp/packages/plugin-connections-administration/src/module.ts b/webapp/packages/plugin-connections-administration/src/module.ts index ed26bb3851..5f73e5f672 100644 --- a/webapp/packages/plugin-connections-administration/src/module.ts +++ b/webapp/packages/plugin-connections-administration/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { ConnectionFormAccessTabBootstrap } from './ConnectionFormAccess/ConnectionFormAccessTabBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-connections-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-connections-administration/tsconfig.json b/webapp/packages/plugin-connections-administration/tsconfig.json index 8bb1051b53..751d41e634 100644 --- a/webapp/packages/plugin-connections-administration/tsconfig.json +++ b/webapp/packages/plugin-connections-administration/tsconfig.json @@ -7,9 +7,6 @@ "composite": true }, "references": [ - { - "path": "../../common-typescript/@dbeaver/js-helpers" - }, { "path": "../core-administration" }, diff --git a/webapp/packages/plugin-connections/package.json b/webapp/packages/plugin-connections/package.json index 6b684cc1a7..c868732bfc 100644 --- a/webapp/packages/plugin-connections/package.json +++ b/webapp/packages/plugin-connections/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", @@ -44,8 +45,8 @@ "@cloudbeaver/plugin-navigation-tree": "workspace:*", "@cloudbeaver/plugin-projects": "workspace:*", "@cloudbeaver/plugin-top-app-bar": "workspace:*", - "@dbeaver/jdbc-uri-parser": "workspace:^", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/jdbc-uri-parser": "workspace:*", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -56,6 +57,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-connections/src/index.ts b/webapp/packages/plugin-connections/src/index.ts index 392f963761..07abfbc8bf 100644 --- a/webapp/packages/plugin-connections/src/index.ts +++ b/webapp/packages/plugin-connections/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -import { connectionPlugin } from './manifest.js'; export * from './ConnectionAuthentication/IConnectionAuthenticationConfig.js'; export * from './ConnectionAuthentication/ConnectionAuthenticationFormLoader.js'; @@ -34,5 +33,3 @@ export * from './PluginConnectionsSettingsService.js'; export * from './ConnectionShieldLazy.js'; export * from './Actions/ACTION_TREE_CREATE_CONNECTION.js'; export * from './Actions/MENU_TREE_CREATE_CONNECTION.js'; - -export default connectionPlugin; diff --git a/webapp/packages/plugin-connections/src/manifest.ts b/webapp/packages/plugin-connections/src/manifest.ts deleted file mode 100644 index f64c3665c3..0000000000 --- a/webapp/packages/plugin-connections/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const connectionPlugin: PluginManifest = { - info: { - name: 'Connections plugin', - }, -}; diff --git a/webapp/packages/plugin-connections/src/module.ts b/webapp/packages/plugin-connections/src/module.ts index 40bd9a7628..f5159ed831 100644 --- a/webapp/packages/plugin-connections/src/module.ts +++ b/webapp/packages/plugin-connections/src/module.ts @@ -23,7 +23,7 @@ import { ConnectionDriverPropertiesTabService } from './ConnectionForm/DriverPro import { ConnectionFormService } from './ConnectionForm/ConnectionFormService.js'; import { ConnectionAuthService } from './ConnectionAuthService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-connections', configure: serviceCollection => { diff --git a/webapp/packages/plugin-d3js/package.json b/webapp/packages/plugin-d3js/package.json index 1f3fc0fa46..d03408a566 100644 --- a/webapp/packages/plugin-d3js/package.json +++ b/webapp/packages/plugin-d3js/package.json @@ -12,7 +12,8 @@ "description": "The plugin reexports d3js library and contains utility functions and components for d3js", "license": "Apache-2.0", "exports": { - ".": "./lib/index.js" + ".": "./lib/index.js", + "./module": "./lib/module.js" }, "scripts": { "build": "tsc -b", @@ -22,7 +23,6 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-di": "workspace:*", "d3": "^7", "d3-drag": "^3", "tslib": "^2" @@ -33,6 +33,7 @@ "@dbeaver/cli": "workspace:*", "@types/d3": "^7", "@types/d3-drag": "^3", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-d3js/src/index.ts b/webapp/packages/plugin-d3js/src/index.ts index d259822863..0f98026942 100644 --- a/webapp/packages/plugin-d3js/src/index.ts +++ b/webapp/packages/plugin-d3js/src/index.ts @@ -6,10 +6,6 @@ * you may not use this file except in compliance with the License. */ -import { pluginD3js } from './manifest.js'; - -export default pluginD3js; - export { select, line, diff --git a/webapp/packages/plugin-d3js/src/manifest.ts b/webapp/packages/plugin-d3js/src/manifest.ts deleted file mode 100644 index 2ebe5ad396..0000000000 --- a/webapp/packages/plugin-d3js/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const pluginD3js: PluginManifest = { - info: { - name: 'D3js Plugin', - }, -}; diff --git a/webapp/packages/plugin-d3js/tsconfig.json b/webapp/packages/plugin-d3js/tsconfig.json index 2f98b7d8db..e229701eed 100644 --- a/webapp/packages/plugin-d3js/tsconfig.json +++ b/webapp/packages/plugin-d3js/tsconfig.json @@ -12,9 +12,6 @@ }, { "path": "../core-cli" - }, - { - "path": "../core-di" } ], "include": [ diff --git a/webapp/packages/plugin-data-editor-public-settings/package.json b/webapp/packages/plugin-data-editor-public-settings/package.json index 9354d03ac7..bf1bbf3357 100644 --- a/webapp/packages/plugin-data-editor-public-settings/package.json +++ b/webapp/packages/plugin-data-editor-public-settings/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", @@ -24,9 +25,7 @@ "dependencies": { "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", - "@cloudbeaver/core-root": "workspace:*", "@cloudbeaver/core-settings": "workspace:*", - "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/plugin-data-import": "workspace:*", "@cloudbeaver/plugin-data-viewer": "workspace:*" }, diff --git a/webapp/packages/plugin-data-editor-public-settings/src/index.ts b/webapp/packages/plugin-data-editor-public-settings/src/index.ts index feaa728359..c465e1ac53 100644 --- a/webapp/packages/plugin-data-editor-public-settings/src/index.ts +++ b/webapp/packages/plugin-data-editor-public-settings/src/index.ts @@ -7,8 +7,3 @@ */ import './module.js'; - -import { pluginDataEditorPublicSettingsManifest } from './manifest.js'; - -export default pluginDataEditorPublicSettingsManifest; -export { pluginDataEditorPublicSettingsManifest }; diff --git a/webapp/packages/plugin-data-editor-public-settings/src/manifest.ts b/webapp/packages/plugin-data-editor-public-settings/src/manifest.ts deleted file mode 100644 index c714961b56..0000000000 --- a/webapp/packages/plugin-data-editor-public-settings/src/manifest.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ - -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const pluginDataEditorPublicSettingsManifest: PluginManifest = { - info: { - name: 'Plugin data editor settings', - }, -}; diff --git a/webapp/packages/plugin-data-editor-public-settings/src/module.ts b/webapp/packages/plugin-data-editor-public-settings/src/module.ts index c18706c23d..93f6d9448e 100644 --- a/webapp/packages/plugin-data-editor-public-settings/src/module.ts +++ b/webapp/packages/plugin-data-editor-public-settings/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { PluginDataEditorPublicSettingsBootstrap } from './PluginDataEditorPublicSettingsBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-editor-public-settings', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-editor-public-settings/tsconfig.json b/webapp/packages/plugin-data-editor-public-settings/tsconfig.json index 40c0ca5b8a..cee38b5917 100644 --- a/webapp/packages/plugin-data-editor-public-settings/tsconfig.json +++ b/webapp/packages/plugin-data-editor-public-settings/tsconfig.json @@ -22,15 +22,9 @@ { "path": "../core-localization" }, - { - "path": "../core-root" - }, { "path": "../core-settings" }, - { - "path": "../core-utils" - }, { "path": "../plugin-data-import" }, diff --git a/webapp/packages/plugin-data-export/package.json b/webapp/packages/plugin-data-export/package.json index 27bb0d37a9..7097cafc10 100644 --- a/webapp/packages/plugin-data-export/package.json +++ b/webapp/packages/plugin-data-export/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", @@ -48,6 +49,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-data-export/src/index.ts b/webapp/packages/plugin-data-export/src/index.ts index 38d918f515..f8b993467a 100644 --- a/webapp/packages/plugin-data-export/src/index.ts +++ b/webapp/packages/plugin-data-export/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './DataExportMenuService.js'; export * from './DataExportService.js'; diff --git a/webapp/packages/plugin-data-export/src/manifest.ts b/webapp/packages/plugin-data-export/src/manifest.ts deleted file mode 100644 index b868c91416..0000000000 --- a/webapp/packages/plugin-data-export/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataExportManifest: PluginManifest = { - info: { - name: 'Data Export Plugin', - }, -}; diff --git a/webapp/packages/plugin-data-export/src/module.ts b/webapp/packages/plugin-data-export/src/module.ts index db38daa967..0c9d649f64 100644 --- a/webapp/packages/plugin-data-export/src/module.ts +++ b/webapp/packages/plugin-data-export/src/module.ts @@ -15,7 +15,7 @@ import { DataExportService } from './DataExportService.js'; import { DataExportProcessService } from './DataExportProcessService.js'; import { DataExportMenuService } from './DataExportMenuService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-export', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-grid/package.json b/webapp/packages/plugin-data-grid/package.json index 6561137087..5c7c73d9b2 100644 --- a/webapp/packages/plugin-data-grid/package.json +++ b/webapp/packages/plugin-data-grid/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", @@ -26,7 +27,7 @@ "@cloudbeaver/core-blocks": "workspace:*", "@cloudbeaver/core-di": "workspace:*", "@dbeaver/react-data-grid": "workspace:*", - "@dbeaver/ui-kit": "workspace:^", + "@dbeaver/ui-kit": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -38,6 +39,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-data-grid/src/index.ts b/webapp/packages/plugin-data-grid/src/index.ts index c0c76be6ec..f8135bb675 100644 --- a/webapp/packages/plugin-data-grid/src/index.ts +++ b/webapp/packages/plugin-data-grid/src/index.ts @@ -7,10 +7,6 @@ */ import './module.js'; -import { dataGridPlugin } from './manifest.js'; - -export default dataGridPlugin; -export { dataGridPlugin }; export { DataGrid } from './DataGridLazy.js'; diff --git a/webapp/packages/plugin-data-grid/src/manifest.ts b/webapp/packages/plugin-data-grid/src/manifest.ts deleted file mode 100644 index d87212d020..0000000000 --- a/webapp/packages/plugin-data-grid/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataGridPlugin: PluginManifest = { - info: { name: 'Data grid plugin' }, -}; diff --git a/webapp/packages/plugin-data-grid/src/module.ts b/webapp/packages/plugin-data-grid/src/module.ts index f95275c06b..da7c10cac5 100644 --- a/webapp/packages/plugin-data-grid/src/module.ts +++ b/webapp/packages/plugin-data-grid/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-grid', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-import/package.json b/webapp/packages/plugin-data-import/package.json index 8666e8bc04..52b9f66fe6 100644 --- a/webapp/packages/plugin-data-import/package.json +++ b/webapp/packages/plugin-data-import/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", @@ -46,6 +47,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-data-import/src/index.ts b/webapp/packages/plugin-data-import/src/index.ts index 849f29f6ba..2f1059c611 100644 --- a/webapp/packages/plugin-data-import/src/index.ts +++ b/webapp/packages/plugin-data-import/src/index.ts @@ -7,6 +7,5 @@ */ import './module.js'; -export { dataImportPluginManifest } from './manifest.js'; export * from './DataImportSettingsService.js'; diff --git a/webapp/packages/plugin-data-import/src/manifest.ts b/webapp/packages/plugin-data-import/src/manifest.ts deleted file mode 100644 index d6655d2e91..0000000000 --- a/webapp/packages/plugin-data-import/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataImportPluginManifest: PluginManifest = { - info: { - name: 'Data Import Plugin', - }, -}; diff --git a/webapp/packages/plugin-data-import/src/module.ts b/webapp/packages/plugin-data-import/src/module.ts index d3517942a9..ef3ca5bf94 100644 --- a/webapp/packages/plugin-data-import/src/module.ts +++ b/webapp/packages/plugin-data-import/src/module.ts @@ -15,7 +15,7 @@ import { DataImportBootstrap } from './DataImportBootstrap.js'; // force registration after export plugin import '@cloudbeaver/plugin-data-export'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-import', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-spreadsheet-new/package.json b/webapp/packages/plugin-data-spreadsheet-new/package.json index 13330f4c11..aaba1acb1c 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/package.json +++ b/webapp/packages/plugin-data-spreadsheet-new/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", @@ -28,7 +29,6 @@ "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-dialogs": "workspace:*", "@cloudbeaver/core-events": "workspace:*", - "@cloudbeaver/core-executor": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/core-settings": "workspace:*", @@ -37,24 +37,22 @@ "@cloudbeaver/core-view": "workspace:*", "@cloudbeaver/plugin-data-grid": "workspace:*", "@cloudbeaver/plugin-data-viewer": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", - "@dbeaver/result-set-api": "workspace:^", - "@dbeaver/ui-kit": "workspace:^", - "@popperjs/core": "^2", + "@dbeaver/result-set-api": "workspace:*", + "@dbeaver/ui-kit": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", "react-dom": "^19", - "react-popper": "^2", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", "@types/react-dom": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/index.ts b/webapp/packages/plugin-data-spreadsheet-new/src/index.ts index 654f756665..41f2bea246 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/index.ts +++ b/webapp/packages/plugin-data-spreadsheet-new/src/index.ts @@ -7,5 +7,4 @@ */ import './module.js'; -export * from './manifest.js'; export * from './DataGrid/DATA_GRID_BINDINGS.js'; diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts b/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts deleted file mode 100644 index 133186a9f8..0000000000 --- a/webapp/packages/plugin-data-spreadsheet-new/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataSpreadsheetNewManifest: PluginManifest = { - info: { name: 'New spreadsheet implementation' }, -}; diff --git a/webapp/packages/plugin-data-spreadsheet-new/src/module.ts b/webapp/packages/plugin-data-spreadsheet-new/src/module.ts index bba1f5aaa4..e622cfd5a9 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/src/module.ts +++ b/webapp/packages/plugin-data-spreadsheet-new/src/module.ts @@ -15,7 +15,7 @@ import { DataGridContextMenuOrderService } from './DataGrid/DataGridContextMenu/ import { DataGridContextMenuFilterService } from './DataGrid/DataGridContextMenu/DataGridContextMenuFilter/DataGridContextMenuFilterService.js'; import { DataGridContextMenuCellEditingService } from './DataGrid/DataGridContextMenu/DataGridContextMenuCellEditingService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-spreadsheet-new', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-spreadsheet-new/tsconfig.json b/webapp/packages/plugin-data-spreadsheet-new/tsconfig.json index 8f7ea953aa..8702e0227b 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/tsconfig.json +++ b/webapp/packages/plugin-data-spreadsheet-new/tsconfig.json @@ -16,9 +16,6 @@ { "path": "../../common-typescript/@dbeaver/cli" }, - { - "path": "../../common-typescript/@dbeaver/js-helpers" - }, { "path": "../../common-typescript/@dbeaver/result-set-api" }, @@ -43,9 +40,6 @@ { "path": "../core-events" }, - { - "path": "../core-executor" - }, { "path": "../core-localization" }, diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/package.json b/webapp/packages/plugin-data-viewer-result-set-grouping/package.json index 1e15548ea3..4b153065e4 100644 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/package.json +++ b/webapp/packages/plugin-data-viewer-result-set-grouping/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", @@ -44,6 +45,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts index 5672b0a7ae..c465e1ac53 100644 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts +++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { dvResultSetGroupingPlugin } from './manifest.js'; - -export { dvResultSetGroupingPlugin }; -export default dvResultSetGroupingPlugin; diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts deleted file mode 100644 index ad8ee3e690..0000000000 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dvResultSetGroupingPlugin: PluginManifest = { - info: { name: 'Result Set Grouping plugin' }, -}; diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/module.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/module.ts index bcfd96cd61..b5b4dec846 100644 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/module.ts +++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { LocaleService } from './LocaleService.js'; import { DVResultSetGroupingPluginBootstrap } from './DVResultSetGroupingPluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-viewer-result-set-grouping', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-viewer-result-trace-details/package.json b/webapp/packages/plugin-data-viewer-result-trace-details/package.json index 37b9bf969a..ffb541dcf0 100644 --- a/webapp/packages/plugin-data-viewer-result-trace-details/package.json +++ b/webapp/packages/plugin-data-viewer-result-trace-details/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", @@ -38,6 +39,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-data-viewer-result-trace-details/src/index.ts b/webapp/packages/plugin-data-viewer-result-trace-details/src/index.ts index f7f42ea2a6..c465e1ac53 100644 --- a/webapp/packages/plugin-data-viewer-result-trace-details/src/index.ts +++ b/webapp/packages/plugin-data-viewer-result-trace-details/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { dataViewerResultTraceDetailsPlugin } from './manifest.js'; - -export default dataViewerResultTraceDetailsPlugin; -export { dataViewerResultTraceDetailsPlugin }; diff --git a/webapp/packages/plugin-data-viewer-result-trace-details/src/manifest.ts b/webapp/packages/plugin-data-viewer-result-trace-details/src/manifest.ts deleted file mode 100644 index 3cc4472b8b..0000000000 --- a/webapp/packages/plugin-data-viewer-result-trace-details/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataViewerResultTraceDetailsPlugin: PluginManifest = { - info: { - name: 'Result trace details Data Editor plugin', - }, -}; diff --git a/webapp/packages/plugin-data-viewer-result-trace-details/src/module.ts b/webapp/packages/plugin-data-viewer-result-trace-details/src/module.ts index 739d017fdb..2219e220ed 100644 --- a/webapp/packages/plugin-data-viewer-result-trace-details/src/module.ts +++ b/webapp/packages/plugin-data-viewer-result-trace-details/src/module.ts @@ -11,7 +11,7 @@ import { LocaleService } from './LocaleService.js'; import { DVResultTraceDetailsService } from './DVResultTraceDetailsService.js'; import { DVResultTraceDetailsBootstrap } from './DVResultTraceDetailsBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-viewer-result-trace-details', configure: serviceCollection => { diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json index 375044b9a1..4ed67d76e2 100644 --- a/webapp/packages/plugin-data-viewer/package.json +++ b/webapp/packages/plugin-data-viewer/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", @@ -43,8 +44,8 @@ "@cloudbeaver/plugin-codemirror6": "workspace:*", "@cloudbeaver/plugin-navigation-tabs": "workspace:*", "@cloudbeaver/plugin-object-viewer": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", - "@dbeaver/result-set-api": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", + "@dbeaver/result-set-api": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -56,8 +57,9 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/plugin-data-viewer/src/index.ts b/webapp/packages/plugin-data-viewer/src/index.ts index db2a2a308f..09135c21c3 100644 --- a/webapp/packages/plugin-data-viewer/src/index.ts +++ b/webapp/packages/plugin-data-viewer/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './DatabaseDataModel/Actions/Document/DocumentDataAction.js'; export * from './DatabaseDataModel/Actions/Document/DocumentEditAction.js'; diff --git a/webapp/packages/plugin-data-viewer/src/manifest.ts b/webapp/packages/plugin-data-viewer/src/manifest.ts deleted file mode 100644 index 5153219921..0000000000 --- a/webapp/packages/plugin-data-viewer/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const dataViewerManifest: PluginManifest = { - info: { - name: 'Data Editor Plugin', - }, -}; diff --git a/webapp/packages/plugin-data-viewer/src/module.ts b/webapp/packages/plugin-data-viewer/src/module.ts index 9339a59301..18a87935af 100644 --- a/webapp/packages/plugin-data-viewer/src/module.ts +++ b/webapp/packages/plugin-data-viewer/src/module.ts @@ -29,7 +29,7 @@ import { DataViewerDataChangeConfirmationService } from './DataViewerDataChangeC import { DataViewerBootstrap } from './DataViewerBootstrap.js'; import { DataPresentationService } from './DataPresentationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-data-viewer', configure: serviceCollection => { diff --git a/webapp/packages/plugin-datasource-context-switch/package.json b/webapp/packages/plugin-datasource-context-switch/package.json index fbfbbb907c..093057e9f2 100644 --- a/webapp/packages/plugin-datasource-context-switch/package.json +++ b/webapp/packages/plugin-datasource-context-switch/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", @@ -46,6 +47,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-datasource-context-switch/src/index.ts b/webapp/packages/plugin-datasource-context-switch/src/index.ts index 862f3209c7..ac17dd1a99 100644 --- a/webapp/packages/plugin-datasource-context-switch/src/index.ts +++ b/webapp/packages/plugin-datasource-context-switch/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.js'; export * from './ConnectionSchemaManager/ConnectionSchemaManagerService.js'; diff --git a/webapp/packages/plugin-datasource-context-switch/src/manifest.ts b/webapp/packages/plugin-datasource-context-switch/src/manifest.ts deleted file mode 100644 index a356a9641d..0000000000 --- a/webapp/packages/plugin-datasource-context-switch/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const datasourceContextSwitchPluginManifest: PluginManifest = { - info: { - name: 'Datasource context switch plugin', - }, -}; diff --git a/webapp/packages/plugin-datasource-context-switch/src/module.ts b/webapp/packages/plugin-datasource-context-switch/src/module.ts index 2023b82ebe..7f826725a4 100644 --- a/webapp/packages/plugin-datasource-context-switch/src/module.ts +++ b/webapp/packages/plugin-datasource-context-switch/src/module.ts @@ -12,7 +12,7 @@ import { LocaleService } from './LocaleService.js'; import { ConnectionSchemaManagerService } from './ConnectionSchemaManager/ConnectionSchemaManagerService.js'; import { ConnectionSchemaManagerBootstrap } from './ConnectionSchemaManager/ConnectionSchemaManagerBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-datasource-context-switch', configure: serviceCollection => { diff --git a/webapp/packages/plugin-datasource-transaction-manager/package.json b/webapp/packages/plugin-datasource-transaction-manager/package.json index b0d7e7e83d..24d5fc08c4 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/package.json +++ b/webapp/packages/plugin-datasource-transaction-manager/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", @@ -41,7 +42,7 @@ "@cloudbeaver/plugin-sql-editor-new": "workspace:*", "@cloudbeaver/plugin-tools-panel": "workspace:*", "@cloudbeaver/plugin-top-app-bar": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -52,6 +53,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/index.ts b/webapp/packages/plugin-datasource-transaction-manager/src/index.ts index 07cd818ca5..ed809751f4 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/index.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/index.ts @@ -7,6 +7,5 @@ */ import './module.js'; -export { datasourceTransactionManagerPlugin } from './manifest.js'; export { TransactionManagerSettingsService } from './TransactionManagerSettingsService.js'; diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts b/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts deleted file mode 100644 index 08455bba08..0000000000 --- a/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const datasourceTransactionManagerPlugin: PluginManifest = { - info: { - name: 'Datasource transaction manager plugin', - }, -}; diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/module.ts b/webapp/packages/plugin-datasource-transaction-manager/src/module.ts index 6628578ca6..d074e6c4a3 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/module.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/module.ts @@ -14,7 +14,7 @@ import { TransactionLogCountResource } from './TransactionLog/TransactionLogCoun import { LocaleService } from './LocaleService.js'; import { TransactionLogCountEventHandler } from './TransactionLog/TransactionLogCountEventHandler.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-datasource-transaction-manager', configure: serviceCollection => { diff --git a/webapp/packages/plugin-ddl-viewer/package.json b/webapp/packages/plugin-ddl-viewer/package.json index 88c85bac34..959257eff3 100644 --- a/webapp/packages/plugin-ddl-viewer/package.json +++ b/webapp/packages/plugin-ddl-viewer/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", @@ -46,6 +47,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-ddl-viewer/src/index.ts b/webapp/packages/plugin-ddl-viewer/src/index.ts index 0253432608..c465e1ac53 100644 --- a/webapp/packages/plugin-ddl-viewer/src/index.ts +++ b/webapp/packages/plugin-ddl-viewer/src/index.ts @@ -7,8 +7,3 @@ */ import './module.js'; -import { manifest } from './manifest.js'; - -// All Services and Components that is provided by this plugin should be exported here - -export default manifest; diff --git a/webapp/packages/plugin-ddl-viewer/src/manifest.ts b/webapp/packages/plugin-ddl-viewer/src/manifest.ts deleted file mode 100644 index 0902701fee..0000000000 --- a/webapp/packages/plugin-ddl-viewer/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'DDL Viewer Plugin', - }, -}; diff --git a/webapp/packages/plugin-ddl-viewer/src/module.ts b/webapp/packages/plugin-ddl-viewer/src/module.ts index 7fd86bd7e3..31511d19d0 100644 --- a/webapp/packages/plugin-ddl-viewer/src/module.ts +++ b/webapp/packages/plugin-ddl-viewer/src/module.ts @@ -12,7 +12,7 @@ import { DdlViewerBootstrap } from './DdlViewerBootstrap.js'; import { DdlResource } from './DdlViewer/DdlResource.js'; import { DDLViewerFooterService } from './DdlViewer/DDLViewerFooterService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-ddl-viewer', configure: serviceCollection => { diff --git a/webapp/packages/plugin-devtools/package.json b/webapp/packages/plugin-devtools/package.json index ab8eb42b99..4ab45aca39 100644 --- a/webapp/packages/plugin-devtools/package.json +++ b/webapp/packages/plugin-devtools/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", @@ -41,6 +42,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "tslib": "^2", "typescript": "^5", "typescript-plugin-css-modules": "^5", diff --git a/webapp/packages/plugin-devtools/src/index.ts b/webapp/packages/plugin-devtools/src/index.ts index 14415d66fb..eca4db92f7 100644 --- a/webapp/packages/plugin-devtools/src/index.ts +++ b/webapp/packages/plugin-devtools/src/index.ts @@ -7,10 +7,6 @@ */ import './module.js'; -import { devToolsPlugin } from './manifest.js'; - -export { devToolsPlugin }; -export default devToolsPlugin; export * from './DevToolsService.js'; export * from './menu/MENU_DEVTOOLS.js'; diff --git a/webapp/packages/plugin-devtools/src/manifest.ts b/webapp/packages/plugin-devtools/src/manifest.ts deleted file mode 100644 index 79bf2e70e1..0000000000 --- a/webapp/packages/plugin-devtools/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const devToolsPlugin: PluginManifest = { - info: { - name: 'DevTools plugin', - }, -}; diff --git a/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts b/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts index 16bc269c24..f07696fb63 100644 --- a/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts +++ b/webapp/packages/plugin-devtools/src/menu/PluginSubMenuItem.ts @@ -1,25 +1,25 @@ /* * 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. */ -import type { PluginManifest } from '@cloudbeaver/core-di'; import { MenuSubMenuItem } from '@cloudbeaver/core-view'; import { MENU_PLUGIN } from './MENU_PLUGIN.js'; +import type { IModule } from '@cloudbeaver/core-di'; export class PluginSubMenuItem extends MenuSubMenuItem { - readonly plugin: PluginManifest; + readonly module: IModule; - constructor(plugin: PluginManifest) { - super({ menu: MENU_PLUGIN, label: plugin.info.name }); + constructor(module: IModule) { + super({ menu: MENU_PLUGIN, label: module.name }); - this.plugin = plugin; + this.module = module; Object.assign(this, { - id: plugin.info.name, + id: module.name, }); } } diff --git a/webapp/packages/plugin-devtools/src/module.ts b/webapp/packages/plugin-devtools/src/module.ts index e4fb3a7264..fdef7110a1 100644 --- a/webapp/packages/plugin-devtools/src/module.ts +++ b/webapp/packages/plugin-devtools/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; import { DevToolsService } from './DevToolsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-devtools', configure: serviceCollection => { diff --git a/webapp/packages/plugin-gis-viewer/package.json b/webapp/packages/plugin-gis-viewer/package.json index b1aaf156ce..83579d0acb 100644 --- a/webapp/packages/plugin-gis-viewer/package.json +++ b/webapp/packages/plugin-gis-viewer/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", @@ -45,6 +46,7 @@ "@types/react": "^19", "@types/wellknown": "^0", "leaflet": "^1", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-gis-viewer/src/index.ts b/webapp/packages/plugin-gis-viewer/src/index.ts index 32b2d29a8d..2aa5af20b9 100644 --- a/webapp/packages/plugin-gis-viewer/src/index.ts +++ b/webapp/packages/plugin-gis-viewer/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { manifest } from './manifest.js'; - -export default manifest; export * from './ResultSetGISAction.js'; diff --git a/webapp/packages/plugin-gis-viewer/src/manifest.ts b/webapp/packages/plugin-gis-viewer/src/manifest.ts deleted file mode 100644 index 1229ea70c1..0000000000 --- a/webapp/packages/plugin-gis-viewer/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'GIS Viewer plugin', - }, -}; diff --git a/webapp/packages/plugin-gis-viewer/src/module.ts b/webapp/packages/plugin-gis-viewer/src/module.ts index af062472bd..f45b27f2ea 100644 --- a/webapp/packages/plugin-gis-viewer/src/module.ts +++ b/webapp/packages/plugin-gis-viewer/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { LocaleService } from './LocaleService.js'; import { GISViewerBootstrap } from './GISViewerBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-gis-viewer', configure: serviceCollection => { diff --git a/webapp/packages/plugin-help/package.json b/webapp/packages/plugin-help/package.json index f9f64c6741..e4a4ab55e2 100644 --- a/webapp/packages/plugin-help/package.json +++ b/webapp/packages/plugin-help/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", @@ -40,14 +41,18 @@ "@cloudbeaver/plugin-sql-editor": "workspace:*", "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*", "@cloudbeaver/plugin-top-app-bar": "workspace:*", + "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", + "react-dom": "^19", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "@types/react-dom": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-help/src/index.ts b/webapp/packages/plugin-help/src/index.ts index f4b014c101..c465e1ac53 100644 --- a/webapp/packages/plugin-help/src/index.ts +++ b/webapp/packages/plugin-help/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { manifest } from './manifest.js'; - -export default manifest; diff --git a/webapp/packages/plugin-help/src/manifest.ts b/webapp/packages/plugin-help/src/manifest.ts deleted file mode 100644 index 09b43aa388..0000000000 --- a/webapp/packages/plugin-help/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Help plugin', - }, -}; diff --git a/webapp/packages/plugin-help/src/module.ts b/webapp/packages/plugin-help/src/module.ts index e1fd51157b..56941f786b 100644 --- a/webapp/packages/plugin-help/src/module.ts +++ b/webapp/packages/plugin-help/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-help', configure: serviceCollection => { diff --git a/webapp/packages/plugin-holidays-administration/package.json b/webapp/packages/plugin-holidays-administration/package.json index 9aaa3443ba..d53fe9db32 100644 --- a/webapp/packages/plugin-holidays-administration/package.json +++ b/webapp/packages/plugin-holidays-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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-holidays-administration/src/index.ts b/webapp/packages/plugin-holidays-administration/src/index.ts index 0654a59d4f..c465e1ac53 100644 --- a/webapp/packages/plugin-holidays-administration/src/index.ts +++ b/webapp/packages/plugin-holidays-administration/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { holidaysAdministrationPlugin } from './manifest.js'; - -export { holidaysAdministrationPlugin }; -export default holidaysAdministrationPlugin; diff --git a/webapp/packages/plugin-holidays-administration/src/manifest.ts b/webapp/packages/plugin-holidays-administration/src/manifest.ts deleted file mode 100644 index 90a4e08801..0000000000 --- a/webapp/packages/plugin-holidays-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const holidaysAdministrationPlugin: PluginManifest = { - info: { - name: 'Holidays Administration plugin', - }, -}; diff --git a/webapp/packages/plugin-holidays-administration/src/module.ts b/webapp/packages/plugin-holidays-administration/src/module.ts index 0ef5113438..594133089d 100644 --- a/webapp/packages/plugin-holidays-administration/src/module.ts +++ b/webapp/packages/plugin-holidays-administration/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { HolidayAdministrationBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-holidays-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-holidays/package.json b/webapp/packages/plugin-holidays/package.json index cc1aaed914..25315077ca 100644 --- a/webapp/packages/plugin-holidays/package.json +++ b/webapp/packages/plugin-holidays/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,6 +36,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-holidays/src/index.ts b/webapp/packages/plugin-holidays/src/index.ts index 7faf4100b1..5871075190 100644 --- a/webapp/packages/plugin-holidays/src/index.ts +++ b/webapp/packages/plugin-holidays/src/index.ts @@ -7,10 +7,6 @@ */ import './module.js'; -import { holidaysPlugin } from './manifest.js'; export * from './HolidaysService.js'; export * from './HolidayActionButtonLazy.js'; - -export { holidaysPlugin }; -export default holidaysPlugin; diff --git a/webapp/packages/plugin-holidays/src/manifest.ts b/webapp/packages/plugin-holidays/src/manifest.ts deleted file mode 100644 index b1cb2c04e5..0000000000 --- a/webapp/packages/plugin-holidays/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const holidaysPlugin: PluginManifest = { - info: { - name: 'Holidays plugin', - }, -}; diff --git a/webapp/packages/plugin-holidays/src/module.ts b/webapp/packages/plugin-holidays/src/module.ts index 27397c12e6..951c1ac26c 100644 --- a/webapp/packages/plugin-holidays/src/module.ts +++ b/webapp/packages/plugin-holidays/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry, proxy } from '@cloudbeaver/core-di'; import { HolidaysService } from './HolidaysService.js'; import { ChristmasService } from './Christmas/ChristmasService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-holidays', configure: serviceCollection => { diff --git a/webapp/packages/plugin-localization/package.json b/webapp/packages/plugin-localization/package.json index cb3441b009..c2388d5b6c 100644 --- a/webapp/packages/plugin-localization/package.json +++ b/webapp/packages/plugin-localization/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", @@ -30,6 +31,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-localization/src/index.ts b/webapp/packages/plugin-localization/src/index.ts index 4ef2c46d12..c465e1ac53 100644 --- a/webapp/packages/plugin-localization/src/index.ts +++ b/webapp/packages/plugin-localization/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { localizationPlugin } from './manifest.js'; - -export default localizationPlugin; diff --git a/webapp/packages/plugin-localization/src/manifest.ts b/webapp/packages/plugin-localization/src/manifest.ts deleted file mode 100644 index 8a3692e387..0000000000 --- a/webapp/packages/plugin-localization/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const localizationPlugin: PluginManifest = { - info: { name: 'Localization plugin' }, -}; diff --git a/webapp/packages/plugin-localization/src/module.ts b/webapp/packages/plugin-localization/src/module.ts index 98f6fbddd1..43a4b2df73 100644 --- a/webapp/packages/plugin-localization/src/module.ts +++ b/webapp/packages/plugin-localization/src/module.ts @@ -9,7 +9,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-localization', configure: serviceCollection => { diff --git a/webapp/packages/plugin-log-viewer/package.json b/webapp/packages/plugin-log-viewer/package.json index 56f51a23ad..c218c11cc7 100644 --- a/webapp/packages/plugin-log-viewer/package.json +++ b/webapp/packages/plugin-log-viewer/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", @@ -43,8 +44,9 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/plugin-log-viewer/src/index.ts b/webapp/packages/plugin-log-viewer/src/index.ts index 06be0e5741..bf090959e7 100644 --- a/webapp/packages/plugin-log-viewer/src/index.ts +++ b/webapp/packages/plugin-log-viewer/src/index.ts @@ -7,11 +7,7 @@ */ import './module.js'; -import { logViewerPlugin } from './manifest.js'; export * from './LogViewer/LogViewerBootstrap.js'; export * from './LogViewer/LogViewerService.js'; export * from './LogViewer/LogViewerSettingsService.js'; - -export { logViewerPlugin }; -export default logViewerPlugin; diff --git a/webapp/packages/plugin-log-viewer/src/manifest.ts b/webapp/packages/plugin-log-viewer/src/manifest.ts deleted file mode 100644 index 79edb3f0dc..0000000000 --- a/webapp/packages/plugin-log-viewer/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const logViewerPlugin: PluginManifest = { - info: { name: 'Log viewer plugin' }, -}; diff --git a/webapp/packages/plugin-log-viewer/src/module.ts b/webapp/packages/plugin-log-viewer/src/module.ts index cc87805502..f8d50c9294 100644 --- a/webapp/packages/plugin-log-viewer/src/module.ts +++ b/webapp/packages/plugin-log-viewer/src/module.ts @@ -14,7 +14,7 @@ import { LogViewerBootstrap } from './LogViewer/LogViewerBootstrap.js'; import { LogViewerSettingsService } from './LogViewer/LogViewerSettingsService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-log-viewer', configure: serviceCollection => { diff --git a/webapp/packages/plugin-navigation-tabs/package.json b/webapp/packages/plugin-navigation-tabs/package.json index d7b9fcb1d6..d26d3fa6a7 100644 --- a/webapp/packages/plugin-navigation-tabs/package.json +++ b/webapp/packages/plugin-navigation-tabs/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", @@ -32,7 +33,6 @@ "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-projects": "workspace:*", "@cloudbeaver/core-resource": "workspace:*", - "@cloudbeaver/core-root": "workspace:*", "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-storage": "workspace:*", "@cloudbeaver/core-ui": "workspace:*", @@ -48,6 +48,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-navigation-tabs/src/index.ts b/webapp/packages/plugin-navigation-tabs/src/index.ts index 74fe549062..b11a98b1ca 100644 --- a/webapp/packages/plugin-navigation-tabs/src/index.ts +++ b/webapp/packages/plugin-navigation-tabs/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './NavigationTabs/NavigationTabsService.js'; export * from './NavigationTabs/TabNavigationContext.js'; diff --git a/webapp/packages/plugin-navigation-tabs/src/manifest.ts b/webapp/packages/plugin-navigation-tabs/src/manifest.ts deleted file mode 100644 index 1bf8077bed..0000000000 --- a/webapp/packages/plugin-navigation-tabs/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const navigationTabsPlugin: PluginManifest = { - info: { name: 'Navigation tabs plugin' }, -}; diff --git a/webapp/packages/plugin-navigation-tabs/src/module.ts b/webapp/packages/plugin-navigation-tabs/src/module.ts index 458dcf76bc..5c0a1f0f89 100644 --- a/webapp/packages/plugin-navigation-tabs/src/module.ts +++ b/webapp/packages/plugin-navigation-tabs/src/module.ts @@ -12,7 +12,7 @@ import { NavigationTabsService } from './NavigationTabs/NavigationTabsService.js import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-navigation-tabs', configure: serviceCollection => { diff --git a/webapp/packages/plugin-navigation-tabs/tsconfig.json b/webapp/packages/plugin-navigation-tabs/tsconfig.json index 144bc6cb18..60859269f6 100644 --- a/webapp/packages/plugin-navigation-tabs/tsconfig.json +++ b/webapp/packages/plugin-navigation-tabs/tsconfig.json @@ -43,9 +43,6 @@ { "path": "../core-resource" }, - { - "path": "../core-root" - }, { "path": "../core-settings" }, diff --git a/webapp/packages/plugin-navigation-tree-filters/package.json b/webapp/packages/plugin-navigation-tree-filters/package.json index be264d3dd2..9d0ff476d6 100644 --- a/webapp/packages/plugin-navigation-tree-filters/package.json +++ b/webapp/packages/plugin-navigation-tree-filters/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", @@ -42,6 +43,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-navigation-tree-filters/src/index.ts b/webapp/packages/plugin-navigation-tree-filters/src/index.ts index 02b696f4c4..c465e1ac53 100644 --- a/webapp/packages/plugin-navigation-tree-filters/src/index.ts +++ b/webapp/packages/plugin-navigation-tree-filters/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { navigationTreeFiltersPlugin } from './manifest.js'; - -export { navigationTreeFiltersPlugin }; -export default navigationTreeFiltersPlugin; diff --git a/webapp/packages/plugin-navigation-tree-filters/src/manifest.ts b/webapp/packages/plugin-navigation-tree-filters/src/manifest.ts deleted file mode 100644 index 9b9deeb175..0000000000 --- a/webapp/packages/plugin-navigation-tree-filters/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const navigationTreeFiltersPlugin: PluginManifest = { - info: { - name: 'Navigation tree filters plugin', - }, -}; diff --git a/webapp/packages/plugin-navigation-tree-filters/src/module.ts b/webapp/packages/plugin-navigation-tree-filters/src/module.ts index 166c43899d..8e3b934556 100644 --- a/webapp/packages/plugin-navigation-tree-filters/src/module.ts +++ b/webapp/packages/plugin-navigation-tree-filters/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { LocaleService } from './LocaleService.js'; import { NavigationTreeFiltersBootstrap } from './NavigationTreeFiltersBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-navigation-tree-filters', configure: serviceCollection => { diff --git a/webapp/packages/plugin-navigation-tree-rm/package.json b/webapp/packages/plugin-navigation-tree-rm/package.json index 45e0f37f37..dd827b3f4b 100644 --- a/webapp/packages/plugin-navigation-tree-rm/package.json +++ b/webapp/packages/plugin-navigation-tree-rm/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", @@ -40,7 +41,7 @@ "@cloudbeaver/plugin-navigation-tree": "workspace:*", "@cloudbeaver/plugin-projects": "workspace:*", "@cloudbeaver/plugin-resource-manager": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -52,6 +53,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-navigation-tree-rm/src/index.ts b/webapp/packages/plugin-navigation-tree-rm/src/index.ts index 0bae883b3f..9f53a42967 100644 --- a/webapp/packages/plugin-navigation-tree-rm/src/index.ts +++ b/webapp/packages/plugin-navigation-tree-rm/src/index.ts @@ -7,13 +7,9 @@ */ import './module.js'; -import { navigationTreeRMPlugin } from './manifest.js'; export * from './NavNodes/getResourceKeyFromNodeId.js'; export * from './NavNodes/getResourceNodeId.js'; export * from './NavNodes/getRmProjectNodeId.js'; export * from './Tree/ResourceManagerTree.js'; export * from './NavResourceNodeService.js'; - -export { navigationTreeRMPlugin }; -export default navigationTreeRMPlugin; diff --git a/webapp/packages/plugin-navigation-tree-rm/src/manifest.ts b/webapp/packages/plugin-navigation-tree-rm/src/manifest.ts deleted file mode 100644 index e313617e17..0000000000 --- a/webapp/packages/plugin-navigation-tree-rm/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const navigationTreeRMPlugin: PluginManifest = { - info: { name: 'Navigation Tree RM plugin' }, -}; diff --git a/webapp/packages/plugin-navigation-tree-rm/src/module.ts b/webapp/packages/plugin-navigation-tree-rm/src/module.ts index 4b65b64c18..3033044eff 100644 --- a/webapp/packages/plugin-navigation-tree-rm/src/module.ts +++ b/webapp/packages/plugin-navigation-tree-rm/src/module.ts @@ -12,7 +12,7 @@ import { NavTreeRMContextMenuBootstrap } from './NavTreeRMContextMenuBootstrap.j import { NavResourceNodeService } from './NavResourceNodeService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-navigation-tree-rm', configure: serviceCollection => { diff --git a/webapp/packages/plugin-navigation-tree/package.json b/webapp/packages/plugin-navigation-tree/package.json index 5a97eb10aa..c233997858 100644 --- a/webapp/packages/plugin-navigation-tree/package.json +++ b/webapp/packages/plugin-navigation-tree/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", @@ -38,7 +39,7 @@ "@cloudbeaver/core-ui": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/core-view": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -49,8 +50,9 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/plugin-navigation-tree/src/index.ts b/webapp/packages/plugin-navigation-tree/src/index.ts index dcba79b1ac..1edbfe8a81 100644 --- a/webapp/packages/plugin-navigation-tree/src/index.ts +++ b/webapp/packages/plugin-navigation-tree/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; export * from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.js'; export * from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/DATA_CONTEXT_NAV_TREE_ROOT.js'; diff --git a/webapp/packages/plugin-navigation-tree/src/manifest.ts b/webapp/packages/plugin-navigation-tree/src/manifest.ts deleted file mode 100644 index 979e69e24f..0000000000 --- a/webapp/packages/plugin-navigation-tree/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const navigationTreePlugin: PluginManifest = { - info: { name: 'Navigation Tree plugin' }, -}; diff --git a/webapp/packages/plugin-navigation-tree/src/module.ts b/webapp/packages/plugin-navigation-tree/src/module.ts index 7306bc1b5d..55da2a38ac 100644 --- a/webapp/packages/plugin-navigation-tree/src/module.ts +++ b/webapp/packages/plugin-navigation-tree/src/module.ts @@ -18,7 +18,7 @@ import { ElementsTreeToolsMenuService } from './NavigationTree/ElementsTree/Elem import { ElementsTreeService } from './NavigationTree/ElementsTree/ElementsTreeService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-navigation-tree', configure: serviceCollection => { diff --git a/webapp/packages/plugin-object-viewer-nav-tree-link/package.json b/webapp/packages/plugin-object-viewer-nav-tree-link/package.json index 985bdad50d..12302e61f1 100644 --- a/webapp/packages/plugin-object-viewer-nav-tree-link/package.json +++ b/webapp/packages/plugin-object-viewer-nav-tree-link/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", @@ -32,6 +33,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-object-viewer-nav-tree-link/src/index.ts b/webapp/packages/plugin-object-viewer-nav-tree-link/src/index.ts index 69c951c698..d8cc8d2650 100644 --- a/webapp/packages/plugin-object-viewer-nav-tree-link/src/index.ts +++ b/webapp/packages/plugin-object-viewer-nav-tree-link/src/index.ts @@ -9,6 +9,3 @@ import './module.js'; export * from './ACTION_LINK_OBJECT.js'; export * from './KEY_BINDING_LINK_OBJECT.js'; -import { objectViewerNavTreeLinkPlugin } from './manifest.js'; -export { objectViewerNavTreeLinkPlugin }; -export default objectViewerNavTreeLinkPlugin; diff --git a/webapp/packages/plugin-object-viewer-nav-tree-link/src/manifest.ts b/webapp/packages/plugin-object-viewer-nav-tree-link/src/manifest.ts deleted file mode 100644 index e1c383c8e4..0000000000 --- a/webapp/packages/plugin-object-viewer-nav-tree-link/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const objectViewerNavTreeLinkPlugin: PluginManifest = { - info: { name: 'Object Viewer Nav Tree link' }, -}; diff --git a/webapp/packages/plugin-object-viewer-nav-tree-link/src/module.ts b/webapp/packages/plugin-object-viewer-nav-tree-link/src/module.ts index e59cd7bbd5..5520c7e749 100644 --- a/webapp/packages/plugin-object-viewer-nav-tree-link/src/module.ts +++ b/webapp/packages/plugin-object-viewer-nav-tree-link/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { ObjectViewerNavTreeLinkMenuService } from './ObjectViewerNavTreeLinkMenuService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-object-viewer-nav-tree-link', configure: serviceCollection => { diff --git a/webapp/packages/plugin-object-viewer/package.json b/webapp/packages/plugin-object-viewer/package.json index cc6be31558..14b8772d6c 100644 --- a/webapp/packages/plugin-object-viewer/package.json +++ b/webapp/packages/plugin-object-viewer/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", @@ -39,8 +40,8 @@ "@cloudbeaver/plugin-data-grid": "workspace:*", "@cloudbeaver/plugin-navigation-tabs": "workspace:*", "@cloudbeaver/plugin-navigation-tree": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", - "@dbeaver/ui-kit": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", + "@dbeaver/ui-kit": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -52,6 +53,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-object-viewer/src/index.ts b/webapp/packages/plugin-object-viewer/src/index.ts index e77ee10de2..407005cc61 100644 --- a/webapp/packages/plugin-object-viewer/src/index.ts +++ b/webapp/packages/plugin-object-viewer/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -export * from './manifest.js'; // All Services and Components that is provided by this plugin should be exported here export * from './ObjectPage/DBObjectPageService.js'; diff --git a/webapp/packages/plugin-object-viewer/src/manifest.ts b/webapp/packages/plugin-object-viewer/src/manifest.ts deleted file mode 100644 index 4bcafec20e..0000000000 --- a/webapp/packages/plugin-object-viewer/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const objectViewerManifest: PluginManifest = { - info: { name: 'Object Viewer Plugin' }, -}; diff --git a/webapp/packages/plugin-object-viewer/src/module.ts b/webapp/packages/plugin-object-viewer/src/module.ts index 1f97202286..b15e349913 100644 --- a/webapp/packages/plugin-object-viewer/src/module.ts +++ b/webapp/packages/plugin-object-viewer/src/module.ts @@ -16,7 +16,7 @@ import { NavNodeMetadataViewBootstrap } from './ObjectPropertiesPage/NavNodeView import { DBObjectPageService } from './ObjectPage/DBObjectPageService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-object-viewer', configure: serviceCollection => { diff --git a/webapp/packages/plugin-product-information-administration/package.json b/webapp/packages/plugin-product-information-administration/package.json index 9cac707229..f3e65d5492 100644 --- a/webapp/packages/plugin-product-information-administration/package.json +++ b/webapp/packages/plugin-product-information-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", @@ -40,6 +41,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-product-information-administration/src/index.ts b/webapp/packages/plugin-product-information-administration/src/index.ts index e0315718ec..75c6293f4f 100644 --- a/webapp/packages/plugin-product-information-administration/src/index.ts +++ b/webapp/packages/plugin-product-information-administration/src/index.ts @@ -7,10 +7,6 @@ */ import './module.js'; -import { productInformationPlugin } from './manifest.js'; export * from './ProductInfoNavigationService.js'; export * from './ProductInfoService.js'; - -export { productInformationPlugin }; -export default productInformationPlugin; diff --git a/webapp/packages/plugin-product-information-administration/src/manifest.ts b/webapp/packages/plugin-product-information-administration/src/manifest.ts deleted file mode 100644 index 29acfd55ff..0000000000 --- a/webapp/packages/plugin-product-information-administration/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const productInformationPlugin: PluginManifest = { - info: { name: 'Product administration plugin' }, -}; diff --git a/webapp/packages/plugin-product-information-administration/src/module.ts b/webapp/packages/plugin-product-information-administration/src/module.ts index 2e83027918..3cd2141ee1 100644 --- a/webapp/packages/plugin-product-information-administration/src/module.ts +++ b/webapp/packages/plugin-product-information-administration/src/module.ts @@ -11,7 +11,7 @@ import { ProductInfoService } from './ProductInfoService.js'; import { LocaleService } from './LocaleService.js'; import { ProductInfoNavigationService } from './ProductInfoNavigationService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-product-information-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-product/package.json b/webapp/packages/plugin-product/package.json index 28115f949b..dd3ba23d92 100644 --- a/webapp/packages/plugin-product/package.json +++ b/webapp/packages/plugin-product/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", @@ -42,6 +43,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-product/src/index.ts b/webapp/packages/plugin-product/src/index.ts index 96c5ba3ef6..75e097e0cc 100644 --- a/webapp/packages/plugin-product/src/index.ts +++ b/webapp/packages/plugin-product/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { productPlugin } from './manifest.js'; export { default as ProductInfoDialogStyles } from './ProductInfoDialog.module.css'; - -export default productPlugin; diff --git a/webapp/packages/plugin-product/src/manifest.ts b/webapp/packages/plugin-product/src/manifest.ts deleted file mode 100644 index 654554da9b..0000000000 --- a/webapp/packages/plugin-product/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const productPlugin: PluginManifest = { - info: { name: 'Product plugin' }, -}; diff --git a/webapp/packages/plugin-product/src/module.ts b/webapp/packages/plugin-product/src/module.ts index 5826fca106..bfe7433a62 100644 --- a/webapp/packages/plugin-product/src/module.ts +++ b/webapp/packages/plugin-product/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { ProductBootstrap } from './ProductBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-product', configure: serviceCollection => { diff --git a/webapp/packages/plugin-projects/package.json b/webapp/packages/plugin-projects/package.json index c6ca983397..b26909036e 100644 --- a/webapp/packages/plugin-projects/package.json +++ b/webapp/packages/plugin-projects/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", @@ -38,6 +39,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-projects/src/index.ts b/webapp/packages/plugin-projects/src/index.ts index f848df728d..4bf852f530 100644 --- a/webapp/packages/plugin-projects/src/index.ts +++ b/webapp/packages/plugin-projects/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { manifest } from './manifest.js'; export * from './FolderDialog.js'; export * from './ProjectSelect.js'; - -export default manifest; diff --git a/webapp/packages/plugin-projects/src/manifest.ts b/webapp/packages/plugin-projects/src/manifest.ts deleted file mode 100644 index ea6df8d9cc..0000000000 --- a/webapp/packages/plugin-projects/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { - name: 'Projects plugin', - }, -}; diff --git a/webapp/packages/plugin-projects/src/module.ts b/webapp/packages/plugin-projects/src/module.ts index 320197eb14..5a2eaf93e4 100644 --- a/webapp/packages/plugin-projects/src/module.ts +++ b/webapp/packages/plugin-projects/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-projects', configure: serviceCollection => { diff --git a/webapp/packages/plugin-resource-manager-administration/package.json b/webapp/packages/plugin-resource-manager-administration/package.json index e6097687db..c97ff52016 100644 --- a/webapp/packages/plugin-resource-manager-administration/package.json +++ b/webapp/packages/plugin-resource-manager-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", @@ -35,6 +36,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-resource-manager-administration/src/index.ts b/webapp/packages/plugin-resource-manager-administration/src/index.ts index 33b616d1a4..c465e1ac53 100644 --- a/webapp/packages/plugin-resource-manager-administration/src/index.ts +++ b/webapp/packages/plugin-resource-manager-administration/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { resourceManagerAdministrationPlugin } from './manifest.js'; - -export default resourceManagerAdministrationPlugin; diff --git a/webapp/packages/plugin-resource-manager-administration/src/manifest.ts b/webapp/packages/plugin-resource-manager-administration/src/manifest.ts deleted file mode 100644 index ed39927035..0000000000 --- a/webapp/packages/plugin-resource-manager-administration/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const resourceManagerAdministrationPlugin: PluginManifest = { - info: { name: 'Resource manager administration plugin' }, -}; diff --git a/webapp/packages/plugin-resource-manager-administration/src/module.ts b/webapp/packages/plugin-resource-manager-administration/src/module.ts index 6c3aa00bf0..cbd5c60745 100644 --- a/webapp/packages/plugin-resource-manager-administration/src/module.ts +++ b/webapp/packages/plugin-resource-manager-administration/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-resource-manager-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-resource-manager-scripts/package.json b/webapp/packages/plugin-resource-manager-scripts/package.json index 1c366e3c51..4d1f99d848 100644 --- a/webapp/packages/plugin-resource-manager-scripts/package.json +++ b/webapp/packages/plugin-resource-manager-scripts/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", @@ -49,6 +50,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-resource-manager-scripts/src/index.ts b/webapp/packages/plugin-resource-manager-scripts/src/index.ts index 9f4c49f4c5..0caa06b557 100644 --- a/webapp/packages/plugin-resource-manager-scripts/src/index.ts +++ b/webapp/packages/plugin-resource-manager-scripts/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { resourceManagerScriptsPlugin } from './manifest.js'; - -export default resourceManagerScriptsPlugin; export * from './ResourceManagerScriptsService.js'; export * from './SaveScriptDialog.js'; diff --git a/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts b/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts deleted file mode 100644 index 2161fb8264..0000000000 --- a/webapp/packages/plugin-resource-manager-scripts/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const resourceManagerScriptsPlugin: PluginManifest = { - info: { name: 'Resource manager scripts plugin' }, -}; diff --git a/webapp/packages/plugin-resource-manager-scripts/src/module.ts b/webapp/packages/plugin-resource-manager-scripts/src/module.ts index cf75e81bca..b21aef9fbe 100644 --- a/webapp/packages/plugin-resource-manager-scripts/src/module.ts +++ b/webapp/packages/plugin-resource-manager-scripts/src/module.ts @@ -12,7 +12,7 @@ import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; import { ResourceManagerScriptsService } from './ResourceManagerScriptsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-resource-manager-scripts', configure: serviceCollection => { diff --git a/webapp/packages/plugin-resource-manager/package.json b/webapp/packages/plugin-resource-manager/package.json index 904300b4ad..2f5abec98e 100644 --- a/webapp/packages/plugin-resource-manager/package.json +++ b/webapp/packages/plugin-resource-manager/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", @@ -39,7 +40,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/packages/plugin-resource-manager/src/index.ts b/webapp/packages/plugin-resource-manager/src/index.ts index 590ff84d4a..76615f59f5 100644 --- a/webapp/packages/plugin-resource-manager/src/index.ts +++ b/webapp/packages/plugin-resource-manager/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { resourceManagerPlugin } from './manifest.js'; - -export default resourceManagerPlugin; export * from './ResourceManagerSettingsService.js'; export * from './RESOURCE_NAME_REGEX.js'; diff --git a/webapp/packages/plugin-resource-manager/src/manifest.ts b/webapp/packages/plugin-resource-manager/src/manifest.ts deleted file mode 100644 index 25eac95c8d..0000000000 --- a/webapp/packages/plugin-resource-manager/src/manifest.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -// -export const resourceManagerPlugin: PluginManifest = { - info: { name: 'Resource manager plugin' }, -}; diff --git a/webapp/packages/plugin-resource-manager/src/module.ts b/webapp/packages/plugin-resource-manager/src/module.ts index c1b97bc330..e549f6e8c5 100644 --- a/webapp/packages/plugin-resource-manager/src/module.ts +++ b/webapp/packages/plugin-resource-manager/src/module.ts @@ -13,7 +13,7 @@ import { ResourceProjectsResource } from './ResourceProjectsResource.js'; import { ResourceManagerService } from './ResourceManagerService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-resource-manager', configure: serviceCollection => { diff --git a/webapp/packages/plugin-root/package.json b/webapp/packages/plugin-root/package.json index bf1a1b186e..a93acb0d48 100644 --- a/webapp/packages/plugin-root/package.json +++ b/webapp/packages/plugin-root/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", @@ -39,6 +40,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-root/src/index.ts b/webapp/packages/plugin-root/src/index.ts index e79eb26011..3f3a6789e2 100644 --- a/webapp/packages/plugin-root/src/index.ts +++ b/webapp/packages/plugin-root/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { rootPlugin } from './manifest.js'; export { default as ServerNodeChangedDialogStyles } from './ServerNodeChangedDialog/ServerNodeChangedDialog.module.css'; - -export default rootPlugin; diff --git a/webapp/packages/plugin-root/src/manifest.ts b/webapp/packages/plugin-root/src/manifest.ts deleted file mode 100644 index 43b60a1230..0000000000 --- a/webapp/packages/plugin-root/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const rootPlugin: PluginManifest = { - info: { name: 'Root plugin' }, -}; diff --git a/webapp/packages/plugin-root/src/module.ts b/webapp/packages/plugin-root/src/module.ts index 4203438013..e4c2b30fb2 100644 --- a/webapp/packages/plugin-root/src/module.ts +++ b/webapp/packages/plugin-root/src/module.ts @@ -13,7 +13,7 @@ import { NetworkStateNotificationBootstrap } from './NetworkStateNotification/Ne import { LocaleService } from './LocaleService.js'; import { DataSynchronizationResolverBootstrap } from './DataSynchronization/DataSynchronizationResolverBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-root', configure: serviceCollection => { diff --git a/webapp/packages/plugin-session-expiration/package.json b/webapp/packages/plugin-session-expiration/package.json index d2e6045050..5330b56c49 100644 --- a/webapp/packages/plugin-session-expiration/package.json +++ b/webapp/packages/plugin-session-expiration/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", @@ -41,6 +42,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-session-expiration/src/index.ts b/webapp/packages/plugin-session-expiration/src/index.ts index 115e706aa2..c465e1ac53 100644 --- a/webapp/packages/plugin-session-expiration/src/index.ts +++ b/webapp/packages/plugin-session-expiration/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { sessionExpirationPlugin } from './manifest.js'; - -export { sessionExpirationPlugin }; -export default sessionExpirationPlugin; diff --git a/webapp/packages/plugin-session-expiration/src/manifest.ts b/webapp/packages/plugin-session-expiration/src/manifest.ts deleted file mode 100644 index e79947d54d..0000000000 --- a/webapp/packages/plugin-session-expiration/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sessionExpirationPlugin: PluginManifest = { - info: { name: 'Session Expiration plugin' }, -}; diff --git a/webapp/packages/plugin-session-expiration/src/module.ts b/webapp/packages/plugin-session-expiration/src/module.ts index a4dd1e92c9..345da4a1ea 100644 --- a/webapp/packages/plugin-session-expiration/src/module.ts +++ b/webapp/packages/plugin-session-expiration/src/module.ts @@ -12,7 +12,7 @@ import { PluginBootstrap } from './PluginBootstrap.js'; import { SessionExpiredDialogBootstrap } from './SessionExpireDialog/SessionExpiredDialogBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-session-expiration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-set-common/.gitignore b/webapp/packages/plugin-set-common/.gitignore new file mode 100644 index 0000000000..15bc16c7c3 --- /dev/null +++ b/webapp/packages/plugin-set-common/.gitignore @@ -0,0 +1,17 @@ +# dependencies +/node_modules + +# testing +/coverage + +# production +/lib + +# misc +.DS_Store +.env* + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/webapp/packages/plugin-set-common/package.json b/webapp/packages/plugin-set-common/package.json new file mode 100644 index 0000000000..bc4c93ea69 --- /dev/null +++ b/webapp/packages/plugin-set-common/package.json @@ -0,0 +1,128 @@ +{ + "name": "@cloudbeaver/plugin-set-common", + "type": "module", + "sideEffects": [ + "./lib/module.js", + "./lib/index.js", + "src/**/*.css", + "src/**/*.scss", + "public/**/*" + ], + "version": "0.1.0", + "description": "", + "license": "Apache-2.0", + "exports": { + ".": "./lib/index.js", + "./module": "./lib/module.js" + }, + "scripts": { + "build": "tsc -b", + "clean": "rimraf --glob lib", + "lint": "eslint ./src/ --ext .ts,.tsx", + "validate-dependencies": "core-cli-validate-dependencies" + }, + "dependencies": { + "@cloudbeaver/core-administration": "workspace:*", + "@cloudbeaver/core-app": "workspace:*", + "@cloudbeaver/core-authentication": "workspace:*", + "@cloudbeaver/core-blocks": "workspace:*", + "@cloudbeaver/core-browser": "workspace:*", + "@cloudbeaver/core-browser-cookies": "workspace:*", + "@cloudbeaver/core-browser-settings": "workspace:*", + "@cloudbeaver/core-client-activity": "workspace:*", + "@cloudbeaver/core-connections": "workspace:*", + "@cloudbeaver/core-dialogs": "workspace:*", + "@cloudbeaver/core-events": "workspace:*", + "@cloudbeaver/core-localization": "workspace:*", + "@cloudbeaver/core-navigation-tree": "workspace:*", + "@cloudbeaver/core-product": "workspace:*", + "@cloudbeaver/core-projects": "workspace:*", + "@cloudbeaver/core-resource-manager": "workspace:*", + "@cloudbeaver/core-root": "workspace:*", + "@cloudbeaver/core-routing": "workspace:*", + "@cloudbeaver/core-sdk": "workspace:*", + "@cloudbeaver/core-server-localization": "workspace:*", + "@cloudbeaver/core-session-localization": "workspace:*", + "@cloudbeaver/core-settings": "workspace:*", + "@cloudbeaver/core-settings-localization": "workspace:*", + "@cloudbeaver/core-settings-user": "workspace:*", + "@cloudbeaver/core-storage": "workspace:*", + "@cloudbeaver/core-task-manager": "workspace:*", + "@cloudbeaver/core-theming": "workspace:*", + "@cloudbeaver/core-ui": "workspace:*", + "@cloudbeaver/core-version": "workspace:*", + "@cloudbeaver/core-version-update": "workspace:*", + "@cloudbeaver/core-view": "workspace:*", + "@cloudbeaver/plugin-administration": "workspace:*", + "@cloudbeaver/plugin-app-logo": "workspace:*", + "@cloudbeaver/plugin-app-logo-administration": "workspace:*", + "@cloudbeaver/plugin-authentication": "workspace:*", + "@cloudbeaver/plugin-authentication-administration": "workspace:*", + "@cloudbeaver/plugin-browser": "workspace:*", + "@cloudbeaver/plugin-codemirror6": "workspace:*", + "@cloudbeaver/plugin-connection-custom": "workspace:*", + "@cloudbeaver/plugin-connection-search": "workspace:*", + "@cloudbeaver/plugin-connections": "workspace:*", + "@cloudbeaver/plugin-connections-administration": "workspace:*", + "@cloudbeaver/plugin-data-export": "workspace:*", + "@cloudbeaver/plugin-data-grid": "workspace:*", + "@cloudbeaver/plugin-data-import": "workspace:*", + "@cloudbeaver/plugin-data-spreadsheet-new": "workspace:*", + "@cloudbeaver/plugin-data-viewer": "workspace:*", + "@cloudbeaver/plugin-data-viewer-result-set-grouping": "workspace:*", + "@cloudbeaver/plugin-data-viewer-result-trace-details": "workspace:*", + "@cloudbeaver/plugin-datasource-context-switch": "workspace:*", + "@cloudbeaver/plugin-datasource-transaction-manager": "workspace:*", + "@cloudbeaver/plugin-ddl-viewer": "workspace:*", + "@cloudbeaver/plugin-devtools": "workspace:*", + "@cloudbeaver/plugin-gis-viewer": "workspace:*", + "@cloudbeaver/plugin-help": "workspace:*", + "@cloudbeaver/plugin-holidays": "workspace:*", + "@cloudbeaver/plugin-holidays-administration": "workspace:*", + "@cloudbeaver/plugin-localization": "workspace:*", + "@cloudbeaver/plugin-log-viewer": "workspace:*", + "@cloudbeaver/plugin-navigation-tabs": "workspace:*", + "@cloudbeaver/plugin-navigation-tree": "workspace:*", + "@cloudbeaver/plugin-navigation-tree-filters": "workspace:*", + "@cloudbeaver/plugin-navigation-tree-rm": "workspace:*", + "@cloudbeaver/plugin-object-viewer": "workspace:*", + "@cloudbeaver/plugin-object-viewer-nav-tree-link": "workspace:*", + "@cloudbeaver/plugin-product": "workspace:*", + "@cloudbeaver/plugin-product-information-administration": "workspace:*", + "@cloudbeaver/plugin-projects": "workspace:*", + "@cloudbeaver/plugin-resource-manager": "workspace:*", + "@cloudbeaver/plugin-resource-manager-administration": "workspace:*", + "@cloudbeaver/plugin-resource-manager-scripts": "workspace:*", + "@cloudbeaver/plugin-root": "workspace:*", + "@cloudbeaver/plugin-session-expiration": "workspace:*", + "@cloudbeaver/plugin-settings-administration": "workspace:*", + "@cloudbeaver/plugin-settings-default-administration": "workspace:*", + "@cloudbeaver/plugin-settings-menu": "workspace:*", + "@cloudbeaver/plugin-settings-menu-administration": "workspace:*", + "@cloudbeaver/plugin-settings-panel": "workspace:*", + "@cloudbeaver/plugin-sql-editor": "workspace:*", + "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*", + "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*", + "@cloudbeaver/plugin-sql-editor-new": "workspace:*", + "@cloudbeaver/plugin-sql-editor-screen": "workspace:*", + "@cloudbeaver/plugin-sql-generator": "workspace:*", + "@cloudbeaver/plugin-system-information-administration": "workspace:*", + "@cloudbeaver/plugin-task-manager": "workspace:*", + "@cloudbeaver/plugin-theme": "workspace:*", + "@cloudbeaver/plugin-tools-panel": "workspace:*", + "@cloudbeaver/plugin-top-app-bar": "workspace:*", + "@cloudbeaver/plugin-top-app-bar-administration": "workspace:*", + "@cloudbeaver/plugin-user-profile": "workspace:*", + "@cloudbeaver/plugin-user-profile-administration": "workspace:*", + "@cloudbeaver/plugin-user-profile-settings": "workspace:*", + "@cloudbeaver/plugin-version": "workspace:*", + "@cloudbeaver/plugin-version-update-administration": "workspace:*", + "tslib": "^2" + }, + "devDependencies": { + "@cloudbeaver/core-cli": "workspace:*", + "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", + "typescript": "^5" + } +} diff --git a/webapp/packages/plugin-set-common/src/index.ts b/webapp/packages/plugin-set-common/src/index.ts new file mode 100644 index 0000000000..892a2ae989 --- /dev/null +++ b/webapp/packages/plugin-set-common/src/index.ts @@ -0,0 +1,206 @@ +/* + * CloudBeaver - Cloud Database Manager + * 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. + */ + +import coreAdministration from '@cloudbeaver/core-administration/module'; +import coreApp from '@cloudbeaver/core-app/module'; +import coreAuthentication from '@cloudbeaver/core-authentication/module'; +import coreBlocks from '@cloudbeaver/core-blocks/module'; +import coreBrowser from '@cloudbeaver/core-browser/module'; +import coreBrowserCookies from '@cloudbeaver/core-browser-cookies/module'; +import coreBrowserSettings from '@cloudbeaver/core-browser-settings/module'; +import coreClientActivity from '@cloudbeaver/core-client-activity/module'; +import coreConnections from '@cloudbeaver/core-connections/module'; +import coreDialogs from '@cloudbeaver/core-dialogs/module'; +import coreEvents from '@cloudbeaver/core-events/module'; +import coreLocalization from '@cloudbeaver/core-localization/module'; +import coreNavigationTree from '@cloudbeaver/core-navigation-tree/module'; +import coreProduct from '@cloudbeaver/core-product/module'; +import coreProjects from '@cloudbeaver/core-projects/module'; +import coreResourceManager from '@cloudbeaver/core-resource-manager/module'; +import coreRoot from '@cloudbeaver/core-root/module'; +import coreRouting from '@cloudbeaver/core-routing/module'; +import coreSdk from '@cloudbeaver/core-sdk/module'; +import coreServerLocalization from '@cloudbeaver/core-server-localization/module'; +import coreSessionLocalization from '@cloudbeaver/core-session-localization/module'; +import coreSettings from '@cloudbeaver/core-settings/module'; +import coreSettingsLocalization from '@cloudbeaver/core-settings-localization/module'; +import coreSettingsUser from '@cloudbeaver/core-settings-user/module'; +import coreStorage from '@cloudbeaver/core-storage/module'; +import coreTaskManager from '@cloudbeaver/core-task-manager/module'; +import coreTheming from '@cloudbeaver/core-theming/module'; +import coreUi from '@cloudbeaver/core-ui/module'; +import coreVersion from '@cloudbeaver/core-version/module'; +import coreVersionUpdate from '@cloudbeaver/core-version-update/module'; +import coreView from '@cloudbeaver/core-view/module'; + +import pluginAdministration from '@cloudbeaver/plugin-administration/module'; +import pluginAppLogo from '@cloudbeaver/plugin-app-logo/module'; +import pluginAppLogoAdministration from '@cloudbeaver/plugin-app-logo-administration/module'; +import pluginAuthentication from '@cloudbeaver/plugin-authentication/module'; +import pluginAuthenticationAdministration from '@cloudbeaver/plugin-authentication-administration/module'; +import pluginBrowser from '@cloudbeaver/plugin-browser/module'; +import pluginConnectionCustom from '@cloudbeaver/plugin-connection-custom/module'; +import pluginConnectionSearch from '@cloudbeaver/plugin-connection-search/module'; +import pluginConnections from '@cloudbeaver/plugin-connections/module'; +import pluginConnectionsAdministration from '@cloudbeaver/plugin-connections-administration/module'; +import pluginDataExport from '@cloudbeaver/plugin-data-export/module'; +import pluginDataGrid from '@cloudbeaver/plugin-data-grid/module'; +import pluginDataImport from '@cloudbeaver/plugin-data-import/module'; +import pluginDataSpreadSheetNew from '@cloudbeaver/plugin-data-spreadsheet-new/module'; +import pluginObjectViewerNavTreeLink from '@cloudbeaver/plugin-object-viewer-nav-tree-link/module'; +import pluginDataViewer from '@cloudbeaver/plugin-data-viewer/module'; +import pluginDataViewerResultSetGrouping from '@cloudbeaver/plugin-data-viewer-result-set-grouping/module'; +import pluginDataViewerResultTraceDetails from '@cloudbeaver/plugin-data-viewer-result-trace-details/module'; +import pluginDatasourceContextSwitch from '@cloudbeaver/plugin-datasource-context-switch/module'; +import pluginDatasourceTransactionManager from '@cloudbeaver/plugin-datasource-transaction-manager/module'; +import pluginDdlViewer from '@cloudbeaver/plugin-ddl-viewer/module'; +import pluginDevTools from '@cloudbeaver/plugin-devtools/module'; +import pluginGisViewer from '@cloudbeaver/plugin-gis-viewer/module'; +import pluginHelp from '@cloudbeaver/plugin-help/module'; +import pluginHolidays from '@cloudbeaver/plugin-holidays/module'; +import pluginHolidaysAdministration from '@cloudbeaver/plugin-holidays-administration/module'; +import pluginLocalization from '@cloudbeaver/plugin-localization/module'; +import pluginLogViewer from '@cloudbeaver/plugin-log-viewer/module'; +import pluginNavigationTabs from '@cloudbeaver/plugin-navigation-tabs/module'; +import pluginNavigationTree from '@cloudbeaver/plugin-navigation-tree/module'; +import pluginNavigationTreeFilters from '@cloudbeaver/plugin-navigation-tree-filters/module'; +import pluginNavigationTreeRm from '@cloudbeaver/plugin-navigation-tree-rm/module'; +import pluginObjectViewer from '@cloudbeaver/plugin-object-viewer/module'; +import pluginProduct from '@cloudbeaver/plugin-product/module'; +import pluginProductInformationAdministration from '@cloudbeaver/plugin-product-information-administration/module'; +import pluginProjects from '@cloudbeaver/plugin-projects/module'; +import pluginResourceManager from '@cloudbeaver/plugin-resource-manager/module'; +import pluginResourceManagerAdministration from '@cloudbeaver/plugin-resource-manager-administration/module'; +import pluginResourceManagerScripts from '@cloudbeaver/plugin-resource-manager-scripts/module'; +import pluginRoot from '@cloudbeaver/plugin-root/module'; +import pluginSessionExpiration from '@cloudbeaver/plugin-session-expiration/module'; +import pluginSettingsAdministration from '@cloudbeaver/plugin-settings-administration/module'; +import pluginSettingsMenu from '@cloudbeaver/plugin-settings-menu/module'; +import pluginSettingsMenuAdministration from '@cloudbeaver/plugin-settings-menu-administration/module'; +import pluginSettingsPanel from '@cloudbeaver/plugin-settings-panel/module'; +import pluginSqlEditor from '@cloudbeaver/plugin-sql-editor/module'; +import pluginSqlEditorNavigationTab from '@cloudbeaver/plugin-sql-editor-navigation-tab/module'; +import pluginSqlEditorNavigationTabScript from '@cloudbeaver/plugin-sql-editor-navigation-tab-script/module'; +import pluginSqlEditorNew from '@cloudbeaver/plugin-sql-editor-new/module'; +import pluginSqlEditorScreen from '@cloudbeaver/plugin-sql-editor-screen/module'; +import pluginSqlGenerator from '@cloudbeaver/plugin-sql-generator/module'; +import pluginTaskManager from '@cloudbeaver/plugin-task-manager/module'; +import pluginTheme from '@cloudbeaver/plugin-theme/module'; +import pluginToolsPanel from '@cloudbeaver/plugin-tools-panel/module'; +import pluginTopAppBar from '@cloudbeaver/plugin-top-app-bar/module'; +import pluginTopAppBarAdministration from '@cloudbeaver/plugin-top-app-bar-administration/module'; +import pluginUserProfile from '@cloudbeaver/plugin-user-profile/module'; +import pluginUserProfileAdministration from '@cloudbeaver/plugin-user-profile-administration/module'; +import pluginUserProfileSettings from '@cloudbeaver/plugin-user-profile-settings/module'; +import pluginVersion from '@cloudbeaver/plugin-version/module'; +import pluginVersionUpdateAdministration from '@cloudbeaver/plugin-version-update-administration/module'; +import pluginSystemInformationAdministration from '@cloudbeaver/plugin-system-information-administration/module'; +import pluginSettingsDefaultAdministration from '@cloudbeaver/plugin-settings-default-administration/module'; +import pluginCodemirror6 from '@cloudbeaver/plugin-codemirror6/module'; + +const core = [ + coreRouting, // important, should be first because the router starts in load phase first after all plugins register phase + coreBrowser, + coreTheming, + coreLocalization, + coreSettingsLocalization, + coreSessionLocalization, + coreServerLocalization, + coreBlocks, + coreSettings, + coreStorage, + coreEvents, + coreSdk, + coreRoot, + coreBrowserSettings, + coreBrowserCookies, + coreProduct, + coreProjects, + coreAuthentication, + coreUi, + coreView, + coreVersion, + coreVersionUpdate, + coreConnections, + coreAdministration, + coreDialogs, + coreResourceManager, + coreApp, + coreClientActivity, + coreNavigationTree, + coreSettingsUser, + coreTaskManager, +]; + +export const commonSet = [ + ...core, + pluginDevTools, + pluginProductInformationAdministration, + pluginAdministration, + pluginDataSpreadSheetNew, + pluginDataGrid, + pluginAuthentication, + pluginAuthenticationAdministration, + pluginTheme, + pluginLocalization, + pluginConnectionCustom, + pluginConnectionSearch, + pluginDataExport, + pluginDataImport, + pluginDataViewer, + pluginDataViewerResultTraceDetails, + pluginDataViewerResultSetGrouping, + pluginGisViewer, + pluginDdlViewer, + pluginObjectViewer, + pluginSqlEditor, + pluginSqlEditorNavigationTab, + pluginSqlEditorScreen, + pluginSqlEditorNew, + pluginSqlGenerator, + pluginUserProfile, + pluginUserProfileAdministration, + pluginObjectViewerNavTreeLink, + pluginConnections, + pluginConnectionsAdministration, + pluginVersionUpdateAdministration, + pluginProduct, + pluginSettingsMenu, + pluginSettingsMenuAdministration, + pluginSettingsPanel, + pluginHelp, + pluginResourceManager, + pluginResourceManagerAdministration, + pluginResourceManagerScripts, + pluginSqlEditorNavigationTabScript, + pluginLogViewer, + pluginNavigationTree, + pluginNavigationTreeRm, + pluginDatasourceContextSwitch, + pluginTopAppBar, + pluginTopAppBarAdministration, + pluginVersion, + pluginNavigationTabs, + pluginRoot, + pluginSessionExpiration, + pluginToolsPanel, + pluginDatasourceTransactionManager, + pluginProjects, + pluginBrowser, + pluginNavigationTreeFilters, + pluginTaskManager, + pluginSettingsAdministration, + pluginUserProfileSettings, + pluginHolidays, + pluginHolidaysAdministration, + pluginAppLogo, + pluginAppLogoAdministration, + pluginSystemInformationAdministration, + pluginSettingsDefaultAdministration, + pluginCodemirror6, +]; diff --git a/webapp/packages/plugin-set-common/tsconfig.json b/webapp/packages/plugin-set-common/tsconfig.json new file mode 100644 index 0000000000..e8eb040575 --- /dev/null +++ b/webapp/packages/plugin-set-common/tsconfig.json @@ -0,0 +1,310 @@ +{ + "extends": "@cloudbeaver/tsconfig/tsconfig.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "lib", + "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo", + "composite": true + }, + "references": [ + { + "path": "../core-administration" + }, + { + "path": "../core-app" + }, + { + "path": "../core-authentication" + }, + { + "path": "../core-blocks" + }, + { + "path": "../core-browser" + }, + { + "path": "../core-browser-cookies" + }, + { + "path": "../core-browser-settings" + }, + { + "path": "../core-cli" + }, + { + "path": "../core-client-activity" + }, + { + "path": "../core-connections" + }, + { + "path": "../core-dialogs" + }, + { + "path": "../core-events" + }, + { + "path": "../core-localization" + }, + { + "path": "../core-navigation-tree" + }, + { + "path": "../core-product" + }, + { + "path": "../core-projects" + }, + { + "path": "../core-resource-manager" + }, + { + "path": "../core-root" + }, + { + "path": "../core-routing" + }, + { + "path": "../core-sdk" + }, + { + "path": "../core-server-localization" + }, + { + "path": "../core-session-localization" + }, + { + "path": "../core-settings" + }, + { + "path": "../core-settings-localization" + }, + { + "path": "../core-settings-user" + }, + { + "path": "../core-storage" + }, + { + "path": "../core-task-manager" + }, + { + "path": "../core-theming" + }, + { + "path": "../core-ui" + }, + { + "path": "../core-version" + }, + { + "path": "../core-version-update" + }, + { + "path": "../core-view" + }, + { + "path": "../plugin-administration" + }, + { + "path": "../plugin-app-logo" + }, + { + "path": "../plugin-app-logo-administration" + }, + { + "path": "../plugin-authentication" + }, + { + "path": "../plugin-authentication-administration" + }, + { + "path": "../plugin-browser" + }, + { + "path": "../plugin-codemirror6" + }, + { + "path": "../plugin-connection-custom" + }, + { + "path": "../plugin-connection-search" + }, + { + "path": "../plugin-connections" + }, + { + "path": "../plugin-connections-administration" + }, + { + "path": "../plugin-data-export" + }, + { + "path": "../plugin-data-grid" + }, + { + "path": "../plugin-data-import" + }, + { + "path": "../plugin-data-spreadsheet-new" + }, + { + "path": "../plugin-data-viewer" + }, + { + "path": "../plugin-data-viewer-result-set-grouping" + }, + { + "path": "../plugin-data-viewer-result-trace-details" + }, + { + "path": "../plugin-datasource-context-switch" + }, + { + "path": "../plugin-datasource-transaction-manager" + }, + { + "path": "../plugin-ddl-viewer" + }, + { + "path": "../plugin-devtools" + }, + { + "path": "../plugin-gis-viewer" + }, + { + "path": "../plugin-help" + }, + { + "path": "../plugin-holidays" + }, + { + "path": "../plugin-holidays-administration" + }, + { + "path": "../plugin-localization" + }, + { + "path": "../plugin-log-viewer" + }, + { + "path": "../plugin-navigation-tabs" + }, + { + "path": "../plugin-navigation-tree" + }, + { + "path": "../plugin-navigation-tree-filters" + }, + { + "path": "../plugin-navigation-tree-rm" + }, + { + "path": "../plugin-object-viewer" + }, + { + "path": "../plugin-object-viewer-nav-tree-link" + }, + { + "path": "../plugin-product" + }, + { + "path": "../plugin-product-information-administration" + }, + { + "path": "../plugin-projects" + }, + { + "path": "../plugin-resource-manager" + }, + { + "path": "../plugin-resource-manager-administration" + }, + { + "path": "../plugin-resource-manager-scripts" + }, + { + "path": "../plugin-root" + }, + { + "path": "../plugin-session-expiration" + }, + { + "path": "../plugin-settings-administration" + }, + { + "path": "../plugin-settings-default-administration" + }, + { + "path": "../plugin-settings-menu" + }, + { + "path": "../plugin-settings-menu-administration" + }, + { + "path": "../plugin-settings-panel" + }, + { + "path": "../plugin-sql-editor" + }, + { + "path": "../plugin-sql-editor-navigation-tab" + }, + { + "path": "../plugin-sql-editor-navigation-tab-script" + }, + { + "path": "../plugin-sql-editor-new" + }, + { + "path": "../plugin-sql-editor-screen" + }, + { + "path": "../plugin-sql-generator" + }, + { + "path": "../plugin-system-information-administration" + }, + { + "path": "../plugin-task-manager" + }, + { + "path": "../plugin-theme" + }, + { + "path": "../plugin-tools-panel" + }, + { + "path": "../plugin-top-app-bar" + }, + { + "path": "../plugin-top-app-bar-administration" + }, + { + "path": "../plugin-user-profile" + }, + { + "path": "../plugin-user-profile-administration" + }, + { + "path": "../plugin-user-profile-settings" + }, + { + "path": "../plugin-version" + }, + { + "path": "../plugin-version-update-administration" + } + ], + "include": [ + "__custom_mocks__/**/*", + "src/**/*", + "src/**/*.json", + "src/**/*.css", + "src/**/*.scss" + ], + "exclude": [ + "**/node_modules", + "lib/**/*" + ] +} diff --git a/webapp/packages/plugin-settings-administration/package.json b/webapp/packages/plugin-settings-administration/package.json index 86185a1ab5..0a72d82de5 100644 --- a/webapp/packages/plugin-settings-administration/package.json +++ b/webapp/packages/plugin-settings-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", @@ -27,7 +28,6 @@ "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-events": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", - "@cloudbeaver/core-root": "workspace:*", "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-ui": "workspace:*", "@cloudbeaver/plugin-settings-panel": "workspace:*", @@ -42,6 +42,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-settings-administration/src/index.ts b/webapp/packages/plugin-settings-administration/src/index.ts index 2b73e66214..57143a2033 100644 --- a/webapp/packages/plugin-settings-administration/src/index.ts +++ b/webapp/packages/plugin-settings-administration/src/index.ts @@ -7,8 +7,4 @@ */ import './module.js'; -import { settingsAdministrationPlugin } from './manifest.js'; export { SettingsAdministrationService } from './SettingsAdministrationService.js'; - -export { settingsAdministrationPlugin }; -export default settingsAdministrationPlugin; diff --git a/webapp/packages/plugin-settings-administration/src/manifest.ts b/webapp/packages/plugin-settings-administration/src/manifest.ts deleted file mode 100644 index ea492e168b..0000000000 --- a/webapp/packages/plugin-settings-administration/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const settingsAdministrationPlugin: PluginManifest = { - info: { name: 'Settings Administration plugin' }, -}; diff --git a/webapp/packages/plugin-settings-administration/src/module.ts b/webapp/packages/plugin-settings-administration/src/module.ts index d0ae94df2f..b59dbee506 100644 --- a/webapp/packages/plugin-settings-administration/src/module.ts +++ b/webapp/packages/plugin-settings-administration/src/module.ts @@ -11,7 +11,7 @@ import { SettingsAdministrationService } from './SettingsAdministrationService.j import { SettingsAdministrationPluginBootstrap } from './SettingsAdministrationPluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-settings-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-settings-administration/tsconfig.json b/webapp/packages/plugin-settings-administration/tsconfig.json index af27ac81e1..ba29c036f0 100644 --- a/webapp/packages/plugin-settings-administration/tsconfig.json +++ b/webapp/packages/plugin-settings-administration/tsconfig.json @@ -28,9 +28,6 @@ { "path": "../core-localization" }, - { - "path": "../core-root" - }, { "path": "../core-settings" }, diff --git a/webapp/packages/plugin-settings-default-administration/package.json b/webapp/packages/plugin-settings-default-administration/package.json index b43bbd8094..0cb93f74f6 100644 --- a/webapp/packages/plugin-settings-default-administration/package.json +++ b/webapp/packages/plugin-settings-default-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", @@ -21,19 +22,16 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-authentication": "workspace:*", "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-root": "workspace:*", - "@cloudbeaver/core-settings": "workspace:*", - "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/plugin-settings-administration": "workspace:*", - "mobx": "^6", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-settings-default-administration/src/index.ts b/webapp/packages/plugin-settings-default-administration/src/index.ts index 724ba30510..c465e1ac53 100644 --- a/webapp/packages/plugin-settings-default-administration/src/index.ts +++ b/webapp/packages/plugin-settings-default-administration/src/index.ts @@ -7,5 +7,3 @@ */ import './module.js'; - -export * from './manifest.js'; diff --git a/webapp/packages/plugin-settings-default-administration/src/manifest.ts b/webapp/packages/plugin-settings-default-administration/src/manifest.ts deleted file mode 100644 index 47ae89bc39..0000000000 --- a/webapp/packages/plugin-settings-default-administration/src/manifest.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ - -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const pluginSettingsDefaultAdministrationManifest: PluginManifest = { - info: { - name: 'Plugin Default Settings Administration', - }, -}; diff --git a/webapp/packages/plugin-settings-default-administration/src/module.ts b/webapp/packages/plugin-settings-default-administration/src/module.ts index 08007941f4..768cb76641 100644 --- a/webapp/packages/plugin-settings-default-administration/src/module.ts +++ b/webapp/packages/plugin-settings-default-administration/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { SettingsDefaultAdministrationBootstrap } from './SettingsDefaultBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-settings-default-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-settings-default-administration/tsconfig.json b/webapp/packages/plugin-settings-default-administration/tsconfig.json index 165eaf39fb..7398b0d875 100644 --- a/webapp/packages/plugin-settings-default-administration/tsconfig.json +++ b/webapp/packages/plugin-settings-default-administration/tsconfig.json @@ -11,9 +11,6 @@ "lib/**/*" ], "references": [ - { - "path": "../core-authentication" - }, { "path": "../core-cli" }, @@ -26,12 +23,6 @@ { "path": "../core-root" }, - { - "path": "../core-settings" - }, - { - "path": "../core-utils" - }, { "path": "../plugin-settings-administration" } diff --git a/webapp/packages/plugin-settings-menu-administration/package.json b/webapp/packages/plugin-settings-menu-administration/package.json index 0943f079a2..862866341a 100644 --- a/webapp/packages/plugin-settings-menu-administration/package.json +++ b/webapp/packages/plugin-settings-menu-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", @@ -27,6 +28,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-settings-menu-administration/src/index.ts b/webapp/packages/plugin-settings-menu-administration/src/index.ts index f9d153dfb2..c465e1ac53 100644 --- a/webapp/packages/plugin-settings-menu-administration/src/index.ts +++ b/webapp/packages/plugin-settings-menu-administration/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { settingsMenuAdministrationPlugin } from './manifest.js'; - -export default settingsMenuAdministrationPlugin; diff --git a/webapp/packages/plugin-settings-menu-administration/src/manifest.ts b/webapp/packages/plugin-settings-menu-administration/src/manifest.ts deleted file mode 100644 index 583fb16f4f..0000000000 --- a/webapp/packages/plugin-settings-menu-administration/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const settingsMenuAdministrationPlugin: PluginManifest = { - info: { name: 'Settings menu administration plugin' }, -}; diff --git a/webapp/packages/plugin-settings-menu-administration/src/module.ts b/webapp/packages/plugin-settings-menu-administration/src/module.ts index efcf4730f0..1e827d5b75 100644 --- a/webapp/packages/plugin-settings-menu-administration/src/module.ts +++ b/webapp/packages/plugin-settings-menu-administration/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-settings-menu-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-settings-menu/package.json b/webapp/packages/plugin-settings-menu/package.json index 63ddd7d768..57a60f89b6 100644 --- a/webapp/packages/plugin-settings-menu/package.json +++ b/webapp/packages/plugin-settings-menu/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", @@ -36,6 +37,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-settings-menu/src/index.ts b/webapp/packages/plugin-settings-menu/src/index.ts index abad824a84..0975c0798c 100644 --- a/webapp/packages/plugin-settings-menu/src/index.ts +++ b/webapp/packages/plugin-settings-menu/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { settingsMenuPlugin } from './manifest.js'; - -export default settingsMenuPlugin; export * from './SettingsMenu/SettingsMenu.js'; export * from './SettingsMenu/TOP_NAV_BAR_SETTINGS_MENU.js'; diff --git a/webapp/packages/plugin-settings-menu/src/manifest.ts b/webapp/packages/plugin-settings-menu/src/manifest.ts deleted file mode 100644 index 010bc9c356..0000000000 --- a/webapp/packages/plugin-settings-menu/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const settingsMenuPlugin: PluginManifest = { - info: { name: 'Settings menu plugin' }, -}; diff --git a/webapp/packages/plugin-settings-menu/src/module.ts b/webapp/packages/plugin-settings-menu/src/module.ts index e44b517149..12ee0a3cb7 100644 --- a/webapp/packages/plugin-settings-menu/src/module.ts +++ b/webapp/packages/plugin-settings-menu/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-settings-menu', configure: serviceCollection => { diff --git a/webapp/packages/plugin-settings-panel/package.json b/webapp/packages/plugin-settings-panel/package.json index 30abfd0379..9fd1ab29e9 100644 --- a/webapp/packages/plugin-settings-panel/package.json +++ b/webapp/packages/plugin-settings-panel/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", @@ -29,8 +30,8 @@ "@cloudbeaver/core-settings": "workspace:*", "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/plugin-navigation-tree": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", - "@dbeaver/ui-kit": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", + "@dbeaver/ui-kit": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -42,6 +43,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-settings-panel/src/index.ts b/webapp/packages/plugin-settings-panel/src/index.ts index 00aa527e51..47b574fe21 100644 --- a/webapp/packages/plugin-settings-panel/src/index.ts +++ b/webapp/packages/plugin-settings-panel/src/index.ts @@ -7,7 +7,5 @@ */ import './module.js'; -import { settingsPanelPlugin } from './manifest.js'; export * from './SettingsPanel/SettingsLazy.js'; -export default settingsPanelPlugin; diff --git a/webapp/packages/plugin-settings-panel/src/manifest.ts b/webapp/packages/plugin-settings-panel/src/manifest.ts deleted file mode 100644 index 03ef9dc094..0000000000 --- a/webapp/packages/plugin-settings-panel/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const settingsPanelPlugin: PluginManifest = { - info: { name: 'Settings panel plugin' }, -}; diff --git a/webapp/packages/plugin-settings-panel/src/module.ts b/webapp/packages/plugin-settings-panel/src/module.ts index 854c72b6f1..47cc2a2993 100644 --- a/webapp/packages/plugin-settings-panel/src/module.ts +++ b/webapp/packages/plugin-settings-panel/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { SettingsPanelPluginBootstrap } from './SettingsPanelPluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-settings-panel', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json b/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json index 10ac7a2992..b723beffa8 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab-script/package.json +++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/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", @@ -44,13 +45,14 @@ "@cloudbeaver/plugin-resource-manager-scripts": "workspace:*", "@cloudbeaver/plugin-sql-editor": "workspace:*", "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts index 44c440ab03..fafdefffde 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/index.ts @@ -7,8 +7,5 @@ */ import './module.js'; -import { manifest } from './manifest.js'; export * from './KEY_BINDING_SQL_EDITOR_SAVE_AS_SCRIPT.js'; - -export default manifest; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts deleted file mode 100644 index 08eb52e6f1..0000000000 --- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const manifest: PluginManifest = { - info: { name: 'Sql Editor Script plugin' }, -}; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/module.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/module.ts index ba0d39903b..801f837462 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/module.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/module.ts @@ -13,7 +13,7 @@ import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; import { ResourceEditorSettingsService } from './ResourceEditorSettingsService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-editor-navigation-tab-script', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/package.json b/webapp/packages/plugin-sql-editor-navigation-tab/package.json index 3135da7557..590dda12fb 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/package.json +++ b/webapp/packages/plugin-sql-editor-navigation-tab/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", @@ -52,6 +53,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/index.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/index.ts index b20ed60f30..77414c2f6f 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/index.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { sqlEditorTabPluginManifest } from './manifest.js'; - -export default sqlEditorTabPluginManifest; export { DATA_CONTEXT_SQL_EDITOR_TAB } from './DATA_CONTEXT_SQL_EDITOR_TAB.js'; export { ACTION_SQL_EDITOR_OPEN } from './ACTION_SQL_EDITOR_OPEN.js'; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts deleted file mode 100644 index 0b449632ff..0000000000 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sqlEditorTabPluginManifest: PluginManifest = { - info: { - name: 'Sql Editor Navigation Tab Plugin', - }, -}; diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/module.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/module.ts index 587c07b580..94ff8b1390 100644 --- a/webapp/packages/plugin-sql-editor-navigation-tab/src/module.ts +++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/module.ts @@ -12,7 +12,7 @@ import { SqlEditorNavigatorService } from './SqlEditorNavigatorService.js'; import { SqlEditorBootstrap } from './SqlEditorBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-editor-navigation-tab', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-editor-new/package.json b/webapp/packages/plugin-sql-editor-new/package.json index 5c0bdda2e4..1a81cbc072 100644 --- a/webapp/packages/plugin-sql-editor-new/package.json +++ b/webapp/packages/plugin-sql-editor-new/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", @@ -41,6 +42,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-sql-editor-new/src/index.ts b/webapp/packages/plugin-sql-editor-new/src/index.ts index ba870f16b5..faf7f7c5ab 100644 --- a/webapp/packages/plugin-sql-editor-new/src/index.ts +++ b/webapp/packages/plugin-sql-editor-new/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { sqlEditorNewPlugin } from './manifest.js'; - -export default sqlEditorNewPlugin; export * from './SQLEditor/SQLCodeEditor/SQLCodeEditorLoader.js'; export * from './SQLEditor/useSqlDialectAutocompletion.js'; diff --git a/webapp/packages/plugin-sql-editor-new/src/manifest.ts b/webapp/packages/plugin-sql-editor-new/src/manifest.ts deleted file mode 100644 index f5e27c7649..0000000000 --- a/webapp/packages/plugin-sql-editor-new/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sqlEditorNewPlugin: PluginManifest = { - info: { - name: 'Sql Editor New Plugin', - }, -}; diff --git a/webapp/packages/plugin-sql-editor-new/src/module.ts b/webapp/packages/plugin-sql-editor-new/src/module.ts index a94fb340c8..5ce999461d 100644 --- a/webapp/packages/plugin-sql-editor-new/src/module.ts +++ b/webapp/packages/plugin-sql-editor-new/src/module.ts @@ -11,7 +11,7 @@ import { PluginBootstrap } from './PluginBootstrap.js'; import { SQLCodeEditorPanelService } from './SQLEditor/SQLCodeEditorPanel/SQLCodeEditorPanelService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-editor-new', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-editor-screen/package.json b/webapp/packages/plugin-sql-editor-screen/package.json index fe26262bf8..406dfc8e2e 100644 --- a/webapp/packages/plugin-sql-editor-screen/package.json +++ b/webapp/packages/plugin-sql-editor-screen/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", @@ -46,6 +47,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-sql-editor-screen/src/index.ts b/webapp/packages/plugin-sql-editor-screen/src/index.ts index a219ab52a7..c465e1ac53 100644 --- a/webapp/packages/plugin-sql-editor-screen/src/index.ts +++ b/webapp/packages/plugin-sql-editor-screen/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { sqlEditorPagePluginManifest } from './manifest.js'; - -export default sqlEditorPagePluginManifest; diff --git a/webapp/packages/plugin-sql-editor-screen/src/manifest.ts b/webapp/packages/plugin-sql-editor-screen/src/manifest.ts deleted file mode 100644 index e2079727ef..0000000000 --- a/webapp/packages/plugin-sql-editor-screen/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sqlEditorPagePluginManifest: PluginManifest = { - info: { - name: 'Sql Editor Page plugin', - }, -}; diff --git a/webapp/packages/plugin-sql-editor-screen/src/module.ts b/webapp/packages/plugin-sql-editor-screen/src/module.ts index 46165c74e6..f74592bc32 100644 --- a/webapp/packages/plugin-sql-editor-screen/src/module.ts +++ b/webapp/packages/plugin-sql-editor-screen/src/module.ts @@ -13,7 +13,7 @@ import { SqlEditorScreenBootstrap } from './Screen/SqlEditorScreenBootstrap.js'; import { SqlEditorScreenService } from './Screen/SqlEditorScreenService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-editor-screen', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-editor/package.json b/webapp/packages/plugin-sql-editor/package.json index 723427b608..2a689fb4bb 100644 --- a/webapp/packages/plugin-sql-editor/package.json +++ b/webapp/packages/plugin-sql-editor/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", @@ -54,8 +55,9 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", - "@dbeaver/react-tests": "workspace:^", + "@dbeaver/react-tests": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5", "vitest": "^3" diff --git a/webapp/packages/plugin-sql-editor/src/index.ts b/webapp/packages/plugin-sql-editor/src/index.ts index b371a69c73..1520eba764 100644 --- a/webapp/packages/plugin-sql-editor/src/index.ts +++ b/webapp/packages/plugin-sql-editor/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -import { sqlEditorPluginManifest } from './manifest.js'; export * from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_NEW.js'; export * from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT.js'; @@ -52,5 +51,3 @@ export * from './SqlEditorService.js'; export * from './SqlEditorSettingsService.js'; export * from './SqlEditorView.js'; export * from './SqlResultTabs/SqlQueryService.js'; - -export default sqlEditorPluginManifest; diff --git a/webapp/packages/plugin-sql-editor/src/manifest.ts b/webapp/packages/plugin-sql-editor/src/manifest.ts deleted file mode 100644 index 8e704148a8..0000000000 --- a/webapp/packages/plugin-sql-editor/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sqlEditorPluginManifest: PluginManifest = { - info: { - name: 'Sql Editor Plugin', - }, -}; diff --git a/webapp/packages/plugin-sql-editor/src/module.ts b/webapp/packages/plugin-sql-editor/src/module.ts index c814d0a588..b22d9308ea 100644 --- a/webapp/packages/plugin-sql-editor/src/module.ts +++ b/webapp/packages/plugin-sql-editor/src/module.ts @@ -26,7 +26,7 @@ import { LocalStorageSqlDataSourceBootstrap } from './SqlDataSource/LocalStorage import { MenuBootstrap } from './MenuBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-editor', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sql-generator/package.json b/webapp/packages/plugin-sql-generator/package.json index 38f2b0ec76..ae12573636 100644 --- a/webapp/packages/plugin-sql-generator/package.json +++ b/webapp/packages/plugin-sql-generator/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", @@ -47,6 +48,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-sql-generator/src/index.ts b/webapp/packages/plugin-sql-generator/src/index.ts index b72a289d80..324e0cbc94 100644 --- a/webapp/packages/plugin-sql-generator/src/index.ts +++ b/webapp/packages/plugin-sql-generator/src/index.ts @@ -7,11 +7,7 @@ */ import './module.js'; -import { sqlGeneratorPlugin } from './manifest.js'; export * from './SqlGenerators/SqlGeneratorsResource.js'; export * from './SqlGenerators/SqlGeneratorsBootstrap.js'; export * from './actions/ACTION_SQL_GENERATE.js'; - -export { sqlGeneratorPlugin }; -export default sqlGeneratorPlugin; diff --git a/webapp/packages/plugin-sql-generator/src/manifest.ts b/webapp/packages/plugin-sql-generator/src/manifest.ts deleted file mode 100644 index 60171cfb76..0000000000 --- a/webapp/packages/plugin-sql-generator/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const sqlGeneratorPlugin: PluginManifest = { - info: { - name: 'Sql Editor Generator plugin', - }, -}; diff --git a/webapp/packages/plugin-sql-generator/src/module.ts b/webapp/packages/plugin-sql-generator/src/module.ts index 1ab091d8b3..b9e35e0b1e 100644 --- a/webapp/packages/plugin-sql-generator/src/module.ts +++ b/webapp/packages/plugin-sql-generator/src/module.ts @@ -13,7 +13,7 @@ import { ScriptPreviewService } from './ScriptPreview/ScriptPreviewService.js'; import { LocaleService } from './LocaleService.js'; import { GeneratorMenuBootstrap } from './GeneratorMenuBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-sql-generator', configure: serviceCollection => { diff --git a/webapp/packages/plugin-sso/package.json b/webapp/packages/plugin-sso/package.json index 8d7d3a6646..6655cd9dc4 100644 --- a/webapp/packages/plugin-sso/package.json +++ b/webapp/packages/plugin-sso/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", @@ -21,12 +22,12 @@ "validate-dependencies": "core-cli-validate-dependencies" }, "dependencies": { - "@cloudbeaver/core-di": "workspace:*", "tslib": "^2" }, "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-sso/src/index.ts b/webapp/packages/plugin-sso/src/index.ts index 95c6997b75..801aab2c44 100644 --- a/webapp/packages/plugin-sso/src/index.ts +++ b/webapp/packages/plugin-sso/src/index.ts @@ -5,5 +5,3 @@ * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ - -export * from './manifest.js'; diff --git a/webapp/packages/plugin-sso/src/manifest.ts b/webapp/packages/plugin-sso/src/manifest.ts deleted file mode 100644 index 782756d255..0000000000 --- a/webapp/packages/plugin-sso/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const ssoPlugin: PluginManifest = { - info: { - name: 'SSO Plugin', - }, -}; diff --git a/webapp/packages/plugin-sso/tsconfig.json b/webapp/packages/plugin-sso/tsconfig.json index 9ec23da0a4..b11e0d4e65 100644 --- a/webapp/packages/plugin-sso/tsconfig.json +++ b/webapp/packages/plugin-sso/tsconfig.json @@ -9,9 +9,6 @@ "references": [ { "path": "../core-cli" - }, - { - "path": "../core-di" } ], "include": [ diff --git a/webapp/packages/plugin-system-information-administration/package.json b/webapp/packages/plugin-system-information-administration/package.json index 9caabf89a0..da6077d8d5 100644 --- a/webapp/packages/plugin-system-information-administration/package.json +++ b/webapp/packages/plugin-system-information-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", @@ -42,7 +43,7 @@ "@cloudbeaver/tsconfig": "workspace:*", "@dbeaver/cli": "workspace:*", "@types/react": "^19", - "typescript": "^5", - "typescript-plugin-css-modules": "^5" + "rimraf": "^6", + "typescript": "^5" } } diff --git a/webapp/packages/plugin-system-information-administration/src/index.ts b/webapp/packages/plugin-system-information-administration/src/index.ts index ac3d7ce39f..c465e1ac53 100644 --- a/webapp/packages/plugin-system-information-administration/src/index.ts +++ b/webapp/packages/plugin-system-information-administration/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { pluginSystemInformationAdministrationManifest } from './manifest.js'; - -export { pluginSystemInformationAdministrationManifest }; -export default pluginSystemInformationAdministrationManifest; diff --git a/webapp/packages/plugin-system-information-administration/src/manifest.ts b/webapp/packages/plugin-system-information-administration/src/manifest.ts deleted file mode 100644 index abb00de2f0..0000000000 --- a/webapp/packages/plugin-system-information-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const pluginSystemInformationAdministrationManifest: PluginManifest = { - info: { - name: 'System Information Administration plugin', - }, -}; diff --git a/webapp/packages/plugin-system-information-administration/src/module.ts b/webapp/packages/plugin-system-information-administration/src/module.ts index 28fdf0d7eb..05bf9e798a 100644 --- a/webapp/packages/plugin-system-information-administration/src/module.ts +++ b/webapp/packages/plugin-system-information-administration/src/module.ts @@ -11,7 +11,7 @@ import { SystemInformationResource } from './SystemInformationResource.js'; import { SystemInformationBootstrap } from './SystemInformationBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-system-information-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-task-manager/package.json b/webapp/packages/plugin-task-manager/package.json index a46e46e516..379adab997 100644 --- a/webapp/packages/plugin-task-manager/package.json +++ b/webapp/packages/plugin-task-manager/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", @@ -31,6 +32,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-task-manager/src/index.ts b/webapp/packages/plugin-task-manager/src/index.ts index b68d82b94f..c465e1ac53 100644 --- a/webapp/packages/plugin-task-manager/src/index.ts +++ b/webapp/packages/plugin-task-manager/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { taskManagerPluginManifest } from './manifest.js'; - -export { taskManagerPluginManifest }; -export default taskManagerPluginManifest; diff --git a/webapp/packages/plugin-task-manager/src/manifest.ts b/webapp/packages/plugin-task-manager/src/manifest.ts deleted file mode 100644 index 402711abbc..0000000000 --- a/webapp/packages/plugin-task-manager/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const taskManagerPluginManifest: PluginManifest = { - info: { name: 'Task Manager plugin' }, -}; diff --git a/webapp/packages/plugin-task-manager/src/module.ts b/webapp/packages/plugin-task-manager/src/module.ts index 7333b4986c..0ddcc1c7c6 100644 --- a/webapp/packages/plugin-task-manager/src/module.ts +++ b/webapp/packages/plugin-task-manager/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { TaskManagerPluginBootstrap } from './TaskManagerPluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-task-manager', configure: serviceCollection => { diff --git a/webapp/packages/plugin-theme/package.json b/webapp/packages/plugin-theme/package.json index 65d7f31989..7f4f11dd05 100644 --- a/webapp/packages/plugin-theme/package.json +++ b/webapp/packages/plugin-theme/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", @@ -27,6 +28,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-theme/src/index.ts b/webapp/packages/plugin-theme/src/index.ts index 2f87759c92..c465e1ac53 100644 --- a/webapp/packages/plugin-theme/src/index.ts +++ b/webapp/packages/plugin-theme/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { themePlugin } from './manifest.js'; - -export default themePlugin; diff --git a/webapp/packages/plugin-theme/src/manifest.ts b/webapp/packages/plugin-theme/src/manifest.ts deleted file mode 100644 index a8666d8477..0000000000 --- a/webapp/packages/plugin-theme/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const themePlugin: PluginManifest = { - info: { name: 'Theme plugin' }, -}; diff --git a/webapp/packages/plugin-theme/src/module.ts b/webapp/packages/plugin-theme/src/module.ts index 5ced3b99a6..31f692557b 100644 --- a/webapp/packages/plugin-theme/src/module.ts +++ b/webapp/packages/plugin-theme/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-theme', configure: serviceCollection => { diff --git a/webapp/packages/plugin-tools-panel/package.json b/webapp/packages/plugin-tools-panel/package.json index 525ea291e4..8b9c37d549 100644 --- a/webapp/packages/plugin-tools-panel/package.json +++ b/webapp/packages/plugin-tools-panel/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", @@ -40,6 +41,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-tools-panel/src/index.ts b/webapp/packages/plugin-tools-panel/src/index.ts index 7037265a14..9382a2bac0 100644 --- a/webapp/packages/plugin-tools-panel/src/index.ts +++ b/webapp/packages/plugin-tools-panel/src/index.ts @@ -7,12 +7,9 @@ */ import './module.js'; -import { toolsPanelPlugin } from './manifest.js'; export * from './Menu/MENU_TOOLS.js'; export * from './ToolsPanel/ToolsPanelService.js'; export * from './ToolsPanel/ToolsPanelLazy.js'; export * from './ToolsPanelSettingsService.js'; export * from './TOOLS_PANEL_SETTINGS_GROUP.js'; - -export default toolsPanelPlugin; diff --git a/webapp/packages/plugin-tools-panel/src/manifest.ts b/webapp/packages/plugin-tools-panel/src/manifest.ts deleted file mode 100644 index 5c70017236..0000000000 --- a/webapp/packages/plugin-tools-panel/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const toolsPanelPlugin: PluginManifest = { - info: { name: 'Tools panel plugin' }, -}; diff --git a/webapp/packages/plugin-tools-panel/src/module.ts b/webapp/packages/plugin-tools-panel/src/module.ts index 80b22ede01..71a641fb22 100644 --- a/webapp/packages/plugin-tools-panel/src/module.ts +++ b/webapp/packages/plugin-tools-panel/src/module.ts @@ -12,7 +12,7 @@ import { PluginBootstrap } from './PluginBootstrap.js'; import { ToolsPanelService } from './ToolsPanel/ToolsPanelService.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-tools-panel', configure: serviceCollection => { diff --git a/webapp/packages/plugin-top-app-bar-administration/package.json b/webapp/packages/plugin-top-app-bar-administration/package.json index 1e6175fc6a..32c7e28633 100644 --- a/webapp/packages/plugin-top-app-bar-administration/package.json +++ b/webapp/packages/plugin-top-app-bar-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", @@ -32,6 +33,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-top-app-bar-administration/src/index.ts b/webapp/packages/plugin-top-app-bar-administration/src/index.ts index 9a3c812fb1..c465e1ac53 100644 --- a/webapp/packages/plugin-top-app-bar-administration/src/index.ts +++ b/webapp/packages/plugin-top-app-bar-administration/src/index.ts @@ -7,7 +7,3 @@ */ import './module.js'; -import { administrationTopAppBarPlugin } from './manifest.js'; - -export { administrationTopAppBarPlugin }; -export default administrationTopAppBarPlugin; diff --git a/webapp/packages/plugin-top-app-bar-administration/src/manifest.ts b/webapp/packages/plugin-top-app-bar-administration/src/manifest.ts deleted file mode 100644 index aa0b642272..0000000000 --- a/webapp/packages/plugin-top-app-bar-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const administrationTopAppBarPlugin: PluginManifest = { - info: { - name: 'Administration Top App Bar plugin', - }, -}; diff --git a/webapp/packages/plugin-top-app-bar-administration/src/module.ts b/webapp/packages/plugin-top-app-bar-administration/src/module.ts index d92baa53b0..4c66457e36 100644 --- a/webapp/packages/plugin-top-app-bar-administration/src/module.ts +++ b/webapp/packages/plugin-top-app-bar-administration/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-top-app-bar-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-top-app-bar/package.json b/webapp/packages/plugin-top-app-bar/package.json index a46dd494e4..fc3ed6012f 100644 --- a/webapp/packages/plugin-top-app-bar/package.json +++ b/webapp/packages/plugin-top-app-bar/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", @@ -37,6 +38,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-top-app-bar/src/index.ts b/webapp/packages/plugin-top-app-bar/src/index.ts index c8ca5af16a..1d1e8edc3a 100644 --- a/webapp/packages/plugin-top-app-bar/src/index.ts +++ b/webapp/packages/plugin-top-app-bar/src/index.ts @@ -7,7 +7,6 @@ */ import './module.js'; -import { topAppBarPlugin } from './manifest.js'; export * from './TopNavBar/AppStateMenu/AppStateMenu.js'; export * from './TopNavBar/AppStateMenu/MENU_APP_STATE.js'; @@ -15,5 +14,3 @@ export * from './TopNavBar/MainMenu/MENU_APP_ACTIONS.js'; export * from './TopNavBar/TopNavService.js'; export * from './TopNavBar/TopNavBar.js'; export { default as TopMenuWrapperStyles } from './TopNavBar/shared/TopMenuWrapper.module.css'; - -export default topAppBarPlugin; diff --git a/webapp/packages/plugin-top-app-bar/src/manifest.ts b/webapp/packages/plugin-top-app-bar/src/manifest.ts deleted file mode 100644 index d310d99b2f..0000000000 --- a/webapp/packages/plugin-top-app-bar/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const topAppBarPlugin: PluginManifest = { - info: { - name: 'Top App Bar plugin', - }, -}; diff --git a/webapp/packages/plugin-top-app-bar/src/module.ts b/webapp/packages/plugin-top-app-bar/src/module.ts index d15f60e37c..8e5f8394ac 100644 --- a/webapp/packages/plugin-top-app-bar/src/module.ts +++ b/webapp/packages/plugin-top-app-bar/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { TopNavService } from './TopNavBar/TopNavService.js'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-top-app-bar', configure: serviceCollection => { diff --git a/webapp/packages/plugin-user-profile-administration/package.json b/webapp/packages/plugin-user-profile-administration/package.json index 302d3824ea..aa7f1bde0c 100644 --- a/webapp/packages/plugin-user-profile-administration/package.json +++ b/webapp/packages/plugin-user-profile-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", @@ -29,6 +30,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-user-profile-administration/src/index.ts b/webapp/packages/plugin-user-profile-administration/src/index.ts index 9d783218f2..c465e1ac53 100644 --- a/webapp/packages/plugin-user-profile-administration/src/index.ts +++ b/webapp/packages/plugin-user-profile-administration/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { userProfileAdministrationPlugin } from './manifest.js'; - -export default userProfileAdministrationPlugin; diff --git a/webapp/packages/plugin-user-profile-administration/src/manifest.ts b/webapp/packages/plugin-user-profile-administration/src/manifest.ts deleted file mode 100644 index a8807f31ee..0000000000 --- a/webapp/packages/plugin-user-profile-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const userProfileAdministrationPlugin: PluginManifest = { - info: { - name: 'User profile administration plugin', - }, -}; diff --git a/webapp/packages/plugin-user-profile-administration/src/module.ts b/webapp/packages/plugin-user-profile-administration/src/module.ts index c13b6d6cc0..cffead876b 100644 --- a/webapp/packages/plugin-user-profile-administration/src/module.ts +++ b/webapp/packages/plugin-user-profile-administration/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-user-profile-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-user-profile-settings/package.json b/webapp/packages/plugin-user-profile-settings/package.json index 35a615a6c1..fca6f7f4ad 100644 --- a/webapp/packages/plugin-user-profile-settings/package.json +++ b/webapp/packages/plugin-user-profile-settings/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", @@ -43,6 +44,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-user-profile-settings/src/index.ts b/webapp/packages/plugin-user-profile-settings/src/index.ts index eaf15e0f2e..c465e1ac53 100644 --- a/webapp/packages/plugin-user-profile-settings/src/index.ts +++ b/webapp/packages/plugin-user-profile-settings/src/index.ts @@ -7,4 +7,3 @@ */ import './module.js'; -export * from './manifest.js'; diff --git a/webapp/packages/plugin-user-profile-settings/src/manifest.ts b/webapp/packages/plugin-user-profile-settings/src/manifest.ts deleted file mode 100644 index ebc8569d0e..0000000000 --- a/webapp/packages/plugin-user-profile-settings/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const userProfileSettingsPlugin: PluginManifest = { - info: { - name: 'User profile settings plugin', - }, -}; diff --git a/webapp/packages/plugin-user-profile-settings/src/module.ts b/webapp/packages/plugin-user-profile-settings/src/module.ts index a8674a5e56..859d335aa3 100644 --- a/webapp/packages/plugin-user-profile-settings/src/module.ts +++ b/webapp/packages/plugin-user-profile-settings/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { UserProfileSettingsPluginBootstrap } from './UserProfileSettingsPluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-user-profile-settings', configure: serviceCollection => { diff --git a/webapp/packages/plugin-user-profile/package.json b/webapp/packages/plugin-user-profile/package.json index 15c9d9972c..da1112b613 100644 --- a/webapp/packages/plugin-user-profile/package.json +++ b/webapp/packages/plugin-user-profile/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", @@ -36,7 +37,7 @@ "@cloudbeaver/core-view": "workspace:*", "@cloudbeaver/plugin-authentication": "workspace:*", "@cloudbeaver/plugin-top-app-bar": "workspace:*", - "@dbeaver/js-helpers": "workspace:^", + "@dbeaver/js-helpers": "workspace:*", "mobx": "^6", "mobx-react-lite": "^4", "react": "^19", @@ -47,6 +48,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-user-profile/src/index.ts b/webapp/packages/plugin-user-profile/src/index.ts index 2ed4841381..e44c9fc6b0 100644 --- a/webapp/packages/plugin-user-profile/src/index.ts +++ b/webapp/packages/plugin-user-profile/src/index.ts @@ -7,9 +7,6 @@ */ import './module.js'; -import { userProfilePlugin } from './manifest.js'; - -export default userProfilePlugin; export * from './UserProfileTabsService.js'; export * from './UserProfileOptionsPanelService.js'; diff --git a/webapp/packages/plugin-user-profile/src/manifest.ts b/webapp/packages/plugin-user-profile/src/manifest.ts deleted file mode 100644 index b27705ba51..0000000000 --- a/webapp/packages/plugin-user-profile/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const userProfilePlugin: PluginManifest = { - info: { - name: 'User profile plugin', - }, -}; diff --git a/webapp/packages/plugin-user-profile/src/module.ts b/webapp/packages/plugin-user-profile/src/module.ts index e4872a78ee..120ac78131 100644 --- a/webapp/packages/plugin-user-profile/src/module.ts +++ b/webapp/packages/plugin-user-profile/src/module.ts @@ -14,7 +14,7 @@ import { UserProfileFormAuthenticationPartBootstrap } from './UserProfileForm/Us import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-user-profile', configure: serviceCollection => { diff --git a/webapp/packages/plugin-version-update-administration/package.json b/webapp/packages/plugin-version-update-administration/package.json index 3c0691747d..324eaa8a0e 100644 --- a/webapp/packages/plugin-version-update-administration/package.json +++ b/webapp/packages/plugin-version-update-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", @@ -42,6 +43,7 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "typescript-plugin-css-modules": "^5" } diff --git a/webapp/packages/plugin-version-update-administration/src/index.ts b/webapp/packages/plugin-version-update-administration/src/index.ts index 8fe348fffc..f6b515d66d 100644 --- a/webapp/packages/plugin-version-update-administration/src/index.ts +++ b/webapp/packages/plugin-version-update-administration/src/index.ts @@ -9,10 +9,6 @@ import './module.js'; import { importLazyComponent } from '@cloudbeaver/core-blocks'; -import { versionUpdatePlugin } from './manifest.js'; - const VersionUpdate = importLazyComponent(() => import('./VersionUpdate.js').then(m => m.VersionUpdate)); export { VersionUpdate }; - -export default versionUpdatePlugin; diff --git a/webapp/packages/plugin-version-update-administration/src/manifest.ts b/webapp/packages/plugin-version-update-administration/src/manifest.ts deleted file mode 100644 index 4a9d5d2ac6..0000000000 --- a/webapp/packages/plugin-version-update-administration/src/manifest.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const versionUpdatePlugin: PluginManifest = { - info: { - name: 'Version update plugin', - }, -}; diff --git a/webapp/packages/plugin-version-update-administration/src/module.ts b/webapp/packages/plugin-version-update-administration/src/module.ts index 72004c4477..1977ab3cd2 100644 --- a/webapp/packages/plugin-version-update-administration/src/module.ts +++ b/webapp/packages/plugin-version-update-administration/src/module.ts @@ -10,7 +10,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-version-update-administration', configure: serviceCollection => { diff --git a/webapp/packages/plugin-version/package.json b/webapp/packages/plugin-version/package.json index 16177a4458..7e09b01080 100644 --- a/webapp/packages/plugin-version/package.json +++ b/webapp/packages/plugin-version/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", @@ -27,6 +28,7 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", + "rimraf": "^6", "typescript": "^5" } } diff --git a/webapp/packages/plugin-version/src/index.ts b/webapp/packages/plugin-version/src/index.ts index ec3b88d29d..c465e1ac53 100644 --- a/webapp/packages/plugin-version/src/index.ts +++ b/webapp/packages/plugin-version/src/index.ts @@ -7,6 +7,3 @@ */ import './module.js'; -import { versionPlugin } from './manifest.js'; - -export default versionPlugin; diff --git a/webapp/packages/plugin-version/src/manifest.ts b/webapp/packages/plugin-version/src/manifest.ts deleted file mode 100644 index 4c93193941..0000000000 --- a/webapp/packages/plugin-version/src/manifest.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const versionPlugin: PluginManifest = { - info: { name: 'Version plugin' }, -}; diff --git a/webapp/packages/plugin-version/src/module.ts b/webapp/packages/plugin-version/src/module.ts index 46b3d8ca5d..89b6c3064a 100644 --- a/webapp/packages/plugin-version/src/module.ts +++ b/webapp/packages/plugin-version/src/module.ts @@ -9,7 +9,7 @@ import { Bootstrap, ModuleRegistry } from '@cloudbeaver/core-di'; import { PluginBootstrap } from './PluginBootstrap.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/plugin-version', configure: serviceCollection => { diff --git a/webapp/packages/product-base/package.json b/webapp/packages/product-base/package.json index 0a979960ff..68b84cfce9 100644 --- a/webapp/packages/product-base/package.json +++ b/webapp/packages/product-base/package.json @@ -11,6 +11,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*.js": "./lib/*.js", "./*": "./*" }, @@ -26,13 +27,14 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", - "@tailwindcss/vite": "4.0.7", "@types/fs-extra": "^11", "@types/node": "^22", + "rimraf": "^6", "tslib": "^2", "typescript": "^5" }, "dependencies": { + "@tailwindcss/vite": "4.0.7", "@vitejs/plugin-react": "^5", "@wroud/vite-plugin-asset-resolver": "^0", "@wroud/vite-plugin-tsc": "^0", diff --git a/webapp/packages/product-default-impl/package.json b/webapp/packages/product-default-impl/package.json index 8c42aeca0f..7bd6f21f71 100644 --- a/webapp/packages/product-default-impl/package.json +++ b/webapp/packages/product-default-impl/package.json @@ -13,7 +13,8 @@ "description": "CloudBeaver Community", "license": "Apache-2.0", "exports": { - ".": "./lib/index.js" + ".": "./lib/index.js", + "./module": "./lib/module.js" }, "scripts": { "build": "tsc -b", @@ -27,72 +28,8 @@ "@cloudbeaver/core-di": "workspace:*", "@cloudbeaver/core-localization": "workspace:*", "@cloudbeaver/core-version-update": "workspace:*", - "@cloudbeaver/plugin-administration": "workspace:*", - "@cloudbeaver/plugin-app-logo": "workspace:*", - "@cloudbeaver/plugin-app-logo-administration": "workspace:*", - "@cloudbeaver/plugin-authentication": "workspace:*", - "@cloudbeaver/plugin-authentication-administration": "workspace:*", - "@cloudbeaver/plugin-browser": "workspace:*", - "@cloudbeaver/plugin-codemirror6": "workspace:*", - "@cloudbeaver/plugin-connection-custom": "workspace:*", - "@cloudbeaver/plugin-connection-search": "workspace:*", - "@cloudbeaver/plugin-connections": "workspace:*", - "@cloudbeaver/plugin-connections-administration": "workspace:*", "@cloudbeaver/plugin-data-editor-public-settings": "workspace:*", - "@cloudbeaver/plugin-data-export": "workspace:*", - "@cloudbeaver/plugin-data-grid": "workspace:*", - "@cloudbeaver/plugin-data-import": "workspace:*", - "@cloudbeaver/plugin-data-spreadsheet-new": "workspace:*", - "@cloudbeaver/plugin-data-viewer": "workspace:*", - "@cloudbeaver/plugin-data-viewer-result-set-grouping": "workspace:*", - "@cloudbeaver/plugin-data-viewer-result-trace-details": "workspace:*", - "@cloudbeaver/plugin-datasource-context-switch": "workspace:*", - "@cloudbeaver/plugin-datasource-transaction-manager": "workspace:*", - "@cloudbeaver/plugin-ddl-viewer": "workspace:*", - "@cloudbeaver/plugin-devtools": "workspace:*", - "@cloudbeaver/plugin-gis-viewer": "workspace:*", - "@cloudbeaver/plugin-help": "workspace:*", - "@cloudbeaver/plugin-holidays": "workspace:*", - "@cloudbeaver/plugin-holidays-administration": "workspace:*", - "@cloudbeaver/plugin-localization": "workspace:*", - "@cloudbeaver/plugin-log-viewer": "workspace:*", - "@cloudbeaver/plugin-navigation-tabs": "workspace:*", - "@cloudbeaver/plugin-navigation-tree": "workspace:*", - "@cloudbeaver/plugin-navigation-tree-filters": "workspace:*", - "@cloudbeaver/plugin-navigation-tree-rm": "workspace:*", - "@cloudbeaver/plugin-object-viewer": "workspace:*", - "@cloudbeaver/plugin-object-viewer-nav-tree-link": "workspace:*", - "@cloudbeaver/plugin-product": "workspace:*", - "@cloudbeaver/plugin-product-information-administration": "workspace:*", - "@cloudbeaver/plugin-projects": "workspace:*", - "@cloudbeaver/plugin-resource-manager": "workspace:*", - "@cloudbeaver/plugin-resource-manager-administration": "workspace:*", - "@cloudbeaver/plugin-resource-manager-scripts": "workspace:*", - "@cloudbeaver/plugin-root": "workspace:*", - "@cloudbeaver/plugin-session-expiration": "workspace:*", - "@cloudbeaver/plugin-settings-administration": "workspace:*", - "@cloudbeaver/plugin-settings-default-administration": "workspace:^", - "@cloudbeaver/plugin-settings-menu": "workspace:*", - "@cloudbeaver/plugin-settings-menu-administration": "workspace:*", - "@cloudbeaver/plugin-settings-panel": "workspace:*", - "@cloudbeaver/plugin-sql-editor": "workspace:*", - "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*", - "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*", - "@cloudbeaver/plugin-sql-editor-new": "workspace:*", - "@cloudbeaver/plugin-sql-editor-screen": "workspace:*", - "@cloudbeaver/plugin-sql-generator": "workspace:*", - "@cloudbeaver/plugin-sso": "workspace:*", - "@cloudbeaver/plugin-system-information-administration": "workspace:*", - "@cloudbeaver/plugin-task-manager": "workspace:*", - "@cloudbeaver/plugin-theme": "workspace:*", - "@cloudbeaver/plugin-tools-panel": "workspace:*", - "@cloudbeaver/plugin-top-app-bar": "workspace:*", - "@cloudbeaver/plugin-top-app-bar-administration": "workspace:*", - "@cloudbeaver/plugin-user-profile": "workspace:*", - "@cloudbeaver/plugin-user-profile-administration": "workspace:*", - "@cloudbeaver/plugin-user-profile-settings": "workspace:*", - "@cloudbeaver/plugin-version": "workspace:*", - "@cloudbeaver/plugin-version-update-administration": "workspace:*", + "@cloudbeaver/plugin-set-common": "workspace:*", "react": "^19", "tslib": "^2" }, diff --git a/webapp/packages/product-default-impl/src/index.ts b/webapp/packages/product-default-impl/src/index.ts index 753571e5f3..e70b7fb616 100644 --- a/webapp/packages/product-default-impl/src/index.ts +++ b/webapp/packages/product-default-impl/src/index.ts @@ -6,148 +6,17 @@ * you may not use this file except in compliance with the License. */ -import './module.js'; - import { bootstrap } from '@cloudbeaver/core-bootstrap'; -import type { PluginManifest } from '@cloudbeaver/core-di'; -import administration from '@cloudbeaver/plugin-administration'; -import appLogoPlugin from '@cloudbeaver/plugin-app-logo'; -import appLogoPluginAdministration from '@cloudbeaver/plugin-app-logo-administration'; -import authentication from '@cloudbeaver/plugin-authentication'; -import authenticationAdministration from '@cloudbeaver/plugin-authentication-administration'; -import { browserPlugin } from '@cloudbeaver/plugin-browser'; -import connectionCustom from '@cloudbeaver/plugin-connection-custom'; -import connectionSearch from '@cloudbeaver/plugin-connection-search'; -import { objectViewerNavTreeLinkPlugin } from '@cloudbeaver/plugin-object-viewer-nav-tree-link'; -import connectionPlugin from '@cloudbeaver/plugin-connections'; -import connectionAdministration from '@cloudbeaver/plugin-connections-administration'; -import { dataExportManifest } from '@cloudbeaver/plugin-data-export'; -import { dataGridPlugin } from '@cloudbeaver/plugin-data-grid'; -import { dataImportPluginManifest } from '@cloudbeaver/plugin-data-import'; -import { dataSpreadsheetNewManifest } from '@cloudbeaver/plugin-data-spreadsheet-new'; -import { dataViewerManifest } from '@cloudbeaver/plugin-data-viewer'; -import { dvResultSetGroupingPlugin } from '@cloudbeaver/plugin-data-viewer-result-set-grouping'; -import { dataViewerResultTraceDetailsPlugin } from '@cloudbeaver/plugin-data-viewer-result-trace-details'; -import { datasourceContextSwitchPluginManifest } from '@cloudbeaver/plugin-datasource-context-switch'; -import { datasourceTransactionManagerPlugin } from '@cloudbeaver/plugin-datasource-transaction-manager'; -import ddlViewer from '@cloudbeaver/plugin-ddl-viewer'; -import devTools from '@cloudbeaver/plugin-devtools'; -import gisViewer from '@cloudbeaver/plugin-gis-viewer'; -import help from '@cloudbeaver/plugin-help'; -import holidaysPlugin from '@cloudbeaver/plugin-holidays'; -import holidaysPluginAdministration from '@cloudbeaver/plugin-holidays-administration'; -import localization from '@cloudbeaver/plugin-localization'; -import logViewer from '@cloudbeaver/plugin-log-viewer'; -import { navigationTabsPlugin } from '@cloudbeaver/plugin-navigation-tabs'; -import { navigationTreePlugin } from '@cloudbeaver/plugin-navigation-tree'; -import navigationTreeFilters from '@cloudbeaver/plugin-navigation-tree-filters'; -import { navigationTreeRMPlugin } from '@cloudbeaver/plugin-navigation-tree-rm'; -import { objectViewerManifest } from '@cloudbeaver/plugin-object-viewer'; -import productPlugin from '@cloudbeaver/plugin-product'; -import { productInformationPlugin } from '@cloudbeaver/plugin-product-information-administration'; -import projects from '@cloudbeaver/plugin-projects'; -import resourceManager from '@cloudbeaver/plugin-resource-manager'; -import resourceManagerAdministration from '@cloudbeaver/plugin-resource-manager-administration'; -import resourceManagerScripts from '@cloudbeaver/plugin-resource-manager-scripts'; -import root from '@cloudbeaver/plugin-root'; -import { sessionExpirationPlugin } from '@cloudbeaver/plugin-session-expiration'; -import { settingsAdministrationPlugin } from '@cloudbeaver/plugin-settings-administration'; -import settingsMenu from '@cloudbeaver/plugin-settings-menu'; -import settingsMenuAdministration from '@cloudbeaver/plugin-settings-menu-administration'; -import settingsPanelPlugin from '@cloudbeaver/plugin-settings-panel'; -import sqlEditor from '@cloudbeaver/plugin-sql-editor'; -import sqlEditorTab from '@cloudbeaver/plugin-sql-editor-navigation-tab'; -import sqlEditorResource from '@cloudbeaver/plugin-sql-editor-navigation-tab-script'; -import sqlEditorNew from '@cloudbeaver/plugin-sql-editor-new'; -import sqlEditorScreen from '@cloudbeaver/plugin-sql-editor-screen'; -import { sqlGeneratorPlugin } from '@cloudbeaver/plugin-sql-generator'; -import { ssoPlugin } from '@cloudbeaver/plugin-sso'; -import { taskManagerPluginManifest } from '@cloudbeaver/plugin-task-manager'; -import theme from '@cloudbeaver/plugin-theme'; -import toolsPanel from '@cloudbeaver/plugin-tools-panel'; -import topAppBar from '@cloudbeaver/plugin-top-app-bar'; -import { administrationTopAppBarPlugin } from '@cloudbeaver/plugin-top-app-bar-administration'; -import userProfile from '@cloudbeaver/plugin-user-profile'; -import userProfileAdministration from '@cloudbeaver/plugin-user-profile-administration'; -import { userProfileSettingsPlugin } from '@cloudbeaver/plugin-user-profile-settings'; -import version from '@cloudbeaver/plugin-version'; -import versionUpdate from '@cloudbeaver/plugin-version-update-administration'; -import { pluginSystemInformationAdministrationManifest } from '@cloudbeaver/plugin-system-information-administration'; -import { pluginSettingsDefaultAdministrationManifest } from '@cloudbeaver/plugin-settings-default-administration'; -import { codemirror6Manifest } from '@cloudbeaver/plugin-codemirror6'; -import { defaultProductManifest } from './manifest.js'; -import pluginDataEditorPublicSettingsManifest from '@cloudbeaver/plugin-data-editor-public-settings'; +import pluginDataEditorPublicSettings from '@cloudbeaver/plugin-data-editor-public-settings/module'; +import productDefault from './module.js'; +import { commonSet } from '@cloudbeaver/plugin-set-common'; -const PLUGINS: PluginManifest[] = [ - ssoPlugin, - devTools, - productInformationPlugin, - administration, - dataSpreadsheetNewManifest, - dataGridPlugin, - authentication, - authenticationAdministration, - theme, - localization, - connectionCustom, - connectionSearch, - dataExportManifest, - dataImportPluginManifest, - pluginDataEditorPublicSettingsManifest, - dataViewerManifest, - dataViewerResultTraceDetailsPlugin, - dvResultSetGroupingPlugin, - gisViewer, - ddlViewer, - objectViewerManifest, - sqlEditor, - sqlEditorTab, - sqlEditorScreen, - sqlEditorNew, - sqlGeneratorPlugin, - userProfile, - userProfileAdministration, - objectViewerNavTreeLinkPlugin, - connectionPlugin, - connectionAdministration, - versionUpdate, - productPlugin, - settingsMenu, - settingsMenuAdministration, - settingsPanelPlugin, - help, - resourceManager, - resourceManagerAdministration, - resourceManagerScripts, - sqlEditorResource, - logViewer, - navigationTreePlugin, - navigationTreeRMPlugin, - datasourceContextSwitchPluginManifest, - topAppBar, - administrationTopAppBarPlugin, - version, - navigationTabsPlugin, - root, - sessionExpirationPlugin, - toolsPanel, - datasourceTransactionManagerPlugin, - projects, - browserPlugin, - navigationTreeFilters, - taskManagerPluginManifest, - settingsAdministrationPlugin, - userProfileSettingsPlugin, - holidaysPlugin, - holidaysPluginAdministration, - appLogoPlugin, - appLogoPluginAdministration, - pluginSystemInformationAdministrationManifest, - pluginSettingsDefaultAdministrationManifest, - codemirror6Manifest, +const PLUGINS = [ + ...commonSet, + pluginDataEditorPublicSettings, // must be las one to override all - defaultProductManifest, + productDefault, ]; bootstrap(PLUGINS); diff --git a/webapp/packages/product-default-impl/src/manifest.ts b/webapp/packages/product-default-impl/src/manifest.ts deleted file mode 100644 index 3b30e8864f..0000000000 --- a/webapp/packages/product-default-impl/src/manifest.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * 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. - */ -import './module.js'; -import type { PluginManifest } from '@cloudbeaver/core-di'; - -export const defaultProductManifest: PluginManifest = { - info: { - name: 'Default Product', - }, -}; diff --git a/webapp/packages/product-default-impl/src/module.ts b/webapp/packages/product-default-impl/src/module.ts index 4c3f92ffd0..df43099fe1 100644 --- a/webapp/packages/product-default-impl/src/module.ts +++ b/webapp/packages/product-default-impl/src/module.ts @@ -10,7 +10,7 @@ import { ModuleRegistry, Bootstrap } from '@cloudbeaver/core-di'; import { ProductBootstrap } from './ProductBootstrap.js'; import { LocaleService } from './LocaleService.js'; -ModuleRegistry.add({ +export default ModuleRegistry.add({ name: '@cloudbeaver/product-default-impl', configure: serviceCollection => { diff --git a/webapp/packages/product-default-impl/tsconfig.json b/webapp/packages/product-default-impl/tsconfig.json index e49c91e519..6d445e01b6 100644 --- a/webapp/packages/product-default-impl/tsconfig.json +++ b/webapp/packages/product-default-impl/tsconfig.json @@ -25,203 +25,11 @@ { "path": "../core-version-update" }, - { - "path": "../plugin-administration" - }, - { - "path": "../plugin-app-logo" - }, - { - "path": "../plugin-app-logo-administration" - }, - { - "path": "../plugin-authentication" - }, - { - "path": "../plugin-authentication-administration" - }, - { - "path": "../plugin-browser" - }, - { - "path": "../plugin-codemirror6" - }, - { - "path": "../plugin-connection-custom" - }, - { - "path": "../plugin-connection-search" - }, - { - "path": "../plugin-connections" - }, - { - "path": "../plugin-connections-administration" - }, { "path": "../plugin-data-editor-public-settings" }, { - "path": "../plugin-data-export" - }, - { - "path": "../plugin-data-grid" - }, - { - "path": "../plugin-data-import" - }, - { - "path": "../plugin-data-spreadsheet-new" - }, - { - "path": "../plugin-data-viewer" - }, - { - "path": "../plugin-data-viewer-result-set-grouping" - }, - { - "path": "../plugin-data-viewer-result-trace-details" - }, - { - "path": "../plugin-datasource-context-switch" - }, - { - "path": "../plugin-datasource-transaction-manager" - }, - { - "path": "../plugin-ddl-viewer" - }, - { - "path": "../plugin-devtools" - }, - { - "path": "../plugin-gis-viewer" - }, - { - "path": "../plugin-help" - }, - { - "path": "../plugin-holidays" - }, - { - "path": "../plugin-holidays-administration" - }, - { - "path": "../plugin-localization" - }, - { - "path": "../plugin-log-viewer" - }, - { - "path": "../plugin-navigation-tabs" - }, - { - "path": "../plugin-navigation-tree" - }, - { - "path": "../plugin-navigation-tree-filters" - }, - { - "path": "../plugin-navigation-tree-rm" - }, - { - "path": "../plugin-object-viewer" - }, - { - "path": "../plugin-object-viewer-nav-tree-link" - }, - { - "path": "../plugin-product" - }, - { - "path": "../plugin-product-information-administration" - }, - { - "path": "../plugin-projects" - }, - { - "path": "../plugin-resource-manager" - }, - { - "path": "../plugin-resource-manager-administration" - }, - { - "path": "../plugin-resource-manager-scripts" - }, - { - "path": "../plugin-root" - }, - { - "path": "../plugin-session-expiration" - }, - { - "path": "../plugin-settings-administration" - }, - { - "path": "../plugin-settings-default-administration" - }, - { - "path": "../plugin-settings-menu" - }, - { - "path": "../plugin-settings-menu-administration" - }, - { - "path": "../plugin-settings-panel" - }, - { - "path": "../plugin-sql-editor" - }, - { - "path": "../plugin-sql-editor-navigation-tab" - }, - { - "path": "../plugin-sql-editor-navigation-tab-script" - }, - { - "path": "../plugin-sql-editor-new" - }, - { - "path": "../plugin-sql-editor-screen" - }, - { - "path": "../plugin-sql-generator" - }, - { - "path": "../plugin-sso" - }, - { - "path": "../plugin-system-information-administration" - }, - { - "path": "../plugin-task-manager" - }, - { - "path": "../plugin-theme" - }, - { - "path": "../plugin-tools-panel" - }, - { - "path": "../plugin-top-app-bar" - }, - { - "path": "../plugin-top-app-bar-administration" - }, - { - "path": "../plugin-user-profile" - }, - { - "path": "../plugin-user-profile-administration" - }, - { - "path": "../plugin-user-profile-settings" - }, - { - "path": "../plugin-version" - }, - { - "path": "../plugin-version-update-administration" + "path": "../plugin-set-common" } ], "include": [ diff --git a/webapp/packages/tests-runner/package.json b/webapp/packages/tests-runner/package.json index 48b8639b6d..355000fca4 100644 --- a/webapp/packages/tests-runner/package.json +++ b/webapp/packages/tests-runner/package.json @@ -6,6 +6,7 @@ "license": "Apache-2.0", "exports": { ".": "./lib/index.js", + "./module": "./lib/module.js", "./*": "./lib/*.js" }, "scripts": { @@ -17,10 +18,15 @@ }, "dependencies": { "@cloudbeaver/core-di": "workspace:*", + "@dbeaver/react-tests": "workspace:*", + "@testing-library/dom": "^10", + "@testing-library/jest-dom": "^6", + "@testing-library/react": "^16", "mobx": "^6", "react": "^19", "react-dom": "^19", - "tslib": "^2" + "tslib": "^2", + "vitest": "^3" }, "sideEffects": [ "./lib/module.js", @@ -32,13 +38,11 @@ "devDependencies": { "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", - "@dbeaver/cli": "workspace:^", - "@dbeaver/react-tests": "workspace:^", - "@testing-library/dom": "^10", - "@testing-library/jest-dom": "^6", - "@testing-library/react": "^16", + "@dbeaver/cli": "workspace:*", + "@dbeaver/react-tests": "workspace:*", "@types/node": "^22", "@types/react": "^19", + "rimraf": "^6", "typescript": "^5", "vitest": "^3" } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index a90d6d440d..58f5436001 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1402,8 +1402,9 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1429,12 +1430,13 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/core-version": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -1460,8 +1462,8 @@ __metadata: "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" msw: "npm:^2" rimraf: "npm:^6" @@ -1491,7 +1493,7 @@ __metadata: "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" "@dbeaver/js-helpers": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@dbeaver/ui-kit": "workspace:*" "@testing-library/jest-dom": "npm:^6" "@testing-library/react": "npm:^16" @@ -1506,6 +1508,7 @@ __metadata: react-minisearch: "npm:^7" reakit: "npm:^1" reakit-utils: "npm:^0" + rimraf: "npm:^6" subscript: "npm:^9" tslib: "npm:^2" typescript: "npm:^5" @@ -1518,48 +1521,18 @@ __metadata: version: 0.0.0-use.local resolution: "@cloudbeaver/core-bootstrap@workspace:packages/core-bootstrap" dependencies: - "@cloudbeaver/core-administration": "workspace:*" "@cloudbeaver/core-app": "workspace:*" - "@cloudbeaver/core-authentication": "workspace:*" "@cloudbeaver/core-blocks": "workspace:*" - "@cloudbeaver/core-browser": "workspace:*" - "@cloudbeaver/core-browser-cookies": "workspace:*" - "@cloudbeaver/core-browser-settings": "workspace:*" "@cloudbeaver/core-cli": "workspace:*" - "@cloudbeaver/core-client-activity": "workspace:*" - "@cloudbeaver/core-connections": "workspace:*" "@cloudbeaver/core-di": "workspace:*" - "@cloudbeaver/core-dialogs": "workspace:*" - "@cloudbeaver/core-events": "workspace:*" "@cloudbeaver/core-executor": "workspace:*" - "@cloudbeaver/core-links": "workspace:*" - "@cloudbeaver/core-localization": "workspace:*" - "@cloudbeaver/core-navigation-tree": "workspace:*" - "@cloudbeaver/core-product": "workspace:*" - "@cloudbeaver/core-projects": "workspace:*" - "@cloudbeaver/core-resource": "workspace:*" - "@cloudbeaver/core-resource-manager": "workspace:*" - "@cloudbeaver/core-root": "workspace:*" - "@cloudbeaver/core-routing": "workspace:*" - "@cloudbeaver/core-sdk": "workspace:*" - "@cloudbeaver/core-server-localization": "workspace:*" - "@cloudbeaver/core-session-localization": "workspace:*" - "@cloudbeaver/core-settings": "workspace:*" - "@cloudbeaver/core-settings-localization": "workspace:*" - "@cloudbeaver/core-settings-user": "workspace:*" - "@cloudbeaver/core-storage": "workspace:*" - "@cloudbeaver/core-task-manager": "workspace:*" - "@cloudbeaver/core-theming": "workspace:*" - "@cloudbeaver/core-ui": "workspace:*" - "@cloudbeaver/core-version": "workspace:*" - "@cloudbeaver/core-version-update": "workspace:*" - "@cloudbeaver/core-view": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@types/react": "npm:^19" "@types/react-dom": "npm:^19" mobx: "npm:^6" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -1575,6 +1548,7 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1591,7 +1565,8 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1610,6 +1585,7 @@ __metadata: "@dbeaver/cli": "workspace:*" dexie: "npm:^4" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vite: "npm:^7" @@ -1628,7 +1604,6 @@ __metadata: resolution: "@cloudbeaver/core-cli@workspace:packages/core-cli" dependencies: "@cloudbeaver/tsconfig": "workspace:*" - "@swc/core": "npm:^1" "@types/js-yaml": "npm:^4" "@types/node": "npm:^22" enquirer: "npm:^2" @@ -1657,8 +1632,9 @@ __metadata: "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1687,10 +1663,11 @@ __metadata: "@cloudbeaver/core-settings": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" react: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1707,6 +1684,7 @@ __metadata: "@types/react": "npm:^19" mobx: "npm:^6" react: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1720,12 +1698,12 @@ __metadata: "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@types/react": "npm:^19" - "@wroud/di": "npm:^0" + "@wroud/di": "npm:^0.18.3" "@wroud/di-react": "npm:^0" - mobx: "npm:^6" react: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1741,6 +1719,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1759,8 +1738,9 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1775,6 +1755,7 @@ __metadata: "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1786,6 +1767,7 @@ __metadata: dependencies: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1796,9 +1778,9 @@ __metadata: resolution: "@cloudbeaver/core-links@workspace:packages/core-links" dependencies: "@cloudbeaver/core-cli": "workspace:*" - "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1813,8 +1795,9 @@ __metadata: "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1839,12 +1822,12 @@ __metadata: "@cloudbeaver/core-settings": "workspace:*" "@cloudbeaver/core-ui": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" - "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1866,6 +1849,7 @@ __metadata: react: "npm:^19" react-dom: "npm:^19" reakit: "npm:^1" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -1881,6 +1865,7 @@ __metadata: "@cloudbeaver/core-settings": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1903,6 +1888,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1925,6 +1911,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -1935,13 +1922,13 @@ __metadata: resolution: "@cloudbeaver/core-resource@workspace:packages/core-resource" dependencies: "@cloudbeaver/core-cli": "workspace:*" - "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -1965,8 +1952,10 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" msw: "npm:^2" + rimraf: "npm:^6" rxjs: "npm:^7" tslib: "npm:^2" typescript: "npm:^5" @@ -1984,6 +1973,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" router5: "npm:^8" router5-plugin-browser: "npm:^8" tslib: "npm:^2" @@ -2014,6 +2004,7 @@ __metadata: graphql-request: "npm:^7" graphql-tag: "npm:^2" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2029,6 +2020,7 @@ __metadata: "@cloudbeaver/core-root": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2045,6 +2037,7 @@ __metadata: "@cloudbeaver/core-settings-localization": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2061,8 +2054,9 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -2084,6 +2078,7 @@ __metadata: "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2101,9 +2096,10 @@ __metadata: "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -2119,6 +2115,7 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2134,6 +2131,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2152,7 +2150,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@dbeaver/ui-kit": "workspace:^" "@fontsource/roboto": "npm:^5" "@material/button": "npm:^4" @@ -2165,6 +2163,7 @@ __metadata: "@material/theme": "npm:^4" "@material/typography": "npm:^4" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2188,7 +2187,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/core-view": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" @@ -2197,6 +2196,7 @@ __metadata: react-dnd-html5-backend: "npm:^16" react-dom: "npm:^19" reakit: "npm:^1" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2211,7 +2211,7 @@ __metadata: "@cloudbeaver/tests-runner": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@timohausmann/quadtree-ts": "npm:^2" "@types/md5": "npm:^2" "@types/underscore": "npm:^1" @@ -2220,6 +2220,7 @@ __metadata: fast-deep-equal: "npm:^3" md5: "npm:^2" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" underscore: "npm:^1" @@ -2244,6 +2245,7 @@ __metadata: "@types/react": "npm:^19" mobx: "npm:^6" react: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2264,6 +2266,7 @@ __metadata: "@types/semver": "npm:^7" mobx: "npm:^6" react: "npm:^19" + rimraf: "npm:^6" semver: "npm:^7" tslib: "npm:^2" typescript: "npm:^5" @@ -2282,12 +2285,13 @@ __metadata: "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2338,19 +2342,19 @@ __metadata: "@cloudbeaver/core-resource": "workspace:*" "@cloudbeaver/core-root": "workspace:*" "@cloudbeaver/core-routing": "workspace:*" - "@cloudbeaver/core-sdk": "workspace:*" "@cloudbeaver/core-ui": "workspace:*" "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/core-view": "workspace:*" "@cloudbeaver/plugin-settings-menu": "workspace:*" "@cloudbeaver/plugin-top-app-bar": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2366,6 +2370,7 @@ __metadata: "@cloudbeaver/plugin-administration": "workspace:*" "@cloudbeaver/plugin-app-logo": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2389,6 +2394,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2419,14 +2425,15 @@ __metadata: "@cloudbeaver/plugin-administration": "workspace:*" "@cloudbeaver/plugin-authentication": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" reakit: "npm:^1" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2460,6 +2467,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2475,6 +2483,7 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2503,7 +2512,7 @@ __metadata: "@codemirror/search": "npm:^6" "@codemirror/state": "npm:^6" "@codemirror/view": "npm:^6" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/ui-kit": "workspace:*" "@lezer/common": "npm:^1" "@lezer/highlight": "npm:^1" "@types/react": "npm:^19" @@ -2512,6 +2521,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2546,6 +2556,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2579,6 +2590,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2606,12 +2618,12 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/plugin-connections": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2647,13 +2659,14 @@ __metadata: "@cloudbeaver/plugin-projects": "workspace:*" "@cloudbeaver/plugin-top-app-bar": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/jdbc-uri-parser": "workspace:^" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/jdbc-uri-parser": "workspace:*" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2665,13 +2678,13 @@ __metadata: resolution: "@cloudbeaver/plugin-d3js@workspace:packages/plugin-d3js" dependencies: "@cloudbeaver/core-cli": "workspace:*" - "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" "@types/d3": "npm:^7" "@types/d3-drag": "npm:^3" d3: "npm:^7" d3-drag: "npm:^3" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -2684,9 +2697,7 @@ __metadata: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" - "@cloudbeaver/core-root": "workspace:*" "@cloudbeaver/core-settings": "workspace:*" - "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/plugin-data-import": "workspace:*" "@cloudbeaver/plugin-data-viewer": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" @@ -2724,6 +2735,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2740,12 +2752,13 @@ __metadata: "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" "@dbeaver/react-data-grid": "workspace:*" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2777,6 +2790,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2794,7 +2808,6 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-dialogs": "workspace:*" "@cloudbeaver/core-events": "workspace:*" - "@cloudbeaver/core-executor": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-sdk": "workspace:*" "@cloudbeaver/core-settings": "workspace:*" @@ -2805,18 +2818,16 @@ __metadata: "@cloudbeaver/plugin-data-viewer": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" - "@dbeaver/result-set-api": "workspace:^" - "@dbeaver/ui-kit": "workspace:^" - "@popperjs/core": "npm:^2" + "@dbeaver/react-tests": "workspace:*" + "@dbeaver/result-set-api": "workspace:*" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" "@types/react-dom": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" - react-popper: "npm:^2" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2848,6 +2859,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2872,6 +2884,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2906,15 +2919,16 @@ __metadata: "@cloudbeaver/plugin-object-viewer": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" - "@dbeaver/result-set-api": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/react-tests": "workspace:*" + "@dbeaver/result-set-api": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" reflect-metadata: "npm:^0" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2948,6 +2962,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -2980,12 +2995,13 @@ __metadata: "@cloudbeaver/plugin-tools-panel": "workspace:*" "@cloudbeaver/plugin-top-app-bar": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3018,6 +3034,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3045,6 +3062,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3075,6 +3093,7 @@ __metadata: react: "npm:^19" react-dom: "npm:^19" react-leaflet: "npm:^5" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3108,8 +3127,12 @@ __metadata: "@cloudbeaver/plugin-top-app-bar": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@types/react": "npm:^19" + "@types/react-dom": "npm:^19" + mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" + react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3125,6 +3148,7 @@ __metadata: "@cloudbeaver/plugin-administration": "workspace:*" "@cloudbeaver/plugin-holidays": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3145,6 +3169,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3161,6 +3186,7 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3184,12 +3210,13 @@ __metadata: "@cloudbeaver/plugin-tools-panel": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3213,7 +3240,6 @@ __metadata: "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-projects": "workspace:*" "@cloudbeaver/core-resource": "workspace:*" - "@cloudbeaver/core-root": "workspace:*" "@cloudbeaver/core-settings": "workspace:*" "@cloudbeaver/core-storage": "workspace:*" "@cloudbeaver/core-ui": "workspace:*" @@ -3225,6 +3251,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3252,6 +3279,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3283,12 +3311,13 @@ __metadata: "@cloudbeaver/plugin-resource-manager": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3318,13 +3347,14 @@ __metadata: "@cloudbeaver/core-view": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/react-tests": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3344,6 +3374,7 @@ __metadata: "@cloudbeaver/plugin-datasource-context-switch": "workspace:*" "@cloudbeaver/plugin-navigation-tree": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3373,14 +3404,15 @@ __metadata: "@cloudbeaver/plugin-navigation-tabs": "workspace:*" "@cloudbeaver/plugin-navigation-tree": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" reakit: "npm:^1" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3407,6 +3439,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3435,6 +3468,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3459,6 +3493,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3480,6 +3515,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3514,6 +3550,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3536,8 +3573,9 @@ __metadata: "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -3563,6 +3601,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3590,6 +3629,114 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" + tslib: "npm:^2" + typescript: "npm:^5" + languageName: unknown + linkType: soft + +"@cloudbeaver/plugin-set-common@workspace:*, @cloudbeaver/plugin-set-common@workspace:packages/plugin-set-common": + version: 0.0.0-use.local + resolution: "@cloudbeaver/plugin-set-common@workspace:packages/plugin-set-common" + dependencies: + "@cloudbeaver/core-administration": "workspace:*" + "@cloudbeaver/core-app": "workspace:*" + "@cloudbeaver/core-authentication": "workspace:*" + "@cloudbeaver/core-blocks": "workspace:*" + "@cloudbeaver/core-browser": "workspace:*" + "@cloudbeaver/core-browser-cookies": "workspace:*" + "@cloudbeaver/core-browser-settings": "workspace:*" + "@cloudbeaver/core-cli": "workspace:*" + "@cloudbeaver/core-client-activity": "workspace:*" + "@cloudbeaver/core-connections": "workspace:*" + "@cloudbeaver/core-dialogs": "workspace:*" + "@cloudbeaver/core-events": "workspace:*" + "@cloudbeaver/core-localization": "workspace:*" + "@cloudbeaver/core-navigation-tree": "workspace:*" + "@cloudbeaver/core-product": "workspace:*" + "@cloudbeaver/core-projects": "workspace:*" + "@cloudbeaver/core-resource-manager": "workspace:*" + "@cloudbeaver/core-root": "workspace:*" + "@cloudbeaver/core-routing": "workspace:*" + "@cloudbeaver/core-sdk": "workspace:*" + "@cloudbeaver/core-server-localization": "workspace:*" + "@cloudbeaver/core-session-localization": "workspace:*" + "@cloudbeaver/core-settings": "workspace:*" + "@cloudbeaver/core-settings-localization": "workspace:*" + "@cloudbeaver/core-settings-user": "workspace:*" + "@cloudbeaver/core-storage": "workspace:*" + "@cloudbeaver/core-task-manager": "workspace:*" + "@cloudbeaver/core-theming": "workspace:*" + "@cloudbeaver/core-ui": "workspace:*" + "@cloudbeaver/core-version": "workspace:*" + "@cloudbeaver/core-version-update": "workspace:*" + "@cloudbeaver/core-view": "workspace:*" + "@cloudbeaver/plugin-administration": "workspace:*" + "@cloudbeaver/plugin-app-logo": "workspace:*" + "@cloudbeaver/plugin-app-logo-administration": "workspace:*" + "@cloudbeaver/plugin-authentication": "workspace:*" + "@cloudbeaver/plugin-authentication-administration": "workspace:*" + "@cloudbeaver/plugin-browser": "workspace:*" + "@cloudbeaver/plugin-codemirror6": "workspace:*" + "@cloudbeaver/plugin-connection-custom": "workspace:*" + "@cloudbeaver/plugin-connection-search": "workspace:*" + "@cloudbeaver/plugin-connections": "workspace:*" + "@cloudbeaver/plugin-connections-administration": "workspace:*" + "@cloudbeaver/plugin-data-export": "workspace:*" + "@cloudbeaver/plugin-data-grid": "workspace:*" + "@cloudbeaver/plugin-data-import": "workspace:*" + "@cloudbeaver/plugin-data-spreadsheet-new": "workspace:*" + "@cloudbeaver/plugin-data-viewer": "workspace:*" + "@cloudbeaver/plugin-data-viewer-result-set-grouping": "workspace:*" + "@cloudbeaver/plugin-data-viewer-result-trace-details": "workspace:*" + "@cloudbeaver/plugin-datasource-context-switch": "workspace:*" + "@cloudbeaver/plugin-datasource-transaction-manager": "workspace:*" + "@cloudbeaver/plugin-ddl-viewer": "workspace:*" + "@cloudbeaver/plugin-devtools": "workspace:*" + "@cloudbeaver/plugin-gis-viewer": "workspace:*" + "@cloudbeaver/plugin-help": "workspace:*" + "@cloudbeaver/plugin-holidays": "workspace:*" + "@cloudbeaver/plugin-holidays-administration": "workspace:*" + "@cloudbeaver/plugin-localization": "workspace:*" + "@cloudbeaver/plugin-log-viewer": "workspace:*" + "@cloudbeaver/plugin-navigation-tabs": "workspace:*" + "@cloudbeaver/plugin-navigation-tree": "workspace:*" + "@cloudbeaver/plugin-navigation-tree-filters": "workspace:*" + "@cloudbeaver/plugin-navigation-tree-rm": "workspace:*" + "@cloudbeaver/plugin-object-viewer": "workspace:*" + "@cloudbeaver/plugin-object-viewer-nav-tree-link": "workspace:*" + "@cloudbeaver/plugin-product": "workspace:*" + "@cloudbeaver/plugin-product-information-administration": "workspace:*" + "@cloudbeaver/plugin-projects": "workspace:*" + "@cloudbeaver/plugin-resource-manager": "workspace:*" + "@cloudbeaver/plugin-resource-manager-administration": "workspace:*" + "@cloudbeaver/plugin-resource-manager-scripts": "workspace:*" + "@cloudbeaver/plugin-root": "workspace:*" + "@cloudbeaver/plugin-session-expiration": "workspace:*" + "@cloudbeaver/plugin-settings-administration": "workspace:*" + "@cloudbeaver/plugin-settings-default-administration": "workspace:*" + "@cloudbeaver/plugin-settings-menu": "workspace:*" + "@cloudbeaver/plugin-settings-menu-administration": "workspace:*" + "@cloudbeaver/plugin-settings-panel": "workspace:*" + "@cloudbeaver/plugin-sql-editor": "workspace:*" + "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*" + "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*" + "@cloudbeaver/plugin-sql-editor-new": "workspace:*" + "@cloudbeaver/plugin-sql-editor-screen": "workspace:*" + "@cloudbeaver/plugin-sql-generator": "workspace:*" + "@cloudbeaver/plugin-system-information-administration": "workspace:*" + "@cloudbeaver/plugin-task-manager": "workspace:*" + "@cloudbeaver/plugin-theme": "workspace:*" + "@cloudbeaver/plugin-tools-panel": "workspace:*" + "@cloudbeaver/plugin-top-app-bar": "workspace:*" + "@cloudbeaver/plugin-top-app-bar-administration": "workspace:*" + "@cloudbeaver/plugin-user-profile": "workspace:*" + "@cloudbeaver/plugin-user-profile-administration": "workspace:*" + "@cloudbeaver/plugin-user-profile-settings": "workspace:*" + "@cloudbeaver/plugin-version": "workspace:*" + "@cloudbeaver/plugin-version-update-administration": "workspace:*" + "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3605,7 +3752,6 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-events": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" - "@cloudbeaver/core-root": "workspace:*" "@cloudbeaver/core-settings": "workspace:*" "@cloudbeaver/core-ui": "workspace:*" "@cloudbeaver/plugin-settings-panel": "workspace:*" @@ -3616,25 +3762,23 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown linkType: soft -"@cloudbeaver/plugin-settings-default-administration@workspace:^, @cloudbeaver/plugin-settings-default-administration@workspace:packages/plugin-settings-default-administration": +"@cloudbeaver/plugin-settings-default-administration@workspace:*, @cloudbeaver/plugin-settings-default-administration@workspace:packages/plugin-settings-default-administration": version: 0.0.0-use.local resolution: "@cloudbeaver/plugin-settings-default-administration@workspace:packages/plugin-settings-default-administration" dependencies: - "@cloudbeaver/core-authentication": "workspace:*" "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-root": "workspace:*" - "@cloudbeaver/core-settings": "workspace:*" - "@cloudbeaver/core-utils": "workspace:*" "@cloudbeaver/plugin-settings-administration": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3647,6 +3791,7 @@ __metadata: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3668,6 +3813,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3687,13 +3833,14 @@ __metadata: "@cloudbeaver/plugin-navigation-tree": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" - "@dbeaver/ui-kit": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" + "@dbeaver/ui-kit": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3729,8 +3876,9 @@ __metadata: "@cloudbeaver/plugin-sql-editor": "workspace:*" "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" mobx: "npm:^6" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3768,6 +3916,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3795,6 +3944,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3827,6 +3977,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3861,12 +4012,13 @@ __metadata: "@cloudbeaver/plugin-navigation-tabs": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@dbeaver/cli": "workspace:*" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/react-tests": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3900,6 +4052,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -3911,8 +4064,8 @@ __metadata: resolution: "@cloudbeaver/plugin-sso@workspace:packages/plugin-sso" dependencies: "@cloudbeaver/core-cli": "workspace:*" - "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3939,9 +4092,9 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" - typescript-plugin-css-modules: "npm:^5" languageName: unknown linkType: soft @@ -3956,6 +4109,7 @@ __metadata: "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-task-manager": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3968,6 +4122,7 @@ __metadata: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -3993,6 +4148,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -4011,6 +4167,7 @@ __metadata: "@cloudbeaver/tsconfig": "workspace:*" "@types/react": "npm:^19" react: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -4033,6 +4190,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -4048,6 +4206,7 @@ __metadata: "@cloudbeaver/plugin-administration": "workspace:*" "@cloudbeaver/plugin-user-profile": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -4076,6 +4235,7 @@ __metadata: mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -4102,12 +4262,13 @@ __metadata: "@cloudbeaver/plugin-authentication": "workspace:*" "@cloudbeaver/plugin-top-app-bar": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/js-helpers": "workspace:^" + "@dbeaver/js-helpers": "workspace:*" "@types/react": "npm:^19" mobx: "npm:^6" mobx-react-lite: "npm:^4" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -4136,6 +4297,7 @@ __metadata: react: "npm:^19" react-dom: "npm:^19" react-markdown: "npm:^10" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" typescript-plugin-css-modules: "npm:^5" @@ -4149,6 +4311,7 @@ __metadata: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" languageName: unknown @@ -4167,6 +4330,7 @@ __metadata: "@wroud/vite-plugin-asset-resolver": "npm:^0" "@wroud/vite-plugin-tsc": "npm:^0" fs-extra: "npm:^11" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vite: "npm:^7" @@ -4185,72 +4349,8 @@ __metadata: "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/core-localization": "workspace:*" "@cloudbeaver/core-version-update": "workspace:*" - "@cloudbeaver/plugin-administration": "workspace:*" - "@cloudbeaver/plugin-app-logo": "workspace:*" - "@cloudbeaver/plugin-app-logo-administration": "workspace:*" - "@cloudbeaver/plugin-authentication": "workspace:*" - "@cloudbeaver/plugin-authentication-administration": "workspace:*" - "@cloudbeaver/plugin-browser": "workspace:*" - "@cloudbeaver/plugin-codemirror6": "workspace:*" - "@cloudbeaver/plugin-connection-custom": "workspace:*" - "@cloudbeaver/plugin-connection-search": "workspace:*" - "@cloudbeaver/plugin-connections": "workspace:*" - "@cloudbeaver/plugin-connections-administration": "workspace:*" "@cloudbeaver/plugin-data-editor-public-settings": "workspace:*" - "@cloudbeaver/plugin-data-export": "workspace:*" - "@cloudbeaver/plugin-data-grid": "workspace:*" - "@cloudbeaver/plugin-data-import": "workspace:*" - "@cloudbeaver/plugin-data-spreadsheet-new": "workspace:*" - "@cloudbeaver/plugin-data-viewer": "workspace:*" - "@cloudbeaver/plugin-data-viewer-result-set-grouping": "workspace:*" - "@cloudbeaver/plugin-data-viewer-result-trace-details": "workspace:*" - "@cloudbeaver/plugin-datasource-context-switch": "workspace:*" - "@cloudbeaver/plugin-datasource-transaction-manager": "workspace:*" - "@cloudbeaver/plugin-ddl-viewer": "workspace:*" - "@cloudbeaver/plugin-devtools": "workspace:*" - "@cloudbeaver/plugin-gis-viewer": "workspace:*" - "@cloudbeaver/plugin-help": "workspace:*" - "@cloudbeaver/plugin-holidays": "workspace:*" - "@cloudbeaver/plugin-holidays-administration": "workspace:*" - "@cloudbeaver/plugin-localization": "workspace:*" - "@cloudbeaver/plugin-log-viewer": "workspace:*" - "@cloudbeaver/plugin-navigation-tabs": "workspace:*" - "@cloudbeaver/plugin-navigation-tree": "workspace:*" - "@cloudbeaver/plugin-navigation-tree-filters": "workspace:*" - "@cloudbeaver/plugin-navigation-tree-rm": "workspace:*" - "@cloudbeaver/plugin-object-viewer": "workspace:*" - "@cloudbeaver/plugin-object-viewer-nav-tree-link": "workspace:*" - "@cloudbeaver/plugin-product": "workspace:*" - "@cloudbeaver/plugin-product-information-administration": "workspace:*" - "@cloudbeaver/plugin-projects": "workspace:*" - "@cloudbeaver/plugin-resource-manager": "workspace:*" - "@cloudbeaver/plugin-resource-manager-administration": "workspace:*" - "@cloudbeaver/plugin-resource-manager-scripts": "workspace:*" - "@cloudbeaver/plugin-root": "workspace:*" - "@cloudbeaver/plugin-session-expiration": "workspace:*" - "@cloudbeaver/plugin-settings-administration": "workspace:*" - "@cloudbeaver/plugin-settings-default-administration": "workspace:^" - "@cloudbeaver/plugin-settings-menu": "workspace:*" - "@cloudbeaver/plugin-settings-menu-administration": "workspace:*" - "@cloudbeaver/plugin-settings-panel": "workspace:*" - "@cloudbeaver/plugin-sql-editor": "workspace:*" - "@cloudbeaver/plugin-sql-editor-navigation-tab": "workspace:*" - "@cloudbeaver/plugin-sql-editor-navigation-tab-script": "workspace:*" - "@cloudbeaver/plugin-sql-editor-new": "workspace:*" - "@cloudbeaver/plugin-sql-editor-screen": "workspace:*" - "@cloudbeaver/plugin-sql-generator": "workspace:*" - "@cloudbeaver/plugin-sso": "workspace:*" - "@cloudbeaver/plugin-system-information-administration": "workspace:*" - "@cloudbeaver/plugin-task-manager": "workspace:*" - "@cloudbeaver/plugin-theme": "workspace:*" - "@cloudbeaver/plugin-tools-panel": "workspace:*" - "@cloudbeaver/plugin-top-app-bar": "workspace:*" - "@cloudbeaver/plugin-top-app-bar-administration": "workspace:*" - "@cloudbeaver/plugin-user-profile": "workspace:*" - "@cloudbeaver/plugin-user-profile-administration": "workspace:*" - "@cloudbeaver/plugin-user-profile-settings": "workspace:*" - "@cloudbeaver/plugin-version": "workspace:*" - "@cloudbeaver/plugin-version-update-administration": "workspace:*" + "@cloudbeaver/plugin-set-common": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" "@types/react": "npm:^19" react: "npm:^19" @@ -4292,8 +4392,8 @@ __metadata: "@cloudbeaver/core-cli": "workspace:*" "@cloudbeaver/core-di": "workspace:*" "@cloudbeaver/tsconfig": "workspace:*" - "@dbeaver/cli": "workspace:^" - "@dbeaver/react-tests": "workspace:^" + "@dbeaver/cli": "workspace:*" + "@dbeaver/react-tests": "workspace:*" "@testing-library/dom": "npm:^10" "@testing-library/jest-dom": "npm:^6" "@testing-library/react": "npm:^16" @@ -4302,6 +4402,7 @@ __metadata: mobx: "npm:^6" react: "npm:^19" react-dom: "npm:^19" + rimraf: "npm:^6" tslib: "npm:^2" typescript: "npm:^5" vitest: "npm:^3" @@ -4517,7 +4618,7 @@ __metadata: languageName: unknown linkType: soft -"@dbeaver/jdbc-uri-parser@workspace:^, @dbeaver/jdbc-uri-parser@workspace:common-typescript/@dbeaver/jdbc-uri-parser": +"@dbeaver/jdbc-uri-parser@workspace:*, @dbeaver/jdbc-uri-parser@workspace:common-typescript/@dbeaver/jdbc-uri-parser": version: 0.0.0-use.local resolution: "@dbeaver/jdbc-uri-parser@workspace:common-typescript/@dbeaver/jdbc-uri-parser" dependencies: @@ -4528,7 +4629,7 @@ __metadata: languageName: unknown linkType: soft -"@dbeaver/js-helpers@workspace:*, @dbeaver/js-helpers@workspace:^, @dbeaver/js-helpers@workspace:common-typescript/@dbeaver/js-helpers": +"@dbeaver/js-helpers@workspace:*, @dbeaver/js-helpers@workspace:common-typescript/@dbeaver/js-helpers": version: 0.0.0-use.local resolution: "@dbeaver/js-helpers@workspace:common-typescript/@dbeaver/js-helpers" dependencies: @@ -4582,7 +4683,7 @@ __metadata: languageName: unknown linkType: soft -"@dbeaver/react-tests@workspace:^, @dbeaver/react-tests@workspace:common-react/@dbeaver/react-tests": +"@dbeaver/react-tests@workspace:*, @dbeaver/react-tests@workspace:^, @dbeaver/react-tests@workspace:common-react/@dbeaver/react-tests": version: 0.0.0-use.local resolution: "@dbeaver/react-tests@workspace:common-react/@dbeaver/react-tests" dependencies: @@ -4600,7 +4701,7 @@ __metadata: languageName: unknown linkType: soft -"@dbeaver/result-set-api@workspace:^, @dbeaver/result-set-api@workspace:common-typescript/@dbeaver/result-set-api": +"@dbeaver/result-set-api@workspace:*, @dbeaver/result-set-api@workspace:common-typescript/@dbeaver/result-set-api": version: 0.0.0-use.local resolution: "@dbeaver/result-set-api@workspace:common-typescript/@dbeaver/result-set-api" dependencies: @@ -6575,7 +6676,7 @@ __metadata: languageName: node linkType: hard -"@popperjs/core@npm:^2, @popperjs/core@npm:^2.5.4": +"@popperjs/core@npm:^2.5.4": version: 2.11.8 resolution: "@popperjs/core@npm:2.11.8" checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63 @@ -7120,7 +7221,7 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:^1, @swc/core@npm:^1.12.11": +"@swc/core@npm:^1.12.11": version: 1.13.5 resolution: "@swc/core@npm:1.13.5" dependencies: @@ -8384,10 +8485,10 @@ __metadata: languageName: node linkType: hard -"@wroud/di@npm:^0": - version: 0.18.2 - resolution: "@wroud/di@npm:0.18.2" - checksum: 10c0/1c5e80e398e1931163b6f095acc797056aecaf8740254c0ddcbf5850671d311c92bc1e6f3e3c4ac3c754e710dcd2e7c1ee1b1ba022edec66ca5beba061b2d8e0 +"@wroud/di@npm:^0, @wroud/di@npm:^0.18.3": + version: 0.18.3 + resolution: "@wroud/di@npm:0.18.3" + checksum: 10c0/88f806e0c18ea0d4330c0db13bff65287471e7a568f969ecf52383def3804c6deac7332f4b28c3b4d1ec7d13d0c2869ce06b231a04861106d175f6419107b468 languageName: node linkType: hard @@ -15785,13 +15886,6 @@ __metadata: languageName: node linkType: hard -"react-fast-compare@npm:^3.0.1": - version: 3.2.2 - resolution: "react-fast-compare@npm:3.2.2" - checksum: 10c0/0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367 - languageName: node - linkType: hard - "react-hotkeys-hook@npm:^4.6.1": version: 4.6.2 resolution: "react-hotkeys-hook@npm:4.6.2" @@ -15880,20 +15974,6 @@ __metadata: languageName: node linkType: hard -"react-popper@npm:^2": - version: 2.3.0 - resolution: "react-popper@npm:2.3.0" - dependencies: - react-fast-compare: "npm:^3.0.1" - warning: "npm:^4.0.2" - peerDependencies: - "@popperjs/core": ^2.0.0 - react: ^16.8.0 || ^17 || ^18 - react-dom: ^16.8.0 || ^17 || ^18 - checksum: 10c0/23f93540537ca4c035425bb8d5e51b11131fbc921d7ac1d041d0ae557feac8c877f3a012d36b94df8787803f52ed81e6df9257ac9e58719875f7805518d6db3f - languageName: node - linkType: hard - "react-refresh@npm:^0.17.0": version: 0.17.0 resolution: "react-refresh@npm:0.17.0" @@ -18734,15 +18814,6 @@ __metadata: languageName: node linkType: hard -"warning@npm:^4.0.2": - version: 4.0.3 - resolution: "warning@npm:4.0.3" - dependencies: - loose-envify: "npm:^1.0.0" - checksum: 10c0/aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e - languageName: node - linkType: hard - "watchpack@npm:^2.4.2": version: 2.4.4 resolution: "watchpack@npm:2.4.4"