fix: use Edge Bundler to merge edge function declarations #5551
+389
−122
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
📊 Benchmark resultsComparing with b4d888b Package size: 270 MB⬆️ 2.62% increase vs. b4d888b Legend
|
danez
previously approved these changes
Mar 13, 2023
| this.declarationsFromSource = functions.reduce( | ||
| (acc, func, index) => ({ ...acc, [func.name]: functionsConfig[index] }), | ||
| {}, | ||
| ) |
There was a problem hiding this comment.
I see why we changed this because edge-bundler expects it that way. It is surprising that this does not follow the Declaration type that toml and deploy config declarations have.
Would you happen to know why that is? Are we trying to avoid duplicates with this?
There was a problem hiding this comment.
Good question, I'm not sure. I guess we could change it so that it follows the Declaration type, but I'd rather do that in a separate PR.
| return this.declarationsFromConfig?.find((declaration) => declaration.function === func)?.name | ||
| const declarations = [...this.declarationsFromTOML, ...this.declarationsFromDeployConfig] | ||
|
|
||
| return declarations.find((declaration) => declaration.function === func)?.name |
There was a problem hiding this comment.
We do not support the displayName in the ISC?
There was a problem hiding this comment.
|
CI is failing because we'll need netlify/edge-bundler#337. 😢 |
khendrikse
previously approved these changes
Mar 14, 2023
khendrikse
approved these changes
Mar 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
CLI had its own logic for merging edge function declarations coming from different sources (i.e.
netlify.toml, in-source declarations, and deploy configuration API). This PR replaces that with the logic exported by@netlify/edge-bundler.Using the same logic in both places ensures that the local development and production environments behave the same way.
It also moves the definition of the bootstrap URL out of Edge Bundler and into the CLI.
This PR needs netlify/edge-bundler#334 to be merged and released — I'll leave it as a draft until that happens.
Closes netlify/edge-functions-examples#42 and https://github.com/netlify/pod-compute/issues/429.
Supersedes #5561.