Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-22 11:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/nuxt_async_context

Browse Source
This commit is contained in:
Daniel Roe 2025-01-11 21:26:56 +00:00 committed by GitHub
commit 37fd4ab37c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -68,7 +68,6 @@
}, },
"devDependencies": { "devDependencies": {
"@arethetypeswrong/cli": "0.17.2", "@arethetypeswrong/cli": "0.17.2",
"@nuxt/cli": "3.20.0",
"@nuxt/eslint-config": "0.7.5", "@nuxt/eslint-config": "0.7.5",
"@nuxt/kit": "workspace:*", "@nuxt/kit": "workspace:*",
"@nuxt/rspack-builder": "workspace:*", "@nuxt/rspack-builder": "workspace:*",
@ -100,6 +99,7 @@
"markdownlint-cli": "0.43.0", "markdownlint-cli": "0.43.0",
"memfs": "4.17.0", "memfs": "4.17.0",
"nitro": "npm:nitro-nightly@3.0.0-beta-28796231.359af68d", "nitro": "npm:nitro-nightly@3.0.0-beta-28796231.359af68d",
"nuxi": "3.18.2",
"nuxt": "workspace:*", "nuxt": "workspace:*",
"nuxt-content-twoslash": "0.1.2", "nuxt-content-twoslash": "0.1.2",
"ofetch": "1.4.1", "ofetch": "1.4.1",

2
packages/nuxt/src/pages/module.ts
View File

@ -642,7 +642,7 @@ if (import.meta.hot) {
for (const route of routes) { for (const route of routes) {
router.addRoute(route) router.addRoute(route)
} }
router.replace('') router.replace(router.currentRoute.value.fullPath)
} }
if (routes && 'then' in routes) { if (routes && 'then' in routes) {
routes.then(addRoutes) routes.then(addRoutes)

13
pnpm-lock.yaml
View File

@ -44,9 +44,6 @@ importers:
'@arethetypeswrong/cli': '@arethetypeswrong/cli':
specifier: 0.17.2 specifier: 0.17.2
version: 0.17.2 version: 0.17.2
'@nuxt/cli':
specifier: 3.20.0
version: 3.20.0(magicast@0.3.5)
'@nuxt/eslint-config': '@nuxt/eslint-config':
specifier: 0.7.5 specifier: 0.7.5
version: 0.7.5(@vue/compiler-sfc@3.5.13)(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) version: 0.7.5(@vue/compiler-sfc@3.5.13)(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3)
@ -140,6 +137,9 @@ importers:
nitro: nitro:
specifier: npm:nitro-nightly@3.0.0-beta-28796231.359af68d specifier: npm:nitro-nightly@3.0.0-beta-28796231.359af68d
version: nitro-nightly@3.0.0-beta-28796231.359af68d(typescript@5.7.3) version: nitro-nightly@3.0.0-beta-28796231.359af68d(typescript@5.7.3)
nuxi:
specifier: 3.18.2
version: 3.18.2
nuxt: nuxt:
specifier: workspace:* specifier: workspace:*
version: link:packages/nuxt version: link:packages/nuxt
@ -5997,6 +5997,11 @@ packages:
nth-check@2.1.1: nth-check@2.1.1:
resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
nuxi@3.18.2:
resolution: {integrity: sha512-JKpbXJ5suXSBJxPvosw8eqdJOniNs6RUmi91aaRQG4jmKcDCZgbZIPUBBJNdllCIcrE0jQQO40BfFLxnzx8Ipg==}
engines: {node: ^16.10.0 || >=18.0.0}
hasBin: true
nuxt-content-twoslash@0.1.2: nuxt-content-twoslash@0.1.2:
resolution: {integrity: sha512-7vCO04V0uyCXtjh40HgVIVKRReUlXc4efMNMdgDtx3Y7p9mnChRt9eRRD3c8VlDD27pLlkrTTnE2n15bu/SqbQ==} resolution: {integrity: sha512-7vCO04V0uyCXtjh40HgVIVKRReUlXc4efMNMdgDtx3Y7p9mnChRt9eRRD3c8VlDD27pLlkrTTnE2n15bu/SqbQ==}
hasBin: true hasBin: true
@ -14075,6 +14080,8 @@ snapshots:
dependencies: dependencies:
boolbase: 1.0.0 boolbase: 1.0.0
nuxi@3.18.2: {}
nuxt-content-twoslash@0.1.2(@nuxtjs/mdc@0.8.3): nuxt-content-twoslash@0.1.2(@nuxtjs/mdc@0.8.3):
dependencies: dependencies:
'@nuxt/kit': link:packages/kit '@nuxt/kit': link:packages/kit