Merge pull request #5353 from OneCommunityGlobal/development

Frontend Release to Main [4.96]

Author: one-community

.husky/pre-push

@@ -25,6 +25,12 @@ if [ -z "$changed_files" ]; then
   exit 0
 fi
 
+# Skip checks if any outgoing commit is a merge commit
+if git log @{upstream}..HEAD --merges --oneline | grep -q .; then
+  echo "ℹ️  Outgoing commits include a merge commit. Skipping lint/test checks."
+  exit 0
+fi
+
 if ! printf '%s\n' "$changed_files" | grep -qvE '^\.husky/'; then
   echo "ℹ️  Only Husky hook changes detected. Skipping full test and lint checks."
   exit 0

.stylelintrc

@@ -6,12 +6,22 @@
     "node_modules/**/*.css"
   ],
   "rules": {
-    "no-duplicate-selectors": true,
+    "no-duplicate-selectors": [true, {
+      "disallowInList": false
+    }],
     "selector-pseudo-class-no-unknown": [
       true,
       { "ignorePseudoClasses": ["global", "local"] }
     ],
     "selector-class-pattern": null,
     "selector-id-pattern": null
-  }
-}
+  },
+  "overrides": [
+    {
+      "files": ["**/*.module.css"],
+      "rules": {
+        "no-duplicate-selectors": null
+      }
+    }
+  ]
+}

conflict_cplog.txt

@@ -8,8 +8,9 @@
   },
   "private": true,
   "dependencies": {
-    "@ant-design/charts": "^2.6.4", 
+    "@ant-design/charts": "^2.6.4",
     "@ant-design/icons": "^6.0.1",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
     "@babel/runtime": "^7.27.6",
     "@babel/runtime-corejs3": "^7.27.6",
     "@changey/react-leaflet-markercluster": "^4.0.0-rc1",
@@ -32,7 +33,7 @@
     "@tanstack/react-query": "^5.91.0",
     "@tinymce/miniature": "^6.0.0",
     "@tinymce/tinymce-react": "^6.1.0",
-    "ajv": "^8.18.0",
+    "ajv": "^8.0.0",
     "ajv-keywords": "^5.1.0",
     "ant-design": "^1.0.0",
     "antd": "^5.29.3",
@@ -54,8 +55,8 @@
     "date-fns": "^2.14.0",
     "date-fns-tz": "^2.0.1",
     "dayjs": "^1.11.13",
-    "diff": "^8.0.3",
-    "dompurify": "^3.3.2",
+    "diff": "^5.0.0",
+    "dompurify": "^3.2.5",
     "elliptic": "^6.6.1",
     "font-awesome": "^4.7.0",
     "fs-extra": "^11.3.0",
@@ -133,7 +134,8 @@
     "util": "^0.12.5",
     "uuid": "^9.0.1",
     "validator": "^13.15.26",
-    "webpack": "^5.104.1"
+    "webpack": "^5.104.1",
+    "xlsx": "^0.18.5"
   },
   "resolutions": {
     "react": "18.3.1",
@@ -164,7 +166,6 @@
     "@babel/core": "^7.28.0",
     "@babel/eslint-parser": "^7.28.0",
     "@babel/helper-validator-identifier": "^7.12.11",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
     "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
     "@babel/plugin-transform-optional-chaining": "^7.27.1",
     "@babel/plugin-transform-private-property-in-object": "^7.21.11",
@@ -180,13 +181,10 @@
     "@types/html-to-pdfmake": "^2.4.4",
     "@types/pdfmake": "^0.2.11",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^8.44.1",
-    "@typescript-eslint/parser": "^8.44.1",
     "@vitejs/plugin-react": "^4.5.0",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "babel-jest": "^29.7.0",
-    "baseline-browser-mapping": "^2.9.17",
     "cross-env": "^5.2.1",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^5.1.0",
@@ -198,12 +196,10 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-testing-library": "^7.11.0",
     "eslint-plugin-vitest": "^0.5.4",
-    "husky": "^9.1.7",
-    "jest-environment-jsdom": "^30.0.5",
+    "husky": "^7.0.4",
     "joi-browser": "^13.4.0",
     "jsdom": "^26.1.0",
     "lint-staged": "^16.1.5",
-    "mdn-data": "^2.26.0",
     "msw": "^2.10.4",
     "prettier": "^1.19.1",
     "redux-mock-store": "^1.5.4",
@@ -221,8 +217,5 @@
       "prettier --write"
     ],
     "**/*.{css,scss,sass}": "stylelint"
-  },
-  "optionalDependencies": {
-    "@rollup/rollup-darwin-arm64": "^4.54.0"
   }
 }