Skip to content

Commit

Permalink
Merge branch 'main' into refactor_regex
Browse files Browse the repository at this point in the history
  • Loading branch information
rarkins committed Dec 8, 2021
2 parents 055288f + b7b0d04 commit 353ed49
Show file tree
Hide file tree
Showing 586 changed files with 13,084 additions and 6,468 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM containerbase/node:v14.18.1@sha256:b720748f7a35570e402a8741f37a5bd54ad485dd6b4aeaff04027ad761b1306d
FROM containerbase/node:14.18.2@sha256:39288a62b456a381b12cf63aa207ec0b356a05410e95ee1b3fbbc2e1933b1ebc


# renovate: datasource=npm
Expand Down
25 changes: 16 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ module.exports = {
},
plugins: ['@renovate'],
extends: [
'airbnb-typescript/base',
'eslint:recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:jest/recommended',
'plugin:jest/style',
// https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin/src/configs
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:promise/recommended',
Expand All @@ -34,15 +33,15 @@ module.exports = {
'import/named': 0,
'import/namespace': 0,
'import/no-named-as-default-member': 0,
'import/prefer-default-export': 0, // no benefit

// other rules
'import/prefer-default-export': 0, // no benefit
'no-restricted-syntax': 0,
'no-await-in-loop': 0,
'prefer-destructuring': 0,
'prefer-template': 0,
'no-underscore-dangle': 0,
'consistent-return': 'error',
eqeqeq: 'error',
'no-console': 'error',
'no-negated-condition': 'error',
'no-param-reassign': 'error',
'no-template-curly-in-string': 'error',
'sort-imports': [
'error',
{
Expand Down Expand Up @@ -95,14 +94,21 @@ module.exports = {
// TODO: fix me
'@typescript-eslint/no-unsafe-return': 0,
'@typescript-eslint/no-unsafe-call': 0,
'@typescript-eslint/no-unsafe-argument': 0, // thousands of errors :-/

'@typescript-eslint/restrict-template-expressions': [
1,
{ allowNumber: true, allowBoolean: true },
],
'@typescript-eslint/restrict-plus-operands': 2,

'@typescript-eslint/naming-convention': 2,
'@typescript-eslint/naming-convention': [
2,
{
selector: 'enumMember',
format: ['PascalCase'],
},
],

'@typescript-eslint/unbound-method': 2,
'@typescript-eslint/ban-types': 2,
Expand All @@ -120,6 +126,7 @@ module.exports = {
jest: true,
},
rules: {
'no-template-curly-in-string': 0,
'prefer-destructuring': 0,
'prefer-promise-reject-errors': 0,
'import/no-dynamic-require': 0,
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ body:
label: Is this a feature you are interested in implementing yourself?
options:
- 'Yes'
- 'Maybe'
- 'No'
validations:
required: true
22 changes: 8 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,22 @@ jobs:
matrix:
os: [ubuntu-latest]
node-version: [14]
python-version: [3.9]
java-version: [11]
# skip macOS and Windows test on pull requests without 'ci:fulltest' label
include: >-
${{ fromJSON((github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'ci:fulltest')) && '[{
"os": "macos-latest",
"node-version": 14,
"python-version": 3.9,
"java-version": 11
}, {
"os": "windows-latest",
"node-version": 14,
"python-version": 3.9,
"java-version": 11
}]' || '[]') }}
env:
coverage: ${{ matrix.os == 'ubuntu-latest' && matrix.node-version == 14 }}
NODE_VERSION: ${{ matrix.node-version }}
PYTHON_VERSION: ${{ matrix.python-version }}
JAVA_VERSION: ${{ matrix.java-version }}
# skip Java tests on pull requests without 'ci:fulltest' label
SKIP_JAVA_TESTS: ${{ matrix.node-version != 14 || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'ci:fulltest')) }}
Expand All @@ -67,19 +63,14 @@ jobs:
fetch-depth: 2

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # renovate: tag=v2.4.1
uses: actions/setup-node@04c56d2f954f1e4c69436aa54cfef261a018f458 # renovate: tag=v2.5.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn

- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6 # renovate: tag=v2.2.2
with:
python-version: ${{ env.PYTHON_VERSION }}

- name: Set up Java ${{ env.JAVA_VERSION }}
if: env.SKIP_JAVA_TESTS == 'false'
uses: actions/setup-java@8db439b6b47e5e12312bf036760bbaa6893481ac # renovate: tag=v2.3.1
uses: actions/setup-java@5f00602cd1b2819185d88dc7a1b1985f598c6705 # renovate: tag=v2.4.0
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'adopt'
Expand All @@ -96,7 +87,6 @@ jobs:
npm config set scripts-prepend-node-path true
git --version
echo "Node $(node --version)"
python --version
echo "Yarn $(yarn --version)"
- name: Installing dependencies
Expand Down Expand Up @@ -129,7 +119,7 @@ jobs:
fetch-depth: 2

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # renovate: tag=v2.4.1
uses: actions/setup-node@04c56d2f954f1e4c69436aa54cfef261a018f458 # renovate: tag=v2.5.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
Expand All @@ -154,13 +144,17 @@ jobs:
yarn prettier
yarn markdown-lint
yarn git-check
yarn doc-fence-check
- name: Test schema
run: yarn test-schema

- name: Type check
run: yarn type-check

- name: Null check
run: yarn null-check

release:
needs: [lint, test]
if: github.event_name != 'pull_request'
Expand All @@ -175,7 +169,7 @@ jobs:
fetch-depth: 0

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # renovate: tag=v2.4.1
uses: actions/setup-node@04c56d2f954f1e4c69436aa54cfef261a018f458 # renovate: tag=v2.5.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@5581e08a65fc3811c3ac78939dd59e7a8adbf003 # renovate: tag=v1.0.22
uses: github/codeql-action/init@546b30f35ae5a3db0e0be1843008c2224f71c3b0 # renovate: tag=v1.0.25
with:
config-file: ./.github/codeql/codeql-config.yml

Expand All @@ -36,7 +36,7 @@ jobs:
# 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@5581e08a65fc3811c3ac78939dd59e7a8adbf003 # renovate: tag=v1.0.22
uses: github/codeql-action/autobuild@546b30f35ae5a3db0e0be1843008c2224f71c3b0 # renovate: tag=v1.0.25

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -50,4 +50,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@5581e08a65fc3811c3ac78939dd59e7a8adbf003 # renovate: tag=v1.0.22
uses: github/codeql-action/analyze@546b30f35ae5a3db0e0be1843008c2224f71c3b0 # renovate: tag=v1.0.25
2 changes: 1 addition & 1 deletion .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
ref: ${{ env.GIT_SHA }}

- name: Set up Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@270253e841af726300e85d718a5f606959b2903c # renovate: tag=v2.4.1
uses: actions/setup-node@04c56d2f954f1e4c69436aa54cfef261a018f458 # renovate: tag=v2.5.0
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
Expand Down
54 changes: 0 additions & 54 deletions data/extract.py

This file was deleted.

2 changes: 1 addition & 1 deletion data/node-js-schedule.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"lts": "2021-10-26",
"maintenance": "2022-10-18",
"end": "2024-04-30",
"codename": ""
"codename": "Gallium"
},
"v17": {
"start": "2021-10-19",
Expand Down
9 changes: 4 additions & 5 deletions docs/development/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,10 @@ If you add a `renovate.json` file to the root of your repository, you can use th
If you add configuration options to your `package.json` then these will override any other settings above.

```json
"renovate": {
"labels": [
"upgrade",
"bot"
]
{
"renovate": {
"labels": ["upgrade", "bot"]
}
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/development/issue-labeling.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Most issues should have a label relating to either a platform, manager, datasour
Use these to label the status of an issue.
For example, use `status:requirements` to mean that an issue is not yet ready for development to begin.
If we need the original poster or somebody else to respond to a query of ours, apply the `status:waiting-on-response` label.
All open issues should have some `status:*` label applied, and [this search](https://github.com/renovatebot/renovate/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+-label%3Astatus%3Arequirements+-label%3Astatus%3Aready+-label%3Astatus%3Ain-progress+-label%3Astatus%3Ablocked) can identify any which are missing a status label.
All open issues should have some `status:*` label applied, and [this search](https://github.com/renovatebot/renovate/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+-label%3Astatus%3Arequirements+-label%3Astatus%3Aready+-label%3Astatus%3Ain-progress+-label%3Astatus%3Ablocked+-label%3Astatus%3Awaiting-on-response+) can identify any which are missing a status label.

### Type of issue

Expand Down
13 changes: 5 additions & 8 deletions docs/development/local-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ You need the following dependencies for local development:
- Node.js `>=14.15.4`
- Yarn `^1.22.5`
- C++ compiler
- Python `^3.9`
- Java between `8` and `12`

We support Node.js versions according to the [Node.js release schedule](https://github.com/nodejs/Release#release-schedule).
Expand All @@ -31,7 +30,7 @@ curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
sudo apt-get update
sudo apt-get install -y git python-minimal build-essential nodejs yarn default-jre-headless
sudo apt-get install -y git build-essential nodejs yarn default-jre-headless
```

You can also use [SDKMAN](https://sdkman.io/) to manage Java versions.
Expand All @@ -43,7 +42,7 @@ If you already installed a component, 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 --add-python-to-path='true' --debug install --global windows-build-tools`
- In an Administrator PowerShell prompt, run `npm install -global npm` and then `npm --debug install --global windows-build-tools`
- Install [Yarn](https://yarnpkg.com/lang/en/docs/install/#windows-stable)
- Install Java, e.g. from [AdoptOpenJDK](https://adoptopenjdk.net/?variant=openjdk11) or any other distribution

Expand All @@ -53,8 +52,6 @@ If you already installed a component, skip the corresponding step.
PS C:\Windows\system32> git --version
PS C:\Windows\system32> node --version
PS C:\Windows\system32> yarn --version
PS C:\Windows\system32> python --version
PS C:\Windows\system32> python -c "from unittest import mock; print(mock.__version__)"
PS C:\Windows\system32> java -version
```

Expand All @@ -80,7 +77,7 @@ To ensure everything is working properly on your end, you must:
1. Verify all tests pass and have 100% test coverage, by running `yarn test`
1. Verify the installation by running `yarn start`. You must see this error: `You must configure a GitHub personal access token`

You only need to do these 5 steps this one time.
You only need to do these steps once.

Before you submit a pull request you should:

Expand Down Expand Up @@ -181,10 +178,10 @@ It's usually easier to have the logs in a file that you can open with a text edi
You can use a command like this to put the log messages in a file:

```
rm -f debug.log && yarn start myaccount/therepo --log-level=debug > debug.log
LOG_LEVEL=debug yarn start myaccount/therepo > debug.log
```

The example command will delete any existing `debug.log` and then save Renovate's output to a new `debug.log` file.
The example command will redirect/save Renovate's output to the `debug.log` file (and overwrite `debug.log` if it already exists).

### Adding configuration options

Expand Down

0 comments on commit 353ed49

Please sign in to comment.