chore: move certs to top-level

BrowserSync · Dec 22, 2017 · a4bc2fd · a4bc2fd
1 parent 4e4d01e
commit a4bc2fd
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 259 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,6 @@
 lib/public/socket.io.js
 lib/public/socket.io.min.1.6.0.js
 lib/templates/**/*
-lib/server/certs/**
+certs/**
 lib/cli/cli-template.js
 test/specs/resp-mod/rewrite-links.js
diff --git a/lib/server/certs/browsersync.pfx → certs/browsersync.pfx b/lib/server/certs/browsersync.pfx → certs/browsersync.pfx
diff --git a/lib/server/certs/gen.sh → certs/gen.sh b/lib/server/certs/gen.sh → certs/gen.sh
diff --git a/lib/server/certs/server.crt → certs/server.crt b/lib/server/certs/server.crt → certs/server.crt
diff --git a/lib/server/certs/server.csr → certs/server.csr b/lib/server/certs/server.csr → certs/server.csr
diff --git a/lib/server/certs/server.key → certs/server.key b/lib/server/certs/server.key → certs/server.key
diff --git a/examples/server.secure.pfx.js b/examples/server.secure.pfx.js
@@ -20,7 +20,7 @@ browserSync.init({
         baseDir: "app"
     },
     https: {
-        pfx: "lib/server/certs/browsersync.pfx"
+        pfx: "certs/browsersync.pfx"
     }
 });
 
diff --git a/lib/cli/help.txt b/lib/cli/help.txt
diff --git a/lib/server/utils.js b/lib/server/utils.js
@@ -16,13 +16,13 @@ var serveStatic  = require("serve-static");
 var logger       = require("../logger");
 var snippetUtils = require("../snippet").utils;
 var lrSnippet    = require("resp-modifier");
-var utils        = require("../utils");
+var certPath     = join(__dirname, "..", "..", "certs");
 
 function getCa (options) {
     var caOption = options.getIn(["https", "ca"]);
     // if not provided, use Browsersync self-signed
     if (typeof caOption === "undefined") {
-        return fs.readFileSync(join(__dirname, "certs", "server.csr"));
+        return fs.readFileSync(join(certPath, "server.csr"));
     }
     // if a string was given, read that file from disk
     if (typeof caOption === "string") {
@@ -37,11 +37,11 @@ function getCa (options) {
 }
 
 function getKey(options) {
-    return fs.readFileSync(options.getIn(["https", "key"])  || join(__dirname, "certs", "server.key"));
+    return fs.readFileSync(options.getIn(["https", "key"])  || join(certPath, "server.key"));
 }
 
 function getCert(options) {
-    return fs.readFileSync(options.getIn(["https", "cert"]) || join(__dirname, "certs", "server.crt"));
+    return fs.readFileSync(options.getIn(["https", "cert"]) || join(certPath, "server.crt"));
 }
 
 function getHttpsServerDefaults (options) {

diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "lib",
     "lodash.custom.js",
     "client/index",
-    "client/dist"
+    "client/dist",
+    "certs"
   ],
   "engines": {
     "node": ">= 0.8.0"
@@ -87,6 +88,7 @@
     "rimraf": "2.5.4",
     "sinon": "1.17.5",
     "supertest": "2.0.0",
+    "typescript": "^2.6.2",
     "vinyl": "1.2.0"
   },
   "keywords": [

diff --git a/test/specs/e2e/server/e2e.server.secure.custom.js b/test/specs/e2e/server/e2e.server.secure.custom.js
@@ -25,8 +25,8 @@ describe("E2E TLS server with custom certs test", function () {
                 baseDir: "test/fixtures"
             },
             https: {
-                key:  path.resolve("./lib/server/certs/server.key"),
-                cert: path.resolve("./lib/server/certs/server.crt")
+                key:  path.resolve("./certs/server.key"),
+                cert: path.resolve("./certs/server.crt")
             },
             logLevel: "silent",
             open: false

diff --git a/test/specs/e2e/server/e2e.server.secure.pfx.js b/test/specs/e2e/server/e2e.server.secure.pfx.js
@@ -25,7 +25,7 @@ describe("E2E TLS server with PFX certs test", function () {
                 baseDir: "test/fixtures"
             },
             https: {
-                pfx:  path.resolve("./lib/server/certs/browsersync.pfx")
+                pfx:  path.resolve("./certs/browsersync.pfx")
             },
             logLevel: "silent",
             open: false