Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump the monitoring group in /monitoring with 5 updates #1001

Merged
merged 6 commits into from
Jun 4, 2024
Merged

chore(deps): bump the monitoring group in /monitoring with 5 updates #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f738ca3
chore(deps): bump the monitoring group in /monitoring with 5 updates
dependabot[bot] Jun 2, 2024
af2f80d
Install ts-node as ts-node-dev hasn't been updated
akinsola-guardian Jun 3, 2024
7c14fa6
update @guardian/eslint-config-typescript and eslint
akinsola-guardian Jun 3, 2024
a177704
Update .nvmrc
akinsola-guardian Jun 3, 2024
92c67dd
Update .nvmrc
akinsola-guardian Jun 3, 2024
dc9d77e
yarn lint updates
akinsola-guardian Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.0
18.18.0
2 changes: 1 addition & 1 deletion monitoring/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.0
18.18.0
19 changes: 10 additions & 9 deletions monitoring/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"test": "jest",
"test:dev": "jest --watch",
"lint": "eslint src/** localRun.ts --ext .ts --no-error-on-unmatched-pattern",
"start": "ts-node-dev localRun.ts",
"remote": "ts-node-dev remoteRun.ts",
"start": "ts-node localRun.ts",
"remote": "ts-node remoteRun.ts",
"build": "ncc build src/index.ts -o dist -e aws-sdk",
"validate": "npm-run-all test lint build"
},
"dependencies": {
"@aws-sdk/client-cloudwatch": "^3.583.0",
"@aws-sdk/client-cloudwatch": "^3.588.0",
"commander": "^11.1.0",
"dotenv": "^16.4.5",
"inquirer": "^8.2.6",
Expand All @@ -23,25 +23,26 @@
"uuid": "^9.0.1"
},
"devDependencies": {
"@aws-sdk/client-lambda": "^3.583.0",
"@aws-sdk/client-lambda": "^3.588.0",
"@babel/parser": "^7.24.6",
"@guardian/eslint-config-typescript": "^9.0.1",
"@guardian/eslint-config-typescript": "^10.0.1",
"@guardian/prettier": "^7.0.0",
"@guardian/tsconfig": "^0.3.1",
"@tsconfig/node18": "^18.2.4",
"@types/aws-lambda": "^8.10.138",
"@types/inquirer": "^8.2.10",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.12",
"@types/node": "^20.13.0",
"@vercel/ncc": "^0.38.1",
"aws-lambda": "^1.0.7",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"jest": "^29.7.0",
"markdown-toc": "^1.2.0",
"npm-run-all": "^4.1.5",
"ts-jest": "^29.1.3",
"ts-jest": "^29.1.4",
"ts-node": "^10.9.2",
"ts-node-dev": "^2.0.0",
"typescript": "5.1.3"
"typescript": "5.4.5"
},
"prettier": "@guardian/prettier",
"overrides": {
Expand Down
8 changes: 4 additions & 4 deletions monitoring/src/check-page/common-functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,19 @@ export const checkTopAdHasLoaded = async (page: Page) => {
): URLSearchParams | null => {
const url = new URL(request.url());
const param = url.searchParams.get(paramName);
if (!param) return null;
if (!param){return null;}
const paramDecoded = decodeURIComponent(param);
const searchParams = new URLSearchParams(paramDecoded);
return searchParams;
};

const assertOnSlotFromRequest = (request: Request, expectedSlot: string) => {
const isURL = request.url().match(gamUrl);
if (!isURL) return false;
if (!isURL){return false;}
const searchParams = getEncodedParamsFromRequest(request, 'prev_scp');
if (searchParams === null) return false;
if (searchParams === null){return false;}
const slot = searchParams.get('slot');
if (slot !== expectedSlot) return false;
if (slot !== expectedSlot) {return false;}
return true;
};

Expand Down
Loading
Loading