vite 3.0.9 → 3.1.0-beta.2

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-0fc8e132.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-d66eb979.js';
 import { VERSION } from './constants.js';
 import 'node:fs';
 import 'node:path';
@@ -25,13 +25,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';
@@ -694,7 +695,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-0fc8e132.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-d66eb979.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -741,7 +742,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 import('./chunks/dep-0fc8e132.js').then(function (n) { return n.D; });
+    const { build } = await import('./chunks/dep-d66eb979.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -765,7 +766,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 import('./chunks/dep-0fc8e132.js').then(function (n) { return n.C; });
+    const { optimizeDeps } = await import('./chunks/dep-d66eb979.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -788,7 +789,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 import('./chunks/dep-0fc8e132.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-d66eb979.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-var version = "3.0.9";
+var version = "3.1.0-beta.2";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

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>;
@@ -1196,7 +1199,7 @@ export declare interface IndexHtmlTransformContext {
     originalUrl?: string;
 }
 
-export declare type IndexHtmlTransformHook = (html: string, ctx: IndexHtmlTransformContext) => IndexHtmlTransformResult | void | Promise<IndexHtmlTransformResult | void>;
+export declare type IndexHtmlTransformHook = (this: void, html: string, ctx: IndexHtmlTransformContext) => IndexHtmlTransformResult | void | Promise<IndexHtmlTransformResult | void>;
 
 export declare type IndexHtmlTransformResult = string | HtmlTagDescriptor[] | {
     html: string;
@@ -1494,7 +1497,7 @@ declare interface Plugin_2 extends Plugin_3 {
     /**
      * Apply the plugin only for serve or build, or on certain conditions.
      */
-    apply?: 'serve' | 'build' | ((config: UserConfig, env: ConfigEnv) => boolean);
+    apply?: 'serve' | 'build' | ((this: void, config: UserConfig, env: ConfigEnv) => boolean);
     /**
      * Modify vite config before it's resolved. The hook can either mutate the
      * passed-in config directly, or return a partial config object that will be
@@ -1503,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<(this: void, 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<(this: void, 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
@@ -1517,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.
@@ -1526,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:
@@ -1558,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<(this: void, 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 }
 
@@ -1598,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[]>;
 
 /**
@@ -1619,8 +1627,6 @@ export declare interface PreviewServer {
     httpServer: http.Server;
     /**
      * The resolved urls Vite prints on the CLI
-     *
-     * @experimental
      */
     resolvedUrls: ResolvedServerUrls;
     /**
@@ -1629,7 +1635,7 @@ export declare interface PreviewServer {
     printUrls(): void;
 }
 
-export declare type PreviewServerHook = (server: {
+export declare type PreviewServerHook = (this: void, server: {
     middlewares: Connect.Server;
     httpServer: http.Server;
 }) => (() => void) | void | Promise<(() => void) | void>;
@@ -1704,7 +1710,7 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'asse
     worker: ResolveWorkerOptions;
     appType: AppType;
     experimental: ExperimentalOptions;
-}>;
+} & PluginHookUtils>;
 
 export declare interface ResolvedPreviewOptions extends PreviewOptions {
 }
@@ -1754,7 +1760,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;
@@ -2025,7 +2031,7 @@ export declare interface SendOptions {
     map?: SourceMap | null;
 }
 
-export declare type ServerHook = (server: ViteDevServer) => (() => void) | void | Promise<(() => void) | void>;
+export declare type ServerHook = (this: void, server: ViteDevServer) => (() => void) | void | Promise<(() => void) | void>;
 
 export declare interface ServerOptions extends CommonServerOptions {
     /**
@@ -2353,6 +2359,10 @@ export declare interface Update {
     path: string
     acceptedPath: string
     timestamp: number
+    /**
+     * @experimental internal
+     */
+    explicitImportRequired?: boolean | undefined
 }
 
 export declare interface UpdatePayload {
@@ -2560,8 +2570,6 @@ export declare interface ViteDevServer {
     /**
      * The resolved urls Vite prints on the CLI. null in middleware mode or
      * before `server.listen` is called.
-     *
-     * @experimental
      */
     resolvedUrls: ResolvedServerUrls | null;
     /**
@@ -2576,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.
      */
@@ -2706,7 +2714,7 @@ export declare interface WatchOptions {
     ignorePermissionErrors?: boolean
 
     /**
-     * `true` if `useFsEvents` and `usePolling` are `false`). Automatically filters out artifacts
+     * `true` if `useFsEvents` and `usePolling` are `false`. Automatically filters out artifacts
      * that occur when using editors that use "atomic writes" instead of writing directly to the
      * source file. If a file is re-added within 100 ms of being deleted, Chokidar emits a `change`
      * event rather than `unlink` then `add`. If the default of 100 ms does not work well for you,

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-0fc8e132.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-d66eb979.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.9";
+var version = "3.1.0-beta.2";
 
 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.9",
+  "version": "3.1.0-beta.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -58,29 +58,28 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.14.47",
+    "esbuild": "^0.15.6",
     "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"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.18.11",
-    "@babel/types": "^7.18.10",
+    "@babel/parser": "^7.18.13",
+    "@babel/types": "^7.18.13",
     "@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",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "^8.3.4",
+    "@rollup/plugin-typescript": "^8.4.0",
     "@rollup/pluginutils": "^4.2.1",
-    "@vue/compiler-dom": "^3.2.37",
     "acorn": "^8.8.0",
-    "cac": "^6.7.12",
+    "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
     "connect-history-api-fallback": "^2.0.0",
@@ -96,20 +95,20 @@
     "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.12",
+    "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-import": "^15.0.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",
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",

package/src/client/client.ts

@@ -189,7 +189,7 @@ async function handleMessage(payload: HMRPayload) {
             outdatedLinkTags.add(el)
             el.after(newLinkTag)
           }
-          console.log(`[vite] css hot updated: ${searchUrl}`)
+          console.debug(`[vite] css hot updated: ${searchUrl}`)
         }
       })
       break
@@ -388,7 +388,12 @@ export function removeStyle(id: string): void {
   }
 }
 
-async function fetchUpdate({ path, acceptedPath, timestamp }: Update) {
+async function fetchUpdate({
+  path,
+  acceptedPath,
+  timestamp,
+  explicitImportRequired
+}: Update) {
   const mod = hotModulesMap.get(path)
   if (!mod) {
     // In a code-splitting project,
@@ -400,52 +405,37 @@ async function fetchUpdate({ path, acceptedPath, timestamp }: Update) {
   const moduleMap = new Map<string, ModuleNamespace>()
   const isSelfUpdate = path === acceptedPath
 
-  // make sure we only import each dep once
-  const modulesToUpdate = new Set<string>()
-  if (isSelfUpdate) {
-    // self update - only update self
-    modulesToUpdate.add(path)
-  } else {
-    // dep update
-    for (const { deps } of mod.callbacks) {
-      deps.forEach((dep) => {
-        if (acceptedPath === dep) {
-          modulesToUpdate.add(dep)
-        }
-      })
-    }
-  }
-
   // determine the qualified callbacks before we re-import the modules
-  const qualifiedCallbacks = mod.callbacks.filter(({ deps }) => {
-    return deps.some((dep) => modulesToUpdate.has(dep))
-  })
-
-  await Promise.all(
-    Array.from(modulesToUpdate).map(async (dep) => {
-      const disposer = disposeMap.get(dep)
-      if (disposer) await disposer(dataMap.get(dep))
-      const [path, query] = dep.split(`?`)
-      try {
-        const newMod: ModuleNamespace = await import(
-          /* @vite-ignore */
-          base +
-            path.slice(1) +
-            `?import&t=${timestamp}${query ? `&${query}` : ''}`
-        )
-        moduleMap.set(dep, newMod)
-      } catch (e) {
-        warnFailedFetch(e, dep)
-      }
-    })
+  const qualifiedCallbacks = mod.callbacks.filter(({ deps }) =>
+    deps.includes(acceptedPath)
   )
 
+  if (isSelfUpdate || qualifiedCallbacks.length > 0) {
+    const dep = acceptedPath
+    const disposer = disposeMap.get(dep)
+    if (disposer) await disposer(dataMap.get(dep))
+    const [path, query] = dep.split(`?`)
+    try {
+      const newMod: ModuleNamespace = await import(
+        /* @vite-ignore */
+        base +
+          path.slice(1) +
+          `?${explicitImportRequired ? 'import&' : ''}t=${timestamp}${
+            query ? `&${query}` : ''
+          }`
+      )
+      moduleMap.set(dep, newMod)
+    } catch (e) {
+      warnFailedFetch(e, dep)
+    }
+  }
+
   return () => {
     for (const { deps, fn } of qualifiedCallbacks) {
       fn(deps.map((dep) => moduleMap.get(dep)))
     }
     const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`
-    console.log(`[vite] hot updated: ${loggedPath}`)
+    console.debug(`[vite] hot updated: ${loggedPath}`)
   }
 }
 

package/types/chokidar.d.ts

@@ -194,7 +194,7 @@ export interface WatchOptions {
   ignorePermissionErrors?: boolean
 
   /**
-   * `true` if `useFsEvents` and `usePolling` are `false`). Automatically filters out artifacts
+   * `true` if `useFsEvents` and `usePolling` are `false`. Automatically filters out artifacts
    * that occur when using editors that use "atomic writes" instead of writing directly to the
    * source file. If a file is re-added within 100 ms of being deleted, Chokidar emits a `change`
    * event rather than `unlink` then `add`. If the default of 100 ms does not work well for you,

package/types/hmrPayload.d.ts

@@ -20,6 +20,10 @@ export interface Update {
   path: string
   acceptedPath: string
   timestamp: number
+  /**
+   * @experimental internal
+   */
+  explicitImportRequired?: boolean | undefined
 }
 
 export interface PrunePayload {

package/types/shims.d.ts

@@ -47,6 +47,7 @@ declare module 'postcss-import' {
       basedir: string,
       importOptions: any
     ) => string | string[] | Promise<string | string[]>
+    nameLayer: (index: number, rootFilename: string) => string
   }) => Plugin
   export = plugin
 }