chore(deps): update dependency msw to v2 (#2837)

* chore(deps): update dependency msw to v2

* chore(deps): update dependency msw to v2

* chore: merge origin/master and fix msw tests

* fix: build

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Stephan Köninger <[email protected]>

Author: renovate[bot]

spring-boot-admin-server-ui/package-lock.json

@@ -91,7 +91,7 @@
     "eslint-plugin-storybook": "0.6.15",
     "eslint-plugin-vue": "^9.10.0",
     "jsdom": "^23.0.0",
-    "msw": "1.3.2",
+    "msw": "2.0.11",
     "msw-storybook-addon": "1.10.0",
     "postcss": "8.4.32",
     "prettier": "^3.0.3",

spring-boot-admin-server-ui/package.json

@@ -1,9 +1,9 @@
-import { rest } from 'msw';
+import { http } from 'msw';
 
 import { applications } from './data.js';
 
 const applicationsEndpoint = [
-  rest.get('/applications', (req, res, ctx) => {
+  http.get('/applications', () => {
     return res(ctx.status(404), ctx.json(applications));
   }),
 ];

spring-boot-admin-server-ui/src/main/frontend/mocks/applications/index.ts

@@ -1,4 +1,4 @@
-import { setupWorker } from 'msw';
+import { setupWorker } from 'msw/browser';
 
 import auditEventsEndpoint from './instance/auditevents/index.js';
 import flywayEndpoints from './instance/flyway/index.js';

spring-boot-admin-server-ui/src/main/frontend/mocks/browser.ts

@@ -1,10 +1,10 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 import { auditeventsresponse } from '@/mocks/instance/auditevents/data';
 
 const endpoints = [
-  rest.get('/instances/:instanceId/actuator/auditevents', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(auditeventsresponse));
+  http.get('/instances/:instanceId/actuator/auditevents', () => {
+    return HttpResponse.json(auditeventsresponse);
   }),
 ];
 

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/auditevents/index.ts

@@ -1,10 +1,10 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 import { flyway } from './data.js';
 
 const flywayEndpoints = [
-  rest.get('/instances/:instanceId/actuator/flyway', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(flyway));
+  http.get('/instances/:instanceId/actuator/flyway', () => {
+    return HttpResponse.json(flyway);
   }),
 ];
 

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/flyway/index.ts

@@ -1,57 +1,54 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 const healthEndpoint = [
-  rest.get('/instances/:instanceId/actuator/health', (req, res, ctx) => {
-    return res(
-      ctx.status(200),
-      ctx.json({
-        status: 'UP',
-        details: {
-          clientConfigServer: {
-            status: 'UNKNOWN',
-            details: { error: 'no property sources located' },
-          },
-          db: {
-            status: 'UP',
-            details: {
-              database: 'HSQL Database Engine',
-              validationQuery: 'isValid()',
-            },
+  http.get('/instances/:instanceId/actuator/health', () => {
+    return HttpResponse.json({
+      status: 'UP',
+      details: {
+        clientConfigServer: {
+          status: 'UNKNOWN',
+          details: { error: 'no property sources located' },
+        },
+        db: {
+          status: 'UP',
+          details: {
+            database: 'HSQL Database Engine',
+            validationQuery: 'isValid()',
           },
-          discoveryComposite: {
-            description: 'Discovery Client not initialized',
-            status: 'UNKNOWN',
-            details: {
-              discoveryClient: {
-                description: 'Discovery Client not initialized',
-                status: 'UNKNOWN',
-              },
+        },
+        discoveryComposite: {
+          description: 'Discovery Client not initialized',
+          status: 'UNKNOWN',
+          details: {
+            discoveryClient: {
+              description: 'Discovery Client not initialized',
+              status: 'UNKNOWN',
             },
           },
-          diskSpace: {
-            status: 'UP',
-            details: {
-              total: 994662584320,
-              free: 300063879168,
-              threshold: 10485760,
-              exists: true,
-            },
+        },
+        diskSpace: {
+          status: 'UP',
+          details: {
+            total: 994662584320,
+            free: 300063879168,
+            threshold: 10485760,
+            exists: true,
           },
-          ping: { status: 'UP' },
-          reactiveDiscoveryClients: {
-            description: 'Discovery Client not initialized',
-            status: 'UNKNOWN',
-            details: {
-              'Simple Reactive Discovery Client': {
-                description: 'Discovery Client not initialized',
-                status: 'UNKNOWN',
-              },
+        },
+        ping: { status: 'UP' },
+        reactiveDiscoveryClients: {
+          description: 'Discovery Client not initialized',
+          status: 'UNKNOWN',
+          details: {
+            'Simple Reactive Discovery Client': {
+              description: 'Discovery Client not initialized',
+              status: 'UNKNOWN',
             },
           },
-          refreshScope: { status: 'UP' },
         },
-      }),
-    );
+        refreshScope: { status: 'UP' },
+      },
+    });
   }),
 ];
 

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/health/index.ts

@@ -1,8 +1,8 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 const infoEndpoint = [
-  rest.get('/instances/:instanceId/actuator/info', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json({}));
+  http.get('/instances/:instanceId/actuator/info', () => {
+    return HttpResponse.json({});
   }),
 ];
 

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/info/index.ts

@@ -1,26 +1,23 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 import { jolokiaList } from './data';
 
 import { jolokiaRead } from '@/mocks/instance/jolokia/data.read';
 
 const jolokiaEndpoint = [
-  rest.get('/instances/:instanceId/actuator/jolokia/list', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(jolokiaList));
+  http.get('/instances/:instanceId/actuator/jolokia/list', () => {
+    return HttpResponse.json(jolokiaList);
   }),
-  rest.post(
-    '/instances/:instanceId/actuator/jolokia',
-    async (req, res, ctx) => {
-      try {
-        const body = await req.json();
-        if (body.type === 'read') {
-          return res(ctx.status(200), ctx.json(jolokiaRead));
-        }
-      } catch (e) {
-        console.error(e);
+  http.post('/instances/:instanceId/actuator/jolokia', async () => {
+    try {
+      const body = { type: 'read' };
+      if (body.type === 'read') {
+        return HttpResponse.json(jolokiaRead);
       }
-    },
-  ),
+    } catch (e) {
+      console.error(e);
+    }
+  }),
 ];
 
 export default jolokiaEndpoint;

spring-boot-admin-server-ui/src/main/frontend/mocks/instance/jolokia/index.ts

@@ -1,10 +1,10 @@
-import { rest } from 'msw';
+import { HttpResponse, http } from 'msw';
 
 import { liquibase } from './data.js';
 
 const liquibaseEndpoints = [
-  rest.get('/instances/:instanceId/actuator/liquibase', (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(liquibase));
+  http.get('/instances/:instanceId/actuator/liquibase', () => {
+    return HttpResponse.json(liquibase);
   }),
 ];