From 60e5ce43746c42e4a8cf4cbb77ff2eeed2a0c46c Mon Sep 17 00:00:00 2001 From: zacanger Date: Fri, 26 Jan 2024 12:15:45 -0700 Subject: [PATCH] Use import from /dist/ instead of symlink (#2135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Which problem is this PR solving? This is an insignificant issue, so I didn't open an issue ticket beforehand. There's a symlink here to a file in node_modules. It's small problem, but the symlink is unnecessary. I came across this because I have this repo as a submodule in another project, and back up those changes (and a lot of other repos) with `rsync`, the sync checks output to see if there are errors. I would guess this also causes problems on Windows without WSL. ## Description of the changes Change the import. This Just Works™ in Vite. ## How was this change tested? `yarn lint && yarn test && yarn start`, and `yarn build`, and grepping `react-vis` clases in the assets. Screenshot 2024-01-26 at 11 10 46 Screenshot 2024-01-26 at 11 10 37 ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` Signed-off-by: Zac Anger --- .../components/SearchTracePage/SearchResults/ScatterPlot.jsx | 2 +- .../src/components/SearchTracePage/SearchResults/react-vis.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 packages/jaeger-ui/src/components/SearchTracePage/SearchResults/react-vis.css diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx index 634874204f..3b8783de8e 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.jsx @@ -20,7 +20,7 @@ import { XYPlot, XAxis, YAxis, MarkSeries, Hint } from 'react-vis'; import { FALLBACK_TRACE_NAME } from '../../../constants'; import { ONE_MILLISECOND, formatDuration } from '../../../utils/date'; -import './react-vis.css'; +import 'react-vis/dist/style.css'; import './ScatterPlot.css'; export default function ScatterPlot(props) { diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/react-vis.css b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/react-vis.css deleted file mode 120000 index 7cb9d77574..0000000000 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/react-vis.css +++ /dev/null @@ -1 +0,0 @@ -../../../../../../node_modules/react-vis/dist/style.css \ No newline at end of file