Skip to content

Commit

Permalink
refactor: revert to minimal possible changes to preserve backwards co…
Browse files Browse the repository at this point in the history
…mpatibility
  • Loading branch information
danielroe committed Dec 2, 2023
1 parent 8822450 commit 68daaf0
Show file tree
Hide file tree
Showing 11 changed files with 127 additions and 90 deletions.
2 changes: 1 addition & 1 deletion examples/app-vitest-full/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"listhen": "^1.5.5",
"nuxt": "3.8.2",
"typescript": "5.2.2",
"vitest": "1.0.0-beta.6",
"vitest": "0.34.6",
"vue-tsc": "1.8.19"
},
"version": "0.10.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/app-vitest-full/tests/nuxt/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('test utils', () => {
"<div>This is an auto-imported component</div>
<div> I am a global component </div>
<div>Index page</div>
<a href="/test"> Test link </a>"
<a href=\\"/test\\"> Test link </a>"
`)
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ it('should mock', async () => {
"<div>Mocked</div>
<div> I am a global component </div>
<div>Index page</div>
<a href="/test"> Test link </a>"
<a href=\\"/test\\"> Test link </a>"
`)
})
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ it('should mock', async () => {
"<div> Mocked 1 * 2 = 2</div>
<div> I am a global component </div>
<div>Index page</div>
<a href="/test"> Test link </a>"
<a href=\\"/test\\"> Test link </a>"
`)
})
4 changes: 2 additions & 2 deletions examples/app-vitest-full/tests/nuxt/utils-render.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ describe('test utils', () => {
it('can render components within nuxt suspense', async () => {
const { html } = await renderSuspended(App)
expect(html()).toMatchInlineSnapshot(`
"<div id="test-wrapper">
"<div id=\\"test-wrapper\\">
<div>This is an auto-imported component</div>
<div> I am a global component </div>
<div>Index page</div><a href="/test"> Test link </a>
<div>Index page</div><a href=\\"/test\\"> Test link </a>
</div>"
`)
})
Expand Down
2 changes: 1 addition & 1 deletion examples/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"@nuxt/test-utils": "latest",
"changelogen": "^0.5.5",
"nuxt": "^3.8.2",
"vitest": "1.0.0-beta.6"
"vitest": "0.34.6"
}
}
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"unbuild": "latest",
"unimport": "3.6.0",
"vite": "5.0.4",
"vitest": "1.0.0-beta.6",
"vitest": "0.34.6",
"vue-router": "4.2.5",
"vue-tsc": "1.8.24"
},
Expand All @@ -94,7 +94,7 @@
"jsdom": "^22.0.0 || ^23.0.0",
"playwright-core": "^1.34.3",
"vite": "*",
"vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.33.0 || ^1.0.0-beta.6",
"vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.33.0 || ^0.34.6",
"vue": "^3.3.4",
"vue-router": "^4.0.0"
},
Expand Down Expand Up @@ -126,7 +126,6 @@
},
"resolutions": {
"@nuxt/test-utils": "workspace:*",
"vite-node": "1.0.0-beta.6",
"vitest-environment-nuxt": "workspace:*",
"rollup": "4.6.1",
"vite": "5.0.4"
Expand Down
143 changes: 92 additions & 51 deletions pnpm-lock.yaml

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

Loading

0 comments on commit 68daaf0

Please sign in to comment.