From 752d587ef1098fba1ab739e56e28d2b664c4cbb0 Mon Sep 17 00:00:00 2001 From: Kevin Marrec Date: Fri, 12 Jun 2020 15:15:50 +0200 Subject: [PATCH] fix(types): router types fix for vue-router 3.3.3 (#7503) --- packages/types/config/router.d.ts | 5 ++++- packages/types/test/tsconfig.json | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/types/config/router.d.ts b/packages/types/config/router.d.ts index a7f3f66a66..c9c8d0021c 100644 --- a/packages/types/config/router.d.ts +++ b/packages/types/config/router.d.ts @@ -5,7 +5,10 @@ * https://router.vuejs.org/api/#router-construction-options */ -import { RouterOptions, RouteConfig } from 'vue-router' +import { RouterOptions, RouteConfig as _RouteConfig } from 'vue-router' + +type UnionToIntersection = (T extends any ? (k: T) => void : never) extends ((k: infer U) => void) ? U : never +type RouteConfig = UnionToIntersection<_RouteConfig> export interface NuxtRouteConfig extends Pick> { children?: NuxtRouteConfig[] diff --git a/packages/types/test/tsconfig.json b/packages/types/test/tsconfig.json index 385c8552e3..0fd75d0303 100644 --- a/packages/types/test/tsconfig.json +++ b/packages/types/test/tsconfig.json @@ -1,13 +1,13 @@ { "compilerOptions": { - "target": "esnext", - "moduleResolution": "node", + "target": "ESNext", + "moduleResolution": "Node", "strict": true, "noEmit": true, "lib": [ - "esnext", - "esnext.asynciterable", - "dom" + "ESNext", + "ESNext.AsyncIterable", + "DOM" ] } }