Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.github/workflows/authors-and-third-party-notices.yaml

@@ -3,7 +3,7 @@ name: Update Authors and Third Party Notices
 on:
   # Once a week or on pushes to main
   schedule:
-    - cron: "0 3 * * 0"
+    - cron: '0 3 * * 0'
   push:
     branches:
       - main
@@ -13,6 +13,9 @@ permissions:
 
 jobs:
   update_generated_files:
+    if: |
+      github.event_name == 'schedule' ||
+      !startsWith(github.event.head_commit.message, 'chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary')
     name: Update automatically generated files
     runs-on: ubuntu-latest
     env:
@@ -32,13 +35,13 @@ jobs:
 
           # this is important so git log can pick up on
           # the whole history to generate the list of AUTHORS
-          fetch-depth: "0"
+          fetch-depth: '0'
           token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20.16.0
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install [email protected]
         run: |
@@ -71,5 +74,15 @@ jobs:
 
       - name: Commit and push
         run: |
-          git commit --no-allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary" || true
-          git push
+          # We can't rely on git not allowing empty commits by default: the
+          # empty commit check happens before the pre-commit hooks run and if
+          # there is no diff exists after precommit logic was executed, empty
+          # commit will still be generated. Instead of that we will allow empty
+          # commit to happen and will check it directly if it's empty or not
+          git commit --allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary"
+          if [ $(git diff-tree --name-only --no-commit-id HEAD | wc -l) -gt 0 ]; then
+            echo "Files changed, pushing update..."
+            git push
+          else
+            echo "No changes to push"
+          fi

.husky/pre-commit

@@ -4,4 +4,8 @@
 # listings staged files only
 fileList=$(git diff --diff-filter=AM --cached --name-only)
 
-npm run precommit $fileList
+if [ -n "$fileList" ]; then
+  echo "Prettifying staged files..."
+  npx prettier-compass --write --ignore-unknown $fileList
+  git add $fileList
+fi

configs/eslint-config-compass/.prettierrc.json renamed to .prettierrc.json

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+'use strict';
+require('eslint/bin/eslint.js');

THIRD-PARTY-NOTICES.md

@@ -4,35 +4,35 @@
   "description": "Shared Compass eslint configuration",
   "license": "SSPL",
   "main": "index.js",
+  "bin": {
+    "eslint-compass": "./bin/eslint.js"
+  },
   "files": [
     "index.js",
+    "bin",
     "package.json",
     "README.md"
   ],
-  "peerDependencies": {
-    "eslint": "^7.25.0"
-  },
   "dependencies": {
     "@babel/core": "^7.21.4",
     "@babel/eslint-parser": "^7.14.3",
     "@mongodb-js/eslint-config-devtools": "^0.9.9",
     "@mongodb-js/eslint-plugin-compass": "^1.2.6",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
+    "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-filename-rules": "^1.2.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0"
   },
-  "devDependencies": {
-    "prettier": "^2.7.1"
-  },
   "scripts": {
+    "prettier": "prettier-compass",
     "check": "npm run lint",
-    "lint": "prettier --check .",
-    "reformat": "prettier --write ."
+    "lint": "npm run prettier -- --check .",
+    "reformat": "npm run prettier -- --write ."
   },
   "repository": {
     "type": "git",

configs/eslint-config-compass/bin/eslint.js

@@ -24,8 +24,8 @@
   "license": "SSPL",
   "main": "index.js",
   "scripts": {
-    "eslint": "eslint",
-    "prettier": "prettier",
+    "eslint": "eslint-compass",
+    "prettier": "prettier-compass",
     "lint": "npm run eslint . && npm run prettier -- --check .",
     "depcheck": "depcheck",
     "check": "npm run lint && npm run depcheck",
@@ -42,7 +42,6 @@
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",
-    "nyc": "^15.1.0",
-    "prettier": "^2.7.1"
+    "nyc": "^15.1.0"
   }
 }