Merge branch 'dev'

inclusive-design · Aug 2, 2024 · 325c26f · 325c26f
2 parents 137a308 + 4720a0c
commit 325c26f
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 127 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,7 +2,7 @@ module.exports = {
 	extends: [
 		"fluid",
 		"plugin:yml/standard",
-		"plugin:markdown/recommended",
+		"plugin:markdown/recommended-legacy",
 		"plugin:react/recommended"
 	],
 	plugins: ["react"],

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/ensure-cms-branch.yml b/.github/workflows/ensure-cms-branch.yml
@@ -20,7 +20,7 @@ jobs:
       run: |
         echo "target_branch=main" >> $GITHUB_ENV
     - name: Update CMS branch configuration
-      uses: mikefarah/yq@v4.42.1
+      uses: mikefarah/yq@v4.44.1
       with:
         cmd: yq eval -i '.backend.branch = "${{ env.target_branch }}"' src/admin/config.yml
     - name: Commit changes

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit $1
+npx --no-install commitlint --config commitlint.config.mjs --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx --no-install lint-staged