Fixes build errors from some previous TS-related commits (#24811)
This commit is contained in:
		
							parent
							
								
									9ed91c444e
								
							
						
					
					
						commit
						e1985e14f6
					
				
					 3 changed files with 8 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
import React from 'react';
 | 
			
		||||
import { Provider } from 'react-redux';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import configureStore from '../store/configureStore';
 | 
			
		||||
import { store } from '../store/configureStore';
 | 
			
		||||
import { hydrateStore } from '../actions/store';
 | 
			
		||||
import { IntlProvider, addLocaleData } from 'react-intl';
 | 
			
		||||
import { getLocale } from '../locales';
 | 
			
		||||
| 
						 | 
				
			
			@ -12,8 +12,6 @@ import { fetchCustomEmojis } from '../actions/custom_emojis';
 | 
			
		|||
const { localeData, messages } = getLocale();
 | 
			
		||||
addLocaleData(localeData);
 | 
			
		||||
 | 
			
		||||
const store = configureStore();
 | 
			
		||||
 | 
			
		||||
if (initialState) {
 | 
			
		||||
  store.dispatch(hydrateStore(initialState));
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,8 +23,8 @@ import {
 | 
			
		|||
  MARKERS_FETCH_SUCCESS,
 | 
			
		||||
} from '../actions/markers';
 | 
			
		||||
import {
 | 
			
		||||
  APP_FOCUS,
 | 
			
		||||
  APP_UNFOCUS,
 | 
			
		||||
  focusApp,
 | 
			
		||||
  unfocusApp,
 | 
			
		||||
} from '../actions/app';
 | 
			
		||||
import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks';
 | 
			
		||||
import { TIMELINE_DELETE, TIMELINE_DISCONNECT } from '../actions/timelines';
 | 
			
		||||
| 
						 | 
				
			
			@ -258,9 +258,9 @@ export default function notifications(state = initialState, action) {
 | 
			
		|||
    return updateMounted(state);
 | 
			
		||||
  case NOTIFICATIONS_UNMOUNT:
 | 
			
		||||
    return state.update('mounted', count => count - 1);
 | 
			
		||||
  case APP_FOCUS:
 | 
			
		||||
  case focusApp.type:
 | 
			
		||||
    return updateVisibility(state, true);
 | 
			
		||||
  case APP_UNFOCUS:
 | 
			
		||||
  case unfocusApp.type:
 | 
			
		||||
    return updateVisibility(state, false);
 | 
			
		||||
  case NOTIFICATIONS_LOAD_PENDING:
 | 
			
		||||
    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) => {
 | 
			
		|||
    loose: true,
 | 
			
		||||
    modules: false,
 | 
			
		||||
    debug: false,
 | 
			
		||||
    include: [
 | 
			
		||||
      'proposal-numeric-separator',
 | 
			
		||||
    ],
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  const config = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue