Skip to content

Commit

Permalink
Bygg preview med nyere JS støtte
Browse files Browse the repository at this point in the history
  • Loading branch information
LudvigHz committed Oct 30, 2024
1 parent 56851cc commit 3c33f06
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: oven-sh/setup-bun@v2
with:
registry-url: https://npm.pkg.github.com
scope: "@navikt"
scope: '@navikt'

- run: bun install
working-directory: './packages/internarbeidsflate-decorator-v3'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-v3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: oven-sh/setup-bun@v1
with:
registry-url: https://npm.pkg.github.com
scope: "@navikt"
scope: '@navikt'

- name: Install lint dependencies
run: bun install
Expand Down
2 changes: 1 addition & 1 deletion packages/internarbeidsflate-decorator-v3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
"public"
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default defineConfig({
plugins: [react()],
base: '/internarbeidsflatedecorator/',
build: {
target: 'es2022',
cssMinify: true,
minify: true,
},
Expand Down
142 changes: 71 additions & 71 deletions packages/internarbeidsflate-decorator-v3/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.6.0'
const INTEGRITY_CHECKSUM = '07a8241b182f8a246a7cd39894799a9e'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
const PACKAGE_VERSION = '2.6.0';
const INTEGRITY_CHECKSUM = '07a8241b182f8a246a7cd39894799a9e';
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': {
Expand All @@ -53,12 +53,12 @@ self.addEventListener('message', async function (event) {
packageVersion: PACKAGE_VERSION,
checksum: INTEGRITY_CHECKSUM,
},
})
break
});
break;
}

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

sendToClient(client, {
type: 'MOCKING_ENABLED',
Expand All @@ -68,68 +68,68 @@ self.addEventListener('message', async function (event) {
frameType: client.frameType,
},
},
})
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();

sendToClient(
client,
Expand All @@ -146,77 +146,77 @@ async function handleRequest(event, requestId) {
},
},
[responseClone.body],
)
})()
);
})();
}

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 (activeClientIds.has(event.clientId)) {
return client
return client;
}

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();
}

// 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 @@ -239,38 +239,38 @@ async function getResponse(event, client, requestId) {
},
},
[requestBuffer],
)
);

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

case 'PASSTHROUGH': {
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 @@ -279,15 +279,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;
}

0 comments on commit 3c33f06

Please sign in to comment.