feat: include side files with NFT #1614

eduardoboucas · 2023-10-13T11:46:50Z

Summary

In the legacy zisi bundler , functions defined in a sub-directory had any sibling files recursively added to the bundle., regardless of whether they were statically required by the function or not.

As we try to remove this bundler entirely without breaking existing workflows, this PR ports that behaviour over to NFT, only when the default bundler is used (so that we don't affect functions explicitly opting in to nft).

github-actions · 2023-10-13T11:49:22Z

⏱ Benchmark results

Comparing with 9f3dab8

largeDepsEsbuild: 2.6s

⬇️ 29.04% decrease vs. 9f3dab8

^                   3.6s                                                                                  
│                   ┌──┐                                    3.4s                            3.3s          
│   3.2s            |  |    3.2s                            ┌──┐                            ┌──┐          
│   ┌──┐            |  |    ┌──┐                            |  |                            |  |          
│   |  |            |  |    |  |    2.8s                    |  |                            |  |          
│ ──┼──┼────2.7s────┼──┼────┼──┼────┌──┐────2.7s────2.7s────┼──┼────2.6s────2.7s────────────┼──┼────2.6s──
│   |  |    ┌──┐    |  |    |  |    |  |    ┌──┐    ┌──┐    |  |    ┌──┐    ┌──┐    2.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 (ad2c55d): 2.8s
T-29 (304f7f5): 2.6s
T-28 (45ebfea): 3.1s
T-27 (2070b46): 3.7s
T-26 (5d277e7): 2.7s
T-25 (360f373): 2.4s
T-24 (5c6c14a): 2.7s
T-23 (1ea5222): 2.6s
T-22 (4e2fe8b): 3s
T-21 (25c1ae4): 2.6s
T-20 (90325b2): 2.7s
T-19 (1eccedc): 2.8s
T-18 (c9e5384): 2.6s
T-17 (b40788a): 2.5s
T-16 (6ff4fbe): 3.6s
T-15 (dfe6dd0): 3.2s
T-14 (6b85304): 3.4s
T-13 (cd48552): 2.8s
T-12 (cf77a72): 3.2s
T-11 (722a724): 2.7s
T-10 (9e3af6a): 3.6s
T-9 (7eb97de): 3.2s
T-8 (6be8b42): 2.8s
T-7 (23405c6): 2.7s
T-6 (fffff21): 2.7s
T-5 (d1a18f1): 3.4s
T-4 (591f2a8): 2.6s
T-3 (3c294af): 2.7s
T-2 (dad329b): 2.5s
T-1 (9f3dab8): 3.3s
T (current commit): 2.6s

largeDepsNft: 7.6s

⬇️ 32.26% decrease vs. 9f3dab8

^                  11.6s                                                                                  
│                   ┌──┐                                                                                  
│  10.2s            |  |                                   10.7s                                          
│   ┌──┐            |  |    9.8s                            ┌──┐                            10s           
│   |  |            |  |    ┌──┐                            |  |                            ┌──┐          
│ ──┼──┼────────────┼──┼────┼──┼────8.7s────8.5s────8.4s────┼──┼────8.4s────────────────────┼──┼──────────
│   |  |    8.3s    |  |    |  |    ┌──┐    ┌──┐    ┌──┐    |  |    ┌──┐    8.2s            |  |          
│   |  |    ┌──┐    |  |    |  |    |  |    |  |    |  |    |  |    |  |    ┌──┐    7.8s    |  |    7.6s  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    ┌──┐    |  |    ┌──┐  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
│   |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |  |    |▒▒|  
└───┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴────┴──┴──>
    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 (ad2c55d): 8.3s
T-29 (304f7f5): 8.1s
T-28 (45ebfea): 10.1s
T-27 (2070b46): 12.1s
T-26 (5d277e7): 8.3s
T-25 (360f373): 7.5s
T-24 (5c6c14a): 8s
T-23 (1ea5222): 7.7s
T-22 (4e2fe8b): 9.3s
T-21 (25c1ae4): 7.9s
T-20 (90325b2): 8.4s
T-19 (1eccedc): 8.4s
T-18 (c9e5384): 8.3s
T-17 (b40788a): 7.8s
T-16 (6ff4fbe): 11.8s
T-15 (dfe6dd0): 9.4s
T-14 (6b85304): 10.5s
T-13 (cd48552): 8.5s
T-12 (cf77a72): 10.2s
T-11 (722a724): 8.3s
T-10 (9e3af6a): 11.6s
T-9 (7eb97de): 9.8s
T-8 (6be8b42): 8.7s
T-7 (23405c6): 8.5s
T-6 (fffff21): 8.4s
T-5 (d1a18f1): 10.7s
T-4 (591f2a8): 8.4s
T-3 (3c294af): 8.2s
T-2 (dad329b): 7.8s
T-1 (9f3dab8): 10s
T (current commit): 7.6s

largeDepsZisi: 15.4s

⬇️ 30.27% decrease vs. 9f3dab8

^                  21.8s                                                                                  
│                   ┌──┐                                   20.6s                                          
│  19.9s            |  |   19.4s                            ┌──┐                            20s           
│   ┌──┐            |  |    ┌──┐                            |  |                            ┌──┐          
│   |  |            |  |    |  |                            |  |                            |  |          
│ ──┼──┼───16.2s────┼──┼────┼──┼───16.8s───16.2s───16.5s────┼──┼───16.1s───16.3s────────────┼──┼──────────
│   |  |    ┌──┐    |  |    |  |    ┌──┐    ┌──┐    ┌──┐    |  |    ┌──┐    ┌──┐   15.6s    |  |   15.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 (ad2c55d): 15.9s
T-29 (304f7f5): 15.5s
T-28 (45ebfea): 19.3s
T-27 (2070b46): 22.4s
T-26 (5d277e7): 15.7s
T-25 (360f373): 14.4s
T-24 (5c6c14a): 15.7s
T-23 (1ea5222): 15.1s
T-22 (4e2fe8b): 17.9s
T-21 (25c1ae4): 15.4s
T-20 (90325b2): 16.3s
T-19 (1eccedc): 15.9s
T-18 (c9e5384): 15.7s
T-17 (b40788a): 14.8s
T-16 (6ff4fbe): 21.9s
T-15 (dfe6dd0): 18.3s
T-14 (6b85304): 20.3s
T-13 (cd48552): 16.4s
T-12 (cf77a72): 19.9s
T-11 (722a724): 16.2s
T-10 (9e3af6a): 21.8s
T-9 (7eb97de): 19.4s
T-8 (6be8b42): 16.8s
T-7 (23405c6): 16.2s
T-6 (fffff21): 16.5s
T-5 (d1a18f1): 20.6s
T-4 (591f2a8): 16.1s
T-3 (3c294af): 16.3s
T-2 (dad329b): 15.6s
T-1 (9f3dab8): 20s
T (current commit): 15.4s

Skn0tt

Looks good!

Skn0tt · 2023-10-13T11:52:04Z

tests/fixtures/directory-side-files/function-v1/Desktop.ini

This looks like a remnant from Windows testing

oh it's not, it's junk!

Skn0tt · 2023-10-13T11:55:08Z

src/runtimes/node/bundlers/nft/side_files.ts

+import type { Stats } from 'fs'
+import { basename } from 'path'
+
+import { isJunk } from 'junk'


TIL about junk!

eduardoboucas · 2023-10-13T13:07:18Z

@Skn0tt I pushed a8af287 with a change to the test, ensuring we run for all bundler variants and don't include the side files unless the default bundler is used.

Can you re-approve, please?

* feat: return `jsModuleFormat` property * feat: add bundled paths to `inputs` * feat: force bundler to NFT in V2 functions * chore: fix test * refactor: rename property * feat: add CJS shim * feat: include side files when NFT is the default bundler * chore: remove whitespace * chore: update test

eduardoboucas added 9 commits October 7, 2023 14:33

feat: return jsModuleFormat property

c52807a

feat: add bundled paths to inputs

d1b747c

feat: force bundler to NFT in V2 functions

c0be11c

chore: fix test

dab476c

refactor: rename property

802e351

feat: add CJS shim

4d6cae3

Merge branch 'main' into feat/nft-side-files

c418648

Merge branch 'main' into feat/nft-side-files

d44555a

feat: include side files when NFT is the default bundler

138f24b

eduardoboucas requested a review from a team as a code owner October 13, 2023 11:46

chore: remove whitespace

54858fb

Skn0tt previously approved these changes Oct 13, 2023

View reviewed changes

chore: update test

a8af287

eduardoboucas dismissed Skn0tt’s stale review via a8af287 October 13, 2023 13:05

eduardoboucas requested a review from Skn0tt October 13, 2023 13:06

Skn0tt approved these changes Oct 13, 2023

View reviewed changes

eduardoboucas merged commit bf7a4ac into main Oct 13, 2023

eduardoboucas deleted the feat/nft-side-files branch October 13, 2023 13:10

token-generator-app bot mentioned this pull request Oct 13, 2023

chore(main): release 9.25.0 #1615

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: include side files with NFT #1614

feat: include side files with NFT #1614

eduardoboucas commented Oct 13, 2023

github-actions bot commented Oct 13, 2023 •

edited

Loading

Skn0tt left a comment

Skn0tt Oct 13, 2023

Skn0tt Oct 13, 2023

Skn0tt Oct 13, 2023

eduardoboucas commented Oct 13, 2023

feat: include side files with NFT #1614

feat: include side files with NFT #1614

Conversation

eduardoboucas commented Oct 13, 2023

Summary

github-actions bot commented Oct 13, 2023 • edited Loading

⏱ Benchmark results

largeDepsEsbuild: 2.6s

largeDepsNft: 7.6s

largeDepsZisi: 15.4s

Skn0tt left a comment

Choose a reason for hiding this comment

Skn0tt Oct 13, 2023

Choose a reason for hiding this comment

Skn0tt Oct 13, 2023

Choose a reason for hiding this comment

Skn0tt Oct 13, 2023

Choose a reason for hiding this comment

eduardoboucas commented Oct 13, 2023

github-actions bot commented Oct 13, 2023 •

edited

Loading