Skip to content

Commit f70a14d

Browse files
sexta13bbmoz
authored andcommitted
Fix loadable components (#211)
* Fix minio dependency * Fix loadable components change the react-loadable by one compatible with webpack 4.0
1 parent 6111f95 commit f70a14d

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

.babelrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
],
77
"plugins": [
88
"transform-runtime",
9-
"syntax-dynamic-import"
9+
"syntax-dynamic-import",
10+
"dynamic-import-node",
11+
"transform-class-properties"
1012
]
1113
}

client/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
22
import { connect } from 'react-redux'
33
import { Route, Switch } from 'react-router-dom'
44
import PropTypes from 'prop-types'
5-
import Loadable from 'react-loadable'
5+
import Loadable from '@7rulnik/react-loadable'
66
import Loading from './components/Loading/Loading'
77
import AuthActionCreator from './actions/auth'
88
import ForgotPasswordForm from './components/ForgotPasswordForm/ForgotPasswordForm'

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"clear-ports": "./.setup/client/clear-ports.sh"
3030
},
3131
"dependencies": {
32+
"@7rulnik/react-loadable": "^5.3.4",
3233
"@sendgrid/mail": "^6.1.4",
3334
"babel-core": "^6.26.0",
3435
"babel-eslint": "^8.2.1",
@@ -63,7 +64,6 @@
6364
"react-css-modules": "^4.7.1",
6465
"react-dom": "^16.0.0",
6566
"react-dropzone": "^4.2.5",
66-
"react-loadable": "^5.3.1",
6767
"react-redux": "^5.0.6",
6868
"react-router-dom": "^4.2.2",
6969
"react-router-redux": "^5.0.0-alpha.6",
@@ -83,6 +83,9 @@
8383
},
8484
"devDependencies": {
8585
"ava": "^0.25.0",
86+
"babel-plugin-dynamic-import-node": "^1.2.0",
87+
"babel-plugin-module-resolver": "^3.1.1",
88+
"babel-plugin-transform-class-properties": "^6.24.1",
8689
"browser-sync": "^2.23.3",
8790
"chromedriver": "^2.34.1",
8891
"cucumber": "^4.0.0",
@@ -94,7 +97,7 @@
9497
"eslint-plugin-promise": "^3.7.0",
9598
"eslint-plugin-react": "^7.7.0",
9699
"eslint-plugin-standard": "^3.0.1",
97-
"ignore-styles": "^5.0.1",
100+
"ignore-styles": "^5.0.1",
98101
"mongodb-memory-server": "^1.6.3",
99102
"nightwatch": "^1.0.1",
100103
"nightwatch-cucumber": "^9.0.0",
@@ -115,4 +118,4 @@
115118
],
116119
"babel": "inherit"
117120
}
118-
}
121+
}

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
# yarn lockfile v1
33

44

5+
"@7rulnik/react-loadable@^5.3.4":
6+
version "5.3.4"
7+
resolved "https://registry.yarnpkg.com/@7rulnik/react-loadable/-/react-loadable-5.3.4.tgz#a93c1830276bf2fec808d14c3e72faeafe5aa0c4"
8+
dependencies:
9+
prop-types "^15.5.0"
10+
511
"@ava/babel-plugin-throws-helper@^2.0.0":
612
version "2.0.0"
713
resolved "https://registry.yarnpkg.com/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz#2fc1fe3c211a71071a4eca7b8f7af5842cd1ae7c"
@@ -8456,12 +8462,6 @@ react-jss@^8.1.0:
84568462
prop-types "^15.6.0"
84578463
theming "^1.3.0"
84588464

8459-
react-loadable@^5.3.1:
8460-
version "5.3.1"
8461-
resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.3.1.tgz#9699e9a08fed49bacd69caaa282034b62a76bcdd"
8462-
dependencies:
8463-
prop-types "^15.5.0"
8464-
84658465
react-popper@^0.7.4:
84668466
version "0.7.5"
84678467
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.7.5.tgz#71c25946f291db381231281f6b95729e8b801596"

0 commit comments

Comments
 (0)