fix(client-script): allow proxy to also use client script middleware

BrowserSync · Jun 17, 2015 · c5fdbbf · c5fdbbf
1 parent dbe9ffe
commit c5fdbbf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/lib/async.js b/lib/async.js
@@ -170,7 +170,7 @@ module.exports = {
             bs.pluginManager.get("client:script")(
                 bs.options.toJS(),
                 clientJs,
-                bs.options.get("proxy") ? "file" : "middleware"
+                "middleware"
             )
         );
 

diff --git a/lib/server/proxy-server.js b/lib/server/proxy-server.js
@@ -1,6 +1,5 @@
 "use strict";
 
-var snippetUtils = require("./../snippet").utils;
 var _            = require("lodash");
 var utils        = require("./utils");
 var Immutable    = require("immutable");
@@ -26,6 +25,9 @@ module.exports = function createProxyServer (bs, scripts) {
 
     var proxy = utils.getServer(bs.proxy.app, bs.options);
 
+    bs.proxy.app.use(bs.options.getIn(["scriptPaths", "versioned"]), scripts);
+    bs.proxy.app.use(bs.options.getIn(["scriptPaths", "path"]),      scripts);
+
     /**
      * How best to handle websockets going forward?
      */
@@ -36,9 +38,8 @@ module.exports = function createProxyServer (bs, scripts) {
 
 /**
  * @param bs
- * @param scripts
  */
-function getOptions (bs, scripts) {
+function getOptions (bs) {
 
     var options  = bs.options;
 
@@ -50,7 +51,7 @@ function getOptions (bs, scripts) {
         rules:       rules.opts.rules,
         whitelist:   rules.opts.whitelist,
         blacklist:   rules.opts.blacklist,
-        middleware:  options.get("middleware").toJS().concat(getPluginMiddleware(bs, scripts)),
+        middleware:  options.get("middleware").toJS().concat(bs.pluginManager.hook("server:middleware")),
         errHandler:  function (err) {
             bs.logger.debug("{red:[proxy error]} %s", err.message);
         }
@@ -73,18 +74,6 @@ function getOptions (bs, scripts) {
     return out;
 }
 
-/**
- * Get proxy specific middleware
- * @param bs
- * @param scripts
- * @returns {*}
- */
-function getPluginMiddleware (bs, scripts) {
-    return bs.pluginManager.hook("server:middleware", [
-        snippetUtils.getProxyMiddleware(scripts, bs.options.getIn(["scriptPaths", "versioned"]))
-    ]);
-}
-
 /**
  * @param {Object} opts
  * @param {Function} cb

diff --git a/lib/snippet.js b/lib/snippet.js
@@ -64,20 +64,6 @@ var utils = {
             whitelist: options.get("whitelist").toJS()
         };
     },
-    /**
-     * @param {String} scripts - the client side JS
-     * @param {String} scriptPath - the URL to match
-     * @returns {Function}
-     */
-    getProxyMiddleware: function (scripts, scriptPath) {
-        return function serveBsJavascriptfile (req, res, next) {
-            if (req.url.indexOf(scriptPath) > -1) {
-                res.writeHead(200, {"Content-Type": "text/javascript"});
-                return res.end(scripts);
-            }
-            next();
-        };
-    },
     /**
      * @param {Object} req
      * @param {Array} [excludeList]