Skip to content

Commit

Permalink
chore(deps): update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
awlayton committed May 21, 2024
1 parent 5e83126 commit 0a12281
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 695 deletions.
14 changes: 7 additions & 7 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root: true

extends:
- 'plugin:@typescript-eslint/recommended'
- plugin:@typescript-eslint/recommended
- plugin:node/recommended
- plugin:github/recommended
- plugin:promise/recommended
Expand All @@ -14,7 +14,7 @@ extends:
#- plugin:sonarjs/recommended
- plugin:ava/recommended
- xo
#- prettier
- plugin:prettier/recommended

plugins:
- '@typescript-eslint'
Expand All @@ -37,18 +37,18 @@ parser: '@typescript-eslint/parser'

parserOptions:
ecmaVersion: 2020
project: './**/tsconfig.*'
project: ./**/tsconfig.*

overrides:
- files: '*.ts'
extends:
- plugin:github/typescript
- plugin:import/typescript
- xo-typescript
#- prettier
- plugin:prettier/recommended
parserOptions:
ecmaVersion: 2020
project: './**/tsconfig.*'
project: ./**/tsconfig.*
rules:
'@typescript-eslint/naming-convention':
[
Expand Down Expand Up @@ -86,8 +86,8 @@ overrides:
{
args: after-used,
ignoreRestSiblings: true,
varsIgnorePattern: '^_',
argsIgnorePattern: '^_',
varsIgnorePattern: ^_,
argsIgnorePattern: ^_,
},
]
'@typescript-eslint/consistent-type-definitions': [warn, interface]
Expand Down
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

8 changes: 0 additions & 8 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,4 @@ packageExtensions:
"#ansi-styles": "npm:[email protected]"
"#supports-color": "npm:[email protected]"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-4.2.2.cjs
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trellisfw/monitor",
"version": "2.1.1",
"version": "2.2.0",
"description": "A Trellis microservice to respond to monitor pings, spawn and check things internally, and respond with success or fail",
"main": "dist/index.js",
"type": "module",
Expand All @@ -14,6 +14,7 @@
"build": "tsc -b",
"start": "node --enable-source-maps dist/index.js",
"test": "yarn build test && ava",
"test:debug": "ava -T 60m -sv",
"test:live": "cross-env NOCK_MODE=live yarn test",
"test:record": "cross-env NOCK_MODE=record yarn test"
},
Expand Down Expand Up @@ -53,12 +54,12 @@
"@types/debug": "^4.1.12",
"@types/express": "^4.17.21",
"@types/micromatch": "^4.0.7",
"@types/node": "20.12.11",
"@types/node": "20.12.12",
"@types/node-cron": "^3.0.11",
"@types/sinonjs__fake-timers": "^8.1.5",
"@types/tiny-json-http": "^7.3.4",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"@yarnpkg/sdks": "^3.1.2",
"ava": "6.1.3",
"ava-nock": "^2.1.0",
Expand All @@ -70,16 +71,16 @@
"eslint-formatter-pretty": "^6.0.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-array-func": "^5.0.1",
"eslint-plugin-ava": "^15.0.0",
"eslint-plugin-ava": "^15.0.1",
"eslint-plugin-escompat": "^3.4.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-github": "^4.10.2",
"eslint-plugin-github": "^5.0.0-2",
"eslint-plugin-i18n-text": "^1.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-no-constructor-bind": "^2.0.4",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-no-secrets": "^0.9.1",
"eslint-plugin-no-secrets": "^1.0.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-notice": "^0.9.10",
"eslint-plugin-optimize-regex": "^1.2.1",
Expand Down
1 change: 0 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ for await (const t of testfiles) {
continue;
}

// eslint-disable-next-line security/detect-object-injection
rawtests.set(te, testsFile[te]!);
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/testers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,11 @@ const staleKsuidKeys = async ({
if (errors.length > 0) {
return {
status: 'failure',
message: `Had ${errors.length
} ksuid keys beyond maxage of ${maxage}: ${JSON.stringify(
errors.map((aError) => aError.string),
)}`,
message: `Had ${
errors.length
} ksuid keys beyond maxage of ${maxage}: ${JSON.stringify(
errors.map((aError) => aError.string),
)}`,
};
}

Expand All @@ -220,7 +221,6 @@ const countKeys = async ({
}): Promise<TestResult> => {
try {
if (index) {
// eslint-disable-next-line sonarjs/no-small-switch
switch (index) {
case 'day-index': {
path = `${path}/day-index/${moment().format('YYYY-MM-DD')}`;
Expand Down
2 changes: 1 addition & 1 deletion test/maxAge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ setup({ uuid });

let oada: OADAClient;

const path = `/resources/TRELLIS-MONITOR-TEST-${uuid}`;
const path = `/resources/TRELLIS-MONITOR-TEST-${uuid}` as const;
const delay = 1001;

test.before(async () => {
Expand Down
6 changes: 4 additions & 2 deletions test/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ import { fileURLToPath } from 'node:url';
import { configure, setupTests } from 'ava-nock';
import test from 'ava';

import FakeTimers from '@sinonjs/fake-timers';
// import FakeTimers from '@sinonjs/fake-timers';

// Fake the time
/*
FakeTimers.install({
now: new Date('2022-01-01T00:00:00Z'),
shouldAdvanceTime: true,
advanceTimeDelta: 10,
});
*/

/**
* Set up recording and mocking of network requests
Expand All @@ -45,7 +47,7 @@ export default function setup(
let output = input;
for (const [name, value] of Object.entries(variables)) {
const template = `{{ ${name} }}`;
// eslint-disable-next-line security/detect-non-literal-regexp

output = output.replaceAll(new RegExp(String(value), 'g'), template);
}

Expand Down
Loading

0 comments on commit 0a12281

Please sign in to comment.