Skip to content

Commit 94b2c71

Browse files
committed
chore: bump version
1 parent 10804a9 commit 94b2c71

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"weapp-tailwindcss": patch
3+
---
4+
5+
修复 tailwindcss v4 在自动收集 cssEntries 时丢失基准目录的问题:从上下文创建 patcher 时附带工作区 base,保留用户显式设置的 v4 base,并在多 patcher 聚合时沿用首个 patcher 的配置。

packages/weapp-tailwindcss/src/context/tailwindcss.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,19 @@ export function createTailwindcssPatcherFromContext(ctx: InternalUserDefinedOpti
277277
ctx.cssEntries = normalizedCssEntries
278278
}
279279

280+
const shouldAttachBase = Boolean(ctx.tailwindcssBasedir && normalizedCssEntries?.length)
281+
const tailwindcssWithBase = shouldAttachBase && tailwindcss?.v4 !== null
282+
? {
283+
...(tailwindcss ?? {}),
284+
v4: {
285+
...(tailwindcss?.v4 ?? {}),
286+
base: tailwindcss?.v4?.base ?? resolvedTailwindcssBasedir,
287+
},
288+
}
289+
: tailwindcss
290+
280291
const patcherOptions: TailwindcssPatcherFactoryOptions = {
281-
tailwindcss,
292+
tailwindcss: tailwindcssWithBase,
282293
tailwindcssPatcherOptions,
283294
supportCustomLengthUnitsPatch,
284295
appType,

packages/weapp-tailwindcss/src/tailwindcss/v4/patcher.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ export function createMultiTailwindcssPatcher(patchers: TailwindcssPatcherLike[]
316316

317317
const [first] = patchers
318318
const multiPatcher: TailwindcssPatcherLike = {
319+
...first,
319320
packageInfo: first?.packageInfo,
320321
majorVersion: first?.majorVersion,
321322
options: first?.options,

0 commit comments

Comments
 (0)