Skip to content
This repository was archived by the owner on Feb 11, 2020. It is now read-only.

Commit 9d3dde9

Browse files
author
hiroki kojima
committed
bugfix gulp
1 parent 3f13845 commit 9d3dde9

File tree

3 files changed

+58
-28
lines changed

3 files changed

+58
-28
lines changed

client/app/vendor.js

+47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

+6-24
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ gulp.task('compile-ts', ['ts-lint'],
4343
.pipe(gulp.dest('./client/app'));
4444
});
4545

46-
gulp.task('clean', function (done) {
47-
del([
48-
config.dest + '/**'
49-
], done);
50-
});
51-
5246
gulp.task('watch', function() {
5347
gulp.watch([config.allTypeScript], ['ts-lint', 'compile-ts']);
5448
gulp.watch(['assets/stylesheets/pc/**/*.scss'], ['scss:pc']);
@@ -73,7 +67,7 @@ var routine = function(path) {
7367
minifier: false // boolean
7468
}))
7569
.pipe($.concat(path + '.css'))
76-
.pipe(gulp.dest('public/css/'));
70+
.pipe(gulp.dest('client/css/'));
7771
}
7872

7973
// task for PC compass
@@ -88,23 +82,11 @@ gulp.task('scss:sp',function(){
8882

8983
gulp.task('build', ['scss:pc', 'scss:sp', 'ts-lint', 'compile-ts']);
9084

91-
92-
gulp.task('js-vendor', ['ts-vendor', 'js-vendor-pc', 'js-vendor-sp']);
93-
94-
gulp.task('js-vendor-pc', function(){
85+
gulp.task('js-vendor', function(){
9586
gulp.src(['assets/vendor/**/*.js'])
9687
.pipe($.concatVendor('vendor.js'))
97-
.pipe($.if(isRelease, $.uglify({
88+
.pipe($.uglify({
9889
preserveComments: 'some',
99-
}).on('error', util.log)))
100-
.pipe(gulp.dest('public/js/pc/'));
101-
});
102-
103-
gulp.task('js-vendor-sp', function(){
104-
gulp.src(['assets/vendor/**/*.js'])
105-
.pipe($.concatVendor('vendor.js'))
106-
.pipe($.if(isRelease, $.uglify({
107-
preserveComments: 'some',
108-
}).on('error', util.log)))
109-
.pipe(gulp.dest('public/js/sp/'));
110-
});
90+
}))
91+
.pipe(gulp.dest('client/app/'));
92+
});

package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@
5050
"bootstrap": "^3.3.6"
5151
},
5252
"scripts": {
53-
"ts": "gulp compile-ts",
54-
"tslint": "gulp ts-lint",
55-
"watch": "gulp watch",
56-
"build": "gulp build"
53+
"ts": "gulp compile-ts",
54+
"tslint": "gulp ts-lint",
55+
"js-vendor": "gulp js-vendor",
56+
"watch": "gulp watch",
57+
"build": "gulp build"
5758
}
5859
}

0 commit comments

Comments
 (0)