Merge pull request #227 from timcui/dev

RobinzZH · web-flow · commit 22e6f46aa603 · 2018-08-16T16:13:38.000+08:00
fix(config): use resolve support absolute path &amp; fix require
diff --git a/bin/proxy/config.js b/bin/proxy/config.js
@@ -27,7 +27,7 @@ if (global[__filename]) {
 }
 
 if (typeof processArgs.config === 'string') {
-    cache.config = path.join(cwd, processArgs.config);
+    cache.config = require(path.resolve(cwd, processArgs.config));
 } else if (fs.existsSync(currConfig)) {
     cache.config = require(currConfig);
 } else if (fs.existsSync('/etc/tsw.config.js')) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ if (global[__filename]) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if (typeof processArgs.config === 'string') {`
`30`		`- cache.config = path.join(cwd, processArgs.config);`
	`30`	`+ cache.config = require(path.resolve(cwd, processArgs.config));`
`31`	`31`	`} else if (fs.existsSync(currConfig)) {`
`32`	`32`	`cache.config = require(currConfig);`
`33`	`33`	`} else if (fs.existsSync('/etc/tsw.config.js')) {`