chore: change dep-types to bundled-types

packages/vite/package.json

@@ -97,7 +97,7 @@
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
-    "dep-types": "link:./src/types",
+    "bundled-types": "link:./src/types",
     "dotenv": "^16.0.3",
     "dotenv-expand": "^9.0.0",
     "es-module-lexer": "^1.2.0",

packages/vite/scripts/prePatchTypes.ts

@@ -11,10 +11,10 @@ const depTypesDir = resolve(dir, '../src/types')
 // and rewrite them into relative imports - so that api-extractor actually
 // includes them in the rolled-up final d.ts file.
 rewriteImports(tempDir, (importPath, currentFile) => {
-  if (importPath.startsWith('dep-types/')) {
+  if (importPath.startsWith('bundled-types/')) {
     const absoluteTypePath = resolve(
       depTypesDir,
-      importPath.slice('dep-types/'.length),
+      importPath.slice('bundled-types/'.length),
     )
     return slash(relative(dirname(currentFile), absoluteTypePath))
   }

packages/vite/src/node/build.ts

@@ -17,10 +17,10 @@ import type {
   WarningHandler,
   WatcherOptions,
 } from 'rollup'
-import type { Terser } from 'dep-types/terser'
+import type { Terser } from 'bundled-types/terser'
 import commonjsPlugin from '@rollup/plugin-commonjs'
-import type { RollupCommonJSOptions } from 'dep-types/commonjs'
-import type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars'
+import type { RollupCommonJSOptions } from 'bundled-types/commonjs'
+import type { RollupDynamicImportVarsOptions } from 'bundled-types/dynamicImportVars'
 import type { TransformOptions } from 'esbuild'
 import type { InlineConfig, ResolvedConfig } from './config'
 import { isDepsOptimizerEnabled, resolveConfig } from './config'

packages/vite/src/node/config.ts

@@ -4,7 +4,7 @@ import { pathToFileURL } from 'node:url'
 import { performance } from 'node:perf_hooks'
 import { createRequire } from 'node:module'
 import colors from 'picocolors'
-import type { Alias, AliasOptions } from 'dep-types/alias'
+import type { Alias, AliasOptions } from 'bundled-types/alias'
 import aliasPlugin from '@rollup/plugin-alias'
 import { build } from 'esbuild'
 import type { RollupOptions } from 'rollup'

packages/vite/src/node/http.ts

@@ -5,7 +5,7 @@ import type {
   OutgoingHttpHeaders as HttpServerHeaders,
 } from 'node:http'
 import type { ServerOptions as HttpsServerOptions } from 'node:https'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import colors from 'picocolors'
 import { isObject } from './utils'
 import type { ProxyOptions } from './server/middlewares/proxy'

packages/vite/src/node/index.ts

@@ -126,16 +126,20 @@ export type {
   ResolverFunction,
   ResolverObject,
   Alias,
-} from 'dep-types/alias'
-export type { Connect } from 'dep-types/connect'
-export type { WebSocket, WebSocketAlias } from 'dep-types/ws'
-export type { HttpProxy } from 'dep-types/http-proxy'
+} from 'bundled-types/alias'
+export type { Connect } from 'bundled-types/connect'
+export type { WebSocket, WebSocketAlias } from 'bundled-types/ws'
+export type { HttpProxy } from 'bundled-types/http-proxy'
 export type {
   FSWatcher,
   WatchOptions,
   AwaitWriteFinishOptions,
-} from 'dep-types/chokidar'
-export type { Terser } from 'dep-types/terser'
-export type { RollupCommonJSOptions } from 'dep-types/commonjs'
-export type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars'
-export type { Matcher, AnymatchPattern, AnymatchFn } from 'dep-types/anymatch'
+} from 'bundled-types/chokidar'
+export type { Terser } from 'bundled-types/terser'
+export type { RollupCommonJSOptions } from 'bundled-types/commonjs'
+export type { RollupDynamicImportVarsOptions } from 'bundled-types/dynamicImportVars'
+export type {
+  Matcher,
+  AnymatchPattern,
+  AnymatchFn,
+} from 'bundled-types/anymatch'

packages/vite/src/node/plugins/css.ts

@@ -18,7 +18,7 @@ import type * as PostCSS from 'postcss'
 import type Sass from 'sass'
 import type Stylus from 'stylus'
 import type Less from 'less'
-import type { Alias } from 'dep-types/alias'
+import type { Alias } from 'bundled-types/alias'
 import type { TransformOptions } from 'esbuild'
 import { formatMessages, transform } from 'esbuild'
 import type { RawSourceMap } from '@ampproject/remapping'

packages/vite/src/node/plugins/terser.ts

@@ -1,5 +1,5 @@
 import { Worker } from 'okie'
-import type { Terser } from 'dep-types/terser'
+import type { Terser } from 'bundled-types/terser'
 import type { Plugin } from '../plugin'
 import type { ResolvedConfig } from '..'
 import { requireResolveFromRootWithFallback } from '../utils'

packages/vite/src/node/preview.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 import type * as http from 'node:http'
 import sirv from 'sirv'
 import connect from 'connect'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import corsMiddleware from 'cors'
 import type { ResolvedServerOptions, ResolvedServerUrls } from './server'
 import type { CommonServerOptions } from './http'

packages/vite/src/node/server/index.ts

@@ -6,8 +6,8 @@ import connect from 'connect'
 import corsMiddleware from 'cors'
 import colors from 'picocolors'
 import chokidar from 'chokidar'
-import type { FSWatcher, WatchOptions } from 'dep-types/chokidar'
-import type { Connect } from 'dep-types/connect'
+import type { FSWatcher, WatchOptions } from 'bundled-types/chokidar'
+import type { Connect } from 'bundled-types/connect'
 import launchEditorMiddleware from 'launch-editor-middleware'
 import type { SourceMap } from 'rollup'
 import picomatch from 'picomatch'

packages/vite/src/node/server/middlewares/base.ts

@@ -1,4 +1,4 @@
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import type { ViteDevServer } from '..'
 import { joinUrlSegments, stripBase } from '../../utils'
 

packages/vite/src/node/server/middlewares/error.ts

@@ -1,6 +1,6 @@
 import colors from 'picocolors'
 import type { RollupError } from 'rollup'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import strip from 'strip-ansi'
 import type { ErrorPayload } from 'types/hmrPayload'
 import { pad } from '../../utils'

packages/vite/src/node/server/middlewares/htmlFallback.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import history from 'connect-history-api-fallback'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import { createDebugger } from '../../utils'
 
 export function htmlFallbackMiddleware(

packages/vite/src/node/server/middlewares/indexHtml.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import MagicString from 'magic-string'
 import type { SourceMapInput } from 'rollup'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import type { DefaultTreeAdapterMap, Token } from 'parse5'
 import type { IndexHtmlTransformHook } from '../../plugins/html'
 import {

packages/vite/src/node/server/middlewares/proxy.ts

@@ -1,8 +1,8 @@
 import type * as http from 'node:http'
 import type * as net from 'node:net'
 import httpProxy from 'http-proxy'
-import type { Connect } from 'dep-types/connect'
-import type { HttpProxy } from 'dep-types/http-proxy'
+import type { Connect } from 'bundled-types/connect'
+import type { HttpProxy } from 'bundled-types/http-proxy'
 import colors from 'picocolors'
 import { HMR_HEADER } from '../ws'
 import { createDebugger } from '../../utils'

packages/vite/src/node/server/middlewares/static.ts

@@ -2,7 +2,7 @@ import path from 'node:path'
 import type { OutgoingHttpHeaders, ServerResponse } from 'node:http'
 import type { Options } from 'sirv'
 import sirv from 'sirv'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import type { ViteDevServer } from '../..'
 import { FS_PREFIX } from '../../constants'
 import {

packages/vite/src/node/server/middlewares/time.ts

@@ -1,5 +1,5 @@
 import { performance } from 'node:perf_hooks'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import { createDebugger, prettifyUrl, timeFrom } from '../../utils'
 
 const logTime = createDebugger('vite:time')

packages/vite/src/node/server/middlewares/transform.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
-import type { Connect } from 'dep-types/connect'
+import type { Connect } from 'bundled-types/connect'
 import colors from 'picocolors'
 import type { ViteDevServer } from '..'
 import {

packages/vite/src/node/server/ws.ts

@@ -6,7 +6,7 @@ import type { Socket } from 'node:net'
 import colors from 'picocolors'
 import type { ServerOptions, WebSocket as WebSocketRaw } from 'ws'
 import { WebSocketServer as WebSocketServerRaw } from 'ws'
-import type { WebSocket as WebSocketTypes } from 'dep-types/ws'
+import type { WebSocket as WebSocketTypes } from 'bundled-types/ws'
 import type { CustomPayload, ErrorPayload, HMRPayload } from 'types/hmrPayload'
 import type { InferCustomEventPayload } from 'types/customEvent'
 import type { ResolvedConfig } from '..'

packages/vite/src/node/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["./", "../dep-types", "../types"],
+  "include": ["./", "../bundled-types", "../types"],
   "exclude": ["**/__tests__"],
   "compilerOptions": {
     "lib": ["ESNext", "DOM"]

packages/vite/src/node/utils.ts

@@ -14,7 +14,7 @@ import remapping from '@ampproject/remapping'
 import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping'
 import colors from 'picocolors'
 import debug from 'debug'
-import type { Alias, AliasOptions } from 'dep-types/alias'
+import type { Alias, AliasOptions } from 'bundled-types/alias'
 import type MagicString from 'magic-string'
 
 import type { TransformResult } from 'rollup'

packages/vite/src/node/watch.ts

@@ -1,5 +1,5 @@
 import glob from 'fast-glob'
-import type { WatchOptions } from 'dep-types/chokidar'
+import type { WatchOptions } from 'bundled-types/chokidar'
 import type { ResolvedConfig } from '.'
 
 export function resolveChokidarOptions(