Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

web - only export types not interfaces #161609

Merged
merged 2 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,14 @@
{
"when": "hasBrowser",
"pattern": "vs/workbench/workbench.web.main"
},
{
"when": "hasBrowser",
"pattern": "vs/workbench/~"
},
{
"when": "hasBrowser",
"pattern": "vs/workbench/services/*/~"
}
]
},
Expand Down
6 changes: 5 additions & 1 deletion src/vs/code/browser/workbench/workbench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ import { URI, UriComponents } from 'vs/base/common/uri';
import { request } from 'vs/base/parts/request/browser/request';
import product from 'vs/platform/product/common/product';
import { isFolderToOpen, isWorkspaceToOpen } from 'vs/platform/window/common/window';
import { create, ICredentialsProvider, IURLCallbackProvider, IWorkbenchConstructionOptions, IWorkspace, IWorkspaceProvider } from 'vs/workbench/workbench.web.main';
import { create } from 'vs/workbench/workbench.web.main';
import { posix } from 'vs/base/common/path';
import { ltrim } from 'vs/base/common/strings';
import type { ICredentialsProvider } from 'vs/platform/credentials/common/credentials';
import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
import type { IWorkbenchConstructionOptions } from 'vs/workbench/browser/web.api';
import type { IWorkspace, IWorkspaceProvider } from 'vs/workbench/services/host/browser/browserHostService';

interface ICredential {
service: string;
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/browser/web.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export interface IWorkbench {
};

workspace: {

/**
* Forwards a port. If the current embedder implements a tunnelFactory then that will be used to make the tunnel.
* By default, openTunnel only support localhost; however, a tunnelFactory can be used to support other ips.
Expand Down
6 changes: 4 additions & 2 deletions src/vs/workbench/browser/web.factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,10 @@ export namespace env {
return workbench.env.openUri(target);
}

export const telemetryLevel: Promise<IObservableValue<TelemetryLevel>> =
workbenchPromise.p.then(workbench => workbench.env.telemetryLevel);
/**
* {@linkcode IWorkbench.env IWorkbench.env.telemetryLevel}
*/
export const telemetryLevel: Promise<IObservableValue<TelemetryLevel>> = workbenchPromise.p.then(workbench => workbench.env.telemetryLevel);
}

export namespace window {
Expand Down
106 changes: 10 additions & 96 deletions src/vs/workbench/workbench.web.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,118 +178,32 @@ import 'vs/workbench/contrib/offline/browser/offline.contribution';
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

import { create, commands, env, window, workspace, logger } from 'vs/workbench/browser/web.factory';
import { IWorkbench, ICommand, ICommonTelemetryPropertiesResolver, IDefaultEditor, IDefaultLayout, IDefaultView, IDevelopmentOptions, IExternalUriResolver, IExternalURLOpener, IHomeIndicator, IInitialColorTheme, IProductQualityChangeHandler, IResourceUriProvider, ISettingsSyncOptions, IShowPortCandidate, ITunnel, ITunnelFactory, ITunnelOptions, ITunnelProvider, IWelcomeBanner, IWelcomeBannerAction, IWindowIndicator, IWorkbenchConstructionOptions, Menu } from 'vs/workbench/browser/web.api';
import { UriComponents, URI } from 'vs/base/common/uri';
import { IWebSocketFactory, IWebSocket } from 'vs/platform/remote/browser/browserSocketFactory';
import { Menu } from 'vs/workbench/browser/web.api';
import { URI } from 'vs/base/common/uri';
import { Event, Emitter } from 'vs/base/common/event';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { IProductConfiguration } from 'vs/base/common/product';
import { ICredentialsProvider } from 'vs/platform/credentials/common/credentials';
// eslint-disable-next-line no-duplicate-imports
import type { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
// eslint-disable-next-line no-duplicate-imports
import type { IUpdateProvider, IUpdate } from 'vs/workbench/services/update/browser/updateService';
// eslint-disable-next-line no-duplicate-imports
import type { IWorkspace, IWorkspaceProvider } from 'vs/workbench/services/host/browser/browserHostService';
import { EditorGroupLayout, GroupLayoutArgument, GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';
import { Disposable } from 'vs/base/common/lifecycle';
import { GroupOrientation } from 'vs/workbench/services/editor/common/editorGroupsService';

export {

// Factory
create,
IWorkbenchConstructionOptions,
IWorkbench,

// Basic Types
URI,
UriComponents,
Event,
Emitter,
IDisposable,
Disposable,

// Workspace
IWorkspace,
IWorkspaceProvider,

// WebSockets
IWebSocketFactory,
IWebSocket,

// Resources
IResourceUriProvider,

// Credentials
ICredentialsProvider,

// Callbacks
IURLCallbackProvider,

// LogLevel
LogLevel,

// SettingsSync
ISettingsSyncOptions,

// Updates/Quality
IUpdateProvider,
IUpdate,
IProductQualityChangeHandler,

// Telemetry
ICommonTelemetryPropertiesResolver,

// External Uris
IExternalUriResolver,

// External URL Opener
IExternalURLOpener,

// Tunnel
ITunnelProvider,
ITunnelFactory,
ITunnel,
ITunnelOptions,

// Ports
IShowPortCandidate,

// Commands
ICommand,
commands,
Menu,

// Logger
logger,

// Window
window,

// Branding
IHomeIndicator,
IWelcomeBanner,
IWelcomeBannerAction,
IProductConfiguration,
IWindowIndicator,
IInitialColorTheme,

// Default layout
IDefaultLayout,
IDefaultView,
IDefaultEditor,
EditorGroupLayout,
GroupOrientation,
GroupLayoutArgument,
LogLevel,

// Env
// Facade API
env,

// Workspace
window,
workspace,

// Development
IDevelopmentOptions
commands,
logger,
Menu
};


//#endregion