CLI: REACT template CSF refactor

lib/cli/generators/REACT/index.js

@@ -1,23 +1,23 @@
-import path from 'path';
-import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
   writePackageJson,
   getBabelDependencies,
   installDependencies,
+  copyTemplate,
 } from '../../lib/helpers';
 
-export default async npmOptions => {
-  const [storybookVersion, actionsVersion, linksVersion, addonsVersion] = await getVersions(
-    npmOptions,
+export default async (npmOptions, { storyFormat = 'csf' }) => {
+  const packages = [
     '@storybook/react',
     '@storybook/addon-actions',
     '@storybook/addon-links',
-    '@storybook/addons'
-  );
+    '@storybook/addons',
+  ];
 
-  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
+  const versionedPackages = await getVersions(npmOptions, ...packages);
+
+  copyTemplate(__dirname, storyFormat);
 
   const packageJson = getPackageJson();
 
@@ -32,11 +32,5 @@ export default async npmOptions => {
 
   const babelDependencies = await getBabelDependencies(npmOptions, packageJson);
 
-  installDependencies(npmOptions, [
-    `@storybook/react@${storybookVersion}`,
-    `@storybook/addon-actions@${actionsVersion}`,
-    `@storybook/addon-links@${linksVersion}`,
-    `@storybook/addons@${addonsVersion}`,
-    ...babelDependencies,
-  ]);
+  installDependencies(npmOptions, [...versionedPackages, ...babelDependencies]);
 };

lib/cli/lib/initiate.js

@@ -87,7 +87,7 @@ const installStorybook = (projectType, options) => {
           .then(end);
 
       case types.REACT:
-        return reactGenerator(npmOptions)
+        return reactGenerator(npmOptions, generatorOptions)
           .then(commandLog('Adding storybook support to your "React" app'))
           .then(end);