Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken Hot Reload of Plexus Package #2089

Merged
merged 11 commits into from
Jan 7, 2024
Merged

Fix broken Hot Reload of Plexus Package #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62a09e1
Fixed broken Hot Reload of Plexus Package
Wise-Wizard Jan 5, 2024
7a88510
Merge branch 'main' into Plexus_Bug/Hot_Reload
Wise-Wizard Jan 5, 2024
4f090e4
Ran yarn prettier
Wise-Wizard Jan 5, 2024
46e1db6
Merge branch 'Plexus_Bug/Hot_Reload' of https://github.com/Wise-Wizar…
Wise-Wizard Jan 5, 2024
906182c
Merge branch 'main' into Plexus_Bug/Hot_Reload
yurishkuro Jan 5, 2024
fc268d0
Fixed Global Overrirde for Plexus
Wise-Wizard Jan 7, 2024
5804bf5
Ran Yarn Prettier
Wise-Wizard Jan 7, 2024
6e8d3df
Reverted change in DAG.tsx
Wise-Wizard Jan 7, 2024
1bb1e50
Reverted change in tsconfig.json
Wise-Wizard Jan 7, 2024
6bb843a
Reverted change in tsconfig
Wise-Wizard Jan 7, 2024
a1073fd
Update packages/jaeger-ui/vite.config.mts
Wise-Wizard Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import * as React from 'react';
import { Card, Button, Tooltip } from 'antd';
import { IoClose, IoHelpCircleOutline } from 'react-icons/io5';
import cx from 'classnames';
import { Digraph, LayoutManager } from '@jaegertracing/plexus';
import cacheAs from '@jaegertracing/plexus/lib/cacheAs';
import { Digraph, LayoutManager, cacheAs } from '@jaegertracing/plexus';

import {
getNodeRenderer,
Expand Down
7 changes: 7 additions & 0 deletions packages/jaeger-ui/vite.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import react from '@vitejs/plugin-react';
import legacy from '@vitejs/plugin-legacy';
import vitePluginImp from 'vite-plugin-imp';
import { visualizer } from 'rollup-plugin-visualizer';
import path from 'path';

const proxyConfig = {
target: 'http://localhost:16686',
Expand Down Expand Up @@ -86,4 +87,10 @@ export default defineConfig({
transformMixedEsModules: true,
},
},
resolve: {
alias: {
// allow hot reload of Plexus code -- https://github.com/jaegertracing/jaeger-ui/pull/2089
'@jaegertracing/plexus': path.resolve(__dirname, '../plexus/src'),
Wise-Wizard marked this conversation as resolved.
Show resolved Hide resolved
},
},
});