Skip to content

Commit 1e93c5e

Browse files
authored
fix: use userOptions.typesFolder first (#2615)
1 parent a85ec3e commit 1e93c5e

File tree

5 files changed

+102
-45
lines changed

5 files changed

+102
-45
lines changed

.changeset/spotty-laws-sparkle.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/enhanced': patch
3+
---
4+
5+
chore(enhanced): add peer deps required by dts plugin

.changeset/weak-dolls-hug.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/dts-plugin': patch
3+
---
4+
5+
fix: use userOptions.typesFolder first

packages/dts-plugin/src/plugins/DevPlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export class DevPlugin implements WebpackPluginInstance {
216216
: normalizedDtsOptions.implementation,
217217
context: compiler.context,
218218
moduleFederationConfig: this._options,
219-
typesFolder: '@mf-types',
219+
typesFolder: normalizedConsumeTypes.typesFolder || '@mf-types',
220220
abortOnError: false,
221221
...normalizedConsumeTypes,
222222
};

packages/enhanced/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,19 @@
1313
"access": "public"
1414
},
1515
"peerDependencies": {
16-
"webpack": "^5.0.0"
16+
"webpack": "^5.0.0",
17+
"typescript": "^4.9.0 || ^5.0.0",
18+
"vue-tsc": "^1.0.24"
1719
},
1820
"peerDependenciesMeta": {
1921
"webpack": {
2022
"optional": true
23+
},
24+
"typescript": {
25+
"optional": true
26+
},
27+
"vue-tsc": {
28+
"optional": true
2129
}
2230
},
2331
"exports": {

pnpm-lock.yaml

Lines changed: 82 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)