chore(build): added wiredep to wire Bower dependencies to source code

mariuszm · mariuszm · commit 518dde594cc7 · 2015-07-11T11:13:34.000+02:00
diff --git a/.bowerrc b/.bowerrc
@@ -1,4 +1,6 @@
 {
   "directory": "vendor",
-  "json": "bower.json"
+  "scripts": {
+    "postinstall": "gulp wiredep"
+  }
 }
diff --git a/config.json b/config.json
@@ -19,16 +19,12 @@
         "tests"  : "src/+(app|common)/**/*.spec.js"
     },
 
-    "vendor_files": {
-        "js": [
-            "vendor/angular/angular.js",
-            "vendor/angular-ui-router/release/angular-ui-router.js",
-            "vendor/angular-bootstrap/ui-bootstrap-tpls.js"
-        ],
-        "css": [
-        ],
-        "assets": [
-            "vendor/bootstrap-sass-official/assets/fonts/**/*"
+    "bower": {
+        "json": "./bower.json",
+        "directory": "./vendor/",
+        "exclude": [
+            "jquery",
+            "vendor/bootstrap-sass-official/assets/javascripts"
         ]
     },
 
diff --git a/gulpfile.js b/gulpfile.js
@@ -4,6 +4,7 @@ var gulp     = require('gulp'),
     map      = require('map-stream'),
     del      = require('del'),
     minimist = require('minimist'),
+    wiredep  = require('wiredep').stream,
     plugins  = require('gulp-load-plugins')(),
     server   = require('tiny-lr')(),
     config   = require('./config.json'),
@@ -110,7 +111,20 @@ gulp.task('vendor:assets', function () {
     return gulp.src(config.vendor_files.assets, { base: '.' })
         .pipe(gulp.dest(config.build + '/assets'));
 });
+// Wire Bower dependencies to source code
+// ======================================
+
+gulp.task('wiredep', function () {
+    var options = {
+        bowerJson: require(config.bower.json),
+        directory: config.bower.directory,
+        exclude: config.bower.exclude
+    };
 
+    return gulp.src(config.paths.html)
+        .pipe(wiredep(options))
+        .pipe(gulp.dest(config.build));
+});
 
 
 // Prepare JavaScript
@@ -221,8 +235,8 @@ gulp.task('assets', ['assets:img', 'vendor:assets'], function () {
 // Inject CSS & JS to index.html source
 var fnInject = function (path) {
     var inject = {
-        css : (config.vendor_files.css).concat(config.build + '/assets/*.css'),
-        js  : (config.vendor_files.js).concat(config.build + '/+(app|common)/**/*.module.js').concat(config.build + '/+(app|common)/**/*.js')
+        css : [config.build + '/assets/*.css'],
+        js  : [config.build + '/+(app|common)/**/*.module.js', config.build + '/+(app|common)/**/*.js']
     };
 
     var sources = gulp.src(inject.css.concat(inject.js), { read: false });
diff --git a/server.js b/server.js
@@ -18,6 +18,7 @@ module.exports = function (lr, options) {
     // app.use(require('connect-modrewrite')(['!\\.\\w+$ /index.html']));
     app.use(require('connect-livereload')({ port: LIVERELOAD_PORT }));
     app.use(serveStatic(EXPRESS_ROOT));
+    app.use('/vendor', serveStatic('vendor'));
     app.use('/', serveIndex(EXPRESS_ROOT));
 
     var server = http.createServer(app);
diff --git a/src/index.html b/src/index.html
@@ -4,8 +4,15 @@
     <meta charset="UTF-8">
     <title ng-bind="pageTitle"></title>
 
-    <!-- build:css --><!-- inject:css -->
-    <!-- endinject --><!-- endbuild -->
+    <!-- build:css assets/vendor.min.css -->
+    <!-- bower:css -->
+    <!-- endbower -->
+    <!-- endbuild -->
+
+    <!-- build:css assets/app.min.css -->
+    <!-- inject:css -->
+    <!-- endinject -->
+    <!-- endbuild -->
 
 </head>
 <body ng-cloak>
@@ -38,8 +45,15 @@
         </div>
     </div>
 
-    <!-- build:js --><!-- inject:js -->
-    <!-- endinject --><!-- endbuild -->
+    <!-- build:js assets/vendor.min.js -->
+    <!-- bower:js -->
+    <!-- endbower -->
+    <!-- endbuild -->
+
+    <!-- build:js assets/app.min.js -->
+    <!-- inject:js -->
+    <!-- endinject -->
+    <!-- endbuild -->
 
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"directory": "vendor",`
`3`		`- "json": "bower.json"`
	`3`	`+ "scripts": {`
	`4`	`+ "postinstall": "gulp wiredep"`
	`5`	`+ }`
`4`	`6`	`}`