Skip to content

Commit 423c17a

Browse files
committed
fix: 🐛 transformer imported dependencies being overwritten
1 parent a994591 commit 423c17a

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

Diff for: package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/autoProcess.js

+18-15
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ const TEMPLATE_PATTERN = new RegExp(
2222
`<template([\\s\\S]*?)>([\\s\\S]*?)<\\/template>`,
2323
)
2424

25+
const concat = (...arrs) =>
26+
arrs.reduce((acc, a) => (a && a.length ? acc.concat(a) : acc), [])
27+
2528
module.exports = ({ onBefore, aliases, preserve = [], ...rest } = {}) => {
2629
const optionsCache = {}
2730
const transformers = rest.transformers || rest
@@ -78,7 +81,7 @@ module.exports = ({ onBefore, aliases, preserve = [], ...rest } = {}) => {
7881
throwUnsupportedError(alias, filename)
7982
}
8083

81-
const transformedContent = await runTransformer(
84+
const transformed = await runTransformer(
8285
lang,
8386
getTransformerOptions(lang, alias),
8487
{
@@ -88,8 +91,8 @@ module.exports = ({ onBefore, aliases, preserve = [], ...rest } = {}) => {
8891
)
8992

9093
return {
91-
...transformedContent,
92-
dependencies,
94+
...transformed,
95+
dependencies: concat(dependencies, transformed.dependencies),
9396
}
9497
}
9598

@@ -156,26 +159,26 @@ module.exports = ({ onBefore, aliases, preserve = [], ...rest } = {}) => {
156159
})
157160

158161
if (transformers.postcss) {
159-
const result = await runTransformer('postcss', transformers.postcss, {
160-
content: code,
161-
map,
162-
filename,
163-
})
164-
165-
code = result.code
166-
map = result.map
167-
dependencies = dependencies.concat(result.dependencies)
162+
const transformed = await runTransformer(
163+
'postcss',
164+
transformers.postcss,
165+
{ content: code, map, filename },
166+
)
167+
168+
code = transformed.code
169+
map = transformed.map
170+
dependencies = concat(dependencies, transformed.dependencies)
168171
}
169172

170173
if (attributes.global) {
171-
const result = await runTransformer('globalStyle', null, {
174+
const transformed = await runTransformer('globalStyle', null, {
172175
content: code,
173176
map,
174177
filename,
175178
})
176179

177-
code = result.code
178-
map = result.map
180+
code = transformed.code
181+
map = transformed.map
179182
}
180183

181184
return { code, map, dependencies }

0 commit comments

Comments
 (0)