Skip to content

Commit be92a64

Browse files
booleanhunterbooleanhunter
authored
Merge pull request booleanhunter#52 from oklas/update-deps
Update deps
2 parents 2647a52 + 366f28f commit be92a64

File tree

87 files changed

+7023
-239
lines changed

Some content is hidden

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

87 files changed

+7023
-239
lines changed

‎package.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,33 @@
1515
"main": "reactjsAdminlte.js",
1616
"dependencies": {
1717
"jquery": "^3.1.1",
18-
"react": "^15.6.1",
19-
"react-dom": "^15.6.1"
18+
"react": "^16.2.0",
19+
"react-dom": "^16.2.0"
2020
},
2121
"devDependencies": {
22-
"babel-core": "~6.5.1",
23-
"babel-loader": "~6.2.2",
24-
"babel-preset-es2015": "~6.5.0",
25-
"babel-preset-react": "~6.5.0",
22+
"babel-core": "~6.26.0",
23+
"babel-loader": "~7.1.3",
24+
"babel-preset-es2015": "~6.24.1",
25+
"babel-preset-react": "~6.24.1",
2626
"body-parser": "^1.14.0",
2727
"bower": "^1.7.7",
28-
"chai": "^3.5.0",
29-
"consolidate": "^0.13.1",
30-
"css-loader": "^0.23.1",
31-
"expect": "^1.20.2",
32-
"express": "^4.13.3",
28+
"consolidate": "^0.15.0",
29+
"create-react-class": "^15.6.3",
30+
"express": "^4.16.2",
3331
"handlebars": "^4.0.3",
3432
"jsx-loader": "^0.13.2",
35-
"mocha": "^3.1.2",
3633
"raphael": "^2.1.4",
37-
"webpack": "^1.14.0",
38-
"webpack-raphael": "^2.1.4",
39-
"react-hot-loader": "^1.3.1",
40-
"style-loader": "^0.13.0",
4134
"velocity-animate": "^1.4.0",
42-
"webpack-dev-server": "~1.14.1"
35+
"webpack": "^4.0.1",
36+
"webpack-raphael": "^2.1.4",
37+
"chai": "^4.1.2",
38+
"css-loader": "^0.28.10",
39+
"expect": "^1.20.2",
40+
"mocha": "^5.0.1",
41+
"react-hot-loader": "^4.0.0",
42+
"style-loader": "^0.20.2",
43+
"webpack-cli": "^2.0.10",
44+
"webpack-dev-server": "~3.1.0"
4345
},
4446
"scripts": {
4547
"dev": "node server.js",

‎reactjsAdminlte.js

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎reactjsAdminlte.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/chat-box/chat-box.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
define(
22
[
33
'react',
4+
'create-react-class',
45
'react-dom',
56
'../../services/common-functions'
67
],
7-
function (React, ReactDOM, commonFunctions) {
8-
var ChatBox = React.createClass({
8+
function (React, createReactClass, ReactDOM, commonFunctions) {
9+
var ChatBox = createReactClass({
910
getDefaultProps: function() {
1011
return {
1112
headerTheme: 'box-primary',

‎src/components/chat-box/contacts.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
define(
22
[
3-
'react'
3+
'react',
4+
'create-react-class',
45
],
5-
function (React) {
6-
var Contacts = React.createClass({
6+
function (React, createReactClass) {
7+
var Contacts = createReactClass({
78
render: function() {
89

910
var contacts = this.props.contacts.map(function(contactDetails, iterator){

‎src/components/chat-box/conversations.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
define(
22
[
3-
'react'
3+
'react',
4+
'create-react-class',
45
],
5-
function (React) {
6-
var Conversations = React.createClass({
6+
function (React, createReactClass) {
7+
var Conversations = createReactClass({
78
render: function() {
89

910
var conversations = this.props.conversations.map(function(messageDetails, iterator){

‎src/components/controls-menu.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
define(
22
[
33
'react',
4+
'create-react-class',
45
'jquery',
56
],
6-
function(React,$){
7-
var ControlsMenu = React.createClass({
7+
function (React, createReactClass, $){
8+
var ControlsMenu = createReactClass({
89
componentDidMount:function(){
910

1011
},

‎src/components/custom-box/box-tool.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
define(
22
[
33
'react',
4+
'create-react-class',
45
'react-dom',
56
'./box-functions'
67
],
7-
function (React, ReactDOM, boxFunctions) {
8-
var BoxTool = React.createClass({
8+
function (React, createReactClass, ReactDOM, boxFunctions) {
9+
var BoxTool = createReactClass({
910
toggleCollapse: function(event){
1011
var box = boxFunctions.findClosestElement(event.currentTarget, this.props.containerClass),
1112
boxBody = box.children[1],

‎src/components/custom-box/box.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
define(
22
[
33
'react',
4+
'create-react-class',
45
'react-dom',
56
],
6-
function (React, ReactDOM) {
7-
var Box = React.createClass({
7+
function (React, createReactClass, ReactDOM) {
8+
var Box = createReactClass({
89
getDefaultProps: function() {
910
return {
1011
collapsed: false,

‎src/components/header-bar/header-bar.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
define(
22
[
33
'react',
4+
'create-react-class',
45
'jquery',
56
'./header-messages/header-messages',
67
'./header-notifications/header-notifications',
78
'./header-tasks/header-tasks'
89
],
9-
function (React, $, HeaderMessages, HeaderNotifications, HeaderTasks) {
10-
var HeaderBar = React.createClass({
10+
function (React, createReactClass, $, HeaderMessages, HeaderNotifications, HeaderTasks) {
11+
var HeaderBar = createReactClass({
1112
pushMenu: function () {
1213
var body = document.body;
1314
if(body.clientWidth > 768){

0 commit comments

Comments
 (0)