Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint-1b922ff69f

Author: lchans

package.json

@@ -92,7 +92,7 @@
     "globals": "^16.0.0",
     "jest-extended": "^4.0.2",
     "jsdom": "20.0.3",
-    "prettier": "2.7.1",
+    "prettier": "3.6.2",
     "storybook": "^9.0.10",
     "typescript": "^5.7.3",
     "vite": "6.3.5",

src/styles/styles.ts

@@ -18,13 +18,22 @@ const rotateAnimation = keyframes({
 });
 
 export const animatedBlueBorder = css`
-  background: linear-gradient(90deg, ${palette.blue.base} 50%, transparent 50%),
+  background:
+    linear-gradient(90deg, ${palette.blue.base} 50%, transparent 50%),
     linear-gradient(90deg, ${palette.blue.base} 50%, transparent 50%),
     linear-gradient(0deg, ${palette.blue.base} 50%, transparent 50%),
     linear-gradient(0deg, ${palette.blue.base} 50%, transparent 50%);
   background-repeat: repeat-x, repeat-x, repeat-y, repeat-y;
-  background-position: left top, right bottom, left bottom, right top;
-  background-size: 15px 2px, 15px 2px, 2px 15px, 2px 15px;
+  background-position:
+    left top,
+    right bottom,
+    left bottom,
+    right top;
+  background-size:
+    15px 2px,
+    15px 2px,
+    2px 15px,
+    2px 15px;
   animation: ${rotateAnimation} 1s linear infinite;
   border-radius: ${spacing[200]}px;
 `;

src/utilities/apply-layout.ts

@@ -66,8 +66,11 @@ export const applyLayout = <N extends BaseNode, E extends BaseEdge>(
   const transformedNodes = nodes.map<N>(node => ({
     ...node,
     height:
-      'height' in node && typeof node.height === 'number' ? node.height : node.measured?.height ?? getNodeHeight(node),
-    width: 'width' in node && typeof node.width === 'number' ? node.width : node.measured?.width ?? DEFAULT_NODE_WIDTH,
+      'height' in node && typeof node.height === 'number'
+        ? node.height
+        : (node.measured?.height ?? getNodeHeight(node)),
+    width:
+      'width' in node && typeof node.width === 'number' ? node.width : (node.measured?.width ?? DEFAULT_NODE_WIDTH),
   }));
 
   const transformedEdges = edges.map<ElkExtendedEdge>(edge => ({

yarn.lock

@@ -1337,7 +1337,7 @@ __metadata:
     globals: "npm:^16.0.0"
     jest-extended: "npm:^4.0.2"
     jsdom: "npm:20.0.3"
-    prettier: "npm:2.7.1"
+    prettier: "npm:3.6.2"
     react: "npm:17.0.2"
     react-dom: "npm:17.0.2"
     storybook: "npm:^9.0.10"
@@ -7827,12 +7827,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:2.7.1":
-  version: 2.7.1
-  resolution: "prettier@npm:2.7.1"
+"prettier@npm:3.6.2":
+  version: 3.6.2
+  resolution: "prettier@npm:3.6.2"
   bin:
-    prettier: bin-prettier.js
-  checksum: 10c0/359d2b7ecf36bd52924a48331cae506d335f18637fde6c686212f952b9ce678ce9f554a80571049b36ec2897a8a6c40094b776dea371cc5c04c481cf5b78504b
+    prettier: bin/prettier.cjs
+  checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812
   languageName: node
   linkType: hard