Merge branch 'release/3.3' into channel-onPeer

addons/info/package.json

@@ -23,6 +23,9 @@
     "react-addons-create-fragment": "^15.5.3",
     "util-deprecate": "^1.0.2"
   },
+  "devDependencies": {
+    "react-test-renderer": "^16.1.0"
+  },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"

docs/package.json

@@ -31,11 +31,11 @@
     "babel-preset-stage-0": "^6.24.1",
     "bootstrap": "^3.3.7",
     "gatsby": "^1.9.112",
-    "gatsby-link": "^1.6.27",
-    "gatsby-plugin-sharp": "^1.6.20",
+    "gatsby-link": "^1.6.28",
+    "gatsby-plugin-sharp": "^1.6.21",
     "gatsby-remark-autolink-headers": "^1.4.8",
     "gatsby-remark-copy-linked-files": "^1.5.21",
-    "gatsby-remark-images": "^1.5.31",
+    "gatsby-remark-images": "^1.5.32",
     "gatsby-remark-smartypants": "^1.4.8",
     "gatsby-source-filesystem": "^1.5.8",
     "gatsby-transformer-remark": "^1.7.21",

docs/yarn.lock

@@ -4173,9 +4173,9 @@ gatsby-cli@^1.1.20:
     yargs "^8.0.2"
     yurnalist "^0.2.1"
 
-gatsby-link@^1.6.27:
-  version "1.6.27"
-  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-1.6.27.tgz#6111fbe7a32badd92eee95185c21d5a434109a3d"
+gatsby-link@^1.6.28:
+  version "1.6.28"
+  resolved "https://registry.yarnpkg.com/gatsby-link/-/gatsby-link-1.6.28.tgz#12b799aa12663ae22f626195ab258e0ee5dddc9c"
   dependencies:
     babel-runtime "^6.26.0"
     prop-types "^15.5.8"
@@ -4188,9 +4188,9 @@ gatsby-module-loader@^1.0.8:
     babel-runtime "^6.26.0"
     loader-utils "^0.2.16"
 
-gatsby-plugin-sharp@^1.6.20:
-  version "1.6.20"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.20.tgz#5bd14a0b840485ccf71964c83832cf749827bd67"
+gatsby-plugin-sharp@^1.6.21:
+  version "1.6.21"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.21.tgz#990e856153b65be28316c23ab29b4e78dd5634de"
   dependencies:
     async "^2.1.2"
     babel-runtime "^6.26.0"
@@ -4235,13 +4235,13 @@ gatsby-remark-copy-linked-files@^1.5.21:
     path-is-inside "^1.0.2"
     unist-util-visit "^1.1.1"
 
-gatsby-remark-images@^1.5.31:
-  version "1.5.31"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.31.tgz#96839f7163973916991ac43708198c787f6b680b"
+gatsby-remark-images@^1.5.32:
+  version "1.5.32"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.32.tgz#1e6bbc5991343f082f224869ffb14abb4a02c6ba"
   dependencies:
     babel-runtime "^6.26.0"
     cheerio "^1.0.0-rc.2"
-    gatsby-plugin-sharp "^1.6.20"
+    gatsby-plugin-sharp "^1.6.21"
     is-relative-url "^2.0.0"
     lodash "^4.17.4"
     slash "^1.0.0"

lib/cli/test/snapshots/meteor/package.json

@@ -10,8 +10,8 @@
   "dependencies": {
     "babel-runtime": "^6.20.0",
     "meteor-node-stubs": "~0.2.4",
-    "react": "^16.1.0",
-    "react-dom": "^16.1.0"
+    "react": "^16.1.1",
+    "react-dom": "^16.1.1"
   },
   "devDependencies": {
     "babel-preset-env": "^1.6.1",

lib/ui/package.json

@@ -34,7 +34,7 @@
     "react-inspector": "^2.2.1",
     "@storybook/react-komposer": "^2.0.0",
     "react-modal": "^3.1.2",
-    "react-split-pane": "^0.1.68",
+    "react-split-pane": "^0.1.71",
     "react-treebeard": "^2.0.3",
     "redux": "^3.7.2"
   },

lib/ui/src/libs/key_events.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-fallthrough */
 import keycode from 'keycode';
 
 export const features = {
@@ -40,9 +41,13 @@ export default function handle(e) {
     case keycode('F'):
       e.preventDefault();
       return features.FULLSCREEN;
+    case keycode('C'):
+    // backward-compatibility
     case keycode('D'):
       e.preventDefault();
       return features.ADDON_PANEL;
+    case keycode('X'):
+    // backward-compatibility
     case keycode('L'):
       e.preventDefault();
       return features.STORIES_PANEL;
@@ -52,9 +57,13 @@ export default function handle(e) {
     case keycode('left'):
       e.preventDefault();
       return features.PREV_STORY;
+    case keycode('O'):
+    // backward-compatibility
     case keycode('P'):
       e.preventDefault();
       return features.SHOW_SEARCH;
+    case keycode('G'):
+    // backward-compatibility
     case keycode('J'):
       e.preventDefault();
       return features.ADDON_PANEL_IN_RIGHT;

lib/ui/src/modules/ui/components/shortcuts_help.js

@@ -39,22 +39,22 @@ export function getShortcuts(platform) {
   // if it is mac platform
   if (platform && platform.indexOf('mac') !== -1) {
     return [
-      { name: 'Show Search Box', keys: ['⌘ ⇧ P', '⌃ ⇧ P'] },
-      { name: 'Toggle Addon panel position', keys: ['⌘ ⇧ J', '⌃ ⇧ J'] },
+      { name: 'Show Search Box', keys: ['⌘ ⇧ O', '⌃ ⇧ O'] },
+      { name: 'Toggle Addon panel position', keys: ['⌘ ⇧ G', '⌃ ⇧ G'] },
       { name: 'Toggle Fullscreen Mode', keys: ['⌘ ⇧ F', '⌃ ⇧ F'] },
-      { name: 'Toggle Stories Panel', keys: ['⌘ ⇧ L', '⌃ ⇧ L'] },
-      { name: 'Toggle Addon panel', keys: ['⌘ ⇧ D', '⌃ ⇧ D'] },
+      { name: 'Toggle Stories Panel', keys: ['⌘ ⇧ X', '⌃ ⇧ X'] },
+      { name: 'Toggle Addon panel', keys: ['⌘ ⇧ C', '⌃ ⇧ C'] },
       { name: 'Next Story', keys: ['⌘ ⇧ →', '⌃ ⇧ →'] },
       { name: 'Previous Story', keys: ['⌘ ⇧ ←', '⌃ ⇧ ←'] },
     ];
   }
 
   return [
-    { name: 'Show Search Box', keys: ['Ctrl + Shift + P'] },
-    { name: 'Toggle Addon panel position', keys: ['Ctrl + Shift + J'] },
+    { name: 'Show Search Box', keys: ['Ctrl + Shift + O'] },
+    { name: 'Toggle Addon panel position', keys: ['Ctrl + Shift + G'] },
     { name: 'Toggle Fullscreen Mode', keys: ['Ctrl + Shift + F'] },
-    { name: 'Toggle Stories Panel', keys: ['Ctrl + Shift + L'] },
-    { name: 'Toggle Addon panel', keys: ['Ctrl + Shift + D'] },
+    { name: 'Toggle Stories Panel', keys: ['Ctrl + Shift + X'] },
+    { name: 'Toggle Addon panel', keys: ['Ctrl + Shift + C'] },
     { name: 'Next Story', keys: ['Ctrl + Shift + →'] },
     { name: 'Previous Story', keys: ['Ctrl + Shift + ←'] },
   ];

package.json

@@ -55,8 +55,8 @@
     "commander": "^2.11.0",
     "cross-env": "^5.1.1",
     "danger": "^2.0.1",
-    "enzyme": "^3.1.1",
-    "enzyme-adapter-react-16": "^1.0.4",
+    "enzyme": "^3.2.0",
+    "enzyme-adapter-react-16": "^1.1.0",
     "eslint": "^4.11.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-prettier": "^2.7.0",

scripts/repo-dirty-check.js

@@ -4,7 +4,7 @@ const shell = require('shelljs');
 // exit with code 1 if there are some changed files
 if (shell.exec('git status --porcelain').stdout.trim() !== '') {
   console.error(
-    'Git repo is dirty, please consider updating lockfiles by running `yarn bootstrap --core --docs`'
+    'Git repo is dirty, please consider updating lockfiles by running `yarn bootstrap --reset --core --docs`'
   );
   process.exit(1);
 }

yarn.lock

@@ -259,14 +259,14 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^6.0.46", "@types/node@~6.0.60":
-  version "6.0.92"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.92.tgz#e7f721ae282772e12ba2579968c00d9cce422c5d"
-
-"@types/node@^8.0.0":
+"@types/node@*", "@types/node@^8.0.0":
   version "8.0.52"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.52.tgz#8e7f47747868e7687f2cd4922966e2d6af78d22d"
 
+"@types/node@^6.0.46", "@types/node@~6.0.60":
+  version "6.0.92"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.92.tgz#e7f721ae282772e12ba2579968c00d9cce422c5d"
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -3794,7 +3794,7 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
 
@@ -4299,7 +4299,7 @@ envinfo@^3.0.0:
     os-name "^2.0.1"
     which "^1.2.14"
 
-enzyme-adapter-react-16@^1.0.4:
+enzyme-adapter-react-16@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.0.tgz#86c5db7c10f0be6ec25d54ca41b59f2abb397cf4"
   dependencies:
@@ -4330,7 +4330,7 @@ enzyme-to-json@^3.0.0:
   dependencies:
     lodash "^4.17.4"
 
-enzyme@^3.0.0, enzyme@^3.1.1:
+enzyme@^3.0.0, enzyme@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.2.0.tgz#998bdcda0fc71b8764a0017f7cc692c943f54a7a"
   dependencies:
@@ -6430,7 +6430,7 @@ import-local@^0.1.1:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
@@ -8130,10 +8130,6 @@ lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-
 lodash._baseisequal@^3.0.0:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1"
@@ -8157,14 +8153,10 @@ lodash._basevalues@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
 
-lodash._bindcallback@*, lodash._bindcallback@^3.0.0:
+lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
 
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
@@ -8173,17 +8165,11 @@ lodash._createassigner@^3.0.0:
     lodash._isiterateecall "^3.0.0"
     lodash.restparam "^3.0.0"
 
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
+lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
@@ -8333,7 +8319,7 @@ lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
 
-lodash.restparam@*, lodash.restparam@^3.0.0:
+lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
@@ -10953,7 +10939,7 @@ react-scripts@1.0.17:
   optionalDependencies:
     fsevents "1.1.2"
 
-react-split-pane@^0.1.68:
+react-split-pane@^0.1.71:
   version "0.1.71"
   resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.71.tgz#19b1b30638655e655f9f5fe57b1ae7cc6c151829"
   dependencies:
@@ -11167,7 +11153,7 @@ readable-stream@~1.1.10, readable-stream@~1.1.8, readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   dependencies:
@@ -13731,7 +13717,7 @@ v8flags@^3.0.0:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-validate-npm-package-license@*, validate-npm-package-license@^3.0.1:
+validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies:
@@ -13825,7 +13811,7 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
-"vm2@github:patriksimek/vm2#custom_files":
+vm2@patriksimek/vm2#custom_files:
   version "3.5.0"
   resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57"