Skip to content

Commit

Permalink
[cascading] from release/10.1.0-rc to main (#1569)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/10.1.0-rc","targetBranch":"main","bypassReviewers":true,"isConflicting":false}
-->

## Cascading from release/10.1.0-rc to main

The configuration requests the cascading to bypass reviewer in case of
CI success.
To not bypass the reviewing process, please check the following
checkbox:

- [ ] <!-- !cancel bypass! --> 🚫 stop reviewing process
bypass for this Pull Request

---

<small>This Pull Request has been generated with ❤️ by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
fpaul-1A authored Mar 29, 2024
2 parents c6d070e + 0baea09 commit 1ae00b2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion packages/@o3r/eslint-config-otter/schematics/ng-add/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
'eslint-plugin-prefer-arrow',
'eslint-plugin-unicorn',
'jest',
'jsonc-eslint-parser'
'jsonc-eslint-parser',
'yaml-eslint-parser'
];

const {
Expand Down
7 changes: 6 additions & 1 deletion packages/@o3r/eslint-config-otter/typescript.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
const hasJestDependency = (() => {
try { return !!require.resolve('jest'); }
catch { return false; }
})();

module.exports = {
overrides: [
{
Expand All @@ -11,7 +16,7 @@ module.exports = {
'./rules/typescript/prefer-arrow.cjs',
'./rules/typescript/stylistic.cjs',
'./rules/typescript/unicorn.cjs',
'./rules/typescript/jest.cjs',
...hasJestDependency ? ['./rules/typescript/jest.cjs'] : [],
'./rules/typescript/stylistic.cjs'
],
parserOptions: {
Expand Down

0 comments on commit 1ae00b2

Please sign in to comment.