Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
b4db8088
Unverified
Commit
b4db8088
authored
Feb 16, 2024
by
Dima Voytenko
Committed by
GitHub
Feb 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OpenTelemetry: trace API routes in page router (#62120)
Co-authored-by:
JJ Kasper
<
jj@jjsweb.site
>
parent
b2e5c014
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
981 additions
and
727 deletions
+981
-727
pages-edge-api.ts
packages/next/src/build/templates/pages-edge-api.ts
+2
-1
next-edge-function-loader.ts
...xt/src/build/webpack/loaders/next-edge-function-loader.ts
+2
-1
index.ts
packages/next/src/server/api-utils/index.ts
+19
-0
api-resolver.ts
packages/next/src/server/api-utils/node/api-resolver.ts
+1
-11
module.ts
.../next/src/server/future/route-modules/pages-api/module.ts
+10
-2
route.ts
.../e2e/opentelemetry/app/api/app/[param]/data/edge/route.ts
+6
-0
page.tsx
...e2e/opentelemetry/app/app/[param]/rsc-fetch/edge/page.tsx
+13
-0
collector.ts
test/e2e/opentelemetry/collector.ts
+62
-0
constants.ts
test/e2e/opentelemetry/constants.ts
+1
-2
instrumentation-polyfill.ts
test/e2e/opentelemetry/instrumentation-polyfill.ts
+3
-0
instrumentation-test.ts
test/e2e/opentelemetry/instrumentation-test.ts
+93
-0
instrumentation.ts
test/e2e/opentelemetry/instrumentation.ts
+9
-9
opentelemetry.test.ts
test/e2e/opentelemetry/opentelemetry.test.ts
+731
-693
package.json
test/e2e/opentelemetry/package.json
+7
-6
edge.ts
test/e2e/opentelemetry/pages/api/pages/[param]/edge.ts
+7
-0
getServerSideProps.tsx
...telemetry/pages/pages/[param]/edge/getServerSideProps.tsx
+13
-0
index.test.js
test/integration/server-side-dev-errors/test/index.test.js
+2
-2
No files found.
packages/next/src/build/templates/pages-edge-api.ts
View file @
b4db8088
...
@@ -4,6 +4,7 @@ import '../../server/web/globals'
...
@@ -4,6 +4,7 @@ import '../../server/web/globals'
import
{
adapter
}
from
'../../server/web/adapter'
import
{
adapter
}
from
'../../server/web/adapter'
import
{
IncrementalCache
}
from
'../../server/lib/incremental-cache'
import
{
IncrementalCache
}
from
'../../server/lib/incremental-cache'
import
{
wrapApiHandler
}
from
'../../server/api-utils'
// Import the userland code.
// Import the userland code.
import
handler
from
'VAR_USERLAND'
import
handler
from
'VAR_USERLAND'
...
@@ -23,6 +24,6 @@ export default function (
...
@@ -23,6 +24,6 @@ export default function (
...
opts
,
...
opts
,
IncrementalCache
,
IncrementalCache
,
page
:
'VAR_DEFINITION_PATHNAME'
,
page
:
'VAR_DEFINITION_PATHNAME'
,
handler
,
handler
:
wrapApiHandler
(
page
,
handler
)
,
})
})
}
}
packages/next/src/build/webpack/loaders/next-edge-function-loader.ts
View file @
b4db8088
...
@@ -40,6 +40,7 @@ const nextEdgeFunctionLoader: webpack.LoaderDefinitionFunction<EdgeFunctionLoade
...
@@ -40,6 +40,7 @@ const nextEdgeFunctionLoader: webpack.LoaderDefinitionFunction<EdgeFunctionLoade
import 'next/dist/esm/server/web/globals'
import 'next/dist/esm/server/web/globals'
import { adapter } from 'next/dist/esm/server/web/adapter'
import { adapter } from 'next/dist/esm/server/web/adapter'
import { IncrementalCache } from 'next/dist/esm/server/lib/incremental-cache'
import { IncrementalCache } from 'next/dist/esm/server/lib/incremental-cache'
import { wrapApiHandler } from 'next/dist/esm/server/api-utils'
import handler from
${
stringifiedPagePath
}
import handler from
${
stringifiedPagePath
}
...
@@ -52,7 +53,7 @@ const nextEdgeFunctionLoader: webpack.LoaderDefinitionFunction<EdgeFunctionLoade
...
@@ -52,7 +53,7 @@ const nextEdgeFunctionLoader: webpack.LoaderDefinitionFunction<EdgeFunctionLoade
...opts,
...opts,
IncrementalCache,
IncrementalCache,
page:
${
JSON
.
stringify
(
page
)}
,
page:
${
JSON
.
stringify
(
page
)}
,
handler,
handler
: wrapApiHandler(
${
JSON
.
stringify
(
page
)}
, handler)
,
})
})
}
}
`
`
...
...
packages/next/src/server/api-utils/index.ts
View file @
b4db8088
...
@@ -8,6 +8,8 @@ import {
...
@@ -8,6 +8,8 @@ import {
PRERENDER_REVALIDATE_HEADER
,
PRERENDER_REVALIDATE_HEADER
,
PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER
,
PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER
,
}
from
'../../lib/constants'
}
from
'../../lib/constants'
import
{
getTracer
}
from
'../lib/trace/tracer'
import
{
NodeSpan
}
from
'../lib/trace/constants'
export
type
NextApiRequestCookies
=
Partial
<
{
[
key
:
string
]:
string
}
>
export
type
NextApiRequestCookies
=
Partial
<
{
[
key
:
string
]:
string
}
>
export
type
NextApiRequestQuery
=
Partial
<
{
[
key
:
string
]:
string
|
string
[]
}
>
export
type
NextApiRequestQuery
=
Partial
<
{
[
key
:
string
]:
string
|
string
[]
}
>
...
@@ -18,6 +20,23 @@ export type __ApiPreviewProps = {
...
@@ -18,6 +20,23 @@ export type __ApiPreviewProps = {
previewModeSigningKey
:
string
previewModeSigningKey
:
string
}
}
export
function
wrapApiHandler
<
T
extends
(...
args
:
any
[])
=>
any
>
(
page
:
string
,
handler
:
T
):
T
{
return
((...
args
)
=>
{
getTracer
().
getRootSpanAttributes
()?.
set
(
'next.route'
,
page
)
// Call API route method
return
getTracer
().
trace
(
NodeSpan
.
runHandler
,
{
spanName
:
`executing api route (pages)
${
page
}
`
,
},
()
=>
handler
(...
args
)
)
})
as
T
}
/**
/**
*
*
* @param res response object
* @param res response object
...
...
packages/next/src/server/api-utils/node/api-resolver.ts
View file @
b4db8088
...
@@ -23,8 +23,6 @@ import {
...
@@ -23,8 +23,6 @@ import {
RESPONSE_LIMIT_DEFAULT
,
RESPONSE_LIMIT_DEFAULT
,
}
from
'./../index'
}
from
'./../index'
import
{
getCookieParser
}
from
'./../get-cookie-parser'
import
{
getCookieParser
}
from
'./../get-cookie-parser'
import
{
getTracer
}
from
'../../lib/trace/tracer'
import
{
NodeSpan
}
from
'../../lib/trace/constants'
import
{
import
{
PRERENDER_REVALIDATE_HEADER
,
PRERENDER_REVALIDATE_HEADER
,
PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER
,
PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER
,
...
@@ -416,15 +414,7 @@ export async function apiResolver(
...
@@ -416,15 +414,7 @@ export async function apiResolver(
res
.
once
(
'pipe'
,
()
=>
(
wasPiped
=
true
))
res
.
once
(
'pipe'
,
()
=>
(
wasPiped
=
true
))
}
}
getTracer
().
getRootSpanAttributes
()?.
set
(
'next.route'
,
page
)
const
apiRouteResult
=
await
resolver
(
req
,
res
)
// Call API route method
const
apiRouteResult
=
await
getTracer
().
trace
(
NodeSpan
.
runHandler
,
{
spanName
:
`executing api route (pages)
${
page
}
`
,
},
()
=>
resolver
(
req
,
res
)
)
if
(
process
.
env
.
NODE_ENV
!==
'production'
)
{
if
(
process
.
env
.
NODE_ENV
!==
'production'
)
{
if
(
typeof
apiRouteResult
!==
'undefined'
)
{
if
(
typeof
apiRouteResult
!==
'undefined'
)
{
...
...
packages/next/src/server/future/route-modules/pages-api/module.ts
View file @
b4db8088
...
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from 'http'
...
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from 'http'
import
type
{
PagesAPIRouteDefinition
}
from
'../../route-definitions/pages-api-route-definition'
import
type
{
PagesAPIRouteDefinition
}
from
'../../route-definitions/pages-api-route-definition'
import
type
{
PageConfig
}
from
'../../../../../types'
import
type
{
PageConfig
}
from
'../../../../../types'
import
type
{
ParsedUrlQuery
}
from
'querystring'
import
type
{
ParsedUrlQuery
}
from
'querystring'
import
type
{
__ApiPreviewProps
}
from
'../../../api-utils'
import
{
wrapApiHandler
,
type
__ApiPreviewProps
}
from
'../../../api-utils'
import
type
{
RouteModuleOptions
}
from
'../route-module'
import
type
{
RouteModuleOptions
}
from
'../route-module'
import
{
RouteModule
,
type
RouteModuleHandleContext
}
from
'../route-module'
import
{
RouteModule
,
type
RouteModuleHandleContext
}
from
'../route-module'
...
@@ -104,6 +104,8 @@ export class PagesAPIRouteModule extends RouteModule<
...
@@ -104,6 +104,8 @@ export class PagesAPIRouteModule extends RouteModule<
PagesAPIRouteDefinition
,
PagesAPIRouteDefinition
,
PagesAPIUserlandModule
PagesAPIUserlandModule
>
{
>
{
private
apiResolverWrapped
:
typeof
apiResolver
constructor
(
options
:
PagesAPIRouteModuleOptions
)
{
constructor
(
options
:
PagesAPIRouteModuleOptions
)
{
super
(
options
)
super
(
options
)
...
@@ -112,6 +114,11 @@ export class PagesAPIRouteModule extends RouteModule<
...
@@ -112,6 +114,11 @@ export class PagesAPIRouteModule extends RouteModule<
`Page
${
options
.
definition
.
page
}
does not export a default function.`
`Page
${
options
.
definition
.
page
}
does not export a default function.`
)
)
}
}
this
.
apiResolverWrapped
=
wrapApiHandler
(
options
.
definition
.
page
,
apiResolver
)
}
}
/**
/**
...
@@ -125,7 +132,8 @@ export class PagesAPIRouteModule extends RouteModule<
...
@@ -125,7 +132,8 @@ export class PagesAPIRouteModule extends RouteModule<
res
:
ServerResponse
,
res
:
ServerResponse
,
context
:
PagesAPIRouteHandlerContext
context
:
PagesAPIRouteHandlerContext
):
Promise
<
void
>
{
):
Promise
<
void
>
{
await
apiResolver
(
const
{
apiResolverWrapped
}
=
this
await
apiResolverWrapped
(
req
,
req
,
res
,
res
,
context
.
query
,
context
.
query
,
...
...
test/e2e/opentelemetry/app/api/app/[param]/data/edge/route.ts
0 → 100644
View file @
b4db8088
export
async
function
GET
()
{
return
new
Response
(
JSON
.
stringify
({
test
:
'data-edge'
}))
}
export
const
runtime
=
'edge'
export
const
dynamic
=
'force-dynamic'
test/e2e/opentelemetry/app/app/[param]/rsc-fetch/edge/page.tsx
0 → 100644
View file @
b4db8088
// We want to trace this fetch in runtime
export
const
dynamic
=
'force-dynamic'
export
const
runtime
=
'edge'
export
async
function
generateMetadata
()
{
return
{}
}
export
default
async
function
Page
()
{
const
data
=
await
fetch
(
'https://vercel.com'
)
return
<
pre
>
RESONSE:
{
data
.
status
}
</
pre
>
}
test/e2e/opentelemetry/collector.ts
0 → 100644
View file @
b4db8088
import
{
Server
as
HttpServer
}
from
'node:http'
import
{
SavedSpan
}
from
'./constants'
export
interface
Collector
{
getSpans
:
()
=>
SavedSpan
[]
shutdown
:
()
=>
Promise
<
void
>
}
export
async
function
connectCollector
({
port
,
}:
{
port
:
number
}):
Promise
<
Collector
>
{
const
spans
:
SavedSpan
[]
=
[]
const
server
=
new
HttpServer
(
async
(
req
,
res
)
=>
{
if
(
req
.
method
!==
'POST'
)
{
res
.
writeHead
(
405
)
res
.
end
()
return
}
const
body
=
await
new
Promise
<
Buffer
>
((
resolve
,
reject
)
=>
{
const
acc
:
Buffer
[]
=
[]
req
.
on
(
'data'
,
(
chunk
:
Buffer
)
=>
{
acc
.
push
(
chunk
)
})
req
.
on
(
'end'
,
()
=>
{
resolve
(
Buffer
.
concat
(
acc
))
})
req
.
on
(
'error'
,
reject
)
})
const
newSpans
=
JSON
.
parse
(
body
.
toString
(
'utf-8'
))
as
SavedSpan
[]
spans
.
push
(...
newSpans
)
res
.
statusCode
=
202
res
.
end
()
})
await
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
server
.
listen
(
port
,
(
err
?:
Error
)
=>
{
if
(
err
)
{
reject
(
err
)
}
else
{
resolve
()
}
})
})
return
{
getSpans
()
{
return
spans
},
shutdown
()
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
server
.
close
((
err
)
=>
(
err
?
reject
(
err
)
:
resolve
()))
).
catch
((
err
)
=>
{
console
.
warn
(
'WARN: collector server disconnect failure:'
,
err
)
})
},
}
}
test/e2e/opentelemetry/constants.ts
View file @
b4db8088
import
{
SpanKind
}
from
'@opentelemetry/api'
import
{
SpanKind
}
from
'@opentelemetry/api'
export
const
traceFile
=
'otel-trace.txt'
export
type
SavedSpan
=
{
export
type
SavedSpan
=
{
runtime
?:
string
traceId
?:
string
traceId
?:
string
parentId
?:
string
parentId
?:
string
traceState
?:
any
traceState
?:
any
...
...
test/e2e/opentelemetry/instrumentation-polyfill.ts
0 → 100644
View file @
b4db8088
if
(
globalThis
.
performance
===
undefined
)
{
globalThis
.
performance
=
{
timeOrigin
:
0
,
now
:
()
=>
Date
.
now
()
}
as
any
}
test/e2e/opentelemetry/instrumentation-
node-
test.ts
→
test/e2e/opentelemetry/instrumentation-test.ts
View file @
b4db8088
import
'./instrumentation-polyfill'
import
{
Resource
}
from
'@opentelemetry/resources'
import
{
Resource
}
from
'@opentelemetry/resources'
import
{
SemanticResourceAttributes
}
from
'@opentelemetry/semantic-conventions'
import
{
SemanticResourceAttributes
}
from
'@opentelemetry/semantic-conventions'
import
{
NodeTracerProvider
}
from
'@opentelemetry/sdk-trace-node'
import
{
BasicTracerProvider
}
from
'@opentelemetry/sdk-trace-base'
import
{
AsyncLocalStorageContextManager
}
from
'@opentelemetry/context-async-hooks'
import
{
import
{
SimpleSpanProcessor
,
SimpleSpanProcessor
,
SpanExporter
,
SpanExporter
,
...
@@ -11,13 +14,11 @@ import {
...
@@ -11,13 +14,11 @@ import {
ExportResultCode
,
ExportResultCode
,
hrTimeToMicroseconds
,
hrTimeToMicroseconds
,
}
from
'@opentelemetry/core'
}
from
'@opentelemetry/core'
import
fs
from
'fs-extra'
import
{
SavedSpan
,
traceFile
}
from
'./constants'
import
{
SavedSpan
}
from
'./constants'
import
path
from
'path'
import
url
from
'url'
const
serializeSpan
=
(
span
:
ReadableSpan
):
SavedSpan
=>
({
const
serializeSpan
=
(
span
:
ReadableSpan
):
SavedSpan
=>
({
runtime
:
process
.
env
.
NEXT_RUNTIME
,
traceId
:
span
.
spanContext
().
traceId
,
traceId
:
span
.
spanContext
().
traceId
,
parentId
:
span
.
parentSpanId
,
parentId
:
span
.
parentSpanId
,
traceState
:
span
.
spanContext
().
traceState
?.
serialize
(),
traceState
:
span
.
spanContext
().
traceState
?.
serialize
(),
...
@@ -32,20 +33,38 @@ const serializeSpan = (span: ReadableSpan): SavedSpan => ({
...
@@ -32,20 +33,38 @@ const serializeSpan = (span: ReadableSpan): SavedSpan => ({
links
:
span
.
links
,
links
:
span
.
links
,
})
})
const
__dirname
=
path
.
dirname
(
url
.
fileURLToPath
(
import
.
meta
.
url
))
class
TestExporter
implements
SpanExporter
{
class
TestExporter
implements
SpanExporter
{
constructor
(
private
port
:
number
)
{}
async
export
(
async
export
(
spans
:
ReadableSpan
[],
spans
:
ReadableSpan
[],
resultCallback
:
(
result
:
ExportResult
)
=>
void
resultCallback
:
(
result
:
ExportResult
)
=>
void
)
{
)
{
const
traceFullPath
=
path
.
join
(
__dirname
,
traceFile
)
try
{
for
(
const
span
of
spans
)
{
const
response
=
await
fetch
(
`http://localhost:
${
this
.
port
}
`
,
{
await
fs
.
appendFile
(
method
:
'POST'
,
traceFullPath
,
headers
:
{
JSON
.
stringify
(
serializeSpan
(
span
))
+
'
\
n'
'Content-Type'
:
'application/json'
,
)
},
body
:
JSON
.
stringify
(
spans
.
map
(
serializeSpan
)),
})
try
{
await
response
.
arrayBuffer
()
}
catch
(
e
)
{
// ignore.
}
if
(
response
.
status
>=
400
)
{
console
.
warn
(
'WARN: TestExporter: response status:'
,
response
.
status
)
resultCallback
({
code
:
ExportResultCode
.
FAILED
,
error
:
new
Error
(
`http status
${
response
.
status
}
`
),
})
}
}
catch
(
e
)
{
console
.
warn
(
'WARN: TestExporterP: error:'
,
e
)
resultCallback
({
code
:
ExportResultCode
.
FAILED
,
error
:
e
})
}
}
resultCallback
({
code
:
ExportResultCode
.
SUCCESS
})
resultCallback
({
code
:
ExportResultCode
.
SUCCESS
})
}
}
shutdown
():
Promise
<
void
>
{
shutdown
():
Promise
<
void
>
{
...
@@ -54,17 +73,21 @@ class TestExporter implements SpanExporter {
...
@@ -54,17 +73,21 @@ class TestExporter implements SpanExporter {
}
}
export
const
register
=
()
=>
{
export
const
register
=
()
=>
{
const
provider
=
new
NodeTracerProvider
({
const
contextManager
=
new
AsyncLocalStorageContextManager
()
contextManager
.
enable
()
const
provider
=
new
BasicTracerProvider
({
resource
:
new
Resource
({
resource
:
new
Resource
({
[
SemanticResourceAttributes
.
SERVICE_NAME
]:
'test-next-app'
,
[
SemanticResourceAttributes
.
SERVICE_NAME
]:
'test-next-app'
,
}),
}),
})
})
provider
.
addSpanProcessor
(
new
SimpleSpanProcessor
(
new
TestExporter
()))
if
(
!
process
.
env
.
TEST_OTEL_COLLECTOR_PORT
)
{
throw
new
Error
(
'TEST_OTEL_COLLECTOR_PORT is not set'
)
}
const
port
=
parseInt
(
process
.
env
.
TEST_OTEL_COLLECTOR_PORT
)
provider
.
addSpanProcessor
(
new
SimpleSpanProcessor
(
new
TestExporter
(
port
)))
// Make sure to register you provider
// Make sure to register you provider
provider
.
register
()
provider
.
register
({
contextManager
})
// Creating this file will let our tests know that initialization is done
fs
.
createFileSync
(
'./'
+
traceFile
)
}
}
test/e2e/opentelemetry/instrumentation.ts
View file @
b4db8088
export
function
register
()
{
import
{
register
as
registerForTest
}
from
'./instrumentation-test'
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs'
)
{
if
(
process
.
env
.
__NEXT_TEST_MODE
)
{
export
async
function
register
(
)
{
require
(
'./instrumentation-node-test'
).
register
()
if
(
process
.
env
.
__NEXT_TEST_MODE
)
{
}
else
{
registerForTest
()
// We use this instrumentation for easier debugging with this test.
}
else
if
(
process
.
env
.
NEXT_RUNTIME
===
'nodejs'
)
{
// We want this test to be executable with `pnpm next-with-deps`
.
// We use this instrumentation for easier debugging with this test
.
require
(
'./instrumentation-node'
).
register
()
// We want this test to be executable with `pnpm next-with-deps`.
}
require
(
'./instrumentation-node'
).
register
()
}
}
}
}
test/e2e/opentelemetry/opentelemetry.test.ts
View file @
b4db8088
This diff is collapsed.
Click to expand it.
test/e2e/opentelemetry/package.json
View file @
b4db8088
...
@@ -2,12 +2,13 @@
...
@@ -2,12 +2,13 @@
"dependencies"
:
{
"dependencies"
:
{
"fs-extra"
:
"^8.0.0"
,
"fs-extra"
:
"^8.0.0"
,
"@types/fs-extra"
:
"^8.0.0"
,
"@types/fs-extra"
:
"^8.0.0"
,
"@opentelemetry/api"
:
"^1.0.0"
,
"@opentelemetry/api"
:
"^1.7.0"
,
"@opentelemetry/core"
:
"^1.0.0"
,
"@opentelemetry/context-async-hooks"
:
"^1.21.0"
,
"@opentelemetry/resources"
:
"^1.0.0"
,
"@opentelemetry/core"
:
"^1.21.0"
,
"@opentelemetry/sdk-trace-base"
:
"^1.0.0"
,
"@opentelemetry/resources"
:
"^1.21.0"
,
"@opentelemetry/sdk-trace-node"
:
"^1.0.0"
,
"@opentelemetry/sdk-trace-base"
:
"^1.21.0"
,
"@opentelemetry/semantic-conventions"
:
"^1.0.0"
,
"@opentelemetry/sdk-trace-node"
:
"^1.21.0"
,
"@opentelemetry/semantic-conventions"
:
"^1.21.0"
,
"@opentelemetry/exporter-trace-otlp-grpc"
:
"^0.34.0"
"@opentelemetry/exporter-trace-otlp-grpc"
:
"^0.34.0"
}
}
}
}
test/e2e/opentelemetry/pages/api/pages/[param]/edge.ts
0 → 100644
View file @
b4db8088
export
const
config
=
{
runtime
:
'edge'
,
}
export
default
function
handler
(
req
)
{
return
Response
.
json
({
text
:
'hello world'
})
}
test/e2e/opentelemetry/pages/pages/[param]/edge/getServerSideProps.tsx
0 → 100644
View file @
b4db8088
export
const
config
=
{
runtime
:
'experimental-edge'
,
}
export
default
function
Page
()
{
return
<
div
>
Page
</
div
>
}
export
function
getServerSideProps
()
{
return
{
props
:
{},
}
}
test/integration/server-side-dev-errors/test/index.test.js
View file @
b4db8088
...
@@ -149,7 +149,7 @@ describe('server-side dev errors', () => {
...
@@ -149,7 +149,7 @@ describe('server-side dev errors', () => {
const
err
=
stderr
.
slice
(
stderrIdx
)
const
err
=
stderr
.
slice
(
stderrIdx
)
return
err
.
includes
(
'pages/api/hello.js'
)
&&
return
err
.
includes
(
'pages/api/hello.js'
)
&&
err
.
includes
(
'2:
2
'
)
&&
err
.
includes
(
'2:
3
'
)
&&
err
.
includes
(
'default'
)
&&
err
.
includes
(
'default'
)
&&
err
.
includes
(
'missingVar'
)
err
.
includes
(
'missingVar'
)
?
'success'
?
'success'
...
@@ -181,7 +181,7 @@ describe('server-side dev errors', () => {
...
@@ -181,7 +181,7 @@ describe('server-side dev errors', () => {
const
err
=
stderr
.
slice
(
stderrIdx
)
const
err
=
stderr
.
slice
(
stderrIdx
)
return
err
.
includes
(
'pages/api/blog/[slug].js'
)
&&
return
err
.
includes
(
'pages/api/blog/[slug].js'
)
&&
err
.
includes
(
'2:
2
'
)
&&
err
.
includes
(
'2:
3
'
)
&&
err
.
includes
(
'default'
)
&&
err
.
includes
(
'default'
)
&&
err
.
includes
(
'missingVar'
)
err
.
includes
(
'missingVar'
)
?
'success'
?
'success'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment