Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into pr/stafyniaksacha/7950
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 committed Oct 26, 2022
2 parents 3278158 + 8e1bcae commit b6e8c83
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 45 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
"@types/node": "^18.11.5",
"@types/rimraf": "^3",
"@types/semver": "^7",
"@unocss/reset": "^0.45.30",
"@unocss/reset": "^0.46.0",
"case-police": "^0.5.10",
"changelogen": "^0.3.5",
"crawler": "^1.3.0",
"eslint": "^8.26.0",
"eslint-plugin-jsdoc": "^39.3.23",
"eslint-plugin-jsdoc": "^39.3.25",
"execa": "^6.1.0",
"expect-type": "^0.15.0",
"globby": "^13.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"unctx": "^2.0.2",
"unenv": "^0.6.2",
"unimport": "^0.7.0",
"unplugin": "^0.10.1",
"unplugin": "^0.10.2",
"untyped": "^0.5.0",
"vue": "^3.2.41",
"vue-bundle-renderer": "^0.4.4",
"vue-devtools-stub": "^0.1.0",
"vue-router": "^4.1.5"
"vue-router": "^4.1.6"
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
Expand Down
3 changes: 2 additions & 1 deletion packages/nuxt/src/pages/runtime/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { KeepAlive, h } from 'vue'
import type { RouterView, RouteLocationMatched, RouteLocationNormalizedLoaded } from 'vue-router'

type InstanceOf<T> = T extends new (...args: any[]) => infer R ? R : never
export type RouterViewSlotProps = Parameters<InstanceOf<typeof RouterView>['$slots']['default']>[0]
type RouterViewSlot = Exclude<InstanceOf<typeof RouterView>['$slots']['default'], undefined>
export type RouterViewSlotProps = Parameters<RouterViewSlot>[0]

const interpolatePath = (route: RouteLocationNormalizedLoaded, match: RouteLocationMatched) => {
return match.path
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"rollup": "^2.79.1",
"rollup-plugin-visualizer": "^5.8.3",
"ufo": "^0.8.6",
"unplugin": "^0.10.1",
"unplugin": "^0.10.2",
"vite": "~3.1.8",
"vite-node": "^0.24.3",
"vite-plugin-checker": "^0.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"style-resources-loader": "^1.5.0",
"time-fix-plugin": "^2.0.7",
"ufo": "^0.8.6",
"unplugin": "^0.10.1",
"unplugin": "^0.10.2",
"url-loader": "^4.1.1",
"vue-bundle-renderer": "^0.4.4",
"vue-loader": "^17.0.0",
"webpack": "^5.74.0",
"webpack-bundle-analyzer": "^4.6.1",
"webpack-bundle-analyzer": "^4.7.0",
"webpack-dev-middleware": "^5.3.3",
"webpack-hot-middleware": "^2.25.2",
"webpack-virtual-modules": "^0.4.5",
Expand Down
65 changes: 28 additions & 37 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b6e8c83

Please sign in to comment.