From 62a09e1443560902f5627a0a3e374378cfd94e2c Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Fri, 5 Jan 2024 09:05:42 +0530 Subject: [PATCH 1/8] Fixed broken Hot Reload of Plexus Package Signed-off-by: Wise-Wizard --- .../DeepDependencies/Graph/DdgNodeContent/index.tsx | 2 +- .../components/DeepDependencies/Graph/getNodeRenderers.tsx | 2 +- .../src/components/DeepDependencies/Graph/getSetOnEdge.tsx | 4 ++-- .../src/components/DeepDependencies/Graph/index.tsx | 6 +++--- packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx | 2 +- .../src/components/TraceDiff/TraceDiffGraph/renderNode.tsx | 2 +- .../TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx | 2 +- .../src/components/TracePage/TraceGraph/OpNode.tsx | 2 +- .../src/components/TracePage/TraceGraph/TraceGraph.tsx | 2 +- .../components/TracePage/TraceGraph/calculateTraceDagEV.tsx | 2 +- .../jaeger-ui/src/components/TracePage/TraceGraph/types.tsx | 2 +- packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx | 2 +- packages/jaeger-ui/src/model/ddg/types.tsx | 2 +- packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx | 2 +- .../src/model/trace-dag/types/TDagPlexusVertex.tsx | 2 +- packages/plexus/package.json | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx index 1773a1080e..57323e2835 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx @@ -15,7 +15,7 @@ import * as React from 'react'; import { Checkbox, Popover } from 'antd'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; import { IoLocate, IoEyeOff } from 'react-icons/io5'; import { connect } from 'react-redux'; import { bindActionCreators, Dispatch } from 'redux'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx index 6ca22d141f..ce6b4c4e95 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx @@ -14,7 +14,7 @@ import * as React from 'react'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; import { TDdgVertex, EViewModifier } from '../../../model/ddg/types'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx index 062a2d2c39..6355b29679 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TRendererUtils } from '@jaegertracing/plexus/lib/Digraph/types'; -import { TLayoutEdge } from '@jaegertracing/plexus/lib/types'; +import { TRendererUtils } from '@jaegertracing/plexus/src/Digraph/types'; +import { TLayoutEdge } from '@jaegertracing/plexus/src/types'; import { getEdgeId } from '../../../model/ddg/GraphModel'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx index 8c4b99e7c9..13399ef516 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx @@ -15,9 +15,9 @@ import React, { PureComponent } from 'react'; import memoize from 'memoize-one'; import { Digraph, LayoutManager } from '@jaegertracing/plexus'; -import { TSetProps, TFromGraphStateFn, TDefEntry } from '@jaegertracing/plexus/lib/Digraph/types'; -import { TEdge } from '@jaegertracing/plexus/lib/types'; -import TNonEmptyArray from '@jaegertracing/plexus/lib/types/TNonEmptyArray'; +import { TSetProps, TFromGraphStateFn, TDefEntry } from '@jaegertracing/plexus/src/Digraph/types'; +import { TEdge } from '@jaegertracing/plexus/src/types'; +import TNonEmptyArray from '@jaegertracing/plexus/src/types/TNonEmptyArray'; import { getNodeRenderer, measureNode } from './DdgNodeContent'; import getNodeRenderers from './getNodeRenderers'; diff --git a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx index 18f3d1aac2..aa2271a991 100644 --- a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx +++ b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx @@ -15,7 +15,7 @@ import React, { ReactNode } from 'react'; import { Digraph, LayoutManager } from '@jaegertracing/plexus'; -import { TEdge, TVertex } from '@jaegertracing/plexus/lib/types'; +import { TEdge, TVertex } from '@jaegertracing/plexus/src/types'; import './dag.css'; diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx index bdebfe84b7..596fe292c0 100644 --- a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx +++ b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx @@ -15,7 +15,7 @@ import * as React from 'react'; import { Popover } from 'antd'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; import EmphasizedNode from '../../common/EmphasizedNode'; import CopyIcon from '../../common/CopyIcon'; diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx index 47486fbd96..27085306de 100644 --- a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx +++ b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertexKey } from '@jaegertracing/plexus/lib/types'; +import { TVertexKey } from '@jaegertracing/plexus/src/types'; import _get from 'lodash/get'; import _map from 'lodash/map'; import memoizeOne from 'memoize-one'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx index 9847dcf289..e09ec2dd6d 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx @@ -14,7 +14,7 @@ import * as React from 'react'; import { Popover } from 'antd'; -import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; import { TSumSpan } from './types'; import CopyIcon from '../../common/CopyIcon'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx index 18ef0c7adc..4763621fdc 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx @@ -17,7 +17,7 @@ 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 cacheAs from '@jaegertracing/plexus/src/cacheAs'; import { getNodeRenderer, diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx index 8a4333b8ef..b7de4b0758 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx @@ -14,7 +14,7 @@ import DRange from 'drange'; -import { TEdge } from '@jaegertracing/plexus/lib/types'; +import { TEdge } from '@jaegertracing/plexus/src/types'; import convPlexus from '../../../model/trace-dag/convPlexus'; import TraceDag from '../../../model/trace-dag/TraceDag'; import TDagNode from '../../../model/trace-dag/types/TDagNode'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx index 958cdd1eed..5ca5e795e0 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TEdge } from '@jaegertracing/plexus/lib/types'; +import { TEdge } from '@jaegertracing/plexus/src/types'; import { TDenseSpanMembers } from '../../../model/trace-dag/types'; import TDagPlexusVertex from '../../../model/trace-dag/types/TDagPlexusVertex'; diff --git a/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx b/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx index 2693b5f58a..27f030356b 100644 --- a/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx +++ b/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx @@ -14,7 +14,7 @@ import memoize from 'lru-memoize'; -import { TEdge } from '@jaegertracing/plexus/lib/types'; +import { TEdge } from '@jaegertracing/plexus/src/types'; import getDerivedViewModifiers from './getDerivedViewModifiers'; import getEdgeId from './getEdgeId'; diff --git a/packages/jaeger-ui/src/model/ddg/types.tsx b/packages/jaeger-ui/src/model/ddg/types.tsx index abea39415f..725a01d751 100644 --- a/packages/jaeger-ui/src/model/ddg/types.tsx +++ b/packages/jaeger-ui/src/model/ddg/types.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertex } from '@jaegertracing/plexus/lib/types'; +import { TVertex } from '@jaegertracing/plexus/src/types'; import PathElem from './PathElem'; diff --git a/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx b/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx index fcc28e3fd2..c84cca7af2 100644 --- a/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx +++ b/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TEdge } from '@jaegertracing/plexus/lib/types'; +import { TEdge } from '@jaegertracing/plexus/src/types'; import { NodeID } from './types'; import TDagNode from './types/TDagNode'; diff --git a/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx b/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx index be15baabc7..1d30a29f9c 100644 --- a/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx +++ b/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertex } from '@jaegertracing/plexus/lib/types'; +import { TVertex } from '@jaegertracing/plexus/src/types'; import TDagNode from './TDagNode'; diff --git a/packages/plexus/package.json b/packages/plexus/package.json index cff7551a22..3f6712a218 100644 --- a/packages/plexus/package.json +++ b/packages/plexus/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "version": "0.2.0", "description": "Directed Graph React component", - "main": "lib/index.js", + "main": "src/index.tsx", "files": [ "lib", "dist" @@ -70,4 +70,4 @@ "start": "NODE_ENV='development' npm-run-all -ln --serial _tasks/clean/worker _tasks/bundle-worker --parallel '_tasks/bundle-worker --watch' _tasks/dev-server", "test": "echo 'NO TESTS YET'" } -} +} \ No newline at end of file From 4f090e44ae9c9813a9956e6220704e9e86bfc29f Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Fri, 5 Jan 2024 09:58:58 +0530 Subject: [PATCH 2/8] Ran yarn prettier Signed-off-by: Wise-Wizard --- packages/plexus/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plexus/package.json b/packages/plexus/package.json index 3f6712a218..096929c129 100644 --- a/packages/plexus/package.json +++ b/packages/plexus/package.json @@ -70,4 +70,4 @@ "start": "NODE_ENV='development' npm-run-all -ln --serial _tasks/clean/worker _tasks/bundle-worker --parallel '_tasks/bundle-worker --watch' _tasks/dev-server", "test": "echo 'NO TESTS YET'" } -} \ No newline at end of file +} From fc268d0fd60c5636235d69cf3f4ed0dd811d9511 Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Sun, 7 Jan 2024 14:41:59 +0530 Subject: [PATCH 3/8] Fixed Global Overrirde for Plexus Signed-off-by: Wise-Wizard --- .../Graph/DdgNodeContent/index.tsx | 2 +- .../Graph/getNodeRenderers.tsx | 2 +- .../DeepDependencies/Graph/getSetOnEdge.tsx | 4 ++-- .../DeepDependencies/Graph/index.tsx | 6 +++--- .../src/components/DependencyGraph/DAG.tsx | 3 +-- .../TraceDiff/TraceDiffGraph/renderNode.tsx | 2 +- .../TraceDiffGraph/traceDiffGraphUtils.tsx | 2 +- .../components/TracePage/TraceGraph/OpNode.tsx | 2 +- .../TracePage/TraceGraph/TraceGraph.tsx | 3 +-- .../TraceGraph/calculateTraceDagEV.tsx | 2 +- .../components/TracePage/TraceGraph/types.tsx | 2 +- .../src/model/ddg/GraphModel/index.tsx | 2 +- packages/jaeger-ui/src/model/ddg/types.tsx | 2 +- .../src/model/trace-dag/convPlexus.tsx | 2 +- .../model/trace-dag/types/TDagPlexusVertex.tsx | 2 +- packages/jaeger-ui/tsconfig.json | 18 +++++++++++++++--- packages/jaeger-ui/vite.config.mts | 6 ++++++ packages/plexus/package.json | 4 ++-- 18 files changed, 41 insertions(+), 25 deletions(-) diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx index 57323e2835..1773a1080e 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/index.tsx @@ -15,7 +15,7 @@ import * as React from 'react'; import { Checkbox, Popover } from 'antd'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; import { IoLocate, IoEyeOff } from 'react-icons/io5'; import { connect } from 'react-redux'; import { bindActionCreators, Dispatch } from 'redux'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx index ce6b4c4e95..6ca22d141f 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getNodeRenderers.tsx @@ -14,7 +14,7 @@ import * as React from 'react'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; import { TDdgVertex, EViewModifier } from '../../../model/ddg/types'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx index 6355b29679..062a2d2c39 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/getSetOnEdge.tsx @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TRendererUtils } from '@jaegertracing/plexus/src/Digraph/types'; -import { TLayoutEdge } from '@jaegertracing/plexus/src/types'; +import { TRendererUtils } from '@jaegertracing/plexus/lib/Digraph/types'; +import { TLayoutEdge } from '@jaegertracing/plexus/lib/types'; import { getEdgeId } from '../../../model/ddg/GraphModel'; diff --git a/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx b/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx index 13399ef516..8c4b99e7c9 100644 --- a/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx +++ b/packages/jaeger-ui/src/components/DeepDependencies/Graph/index.tsx @@ -15,9 +15,9 @@ import React, { PureComponent } from 'react'; import memoize from 'memoize-one'; import { Digraph, LayoutManager } from '@jaegertracing/plexus'; -import { TSetProps, TFromGraphStateFn, TDefEntry } from '@jaegertracing/plexus/src/Digraph/types'; -import { TEdge } from '@jaegertracing/plexus/src/types'; -import TNonEmptyArray from '@jaegertracing/plexus/src/types/TNonEmptyArray'; +import { TSetProps, TFromGraphStateFn, TDefEntry } from '@jaegertracing/plexus/lib/Digraph/types'; +import { TEdge } from '@jaegertracing/plexus/lib/types'; +import TNonEmptyArray from '@jaegertracing/plexus/lib/types/TNonEmptyArray'; import { getNodeRenderer, measureNode } from './DdgNodeContent'; import getNodeRenderers from './getNodeRenderers'; diff --git a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx index aa2271a991..8f097ff011 100644 --- a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx +++ b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx @@ -13,9 +13,8 @@ // limitations under the License. import React, { ReactNode } from 'react'; - import { Digraph, LayoutManager } from '@jaegertracing/plexus'; -import { TEdge, TVertex } from '@jaegertracing/plexus/src/types'; +import { TEdge, TVertex } from '@jaegertracing/plexus/lib/types'; import './dag.css'; diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx index 596fe292c0..bdebfe84b7 100644 --- a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx +++ b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/renderNode.tsx @@ -15,7 +15,7 @@ import * as React from 'react'; import { Popover } from 'antd'; import cx from 'classnames'; -import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; import EmphasizedNode from '../../common/EmphasizedNode'; import CopyIcon from '../../common/CopyIcon'; diff --git a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx index 27085306de..47486fbd96 100644 --- a/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx +++ b/packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/traceDiffGraphUtils.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertexKey } from '@jaegertracing/plexus/src/types'; +import { TVertexKey } from '@jaegertracing/plexus/lib/types'; import _get from 'lodash/get'; import _map from 'lodash/map'; import memoizeOne from 'memoize-one'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx index e09ec2dd6d..9847dcf289 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/OpNode.tsx @@ -14,7 +14,7 @@ import * as React from 'react'; import { Popover } from 'antd'; -import { TLayoutVertex } from '@jaegertracing/plexus/src/types'; +import { TLayoutVertex } from '@jaegertracing/plexus/lib/types'; import { TSumSpan } from './types'; import CopyIcon from '../../common/CopyIcon'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx index 4763621fdc..04d39fe924 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/TraceGraph.tsx @@ -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/src/cacheAs'; +import { Digraph, LayoutManager, cacheAs } from '@jaegertracing/plexus'; import { getNodeRenderer, diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx index b7de4b0758..8a4333b8ef 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/calculateTraceDagEV.tsx @@ -14,7 +14,7 @@ import DRange from 'drange'; -import { TEdge } from '@jaegertracing/plexus/src/types'; +import { TEdge } from '@jaegertracing/plexus/lib/types'; import convPlexus from '../../../model/trace-dag/convPlexus'; import TraceDag from '../../../model/trace-dag/TraceDag'; import TDagNode from '../../../model/trace-dag/types/TDagNode'; diff --git a/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx b/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx index 5ca5e795e0..958cdd1eed 100644 --- a/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TraceGraph/types.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TEdge } from '@jaegertracing/plexus/src/types'; +import { TEdge } from '@jaegertracing/plexus/lib/types'; import { TDenseSpanMembers } from '../../../model/trace-dag/types'; import TDagPlexusVertex from '../../../model/trace-dag/types/TDagPlexusVertex'; diff --git a/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx b/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx index 27f030356b..2693b5f58a 100644 --- a/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx +++ b/packages/jaeger-ui/src/model/ddg/GraphModel/index.tsx @@ -14,7 +14,7 @@ import memoize from 'lru-memoize'; -import { TEdge } from '@jaegertracing/plexus/src/types'; +import { TEdge } from '@jaegertracing/plexus/lib/types'; import getDerivedViewModifiers from './getDerivedViewModifiers'; import getEdgeId from './getEdgeId'; diff --git a/packages/jaeger-ui/src/model/ddg/types.tsx b/packages/jaeger-ui/src/model/ddg/types.tsx index 725a01d751..abea39415f 100644 --- a/packages/jaeger-ui/src/model/ddg/types.tsx +++ b/packages/jaeger-ui/src/model/ddg/types.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertex } from '@jaegertracing/plexus/src/types'; +import { TVertex } from '@jaegertracing/plexus/lib/types'; import PathElem from './PathElem'; diff --git a/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx b/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx index c84cca7af2..fcc28e3fd2 100644 --- a/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx +++ b/packages/jaeger-ui/src/model/trace-dag/convPlexus.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TEdge } from '@jaegertracing/plexus/src/types'; +import { TEdge } from '@jaegertracing/plexus/lib/types'; import { NodeID } from './types'; import TDagNode from './types/TDagNode'; diff --git a/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx b/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx index 1d30a29f9c..be15baabc7 100644 --- a/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx +++ b/packages/jaeger-ui/src/model/trace-dag/types/TDagPlexusVertex.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TVertex } from '@jaegertracing/plexus/src/types'; +import { TVertex } from '@jaegertracing/plexus/lib/types'; import TDagNode from './TDagNode'; diff --git a/packages/jaeger-ui/tsconfig.json b/packages/jaeger-ui/tsconfig.json index b1dd3c67ac..69e696bba5 100644 --- a/packages/jaeger-ui/tsconfig.json +++ b/packages/jaeger-ui/tsconfig.json @@ -12,6 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. { - "extends": "../../tsconfig", - "include": ["src/**/*.tsx", "typings"] -} + "extends": "../../tsconfig.json", + "include": [ + "src/**/*.tsx", + "typings" + ], + "compilerOptions": { + "baseUrl": "..", + // other options... + "paths": { + "@jaegertracing/plexus": [ + "plexus/src" + ] + } + }, +} \ No newline at end of file diff --git a/packages/jaeger-ui/vite.config.mts b/packages/jaeger-ui/vite.config.mts index 9f723370e2..f06ee5b91c 100644 --- a/packages/jaeger-ui/vite.config.mts +++ b/packages/jaeger-ui/vite.config.mts @@ -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', @@ -86,4 +87,9 @@ export default defineConfig({ transformMixedEsModules: true, }, }, + resolve: { + alias: { + '@jaegertracing/plexus': path.resolve(__dirname, '../plexus/src'), + }, + }, }); diff --git a/packages/plexus/package.json b/packages/plexus/package.json index aae9546620..33d7592233 100644 --- a/packages/plexus/package.json +++ b/packages/plexus/package.json @@ -3,7 +3,7 @@ "license": "Apache-2.0", "version": "0.2.0", "description": "Directed Graph React component", - "main": "src/index.tsx", + "main": "lib/index.js", "files": [ "lib", "dist" @@ -70,4 +70,4 @@ "start": "NODE_ENV='development' npm-run-all -ln --serial _tasks/clean/worker _tasks/bundle-worker --parallel '_tasks/bundle-worker --watch' _tasks/dev-server", "test": "echo 'NO TESTS YET'" } -} +} \ No newline at end of file From 5804bf5d7497e29dd93c0a78972c72724ab1765c Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Sun, 7 Jan 2024 14:44:04 +0530 Subject: [PATCH 4/8] Ran Yarn Prettier Signed-off-by: Wise-Wizard --- packages/jaeger-ui/tsconfig.json | 13 ++++--------- packages/plexus/package.json | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/jaeger-ui/tsconfig.json b/packages/jaeger-ui/tsconfig.json index 69e696bba5..b52b2eeedc 100644 --- a/packages/jaeger-ui/tsconfig.json +++ b/packages/jaeger-ui/tsconfig.json @@ -13,17 +13,12 @@ // limitations under the License. { "extends": "../../tsconfig.json", - "include": [ - "src/**/*.tsx", - "typings" - ], + "include": ["src/**/*.tsx", "typings"], "compilerOptions": { "baseUrl": "..", // other options... "paths": { - "@jaegertracing/plexus": [ - "plexus/src" - ] + "@jaegertracing/plexus": ["plexus/src"] } - }, -} \ No newline at end of file + } +} diff --git a/packages/plexus/package.json b/packages/plexus/package.json index 33d7592233..4f32f664ec 100644 --- a/packages/plexus/package.json +++ b/packages/plexus/package.json @@ -70,4 +70,4 @@ "start": "NODE_ENV='development' npm-run-all -ln --serial _tasks/clean/worker _tasks/bundle-worker --parallel '_tasks/bundle-worker --watch' _tasks/dev-server", "test": "echo 'NO TESTS YET'" } -} \ No newline at end of file +} From 6e8d3dfaf806f3f2561af3d78c6ab587b0157516 Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Sun, 7 Jan 2024 15:52:06 +0530 Subject: [PATCH 5/8] Reverted change in DAG.tsx Signed-off-by: Wise-Wizard --- packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx index 8f097ff011..18f3d1aac2 100644 --- a/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx +++ b/packages/jaeger-ui/src/components/DependencyGraph/DAG.tsx @@ -13,6 +13,7 @@ // limitations under the License. import React, { ReactNode } from 'react'; + import { Digraph, LayoutManager } from '@jaegertracing/plexus'; import { TEdge, TVertex } from '@jaegertracing/plexus/lib/types'; From 1bb1e50ef33dd6ff4a0b42b91da8547183fbadf5 Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Sun, 7 Jan 2024 23:19:17 +0530 Subject: [PATCH 6/8] Reverted change in tsconfig.json Signed-off-by: Wise-Wizard --- packages/jaeger-ui/tsconfig.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/jaeger-ui/tsconfig.json b/packages/jaeger-ui/tsconfig.json index b52b2eeedc..00f05ee2f8 100644 --- a/packages/jaeger-ui/tsconfig.json +++ b/packages/jaeger-ui/tsconfig.json @@ -13,12 +13,5 @@ // limitations under the License. { "extends": "../../tsconfig.json", - "include": ["src/**/*.tsx", "typings"], - "compilerOptions": { - "baseUrl": "..", - // other options... - "paths": { - "@jaegertracing/plexus": ["plexus/src"] - } - } + "include": ["src/**/*.tsx", "typings"] } From 6bb843a2c0b617f86000d67181cd3b8819e2a06c Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Sun, 7 Jan 2024 23:20:19 +0530 Subject: [PATCH 7/8] Reverted change in tsconfig Signed-off-by: Wise-Wizard --- packages/jaeger-ui/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jaeger-ui/tsconfig.json b/packages/jaeger-ui/tsconfig.json index 00f05ee2f8..b1dd3c67ac 100644 --- a/packages/jaeger-ui/tsconfig.json +++ b/packages/jaeger-ui/tsconfig.json @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig", "include": ["src/**/*.tsx", "typings"] } From a1073fd03ee26e660778a3cbe20c3dfd25543da1 Mon Sep 17 00:00:00 2001 From: Saransh Shankar <103821431+Wise-Wizard@users.noreply.github.com> Date: Sun, 7 Jan 2024 23:35:14 +0530 Subject: [PATCH 8/8] Update packages/jaeger-ui/vite.config.mts Co-authored-by: Yuri Shkuro Signed-off-by: Saransh Shankar <103821431+Wise-Wizard@users.noreply.github.com> --- packages/jaeger-ui/vite.config.mts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/jaeger-ui/vite.config.mts b/packages/jaeger-ui/vite.config.mts index f06ee5b91c..df8dfe0807 100644 --- a/packages/jaeger-ui/vite.config.mts +++ b/packages/jaeger-ui/vite.config.mts @@ -89,6 +89,7 @@ export default defineConfig({ }, resolve: { alias: { + // allow hot reload of Plexus code -- https://github.com/jaegertracing/jaeger-ui/pull/2089 '@jaegertracing/plexus': path.resolve(__dirname, '../plexus/src'), }, },