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

Update dependencies #891

Merged
merged 5 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
go-version: ${{ steps.go_version.outputs.go_version }}
- name: Check atlas.sum
run: |
go run -mod=mod ariga.io/atlas/cmd/atlas@v0.5.0 \
go run -mod=mod ariga.io/atlas/cmd/atlas@v0.13.1 \
migrate validate --dir "file://./internal/storage/persistence/migrations"
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22.0
1.22.1
1,836 changes: 746 additions & 1,090 deletions dashboard/package-lock.json

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,43 @@
},
"dependencies": {
"@pinia/plugin-debounce": "^1.0.1",
"@types/humanize-duration": "^3.27.3",
"@types/humanize-duration": "^3.27.4",
"@vueuse/core": "^10.7.0",
"humanize-duration": "^3.31.0",
"moment": "^2.29.4",
"oidc-client-ts": "^2.4.0",
"moment": "^2.30.1",
"oidc-client-ts": "^3.0.1",
"pinia": "^2.1.7",
"ts-debounce": "^4.0.0",
"vue": "^3.3.13",
"vue-router": "^4.2.5",
"vue": "^3.4.21",
"vue-router": "^4.3.0",
"vue3-promise-dialog": "^0.3.4"
},
"devDependencies": {
"@iconify/json": "^2.2.160",
"@iconify/json": "^2.2.192",
"@pinia/testing": "^0.1.3",
"@testing-library/vue": "^8.0.1",
"@testing-library/vue": "^8.0.2",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@tsconfig/node20": "^20.1.2",
"@types/bootstrap": "^5.2.10",
"@types/jsdom": "^21.1.6",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.10.5",
"@vitejs/plugin-vue": "^4.5.2",
"@vitest/coverage-v8": "^1.1.0",
"@vue-macros/reactivity-transform": "^0.4.1",
"@types/node": "^20.11.27",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/coverage-v8": "^1.3.1",
"@vue-macros/reactivity-transform": "^0.4.3",
"@vue/tsconfig": "^0.5.1",
"bootstrap": "^5.3.2",
"happy-dom": "^12.10.3",
"bootstrap": "^5.3.3",
"happy-dom": "^13.8.4",
"lodash-es": "^4.17.21",
"npm-check-updates": "^16.14.12",
"npm-run-all2": "^6.1.1",
"prettier": "^3.1.1",
"sass": "^1.69.5",
"typescript": "^5.3.3",
"unplugin-icons": "^0.18.1",
"unplugin-vue-router": "^0.7.0",
"vite": "^5.0.12",
"vitest": "^1.1.0",
"vue-tsc": "^1.8.25"
"npm-check-updates": "^16.14.15",
"npm-run-all2": "^6.1.2",
"prettier": "^3.2.5",
"sass": "^1.72.0",
"typescript": "^5.4.2",
"unplugin-icons": "^0.18.5",
"unplugin-vue-router": "^0.8.5",
"vite": "^5.1.6",
"vitest": "^1.3.1",
"vue-tsc": "^2.0.6"
}
}
4 changes: 1 addition & 3 deletions dashboard/src/router.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { useLayoutStore } from "./stores/layout";
import { createRouter, createWebHistory } from "vue-router";
import { routes } from "vue-router/auto/routes";
import { createRouter, createWebHistory } from "vue-router/auto";

const router = createRouter({
history: createWebHistory("/"),
routes,
strict: false,
});

Expand Down
7 changes: 6 additions & 1 deletion dashboard/tsconfig.vitest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
"compilerOptions": {
"composite": true,
"lib": [],
"types": ["node", "jsdom"]
"types": [
"node",
"jsdom",
"@vue-macros/reactivity-transform/macros-global",
"unplugin-vue-router/client"
]
}
}
140 changes: 11 additions & 129 deletions dashboard/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 'unplugin-vue-router/types'

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 @@ -55,100 +34,3 @@ declare module 'vue-router/auto/routes' {
'/user/signin-callback': RouteRecordInfo<'/user/signin-callback', '/user/signin-callback', 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>
}
}
Loading
Loading