javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 06:22:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0' into 2.0

Browse Source
This commit is contained in:
Adam Bradley
2016-02-05 10:47:55 -06:00
parent 80a889e3d7 3226ec7ec6
commit 1d473ae227
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulpfile.js
View File

@ -335,7 +335,15 @@ gulp.task('copy.scss', function() {
gulp.task('copy.libs', function() { gulp.task('copy.libs', function() {
var merge = require('merge2'); var merge = require('merge2');
var webAnimations = gulp.src([ var webAnimations = gulp.src([
'scripts/resources/web-animations-js/web-animations.min.js' 'scripts/resources/web-animations-js/web-animations.min.js',
'node_modules/es6-shim/es6-shim.min.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js',
'node_modules/systemjs/dist/system.src.js',
'node_modules/angular2/bundles/angular2-polyfills.js',
'node_modules/angular2/bundles/angular2.dev.js',
'node_modules/angular2/bundles/router.dev.js',
'node_modules/angular2/bundles/http.dev.js',
'node_modules/rxjs/bundles/Rx.js'
]) ])
.pipe(gulp.dest('dist/js')); .pipe(gulp.dest('dist/js'));
@ -767,7 +775,8 @@ gulp.task('build.release', function(done){
runSequence( runSequence(
'clean', 'clean',
'copy.libs', 'copy.libs',
['bundle', 'sass', 'fonts', 'copy.scss'] ['bundle', 'sass', 'fonts', 'copy.scss'],
done
); );
}); });

2
scripts/README.md
View File

@ -50,8 +50,6 @@ To remove the linked version of `ionic-framework` do `npm rm ionic-framework`, a
3. Export `IONIC_SNAPSHOT_KEY` (get from someone) 3. Export `IONIC_SNAPSHOT_KEY` (get from someone)
4. Run `gulp snapshot` 4. Run `gulp snapshot`
For more information on protractor, see https://angular.github.io/protractor/#/.
### Running Tests ### Running Tests

17
scripts/e2e/e2e.template.html
View File

@ -33,15 +33,16 @@
} }
</script> </script>
<script src="../../../../node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js"></script> <script src="../../../js/es6-shim.min.js"></script>
<script src="../../../../node_modules/systemjs/dist/system.src.js"></script> <script src="../../../js/es6-module-loader.src.js"></script>
<script src="../../../../node_modules/angular2/bundles/angular2-polyfills.js"></script> <script src="../../../js/system.src.js"></script>
<script src="../../../../node_modules/angular2/bundles/angular2.dev.js"></script> <script src="../../../js/angular2-polyfills.js"></script>
<script src="../../../../node_modules/angular2/bundles/router.dev.js"></script> <script src="../../../js/angular2.dev.js"></script>
<script src="../../../../node_modules/angular2/bundles/http.dev.js"></script> <script src="../../../js/router.dev.js"></script>
<script src="../../../../scripts/resources/web-animations-js/web-animations.min.js"></script> <script src="../../../js/http.dev.js"></script>
<script src="../../../js/web-animations.min.js"></script>
<script src="../../../bundles/ionic.system.js"></script> <script src="../../../bundles/ionic.system.js"></script>
<script src="../../../../node_modules/rxjs/bundles/Rx.js"></script> <script src="../../../js/Rx.js"></script>
<style> <style>
.snapshot body { .snapshot body {

10
scripts/npm/.npmignore
View File

@ -1,2 +1,10 @@
e2e/ e2e/
demos/ demos/
js/Rx.js
js/angular2-polyfills.js
js/angular2.dev.js
js/es6-module-loader.src.js
js/es6-shim.min.js
js/http.dev.js
js/router.dev.js
js/system.src.js