[pull] main from renovatebot:main

.devcontainer/Dockerfile

@@ -1,6 +1,13 @@
-FROM containerbase/node:18.13.0@sha256:bbbf1b8d76f3f508bf4dd9f0b723904153df67597bc2d02189a15cb3052ccccc
+FROM ghcr.io/containerbase/node:18.17.0
 
 USER root
 
+RUN install-apt make g++
+
+# renovate: datasource=github-releases packageName=containerbase/python-prebuild
+RUN install-tool python 3.11.4
+
 # renovate: datasource=npm
 RUN install-tool yarn 1.22.19
+
+USER ubuntu

.devcontainer/devcontainer.json

@@ -1,26 +1,30 @@
 {
+  "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
+  "name": "Renovate",
+  "dockerFile": "Dockerfile",
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {}
+  },
+  "capAdd": ["SYS_PTRACE"],
+  "privileged": true,
+  "securityOpt": ["seccomp=unconfined"],
   "hostRequirements": {
     "cpus": 4,
-    "memory": "8gb",
+    "memory": "7gb",
     "storage": "32gb"
   },
-  "name": "Renovate",
-  "dockerFile": "Dockerfile",
-  "settings": {
-    "terminal.integrated.profiles.linux": { "bash": { "path": "/bin/bash" } },
-    "terminal.integrated.defaultProfile.linux": "bash"
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "orta.vscode-jest",
+        "editorconfig.editorconfig",
+        "github.vscode-github-actions"
+      ]
+    }
   },
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
-    "orta.vscode-jest",
-    "EditorConfig.editorconfig"
-  ],
-  "runArgs": [
-    "--cap-add=SYS_PTRACE",
-    "--security-opt",
-    "seccomp=unconfined",
-    "--privileged"
-  ],
-  "postCreateCommand": "yarn install"
+  "postCreateCommand": [".devcontainer/post-create.sh"],
+  // Otherwise jest watcher fails because deps were not installed yet
+  "waitFor": "postCreateCommand"
 }

.devcontainer/post-create.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+if [[ "${CODESPACES}" == true ]]; then
+  echo "Fixing permissions of /tmp for GitHub Codespaces..." >&2
+  sudo chmod 1777 /tmp
+fi
+
+set -x
+
+exec yarn install

.eslintrc.js

@@ -41,6 +41,8 @@ module.exports = {
     ],
     'import/prefer-default-export': 0, // no benefit
 
+    'import/no-cycle': 2, // cycles don't work when moving to esm
+
     /*
      * This rule is not needed since the project uses typescript and the rule
      * `@typescript-eslint/explicit-function-return-type`.
@@ -135,7 +137,7 @@ module.exports = {
       },
     ],
 
-    '@typescript-eslint/unbound-method': 2,
+    '@typescript-eslint/unbound-method': [2, { ignoreStatic: true }],
     '@typescript-eslint/ban-types': 2,
     '@renovate/jest-root-describe': 2,
 
@@ -206,6 +208,7 @@ module.exports = {
           'error',
           { devDependencies: true },
         ],
+        'no-console': 'off',
       },
     },
     {

.github/DISCUSSION_TEMPLATE/ask-a-question.yml

@@ -0,0 +1,83 @@
+body:
+  - type: dropdown
+    id: how-are-you-running-renovate
+    attributes:
+      label: How are you running Renovate?
+      options:
+        - 'Placeholder value, please select the correct response from the dropdown'
+        - 'Mend Renovate hosted app on github.com'
+        - 'Self-hosted'
+    validations:
+      required: true
+
+  - type: input
+    id: renovate-version-if-selfhosting
+    attributes:
+      label: If you're self-hosting Renovate, tell us what version of Renovate you run.
+    validations:
+      required: false
+
+  - type: dropdown
+    id: platform-select
+    attributes:
+      label: If you're self-hosting Renovate, select which platform you are using.
+      options:
+        - 'AWS CodeCommit'
+        - 'Azure DevOps (dev.azure.com)'
+        - 'Azure DevOps Server'
+        - 'Bitbucket Cloud (bitbucket.org)'
+        - 'Bitbucket Server'
+        - 'Gitea or Forgejo'
+        - 'github.com'
+        - 'GitHub Enterprise Server'
+        - 'gitlab.com'
+        - 'GitLab self-hosted'
+    validations:
+      required: false
+
+  - type: dropdown
+    id: regression-error
+    attributes:
+      label: Was this something which used to work for you, and then stopped?
+      options:
+        - 'It used to work, and then stopped'
+        - 'I never saw this working'
+    validations:
+      required: true
+
+  - type: textarea
+    id: wanted-end-result
+    attributes:
+      label: Wanted end result.
+      description: 'Describe the wanted end result. Do not report any security concerns here. Email [renovate-disclosure@mend.io](mailto:renovate-disclosure@mend.io) instead.'
+    validations:
+      required: true
+
+  - type: textarea
+    id: describe-what-you-tried
+    attributes:
+      label: What you tried so far.
+      description: 'Tell us what you tried so far, what worked, what did not work, and so on.'
+    validations:
+      required: true
+
+  - type: textarea
+    id: debug-logs
+    attributes:
+      label: Relevant debug logs
+      description: |
+        If you're running self-hosted, run with `LOG_LEVEL=debug` in your environment variables and search for whatever dependency/branch/PR that is causing the problem.
+        If you are using the Renovate App, log into [Renovate's app dashboard](https://app.renovatebot.com/dashboard) and locate the correct job log for when the problem occurred (e.g. when the PR was created).
+        Try to paste the *relevant* logs here, not the entire thing and not just a link to the dashboard (others don't have permissions to view them).
+        If you're not sure about the relevant parts of the log, then feel free to post the full log to a [Github Gist](https://gist.github.com/) and link to it.
+        Try to highlight the important logs into the issue itself.
+      value: |
+        <details><summary>Logs</summary>
+
+        ```
+        Copy/paste the relevant log(s) here, between the starting and ending backticks
+        ```
+
+        </details>
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.yml → .github/DISCUSSION_TEMPLATE/report-a-problem.yml

@@ -1,21 +1,12 @@
-name: Bug report
-description: Confirmed bugs only. If in doubt, create a Discussion instead.
-labels: ['type:bug', 'status:requirements', 'priority-5-triage']
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Before you begin to fill out the form, make sure you have actually found a bug.
-        If you're not sure then create a [discussion](https://github.com/renovatebot/renovate/discussions) first.
-        If you have questions or want help with Renovate, then also create a [discussion](https://github.com/renovatebot/renovate/discussions).
-
   - type: dropdown
     id: how-are-you-running-renovate
     attributes:
       label: How are you running Renovate?
       options:
+        - 'Placeholder value, please select the correct response from the dropdown'
         - 'Mend Renovate hosted app on github.com'
-        - 'Self-hosted'
+        - 'Self-hosted Renovate'
     validations:
       required: true
 
@@ -36,45 +27,29 @@ body:
         - 'Azure DevOps Server'
         - 'Bitbucket Cloud (bitbucket.org)'
         - 'Bitbucket Server'
-        - 'Gitea'
+        - 'Gitea or Forgejo'
         - 'github.com'
         - 'GitHub Enterprise Server'
         - 'gitlab.com'
         - 'GitLab self-hosted'
     validations:
       required: false
 
-  - type: input
-    id: platform-version-if-selfhosting
-    attributes:
-      label: If you're self-hosting Renovate, tell us what version of the platform you run.
-      description: |
-        This field is for the version number of your _platform_, so one of these:
-          - AWS CodeCommit
-          - Azure DevOps
-          - Bitbucket Cloud
-          - Bitbucket Server
-          - Azure DevOps
-          - Gitea
-          - GitHub (.com and Enterprise Server)
-          - GitLab (.com and CE/EE)
-    validations:
-      required: false
-
   - type: dropdown
     id: regression-error
     attributes:
       label: Was this something which used to work for you, and then stopped?
       options:
+        - 'Placeholder value, please select the correct response from the dropdown'
+        - 'I am trying to get this working for the first time'
         - 'It used to work, and then stopped'
-        - 'I never saw this working'
     validations:
       required: true
 
   - type: textarea
-    id: describe-bug
+    id: describe-problem
     attributes:
-      label: Describe the bug
+      label: Describe the problem
       description: 'Do not report any security concerns here. Email [renovate-disclosure@mend.io](mailto:renovate-disclosure@mend.io) instead.'
     validations:
       required: true
@@ -84,12 +59,12 @@ body:
     attributes:
       label: Relevant debug logs
       description: |
-        Try not to raise a bug report unless you've looked at the logs first.
+        Try not to report a problem unless you've looked at the logs first.
         If you're running self-hosted, run with `LOG_LEVEL=debug` in your environment variables and search for whatever dependency/branch/PR that is causing the problem.
         If you are using the Renovate App, log into [Renovate's app dashboard](https://app.renovatebot.com/dashboard) and locate the correct job log for when the problem occurred (e.g. when the PR was created).
         Try to paste the *relevant* logs here, not the entire thing and not just a link to the dashboard (others don't have permissions to view them).
         If you're not sure about the relevant parts of the log, then feel free to post the full log to a [Github Gist](https://gist.github.com/) and link to it.
-        Try to highlight the important logs into the issue itself.
+        Try to highlight the important logs into the Discussion itself.
       value: |
         <details><summary>Logs</summary>
 
@@ -107,8 +82,8 @@ body:
       label: Have you created a minimal reproduction repository?
       description: Please read the [minimal reproductions documentation](https://github.com/renovatebot/renovate/blob/main/docs/development/minimal-reproductions.md) to learn how to make a good minimal reproduction repository.
       options:
-        - 'No reproduction repository'
-        - 'No reproduction, but I have linked to a public repo where it occurs'
-        - 'I have linked to a minimal reproduction repository in the bug description'
+        - 'Placeholder value, please select the correct response from the dropdown'
+        - 'I have linked to a minimal reproduction in the description above'
+        - 'I have explained in the description why a minimal reproduction is impossible'
     validations:
       required: true

.github/DISCUSSION_TEMPLATE/request-a-feature.yml

@@ -0,0 +1,8 @@
+body:
+  - type: textarea
+    id: discussion-field
+    attributes:
+      label: Tell us more.
+      description: Explain your feature request in this field.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/administration-only.yml

@@ -0,0 +1,37 @@
+name: Administration only
+description: For administrators only
+labels: ['status:ready', 'priority-3-medium', 'needs-discussion']
+body:
+  - type: markdown
+    attributes:
+      value: '# This form is for Renovate administrators only.'
+
+  - type: markdown
+    attributes:
+      value: |
+        **Stop!** This form is for the Renovate administrators only.
+        If you're a user of Renovate, please create a GitHub Discussion.
+        Please go back a step and select _Start a discussion_ instead of Issue.
+
+  - type: textarea
+    id: describe-proposed-changes
+    attributes:
+      label: Describe the proposed change(s).
+      description: 'Do not report any security concerns here. Email renovate-disclosure@mend.io instead.'
+    validations:
+      required: true
+
+  - type: textarea
+    id: describe-why-we-need-want-these-changes
+    attributes:
+      label: Describe why we need/want these change(s).
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: '# Reminder for administrators:'
+
+  - type: markdown
+    attributes:
+      value: 'Before submitting the issue: add the correct **type:** label and remove the **needs-discussion** label.'

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Start a discussion (config, doubts, docs)
+  - name: Start a discussion
     url: https://github.com/renovatebot/renovate/discussions/new
-    about: If you have any questions about bot configuration or doubts about whether you should create a feature request or bug report, or have problems with the documentation please select the button to create a Discussion instead of an Issue.
+    about: Our preferred starting point if you have any questions or suggestions about bot configuration, features or behavior.