vite 3.1.3 → 3.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.1.3",
+  "version": "3.2.0-beta.0",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -47,35 +47,36 @@
     "dev": "rimraf dist && pnpm run build-bundle -w",
     "build": "rimraf dist && run-s build-bundle build-types",
     "build-bundle": "rollup --config rollup.config.ts --configPlugin typescript",
-    "build-types": "run-s build-temp-types patch-types roll-types check-dist-types",
-    "build-temp-types": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
-    "patch-types": "tsx scripts/patchTypes.ts",
-    "roll-types": "api-extractor run && rimraf temp",
-    "check-dist-types": "tsc --project tsconfig.check.json",
+    "build-types": "run-s build-types-temp build-types-pre-patch build-types-roll build-types-post-patch build-types-check",
+    "build-types-temp": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
+    "build-types-pre-patch": "tsx scripts/prePatchTypes.ts",
+    "build-types-roll": "api-extractor run && rimraf temp",
+    "build-types-post-patch": "tsx scripts/postPatchTypes.ts",
+    "build-types-check": "tsc --project tsconfig.check.json",
     "lint": "eslint --cache --ext .ts src/**",
     "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.15.6",
-    "postcss": "^8.4.16",
+    "esbuild": "^0.15.9",
+    "postcss": "^8.4.17",
     "resolve": "^1.22.1",
-    "rollup": "~2.78.0"
+    "rollup": "^2.79.1"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.19.0",
-    "@babel/types": "^7.19.0",
+    "@babel/parser": "^7.19.3",
+    "@babel/types": "^7.19.3",
     "@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": "14.0.1",
+    "@rollup/plugin-node-resolve": "14.1.0",
     "@rollup/plugin-typescript": "^8.5.0",
     "@rollup/pluginutils": "^4.2.1",
     "acorn": "^8.8.0",
@@ -96,15 +97,16 @@
     "http-proxy": "^1.18.1",
     "json5": "^2.2.1",
     "launch-editor-middleware": "^2.6.0",
-    "magic-string": "^0.26.3",
+    "magic-string": "^0.26.5",
     "micromatch": "^4.0.5",
-    "mlly": "^0.5.14",
+    "mlly": "^0.5.16",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
     "parse5": "^7.1.1",
     "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
+    "picomatch": "^2.3.1",
     "postcss-import": "^15.0.0",
     "postcss-load-config": "^4.0.1",
     "postcss-modules": "^5.0.0",
@@ -113,17 +115,19 @@
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.0.1",
-    "strip-literal": "^0.4.0",
+    "strip-literal": "^0.4.2",
     "tsconfck": "^2.0.1",
     "tslib": "^2.4.0",
+    "dep-types": "link:./src/types",
     "types": "link:./types",
     "ufo": "^0.8.5",
-    "ws": "^8.8.1"
+    "ws": "^8.9.0"
   },
   "peerDependencies": {
     "less": "*",
     "sass": "*",
     "stylus": "*",
+    "sugarss": "*",
     "terser": "^5.4.0"
   },
   "peerDependenciesMeta": {
@@ -136,6 +140,9 @@
     "less": {
       "optional": true
     },
+    "sugarss": {
+      "optional": true
+    },
     "terser": {
       "optional": true
     }

package/src/client/client.ts

@@ -364,6 +364,7 @@ export function updateStyle(id: string, content: string): void {
     if (!style) {
       style = document.createElement('style')
       style.setAttribute('type', 'text/css')
+      style.setAttribute('data-vite-dev-id', id)
       style.innerHTML = content
       document.head.appendChild(style)
     } else {
@@ -545,10 +546,10 @@ export function createHotContext(ownerPath: string): ViteHotContext {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     decline() {},
 
+    // tell the server to re-perform hmr propagation from this module as root
     invalidate() {
-      // TODO should tell the server to re-perform hmr propagation
-      // from this module as root
-      location.reload()
+      notifyListeners('vite:invalidate', { path: ownerPath })
+      this.send('vite:invalidate', { path: ownerPath })
     },
 
     // custom events

package/src/client/overlay.ts

@@ -9,6 +9,17 @@ const template = /*html*/ `
   left: 0;
   width: 100%;
   height: 100%;
+
+  --monospace: 'SFMono-Regular', Consolas,
+  'Liberation Mono', Menlo, Courier, monospace;
+  --red: #ff5555;
+  --yellow: #e2aa53;
+  --purple: #cfa4ff;
+  --cyan: #2dd9da;
+  --dim: #c9c9c9;
+
+  --window-background: #181818;
+  --window-color: #d8d8d8;
 }
 
 .backdrop {
@@ -21,24 +32,17 @@ const template = /*html*/ `
   overflow-y: scroll;
   margin: 0;
   background: rgba(0, 0, 0, 0.66);
-  --monospace: 'SFMono-Regular', Consolas,
-              'Liberation Mono', Menlo, Courier, monospace;
-  --red: #ff5555;
-  --yellow: #e2aa53;
-  --purple: #cfa4ff;
-  --cyan: #2dd9da;
-  --dim: #c9c9c9;
 }
 
 .window {
   font-family: var(--monospace);
   line-height: 1.5;
   width: 800px;
-  color: #d8d8d8;
+  color: var(--window-color);
   margin: 30px auto;
   padding: 25px 40px;
   position: relative;
-  background: #181818;
+  background: var(--window-background);
   border-radius: 6px 6px 8px 8px;
   box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22);
   overflow: hidden;
@@ -108,13 +112,13 @@ code {
   cursor: pointer;
 }
 </style>
-<div class="backdrop">
-  <div class="window">
-    <pre class="message"><span class="plugin"></span><span class="message-body"></span></pre>
-    <pre class="file"></pre>
-    <pre class="frame"></pre>
-    <pre class="stack"></pre>
-    <div class="tip">
+<div class="backdrop" part="backdrop">
+  <div class="window" part="window">
+    <pre class="message" part="message"><span class="plugin"></span><span class="message-body"></span></pre>
+    <pre class="file" part="file"></pre>
+    <pre class="frame" part="frame"></pre>
+    <pre class="stack" part="stack"></pre>
+    <div class="tip" part="tip">
       Click outside or fix the code to dismiss.<br>
       You can also disable this overlay by setting
       <code>server.hmr.overlay</code> to <code>false</code> in <code>vite.config.js.</code>
@@ -132,7 +136,7 @@ const { HTMLElement = class {} as typeof globalThis.HTMLElement } = globalThis
 export class ErrorOverlay extends HTMLElement {
   root: ShadowRoot
 
-  constructor(err: ErrorPayload['err']) {
+  constructor(err: ErrorPayload['err'], links = true) {
     super()
     this.root = this.attachShadow({ mode: 'open' })
     this.root.innerHTML = template
@@ -149,7 +153,7 @@ export class ErrorOverlay extends HTMLElement {
 
     const [file] = (err.loc?.file || err.id || 'unknown file').split(`?`)
     if (err.loc) {
-      this.text('.file', `${file}:${err.loc.line}:${err.loc.column}`, true)
+      this.text('.file', `${file}:${err.loc.line}:${err.loc.column}`, links)
     } else if (err.id) {
       this.text('.file', file)
     }
@@ -157,7 +161,7 @@ export class ErrorOverlay extends HTMLElement {
     if (hasFrame) {
       this.text('.frame', err.frame!.trim())
     }
-    this.text('.stack', err.stack, true)
+    this.text('.stack', err.stack, links)
 
     this.root.querySelector('.window')!.addEventListener('click', (e) => {
       e.stopPropagation()

package/src/client/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["./", "../../types"],
+  "include": ["./", "../types"],
   "compilerOptions": {
     "types": [],
     "target": "ES2019",

package/types/alias.d.ts

@@ -1,59 +1,6 @@
-/**
-Types from https://github.com/rollup/plugins/blob/master/packages/alias/types/index.d.ts
-Inlined because the plugin is bundled.
-
-https://github.com/rollup/plugins/blob/master/LICENSE
-
-The MIT License (MIT)
-
-Copyright (c) 2019 RollupJS Plugin Contributors (https://github.com/rollup/plugins/graphs/contributors)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-import type { PluginHooks } from 'rollup'
-
-export interface Alias {
-  find: string | RegExp
-  replacement: string
-  /**
-   * Instructs the plugin to use an alternative resolving algorithm,
-   * rather than the Rollup's resolver.
-   * @default null
-   */
-  customResolver?: ResolverFunction | ResolverObject | null
-}
-
-export type ResolverFunction = PluginHooks['resolveId']
-
-export interface ResolverObject {
-  buildStart?: PluginHooks['buildStart']
-  resolveId: ResolverFunction
-}
-
-/**
- * Specifies an `Object`, or an `Array` of `Object`,
- * which defines aliases used to replace values in `import` or `require` statements.
- * With either format, the order of the entries is important,
- * in that the first defined rules are applied first.
- *
- * This is passed to \@rollup/plugin-alias as the "entries" field
- * https://github.com/rollup/plugins/tree/master/packages/alias#entries
- */
-export type AliasOptions = readonly Alias[] | { [find: string]: string }
+export type {
+  Alias,
+  ResolverFunction,
+  ResolverObject,
+  AliasOptions
+} from '../dist/node'

package/types/anymatch.d.ts

@@ -1,5 +1 @@
-export type AnymatchFn = (testString: string) => boolean
-export type AnymatchPattern = string | RegExp | AnymatchFn
-type AnymatchMatcher = AnymatchPattern | AnymatchPattern[]
-
-export { AnymatchMatcher as Matcher }
+export type { AnymatchFn, AnymatchPattern, Matcher } from '../dist/node'

package/types/chokidar.d.ts

@@ -1,228 +1,10 @@
-// Inlined to avoid extra dependency (chokidar is bundled in the published build)
+export type {
+  FSWatcher,
+  WatchOptions,
+  AwaitWriteFinishOptions
+} from '../dist/node'
 
-// https://github.com/paulmillr/chokidar/blob/master/types/index.d.ts
-// MIT Licensed https://github.com/paulmillr/chokidar/blob/master/LICENSE
-
-/**
-The MIT License (MIT)
-
-Copyright (c) 2012-2019 Paul Miller (https://paulmillr.com), Elan Shanker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-/// <reference types="node" />
-
-import type * as fs from 'node:fs'
-import { EventEmitter } from 'node:events'
-import type { Matcher } from './anymatch'
-
-export class FSWatcher extends EventEmitter implements fs.FSWatcher {
-  options: WatchOptions
-
-  /**
-   * Constructs a new FSWatcher instance with optional WatchOptions parameter.
-   */
-  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>): this
-
-  /**
-   * Stop watching files, directories, or glob patterns. Takes an array of strings or just one
-   * string.
-   */
-  unwatch(paths: string | ReadonlyArray<string>): this
-
-  /**
-   * Returns an object representing all the paths on the file system being watched by this
-   * `FSWatcher` instance. The object's keys are all the directories (using absolute paths unless
-   * the `cwd` option was used), and the values are arrays of the names of the items contained in
-   * each directory.
-   */
-  getWatched(): {
-    [directory: string]: string[]
-  }
-
-  /**
-   * Removes all listeners from watched files.
-   */
-  close(): Promise<void>
-
-  on(
-    event: 'add' | 'addDir' | 'change',
-    listener: (path: string, stats?: fs.Stats) => void
-  ): this
-
-  on(
-    event: 'all',
-    listener: (
-      eventName: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir',
-      path: string,
-      stats?: fs.Stats
-    ) => void
-  ): this
-
-  /**
-   * Error occurred
-   */
-  on(event: 'error', listener: (error: Error) => void): this
-
-  /**
-   * Exposes the native Node `fs.FSWatcher events`
-   */
-  on(
-    event: 'raw',
-    listener: (eventName: string, path: string, details: any) => void
-  ): this
-
-  /**
-   * Fires when the initial scan is complete
-   */
-  on(event: 'ready', listener: () => void): this
-
-  on(event: 'unlink' | 'unlinkDir', listener: (path: string) => void): this
-
-  on(event: string, listener: (...args: any[]) => void): this
-}
-
-export interface WatchOptions {
-  /**
-   * Indicates whether the process should continue to run as long as files are being watched. If
-   * set to `false` when using `fsevents` to watch, no more events will be emitted after `ready`,
-   * even if the process continues to run.
-   */
-  persistent?: boolean
-
-  /**
-   * ([anymatch](https://github.com/micromatch/anymatch)-compatible definition) Defines files/paths to
-   * be ignored. The whole relative or absolute path is tested, not just filename. If a function
-   * with two arguments is provided, it gets called twice per path - once with a single argument
-   * (the path), second time with two arguments (the path and the
-   * [`fs.Stats`](https://nodejs.org/api/fs.html#fs_class_fs_stats) object of that path).
-   */
-  ignored?: Matcher
-
-  /**
-   * If set to `false` then `add`/`addDir` events are also emitted for matching paths while
-   * instantiating the watching as chokidar discovers these file paths (before the `ready` event).
-   */
-  ignoreInitial?: boolean
-
-  /**
-   * When `false`, only the symlinks themselves will be watched for changes instead of following
-   * the link references and bubbling events through the link's path.
-   */
-  followSymlinks?: boolean
-
-  /**
-   * The base directory from which watch `paths` are to be derived. Paths emitted with events will
-   * be relative to this.
-   */
-  cwd?: string
-
-  /**
-   * If set to true then the strings passed to .watch() and .add() are treated as literal path
-   * names, even if they look like globs.
-   *
-   * @default false
-   */
-  disableGlobbing?: boolean
-
-  /**
-   * Whether to use fs.watchFile (backed by polling), or fs.watch. If polling leads to high CPU
-   * utilization, consider setting this to `false`. It is typically necessary to **set this to
-   * `true` to successfully watch files over a network**, and it may be necessary to successfully
-   * watch files in other non-standard situations. Setting to `true` explicitly on OS X overrides
-   * the `useFsEvents` default.
-   */
-  usePolling?: boolean
-
-  /**
-   * Whether to use the `fsevents` watching interface if available. When set to `true` explicitly
-   * and `fsevents` is available this supercedes the `usePolling` setting. When set to `false` on
-   * OS X, `usePolling: true` becomes the default.
-   */
-  useFsEvents?: boolean
-
-  /**
-   * If relying upon the [`fs.Stats`](https://nodejs.org/api/fs.html#fs_class_fs_stats) object that
-   * may get passed with `add`, `addDir`, and `change` events, set this to `true` to ensure it is
-   * provided even in cases where it wasn't already available from the underlying watch events.
-   */
-  alwaysStat?: boolean
-
-  /**
-   * If set, limits how many levels of subdirectories will be traversed.
-   */
-  depth?: number
-
-  /**
-   * Interval of file system polling.
-   */
-  interval?: number
-
-  /**
-   * Interval of file system polling for binary files. ([see list of binary extensions](https://gi
-   * thub.com/sindresorhus/binary-extensions/blob/master/binary-extensions.json))
-   */
-  binaryInterval?: number
-
-  /**
-   *  Indicates whether to watch files that don't have read permissions if possible. If watching
-   *  fails due to `EPERM` or `EACCES` with this set to `true`, the errors will be suppressed
-   *  silently.
-   */
-  ignorePermissionErrors?: boolean
-
-  /**
-   * `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,
-   * you can override it by setting `atomic` to a custom value, in milliseconds.
-   */
-  atomic?: boolean | number
-
-  /**
-   * can be set to an object in order to adjust timing params:
-   */
-  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`.
- */
+import type { FSWatcher, WatchOptions } from '../dist/node'
 export function watch(
   paths: string | ReadonlyArray<string>,
   options?: WatchOptions