Update dependencies and adjust code accordingly.

master
Tom Hacohen 4 years ago
parent 0fc92b46a7
commit 1327279816

@ -11,26 +11,26 @@
"@material-ui/styles": "^4.6.0",
"etesync": "^0.3.1",
"fuse.js": "^5.0.9-beta",
"ical.js": "^1.2.2",
"ical.js": "^1.4.0",
"immutable": "^4.0.0-rc.12",
"localforage": "^1.7.3",
"moment": "^2.24.0",
"localforage": "^1.9.0",
"moment": "^2.27.0",
"react": "^16.13.1",
"react-big-calendar": "^0.23.0",
"react-dom": "^16.4.0",
"react-big-calendar": "^0.26.0",
"react-dom": "^16.13.1",
"react-dropzone": "^10.0.4",
"react-redux": "^7.1.0",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-redux": "^7.2.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "^3.4.1",
"react-transition-group": "^4.3.0",
"react-virtualized": "^9.21.2",
"redux": "^4.0.1",
"redux-actions": "^2.6.4",
"redux": "^4.0.5",
"redux-actions": "^2.6.5",
"redux-logger": "^3.0.6",
"redux-persist": "^5.10.0",
"redux-persist": "^6.0.0",
"redux-thunk": "^2.3.0",
"reselect": "^3.0.1",
"reselect": "^4.0.0",
"uuid": "^3.1.0"
},
"scripts": {
@ -41,24 +41,26 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"@types/color": "^3.0.1",
"@types/jest": "^24.0.4",
"@types/node": "^11.9.3",
"@types/node-rsa": "^1.0.0",
"@types/react": "^16.8.3",
"@types/react": "^16.9.0",
"@types/react-big-calendar": "^0.22.3",
"@types/react-dom": "^16.8.1",
"@types/react-redux": "^7.1.1",
"@types/react-router": "^4.4.4",
"@types/react-router-dom": "^4.3.1",
"@types/react-dom": "^16.9.0",
"@types/react-redux": "^7.1.9",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.5",
"@types/react-virtualized": "^9.21.8",
"@types/redux": "^3.6.0",
"@types/redux-actions": "^2.3.2",
"@types/redux-logger": "^3.0.5",
"@types/redux-actions": "^2.6.1",
"@types/redux-logger": "^3.0.8",
"@types/sjcl": "^1.0.28",
"@types/urijs": "^1.15.38",
"@types/uuid": "^3.4.3",
"typescript": "^3.7.2"
"typescript": "~3.9.7"
},
"browserslist": [
">0.2%",

@ -308,4 +308,4 @@ const mapStateToProps = (state: store.StoreState) => {
export default connect(
mapStateToProps
)(App);
)(App as any);

@ -48,7 +48,7 @@ interface PropsType {
onSave: (event: EventType, journalUid: string, originalEvent?: EventType) => Promise<void>;
onDelete: (event: EventType, journalUid: string) => void;
onCancel: () => void;
location: Location;
location: Location<EventType>;
history: History;
duplicate: boolean;
}
@ -120,8 +120,8 @@ class EventEdit extends React.PureComponent<PropsType> {
this.state.timezone = event.timezone;
const rruleProp = this.props.item?.component.getFirstPropertyValue<ICAL.Recur>('rrule');
if (rruleProp) {
this.state.rrule = rruleProp.toJSON();
if (rruleProp.until) {
this.state.rrule = rruleProp.toJSON() as any;
if (this.state.rrule && rruleProp.until) {
this.state.rrule.until = rruleProp.until;
}
}

@ -37,7 +37,7 @@ interface RollbackToHereDialogPropsType {
function RollbackToHereDialog(props: RollbackToHereDialogPropsType) {
const [loading, setLoading] = React.useState(false);
const etesync = useCredentials();
const etesync = useCredentials()!;
const dispatch = useDispatch();
const userInfo = useSelector((state: StoreState) => state.cache.userInfo);

@ -111,8 +111,8 @@ class TaskEdit extends React.PureComponent<PropsType> {
}
const rrule = task.rrule;
if (rrule) {
this.state.rrule = rrule.toJSON();
if (rrule.until) {
this.state.rrule = rrule.toJSON() as any;
if (this.state.rrule && rrule.until) {
this.state.rrule.until = rrule.until;
}
}

@ -120,7 +120,7 @@ export default function TaskList(props: PropsType) {
const [toast, setToast] = React.useState<{ message: string, severity: ToastProps['severity'] }>({ message: '', severity: undefined });
const settings = useSelector((state: StoreState) => state.settings.taskSettings);
const { filterBy, sortBy } = settings;
const etesync = useCredentials();
const etesync = useCredentials()!;
const theme = useTheme();
const classes = useStyles();
const dispatch = useDispatch();

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save