Skip to content

fix: tracing root use appDir as fallback #2136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 30, 2023
Merged

fix: tracing root use appDir as fallback #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b65b7da
fix: add default values for relativeAppDir and outputFileTracingRoot
Skn0tt May 25, 2023
8e1936f
fix: use `appDir` as fallback
Skn0tt May 25, 2023
4fe9473
fix: add optional for potetially undefined variable
Skn0tt May 25, 2023
aac893a
fix: apparently not.toReject doesn't exist in newer versions of Jest
Skn0tt May 25, 2023
0d9676a
fix: oops, order of paths was swapped!
Skn0tt May 25, 2023
4fc0ed8
fix: toResolve is not a function
Skn0tt May 30, 2023
28906db
Merge branch 'main' into relativeAppDir-default-values
Skn0tt May 30, 2023
aa15733
fix: why do all these assertions not exist?
Skn0tt May 30, 2023
6902d07
Merge branch 'relativeAppDir-default-values' of github.com:netlify/ne…
Skn0tt May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/runtime/src/helpers/functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ export const setupImageFunction = async ({
}

const traceRequiredServerFiles = async (publish: string): Promise<string[]> => {
const {
files,
relativeAppDir,
config: {
experimental: { outputFileTracingRoot },
},
} = await getRequiredServerFiles(publish)
const appDirRoot = join(outputFileTracingRoot, relativeAppDir)
const requiredServerFiles = await getRequiredServerFiles(publish)

let appDirRoot = requiredServerFiles.appDir ?? join(publish, '..')
if (requiredServerFiles.relativeAppDir && requiredServerFiles.config?.experimental.outputFileTracingRoot) {
appDirRoot = join(requiredServerFiles.config.experimental.outputFileTracingRoot, requiredServerFiles.relativeAppDir)
}

const files = requiredServerFiles.files ?? []
const absoluteFiles = files.map((file) => join(appDirRoot, file))

absoluteFiles.push(join(publish, 'required-server-files.json'))
Expand Down
22 changes: 22 additions & 0 deletions test/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,28 @@ describe('onBuild()', () => {

expect(netlifyConfig.functions['_api_*'].node_bundler).toEqual('nft')
})

// eslint-disable-next-line jest/expect-expect
it('works when `relativeAppDir` is undefined', async () => {
await moveNextDist()

const initialConfig = await getRequiredServerFiles(netlifyConfig.build.publish)
delete initialConfig.relativeAppDir
await updateRequiredServerFiles(netlifyConfig.build.publish, initialConfig)

await nextRuntime.onBuild(defaultArgs)
})

// eslint-disable-next-line jest/expect-expect
it('works when `outputFileTracingRoot` is undefined', async () => {
await moveNextDist()

const initialConfig = await getRequiredServerFiles(netlifyConfig.build.publish)
delete initialConfig.config.experimental.outputFileTracingRoot
await updateRequiredServerFiles(netlifyConfig.build.publish, initialConfig)

await nextRuntime.onBuild(defaultArgs)
})
})

describe('onPostBuild', () => {
Expand Down