This repository was archived by the owner on Dec 4, 2017. It is now read-only.
File tree 10 files changed +25
-31
lines changed
10 files changed +25
-31
lines changed Original file line number Diff line number Diff line change 77
77
}
78
78
} ) ;
79
79
80
- if ( ! global . noBootstrap ) { bootstrap ( ) ; }
80
+ if ( global . autoBootstrap ) { bootstrap ( ) ; }
81
81
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
83
85
function bootstrap ( ) {
84
86
console . log ( 'Auto-bootstrapping' ) ;
85
87
99
101
. catch ( function ( err ) { console . error ( err ) ; } ) ;
100
102
}
101
103
102
- // Import AppModule or make the default AppModule if there isn't one
104
+ // Make the default AppModule
103
105
// returns a promise for the AppModule
104
106
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' ) ;
113
108
114
109
return Promise . all ( [
115
110
System . import ( '@angular/core' ) ,
135
130
} )
136
131
}
137
132
} ) ( this ) ;
133
+
134
+ /*
135
+ Copyright 2016 Google Inc. All Rights Reserved.
136
+ Use of this source code is governed by an MIT-style license that
137
+ can be found in the LICENSE file at http://angular.io/license
138
+ */
Original file line number Diff line number Diff line change 64
64
}
65
65
} ) ;
66
66
67
- if ( ! global . noBootstrap ) { bootstrap ( ) ; }
67
+ if ( global . autoBootstrap ) { bootstrap ( ) ; }
68
68
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
70
72
function bootstrap ( ) {
71
73
console . log ( 'Auto-bootstrapping' ) ;
72
74
86
88
. catch ( function ( err ) { console . error ( err ) ; } ) ;
87
89
}
88
90
89
- // Import AppModule or make the default AppModule if there isn't one
91
+ // Make the default AppModule
90
92
// returns a promise for the AppModule
91
93
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' ) ;
100
95
101
96
return Promise . all ( [
102
97
System . import ( '@angular/core' ) ,
122
117
} )
123
118
}
124
119
} ) ( this ) ;
120
+
121
+ /*
122
+ Copyright 2016 Google Inc. All Rights Reserved.
123
+ Use of this source code is governed by an MIT-style license that
124
+ can be found in the LICENSE file at http://angular.io/license
125
+ */
Original file line number Diff line number Diff line change 13
13
< script src ="node_modules/zone.js/dist/zone.js "> </ script >
14
14
< script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
15
15
< script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16
- < script > document . noBootstrap = true ; </ script >
17
16
< script src ="systemjs.config.js "> </ script >
18
17
< script >
19
18
System . import ( 'app/main.0' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 13
13
< script src ="node_modules/zone.js/dist/zone.js "> </ script >
14
14
< script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
15
15
< script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16
- < script > document . noBootstrap = true ; </ script >
17
16
< script src ="systemjs.config.js "> </ script >
18
17
< script >
19
18
System . import ( 'app/main.1' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 13
13
< script src ="node_modules/zone.js/dist/zone.js "> </ script >
14
14
< script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
15
15
< script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16
- < script > document . noBootstrap = true ; </ script >
17
16
< script src ="systemjs.config.js "> </ script >
18
17
< script >
19
18
System . import ( 'app/main.1b' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 13
13
< script src ="node_modules/zone.js/dist/zone.js "> </ script >
14
14
< script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
15
15
< script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16
- < script > document . noBootstrap = true ; </ script >
17
16
< script src ="systemjs.config.js "> </ script >
18
17
< script >
19
18
System . import ( 'app/main.2' ) . catch ( function ( err ) { console . error ( err ) ; } ) ;
Original file line number Diff line number Diff line change 13
13
< script src ="node_modules/zone.js/dist/zone.js "> </ script >
14
14
< script src ="node_modules/reflect-metadata/Reflect.js "> </ script >
15
15
< script src ="node_modules/systemjs/dist/system.src.js "> </ script >
16
- < script > document . noBootstrap = true ; </ script >
17
16
< script src ="systemjs.config.js "> </ script >
18
17
< script >
19
18
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({
33
33
} ,
34
34
} ) ;
35
35
36
- document [ 'noBootstrap' ] = true ; // do not run system.config.web.js bootstrap
37
-
38
36
System . import ( 'systemjs.config.js' )
39
37
. then ( importSystemJsExtras )
40
38
. then ( initTestBed )
Original file line number Diff line number Diff line change @@ -248,7 +248,6 @@ class PlunkerBuilder {
248
248
} ) ;
249
249
250
250
var defaultExcludes = [
251
- '!**/app/main.ts' ,
252
251
'!**/a2docs.css' ,
253
252
'!**/tsconfig.json' ,
254
253
'!**/*plnkr.*' ,
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ var _rxRules = {
21
21
} ,
22
22
systemjs : {
23
23
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>'
25
25
} ,
26
26
// Clear script like this:
27
27
// <script>
You can’t perform that action at this time.
0 commit comments