diff --git a/.circleci/config.yml b/.circleci/config.yml index 4100c3b117..b30701b75f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2 -unit_tests: &unit_tests +node_unit_tests: &node_unit_tests steps: - checkout - run: @@ -24,7 +24,7 @@ unit_tests: &unit_tests command: yarn compile - run: name: Unit tests - command: yarn test:node + command: yarn test - run: name: report coverage command: yarn codecov @@ -57,25 +57,24 @@ jobs: node8: docker: - image: node:8 - <<: *unit_tests + <<: *node_unit_tests node10: docker: - image: node:10 - <<: *unit_tests + <<: *node_unit_tests node11: docker: - image: node:11 - <<: *unit_tests + <<: *node_unit_tests node12: docker: - image: node:12 - <<: *unit_tests + <<: *node_unit_tests node12-browsers: docker: - image: circleci/node:12-browsers <<: *browsers_unit_tests - workflows: version: 2 build: diff --git a/package.json b/package.json index 14abd7140a..1212309228 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "fix": "lerna run fix", "postinstall": "yarn run bootstrap", "compile": "lerna run compile", - "test:node": "lerna run test:node", + "test": "lerna run test", "test:browser": "lerna run test:browser", "bootstrap": "lerna bootstrap", "bump": "lerna publish", diff --git a/packages/opentelemetry-basic-tracer/package.json b/packages/opentelemetry-basic-tracer/package.json index b0c0e0dfad..a322d81524 100644 --- a/packages/opentelemetry-basic-tracer/package.json +++ b/packages/opentelemetry-basic-tracer/package.json @@ -6,9 +6,9 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test:node": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -40,10 +40,10 @@ "devDependencies": { "@types/mocha": "^5.2.5", "@types/node": "^12.6.8", - "c8": "^5.0.1", "codecov": "^3.1.0", "gts": "^1.0.0", "mocha": "^6.1.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.0.0", "typescript": "^3.4.5" diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 24e0732e73..824e510138 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -9,13 +9,12 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test": "yarn test:node && yarn test:browser", - "test:node": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "test:browser": "karma start --single-run", "tdd": "yarn tdd:node", "tdd:node": "yarn test -- --watch-extensions ts --watch", "tdd:browser": "karma start", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -48,7 +47,6 @@ "@types/mocha": "^5.2.5", "@types/node": "^12.6.8", "@types/webpack-env": "1.13.9", - "c8": "^5.0.1", "codecov": "^3.1.0", "gts": "^1.0.0", "karma": "^4.1.0", @@ -57,6 +55,7 @@ "karma-spec-reporter": "^0.0.32", "karma-webpack": "^4.0.2", "mocha": "^6.1.0", + "nyc": "^14.1.1", "ts-loader": "^6.0.4", "ts-mocha": "^6.0.0", "ts-node": "^8.0.0", diff --git a/packages/opentelemetry-node-tracer/package.json b/packages/opentelemetry-node-tracer/package.json index 59ed542694..d36c87c0c0 100644 --- a/packages/opentelemetry-node-tracer/package.json +++ b/packages/opentelemetry-node-tracer/package.json @@ -6,9 +6,9 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test:node": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -40,10 +40,10 @@ "devDependencies": { "@types/mocha": "^5.2.5", "@types/node": "^12.6.8", - "c8": "^5.0.1", "codecov": "^3.1.0", "gts": "^1.0.0", "mocha": "^6.1.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.0.0", "typescript": "^3.4.5" diff --git a/packages/opentelemetry-plugin-grpc/package.json b/packages/opentelemetry-plugin-grpc/package.json index 799c54741a..15b16d3ae3 100644 --- a/packages/opentelemetry-plugin-grpc/package.json +++ b/packages/opentelemetry-plugin-grpc/package.json @@ -6,9 +6,8 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -41,10 +40,10 @@ "devDependencies": { "@types/mocha": "^5.2.7", "@types/node": "^12.6.9", - "c8": "^5.0.1", "codecov": "^3.5.0", "gts": "^1.1.0", "mocha": "^6.2.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.3.0", "typescript": "^3.5.3" diff --git a/packages/opentelemetry-plugin-http/package.json b/packages/opentelemetry-plugin-http/package.json index af40dc4748..9a7819670c 100644 --- a/packages/opentelemetry-plugin-http/package.json +++ b/packages/opentelemetry-plugin-http/package.json @@ -6,9 +6,8 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -41,10 +40,10 @@ "devDependencies": { "@types/mocha": "^5.2.7", "@types/node": "^12.6.9", - "c8": "^5.0.1", "codecov": "^3.5.0", "gts": "^1.1.0", "mocha": "^6.2.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.3.0", "typescript": "^3.5.3" diff --git a/packages/opentelemetry-scope-async-hooks/package.json b/packages/opentelemetry-scope-async-hooks/package.json index 7fa20b01b8..9f2c6dfb5b 100644 --- a/packages/opentelemetry-scope-async-hooks/package.json +++ b/packages/opentelemetry-scope-async-hooks/package.json @@ -6,9 +6,9 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test:node": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -41,10 +41,10 @@ "@types/mocha": "^5.2.5", "@types/node": "^12.6.8", "@types/shimmer": "^1.0.1", - "c8": "^5.0.1", "codecov": "^3.1.0", "gts": "^1.0.0", "mocha": "^6.1.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.0.0", "typescript": "^3.4.5" diff --git a/packages/opentelemetry-scope-base/package.json b/packages/opentelemetry-scope-base/package.json index e8bc0d9e2f..26eedab49e 100644 --- a/packages/opentelemetry-scope-base/package.json +++ b/packages/opentelemetry-scope-base/package.json @@ -6,9 +6,9 @@ "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "test:node": "c8 ts-mocha -p tsconfig.json test/**/*.ts", + "test": "nyc ts-mocha -p tsconfig.json test/**/*.ts", "tdd": "yarn test -- --watch-extensions ts --watch", - "codecov": "c8 report --reporter=json && codecov -f coverage/*.json -p ../../", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "clean": "rimraf build/*", "check": "gts check", "compile": "tsc -p .", @@ -40,10 +40,10 @@ "devDependencies": { "@types/mocha": "^5.2.5", "@types/node": "^12.6.8", - "c8": "^5.0.1", "codecov": "^3.1.0", "gts": "^1.0.0", "mocha": "^6.1.0", + "nyc": "^14.1.1", "ts-mocha": "^6.0.0", "ts-node": "^8.0.0", "typescript": "^3.4.5"