Skip to content

Commit

Permalink
chore: upgrade valaxy deps
Browse files Browse the repository at this point in the history
  • Loading branch information
YunYouJun committed Sep 28, 2024
1 parent e183885 commit 7f758b3
Show file tree
Hide file tree
Showing 22 changed files with 3,256 additions and 3,331 deletions.
140 changes: 11 additions & 129 deletions demo/.valaxy/typed-router.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,18 @@
// It's recommended to commit this file.
// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.

/// <reference types="unplugin-vue-router/client" />
declare module 'vue-router/auto-routes' {
import type {
RouteRecordInfo,
ParamValue,
ParamValueOneOrMore,
ParamValueZeroOrMore,
ParamValueZeroOrOne,
} from 'vue-router'

import type {
// type safe route locations
RouteLocationTypedList,
RouteLocationResolvedTypedList,
RouteLocationNormalizedTypedList,
RouteLocationNormalizedLoadedTypedList,
RouteLocationAsString,
RouteLocationAsRelativeTypedList,
RouteLocationAsPathTypedList,

// helper types
// route definitions
RouteRecordInfo,
ParamValue,
ParamValueOneOrMore,
ParamValueZeroOrMore,
ParamValueZeroOrOne,

// vue-router extensions
_RouterTyped,
RouterLinkTyped,
RouterLinkPropsTyped,
NavigationGuard,
UseLinkFnTyped,

// data fetching
_DataLoader,
_DefineLoaderOptions,
} from 'unplugin-vue-router/types'

declare module 'vue-router/auto/routes' {
/**
* Route name map generated by unplugin-vue-router
*/
export interface RouteNamedMap {
'/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
'/[...path]': RouteRecordInfo<'/[...path]', '/:path(.*)', { path: ParamValue<true> }, { path: ParamValue<false> }>,
Expand All @@ -53,100 +32,3 @@ declare module 'vue-router/auto/routes' {
'/tags/': RouteRecordInfo<'/tags/', '/tags', Record<never, never>, Record<never, never>>,
}
}

declare module 'vue-router/auto' {
import type { RouteNamedMap } from 'vue-router/auto/routes'

export type RouterTyped = _RouterTyped<RouteNamedMap>

/**
* Type safe version of `RouteLocationNormalized` (the type of `to` and `from` in navigation guards).
* Allows passing the name of the route to be passed as a generic.
*/
export type RouteLocationNormalized<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedTypedList<RouteNamedMap>[Name]

/**
* Type safe version of `RouteLocationNormalizedLoaded` (the return type of `useRoute()`).
* Allows passing the name of the route to be passed as a generic.
*/
export type RouteLocationNormalizedLoaded<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]

/**
* Type safe version of `RouteLocationResolved` (the returned route of `router.resolve()`).
* Allows passing the name of the route to be passed as a generic.
*/
export type RouteLocationResolved<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationResolvedTypedList<RouteNamedMap>[Name]

/**
* Type safe version of `RouteLocation` . Allows passing the name of the route to be passed as a generic.
*/
export type RouteLocation<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationTypedList<RouteNamedMap>[Name]

/**
* Type safe version of `RouteLocationRaw` . Allows passing the name of the route to be passed as a generic.
*/
export type RouteLocationRaw<Name extends keyof RouteNamedMap = keyof RouteNamedMap> =
| RouteLocationAsString<RouteNamedMap>
| RouteLocationAsRelativeTypedList<RouteNamedMap>[Name]
| RouteLocationAsPathTypedList<RouteNamedMap>[Name]

/**
* Generate a type safe params for a route location. Requires the name of the route to be passed as a generic.
*/
export type RouteParams<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['params']
/**
* Generate a type safe raw params for a route location. Requires the name of the route to be passed as a generic.
*/
export type RouteParamsRaw<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['paramsRaw']

export function useRouter(): RouterTyped
export function useRoute<Name extends keyof RouteNamedMap = keyof RouteNamedMap>(name?: Name): RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]

export const useLink: UseLinkFnTyped<RouteNamedMap>

export function onBeforeRouteLeave(guard: NavigationGuard<RouteNamedMap>): void
export function onBeforeRouteUpdate(guard: NavigationGuard<RouteNamedMap>): void

export const RouterLink: RouterLinkTyped<RouteNamedMap>
export const RouterLinkProps: RouterLinkPropsTyped<RouteNamedMap>

// Experimental Data Fetching

export function defineLoader<
P extends Promise<any>,
Name extends keyof RouteNamedMap = keyof RouteNamedMap,
isLazy extends boolean = false,
>(
name: Name,
loader: (route: RouteLocationNormalizedLoaded<Name>) => P,
options?: _DefineLoaderOptions<isLazy>,
): _DataLoader<Awaited<P>, isLazy>
export function defineLoader<
P extends Promise<any>,
isLazy extends boolean = false,
>(
loader: (route: RouteLocationNormalizedLoaded) => P,
options?: _DefineLoaderOptions<isLazy>,
): _DataLoader<Awaited<P>, isLazy>

export {
_definePage as definePage,
_HasDataLoaderMeta as HasDataLoaderMeta,
_setupDataFetchingGuard as setupDataFetchingGuard,
_stopDataFetchingScope as stopDataFetchingScope,
} from 'unplugin-vue-router/runtime'
}

declare module 'vue-router' {
import type { RouteNamedMap } from 'vue-router/auto/routes'

export interface TypesConfig {
beforeRouteUpdate: NavigationGuard<RouteNamedMap>
beforeRouteLeave: NavigationGuard<RouteNamedMap>

$route: RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[keyof RouteNamedMap]
$router: _RouterTyped<RouteNamedMap>

RouterLink: RouterLinkTyped<RouteNamedMap>
}
}
4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"serve": "vite preview"
},
"dependencies": {
"valaxy": "^0.18.7",
"valaxy": "^0.19.12",
"valaxy-theme-gitlink": "link:../valaxy-theme-yun"
},
"devDependencies": {
"nodemon": "^3.1.3"
"nodemon": "^3.1.7"
}
}
2 changes: 1 addition & 1 deletion demo/pages/posts/i18n.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ Config Vite Vue-i18n plugin [@intlify/vite-plugin-vue-i18n](https://github.com/i

```ts
import path from 'node:path'
import { defineConfig } from 'vite'
import VueI18n from '@intlify/vite-plugin-vue-i18n'
import { defineConfig } from 'vite'

export default defineConfig({
plugins: [
Expand Down
5 changes: 5 additions & 0 deletions demo/shims.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare interface Window {
// extend the window
__DEV__: boolean
$pageData: any
}
2 changes: 1 addition & 1 deletion demo/valaxy.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'valaxy'
import type { ThemeConfig } from 'valaxy-theme-gitlink'
import { defineConfig } from 'valaxy'

/**
* User Config
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "module",
"private": true,
"packageManager": "pnpm@9.1.4",
"packageManager": "pnpm@9.11.0",
"homepage": "https://valaxy.site",
"scripts": {
"build": "npm run build:demo",
Expand All @@ -14,13 +14,13 @@
"typecheck": "vue-tsc --noEmit --skipLibCheck"
},
"devDependencies": {
"@antfu/eslint-config": "^2.20.0",
"@unocss/eslint-plugin": "^0.60.4",
"bumpp": "^9.4.1",
"eslint": "^9.4.0",
"typescript": "^5.4.5",
"valaxy": "^0.18.7",
"@antfu/eslint-config": "^3.7.3",
"@unocss/eslint-plugin": "^0.63.0",
"bumpp": "^9.6.1",
"eslint": "^9.11.1",
"typescript": "^5.6.2",
"valaxy": "^0.19.12",
"valaxy-theme-gitlink": "workspace:*",
"vue-tsc": "^2.0.19"
"vue-tsc": "^2.1.6"
}
}
Loading

0 comments on commit 7f758b3

Please sign in to comment.