Merge pull request #1255 from austinpray/8.0.0

Use new manifest format

README.md

@@ -78,6 +78,7 @@ You now have all the necessary dependencies to run the build process.
 
 * `gulp` — Compile and optimize the files in your assets directory
 * `gulp watch` — Compile assets when file changes are made
+* `gulp --production` — Compile assets for production (no source maps).
 * `gulp --tasks` — Lists all the available tasks and what they do
 
 ## Documentation

assets/manifest.json

@@ -1,22 +1,28 @@
 {
   "dependencies": {
-    "theme": {
+    "app.js": {
-      "scripts": [
+      "files": [
         "scripts/**/*",
         "scripts/main.js"
       ],
-      "styles": "styles/main.less",
+      "main": true
-      "editorStyle": "styles/editor-style.less"
     },
-    "vendor": {
+    "main.css": {
-      "scripts": [],
+      "files": [
-      "styles": []
+        "styles/main.less"
+      ],
+      "main": true
+    },
+    "editor-style.css": {
+      "files": [
+        "styles/editor-style.less"
+      ]
+    },
+    "jquery.js": {
+      "bower": ["jquery"]
+    },
+    "modernizr.js": {
+      "bower": ["modernizr"]
     }
-  },
-  "ignoreDependencies": {
-    "bower": [
-      "jquery",
-      "modernizr"
-    ]
   }
 }

bower.json

@@ -13,6 +13,9 @@
     "bootstrap": "3.3.1"
   },
   "overrides": {
+    "modernizr": {
+      "main": "./modernizr.js"
+    },
     "bootstrap": {
       "main": [
         "./less/bootstrap.less",

gulpfile.js

@@ -1,55 +1,63 @@
 /*global $:true*/
-var $              = require('gulp-load-plugins')();
+var $        = require('gulp-load-plugins')();
-var _              = require('lodash');
+var _        = require('lodash');
-var autoprefixer   = require('autoprefixer-core');
+var argv     = require('yargs').argv;
-var csswring       = require('csswring');
+var gulp     = require('gulp');
-var gulp           = require('gulp');
+var lazypipe = require('lazypipe');
-var lazypipe       = require('lazypipe');
-var mainBowerFiles = require('main-bower-files');
-var obj            = require('object-path');
-
 var manifest = require('asset-builder')('./assets/manifest.json');
+var merge    = require('merge-stream');
 
-var path = manifest.buildPaths;
+var mapsEnabled = !argv.production;
+var path = manifest.paths;
 var globs = manifest.globs;
+var project = manifest.getProjectGlobs();
 
 var cssTasks = function(filename) {
-  var processors = [
-    autoprefixer({browsers: ['last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12']}),
-    csswring
-  ];
-
   return lazypipe()
     .pipe($.plumber)
-    .pipe($.sourcemaps.init)
+    .pipe(function () {
+      return $.if(mapsEnabled, $.sourcemaps.init());
+    })
       .pipe(function() {
         return $.if('*.less', $.less().on('error', function(err) {
           console.warn(err.message);
         }));
       })
       .pipe(function() {
-        return $.if('*.scss', $.sass());
+        return $.if('*.scss', $.sass({
+          outputStyle: 'nested', // libsass doesn't support expanded yet
+          precision: 10,
+          includePaths: ['.'],
+          onError: console.error.bind(console, 'Sass error:')
+        }));
       })
       .pipe($.concat, filename)
-    .pipe($.postcss, processors)
+      .pipe($.pleeease, {
-    .pipe($.sourcemaps.write, '.')
+        autoprefixer: {
+          browsers: [
+            'last 2 versions', 'ie 8', 'ie 9', 'android 2.3', 'android 4', 'opera 12'
+          ]
+        }
+      })
+    .pipe(function () {
+      return $.if(mapsEnabled, $.sourcemaps.write('.'));
+    })
     .pipe(gulp.dest, path.dist + 'styles')();
 };
 
-gulp.task('styles', ['wiredep', 'styles:editorStyle'], function() {
+gulp.task('styles', ['wiredep'], function() {
-  return gulp.src(globs.styles)
+  var merged = merge();
-    .pipe(cssTasks('main.css'));
+  manifest.forEachDependency('css', function (dep) {
-});
+    merged.add(gulp.src(dep.globs)
-
+      .pipe(cssTasks(dep.name)));
-gulp.task('styles:editorStyle', function() {
+  });
-  return gulp.src(globs.editorStyle)
+  return merged;
-    .pipe(cssTasks('editor-style.css'));
 });
 
 gulp.task('jshint', function() {
   return gulp.src([
     'bower.json', 'gulpfile.js'
-  ].concat(obj.get(manifest, 'dependencies.theme.scripts', [])))
+  ].concat(project.js))
     .pipe($.jshint())
     .pipe($.jshint.reporter('jshint-stylish'))
     .pipe($.jshint.reporter('fail'));
@@ -58,23 +66,26 @@ gulp.task('jshint', function() {
 var jsTasks = function(filename) {
   var fn = filename;
   return lazypipe()
-    .pipe($.sourcemaps.init)
+    .pipe(function () {
+      return $.if(mapsEnabled, $.sourcemaps.init());
+    })
     .pipe(function() {
       return $.if(!!fn, $.concat(fn || 'all.js'));
     })
     .pipe($.uglify)
-    .pipe($.sourcemaps.write, '.')
+    .pipe(function () {
+      return $.if(mapsEnabled, $.sourcemaps.write('.'));
+    })
     .pipe(gulp.dest, path.dist + 'scripts')();
 };
 
-gulp.task('scripts', ['jshint', 'scripts:ignored'], function() {
+gulp.task('scripts', ['jshint'], function() {
-  return gulp.src(globs.scripts)
+  var merged = merge();
-    .pipe(jsTasks('app.js'));
+  manifest.forEachDependency('js', function (dep) {
-});
+    merged.add(gulp.src(dep.globs)
-
+      .pipe(jsTasks(dep.name)));
-gulp.task('scripts:ignored', function() {
+  });
-  return gulp.src(globs.scriptsIgnored)
+  return merged;
-    .pipe(jsTasks());
 });
 
 gulp.task('fonts', function() {
@@ -119,9 +130,9 @@ gulp.task('build', ['styles', 'scripts', 'fonts', 'images'], function() {
 
 gulp.task('wiredep', function() {
   var wiredep = require('wiredep').stream;
-  gulp.src(globs.styles)
+  gulp.src(project.css)
     .pipe(wiredep())
-    .pipe(gulp.dest(path.dist + 'styles'));
+    .pipe(gulp.dest(path.source + 'styles'));
 });
 
 gulp.task('default', ['clean'], function() {

package.json

@@ -24,21 +24,19 @@
     "node": ">= 0.10.0"
   },
   "devDependencies": {
-    "asset-builder": "0.0.1",
+    "asset-builder": "~0.3.0",
-    "autoprefixer-core": "4.0.1",
+    "del": "^1.1.1",
-    "csswring": "^2.0.0",
-    "del": "^0.1.3",
     "gulp": "^3.8.10",
     "gulp-concat": "^2.3.4",
     "gulp-flatten": "0.0.4",
     "gulp-if": "^1.2.5",
     "gulp-imagemin": "^2.0.0",
     "gulp-jshint": "^1.8.4",
-    "gulp-less": "^1.3.3",
+    "gulp-less": "^2.0.1",
-    "gulp-livereload": "^2.1.0",
+    "gulp-livereload": "^3.4.0",
-    "gulp-load-plugins": "^0.7.1",
+    "gulp-load-plugins": "^0.8.0",
+    "gulp-pleeease": "^1.1.0",
     "gulp-plumber": "^0.6.3",
-    "gulp-postcss": "^3.0.0",
     "gulp-rename": "^1.2.0",
     "gulp-rev": "^2.0.1",
     "gulp-sass": "^1.2.4",
@@ -48,9 +46,9 @@
     "jshint-stylish": "^1.0.0",
     "lazypipe": "^0.2.2",
     "lodash": "^2.4.1",
-    "main-bower-files": "^2.4.0",
+    "merge-stream": "^0.1.7",
-    "object-path": "^0.8.0",
     "traverse": "^0.6.6",
-    "wiredep": "^2.1.0"
+    "wiredep": "^2.1.0",
+    "yargs": "^1.3.3"
   }
 }