Skip to content

Accept CJS exports pattern baseline diffs#3781

Merged
jakebailey merged 4 commits into
mainfrom
copilot/fix-cjs-exports-pattern
May 12, 2026
Merged

Accept CJS exports pattern baseline diffs#3781
jakebailey merged 4 commits into
mainfrom
copilot/fix-cjs-exports-pattern

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented May 8, 2026

Accepts baseline diffs for CJS declaration emit changes as intentional. Corsa no longer binds nested JS exports, producing a new Nested CommonJS export constructs cannot be serialized for declaration emit error instead.

  • Moved 4 diff files from submoduleTriaged/submoduleAccepted/
  • Updated submoduleAccepted.txt / submoduleTriaged.txt accordingly

Affected baselines

  • compiler/jsExportAssignmentNonMutableLocation.js.diff
  • conformance/commonJSImportClassTypeReference.js.diff
  • conformance/commonJSImportNestedClassTypeReference.js.diff
  • conformance/jsDeclarationsExportDoubleAssignmentInClosure.js.diff

Move diff files from submoduleTriaged/ to submoduleAccepted/ for:
- compiler/jsExportAssignmentNonMutableLocation.js.diff
- conformance/commonJSImportClassTypeReference.js.diff
- conformance/commonJSImportNestedClassTypeReference.js.diff
- conformance/jsDeclarationsExportDoubleAssignmentInClosure.js.diff

These are intentional changes - nested CJS exports are no longer bound,
and there is a new declaration emit error for it.

Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix CJS exports pattern changes in declaration emit Accept CJS exports pattern baseline diffs May 8, 2026
Copilot AI requested a review from RyanCavanaugh May 8, 2026 21:27
@RyanCavanaugh RyanCavanaugh marked this pull request as ready for review May 8, 2026 23:11
Copilot AI review requested due to automatic review settings May 8, 2026 23:11
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the repository’s baseline-tracking metadata to treat several CommonJS (CJS) declaration-emit output diffs as intentionally accepted, reflecting the current Corsa behavior around nested CJS export patterns.

Changes:

  • Moved four baseline .diff files from submoduleTriaged to submoduleAccepted (reference baselines).
  • Updated testdata/submoduleAccepted.txt and testdata/submoduleTriaged.txt to reflect the reclassification.
  • Added the corresponding accepted baseline diff files under testdata/baselines/reference/submoduleAccepted/....
Show a summary per file
File Description
testdata/submoduleTriaged.txt Removes the CJS declaration-emit diffs from the triaged list.
testdata/submoduleAccepted.txt Adds the CJS declaration-emit diffs to the accepted list under issue #3559.
testdata/baselines/reference/submoduleAccepted/compiler/jsExportAssignmentNonMutableLocation.js.diff Adds accepted baseline diff for compiler case related to CJS export assignment pattern.
testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportClassTypeReference.js.diff Adds accepted baseline diff for conformance CJS import/class type reference behavior.
testdata/baselines/reference/submoduleAccepted/conformance/commonJSImportNestedClassTypeReference.js.diff Adds accepted baseline diff for nested CJS import/class type reference behavior.
testdata/baselines/reference/submoduleAccepted/conformance/jsDeclarationsExportDoubleAssignmentInClosure.js.diff Adds accepted baseline diff for JS declarations export double-assignment-in-closure case.

Copilot's findings

  • Files reviewed: 2/6 changed files
  • Comments generated: 0

@RyanCavanaugh RyanCavanaugh added this pull request to the merge queue May 11, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch May 11, 2026
@jakebailey
Copy link
Copy Markdown
Member

Alas, merge conflict

@RyanCavanaugh
Copy link
Copy Markdown
Member

@copilot resolve the merge conflict

Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented May 11, 2026

@copilot resolve the merge conflict

Resolved the merge conflict in submoduleAccepted.txt — kept both the late-bound entries from main and our CJS exports entries.

Copy link
Copy Markdown
Member

@jakebailey jakebailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, it actually solved the conflict

@jakebailey
Copy link
Copy Markdown
Member

And then we immediately caused another one

@RyanCavanaugh
Copy link
Copy Markdown
Member

@copilot resolve the merge conflict

Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented May 12, 2026

@copilot resolve the merge conflict

Resolved — conflict was with the new tslib helper entries from #3777. Kept both sets of entries.

@jakebailey jakebailey enabled auto-merge May 12, 2026 17:50
@jakebailey jakebailey added this pull request to the merge queue May 12, 2026
Merged via the queue into main with commit 6cf85ce May 12, 2026
21 checks passed
@jakebailey jakebailey deleted the copilot/fix-cjs-exports-pattern branch May 12, 2026 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Baselines: CJS exports pattern changes in declaration emit

5 participants