@@ -7,7 +7,7 @@ const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns
7
7
const { nsReplaceLazyLoader } = require ( "nativescript-dev-webpack/transformers/ns-replace-lazy-loader" ) ;
8
8
const { nsSupportHmrNg } = require ( "nativescript-dev-webpack/transformers/ns-support-hmr-ng" ) ;
9
9
const { getMainModulePath } = require ( "nativescript-dev-webpack/utils/ast-utils" ) ;
10
- const { getNoEmitOnErrorFromTSConfig } = require ( "nativescript-dev-webpack/utils/tsconfig-utils" ) ;
10
+ const { getNoEmitOnErrorFromTSConfig, getCompilerOptionsFromTSConfig } = require ( "nativescript-dev-webpack/utils/tsconfig-utils" ) ;
11
11
const CleanWebpackPlugin = require ( "clean-webpack-plugin" ) ;
12
12
const CopyWebpackPlugin = require ( "copy-webpack-plugin" ) ;
13
13
const { BundleAnalyzerPlugin } = require ( "webpack-bundle-analyzer" ) ;
@@ -61,19 +61,28 @@ module.exports = env => {
61
61
const isAnySourceMapEnabled = ! ! sourceMap || ! ! hiddenSourceMap ;
62
62
const externals = nsWebpack . getConvertedExternals ( env . externals ) ;
63
63
const appFullPath = resolve ( projectRoot , appPath ) ;
64
+ const tsConfigName = "tsconfig.tns.json" ;
65
+ const tsConfigPath = join ( __dirname , tsConfigName ) ;
64
66
const hasRootLevelScopedModules = nsWebpack . hasRootLevelScopedModules ( { projectDir : projectRoot } ) ;
67
+ const hasRootLevelScopedAngular = nsWebpack . hasRootLevelScopedAngular ( { projectDir : projectRoot } ) ;
65
68
let coreModulesPackageName = "tns-core-modules" ;
66
69
const alias = {
67
70
'~' : appFullPath
68
71
} ;
69
72
73
+ const compilerOptions = getCompilerOptionsFromTSConfig ( tsConfigPath ) ;
70
74
if ( hasRootLevelScopedModules ) {
71
75
coreModulesPackageName = "@nativescript/core" ;
72
76
alias [ "tns-core-modules" ] = coreModulesPackageName ;
77
+ nsWebpack . processTsPathsForScopedModules ( { compilerOptions } ) ;
78
+ }
79
+
80
+ if ( hasRootLevelScopedAngular ) {
73
81
alias [ "nativescript-angular" ] = "@nativescript/angular" ;
82
+ nsWebpack . processTsPathsForScopedAngular ( { compilerOptions } ) ;
74
83
}
84
+
75
85
const appResourcesFullPath = resolve ( projectRoot , appResourcesPath ) ;
76
- const tsConfigName = "tsconfig.tns.json" ;
77
86
const entryModule = `${ nsWebpack . getEntryModule ( appFullPath , platform ) } .ts` ;
78
87
const entryPath = `.${ sep } ${ entryModule } ` ;
79
88
const entries = { bundle : entryPath , application : "./application.android" } ;
@@ -110,10 +119,11 @@ module.exports = env => {
110
119
hostReplacementPaths : nsWebpack . getResolver ( [ platform , "tns" ] ) ,
111
120
platformTransformers : ngCompilerTransformers . map ( t => t ( ( ) => ngCompilerPlugin , resolve ( appFullPath , entryModule ) , projectRoot ) ) ,
112
121
mainPath : join ( appFullPath , entryModule ) ,
113
- tsConfigPath : join ( __dirname , tsConfigName ) ,
122
+ tsConfigPath,
114
123
skipCodeGeneration : ! aot ,
115
124
sourceMap : ! ! isAnySourceMapEnabled ,
116
- additionalLazyModuleResources : additionalLazyModuleResources
125
+ additionalLazyModuleResources : additionalLazyModuleResources ,
126
+ compilerOptions : { paths : compilerOptions . paths }
117
127
} ) ;
118
128
119
129
let sourceMapFilename = nsWebpack . getSourceMapFilename ( hiddenSourceMap , __dirname , dist ) ;
0 commit comments