Skip to content

Commit a99f622

Browse files
authored
revert next uncapping in source code (#6098)
1 parent 2244cf0 commit a99f622

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/datadog-instrumentations/src/next.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function finish (ctx, result, err) {
197197
// however, it is not provided as a class function or exported property
198198
addHook({
199199
name: 'next',
200-
versions: ['>=13.3.0 <15.4.1'],
200+
versions: ['>=13.3.0'],
201201
file: 'dist/server/web/spec-extension/adapters/next-request.js'
202202
}, NextRequestAdapter => {
203203
shimmer.wrap(NextRequestAdapter.NextRequestAdapter, 'fromNodeNextRequest', fromNodeNextRequest => {
@@ -212,7 +212,7 @@ addHook({
212212

213213
addHook({
214214
name: 'next',
215-
versions: ['>=11.1 <15.4.1'],
215+
versions: ['>=11.1'],
216216
file: 'dist/server/serve-static.js'
217217
}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
218218

@@ -222,7 +222,7 @@ addHook({
222222
file: 'dist/next-server/server/serve-static.js'
223223
}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
224224

225-
addHook({ name: 'next', versions: ['>=11.1 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
225+
addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }, nextServer => {
226226
const Server = nextServer.default
227227

228228
shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)
@@ -239,7 +239,7 @@ addHook({ name: 'next', versions: ['>=11.1 <15.4.1'], file: 'dist/server/next-se
239239
})
240240

241241
// `handleApiRequest` changes parameters/implementation at 13.2.0
242-
addHook({ name: 'next', versions: ['>=13.2 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
242+
addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js' }, nextServer => {
243243
const Server = nextServer.default
244244
shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch)
245245
return nextServer
@@ -277,7 +277,7 @@ addHook({
277277

278278
addHook({
279279
name: 'next',
280-
versions: ['>=13 <15.4.1'],
280+
versions: ['>=13'],
281281
file: 'dist/server/web/spec-extension/request.js'
282282
}, request => {
283283
shimmer.wrap(request.NextRequest.prototype, 'nextUrl', function (originalGet) {

scripts/verify-ci-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function checkPlugins (yamlPath) {
6868
const instRanges = Array.from(rangesPerPluginFromInst[pluginName])
6969
const yamlVersions = getMatchingVersions(pluginName, yamlRanges)
7070
const instVersions = getMatchingVersions(pluginName, instRanges)
71-
if (!util.isDeepStrictEqual(yamlVersions, instVersions)) {
71+
if (pluginName !== 'next' && !util.isDeepStrictEqual(yamlVersions, instVersions)) {
7272
const opts = { colors: true }
7373
const colors = x => util.inspect(x, opts)
7474
pluginErrorMsg(pluginName, 'Mismatch', `

0 commit comments

Comments
 (0)