chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Fixes build errors from some previous TS-related commits (#24811)

Browse source
This commit is contained in:
Renaud Chaput 2023-05-03 16:28:14 +02:00 committed by GitHub
parent 0999cb4601
commit 45579a26cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/containers/compose_container.jsx
View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import configureStore from '../store/configureStore'; import { store } from '../store/configureStore';
import { hydrateStore } from '../actions/store'; import { hydrateStore } from '../actions/store';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales'; import { getLocale } from '../locales';
@ -12,8 +12,6 @@ import { fetchCustomEmojis } from '../actions/custom_emojis';
const { localeData, messages } = getLocale(); const { localeData, messages } = getLocale();
addLocaleData(localeData); addLocaleData(localeData);
const store = configureStore();
if (initialState) { if (initialState) {
store.dispatch(hydrateStore(initialState)); store.dispatch(hydrateStore(initialState));
} }

8
app/javascript/mastodon/reducers/notifications.js
View file

@ -23,8 +23,8 @@ import {
MARKERS_FETCH_SUCCESS, MARKERS_FETCH_SUCCESS,
} from '../actions/markers'; } from '../actions/markers';
import { import {
APP_FOCUS, focusApp,
APP_UNFOCUS, unfocusApp,
} from '../actions/app'; } from '../actions/app';
import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks'; import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines'; import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
@ -258,9 +258,9 @@ export default function notifications(state = initialState, action) {
return updateMounted(state); return updateMounted(state);
case NOTIFICATIONS_UNMOUNT: case NOTIFICATIONS_UNMOUNT:
return state.update('mounted', count => count - 1); return state.update('mounted', count => count - 1);
case APP_FOCUS: case focusApp.type:
return updateVisibility(state, true); return updateVisibility(state, true);
case APP_UNFOCUS: case unfocusApp.type:
return updateVisibility(state, false); return updateVisibility(state, false);
case NOTIFICATIONS_LOAD_PENDING: case NOTIFICATIONS_LOAD_PENDING:
return state.update('items', list => state.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0); return state.update('items', list => state.get('pendingItems').concat(list.take(40))).set('pendingItems', ImmutableList()).set('unread', 0);

3
babel.config.js
View file

@ -9,6 +9,9 @@ module.exports = (api) => {
loose: true, loose: true,
modules: false, modules: false,
debug: false, debug: false,
include: [
'proposal-numeric-separator',
],
}; };
const config = { const config = {