Skip to content

Commit ed777fd

Browse files
committed
Upgrade React and related dependencies
https://github.com/botpress/botpress/issues/429
1 parent c33dcc7 commit ed777fd

File tree

4 files changed

+253
-98
lines changed

4 files changed

+253
-98
lines changed

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@
4848
"file-loader": "^1.1.6",
4949
"lodash": "^4.17.4",
5050
"node-sass": "^3.11.2",
51-
"react": "^15.3.2",
52-
"react-bootstrap": "^0.30.6",
53-
"react-dom": "^15.3.2",
54-
"react-markdown": "^2.4.2",
51+
"react-markdown": "^3.2.0",
5552
"sass-loader": "^6.0.6",
5653
"style-loader": "^0.19.1",
5754
"webpack": "^3.10.0",

src/views/index.jsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,15 +253,17 @@ export default class ApiModule extends React.Component {
253253
<Col md={8} mdOffset={2}>
254254
{this.renderMessageAlert()}
255255
<Panel className={style.panel} header="Settings">
256-
{this.renderSaveButton()}
257-
<div className={style.settings}>
258-
{this.renderAccessToken()}
259-
{this.renderLanguage()}
260-
{this.renderMode()}
261-
</div>
256+
<Panel.Body>
257+
{this.renderSaveButton()}
258+
<div className={style.settings}>
259+
{this.renderAccessToken()}
260+
{this.renderLanguage()}
261+
{this.renderMode()}
262+
</div>
263+
<Panel.Body>
262264
</Panel>
263265
<Panel header="Documentation">
264-
{this.renderExplication()}
266+
<Panel.Body>{this.renderExplication()}</Panel.Body>
265267
</Panel>
266268
</Col>
267269
</Row>

webpack.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ var webConfig = {
4545
libraryTarget: 'assign',
4646
library: ['botpress', pkg.name]
4747
},
48+
externals: {
49+
'react': 'React',
50+
'react-dom': 'ReactDOM',
51+
'react-bootstrap': 'ReactBootstrap',
52+
'prop-types': 'PropTypes'
53+
},
4854
resolve: {
4955
extensions: ['.js', '.jsx']
5056
},

0 commit comments

Comments
 (0)