[wip] More SS options

qwshixiang · Sep 29, 2016 · cc2f4d9 · cc2f4d9
1 parent c1bfc5c
commit cc2f4d9
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 24 deletions.
diff --git a/lib/async-tasks.js b/lib/async-tasks.js
@@ -45,10 +45,6 @@ module.exports = [
         step: "Starting the Server",
         fn: async.startServer
     },
-    {
-        step: "Adding serve static middlewares",
-        fn: async.addServeStaticMiddleware
-    },
     {
         step: "Starting the HTTPS Tunnel",
         fn: async.startTunnel

diff --git a/lib/async.js b/lib/async.js
@@ -246,18 +246,6 @@ module.exports = {
             }
         });
     },
-    /**
-     * @param bs
-     * @param done
-     */
-    addServeStaticMiddleware: function (bs, done) {
-        bs.options
-            .get("serveStatic")
-            .forEach(function (dir) {
-                bs.addMiddleware("*", utils.serveStatic(dir));
-            });
-        done();
-    },
     /**
      * @param {BrowserSync} bs
      * @param {Function} done

diff --git a/lib/browser-sync.js b/lib/browser-sync.js
@@ -655,7 +655,7 @@ BrowserSync.prototype.doFileReload = function (data) {
 
     /**
      * If the current item will cause the browser
-     * to reload, fire the correct 
+     * to reload, fire the correct
      */
     if (willReload) {
         bs.io.sockets.emit("browser:reload");

diff --git a/lib/server/utils.js b/lib/server/utils.js
@@ -1,12 +1,15 @@
 "use strict";
 
-var fs        = require("fs");
-var filePath  = require("path");
-var connect   = require("connect");
-var http      = require("http");
-var https     = require("https");
-var Map       = require("immutable").Map;
-var snippet   = require("./../snippet").utils;
+var fs          = require("fs");
+var filePath    = require("path");
+var connect     = require("connect");
+var Immutable   = require("immutable");
+var http        = require("http");
+var https       = require("https");
+var Map         = require("immutable").Map;
+var snippet     = require("./../snippet").utils;
+var _           = require("./../../lodash.custom");
+var serveStatic = require("serve-static");
 
 var utils = {
     /**
@@ -79,6 +82,32 @@ var utils = {
             })
         }
 
+        if (options.get('serveStatic')) {
+            options
+                .get("serveStatic")
+                .forEach(function (dir, i) {
+                    if (Immutable.Map.isMap(dir)) {
+                        var ssOptions = (function () {
+                            if (dir.get('options')) {
+                                return dir.get('options').toJS();
+                            }
+                            return {}
+                        })();
+                        defaultMiddlewares.push({
+                            id: "Serve static " + i,
+                            route: dir.get("route"),
+                            handle: serveStatic(dir.get("dir"), ssOptions)
+                        });
+                    } else if (_.isString(dir)) {
+                        defaultMiddlewares.push({
+                            id: "Serve static " + i,
+                            route: "",
+                            handle: serveStatic(dir, options.get('serveStaticOptions').toJS())
+                        });
+                    }
+                });
+        }
+
         /**
          * Add the proxy Middleware to the end of the stack
          */