fix(nuxt): load spaLoadingTemplate if file exists
#23048
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
Whoops - thank you ❤️ |
danielroe
reviewed
Sep 6, 2023
davidglezz
force-pushed
the
fix-spaLoadingTemplate
branch
2 times, most recently
from
f2194f7
to
d24fc4e
Compare
Signed-off-by: davidglezz <davidg@empathy.co>
Signed-off-by: davidglezz <davidg@empathy.co>
davidglezz
force-pushed
the
fix-spaLoadingTemplate
branch
from
f9a2904
to
cc24c4d
Compare
Signed-off-by: davidglezz <davidg@empathy.co>
davidglezz
force-pushed
the
fix-spaLoadingTemplate
branch
from
cc24c4d
to
b4b362f
Compare
danielroe
reviewed
Sep 11, 2023
packages/schema/src/config/app.ts
Outdated
| * | ||
| * Some good sources for spinners are [SpinKit](https://github.com/tobiasahlin/SpinKit) or [SVG Spinners](https://icones.js.org/collection/svg-spinners). | ||
| * | ||
| * @example ~/app/spa-loading-template.html | ||
| * ```html | ||
| * <!-- https://github.com/barelyhuman/snips/blob/dev/pages/css-loader.md --> | ||
| * <!-- https://gist.github.com/davidglezz/85a2e6185edbd0873a5a2bdb2ce1cd36 --> |
There was a problem hiding this comment.
I think we should keep the original credit + loader:
Suggested change
| * <!-- https://gist.github.com/davidglezz/85a2e6185edbd0873a5a2bdb2ce1cd36 --> | |
| * <!-- https://github.com/barelyhuman/snips/blob/dev/pages/css-loader.md --> |
danielroe
reviewed
Sep 11, 2023
packages/nuxt/src/core/nitro.ts
Outdated
| @@ -415,3 +402,24 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) { | |||
| function relativeWithDot (from: string, to: string) { | |||
| return relative(from, to).replace(/^([^.])/, './$1') || '.' | |||
| } | |||
|
|
|||
| function spaLoadingTemplate (options: Nuxt['options']) { | |||
There was a problem hiding this comment.
Totally minor point, but let's take nuxt as the argument, for consistency with other code.
danielroe
approved these changes
Sep 11, 2023
|
Thank you for your great work on this PR ❤️ Pushed directly so we can include in today's patch release. |
danielroe
changed the title
spaLoadingTemplate from default location when set to true
danielroe
changed the title
spaLoadingTemplate from default location when set to truespaLoadingTemplate if file exists
Merged
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🔗 Linked issue
resolves #23047
❓ Type of change
📚 Description
The behavior is not the same as documented because was changed in #22798
This PR restores the loading of ~/app/spa-loading-template.html when
spaLoadingTemplateistrue📝 Checklist