Skip to content

Commit

Permalink
Cleanup and fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
spautz committed Jul 27, 2020
1 parent 523ad12 commit b00a678
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
4 changes: 1 addition & 3 deletions demos/todo-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"limited-cache": "^0.5.0",
"lodash": "^4.17.19",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-scripts": "3.4.1",
"recoil": "^0.0.10",
"redux": "^4.0.5",
"redux-to-recoil": "github:spautz/redux-to-recoil#dev--core-functionality",
"redux-to-recoil": "github:spautz/redux-to-recoil#master",
"reselect": "^4.0.0"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import AddTodo from './components-recoil-readonly/AddTodo';
import FilterLink from './components-recoil-readonly/FilterLink';
import VisibleTodoList from './components-recoil-readonly/VisibleTodoList';

const ReduxApp = () => (
const RecoilReadOnlyApp = () => (
<fieldset>
<legend>
<legend>Redux-to-Recoil: Read-only</legend>
Expand All @@ -22,4 +22,4 @@ const ReduxApp = () => (
</fieldset>
);

export default ReduxApp;
export default RecoilReadOnlyApp;
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import AddTodo from './components-recoil-readwrite/AddTodo';
import FilterLink from './components-recoil-readwrite/FilterLink';
import VisibleTodoList from './components-recoil-readwrite/VisibleTodoList';

const ReduxApp = () => (
const RecoilReadWriteApp = () => (
<fieldset>
<legend>
<legend>Redux-to-Recoil: Read-Write (with middleware)</legend>
Expand All @@ -22,4 +22,4 @@ const ReduxApp = () => (
</fieldset>
);

export default ReduxApp;
export default RecoilReadWriteApp;
File renamed without changes.
10 changes: 5 additions & 5 deletions demos/todo-list/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { RecoilRoot } from 'recoil';
import { SyncReduxToRecoil } from 'redux-to-recoil';

import rootReducer from './reducers';
import ReduxApp from './ReduxApp';
import RecoilAppReadOnly from './RecoilApp.readonly';
import RecoilAppReadWrite from './RecoilApp.readwrite';
import ReduxApp from './App.redux';
import RecoilReadOnlyApp from './App.recoil-readonly';
import RecoilReadWriteApp from './App.recoil-readwrite';

const store = createStore(rootReducer);

Expand All @@ -18,8 +18,8 @@ render(
<RecoilRoot>
<SyncReduxToRecoil>
<ReduxApp />
<RecoilAppReadOnly />
<RecoilAppReadWrite />
<RecoilReadOnlyApp />
<RecoilReadWriteApp />
</SyncReduxToRecoil>
</RecoilRoot>
</Provider>
Expand Down
2 changes: 1 addition & 1 deletion src/SyncReduxToRecoil.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useSelector, useStore } from 'react-redux';
import { useSelector } from 'react-redux';
import { useRecoilState } from 'recoil';

import internalStateAtom from './internalStateAtom';
Expand Down
4 changes: 2 additions & 2 deletions src/atomFromRedux.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import getPath from 'lodash/get';
import { ReadWriteSelectorOptions, RecoilState, selector } from 'recoil';
import { RecoilState, selector } from 'recoil';
import { LimitedCache } from 'limited-cache';

import internalStateAtom from './internalStateAtom';
Expand Down Expand Up @@ -29,7 +29,7 @@ const atomFromRedux = <ReturnType = any>(path: string): RecoilState<ReturnType>
set: ({ get, set }, newValue) => {
console.log('TODO: Bidirectional support', realPath, { get, set }, newValue);
},
} as ReadWriteSelectorOptions<any>);
});

atomSelectorCache.set(realPath, selectorForPath);
}
Expand Down
3 changes: 2 additions & 1 deletion src/internalStateAtom.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { atom } from 'recoil';

const internalStateAtom = atom({
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const internalStateAtom = atom<any>({
key: 'redux-to-recoil:state',
default: null,
});
Expand Down

0 comments on commit b00a678

Please sign in to comment.