Merge branch 'main' into feat/bitbucket-merge-strategies

renovatebot · Jul 26, 2021 · f7f0be8 · f7f0be8
2 parents 4451f05 + feb1297
commit f7f0be8
Show file tree

Hide file tree

Showing 31 changed files with 1,923 additions and 957 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM containerbase/node:14.17.3@sha256:c56a9d4c2426aeda033d29213d71dd74e1156c12d929c0babbc91456ec05bf2d
+FROM containerbase/node:14.17.3@sha256:97dcd76f880f1283cca12b854771e239eaefb57f0805876e5c05930dbf29d707
 
 
 # renovate: datasource=npm

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -50,7 +50,7 @@ jobs:
         run: yarn jest --maxWorkers=2 --ci
 
       - name: Codecov
-        uses: codecov/codecov-action@29386c70ef20e286228c72b668a06fd0e8399192 # renovate: tag=v1.5.2
+        uses: codecov/codecov-action@51d810878be5422784e86451c0e7c14e5860ec47 # renovate: tag=v2.0.2
         if: always()
 
       # build after tests to exclude files
@@ -72,7 +72,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -87,7 +87,7 @@ jobs:
         run: yarn jest --maxWorkers=2 --ci --coverage ${{ env.coverage }}
 
       - name: Codecov
-        uses: codecov/codecov-action@29386c70ef20e286228c72b668a06fd0e8399192 # renovate: tag=v1.5.2
+        uses: codecov/codecov-action@51d810878be5422784e86451c0e7c14e5860ec47 # renovate: tag=v2.0.2
         if: always() && env.coverage == 'true'
 
       # build after tests to exclude build files from tests
@@ -110,7 +110,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -154,7 +154,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -22,15 +22,15 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@500dad96d7fcdc698d0155829f2ae8bb6f3b79a9 # renovate: tag=v1.0.5
+        uses: github/codeql-action/init@592af860c5202d807cbd19ffcf9bd63cf3b7edf2 # renovate: tag=v1.0.7
 
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@500dad96d7fcdc698d0155829f2ae8bb6f3b79a9 # renovate: tag=v1.0.5
+        uses: github/codeql-action/autobuild@592af860c5202d807cbd19ffcf9bd63cf3b7edf2 # renovate: tag=v1.0.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -44,4 +44,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@500dad96d7fcdc698d0155829f2ae8bb6f3b79a9 # renovate: tag=v1.0.5
+        uses: github/codeql-action/analyze@592af860c5202d807cbd19ffcf9bd63cf3b7edf2 # renovate: tag=v1.0.7
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -40,7 +40,7 @@ jobs:
           ref: ${{ env.GIT_SHA }}
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@38d90ce44d5275ad62cc48384b3d8a58c500bb5f # renovate: tag=v2.2.0
+        uses: actions/setup-node@aa759c6c94d3800c55b8601f21ba4b2371704cb7 # renovate: tag=v2.3.0
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

diff --git a/.github/workflows/stale-action.yml b/.github/workflows/stale-action.yml
@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@98ed4cb500039dbcccf4bd9bedada4d0187f2757 # renovate: tag=v3.0.19
+      - uses: actions/stale@cdf15f641adb27a71842045a94023bef6945e3aa # renovate: tag=v4.0.0
         with:
           # Rate limit per run, (defaults to 30, but we've increased it to 40 for now).
           operations-per-run: 40
@@ -31,3 +31,7 @@ jobs:
           # Close out issue after 7 stale days.
           days-before-issue-close: 7
           close-issue-message: 'This bug report has been closed as we need a reproduction to work on this. If the original poster or anybody else with the same problem discovers that they can reproduce it, please create a new issue, and reference this issue.'
+
+          # Never label/close any pull requests
+          days-before-pr-close: -1
+          days-before-pr-stale: -1
diff --git a/docs/usage/docker.md b/docs/usage/docker.md
@@ -227,7 +227,7 @@ To get access to the token a custom Renovate Docker image is needed that include
 The Dockerfile to create such an image can look like this:
 
 ```Dockerfile
-FROM renovate/renovate:25.53.3
+FROM renovate/renovate:25.58.0
 # 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/self-hosting.md b/docs/usage/self-hosting.md
@@ -25,8 +25,8 @@ For example, all the following are valid tags:
 
 ```sh
 docker run --rm renovate/renovate
-docker run --rm renovate/renovate:25.53.3
-docker run --rm renovate/renovate:25.53
+docker run --rm renovate/renovate:25.58.0
+docker run --rm renovate/renovate:25.58
 docker run --rm renovate/renovate:25
 ```
 
@@ -62,7 +62,7 @@ spec:
             - name: renovate
               # Update this to the latest available and then enable Renovate on
               # the manifest
-              image: renovate/renovate:25.53.3
+              image: renovate/renovate:25.58.0
               args:
                 - user/repo
               # Environment Variables
@@ -121,7 +121,7 @@ spec:
       template:
         spec:
           containers:
-            - image: renovate/renovate:25.53.3
+            - image: renovate/renovate:25.58.0
               name: renovate-bot
               env: # For illustration purposes, please use secrets.
                 - name: RENOVATE_PLATFORM
@@ -463,7 +463,7 @@ spec:
           containers:
             - name: renovate
               # Update this to the latest available and then enable Renovate on the manifest
-              image: renovate/renovate:25.53.3
+              image: renovate/renovate:25.58.0
               volumeMounts:
                 - name: ssh-key-volume
                   readOnly: true

diff --git a/lib/config/definitions.ts b/lib/config/definitions.ts
@@ -425,6 +425,7 @@ const options: RenovateOptions[] = [
       'These labels will always be applied on the Dependency Dashboard issue, even when they have been removed manually.',
     type: 'array',
     subType: 'string',
+    default: null,
   },
   {
     name: 'configWarningReuseIssue',

diff --git a/lib/config/presets/internal/monorepo.ts b/lib/config/presets/internal/monorepo.ts
@@ -66,6 +66,10 @@ const repoGroups = {
   capacitor: 'https://github.com/ionic-team/capacitor',
   chromely: 'https://github.com/chromelyapps/Chromely',
   clarity: 'https://github.com/vmware/clarity',
+  clearscript: [
+    'https://github.com/microsoft/ClearScript',
+    'https://github.com/Microsoft/ClearScript',
+  ],
   commitlint: 'https://github.com/conventional-changelog/commitlint',
   docusaurus: 'https://github.com/facebook/docusaurus',
   dotnet: [
@@ -98,6 +102,8 @@ const repoGroups = {
   infrastructure: 'https://github.com/instructure/instructure-ui',
   istanbuljs: 'https://github.com/istanbuljs/istanbuljs',
   jasmine: 'https://github.com/jasmine/jasmine',
+  javascriptengineswitcher:
+    'https://github.com/Taritsyn/JavaScriptEngineSwitcher',
   jersey: 'https://github.com/eclipse-ee4j/jersey',
   jest: 'https://github.com/facebook/jest',
   junit5: 'https://github.com/junit-team/junit5',

diff --git a/lib/datasource/orb/__snapshots__/index.spec.ts.snap b/lib/datasource/orb/__snapshots__/index.spec.ts.snap
@@ -66,6 +66,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",
@@ -147,6 +148,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",
@@ -179,6 +181,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",
@@ -211,6 +214,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",
@@ -243,6 +247,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",
@@ -275,6 +280,7 @@ Array [
           },
         },
       },
+      "variables": Object {},
     },
     "headers": Object {
       "accept": "application/json",

diff --git a/lib/manager/github-actions/index.ts b/lib/manager/github-actions/index.ts
@@ -1,9 +1,6 @@
-import { LANGUAGE_DOCKER } from '../../constants/languages';
 import { extractPackageFile } from './extract';
 
-const language = LANGUAGE_DOCKER;
-
-export { extractPackageFile, language };
+export { extractPackageFile };
 
 export const defaultConfig = {
   fileMatch: ['^(workflow-templates|\\.github\\/workflows)\\/[^/]+\\.ya?ml$'],

diff --git a/lib/manager/npm/__fixtures__/inputs/01-glob.json b/lib/manager/npm/__fixtures__/inputs/01-glob.json
@@ -25,6 +25,7 @@
     "@angular/core": "4.0.0-beta.1"
   },
   "resolutions": {
+    "//": ["This is a comment"],
     "**/config": "1.21.0"
   },
   "homepage": "https://keylocation.sg",

diff --git a/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap b/lib/manager/npm/extract/__snapshots__/index.spec.ts.snap
@@ -1229,3 +1229,121 @@ Object {
   "yarnrc": undefined,
 }
 `;
+
+exports[`manager/npm/extract/index .extractPackageFile() returns an array of dependencies with resolution comments 1`] = `
+Object {
+  "constraints": Object {},
+  "deps": Array [
+    Object {
+      "currentValue": "6.5.0",
+      "datasource": "npm",
+      "depName": "autoprefixer",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "currentValue": "~1.6.0",
+      "datasource": "npm",
+      "depName": "bower",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "currentValue": "13.1.0",
+      "datasource": "npm",
+      "depName": "browserify",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "currentValue": "0.9.2",
+      "datasource": "npm",
+      "depName": "browserify-css",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "currentValue": "=0.22.0",
+      "datasource": "npm",
+      "depName": "cheerio",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "currentValue": "1.21.0",
+      "datasource": "npm",
+      "depName": "config",
+      "depType": "dependencies",
+      "prettyDepType": "dependency",
+    },
+    Object {
+      "depName": "enabled",
+      "depType": "devDependencies",
+      "prettyDepType": "devDependency",
+      "skipReason": "invalid-value",
+    },
+    Object {
+      "currentValue": "^1.5.8",
+      "datasource": "npm",
+      "depName": "angular",
+      "depType": "devDependencies",
+      "prettyDepType": "devDependency",
+    },
+    Object {
+      "currentValue": "1.5.8",
+      "datasource": "npm",
+      "depName": "angular-touch",
+      "depType": "devDependencies",
+      "prettyDepType": "devDependency",
+    },
+    Object {
+      "currentValue": "1.5.8",
+      "datasource": "npm",
+      "depName": "angular-sanitize",
+      "depType": "devDependencies",
+      "prettyDepType": "devDependency",
+    },
+    Object {
+      "currentValue": "4.0.0-beta.1",
+      "datasource": "npm",
+      "depName": "@angular/core",
+      "depType": "devDependencies",
+      "prettyDepType": "devDependency",
+    },
+    Object {
+      "depName": undefined,
+      "depType": "resolutions",
+      "managerData": Object {
+        "key": "//",
+      },
+      "prettyDepType": "resolutions",
+      "skipReason": "invalid-name",
+    },
+    Object {
+      "currentValue": "1.21.0",
+      "datasource": "npm",
+      "depName": "config",
+      "depType": "resolutions",
+      "managerData": Object {
+        "key": "**/config",
+      },
+      "prettyDepType": "resolutions",
+    },
+  ],
+  "lernaClient": undefined,
+  "lernaPackages": undefined,
+  "managerData": Object {
+    "lernaJsonFile": undefined,
+  },
+  "npmLock": undefined,
+  "npmrc": undefined,
+  "packageFileVersion": "1.0.0",
+  "packageJsonName": "renovate",
+  "packageJsonType": "app",
+  "pnpmShrinkwrap": undefined,
+  "skipInstalls": true,
+  "yarnLock": undefined,
+  "yarnWorkspacesPackages": Array [],
+  "yarnrc": undefined,
+}
+`;