Skip to content

Commit c40c3c4

Browse files
t2t2t2t2
authored
Mass-update all of the dependencies (including otel 0.15 / 0.41.0 / contribwhatever numbers) (#623)
1 parent 614c75a commit c40c3c4

13 files changed

+11152
-9146
lines changed

‎.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ module.exports = {
118118
'@typescript-eslint/explicit-module-boundary-types': ['error', {
119119
allowArgumentsExplicitlyTypedAsAny: true, // temporarily till code is completely migrated
120120
}],
121+
'@typescript-eslint/no-explicit-any': 'off',
121122
}
122123
},
123124
{

‎CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ project may be further defined and clarified by project maintainers.
6060
## Enforcement
6161

6262
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63-
reported by contacting the project team at [email protected]. All
63+
reported by contacting the project team at <[email protected]>. All
6464
complaints will be reviewed and investigated and will result in a response that
6565
is deemed necessary and appropriate to the circumstances. The project team is
6666
obligated to maintain confidentiality with regard to the reporter of an incident.

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ requests to ensure we have all the necessary information to effectively respond
77
to your bug report or contribution.
88

99
In addition to this document, review our [Code of Conduct](CODE_OF_CONDUCT.md).
10-
For any code of conduct questions or comments, send an email to [email protected].
10+
For any code of conduct questions or comments, send an email to <[email protected]>.
1111

1212
## Reporting Bugs/Feature Requests
1313

‎package-lock.json

+11,028-9,013
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+22-27
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
"lint": "eslint --ignore-path .gitignore packages/*/src/ packages/*/test/ packages/*/integration-tests/",
1616
"lint:markdown": "markdownlint *.md docs/*.md",
1717
"lint:fix": "eslint --ignore-path .gitignore --fix packages/*/src/ packages/*/test/ packages/*/integration-tests/",
18-
"test:integration:local": "npm run --ws test:integration:local --",
19-
"test:integration:local:all": "npm run --ws test:integration:local:all --",
20-
"test:integration:local:chrome": "npm run --ws test:integration:local:chrome --",
21-
"test:integration:local:firefox": "npm run --ws test:integration:local:firefox --",
22-
"test:integration:local:safari": "npm run --ws test:integration:local:safari --",
23-
"test:integration:local:all:_execute": "npm run --ws test:integration:local:all:_execute --",
24-
"test:integration:local:chrome:_execute": "npm run --ws test:integration:local:chrome:_execute --",
25-
"test:integration:local:firefox:_execute": "npm run --ws test:integration:local:firefox:_execute --",
26-
"test:integration:local:headlessChrome:_execute": "npm run --ws test:integration:local:headlessChrome:_execute --",
27-
"test:integration:local:headlessFirefox:_execute": "npm run --ws test:integration:local:headlessFirefox:_execute --",
28-
"test:integration:local:safari:_execute": "npm run --ws test:integration:local:safari:_execute --",
29-
"test:integration:remote": "npm run --ws test:integration:remote --",
30-
"test:performance": "npm run --ws test:performance --",
31-
"test:unit:ci": "npm run --ws test:unit:ci --",
32-
"test:unit:ci-node": "npm run --ws test:unit:ci-node --",
18+
"test:integration:local": "npm run --ws --if-present test:integration:local --",
19+
"test:integration:local:all": "npm run --ws --if-present test:integration:local:all --",
20+
"test:integration:local:chrome": "npm run --ws --if-present test:integration:local:chrome --",
21+
"test:integration:local:firefox": "npm run --ws --if-present test:integration:local:firefox --",
22+
"test:integration:local:safari": "npm run --ws --if-present test:integration:local:safari --",
23+
"test:integration:local:all:_execute": "npm run --ws --if-present test:integration:local:all:_execute --",
24+
"test:integration:local:chrome:_execute": "npm run --ws --if-present test:integration:local:chrome:_execute --",
25+
"test:integration:local:firefox:_execute": "npm run --ws --if-present test:integration:local:firefox:_execute --",
26+
"test:integration:local:headlessChrome:_execute": "npm run --ws --if-present test:integration:local:headlessChrome:_execute --",
27+
"test:integration:local:headlessFirefox:_execute": "npm run --ws --if-present test:integration:local:headlessFirefox:_execute --",
28+
"test:integration:local:safari:_execute": "npm run --ws --if-present test:integration:local:safari:_execute --",
29+
"test:integration:remote": "npm run --ws --if-present test:integration:remote --",
30+
"test:performance": "npm run --ws --if-present test:performance --",
31+
"test:unit:ci": "npm run --ws --if-present test:unit:ci --",
32+
"test:unit:ci-node": "npm run --ws --if-present test:unit:ci-node --",
3333
"postversion": "node ./scripts/version-update.mjs",
3434
"version:bump": "npm version --workspaces --include-workspace-root",
3535
"version:check": "node ./scripts/version-check.mjs",
@@ -38,18 +38,13 @@
3838
"devDependencies": {
3939
"@aws-sdk/client-cloudfront": "^3.171.0",
4040
"@aws-sdk/client-s3": "^3.171.0",
41-
"@octokit/graphql": "^5.0.1",
42-
"@octokit/request": "^6.2.1",
43-
"@typescript-eslint/eslint-plugin": "^5.37.0",
44-
"@typescript-eslint/parser": "^5.37.0",
45-
"dotenv": "^16.0.2",
46-
"eslint": "^8.23.1",
41+
"@octokit/graphql": "^7.0.1",
42+
"@octokit/request": "^8.1.1",
43+
"@typescript-eslint/eslint-plugin": "^6.2.0",
44+
"@typescript-eslint/parser": "^6.2.0",
45+
"dotenv": "^16.3.1",
46+
"eslint": "^8.45.0",
4747
"eslint-plugin-header": "^3.1.1",
48-
"typescript": "^4.8.3"
49-
},
50-
"overrides": {
51-
"nightwatch": {
52-
"selenium-webdriver": "4.5.0"
53-
}
48+
"typescript": "^5.1.6"
5449
}
5550
}

‎packages/session-recorder/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@
3131
"dist/esm/*.d.ts"
3232
],
3333
"dependencies": {
34-
"@babel/runtime": "~7.18.3",
34+
"@babel/runtime": "~7.22.6",
3535
"@opentelemetry/api": "^1.4.1",
36-
"@opentelemetry/core": "^1.14.0",
37-
"@opentelemetry/resources": "^1.14.0",
38-
"fflate": "^0.7.4",
36+
"@opentelemetry/core": "^1.15.1",
37+
"@opentelemetry/resources": "^1.15.1",
38+
"fflate": "^0.8.0",
3939
"protobufjs": "~7.2.4",
4040
"rrweb": "^1.1.3",
41-
"type-fest": "^3.7.2"
41+
"type-fest": "^4.0.0"
4242
},
4343
"peerDependencies": {
4444
"@splunk/otel-web": "^0.16.0"
4545
},
4646
"devDependencies": {
47-
"@babel/plugin-transform-runtime": "^7.19.1",
48-
"@babel/preset-env": "^7.19.1",
49-
"@babel/runtime-corejs3": "^7.19.1",
50-
"@rollup/plugin-commonjs": "^22.0.2",
51-
"@rollup/plugin-json": "^4.1.0",
52-
"@rollup/plugin-node-resolve": "^14.1.0",
53-
"@rollup/plugin-typescript": "^8.5.0",
47+
"@babel/plugin-transform-runtime": "^7.22.9",
48+
"@babel/preset-env": "^7.22.9",
49+
"@babel/runtime-corejs3": "^7.22.6",
50+
"@rollup/plugin-commonjs": "^25.0.3",
51+
"@rollup/plugin-json": "^6.0.0",
52+
"@rollup/plugin-node-resolve": "^15.1.0",
53+
"@rollup/plugin-terser": "^0.4.3",
54+
"@rollup/plugin-typescript": "^11.1.2",
5455
"npm-run-all": "^4.1.5",
5556
"protobufjs-cli": "^1.1.1",
56-
"rollup": "^2.79.0",
57-
"rollup-plugin-istanbul": "^3.0.0",
58-
"rollup-plugin-polyfill-node": "^0.10.2",
59-
"rollup-plugin-terser": "^7.0.2"
57+
"rollup": "^3.26.3",
58+
"rollup-plugin-istanbul": "^4.0.0",
59+
"rollup-plugin-polyfill-node": "^0.12.0"
6060
},
6161
"bugs": {
6262
"url": "https://github.com/signalfx/splunk-otel-js-web/issues"

‎packages/session-recorder/rollup.config.js ‎packages/session-recorder/rollup.config.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import json from '@rollup/plugin-json';
44
import commonjs from '@rollup/plugin-commonjs';
5-
import { terser } from 'rollup-plugin-terser';
5+
import terser from '@rollup/plugin-terser';
66
import typescript from '@rollup/plugin-typescript';
77

8-
const {
8+
import {
99
babelPlugin,
1010
nodeResolvePlugin,
11-
} = require('../../rollup.shared');
11+
} from '../../rollup.shared.mjs';
1212

1313
export default [
1414
{

‎packages/web/karma.conf.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ const istanbulrollup = require('rollup-plugin-istanbul');
1919
const rollupPolyfills = require('rollup-plugin-polyfill-node');
2020
const typescript = require('@rollup/plugin-typescript');
2121

22-
const {
23-
nodeResolvePlugin, commonjsPlugin,
24-
} = require('../../rollup.shared');
25-
2622
process.env.CHROME_BIN = require('puppeteer').executablePath();
2723

28-
module.exports = function (config) {
24+
module.exports = async function (config) {
25+
const {
26+
nodeResolvePlugin, commonjsPlugin,
27+
} = await import('../../rollup.shared.mjs');
28+
2929
config.set({
3030

3131
// base path that will be used to resolve all patterns (eg. files, exclude)

‎packages/web/package.json

+50-55
Original file line numberDiff line numberDiff line change
@@ -46,80 +46,75 @@
4646
"dist/esm/*.d.ts"
4747
],
4848
"dependencies": {
49-
"@babel/runtime": "^7.21.0",
49+
"@babel/runtime": "^7.22.6",
5050
"@opentelemetry/api": "^1.4.1",
51-
"@opentelemetry/core": "^1.14.0",
52-
"@opentelemetry/exporter-zipkin": "^1.14.0",
53-
"@opentelemetry/instrumentation": "^0.40.0",
54-
"@opentelemetry/instrumentation-document-load": "^0.32.3",
55-
"@opentelemetry/instrumentation-fetch": "^0.40.0",
56-
"@opentelemetry/instrumentation-user-interaction": "^0.32.4",
57-
"@opentelemetry/instrumentation-xml-http-request": "^0.40.0",
58-
"@opentelemetry/resources": "^1.14.0",
59-
"@opentelemetry/sdk-trace-base": "^1.14.0",
60-
"@opentelemetry/sdk-trace-web": "^1.14.0",
61-
"@opentelemetry/semantic-conventions": "^1.14.0",
51+
"@opentelemetry/core": "^1.15.1",
52+
"@opentelemetry/exporter-zipkin": "^1.15.1",
53+
"@opentelemetry/instrumentation": "^0.41.1",
54+
"@opentelemetry/instrumentation-document-load": "^0.33.0",
55+
"@opentelemetry/instrumentation-fetch": "^0.41.1",
56+
"@opentelemetry/instrumentation-user-interaction": "^0.33.0",
57+
"@opentelemetry/instrumentation-xml-http-request": "^0.41.1",
58+
"@opentelemetry/resources": "^1.15.1",
59+
"@opentelemetry/sdk-trace-base": "^1.15.1",
60+
"@opentelemetry/sdk-trace-web": "^1.15.1",
61+
"@opentelemetry/semantic-conventions": "^1.15.1",
6262
"shimmer": "^1.2.1",
63-
"web-vitals": "^3.3.2"
63+
"web-vitals": "^3.4.0"
6464
},
6565
"devDependencies": {
66-
"@babel/plugin-transform-runtime": "^7.19.1",
67-
"@babel/preset-env": "^7.19.1",
68-
"@babel/runtime-corejs3": "^7.19.1",
69-
"@rollup/plugin-babel": "^5.3.1",
70-
"@rollup/plugin-commonjs": "^22.0.2",
71-
"@rollup/plugin-json": "^4.1.0",
72-
"@rollup/plugin-node-resolve": "^14.1.0",
73-
"@rollup/plugin-typescript": "^8.5.0",
74-
"@types/chai": "^4.3.1",
75-
"@types/mocha": "^9.1.1",
76-
"@types/nightwatch": "^2.0.7",
66+
"@babel/plugin-transform-runtime": "^7.22.9",
67+
"@babel/preset-env": "^7.22.9",
68+
"@babel/runtime-corejs3": "^7.22.6",
69+
"@rollup/plugin-babel": "^6.0.3",
70+
"@rollup/plugin-commonjs": "^25.0.3",
71+
"@rollup/plugin-json": "^6.0.0",
72+
"@rollup/plugin-node-resolve": "^15.1.0",
73+
"@rollup/plugin-terser": "^0.4.3",
74+
"@rollup/plugin-typescript": "^11.1.2",
75+
"@types/chai": "^4.3.5",
76+
"@types/mocha": "^10.0.1",
77+
"@types/nightwatch": "^2.3.24",
7778
"@types/shimmer": "^1.0.2",
78-
"body-parser": "^1.19.0",
79-
"browserstack-local": "^1.4.8",
80-
"chai": "^4.3.4",
81-
"chrome-launcher": "^0.15.1",
79+
"body-parser": "^1.20.2",
80+
"browserstack-local": "^1.5.3",
81+
"chai": "^4.3.7",
82+
"chrome-launcher": "^1.0.0",
8283
"chromedriver": "^115.0.0",
8384
"codecov": "^3.8.2",
8485
"compression": "^1.7.4",
8586
"cors": "^2.8.5",
86-
"express": "^4.17.1",
87-
"geckodriver": "^3.2.0",
87+
"express": "^4.18.2",
88+
"geckodriver": "^4.1.3",
8889
"generate-source-map": "0.0.5",
89-
"http-mitm-proxy": "^0.9.0",
90-
"karma": "^6.4.0",
91-
"karma-chrome-launcher": "^3.1.0",
90+
"http-mitm-proxy": "^1.0.0",
91+
"karma": "^6.4.2",
92+
"karma-chrome-launcher": "^3.2.0",
9293
"karma-coverage-istanbul-reporter": "^3.0.3",
93-
"karma-firefox-launcher": "^2.1.0",
94+
"karma-firefox-launcher": "^2.1.2",
9495
"karma-mocha": "^2.0.1",
9596
"karma-rollup-preprocessor": "^7.0.8",
96-
"karma-spec-reporter": "^0.0.34",
97+
"karma-spec-reporter": "^0.0.36",
9798
"karma-websocket-server": "^1.0.0",
98-
"lighthouse": "^9.6.7",
99-
"markdownlint-cli": "^0.32.2",
100-
"mocha": "^10.0.0",
101-
"nightwatch": "^2.3.5",
102-
"node-fetch": "^3.2.10",
99+
"lighthouse": "^10.4.0",
100+
"markdownlint-cli": "^0.35.0",
101+
"mocha": "^10.2.0",
102+
"nightwatch": "^3.0.1",
103+
"node-fetch": "^3.3.2",
103104
"npm-run-all": "^4.1.5",
104105
"nyc": "^15.1.0",
105-
"puppeteer": "^14.1.1",
106-
"rollup": "^2.79.0",
107-
"rollup-plugin-istanbul": "^3.0.0",
108-
"rollup-plugin-polyfill-node": "^0.10.2",
109-
"rollup-plugin-terser": "^7.0.2",
110-
"saucelabs": "^7.2.1",
111-
"sinon": "^14.0.0",
112-
"socket.io": "^4.6.2",
113-
"socket.io-client": "^4.6.2",
106+
"puppeteer": "^20.9.0",
107+
"rollup": "^3.26.3",
108+
"rollup-plugin-istanbul": "^4.0.0",
109+
"rollup-plugin-polyfill-node": "^0.12.0",
110+
"saucelabs": "^7.2.2",
111+
"sinon": "^15.2.0",
112+
"socket.io": "^4.7.1",
113+
"socket.io-client": "^4.7.1",
114114
"ts-node": "^10.9.1",
115-
"ws": "^8.8.1",
115+
"ws": "^8.13.0",
116116
"zone.js": "0.11.4"
117117
},
118-
"overrides": {
119-
"nightwatch": {
120-
"selenium-webdriver": "4.5.0"
121-
}
122-
},
123118
"bugs": {
124119
"url": "https://github.com/signalfx/splunk-otel-js-web/issues"
125120
},

‎packages/web/rollup.config.js ‎packages/web/rollup.config.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import json from '@rollup/plugin-json';
44
import commonjs from '@rollup/plugin-commonjs';
5-
import { terser } from 'rollup-plugin-terser';
5+
import terser from '@rollup/plugin-terser';
66
import { babel } from '@rollup/plugin-babel';
77
import typescript from '@rollup/plugin-typescript';
88

9-
const {
9+
import {
1010
babelPlugin,
1111
nodeResolvePlugin,
12-
} = require('../../rollup.shared');
12+
} from '../../rollup.shared.mjs';
1313

1414
export default [
1515
{

‎packages/web/test/init.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ describe('test xhr', () => {
252252
const span = capturer.spans[capturer.spans.length-1];
253253
assert.strictEqual(span.name, 'HTTP GET');
254254
assert.strictEqual(span.attributes.component, 'xml-http-request');
255-
assert.ok(span.attributes['http.response_content_length'] > 0);
255+
assert.ok(span.attributes['http.response_content_length'] as number > 0);
256256
assert.strictEqual(span.attributes['link.spanId'], '0000000000000002');
257257
assert.strictEqual(span.attributes['http.url'], location.href);
258258
done();

‎rollup.shared.js

-21
This file was deleted.

‎rollup.shared.mjs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/* eslint-disable header/header */
2+
3+
import { nodeResolve } from '@rollup/plugin-node-resolve';
4+
import { babel } from '@rollup/plugin-babel';
5+
import commonjs from '@rollup/plugin-commonjs';
6+
7+
export const babelPlugin = babel({
8+
babelHelpers: 'runtime',
9+
extensions: ['.js', '.es6', '.es', 'mjs', '.ts']
10+
});
11+
12+
export const nodeResolvePlugin = nodeResolve({
13+
browser: true,
14+
preferBuiltins: false,
15+
});
16+
17+
export const commonjsPlugin = commonjs({
18+
browser: true,
19+
preferBuiltins: false,
20+
transformMixedEsModules: true,
21+
});

0 commit comments

Comments
 (0)