Skip to content

Commit df5e1a4

Browse files
committed
Make React as a dependency
1 parent a35e55a commit df5e1a4

File tree

11 files changed

+25
-40
lines changed

11 files changed

+25
-40
lines changed

build/webpack.config.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,17 @@ export default {
5151
],
5252
},
5353

54-
externals : {
55-
react: 'react',
56-
reactDom: 'react-dom'
57-
},
54+
/*externals: {
55+
'react': 'react',
56+
'react-dom': 'react-dom',
57+
},*/
5858

5959
resolve: {
6060
extensions: ['.webpack.js', '.web.js', '.js', '.jsx', '.json'],
61+
alias: {
62+
'react': resolvePath(__dirname, '../node_modules/react'),
63+
'react-dom': resolvePath(__dirname, '../node_modules/react-dom')
64+
}
6165
},
6266

6367
cache: DEBUG,

configurations/default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.2",
2+
"version": "1.0.3",
33
"labels": {
44
"openAll": "Open all",
55
"parameters": "Parameters...",

configurations/en-US.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.2",
2+
"version": "1.0.3",
33
"labels": {
44
"openAll": "Open all",
55
"parameters": "Parameters...",

configurations/es-ES.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.2",
2+
"version": "1.0.3",
33
"labels": {
44
"openAll": "Open all",
55
"parameters": "Parameters...",

configurations/fr-FR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.2",
2+
"version": "1.0.3",
33
"labels": {
44
"openAll": "Tout ouvrir",
55
"parameters": "Parametres...",

dist/main.js

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

dist/main.js.LICENSE.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,12 @@ PERFORMANCE OF THIS SOFTWARE.
6262
* This source code is licensed under the MIT license found in the
6363
* LICENSE file in the root directory of this source tree.
6464
*/
65+
66+
/** @license React v17.0.2
67+
* react.production.min.js
68+
*
69+
* Copyright (c) Facebook, Inc. and its affiliates.
70+
*
71+
* This source code is licensed under the MIT license found in the
72+
* LICENSE file in the root directory of this source tree.
73+
*/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hyper-manager",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "Hyper.js Manager",
55
"main": "./index.js",
66
"scripts": {

src/components/GroupDialog.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class GroupDialog extends Component {
2828
}
2929

3030
static getDerivedStateFromProps(props, state) {
31-
console.log("GroupDialog:getDerivedStateFromProps")
3231
return {
3332
mode: props.mode,
3433
group: props.group,
@@ -37,12 +36,7 @@ class GroupDialog extends Component {
3736
}
3837

3938
shouldComponentUpdate(nextProps, nextState) {
40-
/*console.log('GroupDialog:shouldComponentUpdate:nextProps', nextProps)
41-
console.log('GroupDialog:shouldComponentUpdate:nextState', nextState)
42-
if (!_.isEqual(this.state.group, nextProps.group)) {
43-
return true
44-
}*/
45-
return true//this.state.open != nextProps.open
39+
return true
4640
}
4741

4842
close() {

src/components/ParameterDialog.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,16 @@ class ParameterDialog extends Component {
4646
}
4747

4848
static getDerivedStateFromProps(props, state) {
49-
console.log("ParameterDialog:getDerivedStateFromProps")
5049
return {
5150
open: props.open,
5251
options: props.options
5352
}
5453
}
5554

5655
shouldComponentUpdate(nextProps, nextState) {
57-
/*console.log('ParameterDialog:shouldComponentUpdate:nextProps', nextProps)
58-
console.log('ParameterDialog:shouldComponentUpdate:nextState', nextState)
59-
if (!_.isEqual(nextProps.options, this.state.options)) {
60-
return true
61-
}
62-
return this.state.open != nextProps.open
63-
*/
6456
return true
6557
}
6658

67-
/*getDerivedStateFromProps(props, state) {
68-
console.log('getDerivedStateFromProps')
69-
this.setState({
70-
open: props.open
71-
})
72-
}*/
73-
7459
close() {
7560
this.props.onCancel()
7661
}

0 commit comments

Comments
 (0)