Detect minified umd with leading fn declarations #788
Merged
Conversation
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
|
Added another test case for https://www.npmjs.com/package/@microsoft/teams-js?activeTab=readme Also limiting to first 8 statements to make sure search time is bounded for large modules, since I noticed some performance regressions when I tried the previous version of my fork: https://www.npmjs.com/package/@lewisl9029/esm-cjs-lexer |
ije
approved these changes
Jan 16, 2024
There was a problem hiding this comment.
Thanks @lewisl9029 , this should fix bunch of packages built by webpack! change looks great to me!
packages/esm-cjs-lexer/src/cjs.rs
Outdated
| @@ -1200,7 +1200,7 @@ impl CJSLexer { | |||
| } | |||
|
|
|||
| if webpack_require_props == 2 { | |||
| stmts.iter().skip(first_stmt_index + 1).find(|stmt| match stmt { | |||
| stmts.iter().skip(first_stmt_index + 1).take(8).find(|stmt| match stmt { | |||
|
Upgraded swc crates and bumped the version to 0.10.0, thanks again @lewisl9029 ❤️ |
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.
Hi there! This PR adds a fix for a minified UMD package (ttag) that we didn't handle properly due to the hard-coded indices on statements inside the UMD fn body for detecting webpack's
.dand.rcalls.You can repo by pasting this into the esm.sh playground:
Note that we only see a default export even though the package has a whole bunch of named exports that we should be detecting.
This new implementation now uses some slightly smarter heuristics to determine indices in some places (skipping 1 index only if we detect "use strict"), and searches the entire list of statements until we find one that matches the expected shape in others. I added a few new test cases that fails with the previous implementation and succeeds with the current one.
I wrote this part of the code originally in #689, and tbh it still feels pretty nasty to work with... I'm still not familiar enough with idiomatic rust to know how to make things better yet. Would love to get some tips!