From 96fab559096cca878aa6c5c749d9efde5adea536 Mon Sep 17 00:00:00 2001 From: Masayuki Igawa Date: Thu, 13 Apr 2017 22:23:40 +0900 Subject: [PATCH] Remove vendor-js This commit removes vendor-js related code. We already didn't have the vendor-js directory[1]. So this is just a cleaning up. [1] Ibfefe310fbad1d80f4c7ec96bda083d97a09824e Change-Id: Id5cb4bfb34e867cded9106bed9d13e3a8d383d37 --- .eslintignore | 1 - gulp/config.js | 5 ----- gulp/tasks/development.js | 2 +- gulp/tasks/production.js | 2 +- gulp/tasks/vendor-js.js | 15 --------------- gulp/tasks/watch.js | 1 - test/karma.conf.js | 2 -- 7 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 gulp/tasks/vendor-js.js diff --git a/.eslintignore b/.eslintignore index a427d0ca..2391a45b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,7 +3,6 @@ build node_modules coverage doc -app/vendor-js app/js/templates.js gulp reports diff --git a/gulp/config.js b/gulp/config.js index af4d989c..0b4164f5 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -62,11 +62,6 @@ module.exports = { 'dest': 'build/data' }, - 'vendorJs': { - 'src' : ['app/vendor-js/**/*'], - 'dest': 'build/js/' - }, - 'devResources': { 'src': ['etc/config.json'], 'dest': 'build/' diff --git a/gulp/tasks/development.js b/gulp/tasks/development.js index 55493eef..1e354c17 100644 --- a/gulp/tasks/development.js +++ b/gulp/tasks/development.js @@ -10,7 +10,7 @@ gulp.task('dev', ['clean'], function(cb) { global.isProd = false; runSequence( - ['styles', 'fonts', 'images', 'data', 'vendor-js', 'views', 'dev-resources'], + ['styles', 'fonts', 'images', 'data', 'views', 'dev-resources'], 'browserify', 'watch', cb); }); diff --git a/gulp/tasks/production.js b/gulp/tasks/production.js index 4b442661..727d9acb 100644 --- a/gulp/tasks/production.js +++ b/gulp/tasks/production.js @@ -10,7 +10,7 @@ gulp.task('prod', ['clean'], function(cb) { global.isProd = true; runSequence( - ['styles', 'fonts', 'images', 'vendor-js', 'views'], + ['styles', 'fonts', 'images', 'views'], 'browserify', 'gzip', cb); }); diff --git a/gulp/tasks/vendor-js.js b/gulp/tasks/vendor-js.js deleted file mode 100644 index f1fe7d36..00000000 --- a/gulp/tasks/vendor-js.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -var config = require('../config'); -var gulp = require('gulp'); -var concat = require('gulp-concat'); -var browserSync = require('browser-sync'); - -gulp.task('vendor-js', function() { - - return gulp.src(config.vendorJs.src) - .pipe(concat('vendor.js')) - .pipe(gulp.dest(config.vendorJs.dest)) - .pipe(browserSync.reload({ stream: true, once: true })); - -}); diff --git a/gulp/tasks/watch.js b/gulp/tasks/watch.js index be66c8f7..74817135 100644 --- a/gulp/tasks/watch.js +++ b/gulp/tasks/watch.js @@ -11,7 +11,6 @@ gulp.task('watch', ['browserSync', 'server'], function() { gulp.watch(config.images.src, ['images']); gulp.watch(config.data.src, ['data']); gulp.watch(config.devResources.src, ['dev-resources']); - gulp.watch(config.vendorJs.src, ['vendor-js']); gulp.watch(config.views.watch, ['views']); }); diff --git a/test/karma.conf.js b/test/karma.conf.js index 3db3c881..ad312ae9 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -12,8 +12,6 @@ module.exports = function(config) { frameworks: ['jasmine', 'browserify'], files: [ - // vendor js (normally included by browserify-shim) - 'app/vendor-js/**/*.js', // app-specific code 'app/js/main.js', // 3rd-party resources