Skip to content

Commit

Permalink
test: vendor 'proxy' dependency (#29370)
Browse files Browse the repository at this point in the history
Fixes #28701
  • Loading branch information
mxschmitt authored Feb 5, 2024
1 parent 47f8ba2 commit 57d841f
Show file tree
Hide file tree
Showing 7 changed files with 497 additions and 66 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
test/assets/modernizr.js
/tests/third_party/
/packages/*/lib/
*.js
/packages/playwright-core/src/generated/*
Expand Down
63 changes: 0 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
"license-checker": "^25.0.1",
"mime": "^3.0.0",
"node-stream-zip": "^1.15.0",
"proxy": "^2.1.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"socksv5": "0.0.6",
Expand Down
4 changes: 2 additions & 2 deletions tests/config/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

import type { IncomingMessage } from 'http';
import type { Socket } from 'net';
import type { ProxyServer } from 'proxy';
import { createProxy } from 'proxy';
import type { ProxyServer } from '../third_party/proxy';
import { createProxy } from '../third_party/proxy';

export class TestProxy {
readonly PORT: number;
Expand Down
22 changes: 22 additions & 0 deletions tests/third_party/proxy/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
(The MIT License)

Copyright (c) 2013 Nathan Rajlich <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 4 additions & 0 deletions tests/third_party/proxy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This folder contains the [proxy](https://github.com/TooTallNate/proxy-agents)
library vendored at commit `c881a1804197b89580320b87082971c3c6a61746` with the following modifications:

- https://github.com/TooTallNate/proxy-agents/pull/270
Loading

0 comments on commit 57d841f

Please sign in to comment.