Skip to content

Commit caa8a80

Browse files
authored
Support the new @fs/zion/logical-over-directional (#20)
To get the new @fs/zion/logical-over-directional rule to be applied. @fs/zion/logical-over-directional is in the jest file for now. jest stuff is in overrides in the jest file so we can just extend it from the top level rather than from a overrides. npm update and update to node 20 and update husky npm run test:update
1 parent e126b72 commit caa8a80

File tree

7 files changed

+91
-21
lines changed

7 files changed

+91
-21
lines changed

.husky/pre-push

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm test

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
20

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dist: focal
22
version: ~> 1.0
33
language: node_js
44
node_js:
5-
- 16
5+
- 20
66
branches:
77
only:
88
- master

demo/test/snapshots/linting-config.test.js.md

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Generated by [AVA](https://ava.li).
1010
1111
`{␊
1212
"env": {␊
13+
"jest/globals": true,␊
1314
"es2021": true,␊
1415
"es6": true,␊
1516
"node": true,␊
@@ -39,6 +40,8 @@ Generated by [AVA](https://ava.li).
3940
"import",␊
4041
"@babel",␊
4142
"jsdoc",␊
43+
"@fs/zion",␊
44+
"jest",␊
4245
"you-dont-need-lodash-underscore",␊
4346
"prettier",␊
4447
"test-selectors",␊
@@ -64,6 +67,12 @@ Generated by [AVA](https://ava.li).
6467
"@babel/semi": [␊
6568
"off"␊
6669
],␊
70+
"@fs/zion/logical-over-directional": [␊
71+
"warn"␊
72+
],␊
73+
"@fs/zion/prefer-zion-render": [␊
74+
"off"␊
75+
],␊
6776
"@typescript-eslint/block-spacing": [␊
6877
"off"␊
6978
],␊
@@ -496,7 +505,8 @@ Generated by [AVA](https://ava.li).
496505
{␊
497506
"maxDepth": "∞",␊
498507
"ignoreExternal": false,␊
499-
"allowUnsafeDynamicCyclicDependency": false␊
508+
"allowUnsafeDynamicCyclicDependency": false,␊
509+
"disableScc": false␊
500510
}␊
501511
],␊
502512
"import/no-default-export": [␊
@@ -670,6 +680,63 @@ Generated by [AVA](https://ava.li).
670680
"init-declarations": [␊
671681
"off"␊
672682
],␊
683+
"jest/expect-expect": [␊
684+
"warn"␊
685+
],␊
686+
"jest/no-alias-methods": [␊
687+
"error"␊
688+
],␊
689+
"jest/no-commented-out-tests": [␊
690+
"warn"␊
691+
],␊
692+
"jest/no-conditional-expect": [␊
693+
"error"␊
694+
],␊
695+
"jest/no-deprecated-functions": [␊
696+
"error"␊
697+
],␊
698+
"jest/no-disabled-tests": [␊
699+
"warn"␊
700+
],␊
701+
"jest/no-done-callback": [␊
702+
"error"␊
703+
],␊
704+
"jest/no-export": [␊
705+
"error"␊
706+
],␊
707+
"jest/no-focused-tests": [␊
708+
"error"␊
709+
],␊
710+
"jest/no-identical-title": [␊
711+
"error"␊
712+
],␊
713+
"jest/no-interpolation-in-snapshots": [␊
714+
"error"␊
715+
],␊
716+
"jest/no-jasmine-globals": [␊
717+
"error"␊
718+
],␊
719+
"jest/no-mocks-import": [␊
720+
"error"␊
721+
],␊
722+
"jest/no-standalone-expect": [␊
723+
"error"␊
724+
],␊
725+
"jest/no-test-prefixes": [␊
726+
"error"␊
727+
],␊
728+
"jest/valid-describe-callback": [␊
729+
"error"␊
730+
],␊
731+
"jest/valid-expect": [␊
732+
"error"␊
733+
],␊
734+
"jest/valid-expect-in-promise": [␊
735+
"error"␊
736+
],␊
737+
"jest/valid-title": [␊
738+
"error"␊
739+
],␊
673740
"jsdoc/check-alignment": [␊
674741
"warn"␊
675742
],␊
@@ -2317,7 +2384,7 @@ Generated by [AVA](https://ava.li).
23172384
{␊
23182385
"ignoreRefs": true,␊
23192386
"allowArrowFunctions": true,␊
2320-
"allowFunctions": false,␊
2387+
"allowFunctions": true,␊
23212388
"allowBind": false,␊
23222389
"ignoreDOMComponents": true␊
23232390
}␊
@@ -3185,6 +3252,9 @@ Generated by [AVA](https://ava.li).
31853252
"you-dont-need-lodash-underscore/chunk": [␊
31863253
"off"␊
31873254
],␊
3255+
"you-dont-need-lodash-underscore/clone-deep": [␊
3256+
2␊
3257+
],␊
31883258
"you-dont-need-lodash-underscore/collect": [␊
31893259
1␊
31903260
],␊
@@ -3424,7 +3494,9 @@ Generated by [AVA](https://ava.li).
34243494
".mts",␊
34253495
".tsx",␊
34263496
".js",␊
3427-
".jsx"␊
3497+
".jsx",␊
3498+
".mjs",␊
3499+
".cjs"␊
34283500
],␊
34293501
"import/external-module-folders": [␊
34303502
"node_modules",␊
@@ -3446,7 +3518,9 @@ Generated by [AVA](https://ava.li).
34463518
".mts",␊
34473519
".tsx",␊
34483520
".js",␊
3449-
".jsx"␊
3521+
".jsx",␊
3522+
".mjs",␊
3523+
".cjs"␊
34503524
]␊
34513525
}␊
34523526
},␊
133 Bytes
Binary file not shown.

es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
'@fs/eslint-config-frontier-react/es6',
1212
'@fs/eslint-config-frontier-react/json',
1313
'@fs/eslint-config-frontier-react/jsdoc',
14+
'@fs/eslint-config-frontier-react/jest',
1415
'@fs/eslint-config-frontier-react/dont-need-lodash',
1516
'@fs/eslint-config-frontier-react/typescript',
1617
'@fs/eslint-config-frontier-react/prettierSetup', // Always have prettier last so it can override format rules in the extends before it
@@ -98,7 +99,6 @@ module.exports = {
9899
overrides: [
99100
{
100101
files: ['*.stories.*', '*test*', '**/test/**', '**/*mock*/**', '*mock*', '**/setupTests.*', '**/fixtures/**'],
101-
extends: ['@fs/eslint-config-frontier-react/jest'],
102102
rules: {
103103
'no-alert': 'off',
104104
'no-console': 'off',

package.json

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fs/eslint-config-tree",
3-
"version": "6.0.1",
3+
"version": "6.1.0",
44
"description": "Shared Tree configuration that contains overrides and enhancements on top of the base frontier configuration.",
55
"main": "index.js",
66
"repository": {
@@ -28,37 +28,32 @@
2828
"!.*"
2929
],
3030
"dependencies": {
31-
"@babel/eslint-parser": "^7.23.3",
32-
"@fs/eslint-config-frontier-react": "^11.0.0",
33-
"eslint": "^8.55.0",
31+
"@babel/eslint-parser": "^7.25.1",
32+
"@fs/eslint-config-frontier-react": "^11.2.0",
33+
"eslint": "^8.57.1",
3434
"eslint-plugin-bestpractices": "github:skye2k2/eslint-plugin-bestpractices",
3535
"eslint-plugin-deprecate": "^0.7.0",
3636
"eslint-plugin-html": "^7.1.0",
37-
"eslint-plugin-promise": "^6.1.1",
37+
"eslint-plugin-promise": "^6.6.0",
3838
"eslint-plugin-sonarjs": "^0.22.0",
3939
"eslint-plugin-test-selectors": "^2.1.1"
4040
},
4141
"devDependencies": {
42-
"@fs/npm-publisher": "^1.5.2",
42+
"@fs/npm-publisher": "^1.6.0",
4343
"ava": "^2.4.0",
4444
"file-manager-js": "^3.1.6",
45-
"husky": "^3.1.0"
46-
},
47-
"husky": {
48-
"hooks": {
49-
"pre-push": "npm test"
50-
}
45+
"husky": "^9.1.6"
5146
},
5247
"scripts": {
5348
"lint": "eslint demo",
5449
"lint:fix": "eslint demo --fix",
5550
"lint:quiet": "eslint demo --quiet",
5651
"lint:report": "eslint demo '**/*.html' --format html --output-file ./reports/linting/linting_report.html & eslint demo --format json --output-file ./reports/linting/linting_report.json",
5752
"lint:snapshot": "eslint --print-config file.js > ./demo/test/snapshots/local-linting-final-config.json; eslint demo --no-color --output-file ./demo/test/snapshots/local-linting-output.txt; npm run test:format",
58-
"postinstall": "npm rebuild husky",
5953
"publish": "npmPublish",
6054
"test": "npm run lint:snapshot; ava",
6155
"test:format": "node demo/test/snapshots/format-config.js",
62-
"test:update": "npm run lint:snapshot; ava --update-snapshots"
56+
"test:update": "npm run lint:snapshot; ava --update-snapshots",
57+
"prepare": "husky"
6358
}
6459
}

0 commit comments

Comments
 (0)