vite 2.8.0-beta.1 → 2.8.0-beta.5

package/dist/node/chunks/{dep-51191982.js → dep-ba706304.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var build = require('./dep-e4dc9ea2.js');
+var build = require('./dep-aff09a4c.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {
@@ -340,8 +340,20 @@ const SVG_TAGS = 'svg,animate,animateMotion,animateTransform,circle,clipPath,col
     'polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,' +
     'text,textPath,title,tspan,unknown,use,view';
 const VOID_TAGS = 'area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr';
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `(process.env.NODE_ENV !== 'production')` flag.
+ */
 const isHTMLTag = /*#__PURE__*/ makeMap(HTML_TAGS);
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `(process.env.NODE_ENV !== 'production')` flag.
+ */
 const isSVGTag = /*#__PURE__*/ makeMap(SVG_TAGS);
+/**
+ * Compiler only.
+ * Do NOT use in runtime code paths unless behind `(process.env.NODE_ENV !== 'production')` flag.
+ */
 const isVoidTag = /*#__PURE__*/ makeMap(VOID_TAGS);
 
 const escapeRE = /["'&<>]/;
@@ -1942,7 +1954,7 @@ function parseAttributes(context, type) {
         }
         const attr = parseAttribute(context, attributeNames);
         // Trim whitespace between class
-        // https://github.com/vuejs/vue-next/issues/4251
+        // https://github.com/vuejs/core/issues/4251
         if (attr.type === 6 /* ATTRIBUTE */ &&
             attr.value &&
             attr.name === 'class') {
@@ -2178,7 +2190,7 @@ function parseTextData(context, length, mode) {
     advanceBy(context, length);
     if (mode === 2 /* RAWTEXT */ ||
         mode === 3 /* CDATA */ ||
-        rawText.indexOf('&') === -1) {
+        !rawText.includes('&')) {
         return rawText;
     }
     else {
@@ -3802,6 +3814,7 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
         const renderExp = createCallExpression(helper(RENDER_LIST), [
             forNode.source
         ]);
+        const isTemplate = isTemplateNode(node);
         const memo = findDir(node, 'memo');
         const keyProp = findProp(node, `key`);
         const keyExp = keyProp &&
@@ -3821,7 +3834,6 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
         return () => {
             // finish the codegen now that all children have been traversed
             let childBlock;
-            const isTemplate = isTemplateNode(node);
             const { children } = forNode;
             // check <template v-for> key placement
             if (((process.env.NODE_ENV !== 'production') || !true) && isTemplate) {
@@ -8738,4 +8750,3 @@ var compilerDom_cjs$1 = /*#__PURE__*/_mergeNamespaces({
 }, [compilerDom_cjs$2]);
 
 exports.compilerDom_cjs = compilerDom_cjs$1;
-//# sourceMappingURL=dep-51191982.js.map

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('events');
-var build = require('./chunks/dep-e4dc9ea2.js');
+var build = require('./chunks/dep-aff09a4c.js');
 var perf_hooks = require('perf_hooks');
 require('fs');
 require('path');
@@ -22,7 +22,6 @@ require('assert');
 require('buffer');
 require('querystring');
 require('esbuild');
-require('json5');
 require('child_process');
 require('worker_threads');
 require('readline');
@@ -684,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-aff09a4c.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -733,7 +732,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: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.build$1; });
+    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-aff09a4c.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build$1({
@@ -756,7 +755,7 @@ cli
     .command('optimize [root]')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-aff09a4c.js'); }).then(function (n) { return n.index; });
     try {
         const config = await build.resolveConfig({
             root,
@@ -804,4 +803,3 @@ cli
 cli.help();
 cli.version(require('../../package.json').version);
 cli.parse();
-//# sourceMappingURL=cli.js.map

package/dist/node/index.d.ts

@@ -74,6 +74,18 @@ export declare type AnymatchFn = (testString: string) => boolean
 
 export declare type AnymatchPattern = string | RegExp | AnymatchFn
 
+export declare interface AwaitWriteFinishOptions {
+    /**
+     * Amount of time in milliseconds for a file size to remain constant before emitting its event.
+     */
+    stabilityThreshold?: number
+
+    /**
+     * File size polling interval.
+     */
+    pollInterval?: number
+}
+
 /**
  * Bundles the app for production.
  * Returns a Promise containing the build result.
@@ -601,25 +613,25 @@ export declare interface FileSystemServeOptions {
     deny?: string[];
 }
 
-export declare interface FSWatcher extends fs.FSWatcher {
+export declare class FSWatcher extends EventEmitter implements fs.FSWatcher {
     options: WatchOptions
 
     /**
      * Constructs a new FSWatcher instance with optional WatchOptions parameter.
      */
-    (options?: WatchOptions): void
+    constructor(options?: WatchOptions)
 
     /**
      * Add files, directories, or glob patterns for tracking. Takes an array of strings or just one
      * string.
      */
-    add(paths: string | ReadonlyArray<string>): void
+    add(paths: string | ReadonlyArray<string>): this
 
     /**
      * Stop watching files, directories, or glob patterns. Takes an array of strings or just one
      * string.
      */
-    unwatch(paths: string | ReadonlyArray<string>): void
+    unwatch(paths: string | ReadonlyArray<string>): this
 
     /**
      * Returns an object representing all the paths on the file system being watched by this
@@ -1333,6 +1345,7 @@ export declare type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'alia
     root: string;
     base: string;
     publicDir: string;
+    cacheDir: string;
     command: 'build' | 'serve';
     mode: string;
     isProduction: boolean;
@@ -1894,6 +1907,7 @@ export declare interface UserConfig {
      * the performance. You can use `--force` flag or manually delete the directory
      * to regenerate the cache files. The value can be either an absolute file
      * system path or a path relative to <root>.
+     * Default to `.vite` when no package.json is detected.
      * @default 'node_modules/.vite'
      */
     cacheDir?: string;
@@ -2161,7 +2175,7 @@ export declare interface WatchOptions {
 
     /**
      * Whether to use the `fsevents` watching interface if available. When set to `true` explicitly
-     * and `fsevents` is available this supersedes the `usePolling` setting. When set to `false` on
+     * and `fsevents` is available this supercedes the `usePolling` setting. When set to `false` on
      * OS X, `usePolling: true` becomes the default.
      */
     useFsEvents?: boolean
@@ -2208,19 +2222,7 @@ export declare interface WatchOptions {
     /**
      * can be set to an object in order to adjust timing params:
      */
-    awaitWriteFinish?:
-    | {
-        /**
-         * Amount of time in milliseconds for a file size to remain constant before emitting its event.
-         */
-        stabilityThreshold?: number
-
-        /**
-         * File size polling interval.
-         */
-        pollInterval?: number
-    }
-    | boolean
+    awaitWriteFinish?: AwaitWriteFinishOptions | boolean
 }
 
 export declare class WebSocket extends EventEmitter {

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var build = require('./chunks/dep-e4dc9ea2.js');
+var build = require('./chunks/dep-aff09a4c.js');
 require('fs');
 require('path');
 require('tty');
@@ -24,7 +24,6 @@ require('assert');
 require('buffer');
 require('querystring');
 require('esbuild');
-require('json5');
 require('child_process');
 require('worker_threads');
 require('readline');
@@ -50,4 +49,3 @@ exports.searchForWorkspaceRoot = build.searchForWorkspaceRoot;
 exports.send = build.send;
 exports.sortUserPlugins = build.sortUserPlugins;
 exports.transformWithEsbuild = build.transformWithEsbuild;
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.5",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -44,24 +44,23 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "0.14.3",
-    "json5": "^2.2.0",
+    "esbuild": "^0.14.14",
     "postcss": "^8.4.5",
-    "resolve": "^1.20.0",
+    "resolve": "^1.22.0",
     "rollup": "^2.59.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^1.0.2",
-    "@babel/parser": "^7.16.6",
-    "@babel/types": "^7.16.0",
-    "@rollup/plugin-alias": "^3.1.8",
+    "@ampproject/remapping": "^1.1.1",
+    "@babel/parser": "^7.16.12",
+    "@babel/types": "^7.16.8",
+    "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-dynamic-import-vars": "^1.4.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "13.1.1",
+    "@rollup/plugin-node-resolve": "13.1.3",
     "@rollup/plugin-typescript": "^8.3.0",
     "@rollup/pluginutils": "^4.1.2",
     "@types/convert-source-map": "^1.5.2",
@@ -72,15 +71,15 @@
     "@types/less": "^3.0.3",
     "@types/micromatch": "^4.0.2",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.11.17",
+    "@types/node": "^16.11.21",
     "@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.26",
+    "@vue/compiler-dom": "^3.2.29",
     "acorn": "^8.7.0",
     "cac": "6.7.9",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "connect": "^3.7.0",
     "connect-history-api-fallback": "^1.6.0",
@@ -88,36 +87,37 @@
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.3",
-    "dotenv": "^10.0.0",
-    "dotenv-expand": "^5.1.0",
+    "dotenv": "^14.3.2",
+    "dotenv-expand": "^6.0.1",
     "es-module-lexer": "^0.9.3",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
-    "fast-glob": "^3.2.7",
+    "fast-glob": "^3.2.11",
     "http-proxy": "^1.18.1",
+    "json5": "^2.2.0",
     "launch-editor-middleware": "^2.3.0",
     "magic-string": "^0.25.7",
     "micromatch": "^4.0.4",
     "mrmime": "^1.0.0",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.2.1",
     "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.0",
+    "postcss-load-config": "^3.1.1",
     "postcss-modules": "^4.3.0",
     "resolve.exports": "^1.1.0",
-    "rollup-plugin-license": "^2.6.0",
-    "sirv": "^2.0.0",
-    "source-map": "^0.6.1",
+    "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",
-    "tsconfck": "1.1.1",
+    "tsconfck": "1.1.2",
     "tslib": "^2.3.1",
     "types": "link:./types",
-    "ws": "^8.4.0"
+    "ws": "^8.4.2"
   },
   "peerDependencies": {
     "less": "*",

package/src/client/client.ts

@@ -39,6 +39,12 @@ function warnFailedFetch(err: Error, path: string | string[]) {
   )
 }
 
+function cleanUrl(pathname: string): string {
+  const url = new URL(pathname, location.toString())
+  url.searchParams.delete('direct')
+  return url.pathname + url.search
+}
+
 // Listen for messages
 socket.addEventListener('message', async ({ data }) => {
   handleMessage(JSON.parse(data))
@@ -73,21 +79,21 @@ async function handleMessage(payload: HMRPayload) {
         } else {
           // css-update
           // this is only sent when a css file referenced with <link> is updated
-          let { path, timestamp } = update
-          path = path.replace(/\?.*/, '')
+          const { path, timestamp } = update
+          const searchUrl = cleanUrl(path)
           // can't use querySelector with `[href*=]` here since the link may be
           // using relative paths so we need to use link.href to grab the full
           // URL for the include check.
           const el = Array.from(
             document.querySelectorAll<HTMLLinkElement>('link')
-          ).find((e) => e.href.includes(path))
+          ).find((e) => cleanUrl(e.href).includes(searchUrl))
           if (el) {
-            const newPath = `${base}${path.slice(1)}${
-              path.includes('?') ? '&' : '?'
+            const newPath = `${base}${searchUrl.slice(1)}${
+              searchUrl.includes('?') ? '&' : '?'
             }t=${timestamp}`
             el.href = new URL(newPath, el.href).href
           }
-          console.log(`[vite] css hot updated: ${path}`)
+          console.log(`[vite] css hot updated: ${searchUrl}`)
         }
       })
       break

package/types/chokidar.d.ts

@@ -29,27 +29,28 @@ THE SOFTWARE.
 /// <reference types="node" />
 
 import type * as fs from 'fs'
+import { EventEmitter } from 'events'
 import type { Matcher } from './anymatch'
 
-export interface FSWatcher extends fs.FSWatcher {
+export class FSWatcher extends EventEmitter implements fs.FSWatcher {
   options: WatchOptions
 
   /**
    * Constructs a new FSWatcher instance with optional WatchOptions parameter.
    */
-  (options?: WatchOptions): void
+  constructor(options?: WatchOptions)
 
   /**
    * Add files, directories, or glob patterns for tracking. Takes an array of strings or just one
    * string.
    */
-  add(paths: string | ReadonlyArray<string>): void
+  add(paths: string | ReadonlyArray<string>): this
 
   /**
    * Stop watching files, directories, or glob patterns. Takes an array of strings or just one
    * string.
    */
-  unwatch(paths: string | ReadonlyArray<string>): void
+  unwatch(paths: string | ReadonlyArray<string>): this
 
   /**
    * Returns an object representing all the paths on the file system being watched by this
@@ -155,7 +156,7 @@ export interface WatchOptions {
 
   /**
    * Whether to use the `fsevents` watching interface if available. When set to `true` explicitly
-   * and `fsevents` is available this supersedes the `usePolling` setting. When set to `false` on
+   * and `fsevents` is available this supercedes the `usePolling` setting. When set to `false` on
    * OS X, `usePolling: true` becomes the default.
    */
   useFsEvents?: boolean
@@ -202,17 +203,25 @@ export interface WatchOptions {
   /**
    * can be set to an object in order to adjust timing params:
    */
-  awaitWriteFinish?:
-    | {
-        /**
-         * Amount of time in milliseconds for a file size to remain constant before emitting its event.
-         */
-        stabilityThreshold?: number
-
-        /**
-         * File size polling interval.
-         */
-        pollInterval?: number
-      }
-    | boolean
+  awaitWriteFinish?: AwaitWriteFinishOptions | boolean
 }
+
+export interface AwaitWriteFinishOptions {
+  /**
+   * Amount of time in milliseconds for a file size to remain constant before emitting its event.
+   */
+  stabilityThreshold?: number
+
+  /**
+   * File size polling interval.
+   */
+  pollInterval?: number
+}
+
+/**
+ * produces an instance of `FSWatcher`.
+ */
+export function watch(
+  paths: string | ReadonlyArray<string>,
+  options?: WatchOptions
+): FSWatcher

package/types/importMeta.d.ts

@@ -4,6 +4,15 @@
 
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
+// Duplicate import('../src/node/importGlob').AssertOptions
+// Avoid breaking the production client type because this file is referenced
+// in vite/client.d.ts and in production src/node/importGlob.ts doesn't exist
+interface AssertOptions {
+  assert?: {
+    type: string
+  }
+}
+
 interface ImportMeta {
   url: string
 
@@ -50,14 +59,20 @@ interface ImportMeta {
 
   readonly env: ImportMetaEnv
 
-  glob(pattern: string): Record<
+  glob(
+    pattern: string,
+    options?: AssertOptions
+  ): Record<
     string,
     () => Promise<{
       [key: string]: any
     }>
   >
 
-  globEager(pattern: string): Record<
+  globEager(
+    pattern: string,
+    options?: AssertOptions
+  ): Record<
     string,
     {
       [key: string]: any