@storybook/cli 7.0.0-alpha.1 → 7.0.0-alpha.10

package/dist/cjs/automigrate/fixes/index.js

@@ -22,6 +22,8 @@ var _eslintPlugin = require("./eslint-plugin");
 
 var _builderVite = require("./builder-vite");
 
+var _npm = require("./npm7");
+
 var _types = require("../types");
 
 Object.keys(_types).forEach(function (key) {
@@ -35,5 +37,5 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
+const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
 exports.fixes = fixes;

package/dist/cjs/automigrate/fixes/npm7.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.npm7 = void 0;
+
+require("core-js/modules/es.promise.js");
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+const npm7 = {
+  id: 'npm7',
+
+  async check({
+    packageManager
+  }) {
+    if (packageManager.type !== 'npm') return null;
+    const npmVersion = packageManager.getNpmVersion();
+
+    if (packageManager.needsLegacyPeerDeps(npmVersion)) {
+      return {
+        npmVersion
+      };
+    }
+
+    return null;
+  },
+
+  prompt({
+    npmVersion
+  }) {
+    const npmFormatted = _chalk.default.cyan(`npm ${npmVersion}`);
+
+    return (0, _tsDedent.default)`
+      We've detected you are running ${npmFormatted} which has peer dependency semantics which Storybook is incompatible with.
+
+      In order to work with Storybook's package structure, you'll need to run \`npm\` with the
+      \`--legacy-peer-deps=true\` flag. We can generate an \`.npmrc\` which will do that automatically.
+      
+      More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/issues/18298')}
+    `;
+  },
+
+  async run({
+    packageManager
+  }) {
+    packageManager.setLegacyPeerDeps();
+  }
+
+};
+exports.npm7 = npm7;

package/dist/cjs/automigrate/index.js

@@ -34,9 +34,15 @@ const automigrate = async ({
 
   for (let i = 0; i < filtered.length; i += 1) {
     const f = _fixes.fixes[i];
-    const result = await f.check({
-      packageManager
-    });
+    let result;
+
+    try {
+      result = await f.check({
+        packageManager
+      });
+    } catch (e) {
+      logger.info(`failed to check fix: ${f.id}`);
+    }
 
     if (result) {
       logger.info(`🔎 found a '${_chalk.default.cyan(f.id)}' migration:`);

package/dist/cjs/babel-config.js

@@ -11,8 +11,6 @@ var _fsExtra = require("fs-extra");
 
 var _nodeLogger = require("@storybook/node-logger");
 
-var _coreCommon = require("@storybook/core-common");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _prompts = _interopRequireDefault(require("prompts"));
@@ -33,8 +31,11 @@ const generateStorybookBabelConfig = async ({
 }) => {
   _nodeLogger.logger.info(`Generating the storybook default babel config at ${target}`);
 
-  const config = (0, _coreCommon.getStorybookBabelConfig)();
-  const contents = JSON.stringify(config, null, 2);
+  const contents = JSON.stringify({
+    sourceType: 'unambiguous',
+    presets: [],
+    plugins: []
+  }, null, 2);
   const fileName = '.babelrc.json';
 
   const location = _path.default.join(target, fileName);

package/dist/cjs/frameworks/angular/Button.stories.ts

@@ -1,5 +1,5 @@
 // also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
-import { Story, Meta } from '@storybook/angular/types-6-0';
+import type { Meta, StoryFn } from '@storybook/angular';
 import Button from './button.component';
 
 // More on default export: https://storybook.js.org/docs/angular/writing-stories/introduction#default-export
@@ -13,9 +13,11 @@ export default {
 } as Meta;
 
 // More on component templates: https://storybook.js.org/docs/angular/writing-stories/introduction#using-args
-const Template: Story<Button> = (args: Button) => ({
-  props: args,
-});
+const Template: StoryFn<Button> = (args: Button) => {
+  return {
+    props: { backgroundColor: null, ...args },
+  };
+};
 
 export const Primary = Template.bind({});
 // More on args: https://storybook.js.org/docs/angular/writing-stories/args

package/dist/cjs/frameworks/angular/Header.stories.ts

@@ -1,6 +1,6 @@
 import { moduleMetadata } from '@storybook/angular';
 import { CommonModule } from '@angular/common';
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import Button from './button.component';
 import Header from './header.component';
@@ -20,7 +20,7 @@ export default {
   },
 } as Meta;
 
-const Template: Story<Header> = (args: Header) => ({
+const Template: StoryFn<Header> = (args: Header) => ({
   props: args,
 });
 

package/dist/cjs/frameworks/angular/Page.stories.ts

@@ -1,4 +1,4 @@
-import { moduleMetadata, Story, Meta } from '@storybook/angular';
+import { moduleMetadata, StoryFn, Meta } from '@storybook/angular';
 import { within, userEvent } from '@storybook/testing-library';
 import { CommonModule } from '@angular/common';
 
@@ -10,7 +10,7 @@ export default {
   title: 'Example/Page',
   component: Page,
   parameters: {
-    // More on Story layout: https://storybook.js.org/docs/angular/configure/story-layout
+    // More on StoryFn layout: https://storybook.js.org/docs/angular/configure/story-layout
     layout: 'fullscreen',
   },
   decorators: [
@@ -21,7 +21,7 @@ export default {
   ],
 } as Meta;
 
-const Template: Story<Page> = (args: Page) => ({
+const Template: StoryFn<Page> = (args: Page) => ({
   props: args,
 });
 

package/dist/cjs/frameworks/html/ts/Button.stories.ts

@@ -1,4 +1,4 @@
-import { Story, Meta } from '@storybook/html';
+import type { Meta, StoryFn } from '@storybook/html';
 import { createButton, ButtonProps } from './Button';
 
 // More on default export: https://storybook.js.org/docs/html/writing-stories/introduction#default-export
@@ -15,10 +15,10 @@ export default {
       options: ['small', 'medium', 'large'],
     },
   },
-} as Meta;
+} as Meta<ButtonProps>;
 
 // More on component templates: https://storybook.js.org/docs/html/writing-stories/introduction#using-args
-const Template: Story<ButtonProps> = (args) => {
+const Template: StoryFn<ButtonProps> = (args) => {
   // You can either use a function to create DOM elements or use a plain html string!
   // return `<div>${label}</div>`;
   return createButton(args);

package/dist/cjs/frameworks/html/ts/Button.ts

@@ -36,12 +36,16 @@ export const createButton = ({
   const btn = document.createElement('button');
   btn.type = 'button';
   btn.innerText = label;
-  btn.addEventListener('click', onClick);
+  if (onClick) {
+    btn.addEventListener('click', onClick);
+  }
 
   const mode = primary ? 'storybook-button--primary' : 'storybook-button--secondary';
   btn.className = ['storybook-button', `storybook-button--${size}`, mode].join(' ');
 
-  btn.style.backgroundColor = backgroundColor;
+  if (backgroundColor) {
+    btn.style.backgroundColor = backgroundColor;
+  }
 
   return btn;
 };

package/dist/cjs/frameworks/html/ts/Header.stories.ts

@@ -1,4 +1,4 @@
-import { Story, Meta } from '@storybook/html';
+import type { Meta, StoryFn } from '@storybook/html';
 import { createHeader, HeaderProps } from './Header';
 
 export default {
@@ -13,9 +13,9 @@ export default {
     onLogout: { action: 'onLogout' },
     onCreateAccount: { action: 'onCreateAccount' },
   },
-} as Meta;
+} as Meta<HeaderProps>;
 
-const Template: Story<HeaderProps> = (args) => createHeader(args);
+const Template: StoryFn<HeaderProps> = (args) => createHeader(args);
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {

package/dist/cjs/frameworks/html/ts/Page.stories.ts

@@ -1,5 +1,5 @@
 import { within, userEvent } from '@storybook/testing-library';
-import { Story, Meta } from '@storybook/html';
+import type { Meta, StoryFn } from '@storybook/html';
 import { createPage } from './Page';
 
 export default {
@@ -10,7 +10,7 @@ export default {
   },
 } as Meta;
 
-const Template: Story = () => createPage();
+const Template: StoryFn = () => createPage();
 
 export const LoggedOut = Template.bind({});
 

package/dist/cjs/frameworks/html/ts/Page.ts

@@ -7,12 +7,12 @@ type User = {
 
 export const createPage = () => {
   const article = document.createElement('article');
-  let user: User = null;
-  let header = null;
+  let user: User | undefined;
+  let header: HTMLElement | null = null;
 
   const rerenderHeader = () => {
     const wrapper = document.getElementsByTagName('article')[0];
-    wrapper.replaceChild(createHeaderElement(), wrapper.firstChild);
+    wrapper.replaceChild(createHeaderElement(), wrapper.firstChild as HTMLElement);
   };
 
   const onLogin = () => {
@@ -21,7 +21,7 @@ export const createPage = () => {
   };
 
   const onLogout = () => {
-    user = null;
+    user = undefined;
     rerenderHeader();
   };
 

package/dist/cjs/frameworks/react/ts/Button.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ComponentStory, ComponentMeta } from '@storybook/react';
+import type { ComponentStoryFn, ComponentMeta } from '@storybook/react';
 
 import { Button } from './Button';
 
@@ -14,7 +14,7 @@ export default {
 } as ComponentMeta<typeof Button>;
 
 // More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Template: ComponentStory<typeof Button> = (args) => <Button {...args} />;
+const Template: ComponentStoryFn<typeof Button> = (args) => <Button {...args} />;
 
 export const Primary = Template.bind({});
 // More on args: https://storybook.js.org/docs/react/writing-stories/args

package/dist/cjs/frameworks/react/ts/Header.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ComponentStory, ComponentMeta } from '@storybook/react';
+import type { ComponentStoryFn, ComponentMeta } from '@storybook/react';
 
 import { Header } from './Header';
 
@@ -12,7 +12,7 @@ export default {
   },
 } as ComponentMeta<typeof Header>;
 
-const Template: ComponentStory<typeof Header> = (args) => <Header {...args} />;
+const Template: ComponentStoryFn<typeof Header> = (args) => <Header {...args} />;
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {

package/dist/cjs/frameworks/react/ts/Page.stories.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ComponentStory, ComponentMeta } from '@storybook/react';
+import type { ComponentStoryFn, ComponentMeta } from '@storybook/react';
 import { within, userEvent } from '@storybook/testing-library';
 import { Page } from './Page';
 
@@ -12,7 +12,7 @@ export default {
   },
 } as ComponentMeta<typeof Page>;
 
-const Template: ComponentStory<typeof Page> = (args) => <Page {...args} />;
+const Template: ComponentStoryFn<typeof Page> = (args) => <Page {...args} />;
 
 export const LoggedOut = Template.bind({});
 

package/dist/cjs/frameworks/web-components/ts/Button.stories.ts

@@ -1,4 +1,4 @@
-import { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 import { Button, ButtonProps } from './Button';
 
 // More on default export: https://storybook.js.org/docs/web-components/writing-stories/introduction#default-export
@@ -16,7 +16,7 @@ export default {
 } as Meta;
 
 // More on component templates: https://storybook.js.org/docs/web-components/writing-stories/introduction#using-args
-const Template: Story<Partial<ButtonProps>> = (args) => Button(args);
+const Template: StoryFn<ButtonProps> = (args) => Button(args);
 
 export const Primary = Template.bind({});
 // More on args: https://storybook.js.org/docs/web-components/writing-stories/args

package/dist/cjs/frameworks/web-components/ts/Header.stories.ts

@@ -1,11 +1,11 @@
-import { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 import { Header, HeaderProps } from './Header';
 
 export default {
   title: 'Example/Header',
 } as Meta;
 
-const Template: Story<Partial<HeaderProps>> = (args) => Header(args);
+const Template: StoryFn<HeaderProps> = (args) => Header(args);
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {

package/dist/cjs/frameworks/web-components/ts/Page.stories.ts

@@ -1,4 +1,4 @@
-import { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 import { Page, PageProps } from './Page';
 import * as HeaderStories from './Header.stories';
 
@@ -6,7 +6,7 @@ export default {
   title: 'Example/Page',
 } as Meta;
 
-const Template: Story<Partial<PageProps>> = (args) => Page(args);
+const Template: StoryFn<PageProps> = (args) => Page(args);
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {

package/dist/cjs/generate.js

@@ -52,7 +52,7 @@ process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMET
 
 _commander.default.option('--enable-crash-reports', 'enable sending crash reports to telemetry data');
 
-_commander.default.command('init').description('Initialize Storybook into your project.').option('-f --force', 'Force add Storybook').option('-s --skip-install', 'Skip installing deps').option('-N --use-npm', 'Use npm to install deps').option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser').option('-t --type <type>', 'Add Storybook for a specific project type').option('-y --yes', 'Answer yes to all prompts').option('-b --builder <builder>', 'Builder library').option('-l --linkable', 'Prepare installation for link (contributor helper)').action(options => (0, _initiate.initiate)(options, pkg));
+_commander.default.command('init').description('Initialize Storybook into your project.').option('-f --force', 'Force add Storybook').option('-s --skip-install', 'Skip installing deps').option('-N --use-npm', 'Use npm to install deps').option('--use-pnp', 'Enable pnp mode').option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser').option('-t --type <type>', 'Add Storybook for a specific project type').option('-y --yes', 'Answer yes to all prompts').option('-b --builder <builder>', 'Builder library').option('-l --linkable', 'Prepare installation for link (contributor helper)').action(options => (0, _initiate.initiate)(options, pkg));
 
 _commander.default.command('add <addon>').description('Add an addon to your Storybook').option('-N --use-npm', 'Use NPM to build the Storybook server').option('-s --skip-postinstall', 'Skip package specific postinstall config modifications').action((addonName, options) => (0, _add.add)(addonName, options));
 

package/dist/cjs/generators/ANGULAR/index.js

@@ -57,7 +57,30 @@ const generator = async (packageManager, npmOptions, options) => {
     addScripts: false
   });
   (0, _helpers.copyTemplate)(__dirname);
-  editAngularAppTsConfig();
+  editAngularAppTsConfig(); // TODO: we need to add the following:
+
+  /*
+  "storybook": {
+    "builder": "@storybook/angular:start-storybook",
+    "options": {
+      "browserTarget": "angular-cli:build",
+      "port": 4400
+    }
+  },
+  "build-storybook": {
+    "builder": "@storybook/angular:build-storybook",
+    "options": {
+      "browserTarget": "angular-cli:build"
+    }
+  }
+  */
+  // to the user's angular.json file. see: https://github.com/storybookjs/storybook/blob/next/examples/angular-cli/angular.json#L78
+  // then we want to add these scripts to package.json
+  // packageManager.addScripts({
+  //   storybook: 'ng storybook',
+  //   'build-storybook': 'ng build-storybook',
+  // });
+
   (0, _angularHelpers.editStorybookTsConfig)(_path.default.resolve('./.storybook/tsconfig.json')); // edit scripts to generate docs
 
   const tsConfigFile = await (0, _angularHelpers.getBaseTsConfigName)();

package/dist/cjs/generators/REACT_SCRIPTS/index.js

@@ -30,10 +30,10 @@ const generator = async (packageManager, npmOptions, options) => {
       config.resolve.plugins.forEach((p) => {
         if (Array.isArray(p.appSrcs)) {
           p.appSrcs.push('${monorepoRootPath}');
-        }
-      });
-      return config;
-    }
+              }
+            });
+          return config;
+          }
     %%`
   } : {};
   const craVersion = (_semver$coerce = _semver.default.coerce(packageManager.retrievePackageJson().dependencies['react-scripts'])) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version;

package/dist/cjs/generators/SVELTE/index.js

@@ -16,25 +16,21 @@ var _baseGenerator = require("../baseGenerator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const generator = async (packageManager, npmOptions, options) => {
-  let extraMain;
+  let svelteOptions;
   let commonJs = false; // svelte.config.js ?
 
   if (_fsExtra.default.existsSync('./svelte.config.js')) {
     _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.js'");
 
-    extraMain = {
-      svelteOptions: {
-        preprocess: '%%require("../svelte.config.js").preprocess%%'
-      }
+    svelteOptions = {
+      preprocess: '%%require("../svelte.config.js").preprocess%%'
     };
   } else if (_fsExtra.default.existsSync('./svelte.config.cjs')) {
     _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.cjs'");
 
     commonJs = true;
-    extraMain = {
-      svelteOptions: {
-        preprocess: '%%require("../svelte.config.cjs").preprocess%%'
-      }
+    svelteOptions = {
+      preprocess: '%%require("../svelte.config.cjs").preprocess%%'
     };
   } else {
     // svelte-preprocess dependencies ?
@@ -43,10 +39,8 @@ const generator = async (packageManager, npmOptions, options) => {
     if (packageJson.devDependencies && packageJson.devDependencies['svelte-preprocess']) {
       _nodeLogger.logger.info("Configuring preprocessor with 'svelte-preprocess'");
 
-      extraMain = {
-        svelteOptions: {
-          preprocess: '%%require("svelte-preprocess")()%%'
-        }
+      svelteOptions = {
+        preprocess: '%%require("svelte-preprocess")()%%'
       };
     }
   }
@@ -54,7 +48,7 @@ const generator = async (packageManager, npmOptions, options) => {
   await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'svelte', {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
-    extraMain,
+    framework: svelteOptions,
     commonJs
   });
 };

package/dist/cjs/generators/baseGenerator.js

@@ -34,6 +34,7 @@ const defaultOptions = {
   addBabel: true,
   addESLint: false,
   extraMain: undefined,
+  framework: undefined,
   extensions: undefined,
   commonJs: false
 };
@@ -54,33 +55,39 @@ const getBuilderDetails = builder => {
   return builder;
 };
 
-const getFrameworkDetails = (renderer, builder) => {
+const wrapForPnp = packageName => `%%path.dirname(require.resolve(path.join('${packageName}', 'package.json')))%%`;
+
+const getFrameworkDetails = (renderer, builder, pnp) => {
   const frameworkPackage = `@storybook/${renderer}-${builder}`;
+  const frameworkPackagePath = pnp ? wrapForPnp(frameworkPackage) : frameworkPackage;
   const rendererPackage = `@storybook/${renderer}`;
+  const rendererPackagePath = pnp ? wrapForPnp(rendererPackage) : rendererPackage;
+  const builderPackage = getBuilderDetails(builder);
+  const builderPackagePath = pnp ? wrapForPnp(builderPackage) : builderPackage;
   const isKnownFramework = !!_versions.default[frameworkPackage];
   const isKnownRenderer = !!_versions.default[rendererPackage];
-  const builderPackage = getBuilderDetails(builder);
 
   if (renderer === 'angular') {
     return {
-      package: rendererPackage,
-      builder: builderPackage,
+      packages: [rendererPackage],
+      framework: rendererPackagePath,
       type: 'framework'
     };
   }
 
   if (isKnownFramework) {
     return {
-      package: frameworkPackage,
-      builder: builderPackage,
+      packages: [frameworkPackage],
+      framework: frameworkPackagePath,
       type: 'framework'
     };
   }
 
   if (isKnownRenderer) {
     return {
-      package: rendererPackage,
-      builder: builderPackage,
+      packages: [rendererPackage, builderPackage],
+      builder: builderPackagePath,
+      renderer: rendererPackagePath,
       type: 'renderer'
     };
   }
@@ -94,7 +101,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 
 async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder = _project_types.CoreBuilder.Webpack5
+  builder = _project_types.CoreBuilder.Webpack5,
+  pnp
 }, renderer, options = defaultOptions) {
   const {
     extraAddons: extraAddonPackages,
@@ -109,9 +117,9 @@ async function baseGenerator(packageManager, npmOptions, {
   } = Object.assign({}, defaultOptions, options); // added to main.js
   // make sure to update `canUsePrebuiltManager` in dev-server.js and build-manager-config/main.js when this list changes
 
-  const addons = ['@storybook/addon-links', '@storybook/addon-essentials']; // added to package.json
+  const addons = ['@storybook/addon-links', '@storybook/addon-essentials', ...stripVersions(extraAddonPackages)]; // added to package.json
 
-  const addonPackages = [...addons, '@storybook/addon-actions'];
+  const addonPackages = ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-actions', ...extraAddonPackages];
 
   if (hasInteractiveStories(renderer)) {
     addons.push('@storybook/addon-interactions');
@@ -123,20 +131,16 @@ async function baseGenerator(packageManager, npmOptions, {
   const packageJson = packageManager.retrievePackageJson();
   const installedDependencies = new Set(Object.keys(Object.assign({}, packageJson.dependencies, packageJson.devDependencies)));
   const {
-    package: frameworkPackage,
+    packages: frameworkPackages,
     type,
-    builder: builderPackage
-  } = getFrameworkDetails(renderer, builder); // temp
+    // @ts-ignore
+    renderer: rendererInclude,
+    // deepscan-disable-line UNUSED_DECL
+    framework: frameworkInclude,
+    builder: builderInclude
+  } = getFrameworkDetails(renderer, builder, pnp); // TODO: We need to start supporting this at some point
 
   if (type === 'renderer') {
-    console.log({
-      language,
-      builder,
-      renderer,
-      builderPackage,
-      frameworkPackage,
-      type
-    });
     throw new Error((0, _tsDedent.default)`
         Sorry, for now, you can not do this, please use a framework such as @storybook/react-webpack5
 
@@ -144,32 +148,30 @@ async function baseGenerator(packageManager, npmOptions, {
       `);
   }
 
-  const packages = ['sb', frameworkPackage, ...addonPackages, ...extraPackages, ...extraAddonPackages, ...yarn2ExtraPackages, ...(type === 'framework' ? [] : [builderPackage])].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
+  const packages = ['storybook', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
   const versionedPackages = await packageManager.getVersionedPackages(packages);
-  console.log({
-    versionedPackages
-  });
-  const mainOptions = type !== 'framework' ? Object.assign({
-    core: {
-      builder: builderPackage
-    }
-  }, extraMain) : extraMain;
-  (0, _configure.configure)(renderer, Object.assign({
+  await _fsExtra.default.ensureDir('./.storybook');
+  await (0, _configure.configureMain)(Object.assign({
     framework: {
-      name: frameworkPackage,
-      options: {}
+      name: frameworkInclude,
+      options: options.framework || {}
     },
-    addons: [...addons, ...stripVersions(extraAddonPackages)],
+    addons: pnp ? addons.map(wrapForPnp) : addons,
     extensions,
     commonJs: options.commonJs
-  }, mainOptions));
+  }, extraMain, type !== 'framework' ? {
+    core: {
+      builder: builderInclude
+    }
+  } : {}));
+  await (0, _configure.configurePreview)(renderer, options.commonJs);
 
   if (addComponents) {
     (0, _helpers.copyComponents)(renderer, language);
   } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
 
 
-  if (builderPackage === '@storybook/builder-vite') {
+  if (frameworkPackages.includes('@storybook/builder-vite')) {
     const previewHead = (0, _tsDedent.default)`
       <script>
         window.global = window;