Skip to content

Commit

Permalink
Upgrade fbjs, fbjs-scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
zpao committed Mar 4, 2016
1 parent b89e7d2 commit 0db41a4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"eslint": "1.10.3",
"eslint-plugin-react": "4.1.0",
"eslint-plugin-react-internal": "file:eslint-rules",
"fbjs": "^0.6.1",
"fbjs-scripts": "0.6.0-alpha.2",
"fbjs": "^0.8.0-alpha.2",
"fbjs-scripts": "^0.6.0-alpha.3",
"glob": "^6.0.1",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"envify": "^3.0.0",
"fbjs": "^0.6.1"
"fbjs": "^0.8.0-alpha.2"
},
"browserify": {
"transform": [
Expand Down
8 changes: 1 addition & 7 deletions src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,10 @@ describe('ReactDOMComponent', function() {
ReactDOM.render(<span style={style}></span>, div);
ReactDOM.render(<span style={style}></span>, div);

expect(console.error.argsForCall.length).toBe(2);
expect(console.error.argsForCall.length).toBe(1);
expect(console.error.argsForCall[0][0]).toEqual(
'Warning: `NaN` is an invalid value for the `fontSize` css style property',
);
expect(console.error.argsForCall[1][0]).toEqual(
'Warning: `span` was passed a style object that has previously been ' +
'mutated. Mutating `style` is deprecated. Consider cloning it ' +
'beforehand. Check the `render` using <span>. Previous style: ' +
'{fontSize: NaN}. Mutated style: {fontSize: NaN}.'
);
});

it('should update styles if initially null', function() {
Expand Down

0 comments on commit 0db41a4

Please sign in to comment.