Skip to content

Commit dceb5be

Browse files
ascorbicascorbic
committed
chore: fix tests
1 parent d0d1ad0 commit dceb5be

File tree

4 files changed

+56
-12
lines changed

4 files changed

+56
-12
lines changed

‎packages/runtime/src/helpers/files.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import globby from 'globby'
88
import { PrerenderManifest } from 'next/dist/build'
99
import { outdent } from 'outdent'
1010
import pLimit from 'p-limit'
11-
import { join, resolve } from 'pathe'
11+
import { join, resolve, dirname } from 'pathe'
1212
import slash from 'slash'
1313

1414
import { MINIMUM_REVALIDATE_SECONDS, DIVIDER } from '../constants'
@@ -356,7 +356,7 @@ export const getDependenciesOfFile = async (file: string) => {
356356
return []
357357
}
358358
const dependencies = await readJson(nft, 'utf8')
359-
return dependencies.files.map((dep) => resolve(file, dep))
359+
return dependencies.files.map((dep) => resolve(dirname(file), dep))
360360
}
361361

362362
const baseServerReplacements: Array<[string, string]> = [

‎test/__snapshots__/index.js.snap

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,29 +79,72 @@ exports.resolvePages = () => {
7979
exports[`onBuild() generates a file referencing all page sources: for _api_hello-background-background 1`] = `
8080
"// This file is purely to allow nft to know about these pages.
8181
try {
82-
require.resolve('../../../.next/server/package.json')
82+
require.resolve('../../../.next/package.json')
83+
require.resolve('../../../.next/server/chunks/676.js')
8384
require.resolve('../../../.next/server/pages/_app.js')
8485
require.resolve('../../../.next/server/pages/_document.js')
8586
require.resolve('../../../.next/server/pages/_error.js')
8687
require.resolve('../../../.next/server/pages/api/hello-background.js')
87-
require.resolve('../../../.next/server/pages/chunks/274.js')
88-
require.resolve('../../../.next/server/pages/webpack-api-runtime.js')
89-
require.resolve('../../../.next/server/pages/webpack-runtime.js')
88+
require.resolve('../../../.next/server/webpack-api-runtime.js')
89+
require.resolve('../../../.next/server/webpack-runtime.js')
90+
require.resolve('../../../node_modules/next/dist/server/get-page-files.js')
91+
require.resolve('../../../node_modules/next/dist/server/htmlescape.js')
92+
require.resolve('../../../node_modules/next/dist/server/utils.js')
93+
require.resolve('../../../node_modules/next/dist/shared/lib/amp-context.js')
94+
require.resolve('../../../node_modules/next/dist/shared/lib/amp-mode.js')
95+
require.resolve('../../../node_modules/next/dist/shared/lib/constants.js')
96+
require.resolve('../../../node_modules/next/dist/shared/lib/head-manager-context.js')
97+
require.resolve('../../../node_modules/next/dist/shared/lib/head.js')
98+
require.resolve('../../../node_modules/next/dist/shared/lib/html-context.js')
99+
require.resolve('../../../node_modules/next/dist/shared/lib/is-plain-object.js')
100+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/denormalize-page-path.js')
101+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/ensure-leading-slash.js')
102+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/normalize-page-path.js')
103+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/normalize-path-sep.js')
104+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/index.js')
105+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/is-dynamic.js')
106+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/sorted-routes.js')
107+
require.resolve('../../../node_modules/next/dist/shared/lib/side-effect.js')
108+
require.resolve('../../../node_modules/next/dist/shared/lib/utils.js')
109+
require.resolve('../../../node_modules/next/dist/shared/lib/utils/warn-once.js')
110+
require.resolve('../../../node_modules/next/package.json')
111+
require.resolve('../../../package.json')
90112
} catch {}"
91113
`;
92114

93115
exports[`onBuild() generates a file referencing all page sources: for _api_hello-scheduled-handler 1`] = `
94116
"// This file is purely to allow nft to know about these pages.
95117
try {
96118
require.resolve('../../../.next/package.json')
97-
require.resolve('../../../.next/server/package.json')
119+
require.resolve('../../../.next/server/chunks/676.js')
98120
require.resolve('../../../.next/server/pages/_app.js')
99121
require.resolve('../../../.next/server/pages/_document.js')
100122
require.resolve('../../../.next/server/pages/_error.js')
101123
require.resolve('../../../.next/server/pages/api/hello-scheduled.js')
102-
require.resolve('../../../.next/server/pages/chunks/274.js')
103-
require.resolve('../../../.next/server/pages/webpack-api-runtime.js')
104-
require.resolve('../../../.next/server/pages/webpack-runtime.js')
124+
require.resolve('../../../.next/server/webpack-api-runtime.js')
125+
require.resolve('../../../.next/server/webpack-runtime.js')
126+
require.resolve('../../../node_modules/next/dist/server/get-page-files.js')
127+
require.resolve('../../../node_modules/next/dist/server/htmlescape.js')
128+
require.resolve('../../../node_modules/next/dist/server/utils.js')
129+
require.resolve('../../../node_modules/next/dist/shared/lib/amp-context.js')
130+
require.resolve('../../../node_modules/next/dist/shared/lib/amp-mode.js')
131+
require.resolve('../../../node_modules/next/dist/shared/lib/constants.js')
132+
require.resolve('../../../node_modules/next/dist/shared/lib/head-manager-context.js')
133+
require.resolve('../../../node_modules/next/dist/shared/lib/head.js')
134+
require.resolve('../../../node_modules/next/dist/shared/lib/html-context.js')
135+
require.resolve('../../../node_modules/next/dist/shared/lib/is-plain-object.js')
136+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/denormalize-page-path.js')
137+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/ensure-leading-slash.js')
138+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/normalize-page-path.js')
139+
require.resolve('../../../node_modules/next/dist/shared/lib/page-path/normalize-path-sep.js')
140+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/index.js')
141+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/is-dynamic.js')
142+
require.resolve('../../../node_modules/next/dist/shared/lib/router/utils/sorted-routes.js')
143+
require.resolve('../../../node_modules/next/dist/shared/lib/side-effect.js')
144+
require.resolve('../../../node_modules/next/dist/shared/lib/utils.js')
145+
require.resolve('../../../node_modules/next/dist/shared/lib/utils/warn-once.js')
146+
require.resolve('../../../node_modules/next/package.json')
147+
require.resolve('../../../package.json')
105148
} catch {}"
106149
`;
107150

‎test/analysis.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { extractConfigFromFile } from '../packages/runtime/src/helpers/analysis'
22
import { resolve } from 'pathe'
33
import { getDependenciesOfFile } from '../packages/runtime/src/helpers/files'
4+
import { dirname } from 'path'
45
describe('static source analysis', () => {
56
beforeEach(() => {
67
// Spy on console.error
@@ -85,7 +86,7 @@ describe('dependency tracing', () => {
8586
it('generates dependency list from a source file', async () => {
8687
const dependencies = await getDependenciesOfFile(resolve(__dirname, 'fixtures/analysis/background.js'))
8788
expect(dependencies).toEqual(
88-
['fixtures/webpack-api-runtime.js', 'package.json'].map((dep) => resolve(__dirname, dep)),
89+
['test/webpack-api-runtime.js', 'package.json'].map((dep) => resolve(dirname(__dirname), dep)),
8990
)
9091
})
9192
})

‎test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ describe('onBuild()', () => {
520520
'!.next/server/**/*.js.nft.json',
521521
'!.next/server/**/*.map',
522522
'!**/node_modules/@next/swc*/**/*',
523-
'!../../node_modules/next/dist/compiled/@ampproject/toolbox-optimizer/**/*',
523+
'!node_modules/next/dist/compiled/@ampproject/toolbox-optimizer/**/*',
524524
`!node_modules/next/dist/server/lib/squoosh/**/*.wasm`,
525525
`!node_modules/next/dist/next-server/server/lib/squoosh/**/*.wasm`,
526526
'!node_modules/next/dist/compiled/webpack/bundle4.js',

0 commit comments

Comments
 (0)