Skip to content

Commit

Permalink
chore(deps): update turbo
Browse files Browse the repository at this point in the history
  • Loading branch information
anymaniax committed May 17, 2024
1 parent efc4c35 commit 31bbb26
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 150 deletions.
5 changes: 1 addition & 4 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commitlint --edit
yarn commitlint --edit
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint
yarn test:ci
yarn format:staged
4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ node_modules

# Build
.next
**/dist
**/dist
.husky
mockServiceWorker.js
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"prerelease": "yarn build && cd ./tests && yarn generate && yarn build",
"release": "dotenv release-it",
"postrelease": "yarn build && yarn update-samples",
"prepare": "husky install && cd ./samples/react-query/basic && yarn",
"prepare": "husky",
"commitlint": "commitlint",
"update-samples": "zx ./scripts/update-samples.mjs",
"build": "turbo run build",
Expand Down Expand Up @@ -54,7 +54,7 @@
"release-it": "^15.6.0",
"rimraf": "^5.0.5",
"tsup": "^8.0.2",
"turbo": "^1.12.4",
"turbo": "^1.13.3",
"typescript": "^4.7.4",
"vitest": "^0.6.3",
"zx": "^7.2.3"
Expand Down
144 changes: 72 additions & 72 deletions samples/vue-query/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,124 +8,124 @@
* - Please do NOT serve this file on production.
*/

const INTEGRITY_CHECKSUM = '0877fcdc026242810f5bfde0d7178db4';
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse');
const activeClientIds = new Set();
const INTEGRITY_CHECKSUM = '0877fcdc026242810f5bfde0d7178db4'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

self.addEventListener('install', function () {
self.skipWaiting();
});
self.skipWaiting()
})

self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim());
});
event.waitUntil(self.clients.claim())
})

self.addEventListener('message', async function (event) {
const clientId = event.source.id;
const clientId = event.source.id

if (!clientId || !self.clients) {
return;
return
}

const client = await self.clients.get(clientId);
const client = await self.clients.get(clientId)

if (!client) {
return;
return
}

const allClients = await self.clients.matchAll({
type: 'window',
});
})

switch (event.data) {
case 'KEEPALIVE_REQUEST': {
sendToClient(client, {
type: 'KEEPALIVE_RESPONSE',
});
break;
})
break
}

case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: 'INTEGRITY_CHECK_RESPONSE',
payload: INTEGRITY_CHECKSUM,
});
break;
})
break
}

case 'MOCK_ACTIVATE': {
activeClientIds.add(clientId);
activeClientIds.add(clientId)

sendToClient(client, {
type: 'MOCKING_ENABLED',
payload: true,
});
break;
})
break
}

case 'MOCK_DEACTIVATE': {
activeClientIds.delete(clientId);
break;
activeClientIds.delete(clientId)
break
}

case 'CLIENT_CLOSED': {
activeClientIds.delete(clientId);
activeClientIds.delete(clientId)

const remainingClients = allClients.filter((client) => {
return client.id !== clientId;
});
return client.id !== clientId
})

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister();
self.registration.unregister()
}

break;
break
}
}
});
})

self.addEventListener('fetch', function (event) {
const { request } = event;
const { request } = event

// Bypass navigation requests.
if (request.mode === 'navigate') {
return;
return
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
return;
return
}

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

// Generate unique request ID.
const requestId = crypto.randomUUID();
event.respondWith(handleRequest(event, requestId));
});
const requestId = crypto.randomUUID()
event.respondWith(handleRequest(event, requestId))
})

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event);
const response = await getResponse(event, client, requestId);
const client = await resolveMainClient(event)
const response = await getResponse(event, client, requestId)

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
(async function () {
const responseClone = response.clone();
;(async function () {
const responseClone = response.clone()
// When performing original requests, response body will
// always be a ReadableStream, even for 204 responses.
// But when creating a new Response instance on the client,
// the body for a 204 response must be null.
const responseBody = response.status === 204 ? null : responseClone.body;
const responseBody = response.status === 204 ? null : responseClone.body

sendToClient(
client,
Expand All @@ -142,80 +142,80 @@ async function handleRequest(event, requestId) {
},
},
[responseBody],
);
})();
)
})()
}

return response;
return response
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId);
const client = await self.clients.get(event.clientId)

if (client?.frameType === 'top-level') {
return client;
return client
}

const allClients = await self.clients.matchAll({
type: 'window',
});
})

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === 'visible';
return client.visibilityState === 'visible'
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id);
});
return activeClientIds.has(client.id)
})
}

async function getResponse(event, client, requestId) {
const { request } = event;
const { request } = event

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone();
const requestClone = request.clone()

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries());
const headers = Object.fromEntries(requestClone.headers.entries())

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
delete headers['x-msw-intention'];
delete headers['x-msw-intention']

return fetch(requestClone, { headers });
return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough();
return passthrough()
}

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

// Bypass requests with the explicit bypass header.
// Such requests can be issued by "ctx.fetch()".
const mswIntention = request.headers.get('x-msw-intention');
const mswIntention = request.headers.get('x-msw-intention')
if (['bypass', 'passthrough'].includes(mswIntention)) {
return passthrough();
return passthrough()
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer();
const requestBuffer = await request.arrayBuffer()
const clientMessage = await sendToClient(
client,
{
Expand All @@ -238,38 +238,38 @@ async function getResponse(event, client, requestId) {
},
},
[requestBuffer],
);
)

switch (clientMessage.type) {
case 'MOCK_RESPONSE': {
return respondWithMock(clientMessage.data);
return respondWithMock(clientMessage.data)
}

case 'MOCK_NOT_FOUND': {
return passthrough();
return passthrough()
}
}

return passthrough();
return passthrough()
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel();
const channel = new MessageChannel()

channel.port1.onmessage = (event) => {
if (event.data && event.data.error) {
return reject(event.data.error);
return reject(event.data.error)
}

resolve(event.data);
};
resolve(event.data)
}

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean)),
);
});
)
})
}

async function respondWithMock(response) {
Expand All @@ -278,15 +278,15 @@ async function respondWithMock(response) {
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error();
return Response.error()
}

const mockedResponse = new Response(response.body, response);
const mockedResponse = new Response(response.body, response)

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
});
})

return mockedResponse;
return mockedResponse
}
Loading

0 comments on commit 31bbb26

Please sign in to comment.