Browse Source

upgrade deps

Daniel Zlotin 7 years ago
parent
commit
04eefcf7f5

+ 0
- 2
.travis.yml View File

4
 
4
 
5
 env:
5
 env:
6
   global:
6
   global:
7
-    - YARN_CACHE=$HOME/.yarn-cache
8
     - CODE_SIGNING_REQUIRED=NO
7
     - CODE_SIGNING_REQUIRED=NO
9
     - RCT_NO_LAUNCH_PACKAGER=true
8
     - RCT_NO_LAUNCH_PACKAGER=true
10
 
9
 
18
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
17
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
19
 cache:
18
 cache:
20
   directories:
19
   directories:
21
-    - $YARN_CACHE
22
     - $HOME/.m2
20
     - $HOME/.m2
23
     - $HOME/.gradle/caches/
21
     - $HOME/.gradle/caches/
24
     - $HOME/.gradle/wrapper/
22
     - $HOME/.gradle/wrapper/

+ 1
- 1
integration/remx/component.js View File

2
 const { Component } = require('react');
2
 const { Component } = require('react');
3
 
3
 
4
 const { Text } = require('react-native');
4
 const { Text } = require('react-native');
5
-const { connect } = require('remx/react-native');
5
+const { connect } = require('remx');
6
 const store = require('./store');
6
 const store = require('./store');
7
 
7
 
8
 class MyContainer extends Component {
8
 class MyContainer extends Component {

+ 1
- 1
integration/remx/remx.test.js View File

31
     expect(renderCountIncrement).toHaveBeenCalledTimes(2);
31
     expect(renderCountIncrement).toHaveBeenCalledTimes(2);
32
   });
32
   });
33
 
33
 
34
-  it('rerenders as a result of an underlying state change with a new key using merge', () => {
34
+  it('rerenders as a result of an underlying state change with a new key', () => {
35
     const renderCountIncrement = jest.fn();
35
     const renderCountIncrement = jest.fn();
36
     const tree = renderer.create(<MyConnectedContainer printAge={true} renderCountIncrement={renderCountIncrement} />);
36
     const tree = renderer.create(<MyConnectedContainer printAge={true} renderCountIncrement={renderCountIncrement} />);
37
 
37
 

+ 1
- 1
integration/remx/store.js View File

13
   },
13
   },
14
 
14
 
15
   setAge(age) {
15
   setAge(age) {
16
-    state.merge({ person: { age } });
16
+    state.person.age = age;
17
   }
17
   }
18
 });
18
 });
19
 
19
 

+ 1
- 1
scripts/env/installNode.sh View File

2
 
2
 
3
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
3
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
4
 export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
4
 export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
5
-nvm install 8.2.1
5
+nvm install stable