Skip to content

Commit 7aa8a4a

Browse files
authored
Merge pull request #3 from creativetimofficial/dev-main
Feature: update dependencies
2 parents 3fcde8f + 6bd204e commit 7aa8a4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+214
-233
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.next

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
## [1.1.0] 2021-02-01
2+
### Bug fixing
3+
- https://github.com/creativetimofficial/ct-nextjs-material-dashboard-pro/issues/2
4+
### Major style changes
5+
### Deleted components
6+
### Added components
7+
### Deleted dependencies
8+
- @types/googlemaps
9+
- @types/markerclustererplus
10+
- react-google-maps (we'll use simple Google Maps API with Vanilla JS instead)
11+
- webpack (`next` will install the appropriate one)
12+
### Added dependencies
13+
### Updated dependencies
14+
```
15+
@material-ui/core 4.11.0 → 4.11.3
16+
@material-ui/icons 4.9.1 → 4.11.2
17+
next 9.5.2 → 10.0.5
18+
next-compose-plugins 2.2.0 → 2.2.1
19+
next-images 1.3.1 → 1.7.0
20+
react 16.13.1 → 17.0.1
21+
react-dom 16.13.1 → 17.0.1
22+
typescript 3.9.7 → 4.1.3
23+
```
24+
### Warning
25+
### Warning
26+
**At the moment, the `pages/_app.js` and `pages/_document.js` could not be converted to functional components - for HOOK support, since they still need some of the class comments life-cycle methods. Please check this here: https://nextjs.org/docs/advanced-features/custom-document.**
27+
**The TypeScript dependencies are installed only to stop console warnings on install. They are not actually used in our product. So the product is not based on TypeScript!**
28+
_The following warnings will appear when running the installation command, but they do not affect the UI or the functionality of the product (they will be solved in our next update):_
29+
```
30+
npm WARN react-chartist@0.14.3 requires a peer of react@^0.14.9 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
31+
npm WARN react-swipeable-views@0.13.9 requires a peer of react@^15.3.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
32+
npm WARN react-event-listener@0.6.6 requires a peer of react@^16.3.0 but none is installed. You must install peer dependencies yourself.
33+
```
34+
_If they will persist in our 2.*.* version, we will drop their usages and replace them with other plugins._
35+
_In development mode, some of the above plugins will throw a warning because they still use React v16 syntax. If the error will persist in our 2.*.* version, we will drop their usage and replace them with other plugins._
36+
137
## [1.0.0] 2020-08-19
238
### Original Release
339
- Started project with NextJS

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020 Creative Tim
3+
Copyright (c) 2021 Creative Tim
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/nextjs-material-dashboard.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/nextjs-material-dashboard.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
5+
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/nextjs-material-dashboard.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/nextjs-material-dashboard.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
66

77
![Product Image](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/nextjs-material-dashboard/opt_md_nextjs_thumbnail.jpg)
88

@@ -301,7 +301,7 @@ If you have questions or need help integrating the product please [contact us](h
301301

302302
## Licensing
303303

304-
- Copyright 2020 Creative Tim (https://www.creative-tim.com)
304+
- Copyright 2021 Creative Tim (https://www.creative-tim.com)
305305
- Licensed under MIT (https://github.com/creativetimofficial/nextjs-material-dashboard/blob/master/LICENSE.md)
306306

307307
## Useful Links

assets/css/nextjs-material-dashboard.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* * NextJS Material Dashboard v1.0.0 based on Material Dashboard React v1.9.0
4+
* * NextJS Material Dashboard v1.1.0 based on Material Dashboard React v1.9.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/nextjs-material-dashboard
8-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/nextjs-material-dashboard/blob/master/LICENSE.md)
1010
1111
=========================================================

assets/jss/nextjs-material-dashboard.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* * NextJS Material Dashboard v1.0.0 based on Material Dashboard React v1.9.0
4+
* * NextJS Material Dashboard v1.1.0 based on Material Dashboard React v1.9.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/nextjs-material-dashboard
8-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/nextjs-material-dashboard/blob/master/LICENSE.md)
1010
1111
=========================================================

components/Card/Card.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { makeStyles } from "@material-ui/core/styles";
1010
// core components
1111
import styles from "assets/jss/nextjs-material-dashboard/components/cardStyle.js";
1212

13-
const useStyles = makeStyles(styles);
14-
1513
export default function Card(props) {
14+
const useStyles = makeStyles(styles);
1615
const classes = useStyles();
1716
const { className, children, plain, profile, chart, ...rest } = props;
1817
const cardClasses = classNames({

components/Card/CardAvatar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { makeStyles } from "@material-ui/core/styles";
1010

1111
import styles from "assets/jss/nextjs-material-dashboard/components/cardAvatarStyle.js";
1212

13-
const useStyles = makeStyles(styles);
14-
1513
export default function CardAvatar(props) {
14+
const useStyles = makeStyles(styles);
1615
const classes = useStyles();
1716
const { children, className, plain, profile, ...rest } = props;
1817
const cardAvatarClasses = classNames({

components/Card/CardBody.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { makeStyles } from "@material-ui/core/styles";
1010
// core components
1111
import styles from "assets/jss/nextjs-material-dashboard/components/cardBodyStyle.js";
1212

13-
const useStyles = makeStyles(styles);
14-
1513
export default function CardBody(props) {
14+
const useStyles = makeStyles(styles);
1615
const classes = useStyles();
1716
const { className, children, plain, profile, ...rest } = props;
1817
const cardBodyClasses = classNames({

components/Card/CardFooter.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { makeStyles } from "@material-ui/core/styles";
1010
// core components
1111
import styles from "assets/jss/nextjs-material-dashboard/components/cardFooterStyle.js";
1212

13-
const useStyles = makeStyles(styles);
14-
1513
export default function CardFooter(props) {
14+
const useStyles = makeStyles(styles);
1615
const classes = useStyles();
1716
const { className, children, plain, profile, stats, chart, ...rest } = props;
1817
const cardFooterClasses = classNames({

0 commit comments

Comments
 (0)