javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

temporary npm angular2 bundle work around

Browse Source
This commit is contained in:
Tim Lancina
2015-08-07 15:46:41 -05:00
parent cb7387d491
commit 0954bb4641
4 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gulpfile.js
View File

@ -150,14 +150,7 @@ gulp.task('bundle.ionic', ['transpile'], function() {
gulp.task('bundle', ['bundle.ionic'], function() { gulp.task('bundle', ['bundle.ionic'], function() {
var nm = "node_modules"; var nm = "node_modules";
return gulp.src([ return gulp.src(buildConfig.scripts)
'node_modules/traceur/bin/traceur-runtime.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
'node_modules/systemjs/dist/system.js',
'node_modules/angular2-build/angular2.dev.js',
'dist/js/ionic.js',
'node_modules/web-animations-js/web-animations.min.js'
])
.pipe(concat('ionic.bundle.dev.js')) .pipe(concat('ionic.bundle.dev.js'))
.pipe(gulp.dest('dist/js'));; .pipe(gulp.dest('dist/js'));;
}) })
@ -172,16 +165,7 @@ gulp.task('tests', function() {
.pipe(gulp.dest('dist/tests')) .pipe(gulp.dest('dist/tests'))
}) })
gulp.task('copy-scripts', function(){ gulp.task('e2e', function() {
gulp.src([
'scripts/resources/*.js',
'scripts/vendor/web-animations-js/web-animations.min.js',
'config.js',
'dist/js/ionic.bundle.js'
]).pipe(gulp.dest('dist/lib'));
})
gulp.task('e2e', ['copy-scripts'], function() {
var buildTest = lazypipe() var buildTest = lazypipe()
//.pipe(traceur, traceurOptions) //.pipe(traceur, traceurOptions)
.pipe(tsc, tscOptions, null, tscReporter) .pipe(tsc, tscOptions, null, tscReporter)

2
package.json
View File

@ -47,7 +47,7 @@
"yargs": "^3.6.0" "yargs": "^3.6.0"
}, },
"dependencies": { "dependencies": {
"angular2-build": "2.0.0-alpha.33", "angular2-bundle": "tlancina/angular2-bundle",
"systemjs": "^0.16.11", "systemjs": "^0.16.11",
"traceur": "0.0.91", "traceur": "0.0.91",
"traceur-runtime": "0.0.59", "traceur-runtime": "0.0.59",

13
scripts/build/config.js
View File

@ -12,13 +12,12 @@ module.exports = {
}, },
scripts: [ scripts: [
'scripts/resources/traceur-runtime.js', 'node_modules/traceur/bin/traceur-runtime.js',
{ pattern: 'jspm_packages/es6-module-loader.js', included: false }, 'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
'jspm_packages/system.src.js', 'node_modules/systemjs/dist/system.js',
'config.js', 'node_modules/angular2-bundle/angular2.dev.js',
'scripts/resources/angular2.dev.js', 'dist/js/ionic.js',
'dist/js/ionic.bundle.js', 'node_modules/web-animations-js/web-animations.min.js'
'dist/vendor/web-animations-js/web-animations.min.js'
], ],
protractorPort: 8876, protractorPort: 8876,

3
scripts/test/karma.conf.js
View File

@ -8,7 +8,6 @@ module.exports = function(config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: buildConfig.scripts.concat([ files: buildConfig.scripts.concat([
'dist/js/es5/ionic/**/*.js',
'dist/tests/**/*.spec.js', 'dist/tests/**/*.spec.js',
'scripts/test/test-main.js' 'scripts/test/test-main.js'
]), ]),
@ -24,5 +23,3 @@ module.exports = function(config) {
port: 9876 port: 9876
}); });
}; };