mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-11 00:23:53 +00:00
chore(deps): update all non-major dependencies (main) (#27767)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Roe <daniel@roe.dev>
This commit is contained in:
parent
57b7cf5123
commit
0973f23b6f
@ -148,17 +148,6 @@ export default createConfigForNuxt({
|
||||
],
|
||||
},
|
||||
],
|
||||
'import/order': [
|
||||
'error',
|
||||
{
|
||||
pathGroups: [
|
||||
{
|
||||
group: 'external',
|
||||
pattern: '#vue-router',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
'jsdoc/check-tag-names': [
|
||||
'error',
|
||||
{
|
||||
|
12
package.json
12
package.json
@ -43,7 +43,7 @@
|
||||
"nuxt": "workspace:*",
|
||||
"rollup": "^4.18.0",
|
||||
"vite": "5.3.1",
|
||||
"vue": "3.4.29"
|
||||
"vue": "3.4.30"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.5.0",
|
||||
@ -53,7 +53,7 @@
|
||||
"@nuxt/webpack-builder": "workspace:*",
|
||||
"@testing-library/vue": "8.1.0",
|
||||
"@types/eslint__js": "8.42.3",
|
||||
"@types/node": "20.14.7",
|
||||
"@types/node": "20.14.8",
|
||||
"@types/semver": "7.5.8",
|
||||
"@unhead/schema": "1.9.14",
|
||||
"@vitejs/plugin-vue": "5.0.4",
|
||||
@ -67,7 +67,7 @@
|
||||
"eslint-plugin-no-only-tests": "3.1.0",
|
||||
"eslint-plugin-perfectionist": "2.11.0",
|
||||
"eslint-typegen": "0.2.4",
|
||||
"execa": "9.2.0",
|
||||
"execa": "9.3.0",
|
||||
"globby": "14.0.1",
|
||||
"h3": "1.12.0",
|
||||
"happy-dom": "14.12.3",
|
||||
@ -87,9 +87,9 @@
|
||||
"ufo": "1.5.3",
|
||||
"vitest": "1.6.0",
|
||||
"vitest-environment-nuxt": "1.0.0",
|
||||
"vue": "3.4.29",
|
||||
"vue-router": "4.3.3",
|
||||
"vue-tsc": "2.0.21"
|
||||
"vue": "3.4.30",
|
||||
"vue-router": "4.4.0",
|
||||
"vue-tsc": "2.0.22"
|
||||
},
|
||||
"packageManager": "pnpm@9.4.0",
|
||||
"engines": {
|
||||
|
@ -60,7 +60,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@nuxt/devalue": "^2.0.2",
|
||||
"@nuxt/devtools": "^1.3.3",
|
||||
"@nuxt/devtools": "^1.3.6",
|
||||
"@nuxt/kit": "workspace:*",
|
||||
"@nuxt/schema": "workspace:*",
|
||||
"@nuxt/telemetry": "^2.5.4",
|
||||
@ -68,7 +68,7 @@
|
||||
"@unhead/dom": "^1.9.14",
|
||||
"@unhead/ssr": "^1.9.14",
|
||||
"@unhead/vue": "^1.9.14",
|
||||
"@vue/shared": "^3.4.29",
|
||||
"@vue/shared": "^3.4.30",
|
||||
"acorn": "8.12.0",
|
||||
"c12": "^1.11.1",
|
||||
"chokidar": "^3.6.0",
|
||||
@ -108,13 +108,13 @@
|
||||
"unenv": "^1.9.0",
|
||||
"unimport": "^3.7.2",
|
||||
"unplugin": "^1.10.1",
|
||||
"unplugin-vue-router": "^0.7.0",
|
||||
"unplugin-vue-router": "^0.10.0",
|
||||
"unstorage": "^1.10.2",
|
||||
"untyped": "^1.4.2",
|
||||
"vue": "^3.4.29",
|
||||
"vue": "^3.4.30",
|
||||
"vue-bundle-renderer": "^2.1.0",
|
||||
"vue-devtools-stub": "^0.1.0",
|
||||
"vue-router": "^4.3.3"
|
||||
"vue-router": "^4.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt/scripts": "0.5.1",
|
||||
@ -122,7 +122,7 @@
|
||||
"@parcel/watcher": "2.4.1",
|
||||
"@types/estree": "1.0.5",
|
||||
"@vitejs/plugin-vue": "5.0.4",
|
||||
"@vue/compiler-sfc": "3.4.29",
|
||||
"@vue/compiler-sfc": "3.4.30",
|
||||
"unbuild": "latest",
|
||||
"vite": "5.3.1",
|
||||
"vitest": "1.6.0"
|
||||
|
@ -7,7 +7,7 @@ import type {
|
||||
VNodeProps,
|
||||
} from 'vue'
|
||||
import { computed, defineComponent, h, inject, onBeforeUnmount, onMounted, provide, ref, resolveComponent } from 'vue'
|
||||
import type { RouteLocation, RouteLocationRaw, Router, RouterLink, RouterLinkProps, useLink } from '#vue-router'
|
||||
import type { RouteLocation, RouteLocationRaw, Router, RouterLink, RouterLinkProps, useLink } from 'vue-router'
|
||||
import { hasProtocol, joinURL, parseQuery, withTrailingSlash, withoutTrailingSlash } from 'ufo'
|
||||
import { preloadRouteComponents } from '../composables/preload'
|
||||
import { onNuxtReady } from '../composables/ready'
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { defineComponent, h, nextTick, onMounted, provide, shallowReactive } from 'vue'
|
||||
import type { Ref, VNode } from 'vue'
|
||||
import type { RouteLocation, RouteLocationNormalizedLoaded } from '#vue-router'
|
||||
import type { RouteLocationNormalizedLoaded } from 'vue-router'
|
||||
import { PageRouteSymbol } from './injections'
|
||||
|
||||
export const RouteProvider = defineComponent({
|
||||
@ -23,7 +23,7 @@ export const RouteProvider = defineComponent({
|
||||
const previousRoute = props.route
|
||||
|
||||
// Provide a reactive route within the page
|
||||
const route = {} as RouteLocation
|
||||
const route = {} as RouteLocationNormalizedLoaded
|
||||
for (const key in props.route) {
|
||||
Object.defineProperty(route, key, {
|
||||
get: () => previousKey === props.renderKey ? props.route[key as keyof RouteLocationNormalizedLoaded] : previousRoute[key as keyof RouteLocationNormalizedLoaded],
|
||||
|
@ -2,7 +2,7 @@ import { h } from 'vue'
|
||||
import type { Component, RendererNode } from 'vue'
|
||||
// eslint-disable-next-line
|
||||
import { isString, isPromise, isArray, isObject } from '@vue/shared'
|
||||
import type { RouteLocationNormalized } from '#vue-router'
|
||||
import type { RouteLocationNormalized } from 'vue-router'
|
||||
// @ts-expect-error virtual file
|
||||
import { START_LOCATION } from '#build/pages'
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import type { Component } from 'vue'
|
||||
import type { RouteLocationRaw, Router } from '#vue-router'
|
||||
import type { RouteLocationRaw, Router } from 'vue-router'
|
||||
import { useNuxtApp } from '../nuxt'
|
||||
import { toArray } from '../utils'
|
||||
import { useRouter } from './router'
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { getCurrentInstance, hasInjectionContext, inject, onScopeDispose } from 'vue'
|
||||
import type { Ref } from 'vue'
|
||||
import type { NavigationFailure, NavigationGuard, RouteLocationNormalized, RouteLocationRaw, Router, useRoute as _useRoute, useRouter as _useRouter } from '#vue-router'
|
||||
import type { NavigationFailure, NavigationGuard, RouteLocationNormalized, RouteLocationRaw, Router, useRoute as _useRoute, useRouter as _useRouter } from 'vue-router'
|
||||
import { sanitizeStatusCode } from 'h3'
|
||||
import { hasProtocol, isScriptProtocol, joinURL, withQuery } from 'ufo'
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { effectScope, getCurrentInstance, getCurrentScope, hasInjectionContext, reactive, shallowReactive } from 'vue'
|
||||
import type { App, EffectScope, Ref, VNode, onErrorCaptured } from 'vue'
|
||||
import type { RouteLocationNormalizedLoaded } from '#vue-router'
|
||||
import type { RouteLocationNormalizedLoaded } from 'vue-router'
|
||||
import type { HookCallback, Hookable } from 'hookable'
|
||||
import { createHooks } from 'hookable'
|
||||
import { getContext } from 'unctx'
|
||||
|
@ -226,6 +226,7 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>({
|
||||
})
|
||||
}
|
||||
|
||||
// @ts-expect-error vue-router types diverge from our Route type above
|
||||
nuxtApp._route = route
|
||||
|
||||
// Handle middleware
|
||||
|
@ -358,7 +358,7 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
|
||||
await nuxt.callHook('nitro:config', nitroConfig)
|
||||
|
||||
// TODO: extract to shared utility?
|
||||
const excludedAlias = [/^@vue\/.*$/, '#imports', '#vue-router', 'vue-demi', /^#app/]
|
||||
const excludedAlias = [/^@vue\/.*$/, '#imports', 'vue-demi', /^#app/]
|
||||
const basePath = nitroConfig.typescript!.tsConfig!.compilerOptions?.baseUrl ? resolve(nuxt.options.buildDir, nitroConfig.typescript!.tsConfig!.compilerOptions?.baseUrl) : nuxt.options.buildDir
|
||||
const aliases = nitroConfig.alias!
|
||||
const tsConfig = nitroConfig.typescript!.tsConfig!
|
||||
|
@ -105,14 +105,6 @@ export default defineNuxtModule({
|
||||
}
|
||||
})
|
||||
|
||||
// adds support for #vue-router alias (used for types) with and without pages integration
|
||||
addTypeTemplate({
|
||||
filename: 'vue-router-stub.d.ts',
|
||||
getContents: () => `export * from '${useExperimentalTypedPages ? 'vue-router/auto' : 'vue-router'}'`,
|
||||
})
|
||||
|
||||
nuxt.options.alias['#vue-router'] = join(nuxt.options.buildDir, 'vue-router-stub')
|
||||
|
||||
if (!nuxt.options.pages) {
|
||||
addPlugin(resolve(distDir, 'app/plugins/router'))
|
||||
addTemplate({
|
||||
@ -141,12 +133,6 @@ export default defineNuxtModule({
|
||||
return
|
||||
}
|
||||
|
||||
addTemplate({
|
||||
filename: 'vue-router-stub.mjs',
|
||||
// TODO: use `vue-router/auto` when we have support for page metadata
|
||||
getContents: () => 'export * from \'vue-router\';',
|
||||
})
|
||||
|
||||
if (useExperimentalTypedPages) {
|
||||
const declarationFile = './types/typed-router.d.ts'
|
||||
|
||||
@ -189,6 +175,7 @@ export default defineNuxtModule({
|
||||
nuxt.hook('prepare:types', ({ references }) => {
|
||||
// This file will be generated by unplugin-vue-router
|
||||
references.push({ path: declarationFile })
|
||||
references.push({ types: 'unplugin-vue-router/client' })
|
||||
})
|
||||
|
||||
const context = createRoutesContext(resolveOptions(options))
|
||||
@ -215,15 +202,7 @@ export default defineNuxtModule({
|
||||
|
||||
// Add $router types
|
||||
nuxt.hook('prepare:types', ({ references }) => {
|
||||
references.push({ types: useExperimentalTypedPages ? 'vue-router/auto' : 'vue-router' })
|
||||
})
|
||||
|
||||
// Add vue-router route guard imports
|
||||
nuxt.hook('imports:sources', (sources) => {
|
||||
const routerImports = sources.find(s => s.from === '#app/composables/router' && s.imports.includes('onBeforeRouteLeave'))
|
||||
if (routerImports) {
|
||||
routerImports.from = '#vue-router'
|
||||
}
|
||||
references.push({ types: useExperimentalTypedPages ? 'vue-router/auto-routes' : 'vue-router' })
|
||||
})
|
||||
|
||||
// Regenerate templates when adding or removing pages
|
||||
@ -278,7 +257,7 @@ export default defineNuxtModule({
|
||||
nuxt.hook('imports:extend', (imports) => {
|
||||
imports.push(
|
||||
{ name: 'definePageMeta', as: 'definePageMeta', from: resolve(runtimeDir, 'composables') },
|
||||
{ name: 'useLink', as: 'useLink', from: '#vue-router' },
|
||||
{ name: 'useLink', as: 'useLink', from: 'vue-router' },
|
||||
)
|
||||
if (nuxt.options.experimental.inlineRouteRules) {
|
||||
imports.push({ name: 'defineRouteRules', as: 'defineRouteRules', from: resolve(runtimeDir, 'composables') })
|
||||
|
@ -1,6 +1,6 @@
|
||||
import type { KeepAliveProps, TransitionProps, UnwrapRef } from 'vue'
|
||||
import { getCurrentInstance } from 'vue'
|
||||
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouteRecordRedirectOption } from '#vue-router'
|
||||
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouteRecordRedirectOption } from 'vue-router'
|
||||
import { useRoute } from 'vue-router'
|
||||
import type { NitroRouteConfig } from 'nitropack'
|
||||
import { useNuxtApp } from '#app/nuxt'
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { Fragment, Suspense, Transition, defineComponent, h, inject, nextTick, ref, watch } from 'vue'
|
||||
import type { KeepAliveProps, TransitionProps, VNode } from 'vue'
|
||||
import { RouterView } from '#vue-router'
|
||||
import { RouterView } from 'vue-router'
|
||||
import { defu } from 'defu'
|
||||
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from '#vue-router'
|
||||
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from 'vue-router'
|
||||
|
||||
import { generateRouteKey, toArray, wrapInKeepAlive } from './utils'
|
||||
import type { RouterViewSlotProps } from './utils'
|
||||
|
@ -1,13 +1,7 @@
|
||||
import { isReadonly, reactive, shallowReactive, shallowRef } from 'vue'
|
||||
import type { Ref } from 'vue'
|
||||
import type { RouteLocation, Router, RouterScrollBehavior } from '#vue-router'
|
||||
import {
|
||||
START_LOCATION,
|
||||
createMemoryHistory,
|
||||
createRouter,
|
||||
createWebHashHistory,
|
||||
createWebHistory,
|
||||
} from '#vue-router'
|
||||
import type { RouteLocation, RouteLocationNormalizedLoaded, Router, RouterScrollBehavior } from 'vue-router'
|
||||
import { START_LOCATION, createMemoryHistory, createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
|
||||
import { createError } from 'h3'
|
||||
import { isEqual, withoutBase } from 'ufo'
|
||||
|
||||
@ -124,7 +118,7 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
|
||||
})
|
||||
|
||||
// https://github.com/vuejs/router/blob/main/packages/router/src/router.ts#L1225-L1233
|
||||
const route = {} as RouteLocation
|
||||
const route = {} as RouteLocationNormalizedLoaded
|
||||
for (const key in _route.value) {
|
||||
Object.defineProperty(route, key, {
|
||||
get: () => _route.value[key as keyof RouteLocation],
|
||||
|
@ -1,4 +1,4 @@
|
||||
import type { RouteLocationNormalized, RouterScrollBehavior } from '#vue-router'
|
||||
import type { RouteLocationNormalized, RouterScrollBehavior } from 'vue-router'
|
||||
import type { RouterConfig } from 'nuxt/schema'
|
||||
import { useNuxtApp } from '#app/nuxt'
|
||||
import { isChangingPage } from '#app/components/utils'
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { KeepAlive, h } from 'vue'
|
||||
import type { RouteLocationMatched, RouteLocationNormalizedLoaded, RouterView } from '#vue-router'
|
||||
import type { RouteLocationMatched, RouteLocationNormalizedLoaded, RouterView } from 'vue-router'
|
||||
|
||||
type InstanceOf<T> = T extends new (...args: any[]) => infer R ? R : never
|
||||
type RouterViewSlot = Exclude<InstanceOf<typeof RouterView>['$slots']['default'], undefined>
|
||||
|
@ -42,9 +42,9 @@
|
||||
"@unhead/schema": "1.9.14",
|
||||
"@vitejs/plugin-vue": "5.0.4",
|
||||
"@vitejs/plugin-vue-jsx": "4.0.0",
|
||||
"@vue/compiler-core": "3.4.29",
|
||||
"@vue/compiler-sfc": "3.4.29",
|
||||
"@vue/language-core": "2.0.21",
|
||||
"@vue/compiler-core": "3.4.30",
|
||||
"@vue/compiler-sfc": "3.4.30",
|
||||
"@vue/language-core": "2.0.22",
|
||||
"c12": "1.11.1",
|
||||
"esbuild-loader": "4.2.0",
|
||||
"h3": "1.12.0",
|
||||
@ -55,10 +55,10 @@
|
||||
"unctx": "2.3.1",
|
||||
"unenv": "1.9.0",
|
||||
"vite": "5.3.1",
|
||||
"vue": "3.4.29",
|
||||
"vue": "3.4.30",
|
||||
"vue-bundle-renderer": "2.1.0",
|
||||
"vue-loader": "17.4.2",
|
||||
"vue-router": "4.3.3",
|
||||
"vue-router": "4.4.0",
|
||||
"webpack": "5.92.1",
|
||||
"webpack-dev-middleware": "7.2.1"
|
||||
},
|
||||
|
@ -47,7 +47,8 @@ export default defineUntypedSchema({
|
||||
'@vue/compiler-sfc',
|
||||
'@vue/runtime-dom',
|
||||
'vue-router',
|
||||
'vue-router/auto',
|
||||
'vue-router/auto-routes',
|
||||
'unplugin-vue-router/client',
|
||||
'@nuxt/schema',
|
||||
'nuxt',
|
||||
]
|
||||
|
@ -22,7 +22,7 @@
|
||||
"@types/html-minifier": "4.0.5",
|
||||
"@unocss/reset": "0.61.0",
|
||||
"critters": "0.0.22",
|
||||
"execa": "9.2.0",
|
||||
"execa": "9.3.0",
|
||||
"globby": "14.0.1",
|
||||
"html-minifier": "4.0.0",
|
||||
"jiti": "1.21.6",
|
||||
|
@ -29,7 +29,7 @@
|
||||
"@types/estree": "1.0.5",
|
||||
"rollup": "4.18.0",
|
||||
"unbuild": "latest",
|
||||
"vue": "3.4.29"
|
||||
"vue": "3.4.30"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nuxt/kit": "workspace:*",
|
||||
|
@ -76,7 +76,7 @@
|
||||
"@types/webpack-bundle-analyzer": "4.7.0",
|
||||
"@types/webpack-hot-middleware": "2.25.9",
|
||||
"unbuild": "latest",
|
||||
"vue": "3.4.29"
|
||||
"vue": "3.4.30"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vue": "^3.3.4"
|
||||
|
1048
pnpm-lock.yaml
1048
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
@ -20,12 +20,6 @@
|
||||
"^@vitest/"
|
||||
]
|
||||
},
|
||||
{
|
||||
"groupName": "unplugin-vue-router",
|
||||
"matchPackageNames": [
|
||||
"unplugin-vue-router"
|
||||
]
|
||||
},
|
||||
{
|
||||
"matchBaseBranches": [
|
||||
"main"
|
||||
|
@ -35,7 +35,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM
|
||||
expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot(`"210k"`)
|
||||
|
||||
const modules = await analyzeSizes('node_modules/**/*', serverDir)
|
||||
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"1340k"`)
|
||||
expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot(`"1341k"`)
|
||||
|
||||
const packages = modules.files
|
||||
.filter(m => m.endsWith('package.json'))
|
||||
|
2
test/fixtures/basic-types/package.json
vendored
2
test/fixtures/basic-types/package.json
vendored
@ -10,7 +10,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"ofetch": "latest",
|
||||
"unplugin-vue-router": "^0.7.0",
|
||||
"unplugin-vue-router": "^0.10.0",
|
||||
"vitest": "1.6.0",
|
||||
"vue": "latest",
|
||||
"vue-router": "latest"
|
||||
|
2
test/fixtures/basic-types/types.ts
vendored
2
test/fixtures/basic-types/types.ts
vendored
@ -1,7 +1,7 @@
|
||||
import { describe, expectTypeOf, it } from 'vitest'
|
||||
import type { Ref, SlotsType } from 'vue'
|
||||
import type { FetchError } from 'ofetch'
|
||||
import type { NavigationFailure, RouteLocationNormalized, RouteLocationRaw, Router, useRouter as vueUseRouter } from '#vue-router'
|
||||
import type { NavigationFailure, RouteLocationNormalized, RouteLocationRaw, Router, useRouter as vueUseRouter } from 'vue-router'
|
||||
|
||||
import type { AppConfig, RuntimeValue, UpperSnakeCase } from 'nuxt/schema'
|
||||
import { defineNuxtModule } from 'nuxt/kit'
|
||||
|
@ -40,9 +40,6 @@
|
||||
],
|
||||
"#internal/nitro/utils": [
|
||||
"./node_modules/nitropack/dist/runtime/utils"
|
||||
],
|
||||
"#vue-router": [
|
||||
"./node_modules/vue-router"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user