From d88ea47fdfbdeb493b7d88a2ccfddb8e93ce4530 Mon Sep 17 00:00:00 2001 From: Marc Dumais Date: Mon, 4 Mar 2024 10:58:05 -0500 Subject: [PATCH] [viewer-prototype] Use Theia re-export rather than importing inversify directly This way, we re-use inversify through @theia/core, rather than importing it without declaring it as a dependency in our package.json (i.e. implicit dependency). This also follows Theia's guidance regarding using their re-exports: https://github.com/eclipse-theia/theia/tree/master/packages/core#re-exports-mechanism Signed-off-by: Marc Dumais --- .../src/browser/preferences-frontend-contribution.ts | 2 +- .../src/browser/trace-server-connection-status-client-impl.ts | 2 +- .../viewer-prototype/src/browser/tsp-client-provider-impl.ts | 2 +- .../src/node/trace-server-connection-status-backend-impl.ts | 2 +- .../viewer-prototype/src/node/trace-server-url-provider-impl.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/theia-extensions/viewer-prototype/src/browser/preferences-frontend-contribution.ts b/theia-extensions/viewer-prototype/src/browser/preferences-frontend-contribution.ts index bbc95f421..0afecb343 100644 --- a/theia-extensions/viewer-prototype/src/browser/preferences-frontend-contribution.ts +++ b/theia-extensions/viewer-prototype/src/browser/preferences-frontend-contribution.ts @@ -1,5 +1,5 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser'; -import { inject, injectable } from 'inversify'; +import { inject, injectable } from '@theia/core/shared/inversify'; import { PortPreferenceProxy, TRACE_VIEWER_DEFAULT_PORT } from '../common/trace-server-url-provider'; import { TracePreferences, TRACE_PORT } from './trace-server-preference'; diff --git a/theia-extensions/viewer-prototype/src/browser/trace-server-connection-status-client-impl.ts b/theia-extensions/viewer-prototype/src/browser/trace-server-connection-status-client-impl.ts index 8eeafbb03..991d5a850 100644 --- a/theia-extensions/viewer-prototype/src/browser/trace-server-connection-status-client-impl.ts +++ b/theia-extensions/viewer-prototype/src/browser/trace-server-connection-status-client-impl.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { injectable } from 'inversify'; +import { injectable } from '@theia/core/shared/inversify'; import { TraceServerConnectionStatusClient } from '../common/trace-server-connection-status'; type Listener = (serverStatus: boolean) => void; diff --git a/theia-extensions/viewer-prototype/src/browser/tsp-client-provider-impl.ts b/theia-extensions/viewer-prototype/src/browser/tsp-client-provider-impl.ts index 6c556d286..3eabd2886 100644 --- a/theia-extensions/viewer-prototype/src/browser/tsp-client-provider-impl.ts +++ b/theia-extensions/viewer-prototype/src/browser/tsp-client-provider-impl.ts @@ -1,4 +1,4 @@ -import { injectable, inject } from 'inversify'; +import { injectable, inject } from '@theia/core/shared/inversify'; import { ExperimentManager } from 'traceviewer-base/lib/experiment-manager'; import { TraceManager } from 'traceviewer-base/lib/trace-manager'; import { ITspClientProvider } from 'traceviewer-base/lib/tsp-client-provider'; diff --git a/theia-extensions/viewer-prototype/src/node/trace-server-connection-status-backend-impl.ts b/theia-extensions/viewer-prototype/src/node/trace-server-connection-status-backend-impl.ts index d8814015c..353977fbc 100644 --- a/theia-extensions/viewer-prototype/src/node/trace-server-connection-status-backend-impl.ts +++ b/theia-extensions/viewer-prototype/src/node/trace-server-connection-status-backend-impl.ts @@ -1,4 +1,4 @@ -import { injectable } from 'inversify'; +import { injectable } from '@theia/core/shared/inversify'; import { RestClient } from 'tsp-typescript-client/lib/protocol/rest-client'; import { TraceServerConnectionStatusBackend, diff --git a/theia-extensions/viewer-prototype/src/node/trace-server-url-provider-impl.ts b/theia-extensions/viewer-prototype/src/node/trace-server-url-provider-impl.ts index 64e775528..cd343b5ae 100644 --- a/theia-extensions/viewer-prototype/src/node/trace-server-url-provider-impl.ts +++ b/theia-extensions/viewer-prototype/src/node/trace-server-url-provider-impl.ts @@ -1,4 +1,4 @@ -import { inject, injectable } from 'inversify'; +import { inject, injectable } from '@theia/core/shared/inversify'; import { TraceServerConfigService } from '../common/trace-server-config'; import { TraceServerUrlProvider,