Skip to content

Commit 02c1d95

Browse files
authored
chore: replace istanbul-instrumenter-loader with maintained component (#3918)
1 parent 06e919d commit 02c1d95

File tree

30 files changed

+135
-84
lines changed

30 files changed

+135
-84
lines changed

.nycrc

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"build/**/*.*",
99
"src/index.ts",
1010
"src/platform/**/index.ts",
11-
"src/platform/browser/*.ts",
1211
"src/version.ts",
1312
"test/**/*.*",
1413
".eslintrc.js",

api/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"docs:test": "linkinator docs/out --silent && linkinator docs/*.md *.md --markdown --silent",
2424
"lint:fix": "eslint . --ext .ts --fix",
2525
"lint": "eslint . --ext .ts",
26-
"test:browser": "nyc karma start --single-run",
26+
"test:browser": "karma start --single-run",
2727
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
28-
"test:webworker": "nyc karma start karma.worker.js --single-run",
28+
"test:webworker": "karma start karma.worker.js --single-run",
2929
"cycle-check": "dpdm --exit-code circular:1 src/index.ts",
3030
"version": "node ../scripts/version-update.js",
3131
"prewatch": "npm run precompile",
@@ -68,10 +68,10 @@
6868
"codecov": "3.8.3",
6969
"cross-var": "1.1.0",
7070
"dpdm": "3.13.1",
71-
"istanbul-instrumenter-loader": "3.0.1",
71+
"babel-plugin-istanbul": "6.1.1",
7272
"karma": "6.4.2",
7373
"karma-chrome-launcher": "3.1.0",
74-
"karma-coverage-istanbul-reporter": "3.0.3",
74+
"karma-coverage": "2.2.0",
7575
"karma-mocha": "2.0.1",
7676
"karma-mocha-webworker": "1.3.0",
7777
"karma-spec-reporter": "0.0.36",

experimental/packages/api-events/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1919
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2020
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
21-
"test:browser": "nyc karma start --single-run",
21+
"test:browser": "karma start --single-run",
2222
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
2323
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
2424
"build": "npm run compile",
@@ -70,10 +70,10 @@
7070
"@types/webpack-env": "1.16.3",
7171
"codecov": "3.8.3",
7272
"cross-var": "1.1.0",
73-
"istanbul-instrumenter-loader": "3.0.1",
73+
"babel-plugin-istanbul": "6.1.1",
7474
"karma": "6.4.2",
7575
"karma-chrome-launcher": "3.1.0",
76-
"karma-coverage-istanbul-reporter": "3.0.3",
76+
"karma-coverage": "2.2.0",
7777
"karma-mocha": "2.0.1",
7878
"karma-spec-reporter": "0.0.36",
7979
"karma-webpack": "4.0.2",

experimental/packages/api-logs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1919
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2020
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
21-
"test:browser": "nyc karma start --single-run",
21+
"test:browser": "karma start --single-run",
2222
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
2323
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
2424
"build": "npm run compile",
@@ -70,10 +70,10 @@
7070
"@types/webpack-env": "1.16.3",
7171
"codecov": "3.8.3",
7272
"cross-var": "1.1.0",
73-
"istanbul-instrumenter-loader": "3.0.1",
73+
"babel-plugin-istanbul": "6.1.1",
7474
"karma": "6.4.2",
7575
"karma-chrome-launcher": "3.1.0",
76-
"karma-coverage-istanbul-reporter": "3.0.3",
76+
"karma-coverage": "2.2.0",
7777
"karma-mocha": "2.0.1",
7878
"karma-spec-reporter": "0.0.36",
7979
"karma-webpack": "4.0.2",

experimental/packages/exporter-logs-otlp-http/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"tdd": "npm run test -- --watch-extensions ts --watch",
3939
"tdd:browser": "karma start",
4040
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
41-
"test:browser": "nyc karma start --single-run",
41+
"test:browser": "karma start --single-run",
4242
"version": "node ../../../scripts/version-update.js",
4343
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
4444
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -82,10 +82,10 @@
8282
"codecov": "3.8.3",
8383
"cpx": "1.5.0",
8484
"cross-var": "1.1.0",
85-
"istanbul-instrumenter-loader": "3.0.1",
85+
"babel-plugin-istanbul": "6.1.1",
8686
"karma": "6.4.2",
8787
"karma-chrome-launcher": "3.1.0",
88-
"karma-coverage-istanbul-reporter": "3.0.3",
88+
"karma-coverage": "2.2.0",
8989
"karma-mocha": "2.0.1",
9090
"karma-spec-reporter": "0.0.36",
9191
"karma-webpack": "4.0.2",

experimental/packages/exporter-logs-otlp-proto/package.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"lint:fix": "eslint . --ext .ts --fix",
2222
"tdd": "npm run test -- --watch-extensions ts --watch",
2323
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
24-
"test:browser": "nyc karma start --single-run",
24+
"test:browser": "karma start --single-run",
2525
"version": "node ../../../scripts/version-update.js",
2626
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2727
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -71,13 +71,23 @@
7171
"codecov": "3.8.3",
7272
"cpx": "1.5.0",
7373
"cross-var": "1.1.0",
74+
"babel-plugin-istanbul": "6.1.1",
75+
"karma": "6.4.2",
76+
"karma-chrome-launcher": "3.1.0",
77+
"karma-coverage": "2.2.0",
78+
"karma-mocha": "2.0.1",
79+
"karma-spec-reporter": "0.0.36",
80+
"karma-webpack": "4.0.2",
7481
"lerna": "7.1.1",
7582
"mocha": "10.2.0",
7683
"nyc": "15.1.0",
7784
"sinon": "15.1.2",
7885
"ts-loader": "8.4.0",
7986
"ts-mocha": "10.0.0",
80-
"typescript": "4.4.4"
87+
"typescript": "4.4.4",
88+
"webpack": "4.46.0",
89+
"webpack-cli": "4.10.0",
90+
"webpack-merge": "5.9.0"
8191
},
8292
"peerDependencies": {
8393
"@opentelemetry/api": "^1.0.0"

experimental/packages/exporter-trace-otlp-http/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"tdd": "npm run test -- --watch-extensions ts --watch",
2424
"tdd:browser": "karma start",
2525
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
26-
"test:browser": "nyc karma start --single-run",
26+
"test:browser": "karma start --single-run",
2727
"version": "node ../../../scripts/version-update.js",
2828
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2929
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -73,10 +73,10 @@
7373
"codecov": "3.8.3",
7474
"cpx": "1.5.0",
7575
"cross-var": "1.1.0",
76-
"istanbul-instrumenter-loader": "3.0.1",
76+
"babel-plugin-istanbul": "6.1.1",
7777
"karma": "6.4.2",
7878
"karma-chrome-launcher": "3.1.0",
79-
"karma-coverage-istanbul-reporter": "3.0.3",
79+
"karma-coverage": "2.2.0",
8080
"karma-mocha": "2.0.1",
8181
"karma-spec-reporter": "0.0.36",
8282
"karma-webpack": "4.0.2",

experimental/packages/exporter-trace-otlp-proto/package.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"lint:fix": "eslint . --ext .ts --fix",
2222
"tdd": "npm run test -- --watch-extensions ts --watch",
2323
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
24-
"test:browser": "nyc karma start --single-run",
24+
"test:browser": "karma start --single-run",
2525
"version": "node ../../../scripts/version-update.js",
2626
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2727
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -70,13 +70,23 @@
7070
"codecov": "3.8.3",
7171
"cpx": "1.5.0",
7272
"cross-var": "1.1.0",
73+
"babel-plugin-istanbul": "6.1.1",
74+
"karma": "6.4.2",
75+
"karma-chrome-launcher": "3.1.0",
76+
"karma-coverage": "2.2.0",
77+
"karma-mocha": "2.0.1",
78+
"karma-spec-reporter": "0.0.36",
79+
"karma-webpack": "4.0.2",
7380
"lerna": "7.1.1",
7481
"mocha": "10.2.0",
7582
"nyc": "15.1.0",
7683
"sinon": "15.1.2",
7784
"ts-loader": "8.4.0",
7885
"ts-mocha": "10.0.0",
79-
"typescript": "4.4.4"
86+
"typescript": "4.4.4",
87+
"webpack": "4.46.0",
88+
"webpack-cli": "4.10.0",
89+
"webpack-merge": "5.9.0"
8090
},
8191
"peerDependencies": {
8292
"@opentelemetry/api": "^1.0.0"

experimental/packages/opentelemetry-browser-detector/package.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lint": "eslint . --ext .ts",
1515
"lint:fix": "eslint . --ext .ts --fix",
1616
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
17-
"test:browser": "nyc karma start --single-run",
17+
"test:browser": "karma start --single-run",
1818
"tdd": "npm run test -- --watch-extensions ts --watch",
1919
"tdd:browser": "karma start",
2020
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
@@ -60,13 +60,23 @@
6060
"@types/sinon": "10.0.15",
6161
"codecov": "3.8.3",
6262
"cross-var": "1.1.0",
63+
"babel-plugin-istanbul": "6.1.1",
64+
"karma": "6.4.2",
65+
"karma-chrome-launcher": "3.1.0",
66+
"karma-coverage": "2.2.0",
67+
"karma-mocha": "2.0.1",
68+
"karma-spec-reporter": "0.0.36",
69+
"karma-webpack": "4.0.2",
6370
"lerna": "7.1.1",
6471
"mocha": "10.2.0",
6572
"nyc": "15.1.0",
6673
"sinon": "15.1.2",
6774
"ts-loader": "8.4.0",
6875
"ts-mocha": "10.0.0",
69-
"typescript": "4.4.4"
76+
"typescript": "4.4.4",
77+
"webpack": "4.46.0",
78+
"webpack-cli": "4.10.0",
79+
"webpack-merge": "5.9.0"
7080
},
7181
"peerDependencies": {
7282
"@opentelemetry/api": "^1.0.0"

experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"tdd": "npm run test -- --watch-extensions ts --watch",
2424
"tdd:browser": "karma start",
2525
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
26-
"test:browser": "nyc karma start --single-run",
26+
"test:browser": "karma start --single-run",
2727
"version": "node ../../../scripts/version-update.js",
2828
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2929
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -73,10 +73,10 @@
7373
"codecov": "3.8.3",
7474
"cpx": "1.5.0",
7575
"cross-var": "1.1.0",
76-
"istanbul-instrumenter-loader": "3.0.1",
76+
"babel-plugin-istanbul": "6.1.1",
7777
"karma": "6.4.2",
7878
"karma-chrome-launcher": "3.1.0",
79-
"karma-coverage-istanbul-reporter": "3.0.3",
79+
"karma-coverage": "2.2.0",
8080
"karma-mocha": "2.0.1",
8181
"karma-spec-reporter": "0.0.36",
8282
"karma-webpack": "4.0.2",

experimental/packages/opentelemetry-instrumentation-fetch/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
1717
"version": "node ../../../scripts/version-update.js",
1818
"tdd": "karma start",
19-
"test:browser": "nyc karma start --single-run",
19+
"test:browser": "karma start --single-run",
2020
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2121
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
2222
"prewatch": "node ../../../scripts/version-update.js",
@@ -66,10 +66,10 @@
6666
"babel-loader": "8.3.0",
6767
"codecov": "3.8.3",
6868
"cross-var": "1.1.0",
69-
"istanbul-instrumenter-loader": "3.0.1",
69+
"babel-plugin-istanbul": "6.1.1",
7070
"karma": "6.4.2",
7171
"karma-chrome-launcher": "3.1.0",
72-
"karma-coverage-istanbul-reporter": "3.0.3",
72+
"karma-coverage": "2.2.0",
7373
"karma-mocha": "2.0.1",
7474
"karma-spec-reporter": "0.0.36",
7575
"karma-webpack": "4.0.2",

experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
1717
"version": "node ../../../scripts/version-update.js",
1818
"tdd": "karma start",
19-
"test:browser": "nyc karma start --single-run",
19+
"test:browser": "karma start --single-run",
2020
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2121
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
2222
"prewatch": "node ../../../scripts/version-update.js",
@@ -66,10 +66,10 @@
6666
"babel-loader": "8.3.0",
6767
"codecov": "3.8.3",
6868
"cross-var": "1.1.0",
69-
"istanbul-instrumenter-loader": "3.0.1",
69+
"babel-plugin-istanbul": "6.1.1",
7070
"karma": "6.4.2",
7171
"karma-chrome-launcher": "3.1.0",
72-
"karma-coverage-istanbul-reporter": "3.0.3",
72+
"karma-coverage": "2.2.0",
7373
"karma-mocha": "2.0.1",
7474
"karma-spec-reporter": "0.0.36",
7575
"karma-webpack": "4.0.2",

experimental/packages/opentelemetry-instrumentation/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"test:cjs": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
5252
"test:esm": "nyc node --experimental-loader=./hook.mjs ../../../node_modules/mocha/bin/mocha 'test/node/*.test.mjs' test/node/*.test.mjs",
5353
"test": "npm run test:cjs && npm run test:esm",
54-
"test:browser": "nyc karma start --single-run",
54+
"test:browser": "karma start --single-run",
5555
"version": "node ../../../scripts/version-update.js",
5656
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
5757
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -94,10 +94,10 @@
9494
"codecov": "3.8.3",
9595
"cpx": "1.5.0",
9696
"cross-var": "1.1.0",
97-
"istanbul-instrumenter-loader": "3.0.1",
97+
"babel-plugin-istanbul": "6.1.1",
9898
"karma": "6.4.2",
9999
"karma-chrome-launcher": "3.1.0",
100-
"karma-coverage-istanbul-reporter": "3.0.3",
100+
"karma-coverage": "2.2.0",
101101
"karma-mocha": "2.0.1",
102102
"karma-spec-reporter": "0.0.36",
103103
"karma-webpack": "4.0.2",

experimental/packages/opentelemetry-sdk-node/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"@types/sinon": "10.0.15",
7171
"codecov": "3.8.3",
7272
"cross-var": "1.1.0",
73-
"istanbul-instrumenter-loader": "3.0.1",
7473
"lerna": "7.1.1",
7574
"mocha": "10.2.0",
7675
"nyc": "15.1.0",

experimental/packages/otlp-exporter-base/package.json

+13-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tdd": "npm run test -- --watch-extensions ts --watch",
2525
"tdd:browser": "karma start",
2626
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
27-
"test:browser": "nyc karma start --single-run",
27+
"test:browser": "karma start --single-run",
2828
"version": "node ../../../scripts/version-update.js",
2929
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
3030
"precompile": "cross-var lerna run version --scope $npm_package_name --include-dependencies",
@@ -65,21 +65,30 @@
6565
"tslib": "^2.3.1"
6666
},
6767
"devDependencies": {
68+
"@babel/core": "7.22.5",
6869
"@opentelemetry/api": "1.4.1",
6970
"@types/mocha": "10.0.1",
7071
"@types/node": "18.6.5",
7172
"@types/sinon": "10.0.15",
7273
"codecov": "3.8.3",
7374
"cross-var": "1.1.0",
74-
"istanbul-instrumenter-loader": "3.0.1",
75+
"babel-plugin-istanbul": "6.1.1",
76+
"karma": "6.4.2",
77+
"karma-chrome-launcher": "3.1.0",
78+
"karma-coverage": "2.2.0",
79+
"karma-mocha": "2.0.1",
80+
"karma-spec-reporter": "0.0.36",
81+
"karma-webpack": "4.0.2",
7582
"lerna": "7.1.1",
7683
"mocha": "10.2.0",
77-
"nock": "13.3.1",
7884
"nyc": "15.1.0",
7985
"sinon": "15.1.2",
8086
"ts-loader": "8.4.0",
8187
"ts-mocha": "10.0.0",
82-
"typescript": "4.4.4"
88+
"typescript": "4.4.4",
89+
"webpack": "4.46.0",
90+
"webpack-cli": "4.10.0",
91+
"webpack-merge": "5.9.0"
8392
},
8493
"peerDependencies": {
8594
"@opentelemetry/api": "^1.0.0"

experimental/packages/otlp-transformer/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"lint:fix": "eslint . --ext .ts --fix",
2121
"tdd": "npm run test -- --watch-extensions ts --watch",
2222
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
23-
"test:browser": "nyc karma start --single-run",
23+
"test:browser": "karma start --single-run",
2424
"prewatch": "node ../../../scripts/version-update.js",
2525
"watch": "tsc --build -w tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
2626
"peer-api-check": "node ../../../scripts/peer-api-check.js",
@@ -62,10 +62,10 @@
6262
"@types/webpack-env": "1.16.3",
6363
"codecov": "3.8.3",
6464
"cross-var": "1.1.0",
65-
"istanbul-instrumenter-loader": "3.0.1",
65+
"babel-plugin-istanbul": "6.1.1",
6666
"karma": "6.4.2",
6767
"karma-chrome-launcher": "3.1.0",
68-
"karma-coverage-istanbul-reporter": "3.0.3",
68+
"karma-coverage": "2.2.0",
6969
"karma-mocha": "2.0.1",
7070
"karma-spec-reporter": "0.0.36",
7171
"karma-webpack": "4.0.2",

0 commit comments

Comments
 (0)