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.

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

fix(nuxt,schema): allow showing spa loader til after hydration #29776

Merged
merged 33 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
344940a
fix(nuxt, schema) Keep showing the spa-loading-template until suspens…
RokeAlvo Nov 4, 2024
70cbf80
Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading
danielroe Nov 5, 2024
096b6d6
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 5, 2024
aed5212
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Nov 5, 2024
ffe807b
add experimental.spaPreloaderOutside flag
RokeAlvo Nov 7, 2024
b4a279d
add tests for sapPreloaderOutside
RokeAlvo Nov 7, 2024
872da31
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Nov 7, 2024
45a5a54
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 7, 2024
d2491a0
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Nov 9, 2024
86db10e
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Nov 26, 2024
84d1bcb
perf: tree-shake spa loader handling
danielroe Nov 27, 2024
e1c89be
Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading
danielroe Nov 27, 2024
aa830c5
chore: initialise strings within spa template
danielroe Nov 27, 2024
07cd634
fix: set default `spaPreloaderOutside` when `compatibilityVersion: 4`
danielroe Nov 27, 2024
020f212
refactor: rename to `spaLoadingTemplateLocation`
danielroe Nov 27, 2024
4b5b8ce
docs: add documentation
danielroe Nov 27, 2024
6ca7600
chore: remove default value for `spaLoaderAttrs`
danielroe Nov 27, 2024
df1d397
chore: lint
danielroe Nov 27, 2024
ef927bb
test: use correct test id
danielroe Nov 27, 2024
24a0253
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Nov 29, 2024
f4106a7
chore: add back default id value for spaLoaderAttrs
danielroe Nov 30, 2024
c5f3d53
skip test in dev mode
RokeAlvo Dec 1, 2024
86b6be7
Merge branch 'main' into fix/21721-spa-loading
RokeAlvo Dec 2, 2024
29f0663
Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading
danielroe Dec 9, 2024
a7726ad
test: remove server dir
danielroe Dec 9, 2024
7ac69b6
chore: update workspace name
danielroe Dec 9, 2024
0651291
chore: remove comment
danielroe Dec 9, 2024
2da2115
tetst: remove newline
danielroe Dec 9, 2024
db27a07
fix: global re
danielroe Dec 9, 2024
2f778d2
chore: returns too
danielroe Dec 9, 2024
fcf076d
Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading
danielroe Dec 9, 2024
967c861
chore: add engines
danielroe Dec 9, 2024
b9ae10c
test: update bundle size
danielroe Dec 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into fix/21721-spa-loading
  • Loading branch information
danielroe committed Dec 9, 2024
commit 29f0663f05e20fa52e8d77a904d60dceb8357803
2 changes: 1 addition & 1 deletion packages/nuxt/src/core/runtime/nitro/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { renderSSRHeadOptions } from '#internal/unhead.config.mjs'

import type { NuxtPayload, NuxtSSRContext } from '#app'
// @ts-expect-error virtual file
import { appHead, appId, appRootAttrs, appRootTag, appSpaLoaderAttrs, appSpaLoaderTag, appTeleportAttrs, appTeleportTag, componentIslands, multiApp, spaLoadingTemplateOutside } from '#internal/nuxt.config.mjs'
import { appHead, appId, appRootAttrs, appRootTag, appSpaLoaderAttrs, appSpaLoaderTag, appTeleportAttrs, appTeleportTag, componentIslands, appManifest as isAppManifestEnabled, multiApp, spaLoadingTemplateOutside } from '#internal/nuxt.config.mjs'
// @ts-expect-error virtual file
import { buildAssetsURL, publicAssetsURL } from '#internal/nuxt/paths'

Expand Down
9 changes: 9 additions & 0 deletions packages/schema/src/config/experimental.ts
Original file line number Diff line number Diff line change
Expand Up @@ -428,5 +428,14 @@ export default defineUntypedSchema({
return val ?? (((await get('future') as Record<string, unknown>).compatibilityVersion === 4) ? 'body' : 'within')
},
},

/**
* Enable timings for Nuxt application hooks in the performance panel of Chromium-based browsers.
*
* @see [the Chrome DevTools extensibility API](https://developer.chrome.com/docs/devtools/performance/extension#tracks)
*/
browserDevtoolsTiming: {
$resolve: async (val, get) => val ?? await get('dev'),
},
},
})
You are viewing a condensed version of this merge commit. You can view the full changes here.