From fd8540210b5c70eb1d2fb93161e2ce21e8564668 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 5 Jan 2025 16:30:07 +0000 Subject: [PATCH 1/3] Update dependency react-json-view-lite to v2.1.0 Signed-off-by: Mend Renovate --- package-lock.json | 16 ++++++++-------- packages/jaeger-ui/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index abec13b907..b5b6409ce5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16310,9 +16310,9 @@ "license": "MIT" }, "node_modules/react-json-view-lite": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-2.0.1.tgz", - "integrity": "sha512-yElNMSzL7UJ9rMDQIbTiBemXbvfAoqpxM/0IQd3nr52CLLBC0HxOSKcta/bayct2QCq7ZVzLzI8CGfuf387hHw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/react-json-view-lite/-/react-json-view-lite-2.1.0.tgz", + "integrity": "sha512-4JdlXC+dWPRXPL4fK/NsK6W103+mmpXDeWCHJGhgjPSvuyHnpwQUJ+ClUj4MFlLb4cPxi3T0/PW414JlTKMCJg==", "license": "MIT", "engines": { "node": ">=18" @@ -20114,14 +20114,14 @@ "react-helmet": "^6.1.0", "react-icons": "^5.0.1", "react-is": "^18.2.0", - "react-json-view-lite": "2.0.1", - "react-redux": "^9.2.0", + "react-json-view-lite": "2.1.0", + "react-redux": "^8.1.2", "react-router-dom": "5.3.4", "react-router-dom-v5-compat": "^6.24.0", "react-vis": "1.11.12", "react-vis-force": "^0.3.1", "react-window": "^1.8.10", - "redux": "^5.0.1", + "redux": "^4.2.1", "redux-actions": "2.6.5", "redux-first-history": "^5.2.0", "redux-form": "^8.3.10", @@ -20160,7 +20160,7 @@ "jest-junit": "^16.0.0", "less": "4.2.0", "react-test-renderer": "^18.3.1", - "rollup-plugin-visualizer": "^5.13.1", + "rollup-plugin-visualizer": "^5.11.0", "sinon": "^19.0.0", "terser": "^5.31.0", "vite": "^6.0.7", @@ -20489,7 +20489,7 @@ "style-loader": "4.0.0", "webpack": "^5.92.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.2.0", + "webpack-dev-server": "^5.0.4", "webpack-node-externals": "3.0.0", "worker-loader": "3.0.8" }, diff --git a/packages/jaeger-ui/package.json b/packages/jaeger-ui/package.json index 0ed6e30cbc..04b6ebdccb 100644 --- a/packages/jaeger-ui/package.json +++ b/packages/jaeger-ui/package.json @@ -75,7 +75,7 @@ "react-helmet": "^6.1.0", "react-icons": "^5.0.1", "react-is": "^18.2.0", - "react-json-view-lite": "2.0.1", + "react-json-view-lite": "2.1.0", "react-redux": "^8.1.2", "react-router-dom": "5.3.4", "react-router-dom-v5-compat": "^6.24.0", From 47c5b0984ddeec8712ffc03bbb7f3488a76933f9 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Thu, 9 Jan 2025 18:55:26 -0500 Subject: [PATCH 2/3] fix snapshot Signed-off-by: Yuri Shkuro --- BUILD.md | 4 +++- package.json | 3 ++- .../SpanDetail/__snapshots__/KeyValuesTable.test.js.snap | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index c7188fee67..927581f0c7 100644 --- a/BUILD.md +++ b/BUILD.md @@ -57,7 +57,9 @@ Note that `./packages/plexus` does not yet have any tests, as tracked in issue [ `./packages/jaeger-ui` uses [Jest](https://jestjs.io/) for testing. It can be useful to directly run tests for that package by running `npm test` from its directory, rather than the repository root. To run an individual test file specify the file name, e.g. `npm test src/utils/readJsonFile.test.js`. -Tests for React components in `./packages/jaeger-ui` make extensive use of Jest's [snapshot testing](https://jestjs.io/docs/29.6/snapshot-testing) functionality. These snapshots can be regenerated by running `npm test -- -u` from the package directory to regenerate all snapshots, or `npm test -- -u -t ` to regenerate snapshots for a subset of tests only (`` matches against the full test name, [i.e. the test name and all surrounding describe blocks](https://jestjs.io/docs/29.6/cli#--testnamepatternregex)). +#### Snapshots + +Tests for React components in `./packages/jaeger-ui` make extensive use of Jest's [snapshot testing](https://jestjs.io/docs/29.6/snapshot-testing) functionality. These snapshots can be regenerated by running `npm run update-snapshots` to regenerate all snapshots, or `npm test -- -u -t ` from the package directory to regenerate snapshots for a subset of tests only (`` matches against the full test name, [i.e. the test name and all surrounding describe blocks](https://jestjs.io/docs/29.6/cli#--testnamepatternregex)). ### `husky` . `hooks` . `pre-commit` diff --git a/package.json b/package.json index a38a522e54..e3e2a48aac 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,8 @@ "test": "npm run --workspaces test --", "tsc-lint": "tsc --build", "tsc-lint-debug": "tsc --listFiles", - "start": "cd packages/jaeger-ui && npm run start" + "start": "cd packages/jaeger-ui && npm run start", + "update-snapshots": "cd packages/jaeger-ui && npm test -- -u" }, "prettier": { "arrowParens": "avoid", diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/__snapshots__/KeyValuesTable.test.js.snap b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/__snapshots__/KeyValuesTable.test.js.snap index 631bdfa1f0..a03c646421 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/__snapshots__/KeyValuesTable.test.js.snap +++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanDetail/__snapshots__/KeyValuesTable.test.js.snap @@ -30,6 +30,7 @@ exports[` renders the expected text for each span value 1`] = ` Object { "basicChildStyle": "json-markup-child", "booleanValue": "json-markup-bool", + "childFieldsContainer": "_1BXBN", "clickableLabel": "_2YKJg _1MGIk _1MFti", "collapseIcon": "json-markup-icon-collapse", "collapsedContent": "json-markup-collapse-content", From 5f54610a09ceb34a779e89cf4a2e3ea5cfdabfb4 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Thu, 9 Jan 2025 19:00:30 -0500 Subject: [PATCH 3/3] fix Signed-off-by: Yuri Shkuro --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9aabf2742f..5294b08303 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20114,13 +20114,13 @@ "react-icons": "^5.0.1", "react-is": "^18.2.0", "react-json-view-lite": "2.1.0", - "react-redux": "^8.1.2", + "react-redux": "^9.2.0", "react-router-dom": "5.3.4", "react-router-dom-v5-compat": "^6.24.0", "react-vis": "1.11.12", "react-vis-force": "^0.3.1", "react-window": "^1.8.10", - "redux": "^4.2.1", + "redux": "^5.0.1", "redux-actions": "2.6.5", "redux-first-history": "^5.2.0", "redux-form": "^8.3.10", @@ -20159,7 +20159,7 @@ "jest-junit": "^16.0.0", "less": "4.2.0", "react-test-renderer": "^18.3.1", - "rollup-plugin-visualizer": "^5.11.0", + "rollup-plugin-visualizer": "^5.13.1", "sinon": "^19.0.0", "terser": "^5.31.0", "vite": "^6.0.7", @@ -20488,7 +20488,7 @@ "style-loader": "4.0.0", "webpack": "^5.92.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.4", + "webpack-dev-server": "^5.2.0", "webpack-node-externals": "3.0.0", "worker-loader": "3.0.8" },