vite 2.9.0-beta.3 → 2.9.0-beta.7

package/dist/node/terser.js

@@ -10201,7 +10201,7 @@ function is_some_comments(comment) {
     // multiline comment
     return (
         (comment.type === "comment2" || comment.type === "comment1")
-        && /@preserve|@lic|@cc_on|^\**!/i.test(comment.value)
+        && /@preserve|@copyright|@lic|@cc_on|^\**!/i.test(comment.value)
     );
 }
 
@@ -10314,8 +10314,8 @@ function OutputStream(options) {
     var OUTPUT = new Rope();
     let printed_comments = new Set();
 
-    var to_utf8 = options.ascii_only ? function(str, identifier) {
-        if (options.ecma >= 2015 && !options.safari10) {
+    var to_utf8 = options.ascii_only ? function(str, identifier = false, regexp = false) {
+        if (options.ecma >= 2015 && !options.safari10 && !regexp) {
             str = str.replace(/[\ud800-\udbff][\udc00-\udfff]/g, function(ch) {
                 var code = get_full_char_code(ch, 0).toString(16);
                 return "\\u{" + code + "}";
@@ -11127,7 +11127,8 @@ function OutputStream(options) {
         var p = output.parent();
         if (this.args.length === 0
             && (p instanceof AST_PropAccess // (new Date).getTime(), (new Date)["getTime"]()
-                || p instanceof AST_Call && p.expression === this)) // (new foo)(bar)
+                || p instanceof AST_Call && p.expression === this
+                || p instanceof AST_PrefixedTemplateString && p.prefix === this)) // (new foo)(bar)
             return true;
     });
 
@@ -12242,7 +12243,7 @@ function OutputStream(options) {
         flags = flags ? sort_regexp_flags(flags) : "";
         source = source.replace(r_slash_script, slash_script_replace);
 
-        output.print(output.to_utf8(`/${source}/${flags}`));
+        output.print(output.to_utf8(`/${source}/${flags}`, false, true));
 
         const parent = output.parent();
         if (
@@ -12666,6 +12667,11 @@ const MASK_EXPORT_WANT_MANGLE = 1 << 1;
 
 let function_defs = null;
 let unmangleable_names = null;
+/**
+ * When defined, there is a function declaration somewhere that's inside of a block.
+ * See https://tc39.es/ecma262/multipage/additional-ecmascript-features-for-web-browsers.html#sec-block-level-function-declarations-web-legacy-compatibility-semantics
+*/
+let scopes_with_block_defuns = null;
 
 class SymbolDef {
     constructor(scope, orig, init) {
@@ -13216,6 +13222,15 @@ AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
 });
 
 function next_mangled(scope, options) {
+    let defun_scope;
+    if (
+        scopes_with_block_defuns
+        && (defun_scope = scope.get_defun_scope())
+        && scopes_with_block_defuns.has(defun_scope)
+    ) {
+        scope = defun_scope;
+    }
+
     var ext = scope.enclosed;
     var nth_identifier = options.nth_identifier;
     out: while (true) {
@@ -13350,6 +13365,13 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             lname = save_nesting;
             return true;        // don't descend again in TreeWalker
         }
+        if (
+            node instanceof AST_Defun
+            && !(tw.parent() instanceof AST_Scope)
+        ) {
+            scopes_with_block_defuns = scopes_with_block_defuns || new Set();
+            scopes_with_block_defuns.add(node.parent_scope.get_defun_scope());
+        }
         if (node instanceof AST_Scope) {
             node.variables.forEach(collect);
             return;
@@ -13398,6 +13420,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
 
     function_defs = null;
     unmangleable_names = null;
+    scopes_with_block_defuns = null;
 
     function collect(symbol) {
         if (symbol.export & MASK_EXPORT_DONT_MANGLE) {
@@ -30781,7 +30804,54 @@ function cache_to_json(cache) {
     };
 }
 
-async function minify(files, options) {
+function log_input(files, options, fs, debug_folder) {
+    if (!(fs && fs.writeFileSync && fs.mkdirSync)) {
+        return;
+    }
+
+    try {
+        fs.mkdirSync(debug_folder);
+    } catch (e) {
+        if (e.code !== "EEXIST") throw e;
+    }
+
+    const log_path = `${debug_folder}/terser-debug-${(Math.random() * 9999999) | 0}.log`;
+
+    options = options || {};
+
+    const options_str = JSON.stringify(options, (_key, thing) => {
+        if (typeof thing === "function") return "[Function " + thing.toString() + "]";
+        if (thing instanceof RegExp) return "[RegExp " + thing.toString() + "]";
+        return thing;
+    }, 4);
+
+    const files_str = (file) => {
+        if (typeof file === "object" && options.parse && options.parse.spidermonkey) {
+            return JSON.stringify(file, null, 2);
+        } else if (typeof file === "object") {
+            return Object.keys(file)
+                .map((key) => key + ": " + files_str(file[key]))
+                .join("\n\n");
+        } else if (typeof file === "string") {
+            return "```\n" + file + "\n```";
+        } else {
+            return file; // What do?
+        }
+    };
+
+    fs.writeFileSync(log_path, "Options: \n" + options_str + "\n\nInput files:\n\n" + files_str(files) + "\n");
+}
+
+async function minify(files, options, _fs_module) {
+    if (
+        _fs_module
+        && typeof process === "object"
+        && process.env
+        && typeof process.env.TERSER_DEBUG_DIR === "string"
+    ) {
+        log_input(files, options, _fs_module, process.env.TERSER_DEBUG_DIR);
+    }
+
     options = defaults(options, {
         compress: {},
         ecma: undefined,
@@ -30804,6 +30874,7 @@ async function minify(files, options) {
         warnings: false,
         wrap: false,
     }, true);
+
     var timings = options.timings && {
         start: Date.now()
     };
@@ -31205,7 +31276,7 @@ async function run_cli({ program, packageJson, fs, path }) {
 
         let result;
         try {
-            result = await minify(files, options);
+            result = await minify(files, options, fs);
         } catch (ex) {
             if (ex.name == "SyntaxError") {
                 print_error("Parse error at " + ex.filename + ":" + ex.line + "," + ex.col);
@@ -31268,14 +31339,18 @@ async function run_cli({ program, packageJson, fs, path }) {
             }, 2));
         } else if (program.output == "spidermonkey") {
             try {
-                const minified = await minify(result.code, {
-                    compress: false,
-                    mangle: false,
-                    format: {
-                        ast: true,
-                        code: false
-                    }
-                });
+                const minified = await minify(
+                    result.code,
+                    {
+                        compress: false,
+                        mangle: false,
+                        format: {
+                            ast: true,
+                            code: false
+                        }
+                    },
+                    fs
+                );
                 console.log(JSON.stringify(minified.ast.to_mozilla_ast(), null, 2));
             } catch (ex) {
                 fatal(ex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.9.0-beta.3",
+  "version": "2.9.0-beta.7",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -44,7 +44,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.14.27",
-    "postcss": "^8.4.6",
+    "postcss": "^8.4.12",
     "resolve": "^1.22.0",
     "rollup": "^2.59.0"
   },
@@ -52,17 +52,17 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^2.1.0",
-    "@babel/parser": "^7.17.0",
+    "@ampproject/remapping": "^2.1.2",
+    "@babel/parser": "^7.17.8",
     "@babel/types": "^7.17.0",
-    "@jridgewell/trace-mapping": "^0.3.2",
+    "@jridgewell/trace-mapping": "^0.3.4",
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "^21.0.2",
     "@rollup/plugin-dynamic-import-vars": "^1.4.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-typescript": "^8.3.0",
-    "@rollup/pluginutils": "^4.1.2",
+    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/pluginutils": "^4.2.0",
     "@types/convert-source-map": "^1.5.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/debug": "^4.1.7",
@@ -71,12 +71,12 @@
     "@types/less": "^3.0.3",
     "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.22",
+    "@types/node": "^16.11.26",
     "@types/resolve": "^1.20.1",
     "@types/sass": "~1.43.1",
     "@types/stylus": "^0.48.36",
-    "@types/ws": "^8.2.2",
-    "@vue/compiler-dom": "^3.2.30",
+    "@types/ws": "^8.5.3",
+    "@vue/compiler-dom": "^3.2.31",
     "acorn": "^8.7.0",
     "cac": "6.7.9",
     "chokidar": "^3.5.3",
@@ -85,33 +85,34 @@
     "convert-source-map": "^1.8.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.9.3",
+    "es-module-lexer": "^0.10.4",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
     "http-proxy": "^1.18.1",
-    "json5": "^2.2.0",
+    "json5": "^2.2.1",
     "launch-editor-middleware": "^2.3.0",
-    "magic-string": "^0.25.7",
+    "magic-string": "^0.26.1",
     "micromatch": "^4.0.4",
     "mrmime": "^1.0.0",
-    "node-forge": "^1.2.1",
+    "node-forge": "^1.3.0",
     "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-modules": "^4.3.0",
+    "postcss-modules": "^4.3.1",
     "resolve.exports": "^1.1.0",
     "rollup-plugin-license": "^2.6.1",
     "sirv": "^2.0.2",
+    "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
-    "terser": "^5.10.0",
+    "terser": "^5.12.1",
     "tsconfck": "^1.2.0",
     "tslib": "^2.3.1",
     "types": "link:./types",

package/types/ws.d.ts

@@ -1,4 +1,7 @@
-// Type definitions for ws 8.2
+// Modified and inlined to avoid extra dependency
+// Source: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/ws/index.d.ts
+
+// Type definitions for ws 8.5
 // Project: https://github.com/websockets/ws
 // Definitions by: Paul Loyd <https://github.com/loyd>
 //                 Margus Lamp <https://github.com/mlamp>
@@ -7,6 +10,7 @@
 //                 teidesu <https://github.com/teidesu>
 //                 Bartosz Wojtkowiak <https://github.com/wojtkowiak>
 //                 Kyle Hensel <https://github.com/k-yle>
+//                 Samuel Skeen <https://github.com/cwadrupldijjit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -40,6 +44,8 @@ declare class WebSocket extends EventEmitter {
   binaryType: 'nodebuffer' | 'arraybuffer' | 'fragments'
   readonly bufferedAmount: number
   readonly extensions: string
+  /** Indicates whether the websocket is paused */
+  readonly isPaused: boolean
   readonly protocol: string
   /** The current state of the connection */
   readonly readyState:
@@ -58,11 +64,12 @@ declare class WebSocket extends EventEmitter {
   /** The connection is closed. */
   readonly CLOSED: 3
 
-  onopen: (event: WebSocket.Event) => void
-  onerror: (event: WebSocket.ErrorEvent) => void
-  onclose: (event: WebSocket.CloseEvent) => void
-  onmessage: (event: WebSocket.MessageEvent) => void
+  onopen: ((event: WebSocket.Event) => void) | null
+  onerror: ((event: WebSocket.ErrorEvent) => void) | null
+  onclose: ((event: WebSocket.CloseEvent) => void) | null
+  onmessage: ((event: WebSocket.MessageEvent) => void) | null
 
+  constructor(address: null)
   constructor(
     address: string | URL,
     options?: WebSocket.ClientOptions | ClientRequestArgs
@@ -89,6 +96,18 @@ declare class WebSocket extends EventEmitter {
   ): void
   terminate(): void
 
+  /**
+   * Pause the websocket causing it to stop emitting events. Some events can still be
+   * emitted after this is called, until all buffered data is consumed. This method
+   * is a noop if the ready state is `CONNECTING` or `CLOSED`.
+   */
+  pause(): void
+  /**
+   * Make a paused socket resume emitting events. This method is a noop if the ready
+   * state is `CONNECTING` or `CLOSED`.
+   */
+  resume(): void
+
   // HTML5 WebSocket events
   addEventListener(
     method: 'message',
@@ -281,7 +300,7 @@ declare class WebSocket extends EventEmitter {
 }
 
 declare const WebSocketAlias: typeof WebSocket
-type WebSocketAlias = WebSocket
+interface WebSocketAlias extends WebSocket {} // tslint:disable-line no-empty-interface
 
 declare namespace WebSocket {
   /**
@@ -328,6 +347,7 @@ declare namespace WebSocket {
   interface ClientOptions extends SecureContextOptions {
     protocol?: string | undefined
     followRedirects?: boolean | undefined
+    generateMask?(mask: Buffer): void
     handshakeTimeout?: number | undefined
     maxRedirects?: number | undefined
     perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined
@@ -341,6 +361,7 @@ declare namespace WebSocket {
     checkServerIdentity?(servername: string, cert: CertMeta): boolean
     rejectUnauthorized?: boolean | undefined
     maxPayload?: number | undefined
+    skipUTF8Validation?: boolean | undefined
   }
 
   interface PerMessageDeflateOptions {
@@ -415,6 +436,7 @@ declare namespace WebSocket {
     perMessageDeflate?: boolean | PerMessageDeflateOptions | undefined
     maxPayload?: number | undefined
     skipUTF8Validation?: boolean | undefined
+    WebSocket?: typeof WebSocket.WebSocket | undefined
   }
 
   interface AddressInfo {
@@ -424,10 +446,10 @@ declare namespace WebSocket {
   }
 
   // WebSocket Server
-  class Server extends EventEmitter {
+  class Server<T extends WebSocket = WebSocket> extends EventEmitter {
     options: ServerOptions
     path: string
-    clients: Set<WebSocket>
+    clients: Set<T>
 
     constructor(options?: ServerOptions, callback?: () => void)
 
@@ -437,56 +459,59 @@ declare namespace WebSocket {
       request: IncomingMessage,
       socket: Duplex,
       upgradeHead: Buffer,
-      callback: (client: WebSocket, request: IncomingMessage) => void
+      callback: (client: T, request: IncomingMessage) => void
     ): void
     shouldHandle(request: IncomingMessage): boolean | Promise<boolean>
 
     // Events
     on(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    on(event: 'error', cb: (this: Server, error: Error) => void): this
+    on(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     on(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
     ): this
-    on(event: 'close' | 'listening', cb: (this: Server) => void): this
+    on(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
     on(
       event: string | symbol,
-      listener: (this: Server, ...args: any[]) => void
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
 
     once(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    once(event: 'error', cb: (this: Server, error: Error) => void): this
+    once(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     once(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
+    ): this
+    once(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
+    once(
+      event: string | symbol,
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
-    once(event: 'close' | 'listening', cb: (this: Server) => void): this
-    once(event: string | symbol, listener: (...args: any[]) => void): this
 
     off(
       event: 'connection',
-      cb: (this: Server, socket: WebSocket, request: IncomingMessage) => void
+      cb: (this: Server<T>, socket: T, request: IncomingMessage) => void
     ): this
-    off(event: 'error', cb: (this: Server, error: Error) => void): this
+    off(event: 'error', cb: (this: Server<T>, error: Error) => void): this
     off(
       event: 'headers',
-      cb: (this: Server, headers: string[], request: IncomingMessage) => void
+      cb: (this: Server<T>, headers: string[], request: IncomingMessage) => void
     ): this
-    off(event: 'close' | 'listening', cb: (this: Server) => void): this
+    off(event: 'close' | 'listening', cb: (this: Server<T>) => void): this
     off(
       event: string | symbol,
-      listener: (this: Server, ...args: any[]) => void
+      listener: (this: Server<T>, ...args: any[]) => void
     ): this
 
     addListener(
       event: 'connection',
-      cb: (client: WebSocket, request: IncomingMessage) => void
+      cb: (client: T, request: IncomingMessage) => void
     ): this
     addListener(event: 'error', cb: (err: Error) => void): this
     addListener(
@@ -499,7 +524,7 @@ declare namespace WebSocket {
       listener: (...args: any[]) => void
     ): this
 
-    removeListener(event: 'connection', cb: (client: WebSocket) => void): this
+    removeListener(event: 'connection', cb: (client: T) => void): this
     removeListener(event: 'error', cb: (err: Error) => void): this
     removeListener(
       event: 'headers',
@@ -513,9 +538,9 @@ declare namespace WebSocket {
   }
 
   const WebSocketServer: typeof Server
-  type WebSocketServer = Server
+  interface WebSocketServer extends Server {} // tslint:disable-line no-empty-interface
   const WebSocket: typeof WebSocketAlias
-  type WebSocket = WebSocketAlias
+  interface WebSocket extends WebSocketAlias {} // tslint:disable-line no-empty-interface
 
   // WebSocket stream
   function createWebSocketStream(
@@ -524,5 +549,5 @@ declare namespace WebSocket {
   ): Duplex
 }
 
-//export = WebSocket;
+// export = WebSocket
 export { WebSocket, WebSocketAlias }