Skip to content

Commit da66a9b

Browse files
committed
fix: build typings
1 parent 46e9bee commit da66a9b

File tree

4 files changed

+6210
-5321
lines changed

4 files changed

+6210
-5321
lines changed

packages/vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"esbuild": "^0.19.3",
7878
"postcss": "^8.4.31",
7979
"rollup": "^4.2.0",
80-
"@rolldown/node": "/Users/likui/Github/rolldown/packages/node"
80+
"@rolldown/node": "/Users/likui/Github/rolldown/packages/rolldown"
8181
},
8282
"optionalDependencies": {
8383
"fsevents": "~2.3.3"

packages/vite/src/node/optimizer/esbuildDepPlugin.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import path from 'node:path'
2-
import type { ImportKind } from 'esbuild'
3-
import type { Plugin } from '@rolldown/node'
2+
import type { Plugin, ImportKind } from '@rolldown/node'
43
import { KNOWN_ASSET_TYPES } from '../constants'
54
import type { PackageCache } from '../packages'
65
import { getDepOptimizationConfig } from '../config'
@@ -148,8 +147,7 @@ export function rolldownDepPlugin(
148147
cjsPackageCache.clear()
149148
},
150149
resolveId: async function (id, importer, options) {
151-
// TODO rolldown: kind is not available in rollup
152-
const kind: ImportKind = options.kind
150+
const kind = options.kind
153151
// externalize assets and commonly known non-js file types
154152
// See #8459 for more details about this require-import conversion
155153
if (allExternalTypesReg.test(id)) {
@@ -297,7 +295,7 @@ export function rolldownCjsExternalPlugin(
297295

298296
if (filter.test(id)) {
299297
// TODO rolldown: kind is not available in rollup
300-
const kind: ImportKind = options.kind
298+
const kind = options.kind
301299
if (kind === 'require-call' && platform !== 'node') {
302300
return {
303301
id: cjsExternalFacadeNamespace + id,

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

+2-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import type { RollupOptions, RollupOutput } from '@rolldown/node'
77
import * as rolldown from '@rolldown/node'
88
import colors from 'picocolors'
99
import type { BuildOptions as EsbuildBuildOptions, Loader } from 'esbuild'
10-
import { build } from 'esbuild'
1110
import { init, parse } from 'es-module-lexer'
1211
import glob from 'fast-glob'
1312
import { createFilter } from '@rollup/pluginutils'
@@ -1082,29 +1081,6 @@ function stringifyDepsOptimizerMetadata(
10821081
)
10831082
}
10841083

1085-
function esbuildOutputFromId(
1086-
outputs: Record<string, any>,
1087-
id: string,
1088-
cacheDirOutputPath: string,
1089-
): any {
1090-
const cwd = process.cwd()
1091-
const flatId = flattenId(id) + '.js'
1092-
const normalizedOutputPath = normalizePath(
1093-
path.relative(cwd, path.join(cacheDirOutputPath, flatId)),
1094-
)
1095-
const output = outputs[normalizedOutputPath]
1096-
if (output) {
1097-
return output
1098-
}
1099-
// If the root dir was symlinked, esbuild could return output keys as `../cwd/`
1100-
// Normalize keys to support this case too
1101-
for (const [key, value] of Object.entries(outputs)) {
1102-
if (normalizePath(path.relative(cwd, key)) === normalizedOutputPath) {
1103-
return value
1104-
}
1105-
}
1106-
}
1107-
11081084
export async function extractExportsData(
11091085
filePath: string,
11101086
config: ResolvedConfig,
@@ -1240,6 +1216,8 @@ export function getDepHash(config: ResolvedConfig, ssr: boolean): string {
12401216
exclude: optimizeDeps?.exclude,
12411217
rollupOptions: {
12421218
...optimizeDeps?.rollupOptions,
1219+
// TODO(underfin): the rollupOptions.plugins how to exclude `ParallelPlugin`
1220+
// @ts-ignore
12431221
plugins: optimizeDeps?.rollupOptions?.plugins?.map((p) => p.name),
12441222
},
12451223
},

0 commit comments

Comments
 (0)