@storybook/cli 11.0.0-alpha.0 → 11.0.0-alpha.2

package/dist/_node-chunks/{chunk-L7H6KZKS.js → chunk-W57OB62U.js}

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_26m8jb11507 from 'node:url';
-import CJS_COMPAT_NODE_PATH_26m8jb11507 from 'node:path';
-import CJS_COMPAT_NODE_MODULE_26m8jb11507 from "node:module";
+import CJS_COMPAT_NODE_URL_gumrwr0b82r from 'node:url';
+import CJS_COMPAT_NODE_PATH_gumrwr0b82r from 'node:path';
+import CJS_COMPAT_NODE_MODULE_gumrwr0b82r from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_26m8jb11507.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_26m8jb11507.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_26m8jb11507.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_gumrwr0b82r.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_gumrwr0b82r.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_gumrwr0b82r.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
@@ -12,14 +12,14 @@ var require = CJS_COMPAT_NODE_MODULE_26m8jb11507.createRequire(import.meta.url);
 import {
   globby,
   globbySync
-} from "./chunk-Z6UVGYIX.js";
+} from "./chunk-4FMYWB7X.js";
 import {
   require_semver
-} from "./chunk-ZFSSZ5II.js";
+} from "./chunk-HQDYW2YJ.js";
 import {
   __commonJS,
   __toESM
-} from "./chunk-ERKEB6JM.js";
+} from "./chunk-J3WRLX7B.js";
 
 // ../../../node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
@@ -91,13 +91,20 @@ import { getVitePlusVersions } from "storybook/internal/common";
 import { CLI_COLORS } from "storybook/internal/node-logger";
 
 // src/util.ts
-import { HandledError, JsPackageManager } from "storybook/internal/common";
-import { getProjectRoot, isSatelliteAddon, versions } from "storybook/internal/common";
+import {
+  HandledError,
+  JsPackageManager,
+  getPkgPrNewPackageSpecifier,
+  getProjectRoot,
+  isPkgPrNewVersionSpecifier,
+  isSatelliteAddon,
+  versions
+} from "storybook/internal/common";
 import {
   experimental_loadStorybook,
   getStoriesPathsFromConfig
 } from "storybook/internal/core-server";
-import { logTracker, logger as logger2, prompt } from "storybook/internal/node-logger";
+import { logTracker, logger, prompt } from "storybook/internal/node-logger";
 import {
   UpgradeStorybookToLowerVersionError,
   UpgradeStorybookUnknownCurrentVersionError
@@ -121,16 +128,18 @@ function up(base, options) {
 }
 
 // src/util.ts
-var import_picocolors2 = __toESM(require_picocolors(), 1), import_semver = __toESM(require_semver(), 1);
+var import_picocolors = __toESM(require_picocolors(), 1), import_semver = __toESM(require_semver(), 1);
 
 // src/autoblock/index.ts
 var blockers = () => [
   // add/remove blockers here
-  import("./block-dependencies-versions-325L2TXU.js"),
-  import("./block-node-version-HFQ6OZ6T.js"),
-  import("./block-webpack5-frameworks-22N7B7LN.js"),
-  import("./block-major-version-YOQYZU5B.js"),
-  import("./block-experimental-addon-test-XNH74PCO.js")
+  import("./block-dependencies-versions-OE33DFGG.js"),
+  import("./block-create-react-app-S75U52PV.js"),
+  import("./block-node-version-UYPE22YT.js"),
+  import("./block-webpack5-frameworks-YMQMDT4K.js"),
+  import("./block-major-version-RDFODY7R.js"),
+  import("./block-experimental-addon-test-WOXAZ3RX.js"),
+  import("./block-react-legacy-root-api-PGXZ7QMZ.js")
 ], autoblock = async (options, list = blockers()) => list.length === 0 ? null : await Promise.all(
   list.map(async (i) => {
     let blocker = (await i).blocker;
@@ -139,15 +148,8 @@ var blockers = () => [
 );
 
 // src/automigrate/helpers/mainConfigFile.ts
-var import_picocolors = __toESM(require_picocolors(), 1);
-import {
-  builderPackages,
-  extractFrameworkPackageName,
-  frameworkPackages
-} from "storybook/internal/common";
+import { extractFrameworkPackageName, frameworkPackages } from "storybook/internal/common";
 import { frameworkToRenderer } from "storybook/internal/common";
-import { readConfig, writeConfig as writeConfigFile } from "storybook/internal/csf-tools";
-import { logger } from "storybook/internal/node-logger";
 import { getStorybookData } from "storybook/internal/cli";
 var getFrameworkPackageName = (mainConfig) => {
   let packageNameOrPath = typeof mainConfig?.framework == "string" ? mainConfig.framework : mainConfig?.framework?.name;
@@ -159,45 +161,6 @@ var getFrameworkPackageName = (mainConfig) => {
   let frameworkName = frameworkPackages[frameworkPackageName];
   return frameworkToRenderer[frameworkName];
 };
-var updateMainConfig = async ({ mainConfigPath, dryRun }, callback) => {
-  try {
-    let main = await readConfig(mainConfigPath);
-    await callback(main), dryRun || await writeConfigFile(main);
-  } catch (e) {
-    logger.log(
-      `\u274C The migration failed to update your ${import_picocolors.default.blue(
-        mainConfigPath
-      )} on your behalf because of the following error:
-        ${e}
-`
-    ), logger.log(
-      `\u26A0\uFE0F Storybook automigrations are based on AST parsing and it's possible that your ${import_picocolors.default.blue(
-        mainConfigPath
-      )} file contains a non-standard format (e.g. your export is not an object) or that there was an error when parsing dynamic values (e.g. "require" calls, or usage of environment variables). When your main config is non-standard, automigrations are unfortunately not possible. Please follow the instructions given previously and follow the documentation to make the updates manually.`
-    );
-  }
-};
-function containsESMUsage(content) {
-  let hasImportStatement = /^\s*import\s+/m.test(content) || /^\s*import\s*{/m.test(content) || /^\s*import\s*\(/m.test(content), hasExportStatement = /^\s*export\s+/m.test(content) || /^\s*export\s*{/m.test(content) || /^\s*export\s*default/m.test(content), hasImportMeta = /import\.meta/.test(content);
-  return hasImportStatement || hasExportStatement || hasImportMeta;
-}
-function containsRequireUsage(content) {
-  let requireCallRegex = /\brequire\(/, requireDotRegex = /\brequire\./;
-  return requireCallRegex.test(content) || requireDotRegex.test(content);
-}
-function containsPatternUsage(content, pattern) {
-  let cleanContent = ((s) => s.replace(/(['"`])(?:\\.|(?!\1)[\s\S])*?\1/g, '""'))(content).replace(/\/\*[\s\S]*?\*\//g, "").split(`
-`).map((line) => line.split("//")[0]).join(`
-`);
-  return pattern.test(cleanContent);
-}
-function containsDirnameUsage(content) {
-  return containsPatternUsage(content, /\b__dirname\b/);
-}
-function containsFilenameUsage(content) {
-  return containsPatternUsage(content, /\b__filename\b/);
-}
-var bannerComment = "// This file has been automatically migrated to valid ESM format by Storybook.", hasRequireBanner = (content) => content.includes(bannerComment);
 
 // src/util.ts
 var STORYBOOK_DIR_PATTERN = ["**/.storybook", "**/.rnstorybook"], isSuccessResult = (result) => !("error" in result), isErrorResult = (result) => "error" in result, getVersionModifier = (versionSpecifier) => {
@@ -211,7 +174,7 @@ var STORYBOOK_DIR_PATTERN = ["**/.storybook", "**/.rnstorybook"], isSuccessResul
     modifier,
     useFixed: !modifier
   };
-}, isCanaryVersion = (version) => version.startsWith("0.0.0") || version.startsWith("portal:") || version.startsWith("workspace:");
+}, isCanaryVersion = (version) => version.startsWith("0.0.0") || version.startsWith("portal:") || version.startsWith("workspace:") || isPkgPrNewVersionSpecifier(version);
 function validateVersion(version) {
   if (!version)
     throw new UpgradeStorybookUnknownCurrentVersionError();
@@ -224,20 +187,23 @@ var validateUpgradeCompatibility = (currentVersion, beforeVersion, isCanary) =>
     });
 }, findStorybookProjects = async (cwd = process.cwd()) => {
   try {
-    logger2.debug("Finding Storybook projects...");
+    logger.debug("Finding Storybook projects...");
     let storybookDirs = await globby(STORYBOOK_DIR_PATTERN, {
       cwd,
       dot: !0,
       gitignore: !0,
+      // Packages like @nx/storybook ship .storybook templates, and globby misses .gitignore patterns
+      // like `**/**/node_modules/`, so never rely on .gitignore to skip them.
+      ignore: ["**/node_modules/**"],
       absolute: !0,
       onlyDirectories: !0,
       followSymbolicLinks: !1
     });
-    return logger2.debug(`Found ${storybookDirs.length} Storybook projects`), storybookDirs.length === 0 ? [await prompt.text({
+    return logger.debug(`Found ${storybookDirs.length} Storybook projects`), storybookDirs.length === 0 ? [await prompt.text({
       message: "No Storybook projects were found. Please enter the path to the .storybook directory for the project you want to upgrade."
     })] : storybookDirs;
   } catch (error) {
-    throw logger2.error("Failed to find Storybook projects"), error;
+    throw logger.error("Failed to find Storybook projects"), error;
   }
 };
 var processProject = async ({
@@ -249,7 +215,7 @@ var processProject = async ({
   try {
     onScanStart();
     let name = configDir.replace(getProjectRoot(), "");
-    logger2.debug("Getting Storybook data...");
+    logger.debug("Getting Storybook data...");
     let {
       configDir: resolvedConfigDir,
       mainConfig,
@@ -257,21 +223,21 @@ var processProject = async ({
       packageManager,
       previewConfigPath,
       storiesPaths,
-      versionInstalled,
-      hasCsfFactoryPreview
+      versionSpecifier,
+      versionInstalled
     } = await getStorybookData({ configDir });
-    logger2.debug(`${name} - Validating before version... ${versionInstalled}`), validateVersion(versionInstalled);
-    let isCanary = isCanaryVersion(currentCLIVersion) || isCanaryVersion(versionInstalled);
-    logger2.debug(`${name} - Validating upgrade compatibility...`), validateUpgradeCompatibility(currentCLIVersion, versionInstalled, isCanary), logger2.debug(`${name} - Fetching NPM version information...`);
+    logger.debug(`${name} - Validating before version... ${versionInstalled}`), validateVersion(versionInstalled);
+    let isCanary = isCanaryVersion(currentCLIVersion) || isCanaryVersion(versionInstalled) || isPkgPrNewVersionSpecifier(versionSpecifier);
+    logger.debug(`${name} - Validating upgrade compatibility...`), validateUpgradeCompatibility(currentCLIVersion, versionInstalled, isCanary), logger.debug(`${name} - Fetching NPM version information...`);
     let [latestCLIVersionOnNPM, latestPrereleaseCLIVersionOnNPM] = await Promise.all([
       packageManager.latestVersion("storybook"),
       packageManager.latestVersion("storybook@next")
     ]);
-    latestCLIVersionOnNPM == null && logger2.debug(
+    latestCLIVersionOnNPM == null && logger.debug(
       `${name} - Could not determine the latest Storybook version from the registry; skipping the outdated-version check.`
     );
     let isCLIOutdated = latestCLIVersionOnNPM != null && (0, import_semver.lt)(currentCLIVersion, latestCLIVersionOnNPM), isCLIExactLatest = currentCLIVersion === latestCLIVersionOnNPM, isCLIPrerelease = (0, import_semver.prerelease)(currentCLIVersion) !== null, isCLIExactPrerelease = currentCLIVersion === latestPrereleaseCLIVersionOnNPM, isUpgrade = (0, import_semver.lt)(versionInstalled, currentCLIVersion), autoblockerCheckResults = null;
-    return typeof mainConfig != "boolean" && typeof mainConfigPath < "u" && !options.force && (logger2.debug(`${name} - Evaluating blockers...`), autoblockerCheckResults = await autoblock({
+    return typeof mainConfig != "boolean" && typeof mainConfigPath < "u" && !options.force && (logger.debug(`${name} - Evaluating blockers...`), autoblockerCheckResults = await autoblock({
       packageManager,
       configDir: resolvedConfigDir,
       mainConfig,
@@ -290,19 +256,19 @@ var processProject = async ({
       currentCLIVersion,
       latestCLIVersionOnNPM,
       isCLIExactPrerelease,
+      storybookVersionSpecifier: versionSpecifier,
       autoblockerCheckResults,
       previewConfigPath,
-      storiesPaths,
-      hasCsfFactoryPreview
+      storiesPaths
     };
   } catch (error) {
-    return logger2.debug(String(error)), {
+    return logger.debug(String(error)), {
       configDir,
       error
     };
   }
 }, collectProjects = async (options, configDirs, onProjectScanStart) => {
-  let { default: pLimit } = await import("./p-limit-NCZCMJYE.js"), currentCLIVersion = versions.storybook, limit = pLimit(5), projectPromises = configDirs.map(
+  let { default: pLimit } = await import("./p-limit-LXSOEKNZ.js"), currentCLIVersion = versions.storybook, limit = pLimit(5), projectPromises = configDirs.map(
     (configDir) => limit(
       () => processProject({
         configDir,
@@ -324,7 +290,12 @@ var processProject = async ({
   } = config, storybookCoreUpgrades = Object.keys(dependencies).filter(
     (dependency) => dependency in versions
   ).map((dependency) => {
-    let versionSpec = dependencies[dependency];
+    let versionSpec = dependencies[dependency], pkgPrNewSpecifier = getPkgPrNewPackageSpecifier(
+      dependency,
+      config.storybookVersionSpecifier
+    );
+    if (pkgPrNewSpecifier)
+      return `${dependency}@${pkgPrNewSpecifier}`;
     if (!versionSpec)
       return `${dependency}@${versions[dependency]}`;
     let { modifier } = getVersionModifier(versionSpec);
@@ -347,7 +318,7 @@ var processProject = async ({
         });
         storybookSatelliteUpgrades = (await Promise.all(upgradePromises)).filter((result) => result !== null);
       } catch {
-        logger2.warn("Failed to fetch satellite dependencies");
+        logger.warn("Failed to fetch satellite dependencies");
       }
   }
   return [...storybookCoreUpgrades, ...storybookSatelliteUpgrades];
@@ -359,7 +330,7 @@ var processProject = async ({
       generateUpgradeSpecs(packageJson.devDependencies, config),
       generateUpgradeSpecs(packageJson.peerDependencies, config)
     ]);
-    logger2.debug(JSON.stringify({ upgradedDependencies }, null, 2)), logger2.debug(JSON.stringify({ upgradedDevDependencies }, null, 2)), logger2.debug(JSON.stringify({ upgradedPeerDependencies }, null, 2)), await packageManager.addDependencies(
+    logger.debug(JSON.stringify({ upgradedDependencies }, null, 2)), logger.debug(JSON.stringify({ upgradedDevDependencies }, null, 2)), logger.debug(JSON.stringify({ upgradedPeerDependencies }, null, 2)), await packageManager.addDependencies(
       {
         type: "dependencies",
         skipInstall: !0,
@@ -382,7 +353,7 @@ var processProject = async ({
       upgradedPeerDependencies
     );
   }
-}, formatProjectDirectories = (projectData, modifier) => projectData.length === 0 ? "" : projectData.map((project) => project.configDir).map((dir) => `${modifier} ${import_picocolors2.default.cyan(shortenPath(dir))}`).join(`
+}, formatProjectDirectories = (projectData, modifier) => projectData.length === 0 ? "" : projectData.map((project) => project.configDir).map((dir) => `${modifier} ${import_picocolors.default.cyan(shortenPath(dir))}`).join(`
 `), shortenPath = (path) => {
   let gitRoot = getProjectRoot();
   return path.replace(gitRoot, "");
@@ -392,12 +363,12 @@ var processProject = async ({
     let projectsFoundMessage = [
       "Multiple Storybook projects found. Storybook can only upgrade all projects at once:"
     ];
-    if (validProjects.length > 0 && projectsFoundMessage.push(formatProjectDirectories(validProjects, logger2.SYMBOLS.success)), errorProjects.length > 0 && (logTracker.enableLogWriting(), projectsFoundMessage.push(
+    if (validProjects.length > 0 && projectsFoundMessage.push(formatProjectDirectories(validProjects, logger.SYMBOLS.success)), errorProjects.length > 0 && (logTracker.enableLogWriting(), projectsFoundMessage.push(
       `There were some errors while collecting data for the following projects:
-${formatProjectDirectories(errorProjects, logger2.SYMBOLS.error)}`,
+${formatProjectDirectories(errorProjects, logger.SYMBOLS.error)}`,
       "",
       "Full logs will be available in the Storybook debug logs at the end of the run."
-    )), logger2.log(projectsFoundMessage.join(`
+    )), logger.log(projectsFoundMessage.join(`
 `)), !(yes || await prompt.confirm({
       message: "Continue with the upgrade?",
       initialValue: !0
@@ -428,7 +399,7 @@ ${formatProjectDirectories(errorProjects, logger2.SYMBOLS.error)}`,
     );
     task.stop(`${projects.length} ${projects.length > 1 ? "projects" : "project"} detected`);
     let validProjects = projects.filter(isSuccessResult), errorProjects = projects.filter(isErrorResult);
-    if (logger2.debug(
+    if (logger.debug(
       `Found ${validProjects.length} valid projects and ${errorProjects.length} error projects`
     ), validProjects.length === 1)
       return { allProjects: validProjects, selectedProjects: validProjects };
@@ -450,18 +421,12 @@ Please fix the errors and run the upgrade command again.`
     );
     return selectedProjects ? { allProjects: validProjects, selectedProjects } : void 0;
   } catch (error) {
-    throw error instanceof HandledError || logger2.error("Failed to get projects"), error;
+    throw error instanceof HandledError || logger.error("Failed to get projects"), error;
   }
 }, findFilesUp = (matchers, cwd) => {
   let matchingFiles = [];
   for (let directory of up(cwd, { last: getProjectRoot() }))
-    matchingFiles.push(
-      ...globbySync(matchers, {
-        gitignore: !0,
-        absolute: !0,
-        cwd: directory
-      })
-    );
+    matchingFiles.push(...globbySync(matchers, { absolute: !0, cwd: directory }));
   return matchingFiles;
 };
 
@@ -538,13 +503,6 @@ export {
   require_picocolors,
   getFrameworkPackageName,
   getRendererName,
-  updateMainConfig,
-  containsESMUsage,
-  containsRequireUsage,
-  containsDirnameUsage,
-  containsFilenameUsage,
-  bannerComment,
-  hasRequireBanner,
   getStorybookData,
   up,
   findOutdatedPackage,

package/dist/_node-chunks/{globby-3N2PP55V.js → globby-WMCQAVLC.js}

@@ -1,10 +1,10 @@
-import CJS_COMPAT_NODE_URL_26m8jb11507 from 'node:url';
-import CJS_COMPAT_NODE_PATH_26m8jb11507 from 'node:path';
-import CJS_COMPAT_NODE_MODULE_26m8jb11507 from "node:module";
+import CJS_COMPAT_NODE_URL_gumrwr0b82r from 'node:url';
+import CJS_COMPAT_NODE_PATH_gumrwr0b82r from 'node:path';
+import CJS_COMPAT_NODE_MODULE_gumrwr0b82r from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_26m8jb11507.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_26m8jb11507.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_26m8jb11507.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_gumrwr0b82r.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_gumrwr0b82r.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_gumrwr0b82r.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
@@ -21,8 +21,8 @@ import {
   isGitIgnoredSync,
   isIgnoredByIgnoreFiles,
   isIgnoredByIgnoreFilesSync
-} from "./chunk-Z6UVGYIX.js";
-import "./chunk-ERKEB6JM.js";
+} from "./chunk-4FMYWB7X.js";
+import "./chunk-J3WRLX7B.js";
 export {
   convertPathToPattern,
   generateGlobTasks,

package/dist/_node-chunks/{p-limit-NCZCMJYE.js → p-limit-LXSOEKNZ.js}

@@ -1,15 +1,15 @@
-import CJS_COMPAT_NODE_URL_26m8jb11507 from 'node:url';
-import CJS_COMPAT_NODE_PATH_26m8jb11507 from 'node:path';
-import CJS_COMPAT_NODE_MODULE_26m8jb11507 from "node:module";
+import CJS_COMPAT_NODE_URL_gumrwr0b82r from 'node:url';
+import CJS_COMPAT_NODE_PATH_gumrwr0b82r from 'node:path';
+import CJS_COMPAT_NODE_MODULE_gumrwr0b82r from "node:module";
 
-var __filename = CJS_COMPAT_NODE_URL_26m8jb11507.fileURLToPath(import.meta.url);
-var __dirname = CJS_COMPAT_NODE_PATH_26m8jb11507.dirname(__filename);
-var require = CJS_COMPAT_NODE_MODULE_26m8jb11507.createRequire(import.meta.url);
+var __filename = CJS_COMPAT_NODE_URL_gumrwr0b82r.fileURLToPath(import.meta.url);
+var __dirname = CJS_COMPAT_NODE_PATH_gumrwr0b82r.dirname(__filename);
+var require = CJS_COMPAT_NODE_MODULE_gumrwr0b82r.createRequire(import.meta.url);
 
 // ------------------------------------------------------------
 // end of CJS compatibility banner, injected by Storybook's esbuild configuration
 // ------------------------------------------------------------
-import "./chunk-ERKEB6JM.js";
+import "./chunk-J3WRLX7B.js";
 
 // ../../../node_modules/yocto-queue/index.js
 var Node = class {