vite 2.7.0-beta.1 → 2.7.0-beta.5

package/dist/node/index.d.ts

@@ -12,11 +12,11 @@ import { EventEmitter } from 'events';
 import * as events from 'events';
 import * as fs from 'fs';
 import * as http from 'http';
-import * as https from 'https';
 import { IncomingMessage } from 'http';
 import { InputOptions } from 'rollup';
 import { LoadResult } from 'rollup';
 import { ModuleFormat } from 'rollup';
+import { ModuleInfo } from 'rollup';
 import * as net from 'net';
 import { OutgoingHttpHeaders } from 'http';
 import { OutputBundle } from 'rollup';
@@ -33,8 +33,9 @@ import { RollupOutput } from 'rollup';
 import { RollupWatcher } from 'rollup';
 import { SecureContextOptions } from 'tls';
 import { Server } from 'http';
-import { Server as Server_2 } from 'https';
-import { Server as Server_3 } from 'net';
+import { Server as Server_2 } from 'net';
+import { Server as Server_3 } from 'https';
+import { ServerOptions as ServerOptions_2 } from 'https';
 import { ServerResponse } from 'http';
 import { Socket } from 'net';
 import { SourceDescription } from 'rollup';
@@ -46,6 +47,7 @@ import { TransformResult as TransformResult_3 } from 'rollup';
 import { URL } from 'url';
 import * as url from 'url';
 import { WatcherOptions } from 'rollup';
+import { WebSocketServer as WebSocketServer_2 } from 'ws';
 import { ZlibOptions } from 'zlib';
 
 export declare interface Alias {
@@ -255,6 +257,63 @@ export declare interface BuildOptions {
     watch?: WatcherOptions | null;
 }
 
+export declare interface CommonServerOptions {
+    /**
+     * Specify server port. Note if the port is already being used, Vite will
+     * automatically try the next available port so this may not be the actual
+     * port the server ends up listening on.
+     */
+    port?: number;
+    /**
+     * If enabled, vite will exit if specified port is already in use
+     */
+    strictPort?: boolean;
+    /**
+     * Specify which IP addresses the server should listen on.
+     * Set to 0.0.0.0 to listen on all addresses, including LAN and public addresses.
+     */
+    host?: string | boolean;
+    /**
+     * Enable TLS + HTTP/2.
+     * Note: this downgrades to TLS only when the proxy option is also used.
+     */
+    https?: boolean | ServerOptions_2;
+    /**
+     * Open browser window on startup
+     */
+    open?: boolean | string;
+    /**
+     * Configure custom proxy rules for the dev server. Expects an object
+     * of `{ key: options }` pairs.
+     * Uses [`http-proxy`](https://github.com/http-party/node-http-proxy).
+     * Full options [here](https://github.com/http-party/node-http-proxy#options).
+     *
+     * Example `vite.config.js`:
+     * ``` js
+     * module.exports = {
+     *   proxy: {
+     *     // string shorthand
+     *     '/foo': 'http://localhost:4567/foo',
+     *     // with options
+     *     '/api': {
+     *       target: 'http://jsonplaceholder.typicode.com',
+     *       changeOrigin: true,
+     *       rewrite: path => path.replace(/^\/api/, '')
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    proxy?: Record<string, string | ProxyOptions>;
+    /**
+     * Configure CORS for the dev server.
+     * Uses https://github.com/expressjs/cors.
+     * Set to `true` to allow all methods from any origin, or configure separately
+     * using an object.
+     */
+    cors?: CorsOptions | boolean;
+}
+
 export declare interface ConfigEnv {
     command: 'build' | 'serve';
     mode: string;
@@ -924,7 +983,9 @@ export declare interface InternalResolveOptions extends ResolveOptions {
     tryPrefix?: string;
     skipPackageJson?: boolean;
     preferRelative?: boolean;
+    preserveSymlinks?: boolean;
     isRequire?: boolean;
+    isFromTsImporter?: boolean;
 }
 
 export declare interface JsonOptions {
@@ -1005,12 +1066,12 @@ export declare type Matcher = AnymatchPattern | AnymatchPattern[]
 export declare function mergeConfig(a: Record<string, any>, b: Record<string, any>, isRoot?: boolean): Record<string, any>;
 
 export declare class ModuleGraph {
+    private resolveId;
     urlToModuleMap: Map<string, ModuleNode>;
     idToModuleMap: Map<string, ModuleNode>;
     fileToModulesMap: Map<string, Set<ModuleNode>>;
     safeModulesPath: Set<string>;
-    container: PluginContainer;
-    constructor(container: PluginContainer);
+    constructor(resolveId: (url: string) => Promise<PartialResolvedId | null>);
     getModuleByUrl(rawUrl: string): Promise<ModuleNode | undefined>;
     getModuleById(id: string): ModuleNode | undefined;
     getModulesByFile(file: string): Set<ModuleNode> | undefined;
@@ -1025,7 +1086,7 @@ export declare class ModuleGraph {
     updateModuleInfo(mod: ModuleNode, importedModules: Set<string | ModuleNode>, acceptedModules: Set<string | ModuleNode>, isSelfAccepting: boolean): Promise<Set<ModuleNode> | undefined>;
     ensureEntryFromUrl(rawUrl: string): Promise<ModuleNode>;
     createFileOnlyEntry(file: string): ModuleNode;
-    resolveUrl(url: string): Promise<[string, string]>;
+    resolveUrl(url: string): Promise<ResolvedUrl>;
 }
 
 export declare class ModuleNode {
@@ -1039,6 +1100,8 @@ export declare class ModuleNode {
     id: string | null;
     file: string | null;
     type: 'js' | 'css';
+    info?: ModuleInfo;
+    meta?: Record<string, any>;
     importers: Set<ModuleNode>;
     importedModules: Set<ModuleNode>;
     acceptedHmrDeps: Set<ModuleNode>;
@@ -1184,6 +1247,7 @@ export declare interface Plugin extends Plugin_2 {
 
 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>;
@@ -1209,6 +1273,9 @@ export declare type PluginOption = Plugin | false | null | undefined;
  */
 export declare function preview(inlineConfig: InlineConfig): Promise<PreviewServer>;
 
+export declare interface PreviewOptions extends CommonServerOptions {
+}
+
 export declare interface PreviewServer {
     /**
      * The resolved vite config object
@@ -1224,7 +1291,10 @@ export declare interface PreviewServer {
     printUrls: () => void;
 }
 
-export declare function printHttpServerUrls(server: Server_3, config: ResolvedConfig): void;
+/**
+ * @deprecated Use `server.printUrls()` instead
+ */
+export declare function printHttpServerUrls(server: Server_2, config: ResolvedConfig): void;
 
 export declare interface ProxyOptions extends HttpProxy.ServerOptions {
     /**
@@ -1267,16 +1337,26 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'alia
     plugins: readonly Plugin[];
     server: ResolvedServerOptions;
     build: ResolvedBuildOptions;
+    preview: ResolvedPreviewOptions;
     assetsInclude: (file: string) => boolean;
     logger: Logger;
     createResolver: (options?: Partial<InternalResolveOptions>) => ResolveFn;
     optimizeDeps: Omit<DepOptimizationOptions, 'keepNames'>;
 }>;
 
+export declare interface ResolvedPreviewOptions extends PreviewOptions {
+}
+
 export declare interface ResolvedServerOptions extends ServerOptions {
     fs: Required<FileSystemServeOptions>;
 }
 
+export declare type ResolvedUrl = [
+url: string,
+resolvedId: string,
+meta: object | null | undefined
+];
+
 export declare function resolveEnvPrefix({ envPrefix }: UserConfig): string[];
 
 export declare type ResolveFn = (id: string, importer?: string, aliasOnly?: boolean, ssr?: boolean) => Promise<string | undefined>;
@@ -1309,7 +1389,7 @@ export declare interface ResolverObject {
  */
 export declare interface RollupCommonJSOptions {
     /**
-     * A minimatch pattern, or array of patterns, which specifies the files in
+     * A picomatch pattern, or array of patterns, which specifies the files in
      * the build the plugin should operate on. By default, all files with
      * extension `".cjs"` or those in `extensions` are included, but you can narrow
      * this list by only including specific files. These files will be analyzed
@@ -1319,7 +1399,7 @@ export declare interface RollupCommonJSOptions {
      */
     include?: string | RegExp | readonly (string | RegExp)[]
     /**
-     * A minimatch pattern, or array of patterns, which specifies the files in
+     * A picomatch pattern, or array of patterns, which specifies the files in
      * the build the plugin should _ignore_. By default, all files with
      * extensions other than those in `extensions` or `".cjs"` are ignored, but you
      * can exclude additional files. See also the `include` option.
@@ -1373,6 +1453,26 @@ export declare interface RollupCommonJSOptions {
      * @default []
      */
     ignore?: ReadonlyArray<string> | ((id: string) => boolean)
+    /**
+     * In most cases, where `require` calls are inside a `try-catch` clause,
+     * they should be left unconverted as it requires an optional dependency
+     * that may or may not be installed beside the rolled up package.
+     * Due to the conversion of `require` to a static `import` - the call is hoisted
+     * to the top of the file, outside of the `try-catch` clause.
+     *
+     * - `true`: All `require` calls inside a `try` will be left unconverted.
+     * - `false`: All `require` calls inside a `try` will be converted as if the `try-catch` clause is not there.
+     * - `remove`: Remove all `require` calls from inside any `try` block.
+     * - `string[]`: Pass an array containing the IDs to left unconverted.
+     * - `((id: string) => boolean|'remove')`: Pass a function that control individual IDs.
+     *
+     * @default false
+     */
+    ignoreTryCatch?:
+    | boolean
+    | 'remove'
+    | ReadonlyArray<string>
+    | ((id: string) => boolean | 'remove')
     /**
      * Controls how to render imports from external dependencies. By default,
      * this plugin assumes that all external dependencies are CommonJS. This
@@ -1490,52 +1590,7 @@ export declare function send(req: IncomingMessage, res: ServerResponse, content:
 
 export declare type ServerHook = (server: ViteDevServer) => (() => void) | void | Promise<(() => void) | void>;
 
-export declare interface ServerOptions {
-    host?: string | boolean;
-    port?: number;
-    /**
-     * If enabled, vite will exit if specified port is already in use
-     */
-    strictPort?: boolean;
-    /**
-     * Enable TLS + HTTP/2.
-     * Note: this downgrades to TLS only when the proxy option is also used.
-     */
-    https?: boolean | https.ServerOptions;
-    /**
-     * Open browser window on startup
-     */
-    open?: boolean | string;
-    /**
-     * Configure custom proxy rules for the dev server. Expects an object
-     * of `{ key: options }` pairs.
-     * Uses [`http-proxy`](https://github.com/http-party/node-http-proxy).
-     * Full options [here](https://github.com/http-party/node-http-proxy#options).
-     *
-     * Example `vite.config.js`:
-     * ``` js
-     * module.exports = {
-     *   proxy: {
-     *     // string shorthand
-     *     '/foo': 'http://localhost:4567/foo',
-     *     // with options
-     *     '/api': {
-     *       target: 'http://jsonplaceholder.typicode.com',
-     *       changeOrigin: true,
-     *       rewrite: path => path.replace(/^\/api/, '')
-     *     }
-     *   }
-     * }
-     * ```
-     */
-    proxy?: Record<string, string | ProxyOptions>;
-    /**
-     * Configure CORS for the dev server.
-     * Uses https://github.com/expressjs/cors.
-     * Set to `true` to allow all methods from any origin, or configure separately
-     * using an object.
-     */
-    cors?: CorsOptions | boolean;
+export declare interface ServerOptions extends CommonServerOptions {
     /**
      * Force dep pre-optimization regardless of whether deps have changed.
      */
@@ -1859,6 +1914,10 @@ export declare interface UserConfig {
      * Build specific options
      */
     build?: BuildOptions;
+    /**
+     * Preview specific options, e.g. host, port, https...
+     */
+    preview?: PreviewOptions;
     /**
      * Dep optimization options
      */
@@ -2491,7 +2550,7 @@ export declare namespace WebSocket {
         host?: string | undefined
         port?: number | undefined
         backlog?: number | undefined
-        server?: Server | Server_2 | undefined
+        server?: Server | Server_3 | undefined
         verifyClient?:
         | VerifyClientCallbackAsync
         | VerifyClientCallbackSync
@@ -2607,8 +2666,8 @@ export declare namespace WebSocket {
 }
 
 export declare interface WebSocketServer {
-    on: WebSocket.Server['on'];
-    off: WebSocket.Server['off'];
+    on: WebSocketServer_2['on'];
+    off: WebSocketServer_2['off'];
     send(payload: HMRPayload): void;
     close(): Promise<void>;
 }

package/dist/node/index.js

@@ -2,31 +2,31 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var build = require('./chunks/dep-966eddc9.js');
-require('path');
+var build = require('./chunks/dep-6920cd01.js');
 require('fs');
-require('querystring');
+require('path');
+require('os');
 require('tty');
 require('util');
 require('net');
 require('events');
 require('url');
 require('http');
-require('buffer');
-require('zlib');
-require('os');
+require('stream');
 require('resolve');
 require('module');
 require('perf_hooks');
-require('readline');
-require('crypto');
-require('stream');
-require('esbuild');
-require('worker_threads');
-require('assert');
 require('https');
+require('zlib');
+require('crypto');
 require('tls');
+require('assert');
+require('buffer');
+require('querystring');
+require('esbuild');
 require('child_process');
+require('worker_threads');
+require('readline');
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.7.0-beta.1",
+  "version": "2.7.0-beta.5",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -44,18 +44,18 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.13.10",
+    "esbuild": "^0.13.12",
     "postcss": "^8.3.11",
     "resolve": "^1.20.0",
-    "rollup": "^2.58.3"
+    "rollup": "^2.59.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^1.0.1",
-    "@babel/parser": "^7.15.8",
-    "@babel/types": "^7.15.6",
+    "@babel/parser": "^7.16.2",
+    "@babel/types": "^7.16.0",
     "@rollup/plugin-alias": "^3.1.8",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-dynamic-import-vars": "^1.4.1",
@@ -65,22 +65,22 @@
     "@rollup/pluginutils": "^4.1.1",
     "@types/convert-source-map": "^1.5.2",
     "@types/debug": "^4.1.7",
-    "@types/es-module-lexer": "^0.4.1",
     "@types/estree": "^0.0.50",
     "@types/etag": "^1.8.1",
     "@types/less": "^3.0.3",
+    "@types/micromatch": "^4.0.0",
     "@types/mime": "^2.0.3",
-    "@types/node": "^15.14.9",
+    "@types/node": "^16.11.7",
     "@types/resolve": "^1.20.1",
-    "@types/sass": "~1.16.1",
+    "@types/sass": "~1.43.0",
     "@types/stylus": "^0.48.36",
-    "@types/ws": "^7.4.7",
-    "@vue/compiler-dom": "^3.2.20",
+    "@types/ws": "^8.2.0",
+    "@vue/compiler-dom": "^3.2.21",
     "acorn": "^8.5.0",
     "acorn-class-fields": "^1.0.0",
     "acorn-static-class-features": "^1.0.0",
     "builtin-modules": "^3.2.0",
-    "cac": "6.7.3",
+    "cac": "6.7.9",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "compression": "^1.7.4",
@@ -99,8 +99,8 @@
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.2.1",
     "magic-string": "^0.25.7",
-    "mime": "^2.5.2",
-    "minimatch": "^3.0.4",
+    "micromatch": "^4.0.4",
+    "mime": "^3.0.0",
     "okie": "^1.0.1",
     "open": "^8.4.0",
     "periscopic": "^2.0.3",
@@ -115,10 +115,10 @@
     "source-map-support": "^0.5.20",
     "strip-ansi": "^6.0.1",
     "terser": "^5.9.0",
-    "tsconfck": "1.0.0",
+    "tsconfck": "1.1.1",
     "tslib": "^2.3.1",
     "types": "link:./types",
-    "ws": "^7.5.5"
+    "ws": "^8.2.3"
   },
   "peerDependencies": {
     "less": "*",

package/types/commonjs.d.ts

@@ -7,7 +7,7 @@
  */
 export interface RollupCommonJSOptions {
   /**
-   * A minimatch pattern, or array of patterns, which specifies the files in
+   * A picomatch pattern, or array of patterns, which specifies the files in
    * the build the plugin should operate on. By default, all files with
    * extension `".cjs"` or those in `extensions` are included, but you can narrow
    * this list by only including specific files. These files will be analyzed
@@ -17,7 +17,7 @@ export interface RollupCommonJSOptions {
    */
   include?: string | RegExp | readonly (string | RegExp)[]
   /**
-   * A minimatch pattern, or array of patterns, which specifies the files in
+   * A picomatch pattern, or array of patterns, which specifies the files in
    * the build the plugin should _ignore_. By default, all files with
    * extensions other than those in `extensions` or `".cjs"` are ignored, but you
    * can exclude additional files. See also the `include` option.
@@ -71,6 +71,26 @@ export interface RollupCommonJSOptions {
    * @default []
    */
   ignore?: ReadonlyArray<string> | ((id: string) => boolean)
+  /**
+   * In most cases, where `require` calls are inside a `try-catch` clause,
+   * they should be left unconverted as it requires an optional dependency
+   * that may or may not be installed beside the rolled up package.
+   * Due to the conversion of `require` to a static `import` - the call is hoisted
+   * to the top of the file, outside of the `try-catch` clause.
+   *
+   * - `true`: All `require` calls inside a `try` will be left unconverted.
+   * - `false`: All `require` calls inside a `try` will be converted as if the `try-catch` clause is not there.
+   * - `remove`: Remove all `require` calls from inside any `try` block.
+   * - `string[]`: Pass an array containing the IDs to left unconverted.
+   * - `((id: string) => boolean|'remove')`: Pass a function that control individual IDs.
+   *
+   * @default false
+   */
+  ignoreTryCatch?:
+    | boolean
+    | 'remove'
+    | ReadonlyArray<string>
+    | ((id: string) => boolean | 'remove')
   /**
    * Controls how to render imports from external dependencies. By default,
    * this plugin assumes that all external dependencies are CommonJS. This

package/types/shims.d.ts

@@ -95,13 +95,12 @@ declare module 'rollup-plugin-web-worker-loader' {
   export default p
 }
 
-declare module 'minimatch' {
-  function match(
+declare module 'micromatch' {
+  export function isMatch(
     path: string,
     pattern: string,
     options?: { matchBase?: boolean }
   ): boolean
-  export default match
 }
 
 declare module 'compression' {