Skip to content

Make it possible to load theme/<themename>/dist - #33694

Merged
skjnldsv merged 2 commits into
masterfrom
fix/load-themedir-dist
Aug 28, 2022
Merged

Make it possible to load theme/<themename>/dist#33694
skjnldsv merged 2 commits into
masterfrom
fix/load-themedir-dist

Conversation

@CarlSchwan

Copy link
Copy Markdown
Member

This fix a regression with the theming api following the change in
webpack bundling introduced in 24

Signed-off-by: Carl Schwan carl@carlschwan.eu

@CarlSchwanCarlSchwan added the 3. to review Waiting for reviews label Aug 25, 2022
@CarlSchwanCarlSchwan self-assigned this Aug 25, 2022

@artongeartonge left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Sounds right

Comment threadlib/private/Template/JSResourceLocator.php Outdated
@CarlSchwan
CarlSchwan marked this pull request as draft August 25, 2022 14:37
@CarlSchwan
CarlSchwanforce-pushed the fix/load-themedir-dist branch from 05375b6 to dc1fa56CompareAugust 26, 2022 11:44
@CarlSchwan
CarlSchwan changed the base branch from stable24 to masterAugust 26, 2022 11:44
@CarlSchwan
CarlSchwanforce-pushed the fix/load-themedir-dist branch from dc1fa56 to a4e865cCompareAugust 26, 2022 11:46
This fix a regression with the theming api following the change in
webpack bundling introduced in 24
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@CarlSchwan
CarlSchwanforce-pushed the fix/load-themedir-dist branch from a4e865c to de168b3CompareAugust 26, 2022 11:46
@CarlSchwan
CarlSchwan marked this pull request as ready for review August 26, 2022 12:00
@CarlSchwan

Copy link
Copy Markdown
MemberAuthor

Tested and this is working fine

@CarlSchwanCarlSchwan added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 26, 2022
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@skjnldsv
skjnldsv merged commit ccbeb0f into masterAug 28, 2022
@skjnldsv
skjnldsv deleted the fix/load-themedir-dist branch August 28, 2022 07:04
@CarlSchwan

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable24 failed. Please do this backport manually.

@blizzzblizzz mentioned this pull request Aug 30, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@CarlSchwan@artonge@skjnldsv