This repository has been archived by the owner on Feb 10, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf(netlify): handle dependency tracing for SSR function (#296)
* perf: take over function bundling * Fix test failures * Format * Changeset * Use shared fs helper * Format * Changes from review * Add logging * Test timeout * Use posix path * Remove logs
- Loading branch information
Showing
10 changed files
with
1,082 additions
and
279 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@astrojs/netlify': patch | ||
| --- | ||
|
|
||
| Improves performance for serverless function builds by not bundling dependencies |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import { posix, relative, sep } from 'node:path'; | ||
| import { fileURLToPath } from 'node:url'; | ||
| import { copyFilesToFolder } from '@astrojs/internal-helpers/fs'; | ||
| import type { AstroIntegrationLogger } from 'astro'; | ||
|
|
||
| // Based on the equivalent function in `@astrojs/vercel` | ||
| export async function copyDependenciesToFunction( | ||
| { | ||
| entry, | ||
| outDir, | ||
| includeFiles, | ||
| excludeFiles, | ||
| logger, | ||
| }: { | ||
| entry: URL; | ||
| outDir: URL; | ||
| includeFiles: URL[]; | ||
| excludeFiles: URL[]; | ||
| logger: AstroIntegrationLogger; | ||
| }, | ||
| // we want to pass the caching by reference, and not by value | ||
| cache: object | ||
| ): Promise<{ handler: string }> { | ||
| const entryPath = fileURLToPath(entry); | ||
| logger.info(`Bundling function ${relative(fileURLToPath(outDir), entryPath)}`); | ||
|
|
||
| // Get root of folder of the system (like C:\ on Windows or / on Linux) | ||
| let base = entry; | ||
| while (fileURLToPath(base) !== fileURLToPath(new URL('../', base))) { | ||
| base = new URL('../', base); | ||
| } | ||
|
|
||
| // The Vite bundle includes an import to `@vercel/nft` for some reason, | ||
| // and that trips up `@vercel/nft` itself during the adapter build. Using a | ||
| // dynamic import helps prevent the issue. | ||
| // TODO: investigate why | ||
| const { nodeFileTrace } = await import('@vercel/nft'); | ||
| const result = await nodeFileTrace([entryPath], { | ||
| base: fileURLToPath(base), | ||
| // If you have a route of /dev this appears in source and NFT will try to | ||
| // scan your local /dev :8 | ||
| ignore: ['/dev/**'], | ||
| cache, | ||
| }); | ||
|
|
||
| for (const error of result.warnings) { | ||
| if (error.message.startsWith('Failed to resolve dependency')) { | ||
| const [, module, file] = | ||
| /Cannot find module '(.+?)' loaded from (.+)/.exec(error.message) || []; | ||
|
|
||
| // The import(astroRemark) sometimes fails to resolve, but it's not a problem | ||
| if (module === '@astrojs/') continue; | ||
|
|
||
| // Sharp is always external and won't be able to be resolved, but that's also not a problem | ||
| if (module === 'sharp') continue; | ||
|
|
||
| if (entryPath === file) { | ||
| logger.debug( | ||
| `The module "${module}" couldn't be resolved. This may not be a problem, but it's worth checking.` | ||
| ); | ||
| } else { | ||
| logger.debug( | ||
| `The module "${module}" inside the file "${file}" couldn't be resolved. This may not be a problem, but it's worth checking.` | ||
| ); | ||
| } | ||
| } | ||
| // parse errors are likely not js and can safely be ignored, | ||
| // such as this html file in "main" meant for nw instead of node: | ||
| // https://github.com/vercel/nft/issues/311 | ||
| else if (!error.message.startsWith('Failed to parse')) { | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| const commonAncestor = await copyFilesToFolder( | ||
| [...result.fileList].map((file) => new URL(file, base)).concat(includeFiles), | ||
| outDir, | ||
| excludeFiles | ||
| ); | ||
|
|
||
| return { | ||
| // serverEntry location inside the outDir, converted to posix | ||
| handler: relative(commonAncestor, entryPath).split(sep).join(posix.sep), | ||
| }; | ||
| } |
This file contains 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
Oops, something went wrong.