Skip to content

Commit

Permalink
chore: conflicts?
Browse files Browse the repository at this point in the history
  • Loading branch information
thepassle committed Oct 23, 2023
2 parents b5eec71 + a54138a commit f0c4414
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/02-issue-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ body:
options:
- label: I'm using the [latest](https://github.com/mswjs/msw/releases/latest) `msw` version
required: true
- label: I'm using Node.js version 14 or higher
- label: I'm using Node.js version 18 or higher
required: true

- type: input
attributes:
label: Node.js version
description: Specify which Node.js version you're using (`node -v`).
placeholder: i.e. v16.14.0
placeholder: i.e. v18.14.0
validations:
required: true

Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
> [!IMPORTANT]\
> **MSW 2.0 is finally here! 🎉** Read the [Release notes](https://github.com/mswjs/msw/releases/tag/v2.0.0) and please follow the [**Migration guidelines**](https://mswjs.io/docs/migrations/1.x-to-2.x) to upgrade. If you're having any questions while upgrading, please reach out in our [Discord server](https://discord.gg/z29WbnfDC5).
> **MSW 2.0 is finally here! 🎉** Read the [Release notes](https://github.com/mswjs/msw/releases/tag/v2.0.0) and please follow the [**Migration guidelines**](https://mswjs.io/docs/migrations/1.x-to-2.x) to upgrade. If you're having any questions while upgrading, please reach out in our [Discord server](https://kettanaito.com/discord).
<br />

Expand Down Expand Up @@ -41,8 +41,7 @@
This README will give you a brief overview on the library but there's no better place to start with Mock Service Worker than its official documentation.

- [Documentation](https://mswjs.io/docs)
- [**Getting started**](https://mswjs.io/docs/getting-started/install)
- [Recipes](https://mswjs.io/docs/recipes)
- [**Getting started**](https://mswjs.io/docs/getting-started)
- [FAQ](https://mswjs.io/docs/faq)

## Examples
Expand All @@ -51,7 +50,7 @@ This README will give you a brief overview on the library but there's no better

## Browser

- [Learn more about using MSW in a browser](https://mswjs.io/docs/getting-started/integrate/browser)
- [Learn more about using MSW in a browser](https://mswjs.io/docs/integrations/browser)
- [`setupWorker` API](https://mswjs.io/docs/api/setup-worker)

### How does it work?
Expand Down Expand Up @@ -104,7 +103,7 @@ Performing a `GET https://github.com/octocat` request in your application will r
## Node.js

- [Learn more about using MSW in Node.js](https://mswjs.io/docs/getting-started/integrate/node)
- [Learn more about using MSW in Node.js](https://mswjs.io/docs/integrations/node)
- [`setupServer` API](https://mswjs.io/docs/api/setup-server)

### How does it work?
Expand Down Expand Up @@ -178,7 +177,7 @@ it('displays the list of recent posts', async () => {
})
```

> Don't get overwhelmed! We've prepared a step-by-step [**Getting started**](https://mswjs.io/docs/getting-started/install) tutorial that you can follow to learn how to integrate Mock Service Worker into your project.
> Don't get overwhelmed! We've prepared a step-by-step [**Getting started**](https://mswjs.io/docs/getting-started) tutorial that you can follow to learn how to integrate Mock Service Worker into your project.
Despite the API being called `setupServer`, there are no actual servers involved! The name was chosen for familiarity, and the API was designed to resemble operating with an actual server.

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "msw",
"version": "0.0.0-fetch.rc-24",
"version": "2.0.0",
"description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
"main": "./lib/core/index.js",
"module": "./lib/core/index.mjs",
Expand Down
1 change: 1 addition & 0 deletions src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export type {
ResponseResolver,
ResponseResolverReturnType,
AsyncResponseResolverReturnType,
RequestHandlerOptions,
DefaultBodyType,
DefaultRequestMultipartBody,
} from './handlers/RequestHandler'
Expand Down

0 comments on commit f0c4414

Please sign in to comment.