gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: different config loading strategy (#4807)

Browse Source 
* move config loading from App.js to bootstrap.js

* remove mergeConfig action

* introduce deepmerge package

* fix: manual init

Co-authored-by: erezrokah <erezrokah@users.noreply.github.com>
This commit is contained in:
Vladislav Shkodin
2021-01-13 19:51:45 +02:00
committed by GitHub
parent 9e277ad851
commit 77dd88519f
6 changed files with 60 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/netlify-cms-core/src/reducers/config.ts
View File

@ -1,5 +1,5 @@
import { Map } from 'immutable';
import { CONFIG_REQUEST, CONFIG_SUCCESS, CONFIG_FAILURE, CONFIG_MERGE } from '../actions/config';
import { CONFIG_REQUEST, CONFIG_SUCCESS, CONFIG_FAILURE } from '../actions/config';
import { Config, ConfigAction } from '../types/redux';
import { EDITORIAL_WORKFLOW } from '../constants/publishModes';
@ -7,8 +7,6 @@ const defaultState: Map<string, boolean | string> = Map({ isFetching: true });
const config = (state = defaultState, action: ConfigAction) => {
switch (action.type) {
case CONFIG_MERGE:
return state.mergeDeep(action.payload);
case CONFIG_REQUEST:
return state.set('isFetching', true);
case CONFIG_SUCCESS:
@ -17,7 +15,7 @@ const config = (state = defaultState, action: ConfigAction) => {
* before firing this action (so the resulting config can be validated),
* so we don't have to merge it here.
*/
return action.payload.delete('isFetching');
return action.payload;
case CONFIG_FAILURE:
return state.withMutations(s => {
s.delete('isFetching');