Unverified Commit 53f097f6 authored by Gengkun's avatar Gengkun Committed by GitHub

Fix resolve alternate bundler in monorepo (#77913)

resolve rspack related packages from `next-rspack`, to make sure rspack
is using the expected version
parent 27bb7066
...@@ -3,8 +3,9 @@ import { warnOnce } from '../../build/output/log' ...@@ -3,8 +3,9 @@ import { warnOnce } from '../../build/output/log'
export function getRspackCore() { export function getRspackCore() {
warnRspack() warnRspack()
try { try {
const paths = [require.resolve('next-rspack')]
// eslint-disable-next-line import/no-extraneous-dependencies // eslint-disable-next-line import/no-extraneous-dependencies
return require('@rspack/core') return require(require.resolve('@rspack/core', { paths }))
} catch (e) { } catch (e) {
if (e instanceof Error && 'code' in e && e.code === 'MODULE_NOT_FOUND') { if (e instanceof Error && 'code' in e && e.code === 'MODULE_NOT_FOUND') {
throw new Error( throw new Error(
...@@ -19,10 +20,14 @@ export function getRspackCore() { ...@@ -19,10 +20,14 @@ export function getRspackCore() {
export function getRspackReactRefresh() { export function getRspackReactRefresh() {
warnRspack() warnRspack()
try { try {
const paths = [require.resolve('next-rspack')]
// eslint-disable-next-line import/no-extraneous-dependencies // eslint-disable-next-line import/no-extraneous-dependencies
const plugin = require('@rspack/plugin-react-refresh') const plugin = require(
require.resolve('@rspack/plugin-react-refresh', { paths })
)
const entry = require.resolve( const entry = require.resolve(
'@rspack/plugin-react-refresh/react-refresh-entry' '@rspack/plugin-react-refresh/react-refresh-entry',
{ paths }
) )
plugin.entry = entry plugin.entry = entry
return plugin return plugin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment