Skip to content

Commit fa45902

Browse files
authored
Merge branch 'master' into avoid-lodash
2 parents 2e12ce4 + f212a04 commit fa45902

File tree

8 files changed

+1341
-1390
lines changed

8 files changed

+1341
-1390
lines changed

.github/workflows/coveralls.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Coveralls
55
jobs:
66

77
build:
8-
name: Build
8+
name: coveralls/build
99
runs-on: ubuntu-latest
1010
steps:
1111

.github/workflows/lint.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Lint
2+
3+
on: ["push","pull_request"]
4+
5+
jobs:
6+
build:
7+
name: Lint
8+
9+
runs-on: ubuntu-latest
10+
11+
strategy:
12+
matrix:
13+
node-version: [14.x]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Use Node.js ${{ matrix.node-version }}
18+
uses: actions/setup-node@v1
19+
with:
20+
node-version: ${{ matrix.node-version }}
21+
- run: yarn install
22+
- run: yarn lint

.github/workflows/test.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Test
2+
3+
on: ["push","pull_request"]
4+
5+
jobs:
6+
build:
7+
name: Test with Node.js ${{ matrix.node-version }}
8+
9+
runs-on: ubuntu-latest
10+
11+
strategy:
12+
matrix:
13+
node-version: [10.x, 12.x, 14.x]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Use Node.js ${{ matrix.node-version }}
18+
uses: actions/setup-node@v1
19+
with:
20+
node-version: ${{ matrix.node-version }}
21+
- run: yarn install
22+
- run: yarn test

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"deno.enable": false
3+
}

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

3-
## [v1.0.5](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.0.5)
3+
## [v1.0.6](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.0.6)
4+
5+
- chore(deps): lodash 4.17.20 ([#475](https://github.com/chimurai/http-proxy-middleware/pull/475))
6+
7+
## [v1.0.5](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.0.6)
48

59
- chore(deps): lodash 4.17.19 ([#454](https://github.com/chimurai/http-proxy-middleware/pull/454))
610

package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "http-proxy-middleware",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "The one-liner node.js proxy middleware for connect, express and browser-sync",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -46,36 +46,36 @@
4646
},
4747
"homepage": "https://github.com/chimurai/http-proxy-middleware#readme",
4848
"devDependencies": {
49-
"@commitlint/cli": "^8.3.5",
50-
"@commitlint/config-conventional": "^8.3.4",
49+
"@commitlint/cli": "^11.0.0",
50+
"@commitlint/config-conventional": "^11.0.0",
5151
"@types/express": "^4.17.3",
5252
"@types/is-glob": "^4.0.1",
53-
"@types/jest": "^25.2.3",
54-
"@types/lodash": "^4.14.151",
53+
"@types/jest": "^26.0.14",
54+
"@types/lodash": "^4.14.162",
5555
"@types/micromatch": "^4.0.1",
56-
"@types/node": "^14.0.3",
57-
"@types/supertest": "^2.0.9",
58-
"browser-sync": "^2.26.7",
56+
"@types/node": "^14.11.8",
57+
"@types/supertest": "^2.0.10",
58+
"browser-sync": "^2.26.12",
5959
"connect": "^3.7.0",
6060
"express": "^4.17.1",
61-
"husky": "^4.2.5",
62-
"jest": "^26.0.1",
63-
"lint-staged": "^10.2.4",
64-
"mockttp": "^0.20.1",
65-
"open": "^7.0.4",
66-
"prettier": "^2.0.5",
67-
"supertest": "^4.0.2",
68-
"ts-jest": "^26.0.0",
69-
"tslint": "^6.1.2",
61+
"husky": "^4.3.0",
62+
"jest": "^26.5.3",
63+
"lint-staged": "^10.4.0",
64+
"mockttp": "^1.0.2",
65+
"open": "^7.3.0",
66+
"prettier": "^2.1.2",
67+
"supertest": "^5.0.0",
68+
"ts-jest": "^26.4.1",
69+
"tslint": "^6.1.3",
7070
"tslint-config-prettier": "^1.18.0",
71-
"typescript": "^3.9.2",
72-
"ws": "^7.3.0"
71+
"typescript": "^4.0.3",
72+
"ws": "^7.3.1"
7373
},
7474
"dependencies": {
7575
"@types/http-proxy": "^1.17.4",
7676
"http-proxy": "^1.18.1",
7777
"is-glob": "^4.0.1",
78-
"lodash": "^4.17.19",
78+
"lodash": "^4.17.20",
7979
"micromatch": "^4.0.2"
8080
},
8181
"engines": {

test/e2e/http-proxy-middleware.spec.ts

-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ describe('E2E http-proxy-middleware', () => {
216216
const response = await agent.get(`/api/some/endpoint/index.html`).expect(200);
217217
expect(response.text).toBe('OK');
218218
expect(completedRequest.headers.host).toBe('foobar.dev');
219-
expect(completedRequest.hostname).toBe('foobar.dev');
220219
});
221220
});
222221

0 commit comments

Comments
 (0)