fix(proxy): build proxyList correctly

Also remove unnecessary `all` npm script.
jef · Jan 17, 2021 · c177aed · c177aed
1 parent b7930b2
commit c177aed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,6 @@
   "description": "The world's easiest, most powerful stock checker",
   "main": "src/index.ts",
   "scripts": {
-    "all": "npm run compile && npm run lint && npm run test",
     "fix": "gts fix",
     "lint": "gts lint",
     "clean": "gts clean",

diff --git a/src/config.ts b/src/config.ts
@@ -158,15 +158,15 @@ function envOrNumberMax(
   return number ?? 0;
 }
 
-function loadProxyList(filename: string): string[] {
+function loadProxyList(filename: string): string[] | undefined {
   try {
     return readFileSync(`${filename}.proxies`)
       .toString()
       .trim()
       .split('\n')
       .map(x => x.trim());
   } catch {
-    return [];
+    return undefined;
   }
 }
 
@@ -412,7 +412,7 @@ const store = {
 
     let proxyList = loadProxyList(name);
 
-    if (proxyList.length === 0) {
+    if (!proxyList) {
       proxyList = loadProxyList('global');
     }
 

diff --git a/src/web/index.ts b/src/web/index.ts
@@ -11,7 +11,7 @@ import {
 import {isAbsolute, join, normalize, relative} from 'path';
 import {logger} from '../logger';
 
-const approot = join(__dirname, '../../../');
+const approot = join(__dirname, '../../');
 const webroot = join(approot, './web');
 
 const contentTypeMap: Record<string, string> = {