Merge remote-tracking branch 'upstream/main' into fix-nix

* upstream/main: (27 commits) chore(deps): update python:3.13 docker digest to 7be9b75 (renovatebot#34045) chore(deps): update ghcr.io/containerbase/devcontainer docker tag to v13.7.7 (renovatebot#34043) docs(gitea): fix `gitUrl` support (renovatebot#34038) feat(npm): Support for new option `replacementApproach` (renovatebot#34018) chore(deps): lock file maintenance (renovatebot#33998) chore(deps): update sigstore/cosign-installer action to v3.8.0 (renovatebot#34034) docs(managers/pip-compile): update list of source files and managers (renovatebot#34030) chore(deps): update linters to v8.22.0 (renovatebot#33880) fix(gitea): use endpoint for pr cache pagination (renovatebot#34022) chore(deps): update otel/opentelemetry-collector-contrib docker tag to v0.119.0 (renovatebot#34032) feat(gradle): add support for gradle repository content descriptors (renovatebot#33692) feat(manager): add elixir as a mise core tooling (renovatebot#34025) chore(deps): update python:3.13 docker digest to d59d263 (renovatebot#34026) chore(deps): update ghcr.io/containerbase/devcontainer docker tag to v13.7.6 (renovatebot#34021) fix(gitea): allow overriding platform version (renovatebot#34019) chore(deps): update dependency @types/lodash to v4.17.15 (renovatebot#34020) fix(manager/terragrunt): Update terragrunt packageName (renovatebot#33810) feat(pip-compile): support `uv pip compile` (renovatebot#33952) fix(deps): update dependency mkdocs-material to v9.6.2 (renovatebot#34010) chore(label-actions): improve logs, pr closing (renovatebot#33995) ...
SuperSandro2000 · Feb 5, 2025 · f7f2d80 · f7f2d80
2 parents 1270283 + b48b34f
commit f7f2d80
Show file tree

Hide file tree

Showing 49 changed files with 1,291 additions and 468 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1 +1,5 @@
-FROM ghcr.io/containerbase/devcontainer:13.7.2
+FROM ghcr.io/containerbase/devcontainer:13.7.7
+
+# https://github.com/pnpm/pnpm/issues/8971
+# renovate: datasource=npm
+RUN install-tool pnpm 9.15.4
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -7,4 +7,4 @@ if [[ "${CODESPACES}" == true ]]; then
   sudo chmod 1777 /tmp
 fi
 
-COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install
+pnpm install --reporter append-only --aggregate-output
diff --git a/.github/label-actions.yml b/.github/label-actions.yml
@@ -100,16 +100,6 @@
     </details>
 
 
-    ### Insufficient logs
-
-    <details><summary>Select me to read instructions</summary>
-
-
-    If you already gave us a log, and the Renovate team said it's not enough, then follow the instructions from the **No logs at all** section.
-
-    </details>
-
-
     ### Formatting your logs
 
     <details><summary>Select me to read instructions</summary>
@@ -137,12 +127,31 @@
 
     The Renovate team
 
+'auto:logs-insufficient':
+  comment: >
+    Hi there,
+
+
+    The logs you provided are insufficient to help you.
+
+
+    Please provide more logs, or more detailed logs, so we can help you. Be sure to include _DEBUG_ logs, and don't excessively redact or truncate them.
+
+
+    If you feel the logs are too large to paste here, please use a service like [GitHub Gist](https://gist.github.com/) and paste the link here.
+
+
+    Read the [Renovate docs, Troubleshooting](https://docs.renovatebot.com/troubleshooting/) to learn more about getting the correct logs.
+
+
+    Thanks, the Renovate team
+
 'auto:logs-packages':
   comment: >
     Hi there,
 
 
-    A maintainer wants you to find and share a specific log message (`packageFiles with updates`) from your repository or environment.
+    Please locate the debug message `packageFiles with updates` in your logs and paste the contents here. Depending on your question, we may need the full list of packages or only one.
 
 
     If you self-host Renovate: make sure you run Renovate with `LOG_LEVEL=debug` to get the debug log messages! Next, open the debug-level logs and search for `packageFiles with updates`. This text marks the start of a structured log message that shows every package file, dependency, and update that Renovate found.
@@ -531,3 +540,25 @@
 
 
     Thanks, the Renovate team
+
+'auto:inactive-pr':
+  comment: >
+    Hi there,
+
+
+    This PR appears to have been inactive for a while. Please let us know if you are still working on it, or if we can close it for now.
+
+
+    Thanks, the Renovate team
+
+'auto:close-inactive-pr':
+  comment: >
+    Hi there,
+
+
+    We're closing this PR due to inactivity, but we are happy for you, or others, to finish the PR if time allows.
+
+
+    Thanks, the Renovate team
+
+  close: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -700,7 +700,7 @@ jobs:
           node-version: ${{ needs.setup-build.outputs.node-version }}
           os: ${{ runner.os }}
 
-      - uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
+      - uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
 
       - name: Docker registry login
         run: |

diff --git a/docs/development/local-development.md b/docs/development/local-development.md
@@ -12,7 +12,7 @@ You need the following dependencies for local development:
 
 - Git `>=2.45.1`
 - Node.js `^20.15.1`
-- pnpm `^9.0.0` (use corepack)
+- pnpm `^9.0.0`
 - C++ compiler
 
 We recommend you use the version of Node.js defined in the repository's `.nvmrc` or use [Volta](https://volta.sh/) to manage your tool versions.
@@ -26,12 +26,12 @@ You can use the following commands on Ubuntu.
 curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 sudo apt-get update
 sudo apt-get install -y git build-essential nodejs
-corepack enable
+npm install -g pnpm@latest-10
 ```
 
 #### Nix
 
-To enter a development shell with the necessary packages, run `nix-shell --packages gcc gitFull nodejs` and then `corepack enable`.
+To enter a development shell with the necessary packages, run `nix-shell --packages gcc gitFull nodejs` and then `npm install -global pnpm@latest-10`.
 
 #### Windows
 
@@ -41,7 +41,7 @@ If you already installed a part, skip the corresponding step.
 - Install [Git](https://git-scm.com/downloads). Make sure you've [configured your username and email](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
 - Install [Node.js LTS](https://nodejs.org/en/download/)
 - In an Administrator PowerShell prompt, run `npm install -global npm` and then `npm --debug install --global windows-build-tools`
-- Enable corepack with: `corepack enable`
+- Install pnpm with: `npm install -global pnpm@latest-10`
 
   You can see what versions you're using like this:
 

diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
@@ -849,7 +849,7 @@ It will be compiled using Handlebars and the regex `groups` result.
 It specifies the syntax of the package file that's managed by the custom `jsonata` manager.
 This setting helps the system correctly parse and interpret the configuration file's contents.
 
-Only the `json` and `yaml` format is supported.
+Only the `json` and `yaml` formats are supported.
 `yaml` files are parsed as multi document YAML files.
 
 ```json title="Parsing a JSON file with a custom manager"
@@ -3849,6 +3849,16 @@ The field supports multiple URLs but it is datasource-dependent on whether only
 
 Add to this object if you wish to define rules that apply only to PRs that replace dependencies.
 
+## replacementApproach
+
+For `npm` manager when `replacementApproach=alias` then instead of replacing `"foo": "1.2.3"` with `"@my/foo": "1.2.4"` we would instead replace it with `"foo": "npm:@my/[email protected]"`.
+
+```json
+{
+  "replacementApproach": "alias"
+}
+```
+
 ## respectLatest
 
 Similar to `ignoreUnstable`, this option controls whether to update to versions that are greater than the version tagged as `latest` in the repository.

diff --git a/docs/usage/docker.md b/docs/usage/docker.md
@@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
 For example:
 
 ```Dockerfile
-FROM renovate/renovate:39.134.0
+FROM renovate/renovate:39.156.2
 # Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
 # under "Installation" for "Debian/Ubuntu"
 RUN ...

diff --git a/docs/usage/examples/opentelemetry.md b/docs/usage/examples/opentelemetry.md
@@ -36,7 +36,7 @@ services:
   otel-collector:
     # Using the Contrib version to access the spanmetrics connector.
     # If you don't need the spanmetrics connector, you can use the standard version
-    image: otel/opentelemetry-collector-contrib:0.118.0
+    image: otel/opentelemetry-collector-contrib:0.119.0
     volumes:
       - ./otel-collector-config.yml:/etc/otelcol-contrib/config.yaml
     ports:

diff --git a/docs/usage/examples/self-hosting.md b/docs/usage/examples/self-hosting.md
@@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
 ```sh title="Example of valid tags"
 docker run --rm renovate/renovate
 docker run --rm renovate/renovate:39
-docker run --rm renovate/renovate:39.134
-docker run --rm renovate/renovate:39.134.0
+docker run --rm renovate/renovate:39.156
+docker run --rm renovate/renovate:39.156.2
 ```
 
 <!-- prettier-ignore -->
@@ -62,7 +62,7 @@ spec:
             - name: renovate
               # Update this to the latest available and then enable Renovate on
               # the manifest
-              image: renovate/renovate:39.134.0
+              image: renovate/renovate:39.156.2
               args:
                 - user/repo
               # Environment Variables
@@ -121,7 +121,7 @@ spec:
       template:
         spec:
           containers:
-            - image: renovate/renovate:39.134.0
+            - image: renovate/renovate:39.156.2
               name: renovate-bot
               env: # For illustration purposes, please use secrets.
                 - name: RENOVATE_PLATFORM
@@ -367,7 +367,7 @@ spec:
           containers:
             - name: renovate
               # Update this to the latest available and then enable Renovate on the manifest
-              image: renovate/renovate:39.134.0
+              image: renovate/renovate:39.156.2
               volumeMounts:
                 - name: ssh-key-volume
                   readOnly: true

diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
@@ -770,7 +770,6 @@ To handle the case where the underlying Git processes appear to hang, configure
 ## gitUrl
 
 Override the default resolution for Git remote, e.g. to switch GitLab from HTTPS to SSH-based.
-Currently works for Bitbucket Server and GitLab only.
 
 Possible values:
 

diff --git a/docs/usage/self-hosted-experimental.md b/docs/usage/self-hosted-experimental.md
@@ -99,7 +99,7 @@ If set to any value, Renovate will download `nupkg` files for determining packag
 
 ## `RENOVATE_X_PLATFORM_VERSION`
 
-Specify this string for Renovate to skip API checks and provide GitLab/Bitbucket server version directly.
+Specify this string for Renovate to skip API checks and provide GitLab/Gitea and Forgejo/Bitbucket server version directly.
 Particularly useful with GitLab's `CI_JOB_TOKEN` to authenticate Renovate or to reduce API calls for Bitbucket.
 
 Read [platform details](modules/platform/gitlab/index.md) to learn why we need the server version on GitLab.

diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
@@ -1465,6 +1465,16 @@ const options: RenovateOptions[] = [
     cli: false,
     env: false,
   },
+  {
+    name: 'replacementApproach',
+    description:
+      'Select whether to perform a direct replacement or alias replacement.',
+    type: 'string',
+    stage: 'branch',
+    allowedValues: ['replace', 'alias'],
+    supportedManagers: ['npm'],
+    default: 'replace',
+  },
   {
     name: 'matchConfidence',
     description:
@@ -2904,7 +2914,7 @@ const options: RenovateOptions[] = [
     description:
       'Overrides the default resolution for Git remote, e.g. to switch GitLab from HTTPS to SSH-based.',
     type: 'string',
-    supportedPlatforms: ['gitlab', 'bitbucket-server'],
+    supportedPlatforms: ['gitea', 'gitlab', 'bitbucket-server'],
     allowedValues: ['default', 'ssh', 'endpoint'],
     default: 'default',
     stage: 'repository',

diff --git a/lib/config/types.ts b/lib/config/types.ts
@@ -463,6 +463,16 @@ export interface RenovateOptionBase {
    * For internal use only: add it to any config option of type integer that supports negative integers
    */
   allowNegative?: boolean;
+
+  /**
+   * Managers which support this option, leave undefined if all managers support it.
+   */
+  supportedManagers?: string[];
+
+  /**
+   * Platforms which support this option, leave undefined if all platforms support it.
+   */
+  supportedPlatforms?: PlatformId[];
 }
 
 export interface RenovateArrayOption<
@@ -472,35 +482,25 @@ export interface RenovateArrayOption<
   mergeable?: boolean;
   type: 'array';
   subType?: 'string' | 'object' | 'number';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateStringArrayOption extends RenovateArrayOption<string> {
   format?: 'regex';
   subType: 'string';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateNumberArrayOption extends RenovateArrayOption<number> {
   subType: 'number';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateBooleanOption extends RenovateOptionBase {
   default?: boolean | null;
   type: 'boolean';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateIntegerOption extends RenovateOptionBase {
   default?: number | null;
   type: 'integer';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateStringOption extends RenovateOptionBase {
@@ -510,17 +510,13 @@ export interface RenovateStringOption extends RenovateOptionBase {
   // Not used
   replaceLineReturns?: boolean;
   type: 'string';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export interface RenovateObjectOption extends RenovateOptionBase {
   default?: any;
   additionalProperties?: Record<string, unknown> | boolean;
   mergeable?: boolean;
   type: 'object';
-  supportedManagers?: string[] | 'all';
-  supportedPlatforms?: string[] | 'all';
 }
 
 export type RenovateOptions =

diff --git a/lib/data/monorepo.json b/lib/data/monorepo.json
@@ -463,6 +463,7 @@
     "orleans": "https://github.com/dotnet/orleans",
     "panda-css": "https://github.com/chakra-ui/panda",
     "parcel": "https://github.com/parcel-bundler/parcel",
+    "payloadcms": "https://github.com/payloadcms/payload",
     "percy-cli": "https://github.com/percy/cli",
     "picassojs": "https://github.com/qlik-oss/picasso.js",
     "pixijs": [

diff --git a/lib/modules/manager/azure-pipelines/readme.md b/lib/modules/manager/azure-pipelines/readme.md
@@ -44,7 +44,7 @@ resources:
     - container: linux
       image: ubuntu:24.04
     - container: python
-      image: python:3.13@sha256:137ae4b9f85671bd912a82a19b6966e2655f73e13579b5d6ad4edbddaaf62a9c
+      image: python:3.13@sha256:7be9b757ea8fa90b43efd604dd5ef2923364230f00564b2ea7f0982d24b374c9
 
 stages:
   - stage: StageOne