Skip to content

Commit 02aa588

Browse files
authored
Merge pull request #3629 from mwiencek/flow-281
Upgrade Flow to v0.283.0
2 parents fc62560 + d5ed7b4 commit 02aa588

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+125
-125
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- translations
1010

1111
env:
12-
TESTS_IMAGE_TAG: v-2025-08-29.1
12+
TESTS_IMAGE_TAG: v-2025-09-27.0
1313

1414
jobs:
1515
build-tests-image:

eslint.config.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,8 @@ export default [
773773
'ft-flow/no-internal-flow-type': 'warn',
774774
'ft-flow/no-duplicate-type-union-intersection-members': 'warn',
775775
'ft-flow/no-existential-type': 'warn',
776-
'ft-flow/no-flow-fix-me-comments': 'error',
777776
'ft-flow/no-flow-suppressions-in-strict-files': ['warn', {
778-
"$FlowIssue": false,
777+
"$FlowExpectedError": false,
779778
}],
780779
'ft-flow/no-internal-flow-type': 'warn',
781780
'ft-flow/no-mixed': 'off',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"eslint-plugin-react": "7.37.5",
8383
"eslint-plugin-react-hooks": "6.1.0-canary-4db4b21c-20250626",
8484
"eslint-plugin-simple-import-sort": "^7.0.0",
85-
"flow-bin": "0.275.0",
85+
"flow-bin": "0.283.0",
8686
"flow-typed": "4.1.1",
8787
"gettext-parser": "4.2.0",
8888
"globals": "15.9.0",

root/admin/attributes/AttributeEditForm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ component AttributeEditForm(...props: CreateOrEditAttributePropsT) {
2121
{type: 'Language', const form, ...} => <LanguageEditForm form={form} />,
2222
{type: 'Script', const form, ...} => <ScriptEditForm form={form} />,
2323
{type: 'CollectionType' | 'SeriesType', ...} as props => (
24-
// $FlowIssue[incompatible-type] series vs collection confuses Flow
24+
// $FlowExpectedError[incompatible-type] series/collection confuses Flow
2525
<AttributeEditFormWithEntityType
2626
action={props.action}
2727
entityTypeSelectOptions={props.entityTypeSelectOptions}

root/edit/details/AddArt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ component AddArt(
2828
<tr>
2929
<th>{addColonText(formattedEntityType)}</th>
3030
<td>
31-
{/* $FlowIgnore[prop-missing] */}
31+
{/* $FlowFixMe[prop-missing] */}
3232
<DescriptiveLink entity={display[entityType]} />
3333
</td>
3434
</tr>
@@ -62,7 +62,7 @@ component AddArt(
6262

6363
<EditArtwork
6464
artwork={display.artwork}
65-
// $FlowIgnore[prop-missing]
65+
// $FlowFixMe[prop-missing]
6666
entity={display[entityType]}
6767
/>
6868
</table>

root/edit/details/EditArt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ component EditArt(
4444
<tr>
4545
<th>{addColonText(formattedEntityType)}</th>
4646
<td colSpan={2}>
47-
{/* $FlowIgnore[prop-missing] */}
47+
{/* $FlowFixMe[prop-missing] */}
4848
<DescriptiveLink entity={display[entityType]} />
4949
</td>
5050
</tr>
@@ -80,7 +80,7 @@ component EditArt(
8080
<EditArtwork
8181
artwork={display.artwork}
8282
colSpan={2}
83-
// $FlowIgnore[prop-missing]
83+
// $FlowFixMe[prop-missing]
8484
entity={display[entityType]}
8585
/>
8686
</table>

root/edit/details/RemoveArt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ component RemoveArt(
2828
<tr>
2929
<th>{addColonText(formattedEntityType)}</th>
3030
<td>
31-
{/* $FlowIgnore[prop-missing] */}
31+
{/* $FlowFixMe[prop-missing] */}
3232
<DescriptiveLink entity={display[entityType]} />
3333
</td>
3434
</tr>
@@ -64,7 +64,7 @@ component RemoveArt(
6464

6565
<EditArtwork
6666
artwork={display.artwork}
67-
// $FlowIgnore[prop-missing]
67+
// $FlowFixMe[prop-missing]
6868
entity={display[entityType]}
6969
/>
7070
</table>

root/edit/details/ReorderArt.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ component ReorderArt(
2222
formattedEntityType: string,
2323
) {
2424
const display = edit.display_data;
25-
// $FlowIgnore[prop-missing]
25+
// $FlowFixMe[prop-missing]
2626
const entity = display[entityType];
2727
const oldArt = display.old;
2828
const newArt = display.new;
@@ -40,7 +40,7 @@ component ReorderArt(
4040
<tr>
4141
<th>{addColonText(formattedEntityType)}</th>
4242
<td>
43-
{/* $FlowIgnore[prop-missing] */}
43+
{/* $FlowFixMe[prop-missing] */}
4444
<DescriptiveLink entity={entity} />
4545
</td>
4646
</tr>

root/entity/NotFound.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import NotFoundComponent from '../components/NotFound.js';
1212
import expand2react from '../static/scripts/common/i18n/expand2react.js';
1313

14-
const defaultSearchArgs = {search_url: '/search'};
14+
const defaultSearchArgs: NotFoundPagesPropsT['args'] =
15+
{search_url: '/search'};
1516

1617
type NotFoundPagesPropsT = {
1718
+args: {genre_list?: string, search_url?: string},

root/release/DiscIds.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ component DiscIds(
101101
</tr>
102102
</thead>
103103
<tbody>
104-
{/* $FlowIgnore[incompatible-use] has cdtocs so has mediums */}
104+
{/* $FlowFixMe[incompatible-use] has cdtocs so has mediums */}
105105
{release.mediums.map(medium => {
106106
const mediumCDTocs = groupedMediumCDTocs.get(medium.id) ?? [];
107107
return (

0 commit comments

Comments
 (0)