Skip to content

Commit ad6383d

Browse files
committed
feat: remove webpack check
1 parent a77e294 commit ad6383d

File tree

4 files changed

+8
-42
lines changed

4 files changed

+8
-42
lines changed

.changeset/many-peas-prove.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/modern-js': patch
3+
---
4+
5+
feat: support modern.js@3

packages/modernjs/src/cli/configPlugin.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ export const moduleFederationConfigPlugin = (
425425
chain.output.get('path') || path.resolve(process.cwd(), 'dist');
426426
});
427427
api.config(() => {
428-
const bundlerType = 'rspack';
429428
const ipv4 = getIPV4();
430429

431430
if (userConfig.remoteIpStrategy === undefined) {
@@ -489,10 +488,7 @@ export const moduleFederationConfigPlugin = (
489488
},
490489
source: {
491490
define: defineConfig,
492-
enableAsyncEntry:
493-
bundlerType === 'rspack'
494-
? (modernjsConfig.source?.enableAsyncEntry ?? true)
495-
: modernjsConfig.source?.enableAsyncEntry,
491+
enableAsyncEntry: modernjsConfig.source?.enableAsyncEntry ?? true,
496492
},
497493
dev: {
498494
assetPrefix: modernjsConfig?.dev?.assetPrefix

packages/modernjs/src/cli/index.ts

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import type { CliPlugin, AppTools } from '@modern-js/app-tools';
2-
import {
3-
ModuleFederationPlugin as WebpackModuleFederationPlugin,
4-
AsyncBoundaryPlugin,
5-
} from '@module-federation/enhanced';
62
import { ModuleFederationPlugin as RspackModuleFederationPlugin } from '@module-federation/enhanced/rspack';
73
import type { moduleFederationPlugin as MFPluginOptions } from '@module-federation/sdk';
84
import type { PluginOptions, InternalModernPluginOptions } from '../types';
@@ -29,18 +25,11 @@ export const moduleFederationPlugin = (
2925
return {
3026
name: '@modern-js/plugin-module-federation',
3127
setup: async (api) => {
32-
const modernjsConfig = api.getConfig();
33-
3428
api.modifyBundlerChain((chain) => {
35-
const bundlerType =
36-
api.getAppContext().bundlerType === 'rspack' ? 'rspack' : 'webpack';
3729
const browserPluginOptions =
3830
internalModernPluginOptions.csrConfig as MFPluginOptions.ModuleFederationPluginOptions;
3931

40-
const MFPlugin =
41-
bundlerType === 'webpack'
42-
? WebpackModuleFederationPlugin
43-
: RspackModuleFederationPlugin;
32+
const MFPlugin = RspackModuleFederationPlugin;
4433
if (isWebTarget(chain.get('target'))) {
4534
chain
4635
.plugin('plugin-module-federation')
@@ -50,24 +39,6 @@ export const moduleFederationPlugin = (
5039
return internalModernPluginOptions.browserPlugin;
5140
});
5241
}
53-
54-
if (bundlerType === 'webpack') {
55-
const enableAsyncEntry = modernjsConfig.source?.enableAsyncEntry;
56-
if (!enableAsyncEntry && browserPluginOptions.async !== false) {
57-
const asyncBoundaryPluginOptions =
58-
typeof browserPluginOptions.async === 'object'
59-
? browserPluginOptions.async
60-
: {
61-
eager: (module) =>
62-
module && /\.federation/.test(module?.request || ''),
63-
excludeChunk: (chunk) =>
64-
chunk.name === browserPluginOptions.name,
65-
};
66-
chain
67-
.plugin('async-boundary-plugin')
68-
.use(AsyncBoundaryPlugin, [asyncBoundaryPluginOptions]);
69-
}
70-
}
7142
});
7243

7344
api._internalServerPlugins(({ plugins }) => {

packages/modernjs/src/cli/ssrPlugin.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import path from 'path';
22
import fs from 'fs-extra';
3-
import { ModuleFederationPlugin } from '@module-federation/enhanced/webpack';
43
import { ModuleFederationPlugin as RspackModuleFederationPlugin } from '@module-federation/enhanced/rspack';
54
import UniverseEntryChunkTrackerPlugin from '@module-federation/node/universe-entry-chunk-tracker-plugin';
65
import logger from '../logger';
@@ -272,12 +271,7 @@ export const moduleFederationSSRPlugin = (
272271
if (skipByTarget(target)) {
273272
return;
274273
}
275-
const bundlerType =
276-
api.getAppContext().bundlerType === 'rspack' ? 'rspack' : 'webpack';
277-
const MFPlugin =
278-
bundlerType === 'webpack'
279-
? ModuleFederationPlugin
280-
: RspackModuleFederationPlugin;
274+
const MFPlugin = RspackModuleFederationPlugin;
281275

282276
const isWeb = isWebTarget(target);
283277

0 commit comments

Comments
 (0)