misc gulp cleanup; moving cache to deploy task so files are only cached when they're uploaded

Author: chrisdothtml

gulpfile.js/tasks/deploy.js

@@ -21,24 +21,17 @@ function stageBower () {
   const assets = gulp.src(globs)
 
   return assets
-    .pipe(g.cache.filter())
     .pipe(gulp.dest(`${STAGING_DIR}/assets`))
 }
 
 /**
  * Compiles and stages assets
  */
 function stageAssets () {
-  const assets = gulp.src([
-    'src/assets/css/*.scss.liquid',
-    'src/assets/img/*.jpg',
-    'src/assets/img/*.png',
-    'src/assets/js/*.js',
-    'src/assets/js/*.js.liquid'
-  ])
+  const assets = gulp.src('src/assets/**/*.*')
 
   return assets
-    .pipe(g.cache.filter())
+    .pipe(g.flatten())
     .pipe(gulp.dest(`${STAGING_DIR}/assets`))
 }
 
@@ -48,12 +41,10 @@ function stageAssets () {
 function stageTheme () {
   const theme = gulp.src([
     'src/**/*.*',
-    '!src/assets',
     '!src/assets/**/*'
   ])
 
   return theme
-    .pipe(g.cache.filter())
     .pipe(gulp.dest(STAGING_DIR))
 }
 
@@ -65,6 +56,7 @@ function deploy () {
   const theme = gulp.src(`${STAGING_DIR}/**/*.*`)
 
   return theme
+    .pipe(g.cache.filter())
     .pipe(g.upload(STAGING_DIR))
 }
 

package.json

@@ -10,6 +10,7 @@
     "bower": "^1.7.9",
     "del": "^2.2.2",
     "gulp": "^3.9.1",
+    "gulp-flatten": "^0.3.1",
     "gulp-load-plugins": "^1.3.0",
     "gulp-local-cache": "^1.0.0",
     "gulp-shopify-upload": "^2.0.0",