Skip to content

fix: ntl serve for v2 functions, follow-ups #6210

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 3 commits into from
Nov 28, 2023
Merged

fix: ntl serve for v2 functions, follow-ups #6210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
618752f
fix: for `ntl serve`, populate `routes` from `manifest.json`
Skn0tt Nov 27, 2023
b4bd4df
fix: for `ntl serve`, check `___netlify-entry-point` as `.mjs`
Skn0tt Nov 27, 2023
4af2c8f
Merge branch 'main' into serve-v2
Skn0tt Nov 28, 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
11 changes: 7 additions & 4 deletions src/lib/functions/registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,14 +460,17 @@ export class FunctionsRegistry {
// @ts-expect-error TS(2339) FIXME: Property 'manifest' does not exist on type 'Functi... Remove this comment to see the full error message
const manifestEntry = (this.manifest?.functions || []).find((manifestFunc) => manifestFunc.name === func.name)

func.buildData = manifestEntry?.buildData || {}
func.buildData = {
...manifestEntry?.buildData,
routes: manifestEntry.routes,
}

// When we look at an unzipped function, we don't know whether it uses
// the legacy entry file format (i.e. `[function name].js`) or the new
// one (i.e. `___netlify-entry-point.js`). Let's look for the new one
// the legacy entry file format (i.e. `[function name].mjs`) or the new
// one (i.e. `___netlify-entry-point.mjs`). Let's look for the new one
// and use it if it exists, otherwise use the old one.
try {
const v2EntryPointPath = join(unzippedDirectory, '___netlify-entry-point.js')
const v2EntryPointPath = join(unzippedDirectory, '___netlify-entry-point.mjs')

await stat(v2EntryPointPath)

Expand Down