Skip to content

Commit

Permalink
Merge branch 'main' into fix/eslint-eqeqeq
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice committed Nov 9, 2021
2 parents 85f7453 + b7dec71 commit 4db3a77
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .eslintrc.js
Expand Up @@ -38,8 +38,10 @@ module.exports = {
// other rules
'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 @@ -124,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
2 changes: 2 additions & 0 deletions lib/config-validator.ts
Expand Up @@ -13,6 +13,8 @@ import { getConfig as getFileConfig } from './workers/global/config/parse/file';

let returnVal = 0;

/* eslint-disable no-console */

async function validate(
desc: string,
config: RenovateConfig,
Expand Down
1 change: 1 addition & 0 deletions lib/config/decrypt.ts
Expand Up @@ -179,6 +179,7 @@ export async function decryptConfig(
'Migrating npmToken to npmrc'
);
if (is.string(decryptedConfig.npmrc)) {
/* eslint-disable no-template-curly-in-string */
if (decryptedConfig.npmrc.includes('${NPM_TOKEN}')) {
logger.debug('Replacing ${NPM_TOKEN} with decrypted token');
decryptedConfig.npmrc = decryptedConfig.npmrc.replace(
Expand Down
2 changes: 1 addition & 1 deletion lib/manager/gradle/deep/build-gradle.ts
Expand Up @@ -157,7 +157,7 @@ function dependencyStringVariableExpressionFormatMatch(
): RegExp {
return regEx(
`\\s*dependency\\s+['"]${dependency.group}:${dependency.name}:` +
'${([^}]*)}' +
'${([^}]*)}' + // eslint-disable-line no-template-curly-in-string
`['"](?:\\s|;|})`
);
}
Expand Down
1 change: 1 addition & 0 deletions lib/workers/global/config/parse/cli.ts
Expand Up @@ -85,6 +85,7 @@ export function getConfig(input: string[]): AllConfig {
}
});

/* eslint-disable no-console */
/* istanbul ignore next */
function helpConsole(): void {
console.log(' Examples:');
Expand Down

0 comments on commit 4db3a77

Please sign in to comment.