Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch fomantic-ui to workaround build issue #11244

Merged
merged 8 commits into from
Apr 30, 2020

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Apr 29, 2020

Better workaround than #10653 for fomantic/Fomantic-UI#1356. It does not seem like we're getting a new Fomantic-UI release anytime soon, so this patches it after node_modules installation. Patch source is from here.

Fixes: #11243
Fixes: #10679

Better workaround than go-gitea#10653
for fomantic/Fomantic-UI#1356. It does not
seem like we're getting a new Fomantic-UI release anytime soon, so
this patches it after node_modules installation.

Fixes: go-gitea#11243
Fixes: go-gitea#10679
@silverwind
Copy link
Member Author

I disabled git line ending normalization on the patch because Fomantic-UI's file has CRLF:

$ file node_modules/fomantic-ui/tasks/build/css.js
node_modules/fomantic-ui/tasks/build/css.js: ASCII text, with CRLF line terminators

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 29, 2020
Makefile Show resolved Hide resolved
@silverwind
Copy link
Member Author

patch-package was giving me some troubles apparently related to the line endings so I changed it to just copy the full patched file in now.

Makefile Outdated Show resolved Hide resolved
Co-Authored-By: Sorien <[email protected]>
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 29, 2020
@techknowlogick techknowlogick added type/bug topic/ui Change the appearance of the Gitea UI labels Apr 29, 2020
@techknowlogick techknowlogick added this to the 1.12.0 milestone Apr 29, 2020
@techknowlogick
Copy link
Member

CI fail is unrelated, I'm restarting the CI task.

web_src/fomantic/css.js Outdated Show resolved Hide resolved
Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

Minor nit re: new line

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 29, 2020
@zeripath
Copy link
Contributor

Make lg-tm work

@zeripath zeripath merged commit 310699b into go-gitea:master Apr 30, 2020
@silverwind silverwind deleted the patch-fomantic branch May 1, 2020 11:39
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
* Patch fomantic-ui to workaround build issue

Better workaround than go-gitea#10653
for fomantic/Fomantic-UI#1356. It does not
seem like we're getting a new Fomantic-UI release anytime soon, so
this patches it after node_modules installation.

Fixes: go-gitea#11243
Fixes: go-gitea#10679

* copy instead of patch

* update package-lock.json

* Update Makefile

Co-Authored-By: Sorien <[email protected]>

* Update web_src/fomantic/css.js

Co-Authored-By: zeripath <[email protected]>

Co-authored-by: Sorien <[email protected]>
Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: guillep2k <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UI loading google fonts for lato Offline mode still trying to load css from googleapis
8 participants