Skip to content

Commit fe093b3

Browse files
chore: fix dependencies issues, lint
1 parent 4fcc51c commit fe093b3

7 files changed

Lines changed: 172 additions & 160 deletions

File tree

‎apps/docs/public/mockServiceWorker.js‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@
77
* - Please do NOT modify this file.
88
*/
99

10-
const PACKAGE_VERSION = '2.12.8';
11-
const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82';
12-
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse');
13-
const activeClientIds = new Set();
10+
const PACKAGE_VERSION = '2.12.8'
11+
const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
12+
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
13+
const activeClientIds = new Set()
1414

1515
addEventListener('install', function () {
16-
self.skipWaiting();
17-
});
16+
self.skipWaiting()
17+
})
1818

1919
addEventListener('activate', function (event) {
20-
event.waitUntil(self.clients.claim());
21-
});
20+
event.waitUntil(self.clients.claim())
21+
})
2222

2323
addEventListener('message', async function (event) {
24-
const clientId = Reflect.get(event.source || {}, 'id');
24+
const clientId = Reflect.get(event.source || {}, 'id')
2525

2626
if (!clientId || !self.clients) {
27-
return;
27+
return
2828
}
2929

30-
const client = await self.clients.get(clientId);
30+
const client = await self.clients.get(clientId)
3131

3232
if (!client) {
33-
return;
33+
return
3434
}
3535

3636
const allClients = await self.clients.matchAll({
3737
type: 'window',
38-
});
38+
})
3939

4040
switch (event.data) {
4141
case 'KEEPALIVE_REQUEST': {
4242
sendToClient(client, {
4343
type: 'KEEPALIVE_RESPONSE',
44-
});
45-
break;
44+
})
45+
break
4646
}
4747

4848
case 'INTEGRITY_CHECK_REQUEST': {
@@ -52,12 +52,12 @@ addEventListener('message', async function (event) {
5252
packageVersion: PACKAGE_VERSION,
5353
checksum: INTEGRITY_CHECKSUM,
5454
},
55-
});
56-
break;
55+
})
56+
break
5757
}
5858

5959
case 'MOCK_ACTIVATE': {
60-
activeClientIds.add(clientId);
60+
activeClientIds.add(clientId)
6161

6262
sendToClient(client, {
6363
type: 'MOCKING_ENABLED',
@@ -67,33 +67,33 @@ addEventListener('message', async function (event) {
6767
frameType: client.frameType,
6868
},
6969
},
70-
});
71-
break;
70+
})
71+
break
7272
}
7373

7474
case 'CLIENT_CLOSED': {
75-
activeClientIds.delete(clientId);
75+
activeClientIds.delete(clientId)
7676

7777
const remainingClients = allClients.filter((client) => {
78-
return client.id !== clientId;
79-
});
78+
return client.id !== clientId
79+
})
8080

8181
// Unregister itself when there are no more clients
8282
if (remainingClients.length === 0) {
83-
self.registration.unregister();
83+
self.registration.unregister()
8484
}
8585

86-
break;
86+
break
8787
}
8888
}
89-
});
89+
})
9090

9191
addEventListener('fetch', function (event) {
92-
const requestInterceptedAt = Date.now();
92+
const requestInterceptedAt = Date.now()
9393

9494
// Bypass navigation requests.
9595
if (event.request.mode === 'navigate') {
96-
return;
96+
return
9797
}
9898

9999
// Opening the DevTools triggers the "only-if-cached" request
@@ -102,43 +102,43 @@ addEventListener('fetch', function (event) {
102102
event.request.cache === 'only-if-cached' &&
103103
event.request.mode !== 'same-origin'
104104
) {
105-
return;
105+
return
106106
}
107107

108108
// Bypass all requests when there are no active clients.
109109
// Prevents the self-unregistered worked from handling requests
110110
// after it's been terminated (still remains active until the next reload).
111111
if (activeClientIds.size === 0) {
112-
return;
112+
return
113113
}
114114

115-
const requestId = crypto.randomUUID();
116-
event.respondWith(handleRequest(event, requestId, requestInterceptedAt));
117-
});
115+
const requestId = crypto.randomUUID()
116+
event.respondWith(handleRequest(event, requestId, requestInterceptedAt))
117+
})
118118

119119
/**
120120
* @param {FetchEvent} event
121121
* @param {string} requestId
122122
* @param {number} requestInterceptedAt
123123
*/
124124
async function handleRequest(event, requestId, requestInterceptedAt) {
125-
const client = await resolveMainClient(event);
126-
const requestCloneForEvents = event.request.clone();
125+
const client = await resolveMainClient(event)
126+
const requestCloneForEvents = event.request.clone()
127127
const response = await getResponse(
128128
event,
129129
client,
130130
requestId,
131131
requestInterceptedAt,
132-
);
132+
)
133133

134134
// Send back the response clone for the "response:*" life-cycle events.
135135
// Ensure MSW is active and ready to handle the message, otherwise
136136
// this message will pend indefinitely.
137137
if (client && activeClientIds.has(client.id)) {
138-
const serializedRequest = await serializeRequest(requestCloneForEvents);
138+
const serializedRequest = await serializeRequest(requestCloneForEvents)
139139

140140
// Clone the response so both the client and the library could consume it.
141-
const responseClone = response.clone();
141+
const responseClone = response.clone()
142142

143143
sendToClient(
144144
client,
@@ -160,10 +160,10 @@ async function handleRequest(event, requestId, requestInterceptedAt) {
160160
},
161161
},
162162
responseClone.body ? [serializedRequest.body, responseClone.body] : [],
163-
);
163+
)
164164
}
165165

166-
return response;
166+
return response
167167
}
168168

169169
/**
@@ -175,30 +175,30 @@ async function handleRequest(event, requestId, requestInterceptedAt) {
175175
* @returns {Promise<Client | undefined>}
176176
*/
177177
async function resolveMainClient(event) {
178-
const client = await self.clients.get(event.clientId);
178+
const client = await self.clients.get(event.clientId)
179179

180180
if (activeClientIds.has(event.clientId)) {
181-
return client;
181+
return client
182182
}
183183

184184
if (client?.frameType === 'top-level') {
185-
return client;
185+
return client
186186
}
187187

188188
const allClients = await self.clients.matchAll({
189189
type: 'window',
190-
});
190+
})
191191

192192
return allClients
193193
.filter((client) => {
194194
// Get only those clients that are currently visible.
195-
return client.visibilityState === 'visible';
195+
return client.visibilityState === 'visible'
196196
})
197197
.find((client) => {
198198
// Find the client ID that's recorded in the
199199
// set of clients that have registered the worker.
200-
return activeClientIds.has(client.id);
201-
});
200+
return activeClientIds.has(client.id)
201+
})
202202
}
203203

204204
/**
@@ -211,48 +211,48 @@ async function resolveMainClient(event) {
211211
async function getResponse(event, client, requestId, requestInterceptedAt) {
212212
// Clone the request because it might've been already used
213213
// (i.e. its body has been read and sent to the client).
214-
const requestClone = event.request.clone();
214+
const requestClone = event.request.clone()
215215

216216
function passthrough() {
217217
// Cast the request headers to a new Headers instance
218218
// so the headers can be manipulated with.
219-
const headers = new Headers(requestClone.headers);
219+
const headers = new Headers(requestClone.headers)
220220

221221
// Remove the "accept" header value that marked this request as passthrough.
222222
// This prevents request alteration and also keeps it compliant with the
223223
// user-defined CORS policies.
224-
const acceptHeader = headers.get('accept');
224+
const acceptHeader = headers.get('accept')
225225
if (acceptHeader) {
226-
const values = acceptHeader.split(',').map((value) => value.trim());
226+
const values = acceptHeader.split(',').map((value) => value.trim())
227227
const filteredValues = values.filter(
228228
(value) => value !== 'msw/passthrough',
229-
);
229+
)
230230

231231
if (filteredValues.length > 0) {
232-
headers.set('accept', filteredValues.join(', '));
232+
headers.set('accept', filteredValues.join(', '))
233233
} else {
234-
headers.delete('accept');
234+
headers.delete('accept')
235235
}
236236
}
237237

238-
return fetch(requestClone, { headers });
238+
return fetch(requestClone, { headers })
239239
}
240240

241241
// Bypass mocking when the client is not active.
242242
if (!client) {
243-
return passthrough();
243+
return passthrough()
244244
}
245245

246246
// Bypass initial page load requests (i.e. static assets).
247247
// The absence of the immediate/parent client in the map of the active clients
248248
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
249249
// and is not ready to handle requests.
250250
if (!activeClientIds.has(client.id)) {
251-
return passthrough();
251+
return passthrough()
252252
}
253253

254254
// Notify the client that a request has been intercepted.
255-
const serializedRequest = await serializeRequest(event.request);
255+
const serializedRequest = await serializeRequest(event.request)
256256
const clientMessage = await sendToClient(
257257
client,
258258
{
@@ -264,19 +264,19 @@ async function getResponse(event, client, requestId, requestInterceptedAt) {
264264
},
265265
},
266266
[serializedRequest.body],
267-
);
267+
)
268268

269269
switch (clientMessage.type) {
270270
case 'MOCK_RESPONSE': {
271-
return respondWithMock(clientMessage.data);
271+
return respondWithMock(clientMessage.data)
272272
}
273273

274274
case 'PASSTHROUGH': {
275-
return passthrough();
275+
return passthrough()
276276
}
277277
}
278278

279-
return passthrough();
279+
return passthrough()
280280
}
281281

282282
/**
@@ -287,21 +287,21 @@ async function getResponse(event, client, requestId, requestInterceptedAt) {
287287
*/
288288
function sendToClient(client, message, transferrables = []) {
289289
return new Promise((resolve, reject) => {
290-
const channel = new MessageChannel();
290+
const channel = new MessageChannel()
291291

292292
channel.port1.onmessage = (event) => {
293293
if (event.data && event.data.error) {
294-
return reject(event.data.error);
294+
return reject(event.data.error)
295295
}
296296

297-
resolve(event.data);
298-
};
297+
resolve(event.data)
298+
}
299299

300300
client.postMessage(message, [
301301
channel.port2,
302302
...transferrables.filter(Boolean),
303-
]);
304-
});
303+
])
304+
})
305305
}
306306

307307
/**
@@ -314,17 +314,17 @@ function respondWithMock(response) {
314314
// instance will have status code set to 0. Since it's not possible to create
315315
// a Response instance with status code 0, handle that use-case separately.
316316
if (response.status === 0) {
317-
return Response.error();
317+
return Response.error()
318318
}
319319

320-
const mockedResponse = new Response(response.body, response);
320+
const mockedResponse = new Response(response.body, response)
321321

322322
Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
323323
value: true,
324324
enumerable: true,
325-
});
325+
})
326326

327-
return mockedResponse;
327+
return mockedResponse
328328
}
329329

330330
/**
@@ -345,5 +345,5 @@ async function serializeRequest(request) {
345345
referrerPolicy: request.referrerPolicy,
346346
body: await request.arrayBuffer(),
347347
keepalive: request.keepalive,
348-
};
348+
}
349349
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
"@testing-library/react": "16.0.1",
5656
"@testing-library/user-event": "14.5.2",
5757
"@turbo/gen": "2.8.3",
58-
"@typescript-eslint/eslint-plugin": "6.21.0",
59-
"@typescript-eslint/parser": "6.21.0",
58+
"@typescript-eslint/eslint-plugin": "8.53.1",
59+
"@typescript-eslint/parser": "8.53.1",
6060
"@vitest/coverage-v8": "2.1.9",
6161
"@vitest/ui": "2.1.9",
6262
"chromatic": "11.29.0",

‎packages/client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"dependencies": {
4747
"@edifice.io/utilities": "workspace:*",
4848
"axios": "1.13.4",
49-
"core-js": "3.48.0"
49+
"core-js": "3.48.0",
5050
"ua-parser-js": "2.0.9"
5151
},
5252
"devDependencies": {
@@ -56,7 +56,7 @@
5656
"jasmine": "5.1.0",
5757
"rimraf": "5.0.5",
5858
"rollup-plugin-visualizer": "catalog:",
59-
"typedoc": "0.25.7",
59+
"typedoc": "0.28.16",
6060
"typedoc-plugin-markdown": "3.17.1",
6161
"vite": "catalog:",
6262
"vite-plugin-dts": "catalog:"

0 commit comments

Comments
 (0)