merge master

addons/storyshots/src/index.js

@@ -30,7 +30,8 @@ const pkg = readPkgUp.sync().pkg;
 
 const hasDependency = name =>
   (pkg.devDependencies && pkg.devDependencies[name]) ||
-  (pkg.dependencies && pkg.dependencies[name]);
+  (pkg.dependencies && pkg.dependencies[name]) ||
+  fs.existsSync(path.join('node_modules', name, 'package.json'));
 
 export default function testStorySnapshots(options = {}) {
   addons.setChannel(createChannel());

app/react-native/src/bin/storybook-start.js

@@ -16,6 +16,7 @@ program
   .option('--skip-packager', 'run only storybook server')
   .option('-i, --manual-id', 'allow multiple users to work with same storybook')
   .option('--smoke-test', 'Exit after successful start')
+  .option('--packager-port <packagerPort>', 'Custom packager port')
   .parse(process.argv);
 
 const projectDir = path.resolve();
@@ -69,6 +70,7 @@ if (!program.skipPackager) {
       `--projectRoots ${projectRoots.join(',')}`,
       `--root ${projectDir}`,
       program.resetCache && '--reset-cache',
+      program.packagerPort && `--port=${program.packagerPort}`,
     ]
       .filter(x => x)
       .join(' '),

docs/pages/addons/addon-gallery/index.md

@@ -39,6 +39,10 @@ The Storybook webapp UI can be customised with this addon. It can be used to cha
 
 Storyshots is a way to automatically jest-snapshot all your stories. [More info here](/testing/structural-testing/).
 
+### [Console](https://github.com/storybooks/storybook-addon-console)
+
+Redirects console output (logs, errors, warnings) into Action Logger Panel. `withConsole` decorator notifies from what stories logs are coming.
+
 ## Community Addons
 
 You need to install these addons directly from NPM in order to use them.