Skip to content

Commit

Permalink
Resolve issues to enable passing CI tests. (gravitational#20582)
Browse files Browse the repository at this point in the history
* Move lint commands to root package.json

* Correctly resolve e-teleport paths.

* Fix prettier issues.

* move eslint configuration files to root.

* resolve lint errors.
  • Loading branch information
hatched authored Jan 23, 2023
1 parent dfd3acb commit 0f21a8b
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 102 deletions.
File renamed without changes.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
const eslint = require('./web/packages/build/.eslintrc');
module.exports = eslint;
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
"build-native-deps-for-term": "yarn workspace @gravitational/namespaces build-native-deps-for-term",
"build-and-package-term-ci": "yarn workspace @gravitational/namespaces build-and-package-term-ci",
"test": "yarn workspace @gravitational/namespaces test",
"type-check": "yarn workspace @gravitational/namespaces type-check"
"lint": "yarn prettier-check && yarn eslint",
"eslint": "eslint --quiet --ext .js,.jsx,.ts,.tsx web/",
"type-check": "tsc --noEmit",
"prettier-check": "yarn prettier --check 'web/**/*.{ts,tsx,js,jsx,md}'",
"prettier-write": "yarn prettier --write 'web/**/*.{ts,tsx,js,jsx,md}'"
},
"private": true,
"resolutions": {
Expand All @@ -34,4 +38,4 @@
]
}

}
}
2 changes: 0 additions & 2 deletions web/.eslintrc.js

This file was deleted.

172 changes: 86 additions & 86 deletions web/.storybook/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,121 +8,121 @@
* - Please do NOT serve this file on production.
*/

const INTEGRITY_CHECKSUM = 'b3066ef78c2f9090b4ce87e874965995'
const activeClientIds = new Set()
const INTEGRITY_CHECKSUM = 'b3066ef78c2f9090b4ce87e874965995';
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
})
const remainingClients = allClients.filter(client => {
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 accept = request.headers.get('accept') || ''
const { request } = event;
const accept = request.headers.get('accept') || '';

// Bypass server-sent events.
if (accept.includes('text/event-stream')) {
return
return;
}

// 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 = Math.random().toString(16).slice(2)
const requestId = Math.random().toString(16).slice(2);

event.respondWith(
handleRequest(event, requestId).catch((error) => {
handleRequest(event, requestId).catch(error => {
if (error.name === 'NetworkError') {
console.warn(
'[MSW] Successfully emulated a network error for the "%s %s" request.',
request.method,
request.url,
)
return
request.url
);
return;
}

// At this point, any exception indicates an issue with the original request/response.
Expand All @@ -131,22 +131,22 @@ self.addEventListener('fetch', function (event) {
[MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
request.method,
request.url,
`${error.name}: ${error.message}`,
)
}),
)
})
`${error.name}: ${error.message}`
);
})
);
});

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 clonedResponse = response.clone()
(async function () {
const clonedResponse = response.clone();
sendToClient(client, {
type: 'RESPONSE',
payload: {
Expand All @@ -160,75 +160,75 @@ async function handleRequest(event, requestId) {
headers: Object.fromEntries(clonedResponse.headers.entries()),
redirected: clonedResponse.redirected,
},
})
})()
});
})();
}

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) => {
.filter(client => {
// Get only those clients that are currently visible.
return client.visibilityState === 'visible'
return client.visibilityState === 'visible';
})
.find((client) => {
.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 clonedRequest = request.clone()
const { request } = event;
const clonedRequest = request.clone();

function passthrough() {
// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const headers = Object.fromEntries(clonedRequest.headers.entries())
const headers = Object.fromEntries(clonedRequest.headers.entries());

// Remove MSW-specific request headers so the bypassed requests
// comply with the server's CORS preflight check.
// Operate with the headers as an object because request "Headers"
// are immutable.
delete headers['x-msw-bypass']
delete headers['x-msw-bypass'];

return fetch(clonedRequest, { headers })
return fetch(clonedRequest, { 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()".
if (request.headers.get('x-msw-bypass') === 'true') {
return passthrough()
return passthrough();
}

// Notify the client that a request has been intercepted.
Expand All @@ -251,53 +251,53 @@ async function getResponse(event, client, requestId) {
bodyUsed: request.bodyUsed,
keepalive: request.keepalive,
},
})
});

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

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

case 'NETWORK_ERROR': {
const { name, message } = clientMessage.data
const networkError = new Error(message)
networkError.name = name
const { name, message } = clientMessage.data;
const networkError = new Error(message);
networkError.name = name;

// Rejecting a "respondWith" promise emulates a network error.
throw networkError
throw networkError;
}
}

return passthrough()
return passthrough();
}

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

channel.port1.onmessage = (event) => {
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])
})
client.postMessage(message, [channel.port2]);
});
}

function sleep(timeMs) {
return new Promise((resolve) => {
setTimeout(resolve, timeMs)
})
return new Promise(resolve => {
setTimeout(resolve, timeMs);
});
}

async function respondWithMock(response) {
await sleep(response.delay)
return new Response(response.body, response)
await sleep(response.delay);
return new Response(response.body, response);
}
2 changes: 1 addition & 1 deletion web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ By default, Webpack will store a cache in `node_modules/.cache/webpack` during d
makes starting `webpack-dev-server` really quick after having ran it once, as it will re-use the
cache from the last time it was running.

If you want to change the location of the cache, you can set `WEBPACK_CACHE_DIRECTORY` to an
If you want to change the location of the cache, you can set `WEBPACK_CACHE_DIRECTORY` to an
absolute file path of the folder where you want to store Webpack's cache.

If you wish to disable the cache, you can set `WEBPACK_CACHE_DISABLED` to `yes`.
Expand Down
Loading

0 comments on commit 0f21a8b

Please sign in to comment.