fix: #851 — Rollup-bundled CJS-inside-ESM no longer triggers ImportExportInScript#882
Merged
Merged
Conversation
… ImportExportInScript When the entry file (or any file in a compilePackages target) has top-level ESM `import`/`export` statements with inlined CJS bodies inside helper IIFEs (the shape Rollup produces for bundled-with-CJS-deps output), the file is unambiguously ESM — skip the CJS wrap regardless of whether `module.exports`-style tokens appear deeper in the source. Closes #851.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
crates/perry/src/commands/compile/cjs_wrap.rs::is_commonjsnow short-circuits to ESM when any top-level (non-indented)import/exportstatement is present, regardless ofmodule.exports/require(tokens deeper in the filecjs_wrap.rscover Rollup hybrid shapes, identifier-continuation guards (exports.foo≠export,importMap≠import),export *, dynamicimport('./x'), and indented-import guardtest-files/test_issue_851_rollup_cjs_in_esm.tscompiles natively (ok-851)Validation
cargo test --release -p perry cjs_wrap: 48 passed, 0 failedImportExportInScript)libperry_jsruntime.a— separate downstream issue)Test plan
cjs_wrap)ok-851ImportExportInScriptCloses #851.