@@ -71,7 +71,7 @@ export class FrameworkConfiguration {
71
71
this . preTasks = [ ] ;
72
72
this . postTasks = [ ] ;
73
73
this . resourcesToLoad = { } ;
74
- this . preTask ( ( ) => System . normalize ( 'aurelia-bootstrapper' ) . then ( bootstrapperName => this . bootstrapperName = bootstrapperName ) ) ;
74
+ this . preTask ( ( ) => this . bootstrapperName = aurelia . loader . normalizeSync ( 'aurelia-bootstrapper' ) ) ;
75
75
this . postTask ( ( ) => loadResources ( aurelia . container , this . resourcesToLoad , aurelia . resources ) ) ;
76
76
}
77
77
@@ -202,14 +202,13 @@ export class FrameworkConfiguration {
202
202
203
203
this . plugin ( plugin ) ;
204
204
this . preTask ( ( ) => {
205
- return System . normalize ( name , this . bootstrapperName ) . then ( normalizedName => {
206
- normalizedName = normalizedName . endsWith ( '.js' ) || normalizedName . endsWith ( '.ts' )
207
- ? normalizedName . substring ( 0 , normalizedName . length - 3 ) : normalizedName ;
205
+ let normalizedName = this . aurelia . loader . normalizeSync ( name , this . bootstrapperName ) ;
206
+ normalizedName = normalizedName . endsWith ( '.js' ) || normalizedName . endsWith ( '.ts' )
207
+ ? normalizedName . substring ( 0 , normalizedName . length - 3 ) : normalizedName ;
208
208
209
- plugin . moduleId = normalizedName ;
210
- plugin . resourcesRelativeTo = normalizedName ;
211
- System . map [ name ] = normalizedName ;
212
- } ) ;
209
+ plugin . moduleId = normalizedName ;
210
+ plugin . resourcesRelativeTo = normalizedName ;
211
+ this . aurelia . loader . map ( name , normalizedName ) ;
213
212
} ) ;
214
213
215
214
return this ;
@@ -269,11 +268,10 @@ export class FrameworkConfiguration {
269
268
*/
270
269
developmentLogging ( ) : FrameworkConfiguration {
271
270
this . preTask ( ( ) => {
272
- return System . normalize ( 'aurelia-logging-console' , this . bootstrapperName ) . then ( name => {
273
- return this . aurelia . loader . loadModule ( name ) . then ( m => {
274
- TheLogManager . addAppender ( new m . ConsoleAppender ( ) ) ;
275
- TheLogManager . setLevel ( TheLogManager . logLevel . debug ) ;
276
- } ) ;
271
+ let name = this . aurelia . loader . normalizeSync ( 'aurelia-logging-console' , this . bootstrapperName ) ;
272
+ return this . aurelia . loader . loadModule ( name ) . then ( m => {
273
+ TheLogManager . addAppender ( new m . ConsoleAppender ( ) ) ;
274
+ TheLogManager . setLevel ( TheLogManager . logLevel . debug ) ;
277
275
} ) ;
278
276
} ) ;
279
277
0 commit comments