Skip to content

Commit 75f7a25

Browse files
committed
fix gulpfile concat bug
1 parent 53896c4 commit 75f7a25

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

gulpfile.js

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
var path = require('path');
12
var gulp = require('gulp');
3+
var clean = require('gulp-clean');
4+
var concat = require("gulp-concat");
25
var gzip = require('gulp-gzip');
36
var jsdoc = require("gulp-jsdoc");
4-
var rename = require('gulp-rename');
57
var order = require("gulp-order");
6-
var concat = require("gulp-concat");
8+
var rename = require('gulp-rename');
79
var shell = require('gulp-shell');
810
var tar = require('gulp-tar');
9-
var clean = require('gulp-clean');
1011
var uglify = require('gulp-uglify');
1112

1213
getAVVersion = function() {
@@ -23,32 +24,33 @@ gulp.task('pack', shell.task([
2324
]));
2425

2526
gulp.task('concat', function() {
26-
return gulp.src('src/*.js')
27-
.pipe(order([
28-
'version.js',
29-
'underscore.js',
30-
'utils.js',
31-
'error.js',
32-
'event.js',
33-
'geopoint.js',
34-
'acl.js',
35-
'op.js',
36-
'relation.js',
37-
'promise.js',
38-
'file.js',
39-
'object.js',
40-
'role.js',
41-
'collection.js',
42-
'view.js',
43-
'user.js',
44-
'query.js',
45-
'facebook.js',
46-
'history.js',
47-
'router.js',
48-
'cloudfunction.js',
49-
'push.js',
50-
'status.js',
51-
]))
27+
var sources = [
28+
'version.js',
29+
'underscore.js',
30+
'utils.js',
31+
'error.js',
32+
'event.js',
33+
'geopoint.js',
34+
'acl.js',
35+
'op.js',
36+
'relation.js',
37+
'promise.js',
38+
'file.js',
39+
'object.js',
40+
'role.js',
41+
'collection.js',
42+
'view.js',
43+
'user.js',
44+
'query.js',
45+
'facebook.js',
46+
'history.js',
47+
'router.js',
48+
'cloudfunction.js',
49+
'push.js',
50+
'status.js',
51+
];
52+
return gulp.src(sources.map(function(filename) { return path.join('lib', filename); }))
53+
.pipe(order(sources))
5254
.pipe(concat('av.js'))
5355
.pipe(gulp.dest('dist'));
5456
});

tests/test.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
<script type="text/javascript">var serverURL="http://stg.paas.com/";</script>
14-
<script src="../lib/av.js"></script>
14+
<script src="../dist/av.js"></script>
1515
<script src="test.js"></script>
1616

1717
<!--Parse Test init-->

0 commit comments

Comments
 (0)