Skip to content

Commit 35934ed

Browse files
authored
Merge branch 'develop' into develop
2 parents 9934985 + 15c7797 commit 35934ed

File tree

17 files changed

+331
-128
lines changed

17 files changed

+331
-128
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ I have verified that this pull request:
66

77
* [ ] has no linting errors (`npm run lint`)
88
* [ ] has no test errors (`npm run test`)
9+
* [ ] has no typecheck errors (`npm run typecheck`)
910
* [ ] is from a uniquely-named feature branch and is up to date with the `develop` branch.
1011
* [ ] is descriptively named and links to an issue number, i.e. `Fixes #123`
1112
* [ ] meets the standards outlined in the [accessibility guidelines](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/accessibility.md)

client/modules/IDE/actions/preferences.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type {
66
UpdatePreferencesDispatch,
77
SetPreferencesTabValue,
88
SetFontSizeValue,
9-
GetRootState,
109
SetLineNumbersValue,
1110
SetAutocloseBracketsQuotesValue,
1211
SetAutocompleteHinterValue,
@@ -20,6 +19,7 @@ import type {
2019
SetLanguageValue,
2120
SetThemeValue
2221
} from './preferences.types';
22+
import type { GetRootState } from '../../../reducers';
2323

2424
function updatePreferences(
2525
formParams: UpdatePreferencesRequestBody,

client/modules/IDE/actions/preferences.types.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as ActionTypes from '../../../constants';
22
import type { PreferencesState } from '../reducers/preferences';
3-
import type { RootState } from '../../../reducers';
3+
import type { GetRootState } from '../../../reducers';
44

55
// Value Definitions:
66
export type SetPreferencesTabValue = PreferencesState['tabIndex'];
@@ -112,5 +112,3 @@ export type PreferencesThunk = (
112112
dispatch: UpdatePreferencesDispatch,
113113
getState: GetRootState
114114
) => void;
115-
116-
export type GetRootState = () => RootState;

0 commit comments

Comments
 (0)