vite 2.9.9 → 3.0.0-alpha.2

package/index.cjs

@@ -0,0 +1,33 @@
+/* eslint-disable no-restricted-globals */
+
+// type utils
+module.exports.defineConfig = (config) => config
+
+// proxy cjs utils (sync functions)
+Object.assign(module.exports, require('./dist/node-cjs/publicUtils.cjs'))
+
+// async functions, can be redirect from ESM build
+const asyncFunctions = [
+  'build',
+  'createServer',
+  'preview',
+  'transformWithEsbuild',
+  'resolveConfig',
+  'optimizeDeps',
+  'formatPostcssSourceMap',
+  'loadConfigFromFile'
+]
+asyncFunctions.forEach((name) => {
+  module.exports[name] = (...args) =>
+    import('./dist/node/index.js').then((i) => i[name](...args))
+})
+
+// some sync functions are marked not supported due to their complexity and uncommon usage
+const unsupportedCJS = ['resolvePackageEntry', 'resolvePackageData']
+unsupportedCJS.forEach((name) => {
+  module.exports[name] = () => {
+    throw new Error(
+      `"${name}" is not supported in CJS build of Vite 3.\nPlease use ESM or dynamic imports \`const { ${name} } = await import('vite')\`.`
+    )
+  }
+})

package/package.json

@@ -1,23 +1,39 @@
 {
   "name": "vite",
-  "version": "2.9.9",
+  "version": "3.0.0-alpha.2",
+  "type": "module",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
   "bin": {
     "vite": "bin/vite.js"
   },
-  "main": "dist/node/index.js",
-  "types": "dist/node/index.d.ts",
+  "main": "./dist/node/index.js",
+  "module": "./dist/node/index.js",
+  "types": "./dist/node/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/node/index.d.ts",
+      "import": "./dist/node/index.js",
+      "require": "./index.cjs"
+    },
+    "./client": {
+      "types": "./client.d.ts"
+    },
+    "./terser": {
+      "require": "./dist/node-cjs/terser.cjs"
+    }
+  },
   "files": [
     "bin",
     "dist",
     "client.d.ts",
+    "index.cjs",
     "src/client",
     "types"
   ],
   "engines": {
-    "node": ">=12.2.0"
+    "node": ">=14.6.0"
   },
   "repository": {
     "type": "git",
@@ -29,13 +45,12 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/#readme",
   "scripts": {
-    "dev": "rimraf dist && rollup -c -w",
-    "build": "rimraf dist && npm run lint && run-s build-bundle build-types",
-    "build-bundle": "rollup -c",
+    "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",
     "build-temp-types": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
-    "ci-build": "rimraf dist && run-s build-bundle build-types",
-    "patch-types": "ts-node scripts/patchTypes.ts",
+    "patch-types": "esno scripts/patchTypes.ts",
     "roll-types": "api-extractor run && rimraf temp",
     "lint": "eslint --ext .ts src/**",
     "format": "prettier --write --parser typescript \"src/**/*.ts\"",
@@ -43,10 +58,10 @@
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.14.27",
+    "esbuild": "^0.14.38",
     "postcss": "^8.4.13",
     "resolve": "^1.22.0",
-    "rollup": "^2.59.0"
+    "rollup": "^2.72.1"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -55,7 +70,7 @@
     "@ampproject/remapping": "^2.2.0",
     "@babel/parser": "^7.17.10",
     "@babel/types": "^7.17.10",
-    "@jridgewell/trace-mapping": "^0.3.9",
+    "@jridgewell/trace-mapping": "^0.3.10",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^21.1.0",
     "@rollup/plugin-dynamic-import-vars": "^1.4.3",
@@ -63,19 +78,6 @@
     "@rollup/plugin-node-resolve": "13.2.1",
     "@rollup/plugin-typescript": "^8.3.2",
     "@rollup/pluginutils": "^4.2.1",
-    "@types/convert-source-map": "^1.5.2",
-    "@types/cross-spawn": "^6.0.2",
-    "@types/debug": "^4.1.7",
-    "@types/estree": "^0.0.51",
-    "@types/etag": "^1.8.1",
-    "@types/less": "^3.0.3",
-    "@types/micromatch": "^4.0.2",
-    "@types/mime": "^2.0.3",
-    "@types/node": "^17.0.25",
-    "@types/resolve": "^1.20.2",
-    "@types/sass": "~1.43.1",
-    "@types/stylus": "^0.48.37",
-    "@types/ws": "^8.5.3",
     "@vue/compiler-dom": "^3.2.33",
     "acorn": "^8.7.1",
     "cac": "6.7.9",
@@ -89,6 +91,7 @@
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
     "es-module-lexer": "^0.10.5",
+    "esno": "^0.16.3",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
@@ -112,11 +115,12 @@
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
-    "strip-literal": "^0.2.0",
+    "strip-literal": "^0.3.0",
     "terser": "^5.13.1",
-    "tsconfck": "^1.2.2",
+    "tsconfck": "^2.0.0",
     "tslib": "^2.4.0",
     "types": "link:./types",
+    "ufo": "^0.8.4",
     "ws": "^8.6.0"
   },
   "peerDependencies": {

package/src/client/client.ts

@@ -13,16 +13,35 @@ declare const __HMR_PORT__: string
 declare const __HMR_TIMEOUT__: number
 declare const __HMR_ENABLE_OVERLAY__: boolean
 
-console.log('[vite] connecting...')
+console.debug('[vite] connecting...')
 
 // use server configuration, then fallback to inference
 const socketProtocol =
   __HMR_PROTOCOL__ || (location.protocol === 'https:' ? 'wss' : 'ws')
 const socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`
-const socket = new WebSocket(`${socketProtocol}://${socketHost}`, 'vite-hmr')
 const base = __BASE__ || '/'
 const messageBuffer: string[] = []
 
+let socket: WebSocket
+try {
+  socket = new WebSocket(`${socketProtocol}://${socketHost}`, 'vite-hmr')
+
+  // Listen for messages
+  socket.addEventListener('message', async ({ data }) => {
+    handleMessage(JSON.parse(data))
+  })
+
+  // ping server
+  socket.addEventListener('close', async ({ wasClean }) => {
+    if (wasClean) return
+    console.log(`[vite] server connection lost. polling for restart...`)
+    await waitForSuccessfulPing()
+    location.reload()
+  })
+} catch (error) {
+  console.error(`[vite] failed to connect to websocket (${error}). `)
+}
+
 function warnFailedFetch(err: Error, path: string | string[]) {
   if (!err.message.match('fetch')) {
     console.error(err)
@@ -40,17 +59,12 @@ function cleanUrl(pathname: string): string {
   return url.pathname + url.search
 }
 
-// Listen for messages
-socket.addEventListener('message', async ({ data }) => {
-  handleMessage(JSON.parse(data))
-})
-
 let isFirstUpdate = true
 
 async function handleMessage(payload: HMRPayload) {
   switch (payload.type) {
     case 'connected':
-      console.log(`[vite] connected.`)
+      console.debug(`[vite] connected.`)
       sendMessageBuffer()
       // proxy(nginx, docker) hmr ws maybe caused timeout,
       // so send ping package let ws keep alive.
@@ -106,6 +120,7 @@ async function handleMessage(payload: HMRPayload) {
         const payloadPath = base + payload.path.slice(1)
         if (
           pagePath === payloadPath ||
+          payload.path === '/index.html' ||
           (pagePath.endsWith('/') && pagePath + 'index.html' === payloadPath)
         ) {
           location.reload()
@@ -200,12 +215,10 @@ async function waitForSuccessfulPing(ms = 1000) {
   // eslint-disable-next-line no-constant-condition
   while (true) {
     try {
-      const pingResponse = await fetch(`${base}__vite_ping`)
-
-      // success - 2xx status code
-      if (pingResponse.ok) break
-      // failure - non-2xx status code
-      else throw new Error()
+      // A fetch on a websocket URL will return a successful promise with status 400,
+      // but will reject a networking error.
+      await fetch(`${location.protocol}//${socketHost}`)
+      break
     } catch (e) {
       // wait ms before attempting to ping again
       await new Promise((resolve) => setTimeout(resolve, ms))
@@ -213,14 +226,6 @@ async function waitForSuccessfulPing(ms = 1000) {
   }
 }
 
-// ping server
-socket.addEventListener('close', async ({ wasClean }) => {
-  if (wasClean) return
-  console.log(`[vite] server connection lost. polling for restart...`)
-  await waitForSuccessfulPing()
-  location.reload()
-})
-
 // https://wicg.github.io/construct-stylesheets
 const supportsConstructedSheet = (() => {
   // TODO: re-enable this try block once Chrome fixes the performance of
@@ -432,13 +437,6 @@ export function createHotContext(ownerPath: string): ViteHotContext {
       }
     },
 
-    acceptDeps() {
-      throw new Error(
-        `hot.acceptDeps() is deprecated. ` +
-          `Use hot.accept() with the same signature instead.`
-      )
-    },
-
     dispose(cb) {
       disposeMap.set(ownerPath, cb)
     },

package/src/client/tsconfig.json

@@ -3,7 +3,7 @@
   "include": ["./", "../../types"],
   "compilerOptions": {
     "outDir": "../../dist/client",
-    "module": "esnext",
+    "module": "ESNext",
     "types": [],
     "lib": ["ESNext", "DOM"],
     "declaration": false

package/types/chokidar.d.ts

@@ -140,8 +140,10 @@ export interface WatchOptions {
   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.
+   * 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
 

package/types/hot.d.ts

@@ -7,12 +7,6 @@ export interface ViteHotContext {
   accept(cb: (mod: any) => void): void
   accept(dep: string, cb: (mod: any) => void): void
   accept(deps: readonly string[], cb: (mods: any[]) => void): void
-
-  /**
-   * @deprecated
-   */
-  acceptDeps(): never
-
   dispose(cb: (data: any) => void): void
   decline(): void
   invalidate(): void

package/types/importGlob.d.ts

@@ -0,0 +1,87 @@
+export interface ImportGlobOptions<
+  Eager extends boolean,
+  AsType extends string
+> {
+  /**
+   * Import type for the import url.
+   */
+  as?: AsType
+  /**
+   * Import as static or dynamic
+   *
+   * @default false
+   */
+  eager?: Eager
+  /**
+   * Import only the specific named export. Set to `default` to import the default export.
+   */
+  import?: string
+  /**
+   * Custom queries
+   */
+  query?: string | Record<string, string | number | boolean>
+  /**
+   * Search files also inside `node_modules/` and hidden directories (e.g. `.git/`). This might have impact on performance.
+   *
+   * @default false
+   */
+  exhaustive?: boolean
+}
+
+export type GeneralImportGlobOptions = ImportGlobOptions<boolean, string>
+
+export interface KnownAsTypeMap {
+  raw: string
+  url: string
+  worker: Worker
+}
+
+export interface ImportGlobFunction {
+  /**
+   * 1. No generic provided, infer the type from `eager` and `as`
+   */
+  <
+    Eager extends boolean,
+    As extends string,
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+  >(
+    glob: string | string[],
+    options?: ImportGlobOptions<Eager, As>
+  ): (Eager extends true ? true : false) extends true
+    ? Record<string, T>
+    : Record<string, () => Promise<T>>
+  /**
+   * 2. Module generic provided, infer the type from `eager: false`
+   */
+  <M>(
+    glob: string | string[],
+    options?: ImportGlobOptions<false, string>
+  ): Record<string, () => Promise<M>>
+  /**
+   * 3. Module generic provided, infer the type from `eager: true`
+   */
+  <M>(
+    glob: string | string[],
+    options: ImportGlobOptions<true, string>
+  ): Record<string, M>
+}
+
+export interface ImportGlobEagerFunction {
+  /**
+   * 1. No generic provided, infer the type from `as`
+   */
+  <
+    As extends string,
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+  >(
+    glob: string | string[],
+    options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>
+  ): Record<string, T>
+  /**
+   * 2. Module generic provided
+   */
+  <M>(
+    glob: string | string[],
+    options?: Omit<ImportGlobOptions<boolean, string>, 'eager'>
+  ): Record<string, M>
+}

package/types/importMeta.d.ts

@@ -9,12 +9,6 @@
 // in vite/client.d.ts and in production src/node/importGlob.ts doesn't exist.
 interface GlobOptions {
   as?: string
-  /**
-   * @deprecated
-   */
-  assert?: {
-    type: string
-  }
 }
 
 interface ImportMeta {
@@ -24,15 +18,11 @@ interface ImportMeta {
 
   readonly env: ImportMetaEnv
 
-  glob<Module = { [key: string]: any }>(
-    pattern: string,
-    options?: GlobOptions
-  ): Record<string, () => Promise<Module>>
-
-  globEager<Module = { [key: string]: any }>(
-    pattern: string,
-    options?: GlobOptions
-  ): Record<string, Module>
+  glob: import('./importGlob').ImportGlobFunction
+  /**
+   * @deprecated Use `import.meta.glob('*', { eager: true })` instead
+   */
+  globEager: import('./importGlob').ImportGlobEagerFunction
 }
 
 interface ImportMetaEnv {

package/types/shims.d.ts

@@ -28,7 +28,7 @@ declare module 'launch-editor-middleware' {
 }
 
 declare module 'postcss-load-config' {
-  import type { ProcessOptions, Plugin } from 'postcss'
+  import type { Plugin, ProcessOptions } from 'postcss'
   function load(
     inline: any,
     root: string
@@ -59,6 +59,7 @@ declare module 'postcss-modules' {
 
 declare module '@rollup/plugin-dynamic-import-vars' {
   import type { Plugin } from 'rollup'
+  import type { BaseNode } from 'estree'
 
   interface Options {
     include?: string | RegExp | (string | RegExp)[]
@@ -68,6 +69,10 @@ declare module '@rollup/plugin-dynamic-import-vars' {
 
   const p: (o?: Options) => Plugin
   export default p
+  export function dynamicImportToGlob(
+    ast: BaseNode,
+    source: string
+  ): null | string
 }
 
 declare module 'rollup-plugin-web-worker-loader' {
@@ -85,14 +90,6 @@ declare module 'rollup-plugin-web-worker-loader' {
   export default p
 }
 
-declare module 'micromatch' {
-  export function isMatch(
-    path: string,
-    pattern: string,
-    options?: { matchBase?: boolean }
-  ): boolean
-}
-
 // LESS' types somewhat references this which doesn't make sense in Node,
 // so we have to shim it
 declare interface HTMLLinkElement {}

package/types/terser.d.ts

@@ -185,8 +185,6 @@ export namespace Terser {
     module?: boolean
     nameCache?: object
     format?: FormatOptions
-    /** @deprecated use format instead */
-    output?: FormatOptions
     parse?: ParseOptions
     safari10?: boolean
     sourceMap?: boolean | SourceMapOptions

package/types/ws.d.ts

@@ -20,9 +20,9 @@ import type {
   Agent,
   ClientRequest,
   ClientRequestArgs,
+  Server as HTTPServer,
   IncomingMessage,
-  OutgoingHttpHeaders,
-  Server as HTTPServer
+  OutgoingHttpHeaders
 } from 'http'
 import type { Server as HTTPSServer } from 'https'
 import type { Duplex, DuplexOptions } from 'stream'