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

Fix Dropzone following #15315 #15353

Merged
merged 3 commits into from
Apr 9, 2021
Merged

Fix Dropzone following #15315 #15353

merged 3 commits into from
Apr 9, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 8, 2021

#15315 appears to have caused a change in the way Dropzone is imported - and it
now produces a module rather than the constructor.

This PR rather hackily just adds another Dropzone call to the result.

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
Fix Dropzone following go-gitea#15315
82ddfe1 
go-gitea#15315 appears to have caused a change in the way Dropzone is imported - and it
now produces a module rather than the constructor.

This PR rather hackily just adds another Dropzone call to the result.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added type/bug topic/ui Change the appearance of the Gitea UI issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Apr 8, 2021
@zeripath zeripath added this to the 1.15.0 milestone Apr 8, 2021
@zeripath
Copy link
Contributor Author

zeripath commented Apr 8, 2021

@silverwind - you got any ideas?

(git bisect narrowed it down to #15315 as the causative commit.)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2021
@silverwind
Copy link
Member

Interesting. I would not have thought that webpack suddenly behaves differently in terms of import handling with the type=module change in package.json.

The proper fix would be const [{Dropzone}] above but I need to check closer first.

@silverwind
Copy link
Member

It's so weird. function Dropzone is on .Dropzone and on .default.default of the import return value. Dropzone itself seems to be a pure CJS module. Tribute and ClipboardJS are imported similarily and still work off the default property.

I'll push the proper fix here. It doesn't seem any other imports are affected.

@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 8, 2021
@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 9, 2021
@lunny
Copy link
Member

lunny commented Apr 9, 2021

make L-G-T-M work

@lunny lunny merged commit 7088bcf into go-gitea:master Apr 9, 2021
@zeripath zeripath deleted the fix-dropzone-following-15315 branch April 9, 2021 08:01
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.15.0
Development

Successfully merging this pull request may close these issues.
5 participants
@zeripath @silverwind @lunny @6543 @GiteaBot