Skip to content

Commit 53e4e10

Browse files
sheremet-vasheremet-va
committed
Merge branch 'main' of github.com:vitest-dev/vitest into feat/use-module-runner
2 parents 2febb1f + a4df683 commit 53e4e10

42 files changed

Lines changed: 295 additions & 85 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/.vitepress/config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
groupIconMdPlugin,
99
groupIconVitePlugin,
1010
} from 'vitepress-plugin-group-icons'
11+
import llmstxt from 'vitepress-plugin-llms'
1112
import { version } from '../../package.json'
1213
import { teamMembers } from './contributors'
1314
import {
@@ -79,6 +80,7 @@ export default ({ mode }: { mode: string }) => {
7980
'qwik': 'logos:qwik-icon',
8081
},
8182
}),
83+
llmstxt(),
8284
],
8385
},
8486
markdown: {

‎docs/config/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ In CI, or when run from a non-interactive shell, "watch" mode is not the default
619619

620620
Vitest reruns tests based on the module graph which is populated by static and dynamic `import` statements. However, if you are reading from the file system or fetching from a proxy, then Vitest cannot detect those dependencies.
621621

622-
To correctly rerun those tests, you can define a regex pattern and a function that retuns a list of test files to run.
622+
To correctly rerun those tests, you can define a regex pattern and a function that returns a list of test files to run.
623623

624624
```ts
625625
import { defineConfig } from 'vitest/config'

‎docs/guide/browser/assertion-api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ other element that contains text, such as a paragraph, span, div etc.
10181018

10191019
::: warning
10201020
The expected selection is a string, it does not allow to check for
1021-
selection range indeces.
1021+
selection range indices.
10221022
:::
10231023

10241024
```html

‎docs/guide/browser/commands.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Command is a function that invokes another function on the server and passes dow
1111

1212
### Files Handling
1313

14-
You can use the `readFile`, `writeFile`, and `removeFile` APIs to handle files in your browser tests. Since Vitest 3.2, all paths are resolved relative to the [project](/guide/projects) root (which is `process.cwd()`, unless overriden manually). Previously, paths were resolved relative to the test file.
14+
You can use the `readFile`, `writeFile`, and `removeFile` APIs to handle files in your browser tests. Since Vitest 3.2, all paths are resolved relative to the [project](/guide/projects) root (which is `process.cwd()`, unless overridden manually). Previously, paths were resolved relative to the test file.
1515

1616
By default, Vitest uses `utf-8` encoding but you can override it with options.
1717

‎docs/guide/browser/locators.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ function getByLabelText(
234234

235235
Creates a locator capable of finding an element that has an associated label.
236236

237-
The `page.getByLabelText('Username')` locator will find every input in the example bellow:
237+
The `page.getByLabelText('Username')` locator will find every input in the example below:
238238

239239
```html
240240
// for/htmlFor relationship between label and form element id
@@ -1004,7 +1004,7 @@ declare module '@vitest/browser/context' {
10041004
}
10051005
```
10061006
1007-
If the method is called on the global `page` object, then selector will be applied to the whole page. In the example bellow, `getByArticleTitle` will find all elements with an attribute `data-title` with the value of `title`. However, if the method is called on the locator, then it will be scoped to that locator.
1007+
If the method is called on the global `page` object, then selector will be applied to the whole page. In the example below, `getByArticleTitle` will find all elements with an attribute `data-title` with the value of `title`. However, if the method is called on the locator, then it will be scoped to that locator.
10081008
10091009
```html
10101010
<article data-title="Hello, World!">

‎docs/guide/test-context.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ describe('use scoped values', () => {
325325
test.scoped({ dependency: 'new' })
326326

327327
test('uses scoped value', ({ dependant }) => {
328-
// `dependant` uses the new overriden value that is scoped
328+
// `dependant` uses the new overridden value that is scoped
329329
// to all tests in this suite
330330
expect(dependant).toEqual({ dependency: 'new' })
331331
})

‎docs/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"vite-plugin-pwa": "^0.21.2",
3535
"vitepress": "2.0.0-alpha.8",
3636
"vitepress-plugin-group-icons": "^1.6.1",
37+
"vitepress-plugin-llms": "^1.3.4",
3738
"vitepress-plugin-tabs": "^0.7.1",
3839
"workbox-window": "^7.3.0"
3940
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vitest/monorepo",
33
"type": "module",
4-
"version": "4.0.0-beta.3",
4+
"version": "4.0.0-beta.4",
55
"private": true,
66
"packageManager": "[email protected]",
77
"description": "Next generation testing framework powered by Vite",

‎packages/browser/jest-dom.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ export interface TestingLibraryMatchers<E, R> {
627627
* other element that contains text, such as a paragraph, span, div etc.
628628
*
629629
* NOTE: the expected selection is a string, it does not allow to check for
630-
* selection range indeces.
630+
* selection range indices.
631631
*
632632
* @example
633633
* <div>

‎packages/browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vitest/browser",
33
"type": "module",
4-
"version": "4.0.0-beta.3",
4+
"version": "4.0.0-beta.4",
55
"description": "Browser running for Vitest",
66
"license": "MIT",
77
"funding": "https://opencollective.com/vitest",

0 commit comments

Comments
 (0)