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

feat: render custom offline page in app shell #10360

Merged
merged 4 commits into from Mar 29, 2021
Merged

feat: render custom offline page in app shell #10360

merged 4 commits into from Mar 29, 2021

Conversation

joheriks
Copy link
Contributor

@joheriks joheriks commented Mar 22, 2021 •
edited

Fixes #10160.

@joheriks joheriks added the hilla Issues related to Hilla label Mar 22, 2021
@joheriks joheriks force-pushed the joheriks/10160-remove-offline-stub branch 2 times, most recently from bcff1d2 to 31716bd Compare March 24, 2021 07:49
@joheriks joheriks changed the title Remove offline stub feat!: remove offline stub Mar 24, 2021
@joheriks joheriks force-pushed the joheriks/10160-remove-offline-stub branch from 31716bd to 27ec0b0 Compare March 25, 2021 12:29
@joheriks joheriks changed the title feat!: remove offline stub feat!: render custom offline page in app shell Mar 25, 2021
@joheriks joheriks force-pushed the joheriks/10160-remove-offline-stub branch from 27ec0b0 to 54e05eb Compare March 25, 2021 13:15
feat!: serve offline-stub.html
4843f63 
`/offline-stub.html` returns either user-provided (via @pwa(offlinePath) or the default
generated offline page.
@joheriks joheriks force-pushed the joheriks/10160-remove-offline-stub branch from 54e05eb to 4843f63 Compare March 25, 2021 13:17
@joheriks joheriks marked this pull request as ready for review March 25, 2021 13:17
haijian-vaadin
haijian-vaadin suggested changes Mar 25, 2021
View reviewed changes
Copy link
Contributor

@haijian-vaadin haijian-vaadin left a comment

Choose a reason for hiding this comment

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

Looks good and works fine, great work.
A minor comment could be updated.
What's the breaking change? why use feat! instead of feat?

flow-server/src/main/java/com/vaadin/flow/server/PwaRegistry.java Outdated Show resolved Hide resolved
@joheriks
Copy link
Contributor Author

joheriks commented Mar 25, 2021 •
edited

Looks good and works fine, great work.
A minor comment could be updated.
What's the breaking change? why use feat! instead of feat?

Right, maybe feat is enough (my original line of thought behind was that it's breaking in the sense that offlinePath now has real impact on Fusion applications, whereas previously it was deprecated). Updated the title.

@joheriks joheriks changed the title feat!: render custom offline page in app shell feat: render custom offline page in app shell Mar 25, 2021
haijian-vaadin
haijian-vaadin previously approved these changes Mar 26, 2021
View reviewed changes
platosha
platosha previously approved these changes Mar 29, 2021
View reviewed changes
@haijian-vaadin haijian-vaadin merged commit 119dde7 into master Mar 29, 2021
@haijian-vaadin haijian-vaadin deleted the joheriks/10160-remove-offline-stub branch March 29, 2021 08:15
@vaadin-bot
Copy link
Collaborator

Hi @joheriks , this commit cannot be picked to 6.0 by this bot, can you take a look and pick it manually?

haijian-vaadin added a commit that referenced this pull request Mar 29, 2021
@haijian-vaadin
feat: render custom offline page in app shell (#10360)
3c99a40 
* feat!: serve `offline-stub.html`

`/offline-stub.html` returns either user-provided (via @pwa(offlinePath) or the default
generated offline page.

* Comment fix

* Use relative path ./ instead of resolver.baserUrl

* fix tests

Co-authored-by: haijian <haijian@vaadin.com>
haijian-vaadin added a commit that referenced this pull request Mar 29, 2021
@haijian-vaadin
feat: render custom offline page in app shell (#10360)
682482b 
* feat!: serve `offline-stub.html`

`/offline-stub.html` returns either user-provided (via @pwa(offlinePath) or the default
generated offline page.

* Comment fix

* Use relative path ./ instead of resolver.baserUrl

* fix tests

Co-authored-by: haijian <haijian@vaadin.com>
@haijian-vaadin
Copy link
Contributor

Hi @joheriks , this commit cannot be picked to 6.0 by this bot, can you take a look and pick it manually?

cherry-picked in #10454

haijian-vaadin added a commit that referenced this pull request Mar 30, 2021
@haijian-vaadin
feat: render custom offline page in app shell (#10360)
b2051fd 
* feat!: serve `offline-stub.html`

`/offline-stub.html` returns either user-provided (via @pwa(offlinePath) or the default
generated offline page.

* Comment fix

* Use relative path ./ instead of resolver.baserUrl

* fix tests

Co-authored-by: haijian <haijian@vaadin.com>
@Haprog
Copy link
Contributor

Haprog commented Mar 31, 2021

Agreed in Slack that it's ok to release this as a patch for 6.0.x even though the commit has been marked as feat:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haijian-vaadin haijian-vaadin haijian-vaadin approved these changes

@platosha platosha platosha left review comments

@Lodin Lodin Awaiting requested review from Lodin

@Haprog Haprog Awaiting requested review from Haprog

Assignees
No one assigned
Labels
hilla Issues related to Hilla need to pick manually 6.0 Released with Platform 19.0.3 +0.1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Vaadin 19] Custom offline page is not used when navigating to Java views
5 participants
@joheriks @vaadin-bot @haijian-vaadin @Haprog @platosha