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.

Sign up for GitHub

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

Jump to bottom

Move jquery-minicolors to npm/webpack #12305

Merged
merged 7 commits into from
Jul 29, 2020
Merged

Move jquery-minicolors to npm/webpack #12305

merged 7 commits into from
Jul 29, 2020

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jul 23, 2020 •
edited
Loading

  • Unvendor and add as npm dependency
  • Removed unneeded backend variable
  • Fixed existing bug where picker would previously initialize to the same green color when editing a label.

image

gary-kim
gary-kim suggested changes Jul 23, 2020
View reviewed changes
webpack.config.js Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 23, 2020
gary-kim
gary-kim approved these changes Jul 23, 2020
View reviewed changes
Copy link
Member

@gary-kim gary-kim left a comment

Choose a reason for hiding this comment

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

Would prefer to put publicPath at output.publicPath but that's an issue for another time. 👍

@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 Jul 23, 2020
@silverwind
Copy link
Member Author

I'd prefer to not even set publicPath but I'm not sure how to convince webpack to emit absolute paths starting with a / for css url().

@silverwind
Copy link
Member Author

silverwind commented Jul 23, 2020 •
edited
Loading

Oh and we have to set publicPath at runtime because of STATIC_URL_PREFIX configuration so I don't think we can set it at build time in webpack like output.publicPath would because static assets could always be hosted on a subdirectory/different origin.

That said, webpack will emit / paths if I start outputPath with a slash but that's a wrong URL too in case STATIC_URL_PREFIX is on different origin/path so I think it'll have to stay relative as it is now.

@techknowlogick techknowlogick added type/refactoring Existing code has been cleaned up. There should be no new functionality. topic/ui Change the appearance of the Gitea UI labels Jul 23, 2020
@techknowlogick techknowlogick added this to the 1.13.0 milestone Jul 23, 2020
@silverwind
Move jquery-minicolors to npm/webpack
a2e5c65 
- Unvendor and add as npm dependency
- Removed unneeded backend variable
- Fixed existing bug where picker would previously initizalize to the
  same green color when editing a label.

There was probably a version bump because the previous version was
over 3 years old but it seems to be compatible.
@silverwind
use file-loader
cea9f7f
@silverwind
trailing comma and comment update
7741aa1
@silverwind
misc tweaks
f7e89d1
@silverwind
Copy link
Member Author

Rebased and added screenshot to OP. Ready from my side.

@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 Jul 28, 2020
@techknowlogick
Copy link
Member

🚀

@techknowlogick techknowlogick merged commit 2fd78c1 into go-gitea:master Jul 29, 2020
@silverwind silverwind deleted the minicolors branch July 29, 2020 19:47
@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.
Reviewers

@lafriks lafriks lafriks approved these changes

@gary-kim gary-kim gary-kim approved these changes

Assignees
No one assigned
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/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.13.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@silverwind @techknowlogick @lafriks @gary-kim @GiteaBot