From 6b102a20173368ac2a74f92bbade65e3d27afd00 Mon Sep 17 00:00:00 2001
From: Rahul Barwal <rahul.barwal@appsmith.com>
Date: Wed, 30 Apr 2025 16:57:06 +0530
Subject: [PATCH 1/3] chore: remove TinyMCE version check from pre-commit hook

---
 app/client/.husky/check-staged-files.sh | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh
index 8a73539c2d56..cf456b2339c6 100644
--- a/app/client/.husky/check-staged-files.sh
+++ b/app/client/.husky/check-staged-files.sh
@@ -2,26 +2,14 @@
 
 is_server_change=$(git diff --cached --name-only | grep -c "app/server")
 is_client_change=$(git diff --cached --name-only | grep -c "app/client")
-is_package_json_change=$(git diff --cached --name-only | grep -c "app/client/package.json")
 
 is_merge_commit=$(git rev-parse -q --verify MERGE_HEAD)
 
-# Function to check TinyMCE version changes
-check_tinymce_version() {
-  # Check if TinyMCE version is being changed
-  if git diff --cached app/client/package.json | grep -q '^-.*"tinymce": "6\.8\.3"' &&
-    git diff --cached app/client/package.json | grep -q '^+.*"tinymce": "[^"]*"'; then
-    echo "❌ Error: Attempting to change TinyMCE version. This is not allowed as per team decision."
-    echo "Please keep TinyMCE at version 6.8.3"
-    exit 1
-  fi
-}
-
 # Function to apply Spotless and only commit staged files
 apply_spotless_and_commit_staged_files() {
-  staged_server_files=$(git diff --cached --name-only | grep "app/server" | sed 's|app/server/||')
+  staged_server_files=$(git diff --cached --name-only | grep "app/server"| sed 's|app/server/||')
   mvn spotless:apply
-  # Check if Spotless succeeded
+   # Check if Spotless succeeded
   if [ $? -ne 0 ]; then
     echo "Spotless apply failed, Please run mvn spotless:apply"
     exit 1
@@ -33,16 +21,11 @@ apply_spotless_and_commit_staged_files() {
 if [ "$is_merge_commit" ]; then
   echo "Skipping server and client checks for merge commit"
 else
-  if [ "$is_package_json_change" -ge 1 ]; then
-    echo "Checking package.json changes..."
-    check_tinymce_version
-  fi
-
   if [ "$is_server_change" -ge 1 ]; then
     echo "Applying Spotless to server files..."
-    pushd app/server >/dev/null
+    pushd app/server > /dev/null
     apply_spotless_and_commit_staged_files
-    popd >/dev/null
+    popd > /dev/null
   else
     echo "Skipping server side check..."
   fi

From 11aa0feb0f4be0d428a318ddaaac8702d23e12bc Mon Sep 17 00:00:00 2001
From: Rahul Barwal <rahul.barwal@appsmith.com>
Date: Thu, 1 May 2025 09:35:15 +0530
Subject: [PATCH 2/3] chore: add Dependabot configuration for npm updates in
 client directory

---
 .github/dependabot.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000000..01766cf305ca
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/app/client"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "tinymce"
+        versions: ["6.8.3"]
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "javascript"
+    commit-message:
+      prefix: "chore"
+      include: "scope"

From bc960270a70184b00bfee7789dd3ae3d0c2cf7b5 Mon Sep 17 00:00:00 2001
From: Rahul Barwal <rahul.barwal@appsmith.com>
Date: Thu, 1 May 2025 10:30:14 +0530
Subject: [PATCH 3/3] chore: add Dependabot configuration for Maven updates in
 server directory

---
 .github/dependabot.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 01766cf305ca..98543e8cf375 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,3 +14,14 @@ updates:
     commit-message:
       prefix: "chore"
       include: "scope"
+  - package-ecosystem: "maven"
+    directory: "/app/server"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "java"
+    commit-message:
+      prefix: "chore"
+      include: "scope"