Skip to content

Commit 1d473ae

Browse files
committed
Merge remote-tracking branch 'origin/2.0' into 2.0
2 parents 80a889e + 3226ec7 commit 1d473ae

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

gulpfile.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,15 @@ gulp.task('copy.scss', function() {
335335
gulp.task('copy.libs', function() {
336336
var merge = require('merge2');
337337
var webAnimations = gulp.src([
338-
'scripts/resources/web-animations-js/web-animations.min.js'
338+
'scripts/resources/web-animations-js/web-animations.min.js',
339+
'node_modules/es6-shim/es6-shim.min.js',
340+
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js',
341+
'node_modules/systemjs/dist/system.src.js',
342+
'node_modules/angular2/bundles/angular2-polyfills.js',
343+
'node_modules/angular2/bundles/angular2.dev.js',
344+
'node_modules/angular2/bundles/router.dev.js',
345+
'node_modules/angular2/bundles/http.dev.js',
346+
'node_modules/rxjs/bundles/Rx.js'
339347
])
340348
.pipe(gulp.dest('dist/js'));
341349

@@ -767,7 +775,8 @@ gulp.task('build.release', function(done){
767775
runSequence(
768776
'clean',
769777
'copy.libs',
770-
['bundle', 'sass', 'fonts', 'copy.scss']
778+
['bundle', 'sass', 'fonts', 'copy.scss'],
779+
done
771780
);
772781
});
773782

scripts/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ To remove the linked version of `ionic-framework` do `npm rm ionic-framework`, a
5050
3. Export `IONIC_SNAPSHOT_KEY` (get from someone)
5151
4. Run `gulp snapshot`
5252

53-
For more information on protractor, see https://angular.github.io/protractor/#/.
54-
5553

5654
### Running Tests
5755

scripts/e2e/e2e.template.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,16 @@
3333
}
3434
</script>
3535

36-
<script src="../../../../node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js"></script>
37-
<script src="../../../../node_modules/systemjs/dist/system.src.js"></script>
38-
<script src="../../../../node_modules/angular2/bundles/angular2-polyfills.js"></script>
39-
<script src="../../../../node_modules/angular2/bundles/angular2.dev.js"></script>
40-
<script src="../../../../node_modules/angular2/bundles/router.dev.js"></script>
41-
<script src="../../../../node_modules/angular2/bundles/http.dev.js"></script>
42-
<script src="../../../../scripts/resources/web-animations-js/web-animations.min.js"></script>
36+
<script src="../../../js/es6-shim.min.js"></script>
37+
<script src="../../../js/es6-module-loader.src.js"></script>
38+
<script src="../../../js/system.src.js"></script>
39+
<script src="../../../js/angular2-polyfills.js"></script>
40+
<script src="../../../js/angular2.dev.js"></script>
41+
<script src="../../../js/router.dev.js"></script>
42+
<script src="../../../js/http.dev.js"></script>
43+
<script src="../../../js/web-animations.min.js"></script>
4344
<script src="../../../bundles/ionic.system.js"></script>
44-
<script src="../../../../node_modules/rxjs/bundles/Rx.js"></script>
45+
<script src="../../../js/Rx.js"></script>
4546

4647
<style>
4748
.snapshot body {

scripts/npm/.npmignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
e2e/
2-
demos/
2+
demos/
3+
js/Rx.js
4+
js/angular2-polyfills.js
5+
js/angular2.dev.js
6+
js/es6-module-loader.src.js
7+
js/es6-shim.min.js
8+
js/http.dev.js
9+
js/router.dev.js
10+
js/system.src.js

0 commit comments

Comments
 (0)