Skip to content

Commit

Permalink
Merge branch 'master' into remove-unused-axios
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Jan 14, 2021
2 parents 1570df5 + 14931ce commit bfac17d
Show file tree
Hide file tree
Showing 42 changed files with 153 additions and 153 deletions.
2 changes: 1 addition & 1 deletion backwards-compatability/node10/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@opentelemetry/tracing": "^0.14.0"
},
"devDependencies": {
"@types/node": "10.17.48",
"@types/node": "10.17.50",
"typescript": "3.9.7"
},
"author": "OpenTelemetry Authors",
Expand Down
2 changes: 1 addition & 1 deletion backwards-compatability/node12/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@opentelemetry/tracing": "^0.14.0"
},
"devDependencies": {
"@types/node": "12.19.8",
"@types/node": "12.19.13",
"typescript": "3.9.7"
},
"author": "OpenTelemetry Authors",
Expand Down
4 changes: 2 additions & 2 deletions getting-started/ts-example/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.9",
"@types/node": "14.14.12",
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"ts-node": "8.10.2"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions getting-started/ts-example/monitored-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.9",
"@types/node": "14.14.12",
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"ts-node": "8.10.2"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions getting-started/ts-example/traced-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@types/express": "4.17.9",
"@types/node": "14.14.12",
"@types/express": "4.17.11",
"@types/node": "14.14.20",
"ts-node": "9.1.1"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/propagation-validation-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@opentelemetry/context-async-hooks": "^0.14.0",
"@opentelemetry/core": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"axios": "0.21.0",
"axios": "0.21.1",
"body-parser": "1.19.0",
"express": "4.17.1"
},
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,20 @@
"devDependencies": {
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@typescript-eslint/eslint-plugin": "4.9.1",
"@typescript-eslint/parser": "4.9.1",
"@typescript-eslint/eslint-plugin": "4.13.0",
"@typescript-eslint/parser": "4.13.0",
"beautify-benchmark": "0.2.4",
"benchmark": "2.1.4",
"eslint": "7.15.0",
"eslint": "7.17.0",
"eslint-config-airbnb-base": "14.2.1",
"eslint-plugin-header": "3.1.0",
"eslint-plugin-import": "2.22.1",
"gh-pages": "3.1.0",
"gts": "2.0.2",
"husky": "4.3.5",
"husky": "4.3.7",
"lerna": "3.22.1",
"lerna-changelog": "1.0.1",
"markdownlint-cli": "0.25.0",
"markdownlint-cli": "0.26.0",
"typescript": "3.9.7",
"update-ts-references": "2.0.0"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "2.0.2",
Expand All @@ -67,14 +67,14 @@
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "4.0.2",
"linkinator": "2.8.0",
"linkinator": "2.13.1",
"mocha": "7.2.0",
"nyc": "15.1.0",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"typedoc": "0.19.2",
"typedoc": "0.20.14",
"typescript": "3.9.7",
"webpack": "4.44.2"
"webpack": "4.46.0"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-api/tsconfig.docs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"typedocOptions": {
"name": "OpenTelemetry API for JavaScript",
"out": "docs/out",
"mode": "file",
"entryPoints": ["./src/index.ts"],
"hideGenerator": true
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-async-hooks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/node": "14.14.20",
"@types/shimmer": "1.0.1",
"codecov": "3.8.1",
"gts": "2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/node": "14.14.20",
"codecov": "3.8.1",
"gts": "2.0.2",
"mocha": "7.2.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"@types/zone.js": "0.5.12",
"babel-loader": "8.2.2",
Expand All @@ -60,13 +60,13 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7",
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"zone.js": "0.11.3"
},
"dependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-context-zone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
Expand All @@ -54,14 +54,14 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7",
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"webpack-merge": "5.6.1"
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/context-zone-peer-dep": "^0.14.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/opentelemetry-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"devDependencies": {
"@opentelemetry/propagator-b3": "^0.14.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/node": "14.14.20",
"@types/semver": "7.3.4",
"@types/sinon": "9.0.9",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"codecov": "3.8.1",
"gts": "2.0.2",
Expand All @@ -68,12 +68,12 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7",
"webpack": "4.44.2"
"webpack": "4.46.0"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry-exporter-collector-grpc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"codecov": "3.8.1",
"cpx": "1.5.0",
"gts": "2.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7"
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry-exporter-collector-proto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"codecov": "3.8.1",
"cpx": "1.5.0",
"gts": "2.0.2",
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7"
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-exporter-collector/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
Expand All @@ -67,14 +67,14 @@
"mocha": "7.2.0",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7",
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"webpack-merge": "5.6.1"
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/opentelemetry-exporter-jaeger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"devDependencies": {
"@opentelemetry/resources": "^0.14.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"codecov": "3.8.1",
"gts": "2.0.2",
"mocha": "7.2.0",
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"sinon": "9.2.3",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-prometheus/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"devDependencies": {
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/node": "14.14.20",
"codecov": "3.8.1",
"gts": "2.0.2",
"mocha": "7.2.0",
Expand Down
14 changes: 7 additions & 7 deletions packages/opentelemetry-exporter-zipkin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"devDependencies": {
"@babel/core": "7.12.10",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/sinon": "9.0.9",
"@types/node": "14.14.20",
"@types/sinon": "9.0.10",
"@types/webpack-env": "1.16.0",
"babel-loader": "8.2.2",
"codecov": "3.8.1",
Expand All @@ -65,14 +65,14 @@
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "3.0.2",
"sinon": "9.2.2",
"ts-loader": "8.0.12",
"sinon": "9.2.3",
"ts-loader": "8.0.14",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7",
"webpack": "4.44.2",
"webpack-cli": "4.2.0",
"webpack-merge": "5.6.1"
"webpack": "4.46.0",
"webpack-cli": "4.3.1",
"webpack-merge": "5.7.3"
},
"dependencies": {
"@opentelemetry/api": "^0.14.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry-grpc-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"access": "public"
},
"devDependencies": {
"@grpc/grpc-js": "1.2.2",
"@grpc/grpc-js": "1.2.3",
"@grpc/proto-loader": "0.5.5",
"@opentelemetry/context-async-hooks": "^0.14.0",
"@opentelemetry/context-base": "^0.14.0",
"@opentelemetry/node": "^0.14.0",
"@opentelemetry/tracing": "^0.14.0",
"@types/mocha": "8.2.0",
"@types/node": "14.14.12",
"@types/node": "14.14.20",
"@types/semver": "7.3.4",
"@types/shimmer": "1.0.1",
"@types/sinon": "9.0.9",
"@types/sinon": "9.0.10",
"codecov": "3.8.1",
"grpc": "1.24.4",
"gts": "2.0.2",
Expand All @@ -59,7 +59,7 @@
"nyc": "15.1.0",
"rimraf": "3.0.2",
"semver": "7.3.4",
"sinon": "9.2.2",
"sinon": "9.2.3",
"ts-mocha": "8.0.0",
"ts-node": "9.1.1",
"typescript": "3.9.7"
Expand Down
Loading

0 comments on commit bfac17d

Please sign in to comment.