diff --git a/.github/workflows/dependabot-single-pr.yml b/.github/workflows/dependabot-single-pr.yml index 67a5b6b..b48c1e7 100644 --- a/.github/workflows/dependabot-single-pr.yml +++ b/.github/workflows/dependabot-single-pr.yml @@ -65,8 +65,13 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git fetch origin \ "refs/heads/${SOURCE_BRANCH}:refs/remotes/origin/dependabot-update" - git merge --no-ff origin/dependabot-update \ + git merge --no-ff -X ours origin/dependabot-update \ -m "build(deps): incorporate Dependabot update #${SOURCE_PR}" + npm install --package-lock-only + if ! git diff --quiet package-lock.json; then + git add package-lock.json + git commit --amend --no-edit + fi - name: Verify the combined dependency tree if: steps.target.outputs.found == 'true' diff --git a/package-lock.json b/package-lock.json index 87a7fa8..bb95ba0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8924,9 +8924,9 @@ } }, "node_modules/hono": { - "version": "4.13.1", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.13.1.tgz", - "integrity": "sha512-kdJoFVv2xmayw6cY09H7AbMJMt8Jn5jdlEdXsP7AGBdF2DIptVlKlOLKXP41yPip4/a3yQPv9gVcJYI8YY04dw==", + "version": "4.13.7", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.13.7.tgz", + "integrity": "sha512-c8/gF9ac8Y78/agExVocyLevgR+JlpNB444Py0FSX8pJoPdYUfUzRcXtYEYGwt6l19qIlVZPN5Mfsw9jFShmQQ==", "license": "MIT", "engines": { "node": ">=16.9.0"