Merge branch 'master' into improve/decorator-for-vue

storybookjs · Aug 18, 2017 · f1bf341 · f1bf341
2 parents c8b2e6f + f6ac4a8
commit f1bf341
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -13,9 +13,13 @@ module.exports = Promise.all([
 
  const packageJson = helpers.getPackageJson();
 
+
+ packageJson.devDependencies = packageJson.devDependencies || {};
+
  packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
+
  packageJson.scripts.storybook = 'start-storybook -p 9009';
  packageJson.scripts['build-storybook'] = 'build-storybook';
 

diff --git a/lib/cli/lib/detect.js b/lib/cli/lib/detect.js
@@ -44,7 +44,10 @@ module.exports = function detect(options) {
  return types.VUE;
  }
 
- if (packageJson.devDependencies && packageJson.devDependencies['react-scripts']) {
+ if (
+ (packageJson.dependencies && packageJson.dependencies['react-scripts']) ||
+ (packageJson.devDependencies && packageJson.devDependencies['react-scripts'])
+ ) {
  return types.REACT_SCRIPTS;
  }
 
@@ -56,7 +59,10 @@ module.exports = function detect(options) {
  return types.REACT_PROJECT;
  }
 
- if (packageJson.devDependencies && packageJson.devDependencies['react-native-scripts']) {
+ if (
+ (packageJson.dependencies && packageJson.dependencies['react-native-scripts']) ||
+ (packageJson.devDependencies && packageJson.devDependencies['react-native-scripts'])
+ ) {
  return types.REACT_NATIVE_SCRIPTS;
  }