vite 3.0.7 → 3.1.0-beta.0

package/dist/node/index.d.ts

@@ -21,6 +21,7 @@ import type { LoadResult } from 'rollup';
 import type { ModuleFormat } from 'rollup';
 import type { ModuleInfo } from 'rollup';
 import type * as net from 'node:net';
+import type { ObjectHook } from 'rollup';
 import type { OutgoingHttpHeaders } from 'node:http';
 import type { OutputBundle } from 'rollup';
 import type { OutputChunk } from 'rollup';
@@ -846,6 +847,8 @@ export declare type HMRPayload =
 | ErrorPayload
 | PrunePayload
 
+export declare type HookHandler<T> = T extends ObjectHook<infer H> ? H : T;
+
 export declare interface HtmlTagDescriptor {
     tag: string;
     attrs?: Record<string, string | boolean | undefined>;
@@ -894,7 +897,7 @@ export declare namespace HttpProxy {
          * Used for proxying regular HTTP(S) requests
          * @param req - Client request.
          * @param res - Client response.
-         * @param options - Additionnal options.
+         * @param options - Additional options.
          */
         web(
         req: http.IncomingMessage,
@@ -1088,7 +1091,9 @@ export declare namespace HttpProxy {
 
 export declare interface ImportGlobEagerFunction {
     /**
-     * 1. No generic provided, infer the type from `as`
+     * Eagerly import a list of files with a glob pattern.
+     *
+     * Overload 1: No generic provided, infer the type from `as`
      */
     <
     As extends string,
@@ -1098,7 +1103,9 @@ export declare interface ImportGlobEagerFunction {
     options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>
     ): Record<string, T>
     /**
-     * 2. Module generic provided
+     * Eagerly import a list of files with a glob pattern.
+     *
+     * Overload 2: Module generic provided
      */
     <M>(
     glob: string | string[],
@@ -1108,7 +1115,9 @@ export declare interface ImportGlobEagerFunction {
 
 export declare interface ImportGlobFunction {
     /**
-     * 1. No generic provided, infer the type from `eager` and `as`
+     * Import a list of files with a glob pattern.
+     *
+     * Overload 1: No generic provided, infer the type from `eager` and `as`
      */
     <
     Eager extends boolean,
@@ -1121,14 +1130,18 @@ export declare interface ImportGlobFunction {
     ? Record<string, T>
     : Record<string, () => Promise<T>>
     /**
-     * 2. Module generic provided, infer the type from `eager: false`
+     * Import a list of files with a glob pattern.
+     *
+     * Overload 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`
+     * Import a list of files with a glob pattern.
+     *
+     * Overload 3: Module generic provided, infer the type from `eager: true`
      */
     <M>(
     glob: string | string[],
@@ -1493,11 +1506,11 @@ declare interface Plugin_2 extends Plugin_3 {
      * Note: User plugins are resolved before running this hook so injecting other
      * plugins inside  the `config` hook will have no effect.
      */
-    config?: (config: UserConfig, env: ConfigEnv) => UserConfig | null | void | Promise<UserConfig | null | void>;
+    config?: ObjectHook<(config: UserConfig, env: ConfigEnv) => UserConfig | null | void | Promise<UserConfig | null | void>>;
     /**
      * Use this hook to read and store the final resolved vite config.
      */
-    configResolved?: (config: ResolvedConfig) => void | Promise<void>;
+    configResolved?: ObjectHook<(config: ResolvedConfig) => void | Promise<void>>;
     /**
      * Configure the vite server. The hook receives the {@link ViteDevServer}
      * instance. This can also be used to store a reference to the server
@@ -1507,7 +1520,7 @@ declare interface Plugin_2 extends Plugin_3 {
      * can return a post hook that will be called after internal middlewares
      * are applied. Hook can be async functions and will be called in series.
      */
-    configureServer?: ServerHook;
+    configureServer?: ObjectHook<ServerHook>;
     /**
      * Configure the preview server. The hook receives the connect server and
      * its underlying http server.
@@ -1516,7 +1529,7 @@ declare interface Plugin_2 extends Plugin_3 {
      * 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;
+    configurePreviewServer?: ObjectHook<PreviewServerHook>;
     /**
      * Transform index.html.
      * The hook receives the following arguments:
@@ -1548,22 +1561,22 @@ declare interface Plugin_2 extends Plugin_3 {
      * - If the hook doesn't return a value, the hmr update will be performed as
      *   normal.
      */
-    handleHotUpdate?(ctx: HmrContext): Array<ModuleNode> | void | Promise<Array<ModuleNode> | void>;
+    handleHotUpdate?: ObjectHook<(ctx: HmrContext) => Array<ModuleNode> | void | Promise<Array<ModuleNode> | void>>;
     /**
      * extend hooks with ssr flag
      */
-    resolveId?: (this: PluginContext, source: string, importer: string | undefined, options: {
+    resolveId?: ObjectHook<(this: PluginContext, source: string, importer: string | undefined, options: {
         custom?: CustomPluginOptions;
         ssr?: boolean;
         /* Excluded from this release type: scan */
         isEntry: boolean;
-    }) => Promise<ResolveIdResult> | ResolveIdResult;
-    load?: (this: PluginContext, id: string, options?: {
+    }) => Promise<ResolveIdResult> | ResolveIdResult>;
+    load?: ObjectHook<(this: PluginContext, id: string, options?: {
         ssr?: boolean;
-    }) => Promise<LoadResult> | LoadResult;
-    transform?: (this: TransformPluginContext, code: string, id: string, options?: {
+    }) => Promise<LoadResult> | LoadResult>;
+    transform?: ObjectHook<(this: TransformPluginContext, code: string, id: string, options?: {
         ssr?: boolean;
-    }) => Promise<TransformResult_2> | TransformResult_2;
+    }) => Promise<TransformResult_2> | TransformResult_2>;
 }
 export { Plugin_2 as Plugin }
 
@@ -1588,6 +1601,11 @@ export declare interface PluginContainer {
     close(): Promise<void>;
 }
 
+export declare interface PluginHookUtils {
+    getSortedPlugins: (hookName: keyof Plugin_2) => Plugin_2[];
+    getSortedPluginHooks: <K extends keyof Plugin_2>(hookName: K) => NonNullable<HookHandler<Plugin_2[K]>>[];
+}
+
 export declare type PluginOption = Plugin_2 | false | null | undefined | PluginOption[] | Promise<Plugin_2 | false | null | undefined | PluginOption[]>;
 
 /**
@@ -1694,7 +1712,7 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'asse
     worker: ResolveWorkerOptions;
     appType: AppType;
     experimental: ExperimentalOptions;
-}>;
+} & PluginHookUtils>;
 
 export declare interface ResolvedPreviewOptions extends PreviewOptions {
 }
@@ -1744,7 +1762,7 @@ export declare interface ResolverObject {
     resolveId: ResolverFunction
 }
 
-export declare interface ResolveWorkerOptions {
+export declare interface ResolveWorkerOptions extends PluginHookUtils {
     format: 'es' | 'iife';
     plugins: Plugin_2[];
     rollupOptions: RollupOptions;
@@ -2566,7 +2584,7 @@ export declare interface ViteDevServer {
     /**
      * Transform module code into SSR format.
      */
-    ssrTransform(code: string, inMap: SourceMap | null, url: string): Promise<TransformResult | null>;
+    ssrTransform(code: string, inMap: SourceMap | null, url: string, originalCode?: string): Promise<TransformResult | null>;
     /**
      * Load a given URL as an instantiated module for SSR.
      */
@@ -3254,7 +3272,7 @@ export declare interface WebSocketServer {
      */
     clients: Set<WebSocketClient>;
     /**
-     * Boardcast events to all clients
+     * Broadcast events to all clients
      */
     send(payload: HMRPayload): void;
     /**

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-0f13c890.js';
+export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-34b4c4eb.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -26,13 +26,14 @@ import 'node:dns';
 import 'resolve';
 import 'crypto';
 import 'buffer';
+import 'node:buffer';
 import 'module';
+import 'worker_threads';
 import 'zlib';
 import 'https';
 import 'tls';
 import 'node:http';
 import 'node:https';
-import 'worker_threads';
 import 'querystring';
 import 'node:readline';
 import 'node:child_process';

package/dist/node-cjs/publicUtils.cjs

@@ -31,7 +31,7 @@ var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 
-var version = "3.0.7";
+var version = "3.1.0-beta.0";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(
@@ -3434,7 +3434,12 @@ function lookupFile(dir, formats, options) {
     for (const format of formats) {
         const fullPath = path__default.join(dir, format);
         if (fs__default.existsSync(fullPath) && fs__default.statSync(fullPath).isFile()) {
-            return options?.pathOnly ? fullPath : fs__default.readFileSync(fullPath, 'utf-8');
+            const result = options?.pathOnly
+                ? fullPath
+                : fs__default.readFileSync(fullPath, 'utf-8');
+            if (!options?.predicate || options.predicate(result)) {
+                return result;
+            }
         }
     }
     const parentDir = path__default.dirname(dir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.7",
+  "version": "3.1.0-beta.0",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -61,7 +61,7 @@
     "esbuild": "^0.14.47",
     "postcss": "^8.4.16",
     "resolve": "^1.22.1",
-    "rollup": ">=2.75.6 <2.77.0 || ~2.77.0"
+    "rollup": "~2.78.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -70,7 +70,7 @@
     "@ampproject/remapping": "^2.2.0",
     "@babel/parser": "^7.18.11",
     "@babel/types": "^7.18.10",
-    "@jridgewell/trace-mapping": "^0.3.14",
+    "@jridgewell/trace-mapping": "^0.3.15",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-dynamic-import-vars": "^1.4.4",
@@ -78,7 +78,6 @@
     "@rollup/plugin-node-resolve": "13.3.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@rollup/pluginutils": "^4.2.1",
-    "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.8.0",
     "cac": "^6.7.12",
     "chokidar": "^3.5.3",
@@ -90,24 +89,25 @@
     "debug": "^4.3.4",
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.10.5",
+    "es-module-lexer": "^1.0.3",
     "estree-walker": "^3.0.1",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
     "http-proxy": "^1.18.1",
     "json5": "^2.2.1",
-    "launch-editor-middleware": "^2.5.0",
+    "launch-editor-middleware": "^2.6.0",
     "magic-string": "^0.26.2",
     "micromatch": "^4.0.5",
-    "mlly": "^0.5.7",
+    "mlly": "^0.5.14",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
+    "parse5": "^7.0.0",
     "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
     "postcss-import": "^14.1.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-modules": "^4.3.1",
+    "postcss-modules": "^5.0.0",
     "resolve.exports": "^1.1.0",
     "rollup-plugin-license": "^2.8.1",
     "sirv": "^2.0.2",

package/src/client/client.ts

@@ -101,7 +101,7 @@ function setupWebSocket(
     }
 
     console.log(`[vite] server connection lost. polling for restart...`)
-    await waitForSuccessfulPing(hostAndPath)
+    await waitForSuccessfulPing(protocol, hostAndPath)
     location.reload()
   })
 
@@ -126,6 +126,7 @@ function cleanUrl(pathname: string): string {
 }
 
 let isFirstUpdate = true
+const outdatedLinkTags = new WeakSet<HTMLLinkElement>()
 
 async function handleMessage(payload: HMRPayload) {
   switch (payload.type) {
@@ -166,7 +167,10 @@ async function handleMessage(payload: HMRPayload) {
           // URL for the include check.
           const el = Array.from(
             document.querySelectorAll<HTMLLinkElement>('link')
-          ).find((e) => cleanUrl(e.href).includes(searchUrl))
+          ).find(
+            (e) =>
+              !outdatedLinkTags.has(e) && cleanUrl(e.href).includes(searchUrl)
+          )
           if (el) {
             const newPath = `${base}${searchUrl.slice(1)}${
               searchUrl.includes('?') ? '&' : '?'
@@ -182,6 +186,7 @@ async function handleMessage(payload: HMRPayload) {
             const removeOldEl = () => el.remove()
             newLinkTag.addEventListener('load', removeOldEl)
             newLinkTag.addEventListener('error', removeOldEl)
+            outdatedLinkTags.add(el)
             el.after(newLinkTag)
           }
           console.log(`[vite] css hot updated: ${searchUrl}`)
@@ -292,14 +297,22 @@ async function queueUpdate(p: Promise<(() => void) | undefined>) {
   }
 }
 
-async function waitForSuccessfulPing(hostAndPath: string, ms = 1000) {
+async function waitForSuccessfulPing(
+  socketProtocol: string,
+  hostAndPath: string,
+  ms = 1000
+) {
+  const pingHostProtocol = socketProtocol === 'wss' ? 'https' : 'http'
+
   // eslint-disable-next-line no-constant-condition
   while (true) {
     try {
       // A fetch on a websocket URL will return a successful promise with status 400,
       // but will reject a networking error.
       // When running on middleware mode, it returns status 426, and an cors error happens if mode is not no-cors
-      await fetch(`${location.protocol}//${hostAndPath}`, { mode: 'no-cors' })
+      await fetch(`${pingHostProtocol}://${hostAndPath}`, {
+        mode: 'no-cors'
+      })
       break
     } catch (e) {
       // wait ms before attempting to ping again

package/types/http-proxy.d.ts

@@ -57,7 +57,7 @@ export namespace HttpProxy {
      * Used for proxying regular HTTP(S) requests
      * @param req - Client request.
      * @param res - Client response.
-     * @param options - Additionnal options.
+     * @param options - Additional options.
      */
     web(
       req: http.IncomingMessage,

package/types/importGlob.d.ts

@@ -38,7 +38,9 @@ export interface KnownAsTypeMap {
 
 export interface ImportGlobFunction {
   /**
-   * 1. No generic provided, infer the type from `eager` and `as`
+   * Import a list of files with a glob pattern.
+   *
+   * Overload 1: No generic provided, infer the type from `eager` and `as`
    */
   <
     Eager extends boolean,
@@ -51,14 +53,18 @@ export interface ImportGlobFunction {
     ? Record<string, T>
     : Record<string, () => Promise<T>>
   /**
-   * 2. Module generic provided, infer the type from `eager: false`
+   * Import a list of files with a glob pattern.
+   *
+   * Overload 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`
+   * Import a list of files with a glob pattern.
+   *
+   * Overload 3: Module generic provided, infer the type from `eager: true`
    */
   <M>(
     glob: string | string[],
@@ -68,7 +74,9 @@ export interface ImportGlobFunction {
 
 export interface ImportGlobEagerFunction {
   /**
-   * 1. No generic provided, infer the type from `as`
+   * Eagerly import a list of files with a glob pattern.
+   *
+   * Overload 1: No generic provided, infer the type from `as`
    */
   <
     As extends string,
@@ -78,7 +86,9 @@ export interface ImportGlobEagerFunction {
     options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>
   ): Record<string, T>
   /**
-   * 2. Module generic provided
+   * Eagerly import a list of files with a glob pattern.
+   *
+   * Overload 2: Module generic provided
    */
   <M>(
     glob: string | string[],