vite 2.9.0-beta.1 → 2.9.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.9.0-beta.1",
+  "version": "2.9.0-beta.10",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -43,8 +43,8 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.14.14",
-    "postcss": "^8.4.6",
+    "esbuild": "^0.14.27",
+    "postcss": "^8.4.12",
     "resolve": "^1.22.0",
     "rollup": "^2.59.0"
   },
@@ -52,17 +52,17 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^2.1.0",
-    "@babel/parser": "^7.17.0",
+    "@ampproject/remapping": "^2.1.2",
+    "@babel/parser": "^7.17.8",
     "@babel/types": "^7.17.0",
-    "@jridgewell/trace-mapping": "^0.3.2",
+    "@jridgewell/trace-mapping": "^0.3.4",
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "^21.0.3",
     "@rollup/plugin-dynamic-import-vars": "^1.4.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@rollup/pluginutils": "^4.1.2",
+    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/pluginutils": "^4.2.0",
     "@types/convert-source-map": "^1.5.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/debug": "^4.1.7",
@@ -71,12 +71,12 @@
     "@types/less": "^3.0.3",
     "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.22",
+    "@types/node": "^16.11.26",
     "@types/resolve": "^1.20.1",
     "@types/sass": "~1.43.1",
     "@types/stylus": "^0.48.36",
-    "@types/ws": "^8.2.2",
-    "@vue/compiler-dom": "^3.2.30",
+    "@types/ws": "^8.5.3",
+    "@vue/compiler-dom": "^3.2.31",
     "acorn": "^8.7.0",
     "cac": "6.7.9",
     "chokidar": "^3.5.3",
@@ -85,34 +85,35 @@
     "convert-source-map": "^1.8.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.9.3",
+    "es-module-lexer": "^0.10.4",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
     "http-proxy": "^1.18.1",
-    "json5": "^2.2.0",
+    "json5": "^2.2.1",
     "launch-editor-middleware": "^2.3.0",
-    "magic-string": "^0.25.7",
-    "micromatch": "^4.0.4",
+    "magic-string": "^0.26.1",
+    "micromatch": "^4.0.5",
     "mrmime": "^1.0.0",
-    "node-forge": "^1.2.1",
+    "node-forge": "^1.3.0",
     "okie": "^1.0.1",
     "open": "^8.4.0",
     "periscopic": "^2.0.3",
     "picocolors": "^1.0.0",
-    "postcss-import": "^14.0.2",
+    "postcss-import": "^14.1.0",
     "postcss-load-config": "^3.1.3",
-    "postcss-modules": "^4.3.0",
+    "postcss-modules": "^4.3.1",
     "resolve.exports": "^1.1.0",
     "rollup-plugin-license": "^2.6.1",
     "sirv": "^2.0.2",
+    "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
-    "terser": "^5.10.0",
-    "tsconfck": "^1.2.0",
+    "terser": "^5.12.1",
+    "tsconfck": "^1.2.1",
     "tslib": "^2.3.1",
     "types": "link:./types",
     "ws": "^8.5.0"

package/src/client/client.ts

@@ -1,12 +1,6 @@
-import type {
-  ErrorPayload,
-  FullReloadPayload,
-  HMRPayload,
-  PrunePayload,
-  Update,
-  UpdatePayload
-} from 'types/hmrPayload'
-import type { CustomEventName } from 'types/customEvent'
+import type { ErrorPayload, HMRPayload, Update } from 'types/hmrPayload'
+import type { ViteHotContext } from 'types/hot'
+import type { InferCustomEventPayload } from 'types/customEvent'
 import { ErrorOverlay, overlayId } from './overlay'
 // eslint-disable-next-line node/no-missing-import
 import '@vite/env'
@@ -30,6 +24,7 @@ const socketHost = __HMR_PORT__
 
 const socket = new WebSocket(`${socketProtocol}://${socketHost}`, 'vite-hmr')
 const base = __BASE__ || '/'
+const messageBuffer: string[] = []
 
 function warnFailedFetch(err: Error, path: string | string[]) {
   if (!err.message.match('fetch')) {
@@ -59,9 +54,10 @@ async function handleMessage(payload: HMRPayload) {
   switch (payload.type) {
     case 'connected':
       console.log(`[vite] connected.`)
+      sendMessageBuffer()
       // proxy(nginx, docker) hmr ws maybe caused timeout,
       // so send ping package let ws keep alive.
-      setInterval(() => socket.send('ping'), __HMR_TIMEOUT__)
+      setInterval(() => socket.send('{"type":"ping"}'), __HMR_TIMEOUT__)
       break
     case 'update':
       notifyListeners('vite:beforeUpdate', payload)
@@ -101,7 +97,7 @@ async function handleMessage(payload: HMRPayload) {
       })
       break
     case 'custom': {
-      notifyListeners(payload.event as CustomEventName<any>, payload.data)
+      notifyListeners(payload.event, payload.data)
       break
     }
     case 'full-reload':
@@ -154,19 +150,9 @@ async function handleMessage(payload: HMRPayload) {
   }
 }
 
-function notifyListeners(
-  event: 'vite:beforeUpdate',
-  payload: UpdatePayload
-): void
-function notifyListeners(event: 'vite:beforePrune', payload: PrunePayload): void
-function notifyListeners(
-  event: 'vite:beforeFullReload',
-  payload: FullReloadPayload
-): void
-function notifyListeners(event: 'vite:error', payload: ErrorPayload): void
 function notifyListeners<T extends string>(
-  event: CustomEventName<T>,
-  data: any
+  event: T,
+  data: InferCustomEventPayload<T>
 ): void
 function notifyListeners(event: string, data: any): void {
   const cbs = customListenersMap.get(event)
@@ -361,6 +347,13 @@ async function fetchUpdate({ path, acceptedPath, timestamp }: Update) {
   }
 }
 
+function sendMessageBuffer() {
+  if (socket.readyState === 1) {
+    messageBuffer.forEach((msg) => socket.send(msg))
+    messageBuffer.length = 0
+  }
+}
+
 interface HotModule {
   id: string
   callbacks: HotCallback[]
@@ -382,9 +375,7 @@ const ctxToListenersMap = new Map<
   Map<string, ((data: any) => void)[]>
 >()
 
-// Just infer the return type for now
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export const createHotContext = (ownerPath: string) => {
+export function createHotContext(ownerPath: string): ViteHotContext {
   if (!dataMap.has(ownerPath)) {
     dataMap.set(ownerPath, {})
   }
@@ -425,12 +416,12 @@ export const createHotContext = (ownerPath: string) => {
     hotModulesMap.set(ownerPath, mod)
   }
 
-  const hot = {
+  const hot: ViteHotContext = {
     get data() {
       return dataMap.get(ownerPath)
     },
 
-    accept(deps: any, callback?: any) {
+    accept(deps?: any, callback?: any) {
       if (typeof deps === 'function' || !deps) {
         // self-accept: hot.accept(() => {})
         acceptDeps([ownerPath], ([mod]) => deps && deps(mod))
@@ -451,10 +442,11 @@ export const createHotContext = (ownerPath: string) => {
       )
     },
 
-    dispose(cb: (data: any) => void) {
+    dispose(cb) {
       disposeMap.set(ownerPath, cb)
     },
 
+    // @ts-expect-error untyped
     prune(cb: (data: any) => void) {
       pruneMap.set(ownerPath, cb)
     },
@@ -470,7 +462,7 @@ export const createHotContext = (ownerPath: string) => {
     },
 
     // custom events
-    on: (event: string, cb: (data: any) => void) => {
+    on(event, cb) {
       const addToMap = (map: Map<string, any[]>) => {
         const existing = map.get(event) || []
         existing.push(cb)
@@ -478,6 +470,11 @@ export const createHotContext = (ownerPath: string) => {
       }
       addToMap(customListenersMap)
       addToMap(newListeners)
+    },
+
+    send(event, data) {
+      messageBuffer.push(JSON.stringify({ type: 'custom', event, data }))
+      sendMessageBuffer()
     }
   }
 

package/types/customEvent.d.ts

@@ -1,5 +1,16 @@
-// See https://stackoverflow.com/a/63549561.
-export type CustomEventName<T extends string> = (T extends `vite:${T}`
-  ? never
-  : T) &
-  (`vite:${T}` extends T ? never : T)
+import type {
+  ErrorPayload,
+  FullReloadPayload,
+  PrunePayload,
+  UpdatePayload
+} from './hmrPayload'
+
+export interface CustomEventMap {
+  'vite:beforeUpdate': UpdatePayload
+  'vite:beforePrune': PrunePayload
+  'vite:beforeFullReload': FullReloadPayload
+  'vite:error': ErrorPayload
+}
+
+export type InferCustomEventPayload<T extends string> =
+  T extends keyof CustomEventMap ? CustomEventMap[T] : any

package/types/hot.d.ts

@@ -0,0 +1,25 @@
+import type { InferCustomEventPayload } from './customEvent'
+
+export interface ViteHotContext {
+  readonly data: any
+
+  accept(): void
+  accept(cb: (mod: any) => void): void
+  accept(dep: string, cb: (mod: any) => void): void
+  accept(deps: readonly string[], cb: (mods: any[]) => void): void
+
+  /**
+   * @deprecated
+   */
+  acceptDeps(): never
+
+  dispose(cb: (data: any) => void): void
+  decline(): void
+  invalidate(): void
+
+  on<T extends string>(
+    event: T,
+    cb: (payload: InferCustomEventPayload<T>) => void
+  ): void
+  send<T extends string>(event: T, data?: InferCustomEventPayload<T>): void
+}

package/types/importMeta.d.ts

@@ -20,46 +20,7 @@ interface GlobOptions {
 interface ImportMeta {
   url: string
 
-  readonly hot?: {
-    readonly data: any
-
-    accept(): void
-    accept(cb: (mod: any) => void): void
-    accept(dep: string, cb: (mod: any) => void): void
-    accept(deps: readonly string[], cb: (mods: any[]) => void): void
-
-    /**
-     * @deprecated
-     */
-    acceptDeps(): never
-
-    dispose(cb: (data: any) => void): void
-    decline(): void
-    invalidate(): void
-
-    on: {
-      (
-        event: 'vite:beforeUpdate',
-        cb: (payload: import('./hmrPayload').UpdatePayload) => void
-      ): void
-      (
-        event: 'vite:beforePrune',
-        cb: (payload: import('./hmrPayload').PrunePayload) => void
-      ): void
-      (
-        event: 'vite:beforeFullReload',
-        cb: (payload: import('./hmrPayload').FullReloadPayload) => void
-      ): void
-      (
-        event: 'vite:error',
-        cb: (payload: import('./hmrPayload').ErrorPayload) => void
-      ): void
-      <T extends string>(
-        event: import('./customEvent').CustomEventName<T>,
-        cb: (data: any) => void
-      ): void
-    }
-  }
+  readonly hot?: import('./hot').ViteHotContext
 
   readonly env: ImportMetaEnv
 

package/types/ws.d.ts

@@ -1,4 +1,7 @@
-// Type definitions for ws 8.2
+// Modified and inlined to avoid extra dependency
+// Source: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ws/index.d.ts
+
+// Type definitions for ws 8.5
 // Project: https://github.com/websockets/ws
 // Definitions by: Paul Loyd <https://github.com/loyd>
 //                 Margus Lamp <https://github.com/mlamp>
@@ -7,6 +10,7 @@
 //                 teidesu <https://github.com/teidesu>
 //                 Bartosz Wojtkowiak <https://github.com/wojtkowiak>
 //                 Kyle Hensel <https://github.com/k-yle>
+//                 Samuel Skeen <https://github.com/cwadrupldijjit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -40,6 +44,8 @@ declare class WebSocket extends EventEmitter {
   binaryType: 'nodebuffer' | 'arraybuffer' | 'fragments'
   readonly bufferedAmount: number
   readonly extensions: string
+  /** Indicates whether the websocket is paused */
+  readonly isPaused: boolean
   readonly protocol: string
   /** The current state of the connection */
   readonly readyState:
@@ -58,11 +64,12 @@ declare class WebSocket extends EventEmitter {
   /** The connection is closed. */
   readonly CLOSED: 3
 
-  onopen: (event: WebSocket.Event) => void
-  onerror: (event: WebSocket.ErrorEvent) => void
-  onclose: (event: WebSocket.CloseEvent) => void
-  onmessage: (event: WebSocket.MessageEvent) => void
+  onopen: ((event: WebSocket.Event) => void) | null
+  onerror: ((event: WebSocket.ErrorEvent) => void) | null
+  onclose: ((event: WebSocket.CloseEvent) => void) | null
+  onmessage: ((event: WebSocket.MessageEvent) => void) | null
 
+  constructor(address: null)
   constructor(
     address: string | URL,
     options?: WebSocket.ClientOptions | ClientRequestArgs
@@ -89,6 +96,18 @@ declare class WebSocket extends EventEmitter {
   ): void
   terminate(): void
 
+  /**
+   * Pause the websocket causing it to stop emitting events. Some events can still be
+   * emitted after this is called, until all buffered data is consumed. This method
+   * is a noop if the ready state is `CONNECTING` or `CLOSED`.
+   */
+  pause(): void
+  /**
+   * Make a paused socket resume emitting events. This method is a noop if the ready
+   * state is `CONNECTING` or `CLOSED`.
+   */
+  resume(): void
+
   // HTML5 WebSocket events
   addEventListener(
     method: 'message',
@@ -281,7 +300,7 @@ declare class WebSocket extends EventEmitter {
 }
 
 declare const WebSocketAlias: typeof WebSocket
-type WebSocketAlias = WebSocket
+interface WebSocketAlias extends WebSocket {} // tslint:disable-line no-empty-interface
 
 declare namespace WebSocket {
   /**
@@ -328,6 +347,7 @@ declare namespace WebSocket {
   interface ClientOptions extends SecureContextOptions {
     protocol?: string | undefined
     followRedirects?: boolean | undefined
+    generateMask?(mask: Buffer): void
     handshakeTimeout?: number | undefined
     maxRedirects?: number | undefined
     perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined
@@ -341,6 +361,7 @@ declare namespace WebSocket {
     checkServerIdentity?(servername: string, cert: CertMeta): boolean
     rejectUnauthorized?: boolean | undefined
     maxPayload?: number | undefined
+    skipUTF8Validation?: boolean | undefined
   }
 
   interface PerMessageDeflateOptions {
@@ -415,6 +436,7 @@ declare namespace WebSocket {
     perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined
     maxPayload?: number | undefined
     skipUTF8Validation?: boolean | undefined
+    WebSocket?: typeof WebSocket.WebSocket | undefined
   }
 
   interface AddressInfo {
@@ -424,10 +446,10 @@ declare namespace WebSocket {
   }
 
   // WebSocket Server
-  class Server extends EventEmitter {
+  class Server<T extends WebSocket = WebSocket> extends EventEmitter {
     options: ServerOptions
     path: string
-    clients: Set<WebSocket>
+    clients: Set<T>
 
     constructor(options?: ServerOptions, callback?: () => void)
 
@@ -437,56 +459,59 @@ declare namespace WebSocket {
       request: IncomingMessage,
       socket: Duplex,
       upgradeHead: Buffer,
-      callback: (client: WebSocket, request: IncomingMessage) => void
+      callback: (client: T, request: IncomingMessage) => void
     ): void
     shouldHandle(request: IncomingMessage): boolean | Promise<boolean>
 
     // Events
     on(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    on(event: 'error', cb: (this: Server, error: Error) => void): this
+    on(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     on(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
     ): this
-    on(event: 'close' | 'listening', cb: (this: Server) => void): this
+    on(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
     on(
       event: string | symbol,
-      listener: (this: Server, ...args: any[]) => void
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
 
     once(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    once(event: 'error', cb: (this: Server, error: Error) => void): this
+    once(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     once(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
+    ): this
+    once(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
+    once(
+      event: string | symbol,
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
-    once(event: 'close' | 'listening', cb: (this: Server) => void): this
-    once(event: string | symbol, listener: (...args: any[]) => void): this
 
     off(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    off(event: 'error', cb: (this: Server, error: Error) => void): this
+    off(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     off(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
     ): this
-    off(event: 'close' | 'listening', cb: (this: Server) => void): this
+    off(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
     off(
       event: string | symbol,
-      listener: (this: Server, ...args: any[]) => void
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
 
     addListener(
       event: 'connection',
-      cb: (client: WebSocket, request: IncomingMessage) => void
+      cb: (client: T, request: IncomingMessage) => void
     ): this
     addListener(event: 'error', cb: (err: Error) => void): this
     addListener(
@@ -499,7 +524,7 @@ declare namespace WebSocket {
       listener: (...args: any[]) => void
     ): this
 
-    removeListener(event: 'connection', cb: (client: WebSocket) => void): this
+    removeListener(event: 'connection', cb: (client: T) => void): this
     removeListener(event: 'error', cb: (err: Error) => void): this
     removeListener(
       event: 'headers',
@@ -513,9 +538,9 @@ declare namespace WebSocket {
   }
 
   const WebSocketServer: typeof Server
-  type WebSocketServer = Server
+  interface WebSocketServer extends Server {} // tslint:disable-line no-empty-interface
   const WebSocket: typeof WebSocketAlias
-  type WebSocket = WebSocketAlias
+  interface WebSocket extends WebSocketAlias {} // tslint:disable-line no-empty-interface
 
   // WebSocket stream
   function createWebSocketStream(
@@ -524,5 +549,5 @@ declare namespace WebSocket {
   ): Duplex
 }
 
-//export = WebSocket;
+// export = WebSocket
 export { WebSocket, WebSocketAlias }