Merge pull request #1652 from storybooks/cli-explicit-deps

CLI: Add explicit dependencies on used plugins
storybookjs · Aug 17, 2017 · d773b05 · d773b05
2 parents 8ab7bda + 5c6f426
commit d773b05
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 36 deletions.
diff --git a/lib/cli/generators/METEOR/index.js b/lib/cli/generators/METEOR/index.js
@@ -7,6 +7,8 @@ const latestVersion = require('latest-version');
 
 module.exports = Promise.all([
   latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
   latestVersion('react'),
   latestVersion('react-dom'),
   latestVersion('babel-preset-env'),
@@ -17,6 +19,8 @@ module.exports = Promise.all([
   (
     [
       storybookVersion,
+      actionsVersion,
+      linksVersion,
       reactVersion,
       reactDomVersion,
       presetEnvVersion,
@@ -59,6 +63,8 @@ module.exports = Promise.all([
 
     // write the new package.json.
     packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
+    packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+    packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
     packageJson.scripts.storybook = 'start-storybook -p 6006';
     packageJson.scripts['build-storybook'] = 'build-storybook';
 

diff --git a/lib/cli/generators/METEOR/template/.stories/index.js b/lib/cli/generators/METEOR/template/.stories/index.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React from 'react';
 

diff --git a/lib/cli/generators/METEOR/template/.storybook/addons.js b/lib/cli/generators/METEOR/template/.storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/METEOR/template/.storybook/config.js b/lib/cli/generators/METEOR/template/.storybook/config.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import { configure } from '@storybook/react';
 

diff --git a/lib/cli/generators/REACT/index.js b/lib/cli/generators/REACT/index.js
@@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
 const path = require('path');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/react').then(version => {
+module.exports = Promise.all([
+  latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = helpers.getPackageJson();
 
   packageJson.devDependencies = packageJson.devDependencies || {};
-  packageJson.devDependencies['@storybook/react'] = `^${version}`;
+  packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';

diff --git a/lib/cli/generators/REACT/template/.storybook/addons.js b/lib/cli/generators/REACT/template/.storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/REACT/template/.storybook/config.js b/lib/cli/generators/REACT/template/.storybook/config.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import { configure } from '@storybook/react';
 

diff --git a/lib/cli/generators/REACT_NATIVE/index.js b/lib/cli/generators/REACT_NATIVE/index.js
@@ -5,7 +5,11 @@ const latestVersion = require('latest-version');
 const chalk = require('chalk');
 const helpers = require('../../lib/helpers');
 
-module.exports = latestVersion('@storybook/react-native').then(version => {
+module.exports = Promise.all([
+  latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   // copy all files from the template directory to project directory
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
@@ -28,7 +32,9 @@ module.exports = latestVersion('@storybook/react-native').then(version => {
   packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
 
-  packageJson.devDependencies['@storybook/react-native'] = `^${version}`;
+  packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
     const reactVersion = packageJson.dependencies.react;

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/addons.js b/lib/cli/generators/REACT_NATIVE/template/storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React, { PropTypes } from 'react';
 import { TouchableNativeFeedback } from 'react-native';

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React, { PropTypes } from 'react';
 import { TouchableHighlight } from 'react-native';

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React, { PropTypes } from 'react';
 import { View } from 'react-native';

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React, { PropTypes } from 'react';
 import { View, Text } from 'react-native';

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/stories/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/index.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import React from 'react';
 import { Text } from 'react-native';

diff --git a/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js b/lib/cli/generators/REACT_NATIVE/template/storybook/storybook.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions, global-require */
+/* eslint-disable import/extensions, global-require */
 
 import { AppRegistry } from 'react-native';
 import { getStorybookUI, configure } from '@storybook/react-native';

diff --git a/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js b/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js
@@ -3,7 +3,11 @@ const helpers = require('../../lib/helpers');
 const path = require('path');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/react-native').then(version => {
+module.exports = Promise.all([
+  latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   // copy all files from the template directory to project directory
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
@@ -12,7 +16,9 @@ module.exports = latestVersion('@storybook/react-native').then(version => {
   packageJson.dependencies = packageJson.dependencies || {};
   packageJson.devDependencies = packageJson.devDependencies || {};
 
-  packageJson.devDependencies['@storybook/react-native'] = `^${version}`;
+  packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) {
     const reactVersion = packageJson.dependencies.react;

diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -4,12 +4,18 @@ const path = require('path');
 const fs = require('fs');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/react').then(version => {
+module.exports = Promise.all([
+  latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = helpers.getPackageJson();
 
-  packageJson.devDependencies['@storybook/react'] = `^${version}`;
+  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/generators/REACT_SCRIPTS/template/.storybook/addons.js b/lib/cli/generators/REACT_SCRIPTS/template/.storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register';
 import '@storybook/addon-links/register';
diff --git a/lib/cli/generators/REACT_SCRIPTS/template/.storybook/config.js b/lib/cli/generators/REACT_SCRIPTS/template/.storybook/config.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import { configure } from '@storybook/react';
 

diff --git a/lib/cli/generators/SFC_VUE/index.js b/lib/cli/generators/SFC_VUE/index.js
@@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
 const path = require('path');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/vue').then(version => {
+module.exports = Promise.all([
+  latestVersion('@storybook/vue'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
 
   const packageJson = helpers.getPackageJson();
 
   packageJson.devDependencies = packageJson.devDependencies || {};
-  packageJson.devDependencies['@storybook/vue'] = `^${version}`;
+  packageJson.devDependencies['@storybook/vue'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';

diff --git a/lib/cli/generators/SFC_VUE/template/.storybook/addons.js b/lib/cli/generators/SFC_VUE/template/.storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register'
 import '@storybook/addon-links/register'
diff --git a/lib/cli/generators/SFC_VUE/template/src/stories/index.js b/lib/cli/generators/SFC_VUE/template/src/stories/index.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import { storiesOf } from '@storybook/vue';
 import { action } from '@storybook/addon-actions';

diff --git a/lib/cli/generators/VUE/index.js b/lib/cli/generators/VUE/index.js
@@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
 const path = require('path');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/vue').then(version => {
+Promise.all([
+  latestVersion('@storybook/vue'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
 
   const packageJson = helpers.getPackageJson();
 
   packageJson.devDependencies = packageJson.devDependencies || {};
-  packageJson.devDependencies['@storybook/vue'] = `^${version}`;
+  packageJson.devDependencies['@storybook/vue'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';

diff --git a/lib/cli/generators/VUE/template/.storybook/addons.js b/lib/cli/generators/VUE/template/.storybook/addons.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import '@storybook/addon-actions/register'
 import '@storybook/addon-links/register'
diff --git a/lib/cli/generators/VUE/template/.storybook/config.js b/lib/cli/generators/VUE/template/.storybook/config.js
@@ -1,4 +1,4 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
+/* eslint-disable import/extensions */
 
 import { configure } from '@storybook/vue'
 

diff --git a/lib/cli/generators/VUE/template/stories/MyButton.js b/lib/cli/generators/VUE/template/stories/MyButton.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 export default {
   name: 'my-button',
 

diff --git a/lib/cli/generators/VUE/template/stories/Welcome.js b/lib/cli/generators/VUE/template/stories/Welcome.js
@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, import/no-unresolved, import/extensions */
-
 const log = () => console.log('Welcome to storybook!')
 
 export default {

diff --git a/lib/cli/generators/WEBPACK_REACT/index.js b/lib/cli/generators/WEBPACK_REACT/index.js
@@ -3,13 +3,19 @@ const helpers = require('../../lib/helpers');
 const path = require('path');
 const latestVersion = require('latest-version');
 
-module.exports = latestVersion('@storybook/react').then(version => {
+Promise.all([
+  latestVersion('@storybook/react'),
+  latestVersion('@storybook/addon-actions'),
+  latestVersion('@storybook/addon-links'),
+]).then(([storybookVersion, actionsVersion, linksVersion]) => {
   mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
 
   const packageJson = helpers.getPackageJson();
 
   packageJson.devDependencies = packageJson.devDependencies || {};
-  packageJson.devDependencies['@storybook/react'] = `^${version}`;
+  packageJson.devDependencies['@storybook/react'] = `^${storybookVersion}`;
+  packageJson.devDependencies['@storybook/addon-actions'] = `^${actionsVersion}`;
+  packageJson.devDependencies['@storybook/addon-links'] = `^${linksVersion}`;
 
   packageJson.scripts = packageJson.scripts || {};
   packageJson.scripts.storybook = 'start-storybook -p 6006';