vite 2.6.13 → 2.7.0-beta.3

package/dist/node/index.d.ts

@@ -12,7 +12,6 @@ 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';
@@ -33,8 +32,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 +46,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 +256,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;
@@ -518,19 +576,27 @@ export declare interface FileSystemServeOptions {
      * Set to `false` to disable the warning
      * Default to false at this moment, will enabled by default in the future versions.
      *
-     * @experimental
-     * @default undefined
+     * @default true
      */
-    strict?: boolean | undefined;
+    strict?: boolean;
     /**
      * Restrict accessing files outside the allowed directories.
      *
      * Accepts absolute path or a path relative to project root.
      * Will try to search up for workspace root by default.
+     */
+    allow?: string[];
+    /**
+     * Restrict accessing files that matches the patterns.
+     *
+     * This will have higher priority than `allow`.
+     * Glob patterns are supported.
+     *
+     * @default ['.env', '.env.*', '*.crt', '*.pem']
      *
      * @experimental
      */
-    allow?: string[];
+    deny?: string[];
 }
 
 export declare interface FSWatcher extends fs.FSWatcher {
@@ -917,6 +983,7 @@ export declare interface InternalResolveOptions extends ResolveOptions {
     skipPackageJson?: boolean;
     preferRelative?: boolean;
     isRequire?: boolean;
+    isFromTsImporter?: boolean;
 }
 
 export declare interface JsonOptions {
@@ -1164,17 +1231,30 @@ export declare interface Plugin extends Plugin_2 {
      */
     resolveId?(this: PluginContext, source: string, importer: string | undefined, options: {
         custom?: CustomPluginOptions;
-    }, ssr?: boolean): Promise<ResolveIdResult> | ResolveIdResult;
-    load?(this: PluginContext, id: string, ssr?: boolean): Promise<LoadResult> | LoadResult;
-    transform?(this: TransformPluginContext, code: string, id: string, ssr?: boolean): Promise<TransformResult_3> | TransformResult_3;
+        ssr?: boolean;
+    }): Promise<ResolveIdResult> | ResolveIdResult;
+    load?(this: PluginContext, id: string, options?: {
+        ssr?: boolean;
+    }): Promise<LoadResult> | LoadResult;
+    transform?(this: TransformPluginContext, code: string, id: string, options?: {
+        ssr?: boolean;
+    }): Promise<TransformResult_3> | TransformResult_3;
 }
 
 export declare interface PluginContainer {
     options: InputOptions;
     buildStart(options: InputOptions): Promise<void>;
-    resolveId(id: string, importer?: string, skip?: Set<Plugin>, ssr?: boolean): Promise<PartialResolvedId | null>;
-    transform(code: string, id: string, inMap?: SourceDescription['map'], ssr?: boolean): Promise<SourceDescription | null>;
-    load(id: string, ssr?: boolean): Promise<LoadResult | null>;
+    resolveId(id: string, importer?: string, options?: {
+        skip?: Set<Plugin>;
+        ssr?: boolean;
+    }): Promise<PartialResolvedId | null>;
+    transform(code: string, id: string, options?: {
+        inMap?: SourceDescription['map'];
+        ssr?: boolean;
+    }): Promise<SourceDescription | null>;
+    load(id: string, options?: {
+        ssr?: boolean;
+    }): Promise<LoadResult | null>;
     close(): Promise<void>;
 }
 
@@ -1186,9 +1266,30 @@ export declare type PluginOption = Plugin | false | null | undefined;
  * @param serverOptions - what host and port to use
  * @experimental
  */
-export declare function preview(config: ResolvedConfig, serverOptions: Pick<ServerOptions, 'port' | 'host'>): Promise<Server>;
+export declare function preview(inlineConfig: InlineConfig): Promise<PreviewServer>;
 
-export declare function printHttpServerUrls(server: Server_3, config: ResolvedConfig): void;
+export declare interface PreviewOptions extends CommonServerOptions {
+}
+
+export declare interface PreviewServer {
+    /**
+     * The resolved vite config object
+     */
+    config: ResolvedConfig;
+    /**
+     * native Node http server instance
+     */
+    httpServer: Server;
+    /**
+     * Print server urls
+     */
+    printUrls: () => void;
+}
+
+/**
+ * @deprecated Use `server.printUrls()` instead
+ */
+export declare function printHttpServerUrls(server: Server_2, config: ResolvedConfig): void;
 
 export declare interface ProxyOptions extends HttpProxy.ServerOptions {
     /**
@@ -1231,12 +1332,16 @@ 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>;
 }
@@ -1337,6 +1442,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
@@ -1454,18 +1579,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;
-    /**
-     * 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;
+export declare interface ServerOptions extends CommonServerOptions {
     /**
      * Force dep pre-optimization regardless of whether deps have changed.
      */
@@ -1479,40 +1593,6 @@ export declare interface ServerOptions {
      * https://github.com/paulmillr/chokidar#api
      */
     watch?: WatchOptions;
-    /**
-     * 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;
-    /**
-     * If enabled, vite will exit if specified port is already in use
-     */
-    strictPort?: boolean;
     /**
      * Create Vite dev server to be used as a middleware in an existing server
      */
@@ -1823,6 +1903,10 @@ export declare interface UserConfig {
      * Build specific options
      */
     build?: BuildOptions;
+    /**
+     * Preview specific options, e.g. host, port, https...
+     */
+    preview?: PreviewOptions;
     /**
      * Dep optimization options
      */
@@ -2455,7 +2539,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
@@ -2571,8 +2655,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-85dbaaa7.js');
+var build = require('./chunks/dep-5243d0d3.js');
 require('fs');
 require('path');
-require('events');
+require('os');
+require('tty');
 require('util');
+require('net');
+require('events');
+require('url');
+require('http');
 require('stream');
-require('os');
+require('resolve');
+require('module');
 require('perf_hooks');
-require('url');
+require('https');
+require('zlib');
 require('crypto');
-require('module');
-require('esbuild');
-require('worker_threads');
+require('tls');
 require('assert');
+require('buffer');
+require('querystring');
+require('esbuild');
 require('child_process');
+require('worker_threads');
 require('readline');
-require('zlib');
-require('resolve');
-require('querystring');
-require('tty');
-require('net');
-require('http');
-require('buffer');
-require('https');
-require('tls');
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.6.13",
+  "version": "2.7.0-beta.3",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -44,43 +44,42 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.13.2",
-    "postcss": "^8.3.8",
+    "esbuild": "^0.13.12",
+    "postcss": "^8.3.11",
     "resolve": "^1.20.0",
-    "rollup": "^2.57.0"
+    "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",
-    "@rollup/plugin-alias": "^3.1.5",
-    "@rollup/plugin-commonjs": "^21.0.0",
-    "@rollup/plugin-dynamic-import-vars": "^1.4.0",
+    "@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",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "13.0.5",
-    "@rollup/plugin-typescript": "^8.2.5",
+    "@rollup/plugin-node-resolve": "13.0.6",
+    "@rollup/plugin-typescript": "^8.3.0",
     "@rollup/pluginutils": "^4.1.1",
     "@types/convert-source-map": "^1.5.2",
     "@types/debug": "^4.1.7",
-    "@types/es-module-lexer": "^0.3.0",
     "@types/estree": "^0.0.50",
     "@types/etag": "^1.8.1",
     "@types/less": "^3.0.3",
     "@types/mime": "^2.0.3",
-    "@types/node": "^15.12.2",
+    "@types/node": "^16.11.6",
     "@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.19",
+    "@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",
@@ -91,7 +90,7 @@
     "debug": "^4.3.2",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.9.2",
+    "es-module-lexer": "^0.9.3",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
     "execa": "^5.1.1",
@@ -99,26 +98,26 @@
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.2.1",
     "magic-string": "^0.25.7",
-    "mime": "^2.5.2",
+    "mime": "^3.0.0",
     "minimatch": "^3.0.4",
     "okie": "^1.0.1",
-    "open": "^8.2.1",
+    "open": "^8.4.0",
     "periscopic": "^2.0.3",
     "postcss-import": "^14.0.2",
     "postcss-load-config": "^3.1.0",
     "postcss-modules": "^4.2.2",
-    "resolve.exports": "^1.0.2",
-    "rollup-plugin-license": "^2.5.0",
+    "resolve.exports": "^1.1.0",
+    "rollup-plugin-license": "^2.6.0",
     "selfsigned": "^1.10.11",
-    "sirv": "^1.0.17",
+    "sirv": "^1.0.18",
     "source-map": "^0.6.1",
     "source-map-support": "^0.5.20",
-    "strip-ansi": "^6.0.0",
+    "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

@@ -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

@@ -96,7 +96,11 @@ declare module 'rollup-plugin-web-worker-loader' {
 }
 
 declare module 'minimatch' {
-  function match(path: string, pattern: string): boolean
+  function match(
+    path: string,
+    pattern: string,
+    options?: { matchBase?: boolean }
+  ): boolean
   export default match
 }