Skip to content

Commit

Permalink
fix: apply Cypress rules to all of cypress subdirectories
Browse files Browse the repository at this point in the history
Also:
- fix: ensure Node applied to Node RC scripts
  • Loading branch information
brettz9 committed Jul 17, 2024
1 parent 5d5714c commit 814ac49
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# eslint-config-ash-nazg CHANGES

## 36.0.2

- fix: apply Cypress rules to all of `cypress` subdirectories
- fix: ensure Node applied to Node RC scripts

## 36.0.1

- fix: ensure when Node not included that modules does not reference Node
Expand Down
4 changes: 2 additions & 2 deletions cypress.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import mochaPlus from './mocha-plus.js';
export default [
{
...(cypress.configs.recommended),
files: ['cypress/e2e/**']
files: ['cypress/**']
},
...mochaPlus,
{
files: ['cypress/e2e/**'],
files: ['cypress/**'],
rules: {
// Conflicts with Cypress `should`
'mocha-cleanup/invalid-assertions': 0
Expand Down
7 changes: 7 additions & 0 deletions overrides-script-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import overridesScript from './overrides-script.js';
import scriptNode from './script-node.js';

export default [
...scriptNode,
...overridesScript
];
16 changes: 12 additions & 4 deletions overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import {readFileSync} from 'fs';
import globals from 'globals';
import overridesScript from './overrides-script.js';
import overridesScriptNode from './overrides-script-node.js';
import overridesModule from './overrides-module.js';
import browser from './browser.js';

Expand Down Expand Up @@ -35,17 +36,24 @@ export default function overrides (types, pkg) {
'.babelrc.js',
'babel.config.js',
'.eslintrc.js',
'.eslintrc.cjs',
'.mocharc.js',
'.mocharc.cjs',
'.ncurc.js',
'.ncurc.cjs',
'.3rdparty-eslintrc.js',
'**/jsdoc-config.js',
'webpack.config.js',
'**/.vuepress/config.js',
'*.webpack.config.js',
'web-ext-config.js',
'web-ext-config.js'
]
};
}),
...overridesScriptNode.map((cfg) => {
return {
...cfg,
files: [
'.eslintrc.cjs',
'.mocharc.cjs',
'.ncurc.cjs',
'web-ext-config.cjs'
]
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-config-ash-nazg",
"version": "36.0.1",
"version": "36.0.2",
"description": "An expansion and tweaking of the \"standard\" config style for ESLint",
"main": "index.js",
"type": "module",
Expand Down

0 comments on commit 814ac49

Please sign in to comment.