fix: rename baseGenerator

lib/api/src/version.ts

@@ -1 +1 @@
-export const version = '6.0.0-beta.24';
+export const version = '6.0.0-beta.25';

lib/cli/src/generators/ANGULAR/index.ts

@@ -6,7 +6,7 @@ import {
   getAngularAppTsConfigPath,
 } from './angular-helpers';
 import { writeFileAsJson, copyTemplate } from '../../helpers';
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 function editAngularAppTsConfig() {
   const tsConfigJson = getAngularAppTsConfigJson();

lib/cli/src/generators/AURELIA/index.ts

@@ -1,5 +1,5 @@
 import { writeFileAsJson, readFileAsJson, copyTemplate } from '../../helpers';
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 function addStorybookExcludeGlobToTsConfig() {
   const tsConfigJson = readFileAsJson('tsconfig.json', true);

lib/cli/src/generators/EMBER/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'ember', {

lib/cli/src/generators/HTML/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { StoryFormat } from '../../project_types';
 import { copyTemplate } from '../../helpers';
 

lib/cli/src/generators/MARIONETTE/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   await baseGenerator(packageManager, npmOptions, options, 'marionette');

lib/cli/src/generators/MARKO/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   await baseGenerator(packageManager, npmOptions, options, 'marko');

lib/cli/src/generators/METEOR/index.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import JSON5 from 'json5';
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'react', {

lib/cli/src/generators/MITHRIL/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'mithril');

lib/cli/src/generators/PREACT/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'preact');

lib/cli/src/generators/RAX/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { writePackageJson } from '../../js-package-manager';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {

lib/cli/src/generators/REACT/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { StoryFormat } from '../../project_types';
 import { copyTemplate } from '../../helpers';
 

lib/cli/src/generators/REACT_NATIVE/index.ts

@@ -2,7 +2,7 @@ import shell from 'shelljs';
 import chalk from 'chalk';
 import { paddedLog, copyTemplate } from '../../helpers';
 import { NpmOptions } from '../../NpmOptions';
-import { baseGenerator, GeneratorOptions } from '../generator';
+import { baseGenerator, GeneratorOptions } from '../baseGenerator';
 import { JsPackageManager } from '../../js-package-manager';
 
 const generator = async (

lib/cli/src/generators/REACT_SCRIPTS/index.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { copyTemplate } from '../../helpers';
 import { StoryFormat } from '../../project_types';
 

lib/cli/src/generators/RIOT/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'riot', {

lib/cli/src/generators/SFC_VUE/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { StoryFormat } from '../../project_types';
 import { copyTemplate } from '../../helpers';
 

lib/cli/src/generators/SVELTE/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
   baseGenerator(packageManager, npmOptions, options, 'svelte', {

lib/cli/src/generators/VUE/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { StoryFormat } from '../../project_types';
 import { copyTemplate } from '../../helpers';
 

lib/cli/src/generators/WEB-COMPONENTS/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { copyTemplate } from '../../helpers';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {

lib/cli/src/generators/WEBPACK_REACT/index.ts

@@ -1,4 +1,4 @@
-import { baseGenerator, Generator } from '../generator';
+import { baseGenerator, Generator } from '../baseGenerator';
 import { StoryFormat } from '../../project_types';
 import { copyTemplate } from '../../helpers';
 

lib/cli/src/generators/baseGenerator.ts

@@ -67,13 +67,18 @@ export async function baseGenerator(
     ...addonsPeerDeps,
   ].filter(Boolean);
   const versionedPackages = await packageManager.getVersionedPackages(...packages);
-  console.log('versionedPackages', versionedPackages);
+
   configure([...addons, ...extraAddons]);
   if (addComponents) {
     copyComponents(framework, language);
   }
 
   const packageJson = packageManager.retrievePackageJson();
+  const babelDependencies = await getBabelDependencies(packageManager, packageJson);
+  packageManager.addDependencies({ ...npmOptions, packageJson }, [
+    ...versionedPackages,
+    ...babelDependencies,
+  ]);
 
   if (addScripts) {
     packageManager.addStorybookCommandInScripts({
@@ -81,9 +86,4 @@ export async function baseGenerator(
       staticFolder: staticDir,
     });
   }
-  const babelDependencies = await getBabelDependencies(packageManager, packageJson);
-  packageManager.addDependencies({ ...npmOptions, packageJson }, [
-    ...versionedPackages,
-    ...babelDependencies,
-  ]);
 }