Skip to content
Snippets Groups Projects
Unverified Commit 45579a26 authored by Renaud Chaput's avatar Renaud Chaput Committed by GitHub
Browse files

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

parent 0999cb46
No related branches found
No related tags found
No related merge requests found
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'; ...@@ -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));
} }
......
...@@ -23,8 +23,8 @@ import { ...@@ -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) { ...@@ -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);
......
...@@ -9,6 +9,9 @@ module.exports = (api) => { ...@@ -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 = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment