Skip to content

Commit

Permalink
chore: update deps (#1006)
Browse files Browse the repository at this point in the history
  • Loading branch information
tdeekens authored Dec 11, 2022
1 parent 58ffa97 commit 8df4fe6
Show file tree
Hide file tree
Showing 22 changed files with 1,496 additions and 1,619 deletions.
12 changes: 12 additions & 0 deletions .changeset/real-kiwis-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@promster/apollo": patch
"@promster/express": patch
"@promster/fastify": patch
"@promster/hapi": patch
"@promster/marblejs": patch
"@promster/metrics": patch
"@promster/server": patch
"@promster/types": patch
---

chore: update deps
11 changes: 7 additions & 4 deletions .jestrc.test.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"displayName": "test",
"preset": "ts-jest/presets/default",
"globals": {
"ts-jest": {
"isolatedModules": true
}
"transform": {
"^.+\\.tsx?$": [
"ts-jest",
{
"isolatedModules": true
}
]
},
"setupFiles": [],
"setupFilesAfterEnv": ["./jest-runner-test.config.js"],
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,32 +57,32 @@
"@babel/preset-env": "7.20.2",
"@babel/preset-typescript": "7.18.6",
"@changesets/changelog-github": "0.4.7",
"@changesets/cli": "2.24.4",
"@commitlint/cli": "16.3.0",
"@commitlint/config-conventional": "16.2.4",
"@changesets/cli": "2.25.2",
"@commitlint/cli": "17.3.0",
"@commitlint/config-conventional": "17.3.0",
"@manypkg/cli": "0.19.2",
"@preconstruct/cli": "2.2.2",
"@typescript-eslint/eslint-plugin": "5.16.0",
"@typescript-eslint/parser": "5.16.0",
"@typescript-eslint/eslint-plugin": "5.46.0",
"@typescript-eslint/parser": "5.46.0",
"babel-eslint": "10.1.0",
"check-node-version": "4.2.1",
"codecov": "3.8.3",
"cross-env": "7.0.3",
"eslint": "8.11.0",
"eslint": "8.29.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-xo": "0.40.0",
"eslint-config-xo-typescript": "0.50.0",
"eslint-config-xo": "0.43.1",
"eslint-config-xo-typescript": "0.55.1",
"eslint-formatter-pretty": "4.1.0",
"eslint-plugin-jest": "26.1.2",
"eslint-plugin-prettier": "4.0.0",
"husky": "7.0.4",
"jest": "27.5.1",
"jest-runner-eslint": "1.0.1",
"jest-watch-typeahead": "1.0.0",
"lint-staged": "12.3.7",
"prettier": "2.6.2",
"eslint-plugin-jest": "27.1.6",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.2",
"jest": "29.3.1",
"jest-runner-eslint": "1.1.0",
"jest-watch-typeahead": "2.2.1",
"lint-staged": "13.1.0",
"prettier": "2.8.1",
"rimraf": "3.0.2",
"ts-jest": "27.1.5",
"typescript": "4.9.3"
"ts-jest": "29.0.3",
"typescript": "4.9.4"
}
}
8 changes: 4 additions & 4 deletions packages/apollo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
],
"dependencies": {
"@promster/metrics": "^9.1.5",
"apollo-server-plugin-base": "3.5.2",
"apollo-server-plugin-base": "3.7.1",
"merge-options": "3.0.4",
"tslib": "2.3.1"
"tslib": "2.4.1"
},
"devDependencies": {
"@graphql-tools/schema": "8.5.1",
"@graphql-tools/utils": "8.13.1",
"@graphql-tools/schema": "9.0.12",
"@graphql-tools/utils": "9.1.3",
"apollo-server": "3.11.1",
"graphql": "16.6.0",
"node-fetch": "2.6.7",
Expand Down
28 changes: 14 additions & 14 deletions packages/apollo/src/plugin/plugin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ it('should record GraphQL metrics for successful requests', async () => {
).metrics;

expect(graphQlRequestDurationSeconds).toMatchInlineSnapshot(`
Array [
Object {
"buckets": Object {
[
{
"buckets": {
"+Inf": "1",
"0.5": "1",
"0.9": "1",
Expand All @@ -245,9 +245,9 @@ it('should record GraphQL metrics for successful requests', async () => {
).metrics;

expect(graphQlResolveFieldDurationSeconds).toMatchInlineSnapshot(`
Array [
Object {
"buckets": Object {
[
{
"buckets": {
"+Inf": "2",
"0.5": "2",
"0.9": "2",
Expand Down Expand Up @@ -286,9 +286,9 @@ it('should record GraphQL metrics for failed requests in validation phase', asyn
).metrics;

expect(graphQlErrorsTotal).toMatchInlineSnapshot(`
Array [
Object {
"labels": Object {
[
{
"labels": {
"operation_name": "undefined",
"phase": "validation",
},
Expand Down Expand Up @@ -324,16 +324,16 @@ it('should record GraphQL metrics for failed requests in execute phase', async (
).metrics;

expect(graphQlErrorsTotal).toMatchInlineSnapshot(`
Array [
Object {
"labels": Object {
[
{
"labels": {
"operation_name": "undefined",
"phase": "validation",
},
"value": "1",
},
Object {
"labels": Object {
{
"labels": {
"field_name": "isbn",
"operation_name": "undefined",
"phase": "execution",
Expand Down
2 changes: 1 addition & 1 deletion packages/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@promster/metrics": "^9.1.5",
"merge-options": "3.0.4",
"tslib": "2.3.1"
"tslib": "2.4.1"
},
"devDependencies": {
"@promster/server": "7.0.7",
Expand Down
12 changes: 6 additions & 6 deletions packages/express/src/middleware/middleware.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestsTotal).toMatchInlineSnapshot(`
Array [
Object {
"labels": Object {
[
{
"labels": {
"method": "get",
"path": "/",
"status_code": "200",
Expand All @@ -178,9 +178,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestDurationSeconds).toMatchInlineSnapshot(`
Array [
Object {
"buckets": Object {
[
{
"buckets": {
"+Inf": "1",
"0.05": "1",
"0.1": "1",
Expand Down
3 changes: 2 additions & 1 deletion packages/express/src/middleware/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
TDefaultedPromsterOptions,
} from '@promster/types';
import type { TRequestRecorder } from '@promster/metrics';
import { Application, Request, Response, NextFunction } from 'express';
import type { Application, Request, Response, NextFunction } from 'express';

import merge from 'merge-options';
import {
Expand All @@ -19,6 +19,7 @@ import {
timing,
} from '@promster/metrics';

// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
interface TApp extends Application {
locals: Record<string, unknown>;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/fastify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
],
"dependencies": {
"@promster/metrics": "^9.1.5",
"fastify-plugin": "^3.0.1",
"fastify-plugin": "^4.4.0",
"merge-options": "3.0.4",
"parse-prometheus-text-format": "1.1.1"
},
"devDependencies": {
"fastify": "3.29.4"
"fastify": "4.10.2"
}
}
12 changes: 6 additions & 6 deletions packages/fastify/src/plugin/plugin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestsTotal).toMatchInlineSnapshot(`
Array [
Object {
"labels": Object {
[
{
"labels": {
"method": "get",
"path": "/",
"status_code": "200",
Expand All @@ -172,9 +172,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestDurationSeconds).toMatchInlineSnapshot(`
Array [
Object {
"buckets": Object {
[
{
"buckets": {
"+Inf": "1",
"0.05": "1",
"0.1": "1",
Expand Down
2 changes: 1 addition & 1 deletion packages/fastify/src/plugin/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
TDefaultedPromsterOptions,
} from '@promster/types';
import type { TRequestRecorder, TPromsterTiming } from '@promster/metrics';
import { FastifyInstance, FastifyRequest } from 'fastify';
import type { FastifyInstance, FastifyRequest } from 'fastify';

import fastifyPlugin from 'fastify-plugin';
import merge from 'merge-options';
Expand Down
2 changes: 1 addition & 1 deletion packages/hapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@promster/metrics": "^9.1.5",
"merge-options": "3.0.4",
"semver": "7.3.8",
"tslib": "2.3.1"
"tslib": "2.4.1"
},
"devDependencies": {
"@hapi/boom": "9.1.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/hapi/src/plugin/plugin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestsTotal).toMatchInlineSnapshot(`
Array [
Object {
"labels": Object {
[
{
"labels": {
"method": "get",
"path": "/",
"status_code": "200",
Expand All @@ -169,9 +169,9 @@ it('should record http metrics', async () => {
).metrics;

expect(httpRequestDurationSeconds).toMatchInlineSnapshot(`
Array [
Object {
"buckets": Object {
[
{
"buckets": {
"+Inf": "1",
"0.05": "1",
"0.1": "1",
Expand Down
1 change: 1 addition & 0 deletions packages/hapi/src/plugin/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
timing,
} from '@promster/metrics';

// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
interface TPromsterRequest extends Request {
plugins: {
promster: {
Expand Down
2 changes: 1 addition & 1 deletion packages/marblejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@promster/metrics": "^9.1.5",
"merge-options": "3.0.4",
"rxjs": "^6.6.7",
"tslib": "2.3.1"
"tslib": "2.4.1"
},
"devDependencies": {
"@marblejs/core": "4.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/marblejs/src/middleware/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import type {
import type { TRequestRecorder, TPromsterTiming } from '@promster/metrics';

import merge from 'merge-options';
import { HttpRequest, HttpResponse } from '@marblejs/core';
import { fromEvent, Observable } from 'rxjs';
import type { HttpRequest, HttpResponse } from '@marblejs/core';
import { fromEvent, type Observable } from 'rxjs';
import { tap, map, take, mapTo } from 'rxjs/operators';
import {
createHttpMetrics,
Expand Down
10 changes: 5 additions & 5 deletions packages/metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@
"lodash.once": "4.1.1",
"merge-options": "3.0.4",
"optional": "0.1.4",
"ts-essentials": "9.1.2",
"tslib": "2.3.1",
"url-value-parser": "2.1.0"
"ts-essentials": "9.3.0",
"tslib": "2.4.1",
"url-value-parser": "2.2.0"
},
"devDependencies": {
"@promster/types": "^3.2.4",
"@types/lodash": "4.14.191",
"prom-client": "14.1.0",
"typescript": "4.9.3"
"typescript": "4.9.4"
},
"optionalDependencies": {
"@sematext/gc-stats": "1.5.7"
"@sematext/gc-stats": "1.5.8"
},
"peerDependencies": {
"prom-client": "13.x.x || 14.x"
Expand Down
1 change: 1 addition & 0 deletions packages/metrics/src/client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { skipMetricsInEnvironment } from '../environment';
// We could create multiple registries with `new Prometheus.registry()`.
const defaultRegister = Prometheus.register;

// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
interface TClientOptions
extends Prometheus.DefaultMetricsCollectorConfiguration {
detectKubernetes?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import type {
TLabelValues,
THttpMetrics,
} from '@promster/types';
import type { Timing } from '../timing';

import merge from 'merge-options';
import { skipMetricsInEnvironment } from '../environment';
import { sortLabels } from '../sort-labels';
import { endMeasurementFrom } from '../end-measurement-from';
import { Timing } from '../timing';

type TRecordingOptions = {
labels: TLabelValues;
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
],
"dependencies": {
"@promster/metrics": "^9.1.5",
"tslib": "2.3.1"
"tslib": "2.4.1"
},
"devDependencies": {
"@types/node": "17.0.21"
"@types/node": "18.11.13"
}
}
2 changes: 1 addition & 1 deletion packages/types/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { DeepRequired } from 'ts-essentials';
import { Gauge, Counter, Summary, Histogram } from 'prom-client';
import type { Gauge, Counter, Summary, Histogram } from 'prom-client';

export type TLabelValues = Record<string, string | number>;

Expand Down
Loading

0 comments on commit 8df4fe6

Please sign in to comment.