From 8858e60217dda81a0416c3902e393ef68a60e1df Mon Sep 17 00:00:00 2001 From: Bartlomiej Obecny Date: Sat, 8 May 2021 10:09:45 +0200 Subject: [PATCH] moving dev dependency for types to main dependency (#468) Co-authored-by: Valentin Marchaud --- .../opentelemetry-instrumentation-aws-lambda/package.json | 4 ++-- .../node/opentelemetry-instrumentation-bunyan/package.json | 4 ++-- .../node/opentelemetry-instrumentation-express/package.json | 4 ++-- .../node/opentelemetry-instrumentation-graphql/package.json | 4 ++-- .../node/opentelemetry-instrumentation-hapi/package.json | 4 ++-- .../node/opentelemetry-instrumentation-ioredis/package.json | 5 ++--- plugins/node/opentelemetry-instrumentation-koa/package.json | 6 +++--- .../node/opentelemetry-instrumentation-mongodb/package.json | 4 ++-- .../node/opentelemetry-instrumentation-mysql/package.json | 4 ++-- plugins/node/opentelemetry-instrumentation-pg/package.json | 6 +++--- .../node/opentelemetry-instrumentation-pino/package.json | 4 ++-- .../node/opentelemetry-instrumentation-redis/package.json | 4 ++-- .../node/opentelemetry-instrumentation-restify/package.json | 4 ++-- .../package.json | 1 - 14 files changed, 28 insertions(+), 30 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json index 91f49bc91db..ef41aae7e8c 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json @@ -42,7 +42,6 @@ }, "devDependencies": { "@opentelemetry/node": "0.19.0", - "@types/aws-lambda": "8.10.76", "@types/mocha": "7.0.2", "@types/node": "14.14.43", "codecov": "3.8.1", @@ -58,6 +57,7 @@ "@opentelemetry/instrumentation": "^0.19.0", "@opentelemetry/resources": "^0.19.0", "@opentelemetry/semantic-conventions": "^0.19.0", - "@opentelemetry/tracing": "^0.19.0" + "@opentelemetry/tracing": "^0.19.0", + "@types/aws-lambda": "8.10.76" } } diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json index 9aea67646ac..839cfc40c9e 100644 --- a/plugins/node/opentelemetry-instrumentation-bunyan/package.json +++ b/plugins/node/opentelemetry-instrumentation-bunyan/package.json @@ -45,7 +45,6 @@ "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", - "@types/bunyan": "1.8.6", "@types/mocha": "7.0.2", "@types/node": "14.14.43", "@types/sinon": "9.0.11", @@ -61,6 +60,7 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", - "@opentelemetry/instrumentation": "^0.19.0" + "@opentelemetry/instrumentation": "^0.19.0", + "@types/bunyan": "1.8.6" } } diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json index f8209757d80..0dbef8ab346 100644 --- a/plugins/node/opentelemetry-instrumentation-express/package.json +++ b/plugins/node/opentelemetry-instrumentation-express/package.json @@ -45,7 +45,6 @@ "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", - "@types/express": "4.17.11", "@types/mocha": "7.0.2", "@types/node": "14.14.43", "codecov": "3.8.1", @@ -61,6 +60,7 @@ "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/core": "^0.19.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/express": "4.17.11" } } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index f6fb3af929f..8c821bdafc2 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -44,7 +44,6 @@ }, "devDependencies": { "@opentelemetry/tracing": "0.19.0", - "@types/graphql": "14.5.0", "@types/mocha": "8.2.2", "@types/node": "14.14.43", "codecov": "3.8.1", @@ -58,6 +57,7 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", - "@opentelemetry/instrumentation": "^0.19.0" + "@opentelemetry/instrumentation": "^0.19.0", + "@types/graphql": "14.5.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json index eebf3043bf9..1ee63dad8b4 100644 --- a/plugins/node/opentelemetry-instrumentation-hapi/package.json +++ b/plugins/node/opentelemetry-instrumentation-hapi/package.json @@ -45,7 +45,6 @@ "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", - "@types/hapi__hapi": "20.0.8", "@types/mocha": "7.0.2", "@types/node": "12.20.11", "codecov": "3.8.1", @@ -60,6 +59,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/hapi__hapi": "20.0.8" } } diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json index cef7ce084c2..7e33ca6563b 100644 --- a/plugins/node/opentelemetry-instrumentation-ioredis/package.json +++ b/plugins/node/opentelemetry-instrumentation-ioredis/package.json @@ -48,10 +48,8 @@ "@opentelemetry/node": "0.19.0", "@opentelemetry/test-utils": "^0.16.0", "@opentelemetry/tracing": "0.19.0", - "@types/ioredis": "4.26.1", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/shimmer": "1.0.1", "codecov": "3.8.1", "cross-env": "7.0.3", "gts": "3.1.0", @@ -65,6 +63,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/ioredis": "4.26.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json index da41d1e00a5..1e2c3d6c392 100644 --- a/plugins/node/opentelemetry-instrumentation-koa/package.json +++ b/plugins/node/opentelemetry-instrumentation-koa/package.json @@ -47,8 +47,6 @@ "@opentelemetry/context-async-hooks": "0.19.0", "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", - "@types/koa": "2.13.1", - "@types/koa__router": "8.0.4", "@types/mocha": "7.0.2", "@types/node": "12.20.11", "codecov": "3.8.1", @@ -63,6 +61,8 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/koa": "2.13.1", + "@types/koa__router": "8.0.4" } } diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json index 600274dd7ad..bdaf3a30327 100644 --- a/plugins/node/opentelemetry-instrumentation-mongodb/package.json +++ b/plugins/node/opentelemetry-instrumentation-mongodb/package.json @@ -47,7 +47,6 @@ "@opentelemetry/node": "0.19.0", "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", - "@types/mongodb": "3.6.12", "@types/node": "14.14.43", "codecov": "3.8.1", "gts": "3.1.0", @@ -61,6 +60,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/mongodb": "3.6.12" } } diff --git a/plugins/node/opentelemetry-instrumentation-mysql/package.json b/plugins/node/opentelemetry-instrumentation-mysql/package.json index 98639bc45b8..9382004acaf 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql/package.json @@ -45,7 +45,6 @@ "@opentelemetry/test-utils": "^0.16.0", "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", - "@types/mysql": "2.15.18", "@types/node": "14.14.43", "codecov": "3.8.1", "gts": "3.1.0", @@ -59,6 +58,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/mysql": "2.15.18" } } diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json index 629bfc78805..2442b4b92c3 100644 --- a/plugins/node/opentelemetry-instrumentation-pg/package.json +++ b/plugins/node/opentelemetry-instrumentation-pg/package.json @@ -53,8 +53,6 @@ "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/pg": "7.14.11", - "@types/pg-pool": "2.0.2", "codecov": "3.8.1", "cross-env": "7.0.3", "gts": "3.1.0", @@ -68,6 +66,8 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", - "@opentelemetry/instrumentation": "^0.19.0" + "@opentelemetry/instrumentation": "^0.19.0", + "@types/pg": "7.14.11", + "@types/pg-pool": "2.0.2" } } diff --git a/plugins/node/opentelemetry-instrumentation-pino/package.json b/plugins/node/opentelemetry-instrumentation-pino/package.json index e731dbeb6b3..9c39e6ca108 100644 --- a/plugins/node/opentelemetry-instrumentation-pino/package.json +++ b/plugins/node/opentelemetry-instrumentation-pino/package.json @@ -47,7 +47,6 @@ "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/pino": "6.3.8", "@types/semver": "7.3.5", "@types/sinon": "9.0.11", "codecov": "3.8.1", @@ -64,6 +63,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "semver": "^7.3.5" + "semver": "^7.3.5", + "@types/pino": "6.3.8" } } diff --git a/plugins/node/opentelemetry-instrumentation-redis/package.json b/plugins/node/opentelemetry-instrumentation-redis/package.json index 91753c361ac..c44742b1699 100644 --- a/plugins/node/opentelemetry-instrumentation-redis/package.json +++ b/plugins/node/opentelemetry-instrumentation-redis/package.json @@ -49,7 +49,6 @@ "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/redis": "2.8.28", "codecov": "3.8.1", "cross-env": "7.0.3", "gts": "3.1.0", @@ -63,6 +62,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/redis": "2.8.28" } } diff --git a/plugins/node/opentelemetry-instrumentation-restify/package.json b/plugins/node/opentelemetry-instrumentation-restify/package.json index 0c9937c21a9..85a44efea90 100644 --- a/plugins/node/opentelemetry-instrumentation-restify/package.json +++ b/plugins/node/opentelemetry-instrumentation-restify/package.json @@ -46,7 +46,6 @@ "@opentelemetry/tracing": "0.19.0", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/restify": "4.3.7", "codecov": "3.8.1", "gts": "3.1.0", "mocha": "7.2.0", @@ -59,6 +58,7 @@ "dependencies": { "@opentelemetry/api": "^1.0.0-rc.0", "@opentelemetry/instrumentation": "^0.19.0", - "@opentelemetry/semantic-conventions": "^0.19.0" + "@opentelemetry/semantic-conventions": "^0.19.0", + "@types/restify": "4.3.7" } } diff --git a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json index 88f1c973e33..88d6efe0616 100644 --- a/plugins/web/opentelemetry-instrumentation-user-interaction/package.json +++ b/plugins/web/opentelemetry-instrumentation-user-interaction/package.json @@ -54,7 +54,6 @@ "@types/jquery": "3.5.5", "@types/mocha": "7.0.2", "@types/node": "14.14.43", - "@types/shimmer": "1.0.1", "@types/sinon": "9.0.11", "@types/webpack-env": "1.16.0", "babel-loader": "8.2.2",