Accept all current changes during merge

.gitignore

@@ -197,6 +197,7 @@ Toolbar
 Tooltip
 TransferShuttle
 TreeList
+TreeViz
 TypeAhead
 UserOptions
 Users
@@ -365,4 +366,4 @@ WizardModal
 animations
 ass
 cssClasses
-index
+index

build-tools/build.sh

@@ -33,4 +33,4 @@ fi
 echo "[BUILD:SH] Running post processor scripts..."
 # Run Post processors: Update style imports in .js files, create component modules
 node "$SCRIPT_DIR/post-processor.js" build/cjs $DEV_FLAG
-node "$SCRIPT_DIR/post-processor.js" build/es $DEV_FLAG
+node "$SCRIPT_DIR/post-processor.js" build/es $DEV_FLAG

package.json

@@ -18,18 +18,12 @@
     "publish:sh": "./publish.sh",
     "publish:local": "./publish-local.sh"
   },
-  "peerDependencies": {
-    "@armco/types": "^0.0.18",
+  "dependencies": {
     "@armco/configs": "^0.0.11",
     "@armco/utils": "^0.0.29",
     "@armco/icon": "^0.0.10",
     "@tanstack/react-table": "^8.21.2",
     "bootstrap": "^5.3.0",
-    "d3": "^7.9.0",
-    "highcharts": "^12.1.2",
-    "highcharts-react-official": "^3.2.1",
-    "highlight.js": "^11.8.0",
-    "moment": "^2.29.4",
     "react-app-polyfill": "^3.0.0",
     "react-dev-utils": "^12.0.1",
     "react": ">=16.8.0",
@@ -44,6 +38,16 @@
     "react-router-dom": "^6.13.0",
     "uuid": "^9.0.0"
   },
+  "devDependencies": {
+    "@armco/types": "^0.0.18"
+  },
+  "peerDependencies": {
+    "d3": "^7.9.0",
+    "highcharts": "^12.1.2",
+    "highcharts-react-official": "^3.2.1",
+    "highlight.js": "^11.8.0",
+    "moment": "^2.29.4",
+  },
   "eslintConfig": {
     "extends": [
       "react-app",

src/AdvancedColorPicker.tsx

@@ -29,12 +29,12 @@ const AdvancedColorPicker = (props: AdvancedColorPickerProps): JSX.Element => {
       saturation !== undefined &&
       lightness !== undefined
       ? "hsl(" +
-          Math.round(hue * 255) +
-          ", " +
-          Math.round(saturation * 100) +
-          "%, " +
-          Math.round(lightness * 100) +
-          "%)"
+      Math.round(hue * 255) +
+      ", " +
+      Math.round(saturation * 100) +
+      "%, " +
+      Math.round(lightness * 100) +
+      "%)"
       : ""
   }