Skip to content

Commit 0954bb4

Browse files
committed
temporary npm angular2 bundle work around
1 parent cb7387d commit 0954bb4

4 files changed

Lines changed: 9 additions & 29 deletions

File tree

gulpfile.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,7 @@ gulp.task('bundle.ionic', ['transpile'], function() {
150150

151151
gulp.task('bundle', ['bundle.ionic'], function() {
152152
var nm = "node_modules";
153-
return gulp.src([
154-
'node_modules/traceur/bin/traceur-runtime.js',
155-
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
156-
'node_modules/systemjs/dist/system.js',
157-
'node_modules/angular2-build/angular2.dev.js',
158-
'dist/js/ionic.js',
159-
'node_modules/web-animations-js/web-animations.min.js'
160-
])
153+
return gulp.src(buildConfig.scripts)
161154
.pipe(concat('ionic.bundle.dev.js'))
162155
.pipe(gulp.dest('dist/js'));;
163156
})
@@ -172,16 +165,7 @@ gulp.task('tests', function() {
172165
.pipe(gulp.dest('dist/tests'))
173166
})
174167

175-
gulp.task('copy-scripts', function(){
176-
gulp.src([
177-
'scripts/resources/*.js',
178-
'scripts/vendor/web-animations-js/web-animations.min.js',
179-
'config.js',
180-
'dist/js/ionic.bundle.js'
181-
]).pipe(gulp.dest('dist/lib'));
182-
})
183-
184-
gulp.task('e2e', ['copy-scripts'], function() {
168+
gulp.task('e2e', function() {
185169
var buildTest = lazypipe()
186170
//.pipe(traceur, traceurOptions)
187171
.pipe(tsc, tscOptions, null, tscReporter)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"yargs": "^3.6.0"
4848
},
4949
"dependencies": {
50-
"angular2-build": "2.0.0-alpha.33",
50+
"angular2-bundle": "tlancina/angular2-bundle",
5151
"systemjs": "^0.16.11",
5252
"traceur": "0.0.91",
5353
"traceur-runtime": "0.0.59",

scripts/build/config.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ module.exports = {
1212
},
1313

1414
scripts: [
15-
'scripts/resources/traceur-runtime.js',
16-
{ pattern: 'jspm_packages/es6-module-loader.js', included: false },
17-
'jspm_packages/system.src.js',
18-
'config.js',
19-
'scripts/resources/angular2.dev.js',
20-
'dist/js/ionic.bundle.js',
21-
'dist/vendor/web-animations-js/web-animations.min.js'
15+
'node_modules/traceur/bin/traceur-runtime.js',
16+
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
17+
'node_modules/systemjs/dist/system.js',
18+
'node_modules/angular2-bundle/angular2.dev.js',
19+
'dist/js/ionic.js',
20+
'node_modules/web-animations-js/web-animations.min.js'
2221
],
2322

2423
protractorPort: 8876,

scripts/test/karma.conf.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module.exports = function(config) {
88
frameworks: ['jasmine'],
99

1010
files: buildConfig.scripts.concat([
11-
'dist/js/es5/ionic/**/*.js',
1211
'dist/tests/**/*.spec.js',
1312
'scripts/test/test-main.js'
1413
]),
@@ -24,5 +23,3 @@ module.exports = function(config) {
2423
port: 9876
2524
});
2625
};
27-
28-

0 commit comments

Comments
 (0)