mirror of https://github.com/grafana/grafana.git
				
				
				
			Update dependency msw to v1 (#64281)
* Update dependency msw to v1 * Fix breaking change --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
This commit is contained in:
		
							parent
							
								
									7b01668729
								
							
						
					
					
						commit
						f579a63f8e
					
				| 
						 | 
				
			
			@ -215,7 +215,7 @@
 | 
			
		|||
    "lerna": "5.5.4",
 | 
			
		||||
    "lint-staged": "13.1.0",
 | 
			
		||||
    "mini-css-extract-plugin": "2.7.2",
 | 
			
		||||
    "msw": "0.49.2",
 | 
			
		||||
    "msw": "1.1.0",
 | 
			
		||||
    "mutationobserver-shim": "0.3.7",
 | 
			
		||||
    "ngtemplate-loader": "2.1.0",
 | 
			
		||||
    "node-notifier": "10.0.1",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,13 +1,13 @@
 | 
			
		|||
import { rest } from 'msw';
 | 
			
		||||
import { SetupServerApi } from 'msw/node';
 | 
			
		||||
import { SetupServer } from 'msw/node';
 | 
			
		||||
 | 
			
		||||
import { ExternalAlertmanagersResponse } from '../../../../plugins/datasource/alertmanager/types';
 | 
			
		||||
import { AlertmanagersChoiceResponse } from '../api/alertmanagerApi';
 | 
			
		||||
 | 
			
		||||
export function mockAlertmanagerChoiceResponse(server: SetupServerApi, respose: AlertmanagersChoiceResponse) {
 | 
			
		||||
export function mockAlertmanagerChoiceResponse(server: SetupServer, respose: AlertmanagersChoiceResponse) {
 | 
			
		||||
  server.use(rest.get('/api/v1/ngalert', (req, res, ctx) => res(ctx.status(200), ctx.json(respose))));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export function mockAlertmanagersResponse(server: SetupServerApi, response: ExternalAlertmanagersResponse) {
 | 
			
		||||
export function mockAlertmanagersResponse(server: SetupServer, response: ExternalAlertmanagersResponse) {
 | 
			
		||||
  server.use(rest.get('/api/v1/ngalert/alertmanagers', (req, res, ctx) => res(ctx.status(200), ctx.json(response))));
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,8 +1,8 @@
 | 
			
		|||
import { rest } from 'msw';
 | 
			
		||||
import { SetupServerApi } from 'msw/node';
 | 
			
		||||
import { SetupServer } from 'msw/node';
 | 
			
		||||
 | 
			
		||||
import { DashboardSearchItem } from '../../../search/types';
 | 
			
		||||
 | 
			
		||||
export function mockSearchApiResponse(server: SetupServerApi, searchResult: DashboardSearchItem[]) {
 | 
			
		||||
export function mockSearchApiResponse(server: SetupServer, searchResult: DashboardSearchItem[]) {
 | 
			
		||||
  server.use(rest.get('/api/search', (req, res, ctx) => res(ctx.json<DashboardSearchItem[]>(searchResult))));
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,13 +1,9 @@
 | 
			
		|||
import { rest } from 'msw';
 | 
			
		||||
import { SetupServerApi } from 'msw/node';
 | 
			
		||||
import { SetupServer } from 'msw/node';
 | 
			
		||||
 | 
			
		||||
import { RulerRuleGroupDTO, RulerRulesConfigDTO } from '../../../../types/unified-alerting-dto';
 | 
			
		||||
 | 
			
		||||
export function mockRulerRulesApiResponse(
 | 
			
		||||
  server: SetupServerApi,
 | 
			
		||||
  rulesSourceName: string,
 | 
			
		||||
  response: RulerRulesConfigDTO
 | 
			
		||||
) {
 | 
			
		||||
export function mockRulerRulesApiResponse(server: SetupServer, rulesSourceName: string, response: RulerRulesConfigDTO) {
 | 
			
		||||
  server.use(
 | 
			
		||||
    rest.get(`/api/ruler/${rulesSourceName}/api/v1/rules`, (req, res, ctx) =>
 | 
			
		||||
      res(ctx.json<RulerRulesConfigDTO>(response))
 | 
			
		||||
| 
						 | 
				
			
			@ -16,7 +12,7 @@ export function mockRulerRulesApiResponse(
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
export function mockRulerRulesGroupApiResponse(
 | 
			
		||||
  server: SetupServerApi,
 | 
			
		||||
  server: SetupServer,
 | 
			
		||||
  rulesSourceName: string,
 | 
			
		||||
  namespace: string,
 | 
			
		||||
  group: string,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										21
									
								
								yarn.lock
								
								
								
								
							
							
						
						
									
										21
									
								
								yarn.lock
								
								
								
								
							| 
						 | 
				
			
			@ -22217,7 +22217,7 @@ __metadata:
 | 
			
		|||
    mousetrap: 1.6.5
 | 
			
		||||
    mousetrap-global-bind: 1.1.0
 | 
			
		||||
    moveable: 0.43.1
 | 
			
		||||
    msw: 0.49.2
 | 
			
		||||
    msw: 1.1.0
 | 
			
		||||
    mutationobserver-shim: 0.3.7
 | 
			
		||||
    ngtemplate-loader: 2.1.0
 | 
			
		||||
    node-notifier: 10.0.1
 | 
			
		||||
| 
						 | 
				
			
			@ -28510,9 +28510,9 @@ __metadata:
 | 
			
		|||
  languageName: node
 | 
			
		||||
  linkType: hard
 | 
			
		||||
 | 
			
		||||
"msw@npm:0.49.2":
 | 
			
		||||
  version: 0.49.2
 | 
			
		||||
  resolution: "msw@npm:0.49.2"
 | 
			
		||||
"msw@npm:1.1.0":
 | 
			
		||||
  version: 1.1.0
 | 
			
		||||
  resolution: "msw@npm:1.1.0"
 | 
			
		||||
  dependencies:
 | 
			
		||||
    "@mswjs/cookies": ^0.2.2
 | 
			
		||||
    "@mswjs/interceptors": ^0.17.5
 | 
			
		||||
| 
						 | 
				
			
			@ -28530,7 +28530,7 @@ __metadata:
 | 
			
		|||
    node-fetch: ^2.6.7
 | 
			
		||||
    outvariant: ^1.3.0
 | 
			
		||||
    path-to-regexp: ^6.2.0
 | 
			
		||||
    strict-event-emitter: ^0.2.6
 | 
			
		||||
    strict-event-emitter: ^0.4.3
 | 
			
		||||
    type-fest: ^2.19.0
 | 
			
		||||
    yargs: ^17.3.1
 | 
			
		||||
  peerDependencies:
 | 
			
		||||
| 
						 | 
				
			
			@ -28540,7 +28540,7 @@ __metadata:
 | 
			
		|||
      optional: true
 | 
			
		||||
  bin:
 | 
			
		||||
    msw: cli/index.js
 | 
			
		||||
  checksum: 10ec35671e10e53c2a24ca22c5e7a2262d4cdfb409a403a3ffe221150af404805490e7661611a581986e61790bb8996ce8a0f057d521ef359498304c2431234a
 | 
			
		||||
  checksum: e555547defbc3f07532bdadcbf9f4e3a32b92156d3869e85c9038ecaac220cfc93901727da097b7f9d3ecf9cbbc5a9178c0ecdd3999a9201db4c85c99b92c361
 | 
			
		||||
  languageName: node
 | 
			
		||||
  linkType: hard
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -36107,7 +36107,7 @@ __metadata:
 | 
			
		|||
  languageName: node
 | 
			
		||||
  linkType: hard
 | 
			
		||||
 | 
			
		||||
"strict-event-emitter@npm:^0.2.4, strict-event-emitter@npm:^0.2.6":
 | 
			
		||||
"strict-event-emitter@npm:^0.2.4":
 | 
			
		||||
  version: 0.2.8
 | 
			
		||||
  resolution: "strict-event-emitter@npm:0.2.8"
 | 
			
		||||
  dependencies:
 | 
			
		||||
| 
						 | 
				
			
			@ -36116,6 +36116,13 @@ __metadata:
 | 
			
		|||
  languageName: node
 | 
			
		||||
  linkType: hard
 | 
			
		||||
 | 
			
		||||
"strict-event-emitter@npm:^0.4.3":
 | 
			
		||||
  version: 0.4.6
 | 
			
		||||
  resolution: "strict-event-emitter@npm:0.4.6"
 | 
			
		||||
  checksum: 4f4f2909613e7811de789991c06bfb770d6d6987e2ec5c66fa7485d0f07cc4e7e32eba0dcf26cee6d86af6c92946d7f4acdfaff57d0c4114df2cfa1bf0e3c091
 | 
			
		||||
  languageName: node
 | 
			
		||||
  linkType: hard
 | 
			
		||||
 | 
			
		||||
"string-argv@npm:^0.3.1":
 | 
			
		||||
  version: 0.3.1
 | 
			
		||||
  resolution: "string-argv@npm:0.3.1"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue