diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index fe211e38a..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: / - schedule: - interval: monthly - allow: - - dependency-type: direct - ignore: - - dependency-name: stylelint - versions: [">14"] - - package-ecosystem: github-actions - directory: / - schedule: - interval: monthly diff --git a/package-lock.json b/package-lock.json index 0a6f4d2d5..77134a1fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,11 @@ "eslint": "8.57.0", "eslint-config-fluid": "2.1.1", "eslint-plugin-jsdoc": "48.2.1", +<<<<<<< HEAD + "eslint-plugin-markdown": "4.0.1", +======= "eslint-plugin-markdown": "5.0.0", +>>>>>>> upstream "eslint-plugin-react": "7.34.0", "eslint-plugin-yml": "1.14.0", "husky": "9.0.11", diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000..417e8f571 --- /dev/null +++ b/renovate.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:recommended"], + "lockFileMaintenance": { + "enabled": true, + "automerge": true + }, + "packageRules": [ + { + "matchUpdateTypes": ["minor", "patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true + } + ] +} diff --git a/src/admin/config.yml b/src/admin/config.yml index 7f3f310f5..087052d5d 100644 --- a/src/admin/config.yml +++ b/src/admin/config.yml @@ -1,6 +1,6 @@ backend: name: git-gateway - branch: main + branch: dev squash_merges: true commit_messages: create: 'chore(cms): create "{{path}}"'