@@ -23,8 +23,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
23
23
const { projectRoot, buildOptions, appConfig } = wco ;
24
24
25
25
const appRoot = path . resolve ( projectRoot , appConfig . root ) ;
26
- const projectRootNodeModules = path . resolve ( projectRoot , 'node_modules' ) ;
27
- const nodeModules = module . paths . slice ( 0 , module . paths . indexOf ( projectRootNodeModules ) + 1 ) ;
26
+ const nodeModules = path . resolve ( projectRoot , 'node_modules' ) ;
28
27
29
28
let extraPlugins : any [ ] = [ ] ;
30
29
let extraRules : any [ ] = [ ] ;
@@ -68,12 +67,12 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
68
67
devtool : buildOptions . sourcemaps ? 'source-map' : false ,
69
68
resolve : {
70
69
extensions : [ '.ts' , '.js' ] ,
71
- modules : [ appRoot , 'node_modules' , projectRootNodeModules ] ,
70
+ modules : [ 'node_modules' , nodeModules ] ,
72
71
} ,
73
72
resolveLoader : {
74
- modules : nodeModules
73
+ modules : [ nodeModules , 'node_modules' ]
75
74
} ,
76
- context : projectRoot ,
75
+ context : __dirname ,
77
76
entry : entryPoints ,
78
77
output : {
79
78
path : path . resolve ( projectRoot , buildOptions . outputPath ) ,
@@ -83,7 +82,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
83
82
} ,
84
83
module : {
85
84
rules : [
86
- { enforce : 'pre' , test : / \. j s $ / , loader : 'source-map-loader' , exclude : nodeModules } ,
85
+ { enforce : 'pre' , test : / \. j s $ / , loader : 'source-map-loader' , exclude : [ nodeModules ] } ,
87
86
{ test : / \. j s o n $ / , loader : 'json-loader' } ,
88
87
{ test : / \. h t m l $ / , loader : 'raw-loader' } ,
89
88
{ test : / \. ( e o t | s v g ) $ / , loader : `file-loader?name=[name]${ hashFormat . file } .[ext]` } ,
0 commit comments