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

move unbundled source files to dist/src

Browse Source
This commit is contained in:
Tim Lancina
2015-08-10 16:59:33 -05:00
parent c316b27e2a
commit a5b47583a0
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gulpfile.js
View File

@ -89,9 +89,9 @@ gulp.task('watch', function(done) {
var basePath = file.base.substring(0, file.base.lastIndexOf("ionic/")); var basePath = file.base.substring(0, file.base.lastIndexOf("ionic/"));
var relPath = file.history[0].replace(base, "").replace(".ts", ".js"); var relPath = file.history[0].replace(base, "").replace(".ts", ".js");
var es6Path = basePath + "dist/js/es6/" + relPath; var es6Path = basePath + "dist/src/es6/" + relPath;
var commonPath = basePath + "dist/js/es5/common/" + relPath; var commonPath = basePath + "dist/src/es5/common/" + relPath;
var systemPath = basePath + "dist/js/es5/system/" + relPath; var systemPath = basePath + "dist/src/es5/system/" + relPath;
delete cache.caches.transpile[file.history[0]]; delete cache.caches.transpile[file.history[0]];
@ -156,13 +156,13 @@ function transpile(moduleType) {
.on('error', function(error) { .on('error', function(error) {
stream.emit('end'); stream.emit('end');
}) })
.pipe(gulp.dest('dist/js/es6/ionic')) .pipe(gulp.dest('dist/src/es6/ionic'))
.pipe(babel(getBabelOptions('ionic', moduleType))) .pipe(babel(getBabelOptions('ionic', moduleType)))
.on('error', function (err) { .on('error', function (err) {
console.log("ERROR: " + err.message); console.log("ERROR: " + err.message);
this.emit('end'); this.emit('end');
}) })
.pipe(gulp.dest('dist/js/es5/' + moduleType + '/ionic')) .pipe(gulp.dest('dist/src/es5/' + moduleType + '/ionic'))
return stream; return stream;
} }
@ -173,7 +173,7 @@ gulp.task('transpile', ['transpile.system']);
gulp.task('bundle.ionic', ['transpile'], function() { gulp.task('bundle.ionic', ['transpile'], function() {
return gulp.src([ return gulp.src([
'dist/js/es5/system/ionic/**/*.js', 'dist/src/es5/system/ionic/**/*.js',
'ionic/util/hairline.js' 'ionic/util/hairline.js'
]) ])
.pipe(concat('ionic.js')) .pipe(concat('ionic.js'))
@ -183,9 +183,8 @@ gulp.task('bundle.ionic', ['transpile'], function() {
}); });
gulp.task('bundle', ['bundle.ionic'], function() { gulp.task('bundle', ['bundle.ionic'], function() {
var nm = "node_modules";
return gulp.src(buildConfig.scripts) return gulp.src(buildConfig.scripts)
.pipe(concat('ionic.bundle.dev.js')) .pipe(concat('ionic.bundle.js'))
.pipe(gulp.dest('dist/js'));; .pipe(gulp.dest('dist/js'));;
}) })

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

@ -51,8 +51,8 @@
<script src="../../../lib/web-animations.min.js"></script> --> <script src="../../../lib/web-animations.min.js"></script> -->
<script src="../../../js/ionic.bundle.dev.js"></script> <script src="../../../js/ionic.bundle.js"></script>
<script>System.config({"baseURL": "../../../"})</script> <script>System.config({"baseURL": "../../../"})</script>
<script>System.import("{{MODULE}}");</script> <script>System.import("{{MODULE}}");</script>