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

package/dist/esm/repro-generators/scripts.js

@@ -41,11 +41,12 @@ const exec = async (command, options = {}, {
   logger.debug(command);
   return new Promise((resolve, reject) => {
     const defaultOptions = {
-      silent: true
+      silent: false
     };
 
     const child = _shelljs.default.exec(command, Object.assign({}, defaultOptions, options, {
-      async: true
+      async: true,
+      silent: false
     }));
 
     child.stderr.pipe(process.stderr);
@@ -170,28 +171,37 @@ const addAdditionalFiles = async ({
   additionalFiles,
   cwd
 }) => {
-  if (!additionalFiles || additionalFiles.length === 0) {
-    return;
-  }
-
   logger.info(`⤵️ Adding required files`);
-  additionalFiles.forEach(async file => {
+  await Promise.all(additionalFiles.map(async file => {
     await (0, _fsExtra.outputFile)(_path.default.resolve(cwd, file.path), file.contents, {
       encoding: 'UTF-8'
     });
-  });
+  }));
 };
 
 const initStorybook = async ({
   cwd,
   autoDetect = true,
   name,
-  e2e
+  e2e,
+  pnp
 }) => {
-  const type = autoDetect ? '' : `--type ${name}`;
-  const linkable = e2e ? '' : '--linkable';
+  const flags = ['--yes'];
+
+  if (!autoDetect) {
+    flags.push(`--type ${name}`);
+  }
+
+  if (e2e) {
+    flags.push('--linkable');
+  }
+
+  if (pnp) {
+    flags.push('--use-pnp');
+  }
+
   const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
-  const command = `${sbCLICommand} init --yes ${type} ${linkable}`;
+  const command = `${sbCLICommand} init ${flags.join(' ')}`;
   await exec(command, {
     cwd
   }, {
@@ -283,7 +293,7 @@ const createAndInit = async (cwd, _ref, {
   }));
   await doTask(addAdditionalFiles, Object.assign({}, options, {
     cwd
-  }));
+  }), !!options.additionalFiles);
 
   if (e2e) {
     await doTask(addPackageResolutions, options);

package/dist/esm/versions.js

@@ -6,78 +6,78 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // auto generated file, do not edit
 var _default = {
-  '@storybook/addon-a11y': '7.0.0-alpha.1',
-  '@storybook/addon-actions': '7.0.0-alpha.1',
-  '@storybook/addon-backgrounds': '7.0.0-alpha.1',
-  '@storybook/addon-controls': '7.0.0-alpha.1',
-  '@storybook/addon-docs': '7.0.0-alpha.1',
-  '@storybook/addon-essentials': '7.0.0-alpha.1',
-  '@storybook/addon-interactions': '7.0.0-alpha.1',
-  '@storybook/addon-jest': '7.0.0-alpha.1',
-  '@storybook/addon-links': '7.0.0-alpha.1',
-  '@storybook/addon-measure': '7.0.0-alpha.1',
-  '@storybook/addon-outline': '7.0.0-alpha.1',
-  '@storybook/addon-storyshots': '7.0.0-alpha.1',
-  '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.1',
-  '@storybook/addon-storysource': '7.0.0-alpha.1',
-  '@storybook/addon-toolbars': '7.0.0-alpha.1',
-  '@storybook/addon-viewport': '7.0.0-alpha.1',
-  '@storybook/addons': '7.0.0-alpha.1',
-  '@storybook/angular': '7.0.0-alpha.1',
-  '@storybook/api': '7.0.0-alpha.1',
-  '@storybook/builder-webpack5': '7.0.0-alpha.1',
-  '@storybook/channel-postmessage': '7.0.0-alpha.1',
-  '@storybook/channel-websocket': '7.0.0-alpha.1',
-  '@storybook/channels': '7.0.0-alpha.1',
-  '@storybook/cli': '7.0.0-alpha.1',
-  '@storybook/client-api': '7.0.0-alpha.1',
-  '@storybook/client-logger': '7.0.0-alpha.1',
-  '@storybook/codemod': '7.0.0-alpha.1',
-  '@storybook/components': '7.0.0-alpha.1',
-  '@storybook/core-client': '7.0.0-alpha.1',
-  '@storybook/core-common': '7.0.0-alpha.1',
-  '@storybook/core-events': '7.0.0-alpha.1',
-  '@storybook/core-server': '7.0.0-alpha.1',
-  '@storybook/core-webpack': '7.0.0-alpha.1',
-  '@storybook/csf-tools': '7.0.0-alpha.1',
-  '@storybook/docs-tools': '7.0.0-alpha.1',
-  '@storybook/ember': '7.0.0-alpha.1',
-  '@storybook/html': '7.0.0-alpha.1',
-  '@storybook/html-webpack5': '7.0.0-alpha.1',
-  '@storybook/instrumenter': '7.0.0-alpha.1',
-  '@storybook/manager-webpack5': '7.0.0-alpha.1',
-  '@storybook/node-logger': '7.0.0-alpha.1',
-  '@storybook/postinstall': '7.0.0-alpha.1',
-  '@storybook/preact': '7.0.0-alpha.1',
-  '@storybook/preact-webpack5': '7.0.0-alpha.1',
-  '@storybook/preset-html-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-preact-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-react-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-server-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-svelte-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-vue-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-vue3-webpack': '7.0.0-alpha.1',
-  '@storybook/preset-web-components-webpack': '7.0.0-alpha.1',
-  '@storybook/preview-web': '7.0.0-alpha.1',
-  '@storybook/react': '7.0.0-alpha.1',
-  '@storybook/react-webpack5': '7.0.0-alpha.1',
-  '@storybook/router': '7.0.0-alpha.1',
-  '@storybook/server': '7.0.0-alpha.1',
-  '@storybook/server-webpack5': '7.0.0-alpha.1',
-  '@storybook/source-loader': '7.0.0-alpha.1',
-  '@storybook/store': '7.0.0-alpha.1',
-  '@storybook/svelte': '7.0.0-alpha.1',
-  '@storybook/svelte-webpack5': '7.0.0-alpha.1',
-  '@storybook/telemetry': '7.0.0-alpha.1',
-  '@storybook/theming': '7.0.0-alpha.1',
-  '@storybook/ui': '7.0.0-alpha.1',
-  '@storybook/vue': '7.0.0-alpha.1',
-  '@storybook/vue-webpack5': '7.0.0-alpha.1',
-  '@storybook/vue3': '7.0.0-alpha.1',
-  '@storybook/vue3-webpack5': '7.0.0-alpha.1',
-  '@storybook/web-components': '7.0.0-alpha.1',
-  '@storybook/web-components-webpack5': '7.0.0-alpha.1',
-  sb: '7.0.0-alpha.1',
-  storybook: '7.0.0-alpha.1'
+  '@storybook/addon-a11y': '7.0.0-alpha.2',
+  '@storybook/addon-actions': '7.0.0-alpha.2',
+  '@storybook/addon-backgrounds': '7.0.0-alpha.2',
+  '@storybook/addon-controls': '7.0.0-alpha.2',
+  '@storybook/addon-docs': '7.0.0-alpha.2',
+  '@storybook/addon-essentials': '7.0.0-alpha.2',
+  '@storybook/addon-interactions': '7.0.0-alpha.2',
+  '@storybook/addon-jest': '7.0.0-alpha.2',
+  '@storybook/addon-links': '7.0.0-alpha.2',
+  '@storybook/addon-measure': '7.0.0-alpha.2',
+  '@storybook/addon-outline': '7.0.0-alpha.2',
+  '@storybook/addon-storyshots': '7.0.0-alpha.2',
+  '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.2',
+  '@storybook/addon-storysource': '7.0.0-alpha.2',
+  '@storybook/addon-toolbars': '7.0.0-alpha.2',
+  '@storybook/addon-viewport': '7.0.0-alpha.2',
+  '@storybook/addons': '7.0.0-alpha.2',
+  '@storybook/angular': '7.0.0-alpha.2',
+  '@storybook/api': '7.0.0-alpha.2',
+  '@storybook/builder-webpack5': '7.0.0-alpha.2',
+  '@storybook/channel-postmessage': '7.0.0-alpha.2',
+  '@storybook/channel-websocket': '7.0.0-alpha.2',
+  '@storybook/channels': '7.0.0-alpha.2',
+  '@storybook/cli': '7.0.0-alpha.2',
+  '@storybook/client-api': '7.0.0-alpha.2',
+  '@storybook/client-logger': '7.0.0-alpha.2',
+  '@storybook/codemod': '7.0.0-alpha.2',
+  '@storybook/components': '7.0.0-alpha.2',
+  '@storybook/core-client': '7.0.0-alpha.2',
+  '@storybook/core-common': '7.0.0-alpha.2',
+  '@storybook/core-events': '7.0.0-alpha.2',
+  '@storybook/core-server': '7.0.0-alpha.2',
+  '@storybook/core-webpack': '7.0.0-alpha.2',
+  '@storybook/csf-tools': '7.0.0-alpha.2',
+  '@storybook/docs-tools': '7.0.0-alpha.2',
+  '@storybook/ember': '7.0.0-alpha.2',
+  '@storybook/html': '7.0.0-alpha.2',
+  '@storybook/html-webpack5': '7.0.0-alpha.2',
+  '@storybook/instrumenter': '7.0.0-alpha.2',
+  '@storybook/manager-webpack5': '7.0.0-alpha.2',
+  '@storybook/node-logger': '7.0.0-alpha.2',
+  '@storybook/postinstall': '7.0.0-alpha.2',
+  '@storybook/preact': '7.0.0-alpha.2',
+  '@storybook/preact-webpack5': '7.0.0-alpha.2',
+  '@storybook/preset-html-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-preact-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-react-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-server-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-svelte-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-vue-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-vue3-webpack': '7.0.0-alpha.2',
+  '@storybook/preset-web-components-webpack': '7.0.0-alpha.2',
+  '@storybook/preview-web': '7.0.0-alpha.2',
+  '@storybook/react': '7.0.0-alpha.2',
+  '@storybook/react-webpack5': '7.0.0-alpha.2',
+  '@storybook/router': '7.0.0-alpha.2',
+  '@storybook/server': '7.0.0-alpha.2',
+  '@storybook/server-webpack5': '7.0.0-alpha.2',
+  '@storybook/source-loader': '7.0.0-alpha.2',
+  '@storybook/store': '7.0.0-alpha.2',
+  '@storybook/svelte': '7.0.0-alpha.2',
+  '@storybook/svelte-webpack5': '7.0.0-alpha.2',
+  '@storybook/telemetry': '7.0.0-alpha.2',
+  '@storybook/theming': '7.0.0-alpha.2',
+  '@storybook/ui': '7.0.0-alpha.2',
+  '@storybook/vue': '7.0.0-alpha.2',
+  '@storybook/vue-webpack5': '7.0.0-alpha.2',
+  '@storybook/vue3': '7.0.0-alpha.2',
+  '@storybook/vue3-webpack5': '7.0.0-alpha.2',
+  '@storybook/web-components': '7.0.0-alpha.2',
+  '@storybook/web-components-webpack5': '7.0.0-alpha.2',
+  sb: '7.0.0-alpha.2',
+  storybook: '7.0.0-alpha.2'
 };
 exports.default = _default;

package/dist/types/generators/ANGULAR/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/AURELIA/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/EMBER/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/HTML/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/MARIONETTE/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/MARKO/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/MITHRIL/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/PREACT/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/RAX/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/REACT/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/REACT_SCRIPTS/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/RIOT/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/SERVER/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/SFC_VUE/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/SVELTE/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/VUE/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/VUE3/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/WEB-COMPONENTS/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/WEBPACK_REACT/index.d.ts

@@ -1,3 +1,3 @@
-import { Generator } from '../baseGenerator';
+import { Generator } from '../types';
 declare const generator: Generator;
 export default generator;

package/dist/types/generators/baseGenerator.d.ts

@@ -1,22 +1,5 @@
 import { NpmOptions } from '../NpmOptions';
-import { SupportedLanguage, SupportedRenderers, Builder } from '../project_types';
+import { SupportedRenderers } from '../project_types';
 import { JsPackageManager } from '../js-package-manager';
-export declare type GeneratorOptions = {
-    language: SupportedLanguage;
-    builder: Builder;
-    linkable: boolean;
-};
-export interface FrameworkOptions {
-    extraPackages?: string[];
-    extraAddons?: string[];
-    staticDir?: string;
-    addScripts?: boolean;
-    addComponents?: boolean;
-    addBabel?: boolean;
-    addESLint?: boolean;
-    extraMain?: any;
-    extensions?: string[];
-    commonJs?: boolean;
-}
-export declare type Generator = (packageManager: JsPackageManager, npmOptions: NpmOptions, options: GeneratorOptions) => Promise<void>;
-export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder }: GeneratorOptions, renderer: SupportedRenderers, options?: FrameworkOptions): Promise<void>;
+import { FrameworkOptions, GeneratorOptions } from './types';
+export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder, pnp }: GeneratorOptions, renderer: SupportedRenderers, options?: FrameworkOptions): Promise<void>;

package/dist/types/generators/configure.d.ts

@@ -14,5 +14,6 @@ interface ConfigureMainOptions {
      */
     [key: string]: any;
 }
-export declare function configure(framework: SupportedRenderers, mainOptions: ConfigureMainOptions): void;
+export declare function configureMain({ addons, extensions, commonJs, ...custom }: ConfigureMainOptions): Promise<void>;
+export declare function configurePreview(framework: SupportedRenderers, commonJs: boolean): Promise<void>;
 export {};

package/dist/types/generators/types.d.ts

@@ -0,0 +1,36 @@
+import { NpmOptions } from '../NpmOptions';
+import { SupportedLanguage, Builder, ProjectType } from '../project_types';
+import { JsPackageManager } from '../js-package-manager/JsPackageManager';
+export declare type GeneratorOptions = {
+    language: SupportedLanguage;
+    builder: Builder;
+    linkable: boolean;
+    pnp: boolean;
+};
+export interface FrameworkOptions {
+    extraPackages?: string[];
+    extraAddons?: string[];
+    staticDir?: string;
+    addScripts?: boolean;
+    addComponents?: boolean;
+    addBabel?: boolean;
+    addESLint?: boolean;
+    extraMain?: any;
+    extensions?: string[];
+    commonJs?: boolean;
+}
+export declare type Generator = (packageManagerInstance: JsPackageManager, npmOptions: NpmOptions, generatorOptions: GeneratorOptions) => Promise<void>;
+export declare type CommandOptions = {
+    useNpm?: boolean;
+    usePnp?: boolean;
+    type?: ProjectType;
+    force?: any;
+    html?: boolean;
+    skipInstall?: boolean;
+    parser?: string;
+    yes?: boolean;
+    builder?: Builder;
+    linkable?: boolean;
+    commonJs?: boolean;
+    disableTelemetry?: boolean;
+};

package/dist/types/helpers.d.ts

@@ -22,4 +22,4 @@ export declare function codeLog(codeLines: string[], leftPadAmount?: number): vo
 export declare function getBabelDependencies(packageManager: JsPackageManager, packageJson: PackageJsonWithDepsAndDevDeps): Promise<string[]>;
 export declare function addToDevDependenciesIfNotPresent(packageJson: PackageJson, name: string, packageVersion: string): void;
 export declare function copyTemplate(templateRoot: string): void;
-export declare function copyComponents(framework: SupportedRenderers, language: SupportedLanguage): void;
+export declare function copyComponents(framework: SupportedRenderers, language: SupportedLanguage): Promise<void>;

package/dist/types/initiate.d.ts

@@ -1,17 +1,3 @@
 import { Package } from 'update-notifier';
-import { ProjectType, Builder } from './project_types';
-declare type CommandOptions = {
-    useNpm?: boolean;
-    type?: ProjectType;
-    force?: any;
-    html?: boolean;
-    skipInstall?: boolean;
-    parser?: string;
-    yes?: boolean;
-    builder?: Builder;
-    linkable?: boolean;
-    commonJs?: boolean;
-    disableTelemetry?: boolean;
-};
+import { CommandOptions } from './generators/types';
 export declare function initiate(options: CommandOptions, pkg: Package): Promise<void>;
-export {};

package/dist/types/repro-generators/configs.d.ts

@@ -12,7 +12,7 @@ export interface Parameters {
     autoDetect?: boolean;
     /** Dependencies to add before building Storybook */
     additionalDeps?: string[];
-    /** Files to add before building Storybook */
+    /** Files to add before installing Storybook */
     additionalFiles?: {
         path: string;
         contents: string;
@@ -27,10 +27,7 @@ export declare const cra_typescript: Parameters;
 export declare const react: Parameters;
 export declare const react_legacy_root_api: Parameters;
 export declare const react_typescript: Parameters;
-export declare const vite_react: Parameters;
 export declare const react_in_yarn_workspace: Parameters;
-export declare const angular10: Parameters;
-export declare const angular11: Parameters;
 export declare const angular12: Parameters;
 export declare const angular130: Parameters;
 export declare const angular13: Parameters;

package/dist/types/repro-generators/scripts.d.ts

@@ -14,7 +14,7 @@ export interface Parameters {
     ensureDir?: boolean;
     /** Dependencies to add before building Storybook */
     additionalDeps?: string[];
-    /** Files to add before building Storybook */
+    /** Files to add before installing Storybook */
     additionalFiles?: {
         path: string;
         contents: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.2",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -47,13 +47,13 @@
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@storybook/codemod": "7.0.0-alpha.1",
-    "@storybook/core-common": "7.0.0-alpha.1",
-    "@storybook/core-server": "7.0.0-alpha.1",
-    "@storybook/csf-tools": "7.0.0-alpha.1",
-    "@storybook/node-logger": "7.0.0-alpha.1",
+    "@storybook/codemod": "7.0.0-alpha.2",
+    "@storybook/core-common": "7.0.0-alpha.2",
+    "@storybook/core-server": "7.0.0-alpha.2",
+    "@storybook/csf-tools": "7.0.0-alpha.2",
+    "@storybook/node-logger": "7.0.0-alpha.2",
     "@storybook/semver": "^7.3.2",
-    "@storybook/telemetry": "7.0.0-alpha.1",
+    "@storybook/telemetry": "7.0.0-alpha.2",
     "boxen": "^5.1.2",
     "chalk": "^4.1.0",
     "commander": "^6.2.1",
@@ -78,7 +78,7 @@
     "update-notifier": "^5.0.1"
   },
   "devDependencies": {
-    "@storybook/client-api": "7.0.0-alpha.1",
+    "@storybook/client-api": "7.0.0-alpha.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/prompts": "^2.0.9",
     "@types/puppeteer-core": "^2.1.0",
@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea"
+  "gitHead": "44920e2b6bd51981bac5124743c29fb9f5517e44"
 }