diff --git a/packages/vite/package.json b/packages/vite/package.json index cb8e2ad2f9a60c..42486113b3cd07 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -42,7 +42,9 @@ "#module-sync-enabled": { "module-sync": "./misc/true.js", "default": "./misc/false.js" - } + }, + "#types/*": "./types/*.d.ts", + "#dep-types/*": "./src/types/*.d.ts" }, "files": [ "bin", @@ -113,7 +115,6 @@ "cors": "^2.8.5", "cross-spawn": "^7.0.6", "debug": "^4.4.3", - "dep-types": "link:./src/types", "dotenv": "^17.2.3", "dotenv-expand": "^12.0.3", "es-module-lexer": "^1.7.0", @@ -147,7 +148,6 @@ "strip-literal": "^3.1.0", "terser": "^5.44.0", "tsconfck": "^3.1.6", - "types": "link:./types", "ufo": "^1.6.1", "ws": "^8.18.3" }, diff --git a/packages/vite/rolldown.dts.config.ts b/packages/vite/rolldown.dts.config.ts index 49143888179b7a..9803a10623db52 100644 --- a/packages/vite/rolldown.dts.config.ts +++ b/packages/vite/rolldown.dts.config.ts @@ -1,5 +1,4 @@ import { readFileSync } from 'node:fs' -import { fileURLToPath } from 'node:url' import { builtinModules } from 'node:module' import { defineConfig } from 'rolldown' import type { @@ -20,15 +19,15 @@ import type { Statement, } from '@oxc-project/types' -const depTypesDir = new URL('./src/types/', import.meta.url) const pkg = JSON.parse( readFileSync(new URL('./package.json', import.meta.url)).toString(), ) const external = [ - /^node:*/, + /^node:/, /^vite\//, 'rollup/parseAst', + /^#types\//, ...Object.keys(pkg.dependencies), ...Object.keys(pkg.peerDependencies), ] @@ -99,14 +98,14 @@ const identifierReplacements: Record> = { 'vite/module-runner': { FetchResult$1: 'moduleRunner_FetchResult', }, - '../../types/hmrPayload.js': { + '#types/hmrPayload': { CustomPayload$1: 'hmrPayload_CustomPayload', HotPayload$1: 'hmrPayload_HotPayload', }, - '../../types/customEvent.js': { + '#types/customEvent': { InferCustomEventPayload$1: 'hmrPayload_InferCustomEventPayload', }, - '../../types/internal/lightningcssOptions.js': { + '#types/internal/lightningcssOptions': { LightningCSSOptions$1: 'lightningcssOptions_LightningCSSOptions', }, } @@ -121,38 +120,14 @@ const ignoreConfusingTypeNames = [ /** * Patch the types files before passing to dts plugin - * 1. Resolve `dep-types/*` and `types/*` imports - * 2. Validate unallowed dependency imports - * 3. Replace confusing type names - * 4. Strip leftover internal types - * 5. Clean unnecessary comments + * 1. Validate unallowed dependency imports + * 2. Replace confusing type names + * 3. Strip leftover internal types + * 4. Clean unnecessary comments */ function patchTypes(): Plugin { return { name: 'patch-types', - resolveId: { - order: 'pre', - filter: { - id: /^(dep-)?types\//, - }, - handler(id) { - // Dep types should be bundled - if (id.startsWith('dep-types/')) { - const fileUrl = new URL( - `./${id.slice('dep-types/'.length)}.d.ts`, - depTypesDir, - ) - return fileURLToPath(fileUrl) - } - // Ambient types are unbundled and externalized - if (id.startsWith('types/')) { - return { - id: '../../' + (id.endsWith('.js') ? id : id + '.js'), - external: true, - } - } - }, - }, generateBundle: { order: 'post', handler(_opts, bundle) { @@ -235,6 +210,7 @@ function validateRunnerChunk( if ( !id.startsWith('./') && !id.startsWith('../') && + !id.startsWith('#') && // index and moduleRunner have a common chunk "moduleRunnerTransport" !id.startsWith('moduleRunnerTransport.d') && !id.startsWith('types.d') @@ -260,6 +236,7 @@ function validateChunkImports( if ( !id.startsWith('./') && !id.startsWith('../') && + !id.startsWith('#') && !id.startsWith('node:') && !id.startsWith('types.d') && !id.startsWith('vite/') && diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts index ef7b6be46dd9b7..1fc8c2b522fdb3 100644 --- a/packages/vite/src/client/client.ts +++ b/packages/vite/src/client/client.ts @@ -1,5 +1,5 @@ -import type { ErrorPayload, HotPayload } from 'types/hmrPayload' -import type { ViteHotContext } from 'types/hot' +import type { ErrorPayload, HotPayload } from '#types/hmrPayload' +import type { ViteHotContext } from '#types/hot' import { HMRClient, HMRContext } from '../shared/hmr' import { createWebSocketModuleRunnerTransport, diff --git a/packages/vite/src/client/overlay.ts b/packages/vite/src/client/overlay.ts index 3debebabe6228e..67f22594cf8f1d 100644 --- a/packages/vite/src/client/overlay.ts +++ b/packages/vite/src/client/overlay.ts @@ -1,4 +1,4 @@ -import type { ErrorPayload } from 'types/hmrPayload' +import type { ErrorPayload } from '#types/hmrPayload' // injected by the hmr plugin when served declare const __BASE__: string diff --git a/packages/vite/src/module-runner/hmrHandler.ts b/packages/vite/src/module-runner/hmrHandler.ts index ab0ed6c3b58cae..69d7e671ae3b3e 100644 --- a/packages/vite/src/module-runner/hmrHandler.ts +++ b/packages/vite/src/module-runner/hmrHandler.ts @@ -1,4 +1,4 @@ -import type { HotPayload } from 'types/hmrPayload' +import type { HotPayload } from '#types/hmrPayload' import { slash, unwrapId } from '../shared/utils' import { ERR_OUTDATED_OPTIMIZED_DEP } from '../shared/constants' import { createHMRHandler } from '../shared/hmrHandler' diff --git a/packages/vite/src/module-runner/runner.ts b/packages/vite/src/module-runner/runner.ts index 6230d33f16ab5a..43e5e95dfe2f4e 100644 --- a/packages/vite/src/module-runner/runner.ts +++ b/packages/vite/src/module-runner/runner.ts @@ -1,4 +1,4 @@ -import type { ViteHotContext } from 'types/hot' +import type { ViteHotContext } from '#types/hot' import { HMRClient, HMRContext, type HMRLogger } from '../shared/hmr' import { cleanUrl, isPrimitive } from '../shared/utils' import { analyzeImportedModDifference } from '../shared/ssrTransform' diff --git a/packages/vite/src/module-runner/types.ts b/packages/vite/src/module-runner/types.ts index f4ff25b47aab74..8ccf4b5edb0a4c 100644 --- a/packages/vite/src/module-runner/types.ts +++ b/packages/vite/src/module-runner/types.ts @@ -1,4 +1,4 @@ -import type { ViteHotContext } from 'types/hot' +import type { ViteHotContext } from '#types/hot' import type { HMRLogger } from '../shared/hmr' import type { DefineImportMetadata, diff --git a/packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.spec.ts.snap b/packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.spec.ts.snap index ff2b01e567efe5..a28e45055d25a0 100644 --- a/packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.spec.ts.snap +++ b/packages/vite/src/node/__tests__/plugins/importGlob/__snapshots__/fixture.spec.ts.snap @@ -1,7 +1,7 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`fixture > transform 1`] = ` -"import * as __vite_glob_3_0 from "./modules/a.ts";import * as __vite_glob_3_1 from "./modules/b.ts";import * as __vite_glob_3_2 from "./modules/index.ts";import * as __vite_glob_5_0 from "./modules/a.ts";import * as __vite_glob_5_1 from "./modules/b.ts";import * as __vite_glob_5_2 from "./modules/index.ts";import { name as __vite_glob_9_0 } from "./modules/a.ts";import { name as __vite_glob_9_1 } from "./modules/b.ts";import { name as __vite_glob_9_2 } from "./modules/index.ts";import { name as __vite_glob_11_0 } from "./modules/a.ts";import { name as __vite_glob_11_1 } from "./modules/b.ts";import { name as __vite_glob_11_2 } from "./modules/index.ts";import { default as __vite_glob_15_0 } from "./modules/a.ts?raw";import { default as __vite_glob_15_1 } from "./modules/b.ts?raw";import * as __vite_glob_28_0 from "./.foo/test.ts";import "types/importMeta"; +"import * as __vite_glob_3_0 from "./modules/a.ts";import * as __vite_glob_3_1 from "./modules/b.ts";import * as __vite_glob_3_2 from "./modules/index.ts";import * as __vite_glob_5_0 from "./modules/a.ts";import * as __vite_glob_5_1 from "./modules/b.ts";import * as __vite_glob_5_2 from "./modules/index.ts";import { name as __vite_glob_9_0 } from "./modules/a.ts";import { name as __vite_glob_9_1 } from "./modules/b.ts";import { name as __vite_glob_9_2 } from "./modules/index.ts";import { name as __vite_glob_11_0 } from "./modules/a.ts";import { name as __vite_glob_11_1 } from "./modules/b.ts";import { name as __vite_glob_11_2 } from "./modules/index.ts";import { default as __vite_glob_15_0 } from "./modules/a.ts?raw";import { default as __vite_glob_15_1 } from "./modules/b.ts?raw";import * as __vite_glob_28_0 from "./.foo/test.ts";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")}); export const basicWithObjectKeys = Object.keys({"./modules/a.ts": 0,"./modules/b.ts": 0,"./modules/index.ts": 0}); export const basicWithObjectValues = Object.values([() => import("./modules/a.ts"),() => import("./modules/b.ts"),() => import("./modules/index.ts")]); @@ -105,7 +105,7 @@ export const dotFolder = /* #__PURE__ */ Object.assign({"./.foo/test.ts": __vite `; exports[`fixture > transform with restoreQueryExtension 1`] = ` -"import * as __vite_glob_3_0 from "./modules/a.ts";import * as __vite_glob_3_1 from "./modules/b.ts";import * as __vite_glob_3_2 from "./modules/index.ts";import * as __vite_glob_5_0 from "./modules/a.ts";import * as __vite_glob_5_1 from "./modules/b.ts";import * as __vite_glob_5_2 from "./modules/index.ts";import { name as __vite_glob_9_0 } from "./modules/a.ts";import { name as __vite_glob_9_1 } from "./modules/b.ts";import { name as __vite_glob_9_2 } from "./modules/index.ts";import { name as __vite_glob_11_0 } from "./modules/a.ts";import { name as __vite_glob_11_1 } from "./modules/b.ts";import { name as __vite_glob_11_2 } from "./modules/index.ts";import { default as __vite_glob_15_0 } from "./modules/a.ts?raw";import { default as __vite_glob_15_1 } from "./modules/b.ts?raw";import * as __vite_glob_28_0 from "./.foo/test.ts";import "types/importMeta"; +"import * as __vite_glob_3_0 from "./modules/a.ts";import * as __vite_glob_3_1 from "./modules/b.ts";import * as __vite_glob_3_2 from "./modules/index.ts";import * as __vite_glob_5_0 from "./modules/a.ts";import * as __vite_glob_5_1 from "./modules/b.ts";import * as __vite_glob_5_2 from "./modules/index.ts";import { name as __vite_glob_9_0 } from "./modules/a.ts";import { name as __vite_glob_9_1 } from "./modules/b.ts";import { name as __vite_glob_9_2 } from "./modules/index.ts";import { name as __vite_glob_11_0 } from "./modules/a.ts";import { name as __vite_glob_11_1 } from "./modules/b.ts";import { name as __vite_glob_11_2 } from "./modules/index.ts";import { default as __vite_glob_15_0 } from "./modules/a.ts?raw";import { default as __vite_glob_15_1 } from "./modules/b.ts?raw";import * as __vite_glob_28_0 from "./.foo/test.ts";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")}); export const basicWithObjectKeys = Object.keys({"./modules/a.ts": 0,"./modules/b.ts": 0,"./modules/index.ts": 0}); export const basicWithObjectValues = Object.values([() => import("./modules/a.ts"),() => import("./modules/b.ts"),() => import("./modules/index.ts")]); diff --git a/packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts b/packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts index 50e6b0e509971c..6b3fdbaeefb23b 100644 --- a/packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts +++ b/packages/vite/src/node/__tests__/plugins/importGlob/fixture-a/index.ts @@ -1,4 +1,6 @@ -import 'types/importMeta' +// NOTE: `#types/importMeta` does not work as `src/node/__tests__/package.json` shadows the root +// `package.json` and does not declare the subpath import. +import '../../../../../../types/importMeta' export interface ModuleType { name: string diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 91e817cda83c00..f785ab810f67c2 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -20,9 +20,9 @@ import type { WatcherOptions, } from 'rollup' import commonjsPlugin from '@rollup/plugin-commonjs' -import type { RollupCommonJSOptions } from 'dep-types/commonjs' -import type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars' import type { TransformOptions } from 'esbuild' +import type { RollupCommonJSOptions } from '#dep-types/commonjs' +import type { RollupDynamicImportVarsOptions } from '#dep-types/dynamicImportVars' import { DEFAULT_ASSETS_INLINE_LIMIT, ESBUILD_BASELINE_WIDELY_AVAILABLE_TARGET, diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 42e07c67ee9235..077f15a9c86def 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -7,10 +7,10 @@ import { performance } from 'node:perf_hooks' import { createRequire } from 'node:module' import crypto from 'node:crypto' import colors from 'picocolors' -import type { Alias, AliasOptions } from 'dep-types/alias' import type { PluginContextMeta, RollupOptions } from 'rollup' import picomatch from 'picomatch' import { build } from 'esbuild' +import type { Alias, AliasOptions } from '#dep-types/alias' import type { AnymatchFn } from '../types/anymatch' import { withTrailingSlash } from '../shared/utils' import { diff --git a/packages/vite/src/node/http.ts b/packages/vite/src/node/http.ts index 3d0a09d0b5a18c..23410fc8a2f8f7 100644 --- a/packages/vite/src/node/http.ts +++ b/packages/vite/src/node/http.ts @@ -2,8 +2,8 @@ import fsp from 'node:fs/promises' import path from 'node:path' import type { OutgoingHttpHeaders as HttpServerHeaders } from 'node:http' import type { ServerOptions as HttpsServerOptions } from 'node:https' -import type { Connect } from 'dep-types/connect' import colors from 'picocolors' +import type { Connect } from '#dep-types/connect' import type { ProxyOptions } from './server/middlewares/proxy' import type { Logger } from './logger' import type { HttpServer } from './server' diff --git a/packages/vite/src/node/index.ts b/packages/vite/src/node/index.ts index de73b7814f663e..760301c7d0672a 100644 --- a/packages/vite/src/node/index.ts +++ b/packages/vite/src/node/index.ts @@ -227,19 +227,19 @@ export type { CustomPayload, PrunePayload, ErrorPayload, -} from 'types/hmrPayload' +} from '#types/hmrPayload' export type { CustomEventMap, InferCustomEventPayload, InvalidatePayload, -} from 'types/customEvent' +} from '#types/customEvent' export type { ImportGlobFunction, ImportGlobOptions, GeneralImportGlobOptions, KnownAsTypeMap, -} from 'types/importGlob' -export type { ChunkMetadata, CustomPluginOptionsVite } from 'types/metadata' +} from '#types/importGlob' +export type { ChunkMetadata, CustomPluginOptionsVite } from '#types/metadata' // dep types export type { @@ -248,16 +248,16 @@ export type { ResolverFunction, ResolverObject, Alias, -} from 'dep-types/alias' -export type { Connect } from 'dep-types/connect' -export type { WebSocket, WebSocketAlias } from 'dep-types/ws' +} from '#dep-types/alias' +export type { Connect } from '#dep-types/connect' +export type { WebSocket, WebSocketAlias } from '#dep-types/ws' export type * as HttpProxy from 'http-proxy-3' -export type { FSWatcher, WatchOptions } from 'dep-types/chokidar' -export type { Terser } from 'types/internal/terserOptions' -export type { RollupCommonJSOptions } from 'dep-types/commonjs' -export type { RollupDynamicImportVarsOptions } from 'dep-types/dynamicImportVars' -export type { Matcher, AnymatchPattern, AnymatchFn } from 'dep-types/anymatch' -export type { LightningCSSOptions } from 'types/internal/lightningcssOptions' +export type { FSWatcher, WatchOptions } from '#dep-types/chokidar' +export type { Terser } from '#types/internal/terserOptions' +export type { RollupCommonJSOptions } from '#dep-types/commonjs' +export type { RollupDynamicImportVarsOptions } from '#dep-types/dynamicImportVars' +export type { Matcher, AnymatchPattern, AnymatchFn } from '#dep-types/anymatch' +export type { LightningCSSOptions } from '#types/internal/lightningcssOptions' // Backward compatibility export type { ModuleGraph, ModuleNode } from './server/mixedModuleGraph' diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 68eb075ee00e8c..56de3532c2f1b2 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -21,22 +21,22 @@ import type * as PostCSS from 'postcss' import type Sass from 'sass' import type Stylus from 'stylus' import type Less from 'less' -import type { LightningCSSOptions } from 'types/internal/lightningcssOptions' import type { TransformOptions } from 'esbuild' import { formatMessages, transform } from 'esbuild' import type { RawSourceMap } from '@jridgewell/remapping' import { WorkerWithFallback } from 'artichokie' import { globSync } from 'tinyglobby' -import type { - LessPreprocessorBaseOptions, - SassModernPreprocessBaseOptions, - StylusPreprocessorBaseOptions, -} from 'types/internal/cssPreprocessorOptions' import type { TransformAttributeResult as LightningCssTransformAttributeResult, TransformResult as LightningCssTransformResult, } from 'lightningcss' -import type { CustomPluginOptionsVite } from 'types/metadata' +import type { + LessPreprocessorBaseOptions, + SassModernPreprocessBaseOptions, + StylusPreprocessorBaseOptions, +} from '#types/internal/cssPreprocessorOptions' +import type { LightningCSSOptions } from '#types/internal/lightningcssOptions' +import type { CustomPluginOptionsVite } from '#types/metadata' import { getCodeWithSourcemap, injectSourcesContent } from '../server/sourcemap' import type { EnvironmentModuleNode } from '../server/moduleGraph' import { diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts index c47c310d926a3d..6e20f7a1146d8b 100644 --- a/packages/vite/src/node/plugins/esbuild.ts +++ b/packages/vite/src/node/plugins/esbuild.ts @@ -11,7 +11,7 @@ import type { RawSourceMap } from '@jridgewell/remapping' import type { InternalModuleFormat, SourceMap } from 'rollup' import type { TSConfckParseResult } from 'tsconfck' import { TSConfckCache, TSConfckParseError, parse } from 'tsconfck' -import type { FSWatcher } from 'dep-types/chokidar' +import type { FSWatcher } from '#dep-types/chokidar' import { combineSourcemaps, createDebugger, diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts index 18705709dcf55e..7cdfa4503c8f39 100644 --- a/packages/vite/src/node/plugins/importMetaGlob.ts +++ b/packages/vite/src/node/plugins/importMetaGlob.ts @@ -13,9 +13,9 @@ import type { import type { CustomPluginOptions, RollupAstNode, RollupError } from 'rollup' import MagicString from 'magic-string' import { stringifyQuery } from 'ufo' -import type { GeneralImportGlobOptions } from 'types/importGlob' import { parseAstAsync } from 'rollup/parseAst' import { escapePath, glob } from 'tinyglobby' +import type { GeneralImportGlobOptions } from '#types/importGlob' import type { Plugin } from '../plugin' import type { EnvironmentModuleNode } from '../server/moduleGraph' import type { ResolvedConfig } from '../config' diff --git a/packages/vite/src/node/plugins/terser.ts b/packages/vite/src/node/plugins/terser.ts index 8e7fcdc19c573f..7006949d0dcaa7 100644 --- a/packages/vite/src/node/plugins/terser.ts +++ b/packages/vite/src/node/plugins/terser.ts @@ -1,9 +1,9 @@ import { pathToFileURL } from 'node:url' +import { WorkerWithFallback } from 'artichokie' import type { TerserMinifyOptions, TerserMinifyOutput, -} from 'types/internal/terserOptions' -import { WorkerWithFallback } from 'artichokie' +} from '#types/internal/terserOptions' import type { Plugin } from '../plugin' import type { ResolvedConfig } from '..' import { generateCodeFrame, requireResolveFromRootWithFallback } from '../utils' diff --git a/packages/vite/src/node/preview.ts b/packages/vite/src/node/preview.ts index c45e8e2256ada1..be71275bb4e564 100644 --- a/packages/vite/src/node/preview.ts +++ b/packages/vite/src/node/preview.ts @@ -3,8 +3,8 @@ import path from 'node:path' import sirv from 'sirv' import compression from '@polka/compression' import connect from 'connect' -import type { Connect } from 'dep-types/connect' import corsMiddleware from 'cors' +import type { Connect } from '#dep-types/connect' import type { HttpServer, ResolvedServerOptions, diff --git a/packages/vite/src/node/server/environment.ts b/packages/vite/src/node/server/environment.ts index 281cec3b5de1b8..522f77d234ebbd 100644 --- a/packages/vite/src/node/server/environment.ts +++ b/packages/vite/src/node/server/environment.ts @@ -1,5 +1,5 @@ -import type { FSWatcher } from 'dep-types/chokidar' import colors from 'picocolors' +import type { FSWatcher } from '#dep-types/chokidar' import type { FetchFunctionOptions, FetchResult } from 'vite/module-runner' import { BaseEnvironment } from '../baseEnvironment' import type { diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts index 94cb0665da7401..60605dd3c4321d 100644 --- a/packages/vite/src/node/server/hmr.ts +++ b/packages/vite/src/node/server/hmr.ts @@ -2,8 +2,8 @@ import fsp from 'node:fs/promises' import path from 'node:path' import { EventEmitter } from 'node:events' import colors from 'picocolors' -import type { CustomPayload, HotPayload, Update } from 'types/hmrPayload' import type { RollupError } from 'rollup' +import type { CustomPayload, HotPayload, Update } from '#types/hmrPayload' import type { InvokeMethods, InvokeResponseData, diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts index 7d250a68a8ff41..47dd95f0c146bc 100644 --- a/packages/vite/src/node/server/index.ts +++ b/packages/vite/src/node/server/index.ts @@ -10,10 +10,10 @@ 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 launchEditorMiddleware from 'launch-editor-middleware' import type { SourceMap } from 'rollup' +import type { FSWatcher, WatchOptions } from '#dep-types/chokidar' +import type { Connect } from '#dep-types/connect' import type { ModuleRunner } from 'vite/module-runner' import type { CommonServerOptions } from '../http' import { diff --git a/packages/vite/src/node/server/middlewares/base.ts b/packages/vite/src/node/server/middlewares/base.ts index ed44b4c633a80b..2e2087018df0d2 100644 --- a/packages/vite/src/node/server/middlewares/base.ts +++ b/packages/vite/src/node/server/middlewares/base.ts @@ -1,4 +1,4 @@ -import type { Connect } from 'dep-types/connect' +import type { Connect } from '#dep-types/connect' import { joinUrlSegments, stripBase } from '../../utils' import { cleanUrl, withTrailingSlash } from '../../../shared/utils' diff --git a/packages/vite/src/node/server/middlewares/error.ts b/packages/vite/src/node/server/middlewares/error.ts index 8b9487d36b4b1b..62cb211699b7f8 100644 --- a/packages/vite/src/node/server/middlewares/error.ts +++ b/packages/vite/src/node/server/middlewares/error.ts @@ -2,8 +2,8 @@ import path from 'node:path' import { stripVTControlCharacters as strip } from 'node:util' import colors from 'picocolors' import type { RollupError } from 'rollup' -import type { Connect } from 'dep-types/connect' -import type { ErrorPayload } from 'types/hmrPayload' +import type { Connect } from '#dep-types/connect' +import type { ErrorPayload } from '#types/hmrPayload' import { pad } from '../../utils' import type { ViteDevServer } from '../..' import { CLIENT_PUBLIC_PATH } from '../../constants' diff --git a/packages/vite/src/node/server/middlewares/hostCheck.ts b/packages/vite/src/node/server/middlewares/hostCheck.ts index 6fc76fa953e4d0..af366de279b61a 100644 --- a/packages/vite/src/node/server/middlewares/hostCheck.ts +++ b/packages/vite/src/node/server/middlewares/hostCheck.ts @@ -1,5 +1,5 @@ -import type { Connect } from 'dep-types/connect' import { hostValidationMiddleware as originalHostValidationMiddleware } from 'host-validation-middleware' +import type { Connect } from '#dep-types/connect' import type { ResolvedPreviewOptions, ResolvedServerOptions } from '../..' export function getAdditionalAllowedHosts( diff --git a/packages/vite/src/node/server/middlewares/htmlFallback.ts b/packages/vite/src/node/server/middlewares/htmlFallback.ts index 55e40788817696..ab9356f4a3d96c 100644 --- a/packages/vite/src/node/server/middlewares/htmlFallback.ts +++ b/packages/vite/src/node/server/middlewares/htmlFallback.ts @@ -1,6 +1,6 @@ import path from 'node:path' import fs from 'node:fs' -import type { Connect } from 'dep-types/connect' +import type { Connect } from '#dep-types/connect' import { createDebugger } from '../../utils' import { cleanUrl } from '../../../shared/utils' diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts index 34ccabf4833421..b324bfe9b1ee3e 100644 --- a/packages/vite/src/node/server/middlewares/indexHtml.ts +++ b/packages/vite/src/node/server/middlewares/indexHtml.ts @@ -3,8 +3,8 @@ import fsp from 'node:fs/promises' import path from 'node:path' import MagicString from 'magic-string' import type { SourceMapInput } from 'rollup' -import type { Connect } from 'dep-types/connect' import type { DefaultTreeAdapterMap, Token } from 'parse5' +import type { Connect } from '#dep-types/connect' import type { IndexHtmlTransformHook } from '../../plugins/html' import { addToHTMLProxyCache, diff --git a/packages/vite/src/node/server/middlewares/notFound.ts b/packages/vite/src/node/server/middlewares/notFound.ts index 4ecf6823dcaf89..38bf93b4a6df17 100644 --- a/packages/vite/src/node/server/middlewares/notFound.ts +++ b/packages/vite/src/node/server/middlewares/notFound.ts @@ -1,4 +1,4 @@ -import type { Connect } from 'dep-types/connect' +import type { Connect } from '#dep-types/connect' export function notFoundMiddleware(): Connect.NextHandleFunction { // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...` diff --git a/packages/vite/src/node/server/middlewares/proxy.ts b/packages/vite/src/node/server/middlewares/proxy.ts index af6eed5877796c..7c6d2b26fbd4b0 100644 --- a/packages/vite/src/node/server/middlewares/proxy.ts +++ b/packages/vite/src/node/server/middlewares/proxy.ts @@ -1,7 +1,7 @@ import type * as http from 'node:http' import * as httpProxy from 'http-proxy-3' -import type { Connect } from 'dep-types/connect' import colors from 'picocolors' +import type { Connect } from '#dep-types/connect' import { createDebugger } from '../../utils' import type { CommonServerOptions, ResolvedConfig } from '../..' import type { HttpServer } from '..' diff --git a/packages/vite/src/node/server/middlewares/rejectInvalidRequest.ts b/packages/vite/src/node/server/middlewares/rejectInvalidRequest.ts index e43801d6a78a01..943ce9bd98fa4c 100644 --- a/packages/vite/src/node/server/middlewares/rejectInvalidRequest.ts +++ b/packages/vite/src/node/server/middlewares/rejectInvalidRequest.ts @@ -1,4 +1,4 @@ -import type { Connect } from 'dep-types/connect' +import type { Connect } from '#dep-types/connect' export function rejectInvalidRequestMiddleware(): Connect.NextHandleFunction { // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...` diff --git a/packages/vite/src/node/server/middlewares/static.ts b/packages/vite/src/node/server/middlewares/static.ts index 3d599d08ec426c..666ae7ca24a01f 100644 --- a/packages/vite/src/node/server/middlewares/static.ts +++ b/packages/vite/src/node/server/middlewares/static.ts @@ -2,8 +2,8 @@ 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 escapeHtml from 'escape-html' +import type { Connect } from '#dep-types/connect' import type { ViteDevServer } from '../../server' import type { ResolvedConfig } from '../../config' import { FS_PREFIX } from '../../constants' diff --git a/packages/vite/src/node/server/middlewares/time.ts b/packages/vite/src/node/server/middlewares/time.ts index 8d4b3e10c928a6..5a649e0366a551 100644 --- a/packages/vite/src/node/server/middlewares/time.ts +++ b/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 '#dep-types/connect' import { createDebugger, prettifyUrl, timeFrom } from '../../utils' const logTime = createDebugger('vite:time') diff --git a/packages/vite/src/node/server/middlewares/transform.ts b/packages/vite/src/node/server/middlewares/transform.ts index 3da7689ffa752b..b467ba5bcfc8c8 100644 --- a/packages/vite/src/node/server/middlewares/transform.ts +++ b/packages/vite/src/node/server/middlewares/transform.ts @@ -1,8 +1,8 @@ import path from 'node:path' import fsp from 'node:fs/promises' -import type { Connect } from 'dep-types/connect' import colors from 'picocolors' import type { ExistingRawSourceMap } from 'rollup' +import type { Connect } from '#dep-types/connect' import type { ViteDevServer } from '..' import { createDebugger, diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts index 1cdf1ce89dafb3..e1eabfedeb17cb 100644 --- a/packages/vite/src/node/server/pluginContainer.ts +++ b/packages/vite/src/node/server/pluginContainer.ts @@ -63,8 +63,8 @@ import type { import type { RawSourceMap } from '@jridgewell/remapping' import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping' import MagicString from 'magic-string' -import type { FSWatcher } from 'dep-types/chokidar' import colors from 'picocolors' +import type { FSWatcher } from '#dep-types/chokidar' import type { Plugin } from '../plugin' import { combineSourcemaps, diff --git a/packages/vite/src/node/server/ws.ts b/packages/vite/src/node/server/ws.ts index 0a3f1d15c8b689..584b195e4b2b8a 100644 --- a/packages/vite/src/node/server/ws.ts +++ b/packages/vite/src/node/server/ws.ts @@ -9,10 +9,10 @@ import crypto from 'node:crypto' import colors from 'picocolors' import type { WebSocket as WebSocketRaw } from 'ws' import { WebSocketServer as WebSocketServerRaw_ } from 'ws' -import type { WebSocket as WebSocketTypes } from 'dep-types/ws' -import type { ErrorPayload, HotPayload } from 'types/hmrPayload' -import type { InferCustomEventPayload } from 'types/customEvent' import { isHostAllowed } from 'host-validation-middleware' +import type { WebSocket as WebSocketTypes } from '#dep-types/ws' +import type { ErrorPayload, HotPayload } from '#types/hmrPayload' +import type { InferCustomEventPayload } from '#types/customEvent' import type { ResolvedConfig } from '..' import { isObject } from '../utils' import type { NormalizedHotChannel, NormalizedHotChannelClient } from './hmr' diff --git a/packages/vite/src/node/ssr/runtime/serverModuleRunner.ts b/packages/vite/src/node/ssr/runtime/serverModuleRunner.ts index 828ea96ad58a82..306aeac6604be8 100644 --- a/packages/vite/src/node/ssr/runtime/serverModuleRunner.ts +++ b/packages/vite/src/node/ssr/runtime/serverModuleRunner.ts @@ -1,5 +1,5 @@ import { existsSync, readFileSync } from 'node:fs' -import type { HotPayload } from 'types/hmrPayload' +import type { HotPayload } from '#types/hmrPayload' import { ModuleRunner, createNodeImportMeta } from 'vite/module-runner' import type { ModuleEvaluator, diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts index 931559d0ef93c2..4e291d202e5b91 100644 --- a/packages/vite/src/node/utils.ts +++ b/packages/vite/src/node/utils.ts @@ -11,17 +11,17 @@ import { promises as dns } from 'node:dns' import { performance } from 'node:perf_hooks' import type { AddressInfo, Server } from 'node:net' import fsp from 'node:fs/promises' -import type { FSWatcher } from 'dep-types/chokidar' import remapping from '@jridgewell/remapping' import type { DecodedSourceMap, RawSourceMap } from '@jridgewell/remapping' import colors from 'picocolors' import debug from 'debug' -import type { Alias, AliasOptions } from 'dep-types/alias' import type MagicString from 'magic-string' import type { Equal } from '@type-challenges/utils' import type { TransformResult } from 'rollup' import { createFilter as _createFilter } from '@rollup/pluginutils' +import type { Alias, AliasOptions } from '#dep-types/alias' +import type { FSWatcher } from '#dep-types/chokidar' import { cleanUrl, isWindows, diff --git a/packages/vite/src/node/watch.ts b/packages/vite/src/node/watch.ts index d47916d8874289..ecc7937d8c0e74 100644 --- a/packages/vite/src/node/watch.ts +++ b/packages/vite/src/node/watch.ts @@ -1,9 +1,9 @@ import { EventEmitter } from 'node:events' import path from 'node:path' -import type { FSWatcher, WatchOptions } from 'dep-types/chokidar' import type { OutputOptions } from 'rollup' import colors from 'picocolors' import { escapePath } from 'tinyglobby' +import type { FSWatcher, WatchOptions } from '#dep-types/chokidar' import { withTrailingSlash } from '../shared/utils' import { arraify, normalizePath } from './utils' import type { Logger } from './logger' diff --git a/packages/vite/src/shared/hmr.ts b/packages/vite/src/shared/hmr.ts index aa44ab5e48b0d2..deb0134b4d235e 100644 --- a/packages/vite/src/shared/hmr.ts +++ b/packages/vite/src/shared/hmr.ts @@ -1,6 +1,6 @@ -import type { HotPayload, Update } from 'types/hmrPayload' -import type { ModuleNamespace, ViteHotContext } from 'types/hot' -import type { InferCustomEventPayload } from 'types/customEvent' +import type { HotPayload, Update } from '#types/hmrPayload' +import type { ModuleNamespace, ViteHotContext } from '#types/hot' +import type { InferCustomEventPayload } from '#types/customEvent' import type { NormalizedModuleRunnerTransport } from './moduleRunnerTransport' type CustomListenersMap = Map void)[]> diff --git a/packages/vite/src/shared/hmrHandler.ts b/packages/vite/src/shared/hmrHandler.ts index 59cde8671e3e85..50af459b84d4be 100644 --- a/packages/vite/src/shared/hmrHandler.ts +++ b/packages/vite/src/shared/hmrHandler.ts @@ -1,4 +1,4 @@ -import type { HotPayload } from 'types/hmrPayload' +import type { HotPayload } from '#types/hmrPayload' // updates to HMR should go one after another. It is possible to trigger another update during the invalidation for example. export function createHMRHandler( diff --git a/packages/vite/src/shared/moduleRunnerTransport.ts b/packages/vite/src/shared/moduleRunnerTransport.ts index e70adb3067413a..f3fbb42474a884 100644 --- a/packages/vite/src/shared/moduleRunnerTransport.ts +++ b/packages/vite/src/shared/moduleRunnerTransport.ts @@ -1,5 +1,5 @@ import { nanoid } from 'nanoid/non-secure' -import type { CustomPayload, HotPayload } from 'types/hmrPayload' +import type { CustomPayload, HotPayload } from '#types/hmrPayload' import { promiseWithResolvers } from './utils' import type { InvokeMethods, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7905816347185c..1e62197e66cf35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -318,9 +318,6 @@ importers: debug: specifier: ^4.4.3 version: 4.4.3 - dep-types: - specifier: link:./src/types - version: link:src/types dotenv: specifier: ^17.2.3 version: 17.2.3 @@ -420,9 +417,6 @@ importers: tsconfck: specifier: ^3.1.6 version: 3.1.6(typescript@5.9.2) - types: - specifier: link:./types - version: link:types ufo: specifier: ^1.6.1 version: 1.6.1