Skip to content

Commit 59854ea

Browse files
authored
2026.1 upstream (#3342)
Add binary and merge strategy for frontend build files.
1 parent e09449d commit 59854ea

751 files changed

Lines changed: 995 additions & 991 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# Mark as generated files
44
/public/build/** linguist-generated=true linguist-vendored=true
55

6+
# Mark as binary to prevent merge conflicts and ensure they are always replaced with the version from the branch being merged in
7+
/public/build/** binary
8+
/public/build/** merge=ours
9+
610
# Exclude build/test files from archive to reduce ZIP size for composer dist download
711
/.github export-ignore
812
/tests export-ignore

public/build/5f4d7011-d2e3-491e-b01a-58c7815127c0/entrypoints.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

public/build/5f4d7011-d2e3-491e-b01a-58c7815127c0/manifest.json

Lines changed: 0 additions & 33 deletions
This file was deleted.

public/build/62003f42-c549-4633-a5ff-1b416e06d0ec/entrypoints.json

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/99ad8f38-bb61-49bd-8c21-6900af2bc40c/exposeRemote.js renamed to public/build/62003f42-c549-4633-a5ff-1b416e06d0ec/exposeRemote.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/99ad8f38-bb61-49bd-8c21-6900af2bc40c/index.html renamed to public/build/62003f42-c549-4633-a5ff-1b416e06d0ec/index.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/62003f42-c549-4633-a5ff-1b416e06d0ec/manifest.json

Lines changed: 811 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/99ad8f38-bb61-49bd-8c21-6900af2bc40c/mf-manifest.json renamed to public/build/62003f42-c549-4633-a5ff-1b416e06d0ec/mf-manifest.json

Lines changed: 43 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)