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

Commit

Permalink
Merge remote-tracking branch 'origin/main' into renovate/nuxt
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Sep 12, 2023
2 parents e2cb35c + 378bf72 commit 842a120
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: corepack enable
- uses: actions/setup-node@v3
with:
Expand All @@ -32,7 +32,7 @@ jobs:
matrix:
node-version: [ 16, 18 ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: corepack enable
- uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions packages/vitest-environment-nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"devDependencies": {
"@testing-library/vue": "7.0.0",
"@types/jsdom": "21.1.2",
"happy-dom": "10.11.1",
"happy-dom": "11.0.2",
"jsdom": "22.1.0",
"vue": "3.3.4"
},
"peerDependencies": {
"@testing-library/vue": "7.0.0",
"happy-dom": "^9.10.9 || ^10.0.0",
"happy-dom": "^9.10.9 || ^10.0.0 || ^11.0.0",
"jsdom": "^22.0.0",
"vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.33.0",
"vue": "^3.2.45",
Expand Down
8 changes: 4 additions & 4 deletions packages/vitest-environment-nuxt/src/runtime/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import {
h,
nextTick,
} from 'vue'

import {
type RenderOptions as TestingLibraryRenderOptions,
render as renderFromTestingLibrary,
import type {
RenderOptions as TestingLibraryRenderOptions,
} from '@testing-library/vue'
import { defu } from 'defu'
import type { RouteLocationRaw } from 'vue-router'
Expand Down Expand Up @@ -68,6 +66,8 @@ export async function renderSuspended<T>(
..._options
} = options || {}

const { render : renderFromTestingLibrary } = await import('@testing-library/vue')

// @ts-ignore untyped global __unctx__
const { vueApp } = globalThis.__unctx__.get('nuxt-app').tryUse()
const { render, setup } = component as DefineComponent<any, any>
Expand Down
6 changes: 3 additions & 3 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"devDependencies": {
"@nuxt/devtools": "0.8.2",
"@testing-library/vue": "7.0.0",
"happy-dom": "10.11.1",
"happy-dom": "11.0.2",
"jsdom": "22.1.0",
"nuxt": "3.7.1",
"nuxt-vitest": "0.10.2",
"nuxt-vitest": "0.10.4",
"typescript": "5.2.2",
"vitest": "0.33.0",
"vitest-environment-nuxt": "0.10.2",
"vitest-environment-nuxt": "0.10.4",
"vue-tsc": "1.8.8"
},
"version": "0.10.2"
Expand Down
26 changes: 13 additions & 13 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 842a120

Please sign in to comment.