CLI: Pass package manager to postinstall

code/addons/themes/package.json

@@ -43,7 +43,8 @@
       "require": "./dist/preview.js",
       "import": "./dist/preview.mjs"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./postinstall": "./postinstall.js"
   },
   "main": "dist/index.js",
   "module": "dist/index.mjs",

code/addons/themes/postinstall.js

@@ -0,0 +1,18 @@
+const { spawn } = require('child_process');
+
+const PACKAGE_MANAGER_TO_COMMAND = {
+    npm: 'npx',
+    yarn1: 'yarn dlx',
+    yarn2: 'yarn dlx',
+    pnpm: 'pnpm dlx',
+}
+
+module.exports = function (options) {
+  const command = PACKAGE_MANAGER_TO_COMMAND[options.packageManager];
+
+  spawn(command, ['@storybook/auto-config', 'themes'], {
+    stdio: "inherit",
+    cwd: process.cwd(),
+  });
+
+}

code/lib/cli/src/add.ts

@@ -10,15 +10,19 @@ import { getStorybookVersion } from './utils';
 
 const logger = console;
 
-const postinstallAddon = async (addonName: string) => {
+interface PostinstallOptions {
+  packageManager: PackageManagerName;
+}
+
+const postinstallAddon = async (addonName: string, options: PostinstallOptions) => {
   try {
     const modulePath = require.resolve(`${addonName}/postinstall`, { paths: [process.cwd()] });
     // eslint-disable-next-line import/no-dynamic-require, global-require
     const postinstall = require(modulePath);
 
     try {
       logger.log(`Running postinstall script for ${addonName}`);
-      await postinstall();
+      await postinstall(options);
     } catch (e) {
       logger.error(`Error running postinstall script for ${addonName}`);
       logger.error(e);
@@ -33,6 +37,8 @@ const getVersionSpecifier = (addon: string) => {
   return groups ? [groups[1], groups[2]] : [addon, undefined];
 };
 
+const isSemVer = (version: string) => /^\d+\.\d+\.\d+(-.*)?$/.test(version);
+
 /**
  * Install the given addon package and add it to main.js
  *
@@ -73,7 +79,7 @@ export async function add(
   const isStorybookAddon = addonName.startsWith('@storybook/');
   const storybookVersion = await getStorybookVersion(packageManager);
   const version = versionSpecifier || (isStorybookAddon ? storybookVersion : latestVersion);
-  const addonWithVersion = `${addonName}@^${version}`;
+  const addonWithVersion = isSemVer(version) ? `${addonName}@^${version}` : `${addonName}@${version}`;
   logger.log(`Installing ${addonWithVersion}`);
   await packageManager.addDependencies({ installAsDevDependencies: true }, [addonWithVersion]);
 
@@ -83,6 +89,6 @@ export async function add(
   await writeConfig(main);
 
   if (!options.skipPostinstall && isStorybookAddon) {
-    await postinstallAddon(addonName);
+    await postinstallAddon(addonName, { packageManager: pkgMgr });
   }
 }