Unverified Commit 909ab3b1 authored by Luis Alvarez D's avatar Luis Alvarez D Committed by GitHub

Check for invalid pages (#10403)

* Updated event

* adjust regex

* adjust regexp more

* Better test file regex

* add tests

* Update index.test.js

* Rename test file
Co-authored-by: 's avatarJoe Haddad <timer150@gmail.com>
parent 821b3255
......@@ -770,9 +770,8 @@ export default async function build(dir: string, conf = null): Promise<void> {
const analysisEnd = process.hrtime(analysisBegin)
telemetry.record(
eventBuildOptimize({
eventBuildOptimize(pagePaths, {
durationInSeconds: analysisEnd[0],
totalPageCount: pagePaths.length,
staticPageCount: staticPages.size,
ssrPageCount: pagePaths.length - staticPages.size,
})
......
......@@ -19,13 +19,32 @@ type EventBuildOptimized = {
totalPageCount: number
staticPageCount: number
ssrPageCount: number
hasDunderPages: boolean
hasTestPages: boolean
}
const REGEXP_DIRECTORY_DUNDER = /[\\/]__[^\\/]+(?<![\\/]__(?:tests|mocks))__[\\/]/i
const REGEXP_DIRECTORY_TESTS = /[\\/]__(tests|mocks)__[\\/]/i
const REGEXP_FILE_TEST = /\.(?:spec|test)\.[^.]+$/i
export function eventBuildOptimize(
event: EventBuildOptimized
pagePaths: string[],
event: Omit<
EventBuildOptimized,
'totalPageCount' | 'hasDunderPages' | 'hasTestPages'
>
): { eventName: string; payload: EventBuildOptimized } {
return {
eventName: EVENT_BUILD_OPTIMIZE,
payload: event,
payload: {
...event,
totalPageCount: pagePaths.length,
hasDunderPages: pagePaths.some(path =>
REGEXP_DIRECTORY_DUNDER.test(path)
),
hasTestPages: pagePaths.some(
path => REGEXP_DIRECTORY_TESTS.test(path) || REGEXP_FILE_TEST.test(path)
),
},
}
}
export default () => {
return 'oops, I happen to look like a React component'
}
......@@ -92,6 +92,26 @@ describe('Telemetry CLI', () => {
expect(stderr2).toMatch(/isSrcDir.*?true/)
})
it('detects tests correctly for `next build`', async () => {
await fs.rename(
path.join(appDir, 'pages', 'hello.test.skip'),
path.join(appDir, 'pages', 'hello.test.js')
)
const { stderr } = await runNextCommand(['build', appDir], {
stderr: true,
env: {
NEXT_TELEMETRY_DEBUG: 1,
},
})
await fs.rename(
path.join(appDir, 'pages', 'hello.test.js'),
path.join(appDir, 'pages', 'hello.test.skip')
)
expect(stderr).toMatch(/hasDunderPages.*?true/)
expect(stderr).toMatch(/hasTestPages.*?true/)
})
it('detects isSrcDir dir correctly for `next dev`', async () => {
let port = await findPort()
let stderr = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment