vite 2.9.0-beta.9 → 2.9.2

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('events');
-var index = require('./chunks/dep-f5b7cdd7.js');
+var index = require('./chunks/dep-e7afa13e.js');
 var perf_hooks = require('perf_hooks');
 require('fs');
 require('path');
@@ -683,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-f5b7cdd7.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-e7afa13e.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -721,7 +721,7 @@ cli
     .command('build [root]', 'build for production')
     .option('--target <target>', `[string] transpile target (default: 'modules')`)
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
-    .option('--assetsDir <dir>', `[string] directory under outDir to place assets in (default: _assets)`)
+    .option('--assetsDir <dir>', `[string] directory under outDir to place assets in (default: assets)`)
     .option('--assetsInlineLimit <number>', `[number] static asset base64 inline threshold in bytes (default: 4096)`)
     .option('--ssr [entry]', `[string] build specified entry for server-side rendering`)
     .option('--sourcemap', `[boolean] output source maps for build (default: false)`)
@@ -732,7 +732,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-f5b7cdd7.js'); }).then(function (n) { return n.build$1; });
+    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-e7afa13e.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -755,7 +755,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-f5b7cdd7.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-e7afa13e.js'); }).then(function (n) { return n.index; });
     try {
         const config = await index.resolveConfig({
             root,
@@ -778,7 +778,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-f5b7cdd7.js'); }).then(function (n) { return n.preview$1; });
+    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-e7afa13e.js'); }).then(function (n) { return n.preview$1; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -27,7 +27,7 @@ import type { PartialResolvedId } from 'rollup';
 import type { Plugin as Plugin_2 } from 'rollup';
 import type { PluginContext } from 'rollup';
 import type { PluginHooks } from 'rollup';
-import type * as Postcss from 'postcss';
+import type * as PostCSS from 'postcss';
 import type { ResolveIdResult } from 'rollup';
 import type { RollupError } from 'rollup';
 import type { RollupOptions } from 'rollup';
@@ -35,8 +35,8 @@ import type { RollupOutput } from 'rollup';
 import type { RollupWatcher } from 'rollup';
 import type { SecureContextOptions } from 'tls';
 import type { Server } from 'http';
-import type { Server as Server_2 } from 'net';
-import type { Server as Server_3 } from 'https';
+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';
@@ -48,8 +48,6 @@ import type { TransformResult as TransformResult_3 } from 'rollup';
 import type * as url from 'url';
 import type { URL as URL_2 } from 'url';
 import type { WatcherOptions } from 'rollup';
-import type { WebSocket as WebSocket_2 } from 'ws';
-import { WebSocketServer as WebSocketServer_2 } from 'ws';
 import type { ZlibOptions } from 'zlib';
 
 export declare interface Alias {
@@ -484,8 +482,8 @@ export declare interface CSSOptions {
      */
     modules?: CSSModulesOptions | false;
     preprocessorOptions?: Record<string, any>;
-    postcss?: string | (Postcss.ProcessOptions & {
-        plugins?: Postcss.Plugin[];
+    postcss?: string | (PostCSS.ProcessOptions & {
+        plugins?: PostCSS.Plugin[];
     });
     /**
      * Enables css sourcemaps during dev
@@ -495,6 +493,13 @@ export declare interface CSSOptions {
     devSourcemap?: boolean;
 }
 
+export declare interface CustomEventMap {
+    'vite:beforeUpdate': UpdatePayload
+    'vite:beforePrune': PrunePayload
+    'vite:beforeFullReload': FullReloadPayload
+    'vite:error': ErrorPayload
+}
+
 export declare interface CustomPayload {
     type: 'custom'
     event: string
@@ -588,6 +593,12 @@ export declare interface DepOptimizationOptions {
      * @experimental
      */
     extensions?: string[];
+    /**
+     * Disables dependencies optimizations
+     * @default false
+     * @experimental
+     */
+    disabled?: boolean;
 }
 
 export declare interface DepOptimizationProcessing {
@@ -755,7 +766,7 @@ export declare interface HmrContext {
 export declare interface HmrOptions {
     protocol?: string;
     host?: string;
-    port?: number | false;
+    port?: number;
     clientPort?: number;
     path?: string;
     timeout?: number;
@@ -1030,6 +1041,9 @@ export declare type IndexHtmlTransformResult = string | HtmlTagDescriptor[] | {
     tags: HtmlTagDescriptor[];
 };
 
+export declare type InferCustomEventPayload<T extends string> =
+T extends keyof CustomEventMap ? CustomEventMap[T] : any
+
 export declare interface InlineConfig extends UserConfig {
     configFile?: string | false;
     envFile?: false;
@@ -1175,7 +1189,7 @@ export declare class ModuleNode {
     importers: Set<ModuleNode>;
     importedModules: Set<ModuleNode>;
     acceptedHmrDeps: Set<ModuleNode>;
-    isSelfAccepting: boolean;
+    isSelfAccepting?: boolean;
     transformResult: TransformResult | null;
     ssrTransformResult: TransformResult | null;
     ssrModule: Record<string, any> | null;
@@ -1392,7 +1406,7 @@ export declare interface PreviewServer {
 /**
  * @deprecated Use `server.printUrls()` instead
  */
-export declare function printHttpServerUrls(server: Server_2, config: ResolvedConfig): void;
+export declare function printHttpServerUrls(server: Server_3, config: ResolvedConfig): void;
 
 export declare interface ProxyOptions extends HttpProxy.ServerOptions {
     /**
@@ -2708,7 +2722,7 @@ export declare namespace WebSocket {
         host?: string | undefined
         port?: number | undefined
         backlog?: number | undefined
-        server?: Server | Server_3 | undefined
+        server?: Server | Server_2 | undefined
         verifyClient?:
         | VerifyClientCallbackAsync
         | VerifyClientCallbackSync
@@ -2853,7 +2867,7 @@ export declare interface WebSocketClient {
      * The raw WebSocket instance
      * @advanced
      */
-    socket: WebSocket_2;
+    socket: WebSocket;
 }
 
 export declare type WebSocketCustomListener<T> = (data: T, client: WebSocketClient) => void;
@@ -2870,7 +2884,7 @@ export declare interface WebSocketServer {
     /**
      * Send custom event
      */
-    send(event: string, payload?: CustomPayload['data']): void;
+    send<T extends string>(event: T, payload?: InferCustomEventPayload<T>): void;
     /**
      * Disconnect all clients and terminate the server.
      */
@@ -2878,14 +2892,14 @@ export declare interface WebSocketServer {
     /**
      * Handle custom event emitted by `import.meta.hot.send`
      */
-    on: WebSocketServer_2['on'] & {
-        (event: string, listener: WebSocketCustomListener<any>): void;
+    on: WebSocket.Server['on'] & {
+        <T extends string>(event: T, listener: WebSocketCustomListener<InferCustomEventPayload<T>>): void;
     };
     /**
      * Unregister event listener.
      */
-    off: WebSocketServer_2['off'] & {
-        (event: string, listener: WebSocketCustomListener<any>): void;
+    off: WebSocket.Server['off'] & {
+        (event: string, listener: Function): void;
     };
 }
 

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./chunks/dep-f5b7cdd7.js');
+var index = require('./chunks/dep-e7afa13e.js');
 require('fs');
 require('path');
 require('tty');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.9.0-beta.9",
+  "version": "2.9.2",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -53,11 +53,11 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.1.2",
-    "@babel/parser": "^7.17.8",
+    "@babel/parser": "^7.17.9",
     "@babel/types": "^7.17.0",
     "@jridgewell/trace-mapping": "^0.3.4",
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^21.0.2",
+    "@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",
@@ -74,7 +74,7 @@
     "@types/node": "^16.11.26",
     "@types/resolve": "^1.20.1",
     "@types/sass": "~1.43.1",
-    "@types/stylus": "^0.48.36",
+    "@types/stylus": "^0.48.37",
     "@types/ws": "^8.5.3",
     "@vue/compiler-dom": "^3.2.31",
     "acorn": "^8.7.0",
@@ -88,7 +88,7 @@
     "debug": "^4.3.4",
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.10.4",
+    "es-module-lexer": "^0.10.5",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
@@ -96,15 +96,15 @@
     "json5": "^2.2.1",
     "launch-editor-middleware": "^2.3.0",
     "magic-string": "^0.26.1",
-    "micromatch": "^4.0.4",
+    "micromatch": "^4.0.5",
     "mrmime": "^1.0.0",
-    "node-forge": "^1.3.0",
+    "node-forge": "^1.3.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
     "periscopic": "^2.0.3",
     "picocolors": "^1.0.0",
-    "postcss-import": "^14.0.2",
-    "postcss-load-config": "^3.1.3",
+    "postcss-import": "^14.1.0",
+    "postcss-load-config": "^3.1.4",
     "postcss-modules": "^4.3.1",
     "resolve.exports": "^1.1.0",
     "rollup-plugin-license": "^2.6.1",
@@ -113,7 +113,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
     "terser": "^5.12.1",
-    "tsconfck": "^1.2.1",
+    "tsconfck": "^1.2.2",
     "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'
@@ -15,7 +9,7 @@ import '@vite/env'
 declare const __BASE__: string
 declare const __HMR_PROTOCOL__: string
 declare const __HMR_HOSTNAME__: string
-declare const __HMR_PORT__: string | false
+declare const __HMR_PORT__: string
 declare const __HMR_TIMEOUT__: number
 declare const __HMR_ENABLE_OVERLAY__: boolean
 
@@ -24,10 +18,7 @@ console.log('[vite] connecting...')
 // use server configuration, then fallback to inference
 const socketProtocol =
   __HMR_PROTOCOL__ || (location.protocol === 'https:' ? 'wss' : 'ws')
-const socketHost = __HMR_PORT__
-  ? `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`
-  : `${__HMR_HOSTNAME__ || location.hostname}`
-
+const socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`
 const socket = new WebSocket(`${socketProtocol}://${socketHost}`, 'vite-hmr')
 const base = __BASE__ || '/'
 const messageBuffer: string[] = []
@@ -103,7 +94,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':
@@ -156,19 +147,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)
@@ -391,9 +372,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, {})
   }
@@ -434,12 +413,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))
@@ -460,10 +439,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)
     },
@@ -479,7 +459,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)
@@ -489,7 +469,7 @@ export const createHotContext = (ownerPath: string) => {
       addToMap(newListeners)
     },
 
-    send: (event: string, data?: any) => {
+    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,48 +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
-    }
-
-    send(event: string, data?: any): void
-  }
+  readonly hot?: import('./hot').ViteHotContext
 
   readonly env: ImportMetaEnv
 
@@ -77,7 +36,7 @@ interface ImportMeta {
 }
 
 interface ImportMetaEnv {
-  [key: string]: string | boolean | undefined
+  [key: string]: any
   BASE_URL: string
   MODE: string
   DEV: boolean