File tree 1 file changed +7
-3
lines changed
1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change 1
- import type { ResolveOptions , RspackOptions } from '@rspack/core'
1
+ import type { ResolveOptions , RspackOptions , RspackOptionsNormalized } from '@rspack/core'
2
2
import type { BundlerConfigTransformer } from './index'
3
3
import { log , mergeOptions , tryRequireThenImport } from '@/utils'
4
4
import { isBoolean , isNil , isString } from 'es-toolkit'
5
5
import { EnforceExtension , type NapiResolveOptions } from 'oxc-resolver'
6
6
7
- function normalizeOptions ( options : RspackOptions ) {
7
+ function normalizeOptions ( options : RspackOptionsNormalized ) {
8
8
if ( ! options . resolve )
9
9
return
10
10
if ( options . resolve . byDependency ) {
@@ -107,7 +107,11 @@ export async function transformWebpackConfig(path: string, _options: RspackTrans
107
107
}
108
108
}
109
109
110
- const config = normalizeOptions ( rspackOptions as RspackOptions )
110
+ const { config : rspackConfig } = await tryRequireThenImport < typeof import ( '@rspack/core' ) > ( '@rspack/core' )
111
+ const options = rspackConfig . getNormalizedRspackOptions ( rspackOptions as RspackOptions )
112
+ rspackConfig . applyRspackOptionsDefaults ( options )
113
+
114
+ const config = normalizeOptions ( options )
111
115
if ( ! config || ! config . resolve )
112
116
return { }
113
117
You can’t perform that action at this time.
0 commit comments