File tree Expand file tree Collapse file tree 10 files changed +13
-31
lines changed Expand file tree Collapse file tree 10 files changed +13
-31
lines changed Original file line number Diff line number Diff line change 7777 }
7878 } ) ;
7979
80- if ( ! global . noBootstrap ) { bootstrap ( ) ; }
80+ if ( global . autoBootstrap ) { bootstrap ( ) ; }
8181
82- // Bootstrap the `AppModule`(skip the `app/main.ts` that normally does this)
82+ // Bootstrap with a default `AppModule`
83+ // ignore an `app/app.module.ts` and `app/main.ts`, even if present
84+ // This function exists primarily (exclusively?) for the QuickStart
8385 function bootstrap ( ) {
8486 console . log ( 'Auto-bootstrapping' ) ;
8587
99101 . catch ( function ( err ) { console . error ( err ) ; } ) ;
100102 }
101103
102- // Import AppModule or make the default AppModule if there isn't one
104+ // Make the default AppModule
103105 // returns a promise for the AppModule
104106 function getAppModule ( ) {
105- if ( global . noAppModule ) {
106- return makeAppModule ( ) ;
107- }
108- return System . import ( 'app/app.module' ) . catch ( makeAppModule )
109- }
110-
111- function makeAppModule ( ) {
112- console . log ( 'No AppModule; making a bare-bones, default AppModule' ) ;
107+ console . log ( 'Making a bare-bones, default AppModule' ) ;
113108
114109 return Promise . all ( [
115110 System . import ( '@angular/core' ) ,
Original file line number Diff line number Diff line change 6464 }
6565 } ) ;
6666
67- if ( ! global . noBootstrap ) { bootstrap ( ) ; }
67+ if ( global . autoBootstrap ) { bootstrap ( ) ; }
6868
69- // Bootstrap the `AppModule`(skip the `app/main.ts` that normally does this)
69+ // Bootstrap with a default `AppModule`
70+ // ignore an `app/app.module.ts` and `app/main.ts`, even if present
71+ // This function exists primarily (exclusively?) for the QuickStart
7072 function bootstrap ( ) {
7173 console . log ( 'Auto-bootstrapping' ) ;
7274
8688 . catch ( function ( err ) { console . error ( err ) ; } ) ;
8789 }
8890
89- // Import AppModule or make the default AppModule if there isn't one
91+ // Make the default AppModule
9092 // returns a promise for the AppModule
9193 function getAppModule ( ) {
92- if ( global . noAppModule ) {
93- return makeAppModule ( ) ;
94- }
95- return System . import ( 'app/app.module' ) . catch ( makeAppModule )
96- }
97-
98- function makeAppModule ( ) {
99- console . log ( 'No AppModule; making a bare-bones, default AppModule' ) ;
94+ console . log ( 'Making a bare-bones, default AppModule' ) ;
10095
10196 return Promise . all ( [
10297 System . import ( '@angular/core' ) ,
Original file line number Diff line number Diff line change 1313 < script src ="node_modules/zone.js/dist/zone.js "> </ script >
1414 < script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
1515 < script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16- < script > document . noBootstrap = true ; </ script >
1716 < script src ="systemjs.config.js "> </ script >
1817 < script >
1918 System . import ( 'app/main.0' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 1313 < script src ="node_modules/zone.js/dist/zone.js "> </ script >
1414 < script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
1515 < script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16- < script > document . noBootstrap = true ; </ script >
1716 < script src ="systemjs.config.js "> </ script >
1817 < script >
1918 System . import ( 'app/main.1' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 1313 < script src ="node_modules/zone.js/dist/zone.js "> </ script >
1414 < script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
1515 < script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16- < script > document . noBootstrap = true ; </ script >
1716 < script src ="systemjs.config.js "> </ script >
1817 < script >
1918 System . import ( 'app/main.1b' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 1313 < script src ="node_modules/zone.js/dist/zone.js "> </ script >
1414 < script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
1515 < script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16- < script > document . noBootstrap = true ; </ script >
1716 < script src ="systemjs.config.js "> </ script >
1817 < script >
1918 System . import ( 'app/main.2' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 1313 < script src ="node_modules/zone.js/dist/zone.js "> </ script >
1414 < script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
1515 < script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16- < script > document . noBootstrap = true ; </ script >
1716 < script src ="systemjs.config.js "> </ script >
1817 < script >
1918 System . import ( 'app/main.3' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change @@ -33,8 +33,6 @@ System.config({
3333 } ,
3434} ) ;
3535
36- document [ 'noBootstrap' ] = true ; // do not run system.config.web.js bootstrap
37-
3836System . import ( 'systemjs.config.js' )
3937 . then ( importSystemJsExtras )
4038 . then ( initTestBed )
Original file line number Diff line number Diff line change @@ -248,7 +248,6 @@ class PlunkerBuilder {
248248 } ) ;
249249
250250 var defaultExcludes = [
251- '!**/app/main.ts' ,
252251 '!**/a2docs.css' ,
253252 '!**/tsconfig.json' ,
254253 '!**/*plnkr.*' ,
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ var _rxRules = {
2121 } ,
2222 systemjs : {
2323 from : / < s c r i p t s r c = " s y s t e m j s .c o n f i g .j s " > < \/ s c r i p t > / ,
24- to : '<script src="https://cdn.rawgit.com/angular/angular.io/74ef87f /public/docs/_examples/_boilerplate/systemjs.config.web.js"></script>'
24+ to : '<script src="https://cdn.rawgit.com/angular/angular.io/f2daab7 /public/docs/_examples/_boilerplate/systemjs.config.web.js"></script>'
2525 } ,
2626 // Clear script like this:
2727 // <script>
You can’t perform that action at this time.
0 commit comments