Compare commits

..

2 Commits

Author SHA1 Message Date
github-actions[bot] 11e64942a0 chore: release 3.4.1 (#1723) 2021-01-17 18:21:25 -05:00
Jef LeCompte c177aedd21 fix(proxy): build proxyList correctly
Also remove unnecessary `all` npm script.
2021-01-17 18:19:06 -05:00
5 changed files with 12 additions and 6 deletions
+7
View File
@@ -1,5 +1,12 @@
# Changelog # Changelog
### [3.4.1](https://www.github.com/jef/streetmerchant/compare/v3.4.0...v3.4.1) (2021-01-17)
### Bug Fixes
* **proxy:** build proxyList correctly ([c177aed](https://www.github.com/jef/streetmerchant/commit/c177aedd210e14cb7d401295cb16ece1dfb1ebe7))
## [3.4.0](https://www.github.com/jef/streetmerchant/compare/v3.3.0...v3.4.0) (2021-01-17) ## [3.4.0](https://www.github.com/jef/streetmerchant/compare/v3.3.0...v3.4.0) (2021-01-17)
-1
View File
@@ -3,7 +3,6 @@
"description": "The world's easiest, most powerful stock checker", "description": "The world's easiest, most powerful stock checker",
"main": "src/index.ts", "main": "src/index.ts",
"scripts": { "scripts": {
"all": "npm run compile && npm run lint && npm run test",
"fix": "gts fix", "fix": "gts fix",
"lint": "gts lint", "lint": "gts lint",
"clean": "gts clean", "clean": "gts clean",
+3 -3
View File
@@ -158,7 +158,7 @@ function envOrNumberMax(
return number ?? 0; return number ?? 0;
} }
function loadProxyList(filename: string): string[] { function loadProxyList(filename: string): string[] | undefined {
try { try {
return readFileSync(`${filename}.proxies`) return readFileSync(`${filename}.proxies`)
.toString() .toString()
@@ -166,7 +166,7 @@ function loadProxyList(filename: string): string[] {
.split('\n') .split('\n')
.map(x => x.trim()); .map(x => x.trim());
} catch { } catch {
return []; return undefined;
} }
} }
@@ -412,7 +412,7 @@ const store = {
let proxyList = loadProxyList(name); let proxyList = loadProxyList(name);
if (proxyList.length === 0) { if (!proxyList) {
proxyList = loadProxyList('global'); proxyList = loadProxyList('global');
} }
+1 -1
View File
@@ -11,7 +11,7 @@ import {
import {isAbsolute, join, normalize, relative} from 'path'; import {isAbsolute, join, normalize, relative} from 'path';
import {logger} from '../logger'; import {logger} from '../logger';
const approot = join(__dirname, '../../../'); const approot = join(__dirname, '../../');
const webroot = join(approot, './web'); const webroot = join(approot, './web');
const contentTypeMap: Record<string, string> = { const contentTypeMap: Record<string, string> = {
+1 -1
View File
@@ -1 +1 @@
3.4.0 3.4.1