refactor(types): bundle client types

.eslintignore

@@ -1,4 +1,4 @@
 dist
 playground-temp
 temp
-
+packages/vite/client/types.d.ts

.gitignore

@@ -5,6 +5,7 @@
 *.local
 *.log
 /.vscode/
+/packages/vite/client/types.d.ts
 /packages/vite/LICENSE
 dist
 dist-ssr

.prettierignore

@@ -9,3 +9,4 @@ playground/tsconfig-json-load-error/has-error/tsconfig.json
 playground/html/invalid.html
 playground/html/valid.html
 playground/worker/classic-worker.js
+packages/vite/client/types.d.ts

docs/guide/api-plugin.md

@@ -595,9 +595,9 @@ It is possible to type custom events by extending the `CustomEventMap` interface
 
 ```ts
 // events.d.ts
-import 'vite/types/customEvent'
+import 'vite/client/types'
 
-declare module 'vite/types/customEvent' {
+declare module 'vite/client/types' {
   interface CustomEventMap {
     'custom:foo': { msg: string }
     // 'event-key': payload

packages/vite/api-extractor.client.json

@@ -0,0 +1,54 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  "projectFolder": "./src/client",
+
+  "mainEntryPointFilePath": "./src/client-types.d.ts",
+
+  "dtsRollup": {
+    "enabled": true,
+    "untrimmedFilePath": "",
+    "publicTrimmedFilePath": "./client/types.d.ts"
+  },
+
+  "apiReport": {
+    "enabled": false
+  },
+
+  "docModel": {
+    "enabled": false
+  },
+
+  "tsdocMetadata": {
+    "enabled": false
+  },
+
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    },
+
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "warning",
+        "addToApiReportFile": true
+      },
+
+      "ae-missing-release-tag": {
+        "logLevel": "none"
+      }
+    },
+
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      },
+
+      "tsdoc-undefined-tag": {
+        "logLevel": "none"
+      }
+    }
+  }
+}

packages/vite/client.d.ts

@@ -1,4 +1,4 @@
-/// <reference path="./types/importMeta.d.ts" />
+/// <reference path="./import-meta.d.ts" />
 
 // CSS modules
 type CSSModuleClasses = { readonly [key: string]: string }

packages/vite/import-meta.d.ts

@@ -0,0 +1,9 @@
+import type {
+  ImportMeta as ViteImportMeta,
+  ImportMetaEnv as ViteImportMetaEnv
+} from './client/types'
+
+declare global {
+  interface ImportMeta extends ViteImportMeta {}
+  interface ImportMetaEnv extends ViteImportMetaEnv {}
+}

packages/vite/package.json

@@ -20,16 +20,21 @@
     "./client": {
       "types": "./client.d.ts"
     },
+    "./client/types": {
+      "types": "./client/types.d.ts"
+    },
     "./dist/client/*": "./dist/client/*",
     "./package.json": "./package.json"
   },
   "files": [
     "bin",
     "dist",
     "client.d.ts",
+    "import-meta.d.ts",
     "index.cjs",
     "src/client",
-    "types"
+    "types",
+    "client/types.d.ts"
   ],
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
@@ -47,11 +52,13 @@
     "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-p build-node-types build-client-types",
+    "build-node-types": "run-s build-node-types-temp build-node-types-patch build-node-types-roll build-node-types-check",
+    "build-node-types-temp": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
+    "build-node-types-patch": "tsx scripts/patchTypes.ts",
+    "build-node-types-roll": "api-extractor run && rimraf temp",
+    "build-node-types-check": "tsc --project tsconfig.check.json",
+    "build-client-types": "api-extractor run -c api-extractor.client.json",
     "lint": "eslint --cache --ext .ts src/**",
     "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"

packages/vite/src/client-types.d.ts

@@ -0,0 +1,23 @@
+export type {
+  CustomEventMap,
+  InferCustomEventPayload
+} from './types/customEvent'
+export type {
+  HMRPayload,
+  ConnectedPayload,
+  UpdatePayload,
+  Update,
+  PrunePayload,
+  FullReloadPayload,
+  CustomPayload,
+  ErrorPayload
+} from './types/hmrPayload'
+export type { ModuleNamespace, ViteHotContext } from './types/hot'
+export type {
+  ImportGlobOptions,
+  GeneralImportGlobOptions,
+  KnownAsTypeMap,
+  ImportGlobFunction,
+  ImportGlobEagerFunction
+} from './types/importGlob'
+export type { ImportMetaEnv, ImportMeta } from './types/importMeta'

packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.test.ts.snap

@@ -1,8 +1,7 @@
 // Vitest Snapshot v1
 
 exports[`fixture > transform 1`] = `
-"import * as __vite_glob_1_0 from \\"./modules/a.ts\\";import * as __vite_glob_1_1 from \\"./modules/b.ts\\";import * as __vite_glob_1_2 from \\"./modules/index.ts\\";import { name as __vite_glob_3_0 } from \\"./modules/a.ts\\";import { name as __vite_glob_3_1 } from \\"./modules/b.ts\\";import { name as __vite_glob_3_2 } from \\"./modules/index.ts\\";import { default as __vite_glob_5_0 } from \\"./modules/a.ts?raw\\";import { default as __vite_glob_5_1 } from \\"./modules/b.ts?raw\\";import \\"../../../../../../types/importMeta\\";
-export const basic = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\"),\\"./modules/index.ts\\": () => import(\\"./modules/index.ts\\")});
+"import * as __vite_glob_1_0 from \\"./modules/a.ts\\";import * as __vite_glob_1_1 from \\"./modules/b.ts\\";import * as __vite_glob_1_2 from \\"./modules/index.ts\\";import { name as __vite_glob_3_0 } from \\"./modules/a.ts\\";import { name as __vite_glob_3_1 } from \\"./modules/b.ts\\";import { name as __vite_glob_3_2 } from \\"./modules/index.ts\\";import { default as __vite_glob_5_0 } from \\"./modules/a.ts?raw\\";import { default as __vite_glob_5_1 } from \\"./modules/b.ts?raw\\";export const basic = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\"),\\"./modules/index.ts\\": () => import(\\"./modules/index.ts\\")});
 export const basicEager = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": __vite_glob_1_0,\\"./modules/b.ts\\": __vite_glob_1_1,\\"./modules/index.ts\\": __vite_glob_1_2});
 export const ignore = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\")});
 export const namedEager = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": __vite_glob_3_0,\\"./modules/b.ts\\": __vite_glob_3_1,\\"./modules/index.ts\\": __vite_glob_3_2});
@@ -20,8 +19,7 @@ export const cleverCwd2 = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": (
 `;
 
 exports[`fixture > transform with restoreQueryExtension 1`] = `
-"import * as __vite_glob_1_0 from \\"./modules/a.ts\\";import * as __vite_glob_1_1 from \\"./modules/b.ts\\";import * as __vite_glob_1_2 from \\"./modules/index.ts\\";import { name as __vite_glob_3_0 } from \\"./modules/a.ts\\";import { name as __vite_glob_3_1 } from \\"./modules/b.ts\\";import { name as __vite_glob_3_2 } from \\"./modules/index.ts\\";import { default as __vite_glob_5_0 } from \\"./modules/a.ts?raw\\";import { default as __vite_glob_5_1 } from \\"./modules/b.ts?raw\\";import \\"../../../../../../types/importMeta\\";
-export const basic = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\"),\\"./modules/index.ts\\": () => import(\\"./modules/index.ts\\")});
+"import * as __vite_glob_1_0 from \\"./modules/a.ts\\";import * as __vite_glob_1_1 from \\"./modules/b.ts\\";import * as __vite_glob_1_2 from \\"./modules/index.ts\\";import { name as __vite_glob_3_0 } from \\"./modules/a.ts\\";import { name as __vite_glob_3_1 } from \\"./modules/b.ts\\";import { name as __vite_glob_3_2 } from \\"./modules/index.ts\\";import { default as __vite_glob_5_0 } from \\"./modules/a.ts?raw\\";import { default as __vite_glob_5_1 } from \\"./modules/b.ts?raw\\";export const basic = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\"),\\"./modules/index.ts\\": () => import(\\"./modules/index.ts\\")});
 export const basicEager = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": __vite_glob_1_0,\\"./modules/b.ts\\": __vite_glob_1_1,\\"./modules/index.ts\\": __vite_glob_1_2});
 export const ignore = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": () => import(\\"./modules/a.ts\\"),\\"./modules/b.ts\\": () => import(\\"./modules/b.ts\\")});
 export const namedEager = /* #__PURE__ */ Object.assign({\\"./modules/a.ts\\": __vite_glob_3_0,\\"./modules/b.ts\\": __vite_glob_3_1,\\"./modules/index.ts\\": __vite_glob_3_2});

packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts

@@ -1,4 +1,8 @@
-import '../../../../../../types/importMeta'
+import type { ImportMeta as ViteImportMeta } from 'types/importMeta'
+
+declare global {
+  interface ImportMeta extends ViteImportMeta {}
+}
 
 export interface ModuleType {
   name: string

packages/vite/src/types/importMeta.d.ts

@@ -1,35 +1,25 @@
-// This file is an augmentation to the built-in ImportMeta interface
-// Thus cannot contain any top-level imports
-// <https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation>
+import type { ViteHotContext } from './hot'
+import type { ImportGlobEagerFunction, ImportGlobFunction } from './importGlob'
 
-/* eslint-disable @typescript-eslint/consistent-type-imports */
-
-// Duplicate of import('../src/node/importGlob').GlobOptions in order to
-// 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 GlobOptions {
-  as?: string
+export interface ImportMetaEnv {
+  [key: string]: any
+  BASE_URL: string
+  MODE: string
+  DEV: boolean
+  PROD: boolean
+  SSR: boolean
 }
 
-interface ImportMeta {
+export interface ImportMeta {
   url: string
 
-  readonly hot?: import('./hot').ViteHotContext
+  readonly hot?: ViteHotContext
 
   readonly env: ImportMetaEnv
 
-  glob: import('./importGlob').ImportGlobFunction
+  glob: ImportGlobFunction
   /**
    * @deprecated Use `import.meta.glob('*', { eager: true })` instead
    */
-  globEager: import('./importGlob').ImportGlobEagerFunction
-}
-
-interface ImportMetaEnv {
-  [key: string]: any
-  BASE_URL: string
-  MODE: string
-  DEV: boolean
-  PROD: boolean
-  SSR: boolean
+  globEager: ImportGlobEagerFunction
 }

playground/hmr/event.d.ts

@@ -1,6 +1,6 @@
-import 'vite/types/customEvent'
+import 'vite/client/types'
 
-declare module 'vite/types/customEvent' {
+declare module 'vite/client/types' {
   interface CustomEventMap {
     'custom:foo': { msg: string }
     'custom:remote-add': { a: number; b: number }