Skip to content

Commit 896d11f

Browse files
committed
chore: fix rsbuild test
1 parent 2c026fb commit 896d11f

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

packages/rsbuild-plugin/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
"fs-extra": "11.3.0",
5252
"@module-federation/sdk": "workspace:*",
5353
"@module-federation/enhanced": "workspace:*",
54-
"@module-federation/node": "workspace:*"
54+
"@module-federation/node": "workspace:*",
55+
"import-meta-resolve": "4.1.0"
5556
},
5657
"devDependencies": {
5758
"@rsbuild/core": "^1.3.21"

packages/rsbuild-plugin/src/utils/ssr.spec.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { describe, it, expect, vi } from 'vitest';
2-
import { createSSRMFConfig, patchSSRRspackConfig, SSR_DIR } from './ssr'; // Assuming SSR_DIR is exported or mockable
2+
import { resolve } from 'import-meta-resolve';
3+
import { createSSRMFConfig, patchSSRRspackConfig, SSR_DIR } from './ssr';
34
import type { Rspack } from '@rsbuild/core';
45
import type { moduleFederationPlugin } from '@module-federation/sdk';
56

@@ -15,7 +16,7 @@ describe('createSSRMFConfig', () => {
1516
expect(ssrMFConfig.dts).toBe(false);
1617
expect(ssrMFConfig.dev).toBe(false);
1718
expect(ssrMFConfig.runtimePlugins).toEqual([
18-
require.resolve('@module-federation/node/runtimePlugin'),
19+
resolve('@module-federation/node/runtimePlugin', import.meta.url),
1920
]);
2021
});
2122

@@ -37,11 +38,12 @@ describe('createSSRMFConfig', () => {
3738
process.env.NODE_ENV = 'development';
3839
const ssrMFConfig = createSSRMFConfig(baseMFConfig);
3940
expect(ssrMFConfig.runtimePlugins).toContain(
40-
require.resolve('@module-federation/node/runtimePlugin'),
41+
resolve('@module-federation/node/runtimePlugin', import.meta.url),
4142
);
4243
expect(ssrMFConfig.runtimePlugins).toContain(
43-
require.resolve(
44+
resolve(
4445
'@module-federation/node/record-dynamic-remote-entry-hash-plugin',
46+
import.meta.url,
4547
),
4648
);
4749
process.env.NODE_ENV = originalNodeEnv; // Restore original NODE_ENV
@@ -52,7 +54,7 @@ describe('createSSRMFConfig', () => {
5254
process.env.NODE_ENV = 'production';
5355
const ssrMFConfig = createSSRMFConfig(baseMFConfig);
5456
expect(ssrMFConfig.runtimePlugins).toEqual([
55-
require.resolve('@module-federation/node/runtimePlugin'),
57+
resolve('@module-federation/node/runtimePlugin', import.meta.url),
5658
]);
5759
process.env.NODE_ENV = originalNodeEnv; // Restore original NODE_ENV
5860
});
@@ -65,7 +67,7 @@ describe('createSSRMFConfig', () => {
6567
};
6668
const ssrMFConfig = createSSRMFConfig(mfConfigWithoutRuntimePlugins);
6769
expect(ssrMFConfig.runtimePlugins).toEqual([
68-
require.resolve('@module-federation/node/runtimePlugin'),
70+
resolve('@module-federation/node/runtimePlugin', import.meta.url),
6971
]);
7072
});
7173
});

packages/rsbuild-plugin/src/utils/ssr.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import path from 'path';
2+
import { resolve } from 'import-meta-resolve';
23
import { createRequire } from 'node:module';
34
import { encodeName } from '@module-federation/sdk';
45
import { CALL_NAME_MAP } from '../constant';
@@ -120,14 +121,14 @@ export function createSSRMFConfig(
120121
};
121122

122123
ssrMFConfig.runtimePlugins.push(
123-
// @ts-ignore
124-
import.meta.resolve('@module-federation/node/runtimePlugin'),
124+
resolve('@module-federation/node/runtimePlugin', import.meta.url),
125125
);
126126
if (isDev()) {
127127
ssrMFConfig.runtimePlugins.push(
128128
// @ts-ignore
129-
import.meta.resolve(
129+
resolve(
130130
'@module-federation/node/record-dynamic-remote-entry-hash-plugin',
131+
import.meta.url,
131132
),
132133
);
133134
}

pnpm-lock.yaml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)