This commit is contained in:
Lloyd Brookes
2015-11-13 20:22:10 +00:00
parent fc2548e40e
commit b116426640
2 changed files with 6 additions and 15 deletions

View File

@ -19,11 +19,13 @@ try {
halt(err.message) halt(err.message)
} }
options.stored = loadConfig('local-web-server') options.stored = Object.assign({
blacklist: []
}, loadConfig('local-web-server'))
options.builtIn = { options.builtIn = {
port: 8000, port: 8000,
directory: process.cwd(), directory: process.cwd()
blacklist: []
} }
/* override built-in defaults with stored config and then command line args */ /* override built-in defaults with stored config and then command line args */

View File

@ -28,12 +28,7 @@
"author": "Lloyd Brookes <75pound@gmail.com>", "author": "Lloyd Brookes <75pound@gmail.com>",
"dependencies": { "dependencies": {
"command-line-args": "^2.0.2", "command-line-args": "^2.0.2",
"compression": "^1.0.2",
"config-master": "^2", "config-master": "^2",
"console-dope": "~0.3.0",
"deep-extend": "^0.4.0",
"express": "^4.13.3",
"home-path": "^1",
"kcors": "^1.0.1", "kcors": "^1.0.1",
"koa": "^2.0.0-alpha.3", "koa": "^2.0.0-alpha.3",
"koa-charset": "^1.1.4", "koa-charset": "^1.1.4",
@ -41,20 +36,14 @@
"koa-conditional-get": "^1.0.3", "koa-conditional-get": "^1.0.3",
"koa-convert": "^1.1.0", "koa-convert": "^1.1.0",
"koa-etag": "^2.1.0", "koa-etag": "^2.1.0",
"koa-json": "^1.1.1",
"koa-morgan": "^0.4.0", "koa-morgan": "^0.4.0",
"koa-rewrite": "^1.1.1", "koa-rewrite": "^1.1.1",
"koa-route": "^2.4.2", "koa-route": "^2.4.2",
"koa-serve-index": "^1.1.0", "koa-serve-index": "^1.1.0",
"koa-static": "^1.5.2", "koa-static": "^1.5.2",
"morgan": "^1.0.0", "morgan": "^1.0.0",
"object-tools": "^2",
"proxy-middleware": "^0.13.1",
"req-then": "^0.2.2", "req-then": "^0.2.2",
"serve-index": "^1.6.3", "stream-log-stats": "^1"
"serve-static": "^1.8",
"stream-log-stats": "^1",
"typical": "^2.0.0"
}, },
"devDependencies": { "devDependencies": {
"tape": "^4.2.2" "tape": "^4.2.2"