move files around to support Typescript

Author: shakyShane

.eslintignore

@@ -2,5 +2,5 @@ lib/public/socket.io.js
 lib/public/socket.io.min.1.6.0.js
 templates/**/*
 certs/**
-lib/cli/cli-template.js
+templates/cli-template.js
 test/specs/resp-mod/rewrite-links.js

.gitignore

@@ -19,3 +19,4 @@ before.json
 after.json
 bs-config.js
 /lodash.custom.min.js
+/dist

lib/async.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _            = require("../lodash.custom");
+var _            = require("./lodash.custom");
 var Immutable    = require("immutable");
 
 var utils        = require("./utils");

bin/browser-sync.js lib/bin.jsbin/browser-sync.js renamed to lib/bin.js

@@ -3,10 +3,10 @@ var startOpts = require("../cli-options/opts.start.json");
 var reloadOpts = require("../cli-options/opts.reload.json");
 var recipeOpts = require("../cli-options/opts.recipe.json");
 var pkg = require("../package.json");
-var utils = require("../lib/utils");
+var utils = require("./utils");
 var resolve = require("path").resolve;
 var existsSync = require("fs").existsSync;
-var logger = require("../lib/logger").logger;
+var logger = require("./logger").logger;
 var compile = require("eazy-logger").compile;
 
 var BsErrorLevels = {
@@ -135,7 +135,7 @@ function handleNoCommand(argv, input) {
 function handleCli (opts) {
 
     opts.cb = opts.cb || utils.defaultCallback;
-    return require("../lib/cli/command." + opts.cli.input[0])(opts);
+    return require("./cli/command." + opts.cli.input[0])(opts);
 }
 
 module.exports = handleCli;

lib/browser-sync.js

@@ -8,7 +8,7 @@ var utils           = require("./utils");
 var logger          = require("./logger");
 
 var eachSeries      = utils.eachSeries;
-var _               = require("../lodash.custom");
+var _               = require("./lodash.custom");
 var EE              = require("easy-extender");
 
 /**
@@ -22,7 +22,7 @@ var defaultPlugins = {
     "file:watcher":  require("./file-watcher"),
     "server":        require("./server"),
     "tunnel":        require("./tunnel"),
-    "client:script": require("../client"),
+    "client:script": require("./client"),
     "UI":            require("browser-sync-ui")
 };
 

lib/cli/cli-info.js

@@ -4,7 +4,7 @@ var config = require("../config");
 var logger = require("../logger").logger;
 
 var fs     = require("fs");
-var _      = require("../../lodash.custom");
+var _      = require("../lodash.custom");
 var path   = require("path");
 
 var info = {
@@ -31,7 +31,7 @@ var info = {
      */
     makeConfig: function (cwd, cb) {
 
-        var opts = require(path.join(__dirname, "..", config.configFile));
+        // var opts = require(path.join(__dirname, "..", config.configFile));
         var userOpts = {};
 
         var ignore = ["excludedFileTypes", "injectFileTypes", "snippetOptions"];
@@ -42,7 +42,7 @@ var info = {
             }
         });
 
-        var file = fs.readFileSync(path.join(__dirname, config.template), "utf8");
+        var file = fs.readFileSync(config.template, "utf8");
         file = file.replace("//OPTS", JSON.stringify(userOpts, null, 4));
 
         fs.writeFile(path.resolve(cwd, config.userFile), file, function () {

lib/cli/cli-options.js

@@ -2,7 +2,7 @@
 
 var path = require("path");
 var url = require("url");
-var _    = require("../../lodash.custom");
+var _    = require("../lodash.custom");
 var Immutable = require("immutable");
 var isList = Immutable.List.isList;
 var isMap = Immutable.Map.isMap;

lib/cli/command.start.js

@@ -2,7 +2,7 @@
 
 var path  = require("path");
 var fs    = require("fs");
-var _     = require("../../lodash.custom");
+var _     = require("../lodash.custom");
 var utils = require("../utils");
 var opts  = require("./cli-options").utils;
 
@@ -39,7 +39,7 @@ module.exports = function (opts) {
         }
     }
 
-    return require("../../")
+    return require("../")
         .create("cli")
         .init(input, opts.cb);
 };

client/index.js lib/client.jsclient/index.js renamed to lib/client.js

@@ -6,8 +6,8 @@ var fs    = require("fs");
 var path  = require("path");
 var zlib  = require("zlib");
 
-var minifiedScript   = path.join(__dirname, "/dist/index.min.js");
-var unminifiedScript = path.join(__dirname, "/dist/index.js");
+var minifiedScript   = path.join(__dirname, "..", "..", "/dist/index.min.js");
+var unminifiedScript = path.join(__dirname, "..", "..", "/dist/index.js");
 
 /**
  * Does the current request support compressed encoding?
@@ -118,4 +118,4 @@ module.exports.minified = function () {
 };
 module.exports.unminified = function () {
     return fs.readFileSync(unminifiedScript, 'utf8');
-}
+}

lib/connect-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _             = require("../lodash.custom");
+var _             = require("./lodash.custom");
 var fs            = require("fs");
 var config        = require("./config");