vite 2.9.7 → 3.0.0-alpha.0

package/dist/node/index.d.ts

@@ -24,7 +24,7 @@ import type { OutgoingHttpHeaders } from 'http';
 import type { OutputBundle } from 'rollup';
 import type { OutputChunk } from 'rollup';
 import type { PartialResolvedId } from 'rollup';
-import type { Plugin as Plugin_2 } from 'rollup';
+import type { Plugin as Plugin_3 } from 'rollup';
 import type { PluginContext } from 'rollup';
 import type { PluginHooks } from 'rollup';
 import type * as PostCSS from 'postcss';
@@ -36,18 +36,18 @@ import type { RollupWatcher } from 'rollup';
 import type { SecureContextOptions } from 'tls';
 import type { Server } from 'http';
 import type { Server as Server_2 } from 'https';
-import type { Server as Server_3 } from 'net';
 import type { ServerOptions as ServerOptions_2 } from 'https';
 import type { ServerResponse } from 'http';
 import type { SourceDescription } from 'rollup';
 import type { SourceMap } from 'rollup';
 import type * as stream from 'stream';
 import type { TransformPluginContext } from 'rollup';
-import type { TransformResult as TransformResult_2 } from 'esbuild';
-import type { TransformResult as TransformResult_3 } from 'rollup';
+import type { TransformResult as TransformResult_2 } from 'rollup';
+import type { TransformResult as TransformResult_3 } from 'esbuild';
 import type * as url from 'url';
 import type { URL as URL_2 } from 'url';
 import type { WatcherOptions } from 'rollup';
+import type { Worker as Worker_2 } from 'okie';
 import type { ZlibOptions } from 'zlib';
 
 export declare interface Alias {
@@ -95,11 +95,6 @@ export declare interface AwaitWriteFinishOptions {
 export declare function build(inlineConfig?: InlineConfig): Promise<RollupOutput | RollupOutput[] | RollupWatcher>;
 
 export declare interface BuildOptions {
-    /**
-     * Base public path when served in production.
-     * @deprecated `base` is now a root-level config option.
-     */
-    base?: string;
     /**
      * Compatibility transform target. The transform is performed with esbuild
      * and the lowest supported target is es2015/es6. Note this only handles
@@ -123,13 +118,6 @@ export declare interface BuildOptions {
      * @default true
      */
     polyfillModulePreload?: boolean;
-    /**
-     * whether to inject dynamic import polyfill.
-     * Note: does not apply to library mode.
-     * @default false
-     * @deprecated use plugin-legacy for browsers that don't support dynamic import
-     */
-    polyfillDynamicImport?: boolean;
     /**
      * Directory relative from `root` where build output will be placed. If the
      * directory exists, it will be removed before the build.
@@ -183,10 +171,6 @@ export declare interface BuildOptions {
      * https://terser.org/docs/api-reference#minify-options
      */
     terserOptions?: Terser.MinifyOptions;
-    /**
-     * @deprecated Vite now uses esbuild for CSS minification.
-     */
-    cleanCssOptions?: any;
     /**
      * Will be merged with internal rollup options.
      * https://rollupjs.org/guide/en/#big-list-of-options
@@ -251,12 +235,6 @@ export declare interface BuildOptions {
      * Can slightly improve build speed.
      */
     reportCompressedSize?: boolean;
-    /**
-     * Set to false to disable brotli compressed size reporting for build.
-     * Can slightly improve build speed.
-     * @deprecated use `build.reportCompressedSize` instead.
-     */
-    brotliSize?: boolean;
     /**
      * Adjust chunk size warning limit (in kbs).
      * @default 500
@@ -574,15 +552,10 @@ export declare interface DepOptimizationOptions {
      *
      * - `external` is also omitted, use Vite's `optimizeDeps.exclude` option
      * - `plugins` are merged with Vite's dep plugin
-     * - `keepNames` takes precedence over the deprecated `optimizeDeps.keepNames`
      *
      * https://esbuild.github.io/api
      */
     esbuildOptions?: Omit<BuildOptions_2, 'bundle' | 'entryPoints' | 'external' | 'write' | 'watch' | 'outdir' | 'outfile' | 'outbase' | 'outExtension' | 'metafile'>;
-    /**
-     * @deprecated use `esbuildOptions.keepNames`
-     */
-    keepNames?: boolean;
     /**
      * List of file extensions that can be optimized. A corresponding esbuild
      * plugin must exist to handle the specific extension.
@@ -613,7 +586,7 @@ export declare interface DepOptimizationResult {
      * the page reload will be delayed until the next rerun so we need
      * to be able to discard the result
      */
-    commit: () => void;
+    commit: () => Promise<void>;
     cancel: () => void;
 }
 
@@ -643,10 +616,20 @@ export declare interface ESBuildOptions extends EsbuildTransformOptions {
 
 export { EsbuildTransformOptions }
 
-export declare type ESBuildTransformResult = Omit<TransformResult_2, 'map'> & {
+export declare type ESBuildTransformResult = Omit<TransformResult_3, 'map'> & {
     map: SourceMap;
 };
 
+export declare interface ExperimentalOptions {
+    /**
+     * Append fake `&lang.(ext)` when queries are specified, to preseve the file extension for following plugins to process.
+     *
+     * @experimental
+     * @default false
+     */
+    importGlobRestoreExtension?: boolean;
+}
+
 export declare interface FileSystemServeOptions {
     /**
      * Strictly restrict file accessing outside of allowing paths.
@@ -670,8 +653,6 @@ export declare interface FileSystemServeOptions {
      * Glob patterns are supported.
      *
      * @default ['.env', '.env.*', '*.crt', '*.pem']
-     *
-     * @experimental
      */
     deny?: string[];
 }
@@ -1014,6 +995,86 @@ export declare namespace HttpProxy {
     }
 }
 
+export declare interface ImportGlobEagerFunction {
+    /**
+     * 1. No generic provided, infer the type from `as`
+     */
+    <
+    As extends string,
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+    >(
+    glob: string | string[],
+    options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>
+    ): Record<string, T>
+    /**
+     * 2. Module generic provided
+     */
+    <M>(
+    glob: string | string[],
+    options?: Omit<ImportGlobOptions<boolean, string>, 'eager'>
+    ): Record<string, M>
+}
+
+export declare interface ImportGlobFunction {
+    /**
+     * 1. No generic provided, infer the type from `eager` and `as`
+     */
+    <
+    Eager extends boolean,
+    As extends string,
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+    >(
+    glob: string | string[],
+    options?: ImportGlobOptions<Eager, As>
+    ): (Eager extends true ? true : false) extends true
+    ? Record<string, T>
+    : Record<string, () => Promise<T>>
+    /**
+     * 2. Module generic provided, infer the type from `eager: false`
+     */
+    <M>(
+    glob: string | string[],
+    options?: ImportGlobOptions<false, string>
+    ): Record<string, () => Promise<M>>
+    /**
+     * 3. Module generic provided, infer the type from `eager: true`
+     */
+    <M>(
+    glob: string | string[],
+    options: ImportGlobOptions<true, string>
+    ): Record<string, M>
+}
+
+export declare interface ImportGlobOptions<
+Eager extends boolean,
+AsType extends string
+> {
+    /**
+     * Import type for the import url.
+     */
+    as?: AsType
+    /**
+     * Import as static or dynamic
+     *
+     * @default false
+     */
+    eager?: Eager
+    /**
+     * Import only the specific named export. Set to `default` to import the default export.
+     */
+    import?: string
+    /**
+     * Custom queries
+     */
+    query?: string | Record<string, string | number | boolean>
+    /**
+     * Search files also inside `node_modules/` and hidden directories (e.g. `.git/`). This might have impact on performance.
+     *
+     * @default false
+     */
+    exhaustive?: boolean
+}
+
 export declare type IndexHtmlTransform = IndexHtmlTransformHook | {
     enforce?: 'pre' | 'post';
     transform: IndexHtmlTransformHook;
@@ -1086,6 +1147,12 @@ export declare interface JsonOptions {
     stringify?: boolean;
 }
 
+export declare interface KnownAsTypeMap {
+    raw: string
+    url: string
+    worker: Worker_2<any, any>
+}
+
 export declare type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife';
 
 export declare interface LibraryOptions {
@@ -1238,6 +1305,8 @@ export declare interface PackageData {
     getResolvedCache: (key: string, targetWeb: boolean) => string | undefined;
     data: {
         [field: string]: any;
+        name: string;
+        type: string;
         version: string;
         main: string;
         module: string;
@@ -1268,7 +1337,7 @@ export declare interface PackageData {
  * If a plugin should be applied only for server or build, a function format
  * config file can be used to conditional determine the plugins to use.
  */
-export declare interface Plugin extends Plugin_2 {
+declare interface Plugin_2 extends Plugin_3 {
     /**
      * Enforce plugin invocation tier similar to webpack loaders.
      *
@@ -1309,6 +1378,15 @@ export declare interface Plugin extends Plugin_2 {
      * are applied. Hook can be async functions and will be called in series.
      */
     configureServer?: ServerHook;
+    /**
+     * Configure the preview server. The hook receives the connect server and
+     * its underlying http server.
+     *
+     * The hooks are called before other middlewares are applied. A hook can
+     * return a post hook that will be called after other middlewares are
+     * applied. Hooks can be async functions and will be called in series.
+     */
+    configurePreviewServer?: PreviewServerHook;
     /**
      * Transform index.html.
      * The hook receives the following arguments:
@@ -1354,15 +1432,16 @@ export declare interface Plugin extends Plugin_2 {
     }): Promise<LoadResult> | LoadResult;
     transform?(this: TransformPluginContext, code: string, id: string, options?: {
         ssr?: boolean;
-    }): Promise<TransformResult_3> | TransformResult_3;
+    }): Promise<TransformResult_2> | TransformResult_2;
 }
+export { Plugin_2 as Plugin }
 
 export declare interface PluginContainer {
     options: InputOptions;
     getModuleInfo(id: string): ModuleInfo | null;
     buildStart(options: InputOptions): Promise<void>;
     resolveId(id: string, importer?: string, options?: {
-        skip?: Set<Plugin>;
+        skip?: Set<Plugin_2>;
         ssr?: boolean;
         /* Excluded from this release type: scan */
     }): Promise<PartialResolvedId | null>;
@@ -1376,13 +1455,12 @@ export declare interface PluginContainer {
     close(): Promise<void>;
 }
 
-export declare type PluginOption = Plugin | false | null | undefined | PluginOption[];
+export declare type PluginOption = Plugin_2 | false | null | undefined | PluginOption[];
 
 /**
  * Starts the Vite server in preview mode, to simulate a production deployment
- * @experimental
  */
-export declare function preview(inlineConfig: InlineConfig): Promise<PreviewServer>;
+export declare function preview(inlineConfig?: InlineConfig): Promise<PreviewServer>;
 
 export declare interface PreviewOptions extends CommonServerOptions {
 }
@@ -1402,10 +1480,10 @@ export declare interface PreviewServer {
     printUrls: () => void;
 }
 
-/**
- * @deprecated Use `server.printUrls()` instead
- */
-export declare function printHttpServerUrls(server: Server_3, config: ResolvedConfig): void;
+export declare type PreviewServerHook = (server: {
+    middlewares: Connect.Server;
+    httpServer: http.Server;
+}) => (() => void) | void | Promise<(() => void) | void>;
 
 export declare interface ProxyOptions extends HttpProxy.ServerOptions {
     /**
@@ -1429,9 +1507,9 @@ export declare interface PrunePayload {
 
 export declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string): Promise<ResolvedConfig>;
 
-export declare type ResolvedBuildOptions = Required<Omit<BuildOptions, 'base' | 'cleanCssOptions' | 'polyfillDynamicImport' | 'brotliSize'>>;
+export declare type ResolvedBuildOptions = Required<BuildOptions>;
 
-export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'alias' | 'dedupe' | 'assetsInclude' | 'optimizeDeps' | 'worker'> & {
+export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'assetsInclude' | 'optimizeDeps' | 'worker'> & {
     configFile: string | undefined;
     configFileDependencies: string[];
     inlineConfig: InlineConfig;
@@ -1442,19 +1520,20 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'alia
     command: 'build' | 'serve';
     mode: string;
     isWorker: boolean;
+    /* Excluded from this release type: mainConfig */
     isProduction: boolean;
     env: Record<string, any>;
     resolve: ResolveOptions & {
         alias: Alias[];
     };
-    plugins: readonly Plugin[];
+    plugins: readonly Plugin_2[];
     server: ResolvedServerOptions;
     build: ResolvedBuildOptions;
     preview: ResolvedPreviewOptions;
     assetsInclude: (file: string) => boolean;
     logger: Logger;
     createResolver: (options?: Partial<InternalResolveOptions>) => ResolveFn;
-    optimizeDeps: Omit<DepOptimizationOptions, 'keepNames'>;
+    optimizeDeps: DepOptimizationOptions;
     /* Excluded from this release type: packageCache */
     worker: ResolveWorkerOptions;
 }>;
@@ -1497,7 +1576,7 @@ export declare interface ResolverObject {
 
 export declare interface ResolveWorkerOptions {
     format: 'es' | 'iife';
-    plugins: Plugin[];
+    plugins: Plugin_2[];
     rollupOptions: RollupOptions;
 }
 
@@ -1753,14 +1832,12 @@ export declare interface ServerOptions extends CommonServerOptions {
     origin?: string;
     /**
      * Pre-transform known direct imports
-     *
-     * @experimental this option is experimental and might be changed in the future
      * @default true
      */
     preTransformRequests?: boolean;
 }
 
-export declare function sortUserPlugins(plugins: (Plugin | Plugin[])[] | undefined): [Plugin[], Plugin[], Plugin[]];
+export declare function sortUserPlugins(plugins: (Plugin_2 | Plugin_2[])[] | undefined): [Plugin_2[], Plugin_2[], Plugin_2[]];
 
 export declare function splitVendorChunk(options?: {
     cache?: SplitVendorChunkCache;
@@ -1772,7 +1849,7 @@ export declare class SplitVendorChunkCache {
     reset(): void;
 }
 
-export declare function splitVendorChunkPlugin(): Plugin;
+export declare function splitVendorChunkPlugin(): Plugin_2;
 
 export declare interface SSROptions {
     external?: string[];
@@ -1938,8 +2015,6 @@ export declare namespace Terser {
         module?: boolean
         nameCache?: object
         format?: FormatOptions
-        /** @deprecated use format instead */
-        output?: FormatOptions
         parse?: ParseOptions
         safari10?: boolean
         sourceMap?: boolean | SourceMapOptions
@@ -2072,7 +2147,18 @@ export declare interface UserConfig {
      * Dep optimization options
      */
     optimizeDeps?: DepOptimizationOptions;
-    /* Excluded from this release type: ssr */
+    /**
+     * SSR specific options
+     */
+    ssr?: SSROptions;
+    /**
+     * Experimental features
+     *
+     * Features under this field are addressed to be changed that might NOT follow semver.
+     * Please be careful and always pin Vite's version when using them.
+     * @experimental
+     */
+    experimental?: ExperimentalOptions;
     /**
      * Log level.
      * Default: 'info'
@@ -2097,17 +2183,6 @@ export declare interface UserConfig {
      * @default 'VITE_'
      */
     envPrefix?: string | string[];
-    /**
-     * Import aliases
-     * @deprecated use `resolve.alias` instead
-     */
-    alias?: AliasOptions;
-    /**
-     * Force Vite to always resolve listed dependencies to the same copy (from
-     * project root).
-     * @deprecated use `resolve.dedupe` instead
-     */
-    dedupe?: string[];
     /**
      * Worker bundle options
      */
@@ -2146,10 +2221,6 @@ export declare interface ViteDevServer {
      * https://github.com/senchalabs/connect#use-middleware
      */
     middlewares: Connect.Server;
-    /**
-     * @deprecated use `server.middlewares` instead
-     */
-    app: Connect.Server;
     /**
      * native Node http server instance
      * will be null in middleware mode
@@ -2182,16 +2253,8 @@ export declare interface ViteDevServer {
      * Apply vite built-in HTML transforms and any plugin HTML transforms.
      */
     transformIndexHtml(url: string, html: string, originalUrl?: string): Promise<string>;
-    /**
-     * Util for transforming a file with esbuild.
-     * Can be useful for certain plugins.
-     *
-     * @deprecated import `transformWithEsbuild` from `vite` instead
-     */
-    transformWithEsbuild(code: string, filename: string, options?: EsbuildTransformOptions, inMap?: object): Promise<ESBuildTransformResult>;
     /**
      * Transform module code into SSR format.
-     * @experimental
      */
     ssrTransform(code: string, inMap: SourceMap | null, url: string): Promise<TransformResult | null>;
     /**
@@ -2227,8 +2290,8 @@ export declare interface ViteDevServer {
      */
     restart(forceOptimize?: boolean): Promise<void>;
     /* Excluded from this release type: _optimizedDeps */
+    /* Excluded from this release type: _importGlobMap */
     /* Excluded from this release type: _ssrExternals */
-    /* Excluded from this release type: _globImporters */
     /* Excluded from this release type: _restartPromise */
     /* Excluded from this release type: _forceOptimizeOnRestart */
     /* Excluded from this release type: _pendingRequests */
@@ -2270,8 +2333,10 @@ export declare interface WatchOptions {
     cwd?: string
 
     /**
-     *  If set to true then the strings passed to .watch() and .add() are treated as literal path
-     *  names, even if they look like globs. Default: false.
+     * If set to true then the strings passed to .watch() and .add() are treated as literal path
+     * names, even if they look like globs.
+     *
+     * @default false
      */
     disableGlobbing?: boolean
 
@@ -2336,7 +2401,7 @@ export declare interface WatchOptions {
     awaitWriteFinish?: AwaitWriteFinishOptions | boolean
 }
 
-export declare class WebSocket extends EventEmitter {
+declare class WebSocket_2 extends EventEmitter {
     /** The connection is not yet open. */
     static readonly CONNECTING: 0
     /** The connection is open and ready to communicate. */
@@ -2354,10 +2419,10 @@ export declare class WebSocket extends EventEmitter {
     readonly protocol: string
     /** The current state of the connection */
     readonly readyState:
-    | typeof WebSocket.CONNECTING
-    | typeof WebSocket.OPEN
-    | typeof WebSocket.CLOSING
-    | typeof WebSocket.CLOSED
+    | typeof WebSocket_2.CONNECTING
+    | typeof WebSocket_2.OPEN
+    | typeof WebSocket_2.CLOSING
+    | typeof WebSocket_2.CLOSED
     readonly url: string
 
     /** The connection is not yet open. */
@@ -2369,20 +2434,20 @@ export declare class WebSocket extends EventEmitter {
     /** The connection is closed. */
     readonly CLOSED: 3
 
-    onopen: ((event: WebSocket.Event) => void) | null
-    onerror: ((event: WebSocket.ErrorEvent) => void) | null
-    onclose: ((event: WebSocket.CloseEvent) => void) | null
-    onmessage: ((event: WebSocket.MessageEvent) => void) | null
+    onopen: ((event: WebSocket_2.Event) => void) | null
+    onerror: ((event: WebSocket_2.ErrorEvent) => void) | null
+    onclose: ((event: WebSocket_2.CloseEvent) => void) | null
+    onmessage: ((event: WebSocket_2.MessageEvent) => void) | null
 
     constructor(address: null)
     constructor(
     address: string | URL_2,
-    options?: WebSocket.ClientOptions | ClientRequestArgs
+    options?: WebSocket_2.ClientOptions | ClientRequestArgs
     )
     constructor(
     address: string | URL_2,
     protocols?: string | string[],
-    options?: WebSocket.ClientOptions | ClientRequestArgs
+    options?: WebSocket_2.ClientOptions | ClientRequestArgs
     )
 
     close(code?: number, data?: string | Buffer): void
@@ -2416,146 +2481,146 @@ export declare class WebSocket extends EventEmitter {
     // HTML5 WebSocket events
     addEventListener(
     method: 'message',
-    cb: (event: WebSocket.MessageEvent) => void,
-    options?: WebSocket.EventListenerOptions
+    cb: (event: WebSocket_2.MessageEvent) => void,
+    options?: WebSocket_2.EventListenerOptions
     ): void
     addEventListener(
     method: 'close',
-    cb: (event: WebSocket.CloseEvent) => void,
-    options?: WebSocket.EventListenerOptions
+    cb: (event: WebSocket_2.CloseEvent) => void,
+    options?: WebSocket_2.EventListenerOptions
     ): void
     addEventListener(
     method: 'error',
-    cb: (event: WebSocket.ErrorEvent) => void,
-    options?: WebSocket.EventListenerOptions
+    cb: (event: WebSocket_2.ErrorEvent) => void,
+    options?: WebSocket_2.EventListenerOptions
     ): void
     addEventListener(
     method: 'open',
-    cb: (event: WebSocket.Event) => void,
-    options?: WebSocket.EventListenerOptions
+    cb: (event: WebSocket_2.Event) => void,
+    options?: WebSocket_2.EventListenerOptions
     ): void
 
     removeEventListener(
     method: 'message',
-    cb: (event: WebSocket.MessageEvent) => void
+    cb: (event: WebSocket_2.MessageEvent) => void
     ): void
     removeEventListener(
     method: 'close',
-    cb: (event: WebSocket.CloseEvent) => void
+    cb: (event: WebSocket_2.CloseEvent) => void
     ): void
     removeEventListener(
     method: 'error',
-    cb: (event: WebSocket.ErrorEvent) => void
+    cb: (event: WebSocket_2.ErrorEvent) => void
     ): void
     removeEventListener(
     method: 'open',
-    cb: (event: WebSocket.Event) => void
+    cb: (event: WebSocket_2.Event) => void
     ): void
 
     // Events
     on(
     event: 'close',
-    listener: (this: WebSocket, code: number, reason: Buffer) => void
+    listener: (this: WebSocket_2, code: number, reason: Buffer) => void
     ): this
-    on(event: 'error', listener: (this: WebSocket, err: Error) => void): this
+    on(event: 'error', listener: (this: WebSocket_2, err: Error) => void): this
     on(
     event: 'upgrade',
-    listener: (this: WebSocket, request: IncomingMessage) => void
+    listener: (this: WebSocket_2, request: IncomingMessage) => void
     ): this
     on(
     event: 'message',
     listener: (
-    this: WebSocket,
-    data: WebSocket.RawData,
+    this: WebSocket_2,
+    data: WebSocket_2.RawData,
     isBinary: boolean
     ) => void
     ): this
-    on(event: 'open', listener: (this: WebSocket) => void): this
+    on(event: 'open', listener: (this: WebSocket_2) => void): this
     on(
     event: 'ping' | 'pong',
-    listener: (this: WebSocket, data: Buffer) => void
+    listener: (this: WebSocket_2, data: Buffer) => void
     ): this
     on(
     event: 'unexpected-response',
     listener: (
-    this: WebSocket,
+    this: WebSocket_2,
     request: ClientRequest,
     response: IncomingMessage
     ) => void
     ): this
     on(
     event: string | symbol,
-    listener: (this: WebSocket, ...args: any[]) => void
+    listener: (this: WebSocket_2, ...args: any[]) => void
     ): this
 
     once(
     event: 'close',
-    listener: (this: WebSocket, code: number, reason: Buffer) => void
+    listener: (this: WebSocket_2, code: number, reason: Buffer) => void
     ): this
-    once(event: 'error', listener: (this: WebSocket, err: Error) => void): this
+    once(event: 'error', listener: (this: WebSocket_2, err: Error) => void): this
     once(
     event: 'upgrade',
-    listener: (this: WebSocket, request: IncomingMessage) => void
+    listener: (this: WebSocket_2, request: IncomingMessage) => void
     ): this
     once(
     event: 'message',
     listener: (
-    this: WebSocket,
-    data: WebSocket.RawData,
+    this: WebSocket_2,
+    data: WebSocket_2.RawData,
     isBinary: boolean
     ) => void
     ): this
-    once(event: 'open', listener: (this: WebSocket) => void): this
+    once(event: 'open', listener: (this: WebSocket_2) => void): this
     once(
     event: 'ping' | 'pong',
-    listener: (this: WebSocket, data: Buffer) => void
+    listener: (this: WebSocket_2, data: Buffer) => void
     ): this
     once(
     event: 'unexpected-response',
     listener: (
-    this: WebSocket,
+    this: WebSocket_2,
     request: ClientRequest,
     response: IncomingMessage
     ) => void
     ): this
     once(
     event: string | symbol,
-    listener: (this: WebSocket, ...args: any[]) => void
+    listener: (this: WebSocket_2, ...args: any[]) => void
     ): this
 
     off(
     event: 'close',
-    listener: (this: WebSocket, code: number, reason: Buffer) => void
+    listener: (this: WebSocket_2, code: number, reason: Buffer) => void
     ): this
-    off(event: 'error', listener: (this: WebSocket, err: Error) => void): this
+    off(event: 'error', listener: (this: WebSocket_2, err: Error) => void): this
     off(
     event: 'upgrade',
-    listener: (this: WebSocket, request: IncomingMessage) => void
+    listener: (this: WebSocket_2, request: IncomingMessage) => void
     ): this
     off(
     event: 'message',
     listener: (
-    this: WebSocket,
-    data: WebSocket.RawData,
+    this: WebSocket_2,
+    data: WebSocket_2.RawData,
     isBinary: boolean
     ) => void
     ): this
-    off(event: 'open', listener: (this: WebSocket) => void): this
+    off(event: 'open', listener: (this: WebSocket_2) => void): this
     off(
     event: 'ping' | 'pong',
-    listener: (this: WebSocket, data: Buffer) => void
+    listener: (this: WebSocket_2, data: Buffer) => void
     ): this
     off(
     event: 'unexpected-response',
     listener: (
-    this: WebSocket,
+    this: WebSocket_2,
     request: ClientRequest,
     response: IncomingMessage
     ) => void
     ): this
     off(
     event: string | symbol,
-    listener: (this: WebSocket, ...args: any[]) => void
+    listener: (this: WebSocket_2, ...args: any[]) => void
     ): this
 
     addListener(
@@ -2569,7 +2634,7 @@ export declare class WebSocket extends EventEmitter {
     ): this
     addListener(
     event: 'message',
-    listener: (data: WebSocket.RawData, isBinary: boolean) => void
+    listener: (data: WebSocket_2.RawData, isBinary: boolean) => void
     ): this
     addListener(event: 'open', listener: () => void): this
     addListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this
@@ -2590,7 +2655,7 @@ export declare class WebSocket extends EventEmitter {
     ): this
     removeListener(
     event: 'message',
-    listener: (data: WebSocket.RawData, isBinary: boolean) => void
+    listener: (data: WebSocket_2.RawData, isBinary: boolean) => void
     ): this
     removeListener(event: 'open', listener: () => void): this
     removeListener(event: 'ping' | 'pong', listener: (data: Buffer) => void): this
@@ -2604,28 +2669,28 @@ export declare class WebSocket extends EventEmitter {
     ): this
 }
 
-export declare namespace WebSocket {
+declare namespace WebSocket_2 {
     /**
      * Data represents the raw message payload received over the WebSocket.
      */
-    export type RawData = Buffer | ArrayBuffer | Buffer[]
+    type RawData = Buffer | ArrayBuffer | Buffer[]
 
     /**
      * Data represents the message payload received over the WebSocket.
      */
-    export type Data = string | Buffer | ArrayBuffer | Buffer[]
+    type Data = string | Buffer | ArrayBuffer | Buffer[]
 
     /**
      * CertMeta represents the accepted types for certificate & key data.
      */
-    export type CertMeta = string | string[] | Buffer | Buffer[]
+    type CertMeta = string | string[] | Buffer | Buffer[]
 
     /**
      * VerifyClientCallbackSync is a synchronous callback used to inspect the
      * incoming message. The return value (boolean) of the function determines
      * whether or not to accept the handshake.
      */
-    export type VerifyClientCallbackSync = (info: {
+    type VerifyClientCallbackSync = (info: {
         origin: string
         secure: boolean
         req: IncomingMessage
@@ -2636,7 +2701,7 @@ export declare namespace WebSocket {
      * incoming message. The return value (boolean) of the function determines
      * whether or not to accept the handshake.
      */
-    export type VerifyClientCallbackAsync = (
+    type VerifyClientCallbackAsync = (
     info: { origin: string; secure: boolean; req: IncomingMessage },
     callback: (
     res: boolean,
@@ -2646,7 +2711,7 @@ export declare namespace WebSocket {
     ) => void
     ) => void
 
-    export interface ClientOptions extends SecureContextOptions {
+    interface ClientOptions extends SecureContextOptions {
         protocol?: string | undefined
         followRedirects?: boolean | undefined
         generateMask?(mask: Buffer): void
@@ -2666,7 +2731,7 @@ export declare namespace WebSocket {
         skipUTF8Validation?: boolean | undefined
     }
 
-    export interface PerMessageDeflateOptions {
+    interface PerMessageDeflateOptions {
         serverNoContextTakeover?: boolean | undefined
         clientNoContextTakeover?: boolean | undefined
         serverMaxWindowBits?: number | undefined
@@ -2689,19 +2754,19 @@ export declare namespace WebSocket {
         concurrencyLimit?: number | undefined
     }
 
-    export interface Event {
+    interface Event {
         type: string
         target: WebSocket
     }
 
-    export interface ErrorEvent {
+    interface ErrorEvent {
         error: any
         message: string
         type: string
         target: WebSocket
     }
 
-    export interface CloseEvent {
+    interface CloseEvent {
         wasClean: boolean
         code: number
         reason: string
@@ -2709,17 +2774,17 @@ export declare namespace WebSocket {
         target: WebSocket
     }
 
-    export interface MessageEvent {
+    interface MessageEvent {
         data: Data
         type: string
         target: WebSocket
     }
 
-    export interface EventListenerOptions {
+    interface EventListenerOptions {
         once?: boolean | undefined
     }
 
-    export interface ServerOptions {
+    interface ServerOptions {
         host?: string | undefined
         port?: number | undefined
         backlog?: number | undefined
@@ -2741,14 +2806,14 @@ export declare namespace WebSocket {
         WebSocket?: typeof WebSocket.WebSocket | undefined
     }
 
-    export interface AddressInfo {
+    interface AddressInfo {
         address: string
         family: string
         port: number
     }
 
     // WebSocket Server
-    export class Server<T extends WebSocket = WebSocket> extends EventEmitter {
+    class Server<T extends WebSocket = WebSocket> extends EventEmitter {
         options: ServerOptions
         path: string
         clients: Set<T>
@@ -2840,20 +2905,21 @@ export declare namespace WebSocket {
     }
 
     const WebSocketServer: typeof Server
-    export interface WebSocketServer extends Server {} // tslint:disable-line no-empty-interface
+    interface WebSocketServer extends Server {} // tslint:disable-line no-empty-interface
     const WebSocket: typeof WebSocketAlias
-    export interface WebSocket extends WebSocketAlias {} // tslint:disable-line no-empty-interface
+    interface WebSocket extends WebSocketAlias {} // tslint:disable-line no-empty-interface
 
     // WebSocket stream
-    export function createWebSocketStream(
+    function createWebSocketStream(
     websocket: WebSocket,
     options?: DuplexOptions
     ): Duplex
 }
+export { WebSocket_2 as WebSocket }
 
-export declare const WebSocketAlias: typeof WebSocket;
+export declare const WebSocketAlias: typeof WebSocket_2;
 
-export declare interface WebSocketAlias extends WebSocket {}
+export declare interface WebSocketAlias extends WebSocket_2 {}
 
 export declare interface WebSocketClient {
     /**
@@ -2868,7 +2934,7 @@ export declare interface WebSocketClient {
      * The raw WebSocket instance
      * @advanced
      */
-    socket: WebSocket;
+    socket: WebSocket_2;
 }
 
 export declare type WebSocketCustomListener<T> = (data: T, client: WebSocketClient) => void;
@@ -2893,13 +2959,13 @@ export declare interface WebSocketServer {
     /**
      * Handle custom event emitted by `import.meta.hot.send`
      */
-    on: WebSocket.Server['on'] & {
+    on: WebSocket_2.Server['on'] & {
         <T extends string>(event: T, listener: WebSocketCustomListener<InferCustomEventPayload<T>>): void;
     };
     /**
      * Unregister event listener.
      */
-    off: WebSocket.Server['off'] & {
+    off: WebSocket_2.Server['off'] & {
         (event: string, listener: Function): void;
     };
 }