[Snyk] Upgrade @docusaurus/tsconfig from 3.6.1 to 3.7.0

.github/workflows/global-npm-resolve-conflicting-files-fix.yml

@@ -26,27 +26,42 @@ jobs:
           git config --global user.email "qdraw@users.noreply.github.com"
           git config --global user.name "Global npm resolve conflicting files fix script"
 
+      - name: Backup package.json files
+        run: |
+          for project in ${{ env.projects }}; do
+            cp $project/package.json /tmp/$project-package.json
+          done
+
       - name: Merge master into branch
         run: |
           git fetch origin
           git checkout ${{ github.head_ref }}
           git merge origin/master -X theirs --allow-unrelated-histories
 
-      - name: Resolve package-lock.json conflicts
+      - name: Restore package.json files
         run: |
           for project in ${{ env.projects }}; do
-            echo "Checking for conflicts in $project/package-lock.json"
-            if ! git diff --exit-code $project/package-lock.json > /dev/null; then
-              echo "Conflicts detected in $project/package-lock.json"
-              git checkout --theirs $project/package-lock.json
-              npm install --prefix $project
+            cp /tmp/$project-package.json $project/package.json
+          done
+
+      - name: Check for changes in package.json
+        run: |
+          for project in ${{ env.projects }}; do
+            if ! git diff --exit-code $project/package.json > /dev/null; then
+              echo "Changes detected in $project/package.json"
+              git add $project/package.json
+
+              cd $project
+                npm install
+              cd -
+
               git add $project/package-lock.json
-              echo "Conflicts resolved and changes added for $project/package-lock.json"
+
             else
-              echo "No conflicts detected in $project/package-lock.json"
+              echo "No changes detected in $project/package.json"
             fi
           done
-          git diff-index --quiet HEAD || git commit -m "Resolve package-lock.json conflicts"
+          git diff-index --quiet HEAD || git commit -m "Check in package.json changes"
 
       - name: Push changes
         env:

documentation/package.json

@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.6.0",
-    "@docusaurus/tsconfig": "3.6.1",
+    "@docusaurus/tsconfig": "3.7.0",
     "@docusaurus/types": "3.6.3",
     "typescript": "~5.7.2"
   },