diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eac42cfee5ce..1bb92f807d2d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ [Breaking Changes:](#breaking_changes_1.19.0) +- [output] moved `output-channel` from `common` to `browser` [#10154](https://github.com/eclipse-theia/theia/pull/10154) +- [output] moved `output-preferences` from `common` to `browser` [#10154](https://github.com/eclipse-theia/theia/pull/10154) - [view-container] `ViewContainerPart` constructor takes new 2 parameters: `originalContainerId` and `originalContainerTitle`. The existing `viewContainerId` parameter has been renamed to `currentContainerId` to enable drag & drop views. [#9644](https://github.com/eclipse-theia/theia/pull/9644) ## v1.18.0 - 9/30/2021 diff --git a/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts b/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts index 94a7ef5d592e6..d34f5a6183806 100644 --- a/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts +++ b/examples/api-samples/src/browser/output/sample-output-channel-with-severity.ts @@ -15,7 +15,7 @@ ********************************************************************************/ import { FrontendApplicationContribution } from '@theia/core/lib/browser'; import { inject, injectable, interfaces } from '@theia/core/shared/inversify'; -import { OutputChannelManager, OutputChannelSeverity } from '@theia/output/lib/common/output-channel'; +import { OutputChannelManager, OutputChannelSeverity } from '@theia/output/lib/browser/output-channel'; @injectable() export class SampleOutputChannelWithSeverity diff --git a/packages/debug/src/browser/debug-session-connection.ts b/packages/debug/src/browser/debug-session-connection.ts index b71c48520ac29..fd8a109436208 100644 --- a/packages/debug/src/browser/debug-session-connection.ts +++ b/packages/debug/src/browser/debug-session-connection.ts @@ -19,7 +19,7 @@ import { DebugProtocol } from 'vscode-debugprotocol'; import { Deferred } from '@theia/core/lib/common/promise-util'; import { Event, Emitter, DisposableCollection, Disposable, MaybePromise } from '@theia/core'; -import { OutputChannel } from '@theia/output/lib/common/output-channel'; +import { OutputChannel } from '@theia/output/lib/browser/output-channel'; import { IWebSocket } from '@theia/core/shared/vscode-ws-jsonrpc'; export interface DebugExitEvent { diff --git a/packages/debug/src/browser/debug-session-contribution.ts b/packages/debug/src/browser/debug-session-contribution.ts index 3bffffd1f2f69..87685405dcbbb 100644 --- a/packages/debug/src/browser/debug-session-contribution.ts +++ b/packages/debug/src/browser/debug-session-contribution.ts @@ -23,7 +23,7 @@ import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/w import { DebugSession } from './debug-session'; import { BreakpointManager } from './breakpoint/breakpoint-manager'; import { DebugSessionOptions } from './debug-session-options'; -import { OutputChannelManager, OutputChannel } from '@theia/output/lib/common/output-channel'; +import { OutputChannelManager, OutputChannel } from '@theia/output/lib/browser/output-channel'; import { DebugPreferences } from './debug-preferences'; import { DebugSessionConnection } from './debug-session-connection'; import { IWebSocket } from '@theia/core/shared/vscode-ws-jsonrpc'; diff --git a/packages/output/src/common/output-channel.ts b/packages/output/src/browser/output-channel.ts similarity index 98% rename from packages/output/src/common/output-channel.ts rename to packages/output/src/browser/output-channel.ts index 86998354a146d..06fdff5b5231b 100644 --- a/packages/output/src/common/output-channel.ts +++ b/packages/output/src/browser/output-channel.ts @@ -20,12 +20,9 @@ import URI from '@theia/core/lib/common/uri'; import { Deferred } from '@theia/core/lib/common/promise-util'; import { Resource, ResourceResolver } from '@theia/core/lib/common/resource'; import { Emitter, Event, Disposable, DisposableCollection } from '@theia/core'; -// eslint-disable-next-line @theia/runtime-import-check import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model'; -// eslint-disable-next-line @theia/runtime-import-check import { MonacoTextModelService, IReference } from '@theia/monaco/lib/browser/monaco-text-model-service'; -import { OutputUri } from './output-uri'; -// eslint-disable-next-line @theia/runtime-import-check +import { OutputUri } from '../common/output-uri'; import { OutputResource } from '../browser/output-resource'; import { OutputPreferences } from './output-preferences'; diff --git a/packages/output/src/browser/output-contribution.ts b/packages/output/src/browser/output-contribution.ts index 9e992fb18592f..e1e6db88e2ca8 100644 --- a/packages/output/src/browser/output-contribution.ts +++ b/packages/output/src/browser/output-contribution.ts @@ -25,7 +25,7 @@ import { OutputWidget } from './output-widget'; import { OutputContextMenu } from './output-context-menu'; import { OutputUri } from '../common/output-uri'; import { ClipboardService } from '@theia/core/lib/browser/clipboard-service'; -import { OutputChannelManager, OutputChannel } from '../common/output-channel'; +import { OutputChannelManager, OutputChannel } from './output-channel'; import { OutputCommands } from './output-commands'; import { QuickPickService } from '@theia/core/lib/common/quick-pick-service'; diff --git a/packages/output/src/browser/output-frontend-module.ts b/packages/output/src/browser/output-frontend-module.ts index dda78940077fd..6950f66415a94 100644 --- a/packages/output/src/browser/output-frontend-module.ts +++ b/packages/output/src/browser/output-frontend-module.ts @@ -19,8 +19,8 @@ import { OutputWidget, OUTPUT_WIDGET_KIND } from './output-widget'; import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar'; import { ResourceResolver } from '@theia/core/lib/common'; import { WidgetFactory, bindViewContribution, OpenHandler } from '@theia/core/lib/browser'; -import { OutputChannelManager } from '../common/output-channel'; -import { bindOutputPreferences } from '../common/output-preferences'; +import { OutputChannelManager } from './output-channel'; +import { bindOutputPreferences } from './output-preferences'; import { OutputToolbarContribution } from './output-toolbar-contribution'; import { OutputContribution } from './output-contribution'; import { MonacoEditorFactory } from '@theia/monaco/lib/browser/monaco-editor-provider'; diff --git a/packages/output/src/common/output-preferences.ts b/packages/output/src/browser/output-preferences.ts similarity index 95% rename from packages/output/src/common/output-preferences.ts rename to packages/output/src/browser/output-preferences.ts index 401b73c85fb13..f0bcb8c2e6304 100644 --- a/packages/output/src/common/output-preferences.ts +++ b/packages/output/src/browser/output-preferences.ts @@ -15,14 +15,12 @@ ********************************************************************************/ import { interfaces } from '@theia/core/shared/inversify'; - import { - createPreferenceProxy, + PreferenceContribution, PreferenceProxy, + PreferenceSchema, PreferenceService, - PreferenceContribution, - PreferenceSchema - // eslint-disable-next-line @theia/runtime-import-check + createPreferenceProxy } from '@theia/core/lib/browser/preferences'; export const OutputConfigSchema: PreferenceSchema = { diff --git a/packages/output/src/browser/output-toolbar-contribution.tsx b/packages/output/src/browser/output-toolbar-contribution.tsx index 5703fbb3db3cb..8ba4648f81bd2 100644 --- a/packages/output/src/browser/output-toolbar-contribution.tsx +++ b/packages/output/src/browser/output-toolbar-contribution.tsx @@ -21,7 +21,7 @@ import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/li import { OutputWidget } from './output-widget'; import { OutputCommands } from './output-commands'; import { OutputContribution } from './output-contribution'; -import { OutputChannelManager } from '../common/output-channel'; +import { OutputChannelManager } from './output-channel'; @injectable() export class OutputToolbarContribution implements TabBarToolbarContribution { diff --git a/packages/output/src/browser/output-widget.ts b/packages/output/src/browser/output-widget.ts index 7e301bccff81c..ab294e30ab6d9 100644 --- a/packages/output/src/browser/output-widget.ts +++ b/packages/output/src/browser/output-widget.ts @@ -25,7 +25,7 @@ import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-pr import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable'; import { Message, BaseWidget, DockPanel, Widget, MessageLoop, StatefulWidget, codicon } from '@theia/core/lib/browser'; import { OutputUri } from '../common/output-uri'; -import { OutputChannelManager, OutputChannel } from '../common/output-channel'; +import { OutputChannelManager, OutputChannel } from './output-channel'; import { Emitter, Event, deepClone } from '@theia/core'; @injectable() diff --git a/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts b/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts index 9eeaad7b82da8..fe910607e2787 100644 --- a/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts +++ b/packages/plugin-dev/src/browser/hosted-plugin-log-viewer.ts @@ -15,7 +15,7 @@ ********************************************************************************/ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'; -import { OutputChannel, OutputChannelManager } from '@theia/output/lib/common/output-channel'; +import { OutputChannel, OutputChannelManager } from '@theia/output/lib/browser/output-channel'; import { OutputContribution } from '@theia/output/lib/browser/output-contribution'; import { LogPart } from '@theia/plugin-ext/lib/common/types'; import { HostedPluginWatcher } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin-watcher'; diff --git a/packages/plugin-ext/src/main/browser/debug/debug-main.ts b/packages/plugin-ext/src/main/browser/debug/debug-main.ts index 0220d32abfe66..041a1faa5405c 100644 --- a/packages/plugin-ext/src/main/browser/debug/debug-main.ts +++ b/packages/plugin-ext/src/main/browser/debug/debug-main.ts @@ -38,7 +38,7 @@ import { DebugProtocol } from 'vscode-debugprotocol'; import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager'; import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service'; import { MessageClient } from '@theia/core/lib/common/message-service-protocol'; -import { OutputChannelManager } from '@theia/output/lib/common/output-channel'; +import { OutputChannelManager } from '@theia/output/lib/browser/output-channel'; import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences'; import { PluginDebugAdapterContribution } from './plugin-debug-adapter-contribution'; import { PluginDebugSessionContributionRegistrator, PluginDebugSessionContributionRegistry } from './plugin-debug-session-contribution-registry'; diff --git a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts index 0db48fef5d0c6..1b4953c2adc01 100644 --- a/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts +++ b/packages/plugin-ext/src/main/browser/debug/plugin-debug-session-factory.ts @@ -20,7 +20,7 @@ import { EditorManager } from '@theia/editor/lib/browser/editor-manager'; import { BreakpointManager } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager'; import { LabelProvider } from '@theia/core/lib/browser/label-provider'; import { MessageClient } from '@theia/core/lib/common/message-service-protocol'; -import { OutputChannelManager } from '@theia/output/lib/common/output-channel'; +import { OutputChannelManager } from '@theia/output/lib/browser/output-channel'; import { DebugPreferences } from '@theia/debug/lib/browser/debug-preferences'; import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options'; import { DebugSession } from '@theia/debug/lib/browser/debug-session'; diff --git a/packages/plugin-ext/src/main/browser/webview/webview.ts b/packages/plugin-ext/src/main/browser/webview/webview.ts index f28e709b67867..e516fa7ef3f58 100644 --- a/packages/plugin-ext/src/main/browser/webview/webview.ts +++ b/packages/plugin-ext/src/main/browser/webview/webview.ts @@ -40,7 +40,7 @@ import { Schemes } from '../../../common/uri-components'; import { PluginSharedStyle } from '../plugin-shared-style'; import { WebviewThemeDataProvider } from './webview-theme-data-provider'; import { ExternalUriService } from '@theia/core/lib/browser/external-uri-service'; -import { OutputChannelManager } from '@theia/output/lib/common/output-channel'; +import { OutputChannelManager } from '@theia/output/lib/browser/output-channel'; import { WebviewPreferences } from './webview-preferences'; import { WebviewResourceCache } from './webview-resource-cache'; import { Endpoint } from '@theia/core/lib/browser/endpoint';