feat: expose entryFilename #1472

Skn0tt · 2023-06-23T07:41:51Z

🎉 Thanks for submitting a pull request! 🎉

Summary

As proposed by @eduardoboucas in netlify/cli#5804 (comment), this PR exposes the entryFilename for usage from the CLI.

For us to review and ship your PR efficiently, please perform the following steps:

Open a bug/issue before writing your code 🧑‍💻.
This ensures we can discuss the changes and get feedback from everyone that should be involved. If you`re fixing
a typo or something that`s on fire 🔥 (e.g. incident related), you can skip this step.
Read the contribution guidelines 📖. This ensures your code follows our style guide and
passes our tests.
Update or add tests (if any source code was changed or added) 🧪
Update or add documentation (if features were changed or added) 📝
Make sure the status checks below are successful ✅

A picture of a cute animal (not mandatory, but encouraged)

github-actions · 2023-06-23T07:43:58Z

⏱ Benchmark results

Comparing with c079d56

largeDepsEsbuild: 2.4s

⬇️ 22.81% decrease vs. c079d56

^                                                                                   3.6s                  
│                                                                                   ┌──┐                  
│                                                                           3.2s    |  |                  
│                            3s                                             ┌──┐    |  |     3s           
│                           ┌──┐    2.8s                                    |  |    |  |    ┌──┐          
│ ──────────────────────────┼──┼────┌──┐────2.7s────────────────────2.6s────┼──┼────┼──┼────┼──┼──────────
│   2.6s    2.6s    2.5s    |  |    |  |    ┌──┐    2.4s    2.5s    ┌──┐    |  |    |  |    |  |    2.4s  
│   ┌──┐    ┌──┐    ┌──┐    |  |    |  |    |  |    ┌──┐    ┌──┐    |  |    |  |    |  |    |  |    ┌──┐  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
└───┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴──>
    T-12    T-11    T-10    T-9     T-8     T-7     T-6     T-5     T-4     T-3     T-2     T-1      T

Legend

T-30 (94eb5e6): 2s
T-29 (5a982c9): 2.2s
T-28 (8755797): 2.6s
T-27 (2c31885): 2.6s
T-26 (271729d): 2.2s
T-25 (e34c7f7): 2.7s
T-24 (208671c): 2.1s
T-23 (909a22a): 2.9s
T-22 (881a185): 2.2s
T-21 (9036fc4): 2.5s
T-20 (d4393a8): 2.9s
T-19 (3212f41): 2.4s
T-18 (f303673): 2s
T-17 (4b53ea3): 2.7s
T-16 (2a674c3): 2s
T-15 (2c98796): 2.9s
T-14 (d15f50b): 2.6s
T-13 (cf43a33): 3.5s
T-12 (5c85398): 2.6s
T-11 (16e49d9): 2.6s
T-10 (47c0b97): 2.5s
T-9 (418a420): 3s
T-8 (bae1ee5): 2.8s
T-7 (a46048e): 2.7s
T-6 (ab24af6): 2.4s
T-5 (9012259): 2.5s
T-4 (419b090): 2.6s
T-3 (8ace0a8): 3.2s
T-2 (b615fbb): 3.6s
T-1 (c079d56): 3s
T (current commit): 2.4s

largeDepsNft: 7.8s

⬇️ 22.65% decrease vs. c079d56

^                                                                                  11.7s                  
│                                                                                   ┌──┐                  
│                                                                          10.6s    |  |                  
│                                                                           ┌──┐    |  |                  
│                           9.6s                                            |  |    |  |    9.5s          
│                           ┌──┐    8.8s    8.9s                            |  |    |  |    ┌──┐          
│ ───8s─────8.1s────8.1s────┼──┼────┌──┐────┌──┐────────────────────8.4s────┼──┼────┼──┼────┼──┼──────────
│   ┌──┐    ┌──┐    ┌──┐    |  |    |  |    |  |    7.7s    7.6s    ┌──┐    |  |    |  |    |  |    7.8s  
│   |  |    |  |    |  |    |  |    |  |    |  |    ┌──┐    ┌──┐    |  |    |  |    |  |    |  |    ┌──┐  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
└───┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴──>
    T-12    T-11    T-10    T-9     T-8     T-7     T-6     T-5     T-4     T-3     T-2     T-1      T

Legend

T-30 (94eb5e6): 6.9s
T-29 (5a982c9): 7.6s
T-28 (8755797): 9s
T-27 (2c31885): 9.1s
T-26 (271729d): 7.8s
T-25 (e34c7f7): 10.6s
T-24 (208671c): 7.3s
T-23 (909a22a): 11s
T-22 (881a185): 8.2s
T-21 (9036fc4): 9.2s
T-20 (d4393a8): 10.9s
T-19 (3212f41): 8.7s
T-18 (f303673): 7.1s
T-17 (4b53ea3): 10s
T-16 (2a674c3): 6.9s
T-15 (2c98796): 10.6s
T-14 (d15f50b): 8.1s
T-13 (cf43a33): 12.1s
T-12 (5c85398): 8s
T-11 (16e49d9): 8.1s
T-10 (47c0b97): 8.1s
T-9 (418a420): 9.6s
T-8 (bae1ee5): 8.8s
T-7 (a46048e): 8.9s
T-6 (ab24af6): 7.7s
T-5 (9012259): 7.6s
T-4 (419b090): 8.4s
T-3 (8ace0a8): 10.6s
T-2 (b615fbb): 11.7s
T-1 (c079d56): 9.5s
T (current commit): 7.8s

largeDepsZisi: 14.5s

⬇️ 31.77% decrease vs. c079d56

^                                                                                  22.5s                  
│                                                                                   ┌──┐                  
│                                                                                   |  |                  
│                          18.7s                                           18.8s    |  |   19.1s          
│                           ┌──┐   17.8s                                    ┌──┐    |  |    ┌──┐          
│                           |  |    ┌──┐   16.5s                            |  |    |  |    |  |          
│ ──16s─────16s────16.2s────┼──┼────┼──┼────┌──┐───────────────────15.6s────┼──┼────┼──┼────┼──┼──────────
│   ┌──┐    ┌──┐    ┌──┐    |  |    |  |    |  |   14.8s   14.9s    ┌──┐    |  |    |  |    |  |   14.5s  
│   |  |    |  |    |  |    |  |    |  |    |  |    ┌──┐    ┌──┐    |  |    |  |    |  |    |  |    ┌──┐  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
└───┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴──>
    T-12    T-11    T-10    T-9     T-8     T-7     T-6     T-5     T-4     T-3     T-2     T-1      T

Legend

T-30 (94eb5e6): 13.9s
T-29 (5a982c9): 15s
T-28 (8755797): 17.1s
T-27 (2c31885): 18.7s
T-26 (271729d): 15.4s
T-25 (e34c7f7): 19.8s
T-24 (208671c): 13.9s
T-23 (909a22a): 20.3s
T-22 (881a185): 15.3s
T-21 (9036fc4): 17s
T-20 (d4393a8): 20.4s
T-19 (3212f41): 17.4s
T-18 (f303673): 14.1s
T-17 (4b53ea3): 18.7s
T-16 (2a674c3): 14s
T-15 (2c98796): 20.5s
T-14 (d15f50b): 15.9s
T-13 (cf43a33): 22.5s
T-12 (5c85398): 16s
T-11 (16e49d9): 16s
T-10 (47c0b97): 16.2s
T-9 (418a420): 18.7s
T-8 (bae1ee5): 17.8s
T-7 (a46048e): 16.5s
T-6 (ab24af6): 14.8s
T-5 (9012259): 14.9s
T-4 (419b090): 15.6s
T-3 (8ace0a8): 18.8s
T-2 (b615fbb): 22.5s
T-1 (c079d56): 19.1s
T (current commit): 14.5s

eduardoboucas · 2023-06-23T08:37:00Z

src/runtimes/runtime.ts

@@ -54,6 +54,7 @@ export interface ZipFunctionResult {
  nodeModulesWithDynamicImports?: string[]
  path: string
  runtimeVersion?: string
+  entryFilename?: string


I think we should always be able to populate entryFilename. It should be either ___netlify-entry-point.mjs or <func name>.js. If we always populate it, I think consuming this in the CLI will be easier.

good point. done in 9e25e9a. I'm unsure about the entryFilename for Go and Rust functions - my assumption is that we output an executable binary, so I set entryFilename to "" - that way, join(path, entryFilename) will always point to the right file, independent of runtime.

eduardoboucas

🚀

* feat: expose entryFilename * fix: always populate entryFilename * fix: tests

feat: expose entryFilename

f49d06b

Skn0tt requested a review from eduardoboucas June 23, 2023 07:41

Skn0tt requested a review from a team as a code owner June 23, 2023 07:41

Skn0tt self-assigned this Jun 23, 2023

Skn0tt mentioned this pull request Jun 23, 2023

feat: add support for new functions API netlify/cli#5804

Merged

2 tasks

eduardoboucas reviewed Jun 23, 2023

View reviewed changes

Skn0tt added 2 commits June 23, 2023 11:13

fix: always populate entryFilename

9e25e9a

fix: tests

6901bb2

eduardoboucas approved these changes Jun 23, 2023

View reviewed changes

Skn0tt merged commit 0477b3e into main Jun 23, 2023

Skn0tt deleted the expose-entryfilename branch June 23, 2023 09:37

token-generator-app bot mentioned this pull request Jun 23, 2023

chore(main): release 9.10.0 #1471

Merged

Skn0tt added a commit to netlify/build that referenced this pull request May 21, 2024

feat: expose entryFilename (netlify/zip-it-and-ship-it#1472)

32eaf6f

* feat: expose entryFilename * fix: always populate entryFilename * fix: tests

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: expose entryFilename #1472

feat: expose entryFilename #1472

Skn0tt commented Jun 23, 2023

github-actions bot commented Jun 23, 2023 •

edited

Loading

eduardoboucas Jun 23, 2023

Skn0tt Jun 23, 2023

eduardoboucas left a comment

feat: expose entryFilename #1472

feat: expose entryFilename #1472

Conversation

Skn0tt commented Jun 23, 2023

Summary

github-actions bot commented Jun 23, 2023 • edited Loading

⏱ Benchmark results

largeDepsEsbuild: 2.4s

largeDepsNft: 7.8s

largeDepsZisi: 14.5s

eduardoboucas Jun 23, 2023

Choose a reason for hiding this comment

Skn0tt Jun 23, 2023

Choose a reason for hiding this comment

eduardoboucas left a comment

Choose a reason for hiding this comment

github-actions bot commented Jun 23, 2023 •

edited

Loading