vite 3.0.0-alpha.1 → 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,18 +1,34 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.1",
+  "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"
   ],
@@ -29,12 +45,12 @@
   },
   "homepage": "https://github.com/vitejs/vite/tree/main/#readme",
   "scripts": {
-    "dev": "rimraf dist && rollup -c -w",
+    "dev": "rimraf dist && pnpm run build-bundle -w",
     "build": "rimraf dist && run-s build-bundle build-types",
-    "build-bundle": "rollup -c",
+    "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",
-    "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\"",
@@ -75,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",

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.
@@ -212,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

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/importGlob.d.ts

@@ -1,5 +1,3 @@
-import type { Worker } from 'okie'
-
 export interface ImportGlobOptions<
   Eager extends boolean,
   AsType extends string
@@ -35,7 +33,7 @@ export type GeneralImportGlobOptions = ImportGlobOptions<boolean, string>
 export interface KnownAsTypeMap {
   raw: string
   url: string
-  worker: Worker<any, any>
+  worker: Worker
 }
 
 export interface ImportGlobFunction {