Skip to content

Commit 9f772cd

Browse files
committed
chore: remove import-meta-resolve dep
1 parent 896d11f commit 9f772cd

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

packages/rsbuild-plugin/package.json

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

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { describe, it, expect, vi } from 'vitest';
2-
import { resolve } from 'import-meta-resolve';
32
import { createSSRMFConfig, patchSSRRspackConfig, SSR_DIR } from './ssr';
43
import type { Rspack } from '@rsbuild/core';
54
import type { moduleFederationPlugin } from '@module-federation/sdk';
@@ -16,7 +15,7 @@ describe('createSSRMFConfig', () => {
1615
expect(ssrMFConfig.dts).toBe(false);
1716
expect(ssrMFConfig.dev).toBe(false);
1817
expect(ssrMFConfig.runtimePlugins).toEqual([
19-
resolve('@module-federation/node/runtimePlugin', import.meta.url),
18+
require.resolve('@module-federation/node/runtimePlugin'),
2019
]);
2120
});
2221

@@ -38,12 +37,11 @@ describe('createSSRMFConfig', () => {
3837
process.env.NODE_ENV = 'development';
3938
const ssrMFConfig = createSSRMFConfig(baseMFConfig);
4039
expect(ssrMFConfig.runtimePlugins).toContain(
41-
resolve('@module-federation/node/runtimePlugin', import.meta.url),
40+
require.resolve('@module-federation/node/runtimePlugin'),
4241
);
4342
expect(ssrMFConfig.runtimePlugins).toContain(
44-
resolve(
43+
require.resolve(
4544
'@module-federation/node/record-dynamic-remote-entry-hash-plugin',
46-
import.meta.url,
4745
),
4846
);
4947
process.env.NODE_ENV = originalNodeEnv; // Restore original NODE_ENV
@@ -54,7 +52,7 @@ describe('createSSRMFConfig', () => {
5452
process.env.NODE_ENV = 'production';
5553
const ssrMFConfig = createSSRMFConfig(baseMFConfig);
5654
expect(ssrMFConfig.runtimePlugins).toEqual([
57-
resolve('@module-federation/node/runtimePlugin', import.meta.url),
55+
require.resolve('@module-federation/node/runtimePlugin'),
5856
]);
5957
process.env.NODE_ENV = originalNodeEnv; // Restore original NODE_ENV
6058
});
@@ -67,7 +65,7 @@ describe('createSSRMFConfig', () => {
6765
};
6866
const ssrMFConfig = createSSRMFConfig(mfConfigWithoutRuntimePlugins);
6967
expect(ssrMFConfig.runtimePlugins).toEqual([
70-
resolve('@module-federation/node/runtimePlugin', import.meta.url),
68+
require.resolve('@module-federation/node/runtimePlugin'),
7169
]);
7270
});
7371
});

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import path from 'path';
2-
import { resolve } from 'import-meta-resolve';
32
import { createRequire } from 'node:module';
43
import { encodeName } from '@module-federation/sdk';
54
import { CALL_NAME_MAP } from '../constant';
@@ -8,6 +7,7 @@ import type { EnvironmentConfig, RsbuildConfig, Rspack } from '@rsbuild/core';
87
import type { moduleFederationPlugin } from '@module-federation/sdk';
98

109
const require = createRequire(import.meta.url);
10+
const resolve = require.resolve;
1111

1212
export const SSR_DIR = 'ssr';
1313
export const SSR_ENV_NAME = 'mf-ssr';
@@ -121,14 +121,13 @@ export function createSSRMFConfig(
121121
};
122122

123123
ssrMFConfig.runtimePlugins.push(
124-
resolve('@module-federation/node/runtimePlugin', import.meta.url),
124+
resolve('@module-federation/node/runtimePlugin'),
125125
);
126126
if (isDev()) {
127127
ssrMFConfig.runtimePlugins.push(
128128
// @ts-ignore
129129
resolve(
130130
'@module-federation/node/record-dynamic-remote-entry-hash-plugin',
131-
import.meta.url,
132131
),
133132
);
134133
}

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)