Skip to content

Commit e39d0e7

Browse files
authored
Merge pull request #159 from PHILLIPS71/chore/update-ci-workflow-actions
chore: update ci workflow actions
2 parents 2274f07 + 6c1b82c commit e39d0e7

13 files changed

+153
-121
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
matrix:
1616
node-version: [18.x, 20.x, 22.x]
1717
steps:
18-
- uses: actions/checkout@v2
19-
- uses: actions/setup-node@v2
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-node@v4
2020
with:
2121
node-version: ${{ matrix.node-version }}
2222
cache: 'yarn'
@@ -29,8 +29,8 @@ jobs:
2929
name: Lint
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v2
33-
- uses: actions/setup-node@v2
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-node@v4
3434
with:
3535
node-version: 22.x
3636
cache: 'yarn'
@@ -47,8 +47,8 @@ jobs:
4747
if: github.event_name == 'push' && github.repository == 'relayjs/eslint-plugin-relay'
4848
needs: [build, lint]
4949
steps:
50-
- uses: actions/checkout@v2
51-
- uses: actions/setup-node@v2
50+
- uses: actions/checkout@v4
51+
- uses: actions/setup-node@v4
5252
with:
5353
node-version: 22.x
5454
registry-url: https://registry.npmjs.org/

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ The following rules support suppression within graphql tags:
5252
Supported rules can be suppressed by adding `# eslint-disable-next-line relay/name-of-rule` to the preceding line:
5353

5454
```js
55-
graphql`fragment foo on Page {
56-
# eslint-disable-next-line relay/must-colocate-fragment-spreads
57-
...unused1
58-
}`
55+
graphql`
56+
fragment foo on Page {
57+
# eslint-disable-next-line relay/must-colocate-fragment-spreads
58+
...unused1
59+
}
60+
`;
5961
```
6062

6163
Note that only the `eslint-disable-next-line` form of suppression works. `eslint-disable-line` doesn't currently work until graphql-js provides support for [parsing Comment nodes](https://github.com/graphql/graphql-js/issues/2241) in their AST.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
"mocha": "^9.1.3",
3333
"prettier": "^2.4.1",
3434
"typescript": "^5.8.3"
35-
}
35+
},
36+
"packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
3637
}

src/rule-generated-typescript-types.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,9 @@ module.exports = {
351351
}
352352
if (arg.type === 'Identifier') {
353353
const name = arg.name;
354-
let scope = sourceCode.getScope ? sourceCode.getScope(arg) : context.getScope();
354+
let scope = sourceCode.getScope
355+
? sourceCode.getScope(arg)
356+
: context.getScope();
355357
while (scope != null) {
356358
for (const variable of scope.variables) {
357359
if (variable.name === name) {

src/utils.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ function getLoc(context, templateNode, graphQLNode) {
4545
const start = startAndEnd[0];
4646
const end = startAndEnd[1];
4747
return {
48-
start: getLocFromIndex(context.sourceCode ?? context.getSourceCode(), start),
48+
start: getLocFromIndex(
49+
context.sourceCode ?? context.getSourceCode(),
50+
start
51+
),
4952
end: getLocFromIndex(context.sourceCode ?? context.getSourceCode(), end)
5053
};
5154
}
@@ -105,7 +108,9 @@ function isGraphQLTag(tag) {
105108
}
106109

107110
function shouldLint(context) {
108-
return /graphql|relay/i.test((context.sourceCode ?? context.getSourceCode()).text);
111+
return /graphql|relay/i.test(
112+
(context.sourceCode ?? context.getSourceCode()).text
113+
);
109114
}
110115

111116
function hasPrecedingEslintDisableComment(node, commentText) {

test/compat-uses-vars.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
'use strict';
99

10-
const { builtinRules } = require('eslint/use-at-your-own-risk');
10+
const {builtinRules} = require('eslint/use-at-your-own-risk');
1111
const RuleTester = require('eslint').RuleTester;
1212
const rules = require('..').rules;
1313

@@ -16,7 +16,7 @@ const ruleTester = new RuleTester({
1616
plugins: {
1717
relay: {
1818
rules: {
19-
'compat-uses-vars': rules['compat-uses-vars'],
19+
'compat-uses-vars': rules['compat-uses-vars']
2020
}
2121
}
2222
}

test/function-required-argument.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ const rules = require('..').rules;
1111
const RuleTester = require('eslint').RuleTester;
1212

1313
const ruleTester = new RuleTester({
14-
languageOptions: {ecmaVersion: 6, parser: require('@typescript-eslint/parser')}
14+
languageOptions: {
15+
ecmaVersion: 6,
16+
parser: require('@typescript-eslint/parser')
17+
}
1518
});
1619

1720
ruleTester.run(

test/future-added-value.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ const ruleTester = new RuleTester({
1717
ecmaVersion: 6,
1818
sourceType: 'module',
1919
parser: require('@babel/eslint-parser'),
20-
parserOptions: { requireConfigFile: false, babelOptions: { "presets": ["@babel/preset-flow"] } }
21-
},
20+
parserOptions: {
21+
requireConfigFile: false,
22+
babelOptions: {presets: ['@babel/preset-flow']}
23+
}
24+
}
2225
});
2326

2427
const FUTURE_ADDED_VALUE_MESSAGE =

test/generated-typescript-types.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ const rules = require('..').rules;
1111
const RuleTester = require('eslint').RuleTester;
1212

1313
const ruleTester = new RuleTester({
14-
languageOptions: {ecmaVersion: 6, parser: require('@typescript-eslint/parser'), parserOptions: {ecmaFeatures: {jsx: true}}},
14+
languageOptions: {
15+
ecmaVersion: 6,
16+
parser: require('@typescript-eslint/parser'),
17+
parserOptions: {ecmaFeatures: {jsx: true}}
18+
}
1519
});
1620

1721
const HAS_ESLINT_BEEN_UPGRADED_YET = false;

test/hook-required-argument.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ const rules = require('..').rules;
1111
const RuleTester = require('eslint').RuleTester;
1212

1313
const ruleTester = new RuleTester({
14-
languageOptions: {ecmaVersion: 6, parser: require('@typescript-eslint/parser')}
14+
languageOptions: {
15+
ecmaVersion: 6,
16+
parser: require('@typescript-eslint/parser')
17+
}
1518
});
1619

1720
ruleTester.run('hook-required-argument', rules['hook-required-argument'], {

0 commit comments

Comments
 (0)