Force Jest v30+ updates only and always recreate PRs

Author: loujaybee

backend/catalog/package.json

@@ -9,7 +9,7 @@
     "build": "tsc",
     "test": "jest",
     "setup": "./scripts/setup.sh",
-    "renovate:jest": "echo 'Creating Jest v30 pull request...' && cd /workspaces/gitpodflix-demo && RENOVATE_TOKEN=$GH_CLI_TOKEN renovate --platform=github --recreate-when=always gitpod-samples/gitpodflix-demo"
+    "renovate:jest": "echo 'Creating Jest v30 pull request...' && cd /workspaces/gitpodflix-demo && RENOVATE_TOKEN=$GH_CLI_TOKEN renovate --platform=github --recreate-when=always --rebase-when=conflicted gitpod-samples/gitpodflix-demo"
   },
   "dependencies": {
     "express": "^4.18.2",

renovate.json

@@ -5,9 +5,16 @@
   "includePaths": ["backend/catalog/package.json"],
   "packageRules": [
     {
-      "matchPackageNames": ["jest", "@types/jest"],
+      "matchPackageNames": ["jest"],
       "enabled": true,
-      "recreateWhen": "always"
+      "recreateWhen": "always",
+      "allowedVersions": ">=30.0.0"
+    },
+    {
+      "matchPackageNames": ["@types/jest"],
+      "enabled": true,
+      "recreateWhen": "always",
+      "allowedVersions": ">=30.0.0"
     },
     {
       "matchPackageNames": ["*"],