Skip to content

Commit

Permalink
chore: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Sep 9, 2024
1 parent 7b6713b commit c316206
Show file tree
Hide file tree
Showing 11 changed files with 377 additions and 183 deletions.
2 changes: 2 additions & 0 deletions .github/actions/pnpm-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ runs:
with:
node-version-file: .nvmrc
- uses: pnpm/action-setup@v4
- run: pnpm --version
shell: bash
- run: pnpm i --frozen-lockfile
shell: bash
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"vue-tsc": "^2.0.29",
"yargs": "^17.7.2"
},
"packageManager": "pnpm@9.6.0",
"packageManager": "pnpm@9.10.0",
"pnpm": {
"patchedDependencies": {
"@mdi/[email protected]": "patches/@[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"vitest": "^2.0.5",
"vue-i18n": "^9.7.1",
"vue-router": "^4.3.0",
"webdriverio": "^9.0.9"
"webdriverio": "^8.40.5"
},
"peerDependencies": {
"typescript": ">=4.7",
Expand Down
15 changes: 0 additions & 15 deletions packages/vuetify/src/globals.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'vue/jsx'
import type { ComponentInjectOptions, ComponentOptionsMixin, EmitsOptions, SlotsType } from 'vue'
import type { ComputedOptions, Events, MethodOptions, VNode } from 'vue'
import type { TouchStoredHandlers } from './directives/touch'
import type { CustomCommands } from '../test/setup/browser-commands'

declare global {
interface HTMLCollection {
Expand Down Expand Up @@ -170,17 +169,3 @@ declare module 'vue' {

export interface CSSProperties extends CustomProperties {}
}

interface CustomMatchers<R = unknown> {
toHaveBeenTipped: () => R
toHaveBeenWarned: () => R
}

declare module 'vitest' {
interface Assertion<T = any> extends CustomMatchers<T> {}
interface AsymmetricMatchersContaining extends CustomMatchers {}
}

declare module '@vitest/browser/context' {
interface BrowserCommands extends CustomCommands {}
}
15 changes: 15 additions & 0 deletions packages/vuetify/test/globals.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { CustomCommands } from './setup/browser-commands.ts'

interface CustomMatchers<R = unknown> {
toHaveBeenTipped: () => R
toHaveBeenWarned: () => R
}

declare module 'vitest' {
interface Assertion<T = any> extends CustomMatchers<T> {}
interface AsymmetricMatchersContaining extends CustomMatchers {}
}

declare module '@vitest/browser/context' {
interface BrowserCommands extends CustomCommands {}
}
1 change: 1 addition & 0 deletions packages/vuetify/test/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Utilities
import './globals.d'
import { render as _render } from '@testing-library/vue'
import { createVuetify } from '@/framework.ts'
import { afterEach } from 'vitest'
Expand Down
1 change: 1 addition & 0 deletions packages/vuetify/test/setup/browser-commands.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/// <reference types="@vitest/browser/providers/webdriverio" />
/// <reference types="./percy.d.ts" />

import type { BrowserCommandContext } from 'vitest/node'
import percy from '@percy/sdk-utils'
Expand Down
9 changes: 8 additions & 1 deletion packages/vuetify/tsconfig.dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@
"vitest.workspace.mts"
],
"compilerOptions": {
"allowJs": true
"allowJs": true,
"paths": {
"@/*": ["src/*"],
"@test": ["test/index.ts"]
},
"types": [
"@vitest/browser/providers/webdriverio"
]
},
"vueCompilerOptions": {
"strictTemplates": true
Expand Down
2 changes: 1 addition & 1 deletion packages/vuetify/tsconfig.dist.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"exclude": ["dev", "**/*.spec.*", "cypress"]
"exclude": ["dev", "**/*.spec.*", "test"]
}
9 changes: 2 additions & 7 deletions packages/vuetify/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,17 @@
"include": [
"src",
"dev",
"test"
],
"exclude": ["types-temp", "**/*.spec.cy.ts", "**/*.spec.cy.tsx"],
"compilerOptions": {
"baseUrl": ".",
"outDir": "./types-temp",
"paths": {
"@/*": [
"src/*"
],
"@test": ["test/index.ts"]
"@/*": ["src/*"],
},
"types": [
"node",
"vue-router",
"@vitest/browser/matchers"
"vue-router"
],
"stripInternal": true,
"skipLibCheck": false
Expand Down
Loading

0 comments on commit c316206

Please sign in to comment.