Skip to content

Drop dist source map to avoid rebase conflicts - #279

Merged
minhqdao merged 1 commit into
fortran-lang:developfrom
djkees:fix/drop-dist-sourcemap-271
Oct 8, 2026
Merged

minhqdao merged 1 commit into
fortran-lang:developfrom
djkees:fix/drop-dist-sourcemap-271

Conversation

@djkees

@djkees djkees commented Oct 6, 2026

Copy link
Copy Markdown

Stops committing dist/index.js.map so consecutive PR merges no longer force every other open PR to rebase and rebuild dist/. See #271

  • Remove --source-map from the build script
  • Delete dist/index.js.map and dist/sourcemap-register.js
  • Rebuild dist/index.js (only change: the sourcemap-register require and the sourceMappingURL comment are gone)
  • verify dist needs no change since it diffs whatever dist/ contains
  • Trade-off: crash stack traces point into the bundled dist/index.js instead of the source files; the map can be regenerated from any tag with --source-map
  • Not a full fix: dist/index.js can still conflict when PRs touch nearby code

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@djkees
djkees force-pushed the fix/drop-dist-sourcemap-271 branch from f7534b7 to e230075 Compare October 7, 2026 17:07
@djkees

djkees commented Oct 7, 2026

Copy link
Copy Markdown
Author

Rebased onto develop and force-pushed: Support lfortran 0.67.0 and Upgrade npm packages both rebuilt dist/index.js.map, which this PR deletes, so the PR hit the exact modify/delete conflict described in #271. Rebuilt dist/ after the rebase and it matches.

@minhqdao

minhqdao commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

I think you can rerun the failed job, mark the PR as ready, and then we can merge it. As you mentioned in the description, it won't fully eliminate merge conflicts, but it should remove the conflict that occurred on every rebuild. We can give it a try and see how it goes.

@djkees
djkees marked this pull request as ready for review October 8, 2026 16:40
@djkees

djkees commented Oct 8, 2026

Copy link
Copy Markdown
Author

Marked ready. I don't have rerun permissions here, so could you rerun the failed job? It's ifort / 2021.2 macos-26-intel, which failed on a DNS error reaching registrationcenter-download.intel.com (ENOTFOUND, then ESERVFAIL), unrelated to this change. verify dist passed on the previous run.

@minhqdao
minhqdao merged commit d8419d1 into fortran-lang:develop Oct 8, 2026
1203 of 1204 checks passed
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.

2 participants