Skip to content

Commit e9ef99e

Browse files
authored
chore: re-add require-in-the-middle dep (#3266)
It was temporarily inlined some releases ago while changes were separately upstreamed. Since then there has been some dev on the module that it would be good to keep up with. This effectively upgrades from require-in-the-middle v6.0.0 to v7.0.1. https://github.com/elastic/require-in-the-middle/blob/main/CHANGELOG.md#v701
1 parent fbfa4ba commit e9ef99e

File tree

5 files changed

+26
-262
lines changed

5 files changed

+26
-262
lines changed

NOTICE.md

-33
Original file line numberDiff line numberDiff line change
@@ -425,36 +425,3 @@ The above copyright notice and this permission notice shall be included in all c
425425
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.
426426
```
427427

428-
429-
## require-in-the-middle
430-
431-
- **path:** [lib/ritm.js](lib/ritm.js)
432-
- **author:** Thomas Watson Steen
433-
- **project url:** https://github.com/elastic/require-in-the-middle
434-
- **original file:** https://github.com/elastic/require-in-the-middle/blob/v5.2.0/index.js
435-
- **license:** MIT License (MIT), http://opensource.org/licenses/MIT
436-
437-
```
438-
The MIT License (MIT)
439-
440-
Copyright (c) 2016-2019 Thomas Watson Steen
441-
442-
Permission is hereby granted, free of charge, to any person obtaining a copy
443-
of this software and associated documentation files (the "Software"), to deal
444-
in the Software without restriction, including without limitation the rights
445-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
446-
copies of the Software, and to permit persons to whom the Software is
447-
furnished to do so, subject to the following conditions:
448-
449-
The above copyright notice and this permission notice shall be included in all
450-
copies or substantial portions of the Software.
451-
452-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
453-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
454-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
455-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
456-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
457-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
458-
SOFTWARE.
459-
```
460-

lib/instrumentation/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
var fs = require('fs')
1010
var path = require('path')
1111

12-
const Hook = require('../ritm')
12+
const Hook = require('require-in-the-middle')
1313
const semver = require('semver')
1414

1515
const config = require('../config')

lib/ritm.js

-224
This file was deleted.

package-lock.json

+24-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
"basic-auth": "^2.0.1",
9595
"cookie": "^0.5.0",
9696
"core-util-is": "^1.0.2",
97-
"debug": "^4.1.1",
9897
"elastic-apm-http-client": "11.3.1",
9998
"end-of-stream": "^1.4.4",
10099
"error-callsites": "^2.0.4",
@@ -112,7 +111,7 @@
112111
"original-url": "^1.2.3",
113112
"pino": "^6.11.2",
114113
"relative-microtime": "^2.0.0",
115-
"resolve": "^1.22.1",
114+
"require-in-the-middle": "^7.0.1",
116115
"semver": "^6.3.0",
117116
"set-cookie-serde": "^1.0.0",
118117
"shallow-clone-shim": "^2.0.0",

0 commit comments

Comments
 (0)