Merge pull request #105 from sitegeist/task/yarnUpgrade

TASK: Update yarn dependencies

Author: grebaldi

.nvmrc

@@ -1 +1 @@
-v6.3
+v6.9

Resources/Private/JavaScript/bootstrap/createStore.js

@@ -42,8 +42,8 @@ export default env => {
     //
     // Dev tools extension
     //
-    if (process.env.NODE_ENV !== 'production' && window.devToolsExtension) {
-        storeEnhancers.push(window.devToolsExtension());
+    if (process.env.NODE_ENV !== 'production' && window.__REDUX_DEVTOOLS_EXTENSION__) {
+        storeEnhancers.push(window.__REDUX_DEVTOOLS_EXTENSION__());
     }
 
     //

Resources/Private/JavaScript/containers/styleguide/header/toolbox/breakpoint-selector/breakpoint-list/breakpoint/index.js

@@ -10,8 +10,8 @@ import style from './style.css';
 export default class Breakpoint extends PureComponent {
     static propTypes = {
         label: PropTypes.string.isRequired,
-        dimensions: PropTypes.string.isRequired,
-        handleClick: PropTypes.func.isRequired
+        handleClick: PropTypes.func.isRequired,
+        dimensions: PropTypes.string
     };
 
     render() {
@@ -22,9 +22,11 @@ export default class Breakpoint extends PureComponent {
                 <div className={style.title}>
                     {label}
                 </div>
-                <div className={style.dimensions}>
-                    {dimensions}
-                </div>
+                {dimensions ? (
+                    <div className={style.dimensions}>
+                        {dimensions}
+                    </div>
+                ) : null}
             </button>
         );
     }

Resources/Private/JavaScript/containers/styleguide/qrcode/index.js

@@ -74,7 +74,7 @@ export default class QrCode extends PureComponent {
         });
 
         return (
-	<Dialog isOpen title="QR Code" onRequestClose={this.handleClose}>
+	<Dialog isOpen title="QR Code" onRequestClose={this.handleClose} actions={[]}>
 		<div className={style.form}>
 			{this.state.qrcode && <img className={style.qrcode} src={this.state.qrcode} alt={this.props.url}/>}
 			<div className={style.url}>

Resources/Public/JavaScript/App.js

@@ -37,7 +37,7 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
-    "css-loader": "^0.28.3",
+    "css-loader": "^2.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-jsx-a11y": "^5.0.3",
@@ -50,7 +50,7 @@
     "postcss-loader": "^2.0.5",
     "postcss-nested": "^2.0.2",
     "style-loader": "^0.18.1",
-    "url-loader": "^0.5.8",
+    "url-loader": "^1.1.2",
     "webpack": "^2.6.1"
   },
   "dependencies": {

Resources/Public/JavaScript/App.js.map

@@ -47,7 +47,8 @@ module.exports = {
                             options: {
                                 modules: true,
                                 importLoaders: 1,
-                                localIdentName: '[name]__[local]___[hash:base64:5]'
+                                localIdentName: '[name]__[local]___[hash:base64:5]',
+                                context: __dirname
                             }
                         },
                         {loader: 'postcss-loader'}