Merge pull request #28589 from szubster/upgrade-dagre

Upgrade `dagre` to `@dagrejs/dagre`

.changeset/large-pans-brake.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Upgrade `dagre` to `@dagrejs/dagre`

packages/core-components/package.json

@@ -59,6 +59,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/theme": "workspace:^",
     "@backstage/version-bridge": "workspace:^",
+    "@dagrejs/dagre": "^1.1.4",
     "@date-io/core": "^1.3.13",
     "@material-table/core": "^3.1.0",
     "@material-ui/core": "^4.12.2",
@@ -72,7 +73,6 @@
     "d3-selection": "^3.0.0",
     "d3-shape": "^3.0.0",
     "d3-zoom": "^3.0.0",
-    "dagre": "^0.8.5",
     "js-yaml": "^4.1.0",
     "linkify-react": "4.1.3",
     "linkifyjs": "4.1.3",
@@ -106,7 +106,6 @@
     "@types/d3-selection": "^3.0.1",
     "@types/d3-shape": "^3.0.1",
     "@types/d3-zoom": "^3.0.1",
-    "@types/dagre": "^0.7.44",
     "@types/google-protobuf": "^3.7.2",
     "@types/react": "^18.0.0",
     "@types/react-helmet": "^6.1.0",

packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx

@@ -18,7 +18,7 @@ import React from 'react';
 import * as d3Zoom from 'd3-zoom';
 import * as d3Selection from 'd3-selection';
 import useTheme from '@material-ui/core/styles/useTheme';
-import dagre from 'dagre';
+import dagre from '@dagrejs/dagre';
 import debounce from 'lodash/debounce';
 import { DependencyGraphTypes as Types } from './types';
 import { Node } from './Node';

packages/core-components/src/components/DependencyGraph/Edge.tsx

@@ -21,7 +21,7 @@ import makeStyles from '@material-ui/core/styles/makeStyles';
 import { DependencyGraphTypes as Types } from './types';
 import { ARROW_MARKER_ID, EDGE_TEST_ID, LABEL_TEST_ID } from './constants';
 import { DefaultLabel } from './DefaultLabel';
-import dagre from 'dagre';
+import dagre from '@dagrejs/dagre';
 
 /* Based on: https://github.com/dagrejs/dagre/wiki#configuring-the-layout  */
 export type EdgeProperties = {

packages/core-components/src/components/DependencyGraph/Node.test.tsx

@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import dagre from 'dagre';
+import dagre from '@dagrejs/dagre';
 import { render } from '@testing-library/react';
 import { Node } from './Node';
 import { DependencyGraphTypes as Types } from './types';

packages/core-components/src/components/DependencyGraph/Node.tsx

@@ -19,7 +19,7 @@ import makeStyles from '@material-ui/core/styles/makeStyles';
 import { DefaultNode } from './DefaultNode';
 import { DependencyGraphTypes as Types } from './types';
 import { NODE_TEST_ID } from './constants';
-import dagre from 'dagre';
+import dagre from '@dagrejs/dagre';
 
 /** @public */
 export type DependencyGraphNodeClassKey = 'node';

yarn.lock

@@ -4333,6 +4333,7 @@ __metadata:
     "@backstage/errors": ^1.2.4
     "@backstage/theme": ^0.6.0
     "@backstage/version-bridge": ^1.0.10
+    "@dagrejs/dagre": ^1.1.4
     "@date-io/core": ^1.3.13
     "@material-table/core": ^3.1.0
     "@material-ui/core": ^4.12.2
@@ -4345,7 +4346,6 @@ __metadata:
     d3-selection: ^3.0.0
     d3-shape: ^3.0.0
     d3-zoom: ^3.0.0
-    dagre: ^0.8.5
     linkify-react: 4.1.3
     linkifyjs: 4.1.3
     lodash: ^4.17.21
@@ -4442,6 +4442,7 @@ __metadata:
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
     "@backstage/version-bridge": "workspace:^"
+    "@dagrejs/dagre": ^1.1.4
     "@date-io/core": ^1.3.13
     "@material-table/core": ^3.1.0
     "@material-ui/core": ^4.12.2
@@ -4457,7 +4458,6 @@ __metadata:
     "@types/d3-selection": ^3.0.1
     "@types/d3-shape": ^3.0.1
     "@types/d3-zoom": ^3.0.1
-    "@types/dagre": ^0.7.44
     "@types/google-protobuf": ^3.7.2
     "@types/react": ^18.0.0
     "@types/react-helmet": ^6.1.0
@@ -4472,7 +4472,6 @@ __metadata:
     d3-selection: ^3.0.0
     d3-shape: ^3.0.0
     d3-zoom: ^3.0.0
-    dagre: ^0.8.5
     history: ^5.0.0
     js-yaml: ^4.1.0
     linkify-react: 4.1.3
@@ -9392,6 +9391,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@dagrejs/dagre@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@dagrejs/dagre@npm:1.1.4"
+  dependencies:
+    "@dagrejs/graphlib": 2.2.4
+  checksum: 39d29a0ea34d1782fee012a87b0395e1959d81f2f8c9cdf4b236e2b703f88524ae2de3d7c4eccce85758c8d26966e1ee147d1075201af059443f6da967e5bfd2
+  languageName: node
+  linkType: hard
+
+"@dagrejs/graphlib@npm:2.2.4":
+  version: 2.2.4
+  resolution: "@dagrejs/graphlib@npm:2.2.4"
+  checksum: 02d2d8df07fd6234bfc82f03f0aebd718f1ffc2ba6579ef67a26e423d9ad25a437256d3342e6342e29ae8a5c5e448a07440d6e218c6e77e390bc57ee73b43d2d
+  languageName: node
+  linkType: hard
+
 "@date-io/core@npm:1.x, @date-io/core@npm:^1.3.13":
   version: 1.3.13
   resolution: "@date-io/core@npm:1.3.13"
@@ -19565,13 +19580,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/dagre@npm:^0.7.44":
-  version: 0.7.52
-  resolution: "@types/dagre@npm:0.7.52"
-  checksum: 89e046e73f9f83855fcecc0f79838e0e3e0e42d88b6cc42bb573249364a606909ff7ded5b6a0377246eb0648047b330b5003c8dd975358de3135635ddae0f589
-  languageName: node
-  linkType: hard
-
 "@types/debug@npm:^4.0.0, @types/debug@npm:^4.1.12, @types/debug@npm:^4.1.7":
   version: 4.1.12
   resolution: "@types/debug@npm:4.1.12"