Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielbull committed Jun 14, 2017
1 parent 18a73f0 commit 02cacb3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 22 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ yarn.lock
logs
*.log
npm-debug.log*
package-lock.json

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.3.1 (June 21th, 2017)

- Updated dependencies

## 0.3.0 (April 17th, 2017)

- Added prop-types dependency to avoid deprecation in React 16
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-desktop",
"author": "Gabriel Bull",
"version": "0.3.0",
"version": "0.3.1",
"description": "React UI Components for macOS Sierra and Windows 10",
"main": "./index.js",
"keywords": [
Expand Down Expand Up @@ -34,7 +34,7 @@
"build-publish": "npm run build && npm publish ./build"
},
"dependencies": {
"radium": "^0.18.2"
"radium": "^0.19.1"
},
"peerDependencies": {
"prop-types": "^15.0 || ^16.0",
Expand All @@ -43,27 +43,27 @@
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.2",
"babel-loader": "^6.4.1",
"babel-core": "^6.25.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"chai": "^3.5.0",
"chai": "^4.0.2",
"eslint": "^3.19.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-react": "^6.10.3",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-react": "^7.1.0",
"html-webpack-plugin": "^2.28.0",
"jsdom": "^9.12.0",
"mocha": "^3.2.0",
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-addons-test-utils": "^15.5.1",
"react-color": "^2.11.4",
"react-dom": "^15.5.4",
"jsdom": "^11.0.0",
"mocha": "^3.4.2",
"prop-types": "^15.5.10",
"react": "^15.6.0",
"react-addons-test-utils": "^15.6.0",
"react-color": "^2.12.1",
"react-dom": "^15.6.0",
"react-hot-loader": "^1.3.1",
"webpack": "^2.4.1",
"webpack-dev-server": "^2.4.2"
"webpack": "^2.6.1",
"webpack-dev-server": "^2.4.5"
}
}
4 changes: 2 additions & 2 deletions src/navPane/windows/pane/pane.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Pane extends Component {
}

renderItems() {
return Children.map(this.props.items, (item, index) =>
return Children.map(this.props.items, (item, index) => (
<Item
key={index}
isPaneExpanded={this.state.isPaneExpanded}
Expand All @@ -71,7 +71,7 @@ class Pane extends Component {
onSelect={item.props.onSelect}
selected={item.props.selected}
/>
);
));
}
}

Expand Down
7 changes: 4 additions & 3 deletions test/setup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { jsdom } from 'jsdom';
import { JSDOM } from 'jsdom';

global.document = jsdom('<!doctype html><html><body></body></html>');
global.window = document.defaultView;
const dom = new JSDOM('<!doctype html><html><body></body></html>');
global.window = dom.window;
global.document = dom.window.document;
global.navigator = {
...global.window.navigator,
userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.54 Safari/537.36'
Expand Down

0 comments on commit 02cacb3

Please sign in to comment.