@storybook/cli 7.0.0-alpha.21 → 7.0.0-alpha.25

package/dist/cjs/versions.js

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

package/dist/esm/automigrate/fixes/builder-vite.js

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import { dedent } from 'ts-dedent';
 import { readConfig, writeConfig } from '@storybook/csf-tools';
 import { getStorybookInfo } from '@storybook/core-common';
-import { writePackageJson } from '../../js-package-manager';
 const logger = console;
 
 /**
@@ -78,7 +77,7 @@ export const builderVite = {
     if (!dryRun) {
       delete dependencies['storybook-builder-vite'];
       delete devDependencies['storybook-builder-vite'];
-      writePackageJson(packageJson);
+      packageManager.writePackageJson(packageJson);
     }
 
     logger.info(`Adding '@storybook/builder-vite' as dev dependency`);

package/dist/esm/detect.js

@@ -3,7 +3,6 @@ import fs from 'fs';
 import findUp from 'find-up';
 import { ProjectType, supportedTemplates, SUPPORTED_RENDERERS, SupportedLanguage, unsupportedTemplate, CoreBuilder } from './project_types';
 import { getBowerJson, paddedLog } from './helpers';
-import { readPackageJson } from './js-package-manager';
 import { detectNextJS } from './detect-nextjs';
 const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
 
@@ -118,15 +117,8 @@ export function isStorybookInstalled(dependencies, force) {
 
   return false;
 }
-export function detectLanguage() {
+export function detectLanguage(packageJson) {
   let language = SupportedLanguage.JAVASCRIPT;
-  let packageJson;
-
-  try {
-    packageJson = readPackageJson();
-  } catch (err) {//
-  }
-
   const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {
@@ -139,14 +131,7 @@ export function detectLanguage() {
 
   return language;
 }
-export function detect(options = {}) {
-  let packageJson;
-
-  try {
-    packageJson = readPackageJson();
-  } catch (err) {//
-  }
-
+export function detect(packageJson, options = {}) {
   const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {

package/dist/esm/generators/RAX/index.js

@@ -1,5 +1,4 @@
 import { baseGenerator } from '../baseGenerator';
-import { writePackageJson } from '../../js-package-manager';
 
 const generator = async (packageManager, npmOptions, options) => {
   const [latestRaxVersion] = await packageManager.getVersions('rax');
@@ -12,7 +11,7 @@ const generator = async (packageManager, npmOptions, options) => {
   packageJson.dependencies['rax-link'] = packageJson.dependencies['rax-link'] || raxVersion;
   packageJson.dependencies['rax-text'] = packageJson.dependencies['rax-text'] || raxVersion;
   packageJson.dependencies['rax-view'] = packageJson.dependencies['rax-view'] || raxVersion;
-  writePackageJson(packageJson);
+  packageManager.writePackageJson(packageJson);
   await baseGenerator(packageManager, npmOptions, options, 'rax', {
     extraPackages: ['rax']
   });

package/dist/esm/generators/baseGenerator.js

@@ -52,6 +52,7 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
     return {
       packages: [rendererPackage],
       framework: rendererPackagePath,
+      rendererId: 'angular',
       type: 'framework'
     };
   }
@@ -60,6 +61,7 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
     return {
       packages: [frameworkPackage],
       framework: frameworkPackagePath,
+      rendererId: renderer,
       type: 'framework'
     };
   }
@@ -69,6 +71,7 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
       packages: [rendererPackage, builderPackage],
       builder: builderPackagePath,
       renderer: rendererPackagePath,
+      rendererId: renderer,
       type: 'renderer'
     };
   }
@@ -78,7 +81,7 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
 
 const stripVersions = addons => addons.map(addon => getPackageDetails(addon)[0]);
 
-const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelte', 'vue', 'vue3', 'html'].includes(framework);
+const hasInteractiveStories = rendererId => ['react', 'angular', 'preact', 'svelte', 'vue', 'vue3', 'html'].includes(rendererId);
 
 export async function baseGenerator(packageManager, npmOptions, {
   language,
@@ -96,13 +99,23 @@ export async function baseGenerator(packageManager, npmOptions, {
     addESLint,
     extraMain,
     extensions
-  } = Object.assign({}, defaultOptions, options); // added to main.js
+  } = Object.assign({}, defaultOptions, options);
+  const {
+    packages: frameworkPackages,
+    type,
+    // @ts-ignore
+    renderer: rendererInclude,
+    // deepscan-disable-line UNUSED_DECL
+    rendererId,
+    framework: frameworkInclude,
+    builder: builderInclude
+  } = getFrameworkDetails(renderer, builder, pnp); // added to main.js
 
   const addons = ['@storybook/addon-links', '@storybook/addon-essentials', ...stripVersions(extraAddonPackages)]; // added to package.json
 
   const addonPackages = ['@storybook/addon-links', '@storybook/addon-essentials', ...extraAddonPackages];
 
-  if (hasInteractiveStories(renderer)) {
+  if (hasInteractiveStories(rendererId)) {
     addons.push('@storybook/addon-interactions');
     addonPackages.push('@storybook/addon-interactions', '@storybook/testing-library');
   }
@@ -110,16 +123,7 @@ export async function baseGenerator(packageManager, npmOptions, {
   const yarn2ExtraPackages = packageManager.type === 'yarn2' ? ['@storybook/addon-docs', '@mdx-js/react@1.x.x'] : [];
   const files = await fse.readdir(process.cwd());
   const packageJson = packageManager.retrievePackageJson();
-  const installedDependencies = new Set(Object.keys(Object.assign({}, packageJson.dependencies, packageJson.devDependencies)));
-  const {
-    packages: frameworkPackages,
-    type,
-    // @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
+  const installedDependencies = new Set(Object.keys(Object.assign({}, packageJson.dependencies, packageJson.devDependencies))); // TODO: We need to start supporting this at some point
 
   if (type === 'renderer') {
     throw new Error(dedent`
@@ -152,7 +156,7 @@ export async function baseGenerator(packageManager, npmOptions, {
   } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
 
 
-  if (frameworkPackages.includes('@storybook/builder-vite')) {
+  if (frameworkPackages.find(pkg => pkg.match(/^@storybook\/.*-vite$/))) {
     const previewHead = dedent`
       <script>
         window.global = window;

package/dist/esm/initiate.js

@@ -34,7 +34,14 @@ const installStorybook = (projectType, packageManager, options) => {
     installAsDevDependencies: true,
     skipInstall: options.skipInstall
   };
-  const language = detectLanguage();
+  let packageJson;
+
+  try {
+    packageJson = packageManager.readPackageJson();
+  } catch (err) {//
+  }
+
+  const language = detectLanguage(packageJson);
   const generatorOptions = {
     language,
     builder: options.builder || detectBuilder(packageManager),
@@ -208,7 +215,7 @@ export async function initiate(options, pkg) {
         process.exit(1);
       }
     } else {
-      projectType = detect(options);
+      projectType = detect(packageJson, options);
     }
   } catch (ex) {
     done(ex.message);
@@ -225,7 +232,7 @@ export async function initiate(options, pkg) {
   }
 
   await automigrate({
-    yes: process.env.CI === 'true'
+    yes: options.yes || process.env.CI === 'true'
   });
   logger.log('\nTo run your Storybook, type:\n');
   codeLog([packageManager.getRunStorybookCommand()]);

package/dist/esm/js-package-manager/JsPackageManager.js

@@ -1,8 +1,9 @@
 import chalk from 'chalk';
 import { gt, satisfies } from '@storybook/semver';
 import { sync as spawnSync } from 'cross-spawn';
+import path from 'path';
+import fs from 'fs';
 import { commandLog } from '../helpers';
-import { readPackageJson, writePackageJson } from './PackageJsonHelper';
 import storybookPackagesVersions from '../versions';
 const logger = console;
 /**
@@ -25,13 +26,31 @@ export function getPackageDetails(pkg) {
   return [packageName, packageVersion];
 }
 export class JsPackageManager {
-  constructor() {
-    this.type = void 0;
+  // NOTE: for some reason yarn prefers the npm registry in
+  // local development, so always use npm
+  setRegistryURL(url) {
+    if (url) {
+      this.executeCommand('npm', ['config', 'set', 'registry', url]);
+    } else {
+      this.executeCommand('npm', ['config', 'delete', 'registry']);
+    }
   }
 
+  getRegistryURL() {
+    const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim();
+    return url === 'undefined' ? undefined : url;
+  }
+
+  constructor(options) {
+    this.type = void 0;
+    this.cwd = void 0;
+    this.cwd = options?.cwd;
+  }
   /**
    * Install dependencies listed in `package.json`
    */
+
+
   installDependencies() {
     let done = commandLog('Preparing to install dependencies');
     done();
@@ -48,6 +67,26 @@ export class JsPackageManager {
 
     done();
   }
+
+  packageJsonPath() {
+    return this.cwd ? path.resolve(this.cwd, 'package.json') : path.resolve('package.json');
+  }
+
+  readPackageJson() {
+    const packageJsonPath = this.packageJsonPath();
+
+    if (!fs.existsSync(packageJsonPath)) {
+      throw new Error(`Could not read package.json file at ${packageJsonPath}`);
+    }
+
+    const jsonContent = fs.readFileSync(packageJsonPath, 'utf8');
+    return JSON.parse(jsonContent);
+  }
+
+  writePackageJson(packageJson) {
+    const content = `${JSON.stringify(packageJson, null, 2)}\n`;
+    fs.writeFileSync(this.packageJsonPath(), content, 'utf8');
+  }
   /**
    * Read the `package.json` file available in the directory the command was call from
    * If there is no `package.json` it will create one.
@@ -58,10 +97,10 @@ export class JsPackageManager {
     let packageJson;
 
     try {
-      packageJson = readPackageJson();
+      packageJson = this.readPackageJson();
     } catch (err) {
       this.initPackageJson();
-      packageJson = readPackageJson();
+      packageJson = this.readPackageJson();
     }
 
     return Object.assign({}, packageJson, {
@@ -106,7 +145,7 @@ export class JsPackageManager {
         packageJson.dependencies = Object.assign({}, packageJson.dependencies, dependenciesMap);
       }
 
-      writePackageJson(packageJson);
+      this.writePackageJson(packageJson);
     } else {
       try {
         this.runAddDeps(dependencies, options.installAsDevDependencies);
@@ -148,7 +187,7 @@ export class JsPackageManager {
           delete packageJson.dependencies[dep];
         }
       });
-      writePackageJson(packageJson);
+      this.writePackageJson(packageJson);
     } else {
       try {
         this.runRemoveDeps(dependencies);
@@ -253,7 +292,7 @@ export class JsPackageManager {
 
   addESLintConfig() {
     const packageJson = this.retrievePackageJson();
-    writePackageJson(Object.assign({}, packageJson, {
+    this.writePackageJson(Object.assign({}, packageJson, {
       eslintConfig: Object.assign({}, packageJson.eslintConfig, {
         overrides: [...(packageJson.eslintConfig?.overrides || []), {
           files: ['**/*.stories.*'],
@@ -267,13 +306,20 @@ export class JsPackageManager {
 
   addScripts(scripts) {
     const packageJson = this.retrievePackageJson();
-    writePackageJson(Object.assign({}, packageJson, {
+    this.writePackageJson(Object.assign({}, packageJson, {
       scripts: Object.assign({}, packageJson.scripts, scripts)
     }));
   }
 
+  addPackageResolutions(versions) {
+    const packageJson = this.retrievePackageJson();
+    const resolutions = this.getResolutions(packageJson, versions);
+    this.writePackageJson(Object.assign({}, packageJson, resolutions));
+  }
+
   executeCommand(command, args, stdio) {
     const commandResult = spawnSync(command, args, {
+      cwd: this.cwd,
       stdio: stdio ?? 'pipe',
       encoding: 'utf-8'
     });

package/dist/esm/js-package-manager/JsPackageManagerFactory.js

@@ -4,21 +4,31 @@ import { NPMProxy } from './NPMProxy';
 import { Yarn2Proxy } from './Yarn2Proxy';
 import { Yarn1Proxy } from './Yarn1Proxy';
 export class JsPackageManagerFactory {
-  static getPackageManager(forceNpmUsage = false) {
+  static getPackageManager(forceNpmUsage = false, cwd) {
     if (forceNpmUsage) {
-      return new NPMProxy();
+      return new NPMProxy({
+        cwd
+      });
     }
 
-    const yarnVersion = getYarnVersion();
-    const hasYarnLockFile = findUpSync('yarn.lock');
-    const hasNPMCommand = hasNPM();
+    const yarnVersion = getYarnVersion(cwd);
+    const hasYarnLockFile = findUpSync('yarn.lock', {
+      cwd
+    });
+    const hasNPMCommand = hasNPM(cwd);
 
     if (yarnVersion && (hasYarnLockFile || !hasNPMCommand)) {
-      return yarnVersion === 1 ? new Yarn1Proxy() : new Yarn2Proxy();
+      return yarnVersion === 1 ? new Yarn1Proxy({
+        cwd
+      }) : new Yarn2Proxy({
+        cwd
+      });
     }
 
     if (hasNPMCommand) {
-      return new NPMProxy();
+      return new NPMProxy({
+        cwd
+      });
     }
 
     throw new Error('Unable to find a usable package manager within NPM, Yarn and Yarn 2');
@@ -26,13 +36,17 @@ export class JsPackageManagerFactory {
 
 }
 
-function hasNPM() {
-  const npmVersionCommand = spawnSync('npm', ['--version']);
+function hasNPM(cwd) {
+  const npmVersionCommand = spawnSync('npm', ['--version'], {
+    cwd
+  });
   return npmVersionCommand.status === 0;
 }
 
-function getYarnVersion() {
-  const yarnVersionCommand = spawnSync('yarn', ['--version']);
+function getYarnVersion(cwd) {
+  const yarnVersionCommand = spawnSync('yarn', ['--version'], {
+    cwd
+  });
 
   if (yarnVersionCommand.status !== 0) {
     return undefined;

package/dist/esm/js-package-manager/NPMProxy.js

@@ -53,6 +53,12 @@ export class NPMProxy extends JsPackageManager {
     return this.uninstallArgs;
   }
 
+  getResolutions(packageJson, versions) {
+    return {
+      overrides: Object.assign({}, packageJson.overrides, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('npm', this.getInstallArgs(), 'inherit');
   }

package/dist/esm/js-package-manager/Yarn1Proxy.js

@@ -17,6 +17,12 @@ export class Yarn1Proxy extends JsPackageManager {
     return `yarn ${command}`;
   }
 
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }

package/dist/esm/js-package-manager/Yarn2Proxy.js

@@ -17,6 +17,12 @@ export class Yarn2Proxy extends JsPackageManager {
     return `yarn ${command}`;
   }
 
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }

package/dist/esm/js-package-manager/index.js

@@ -1,4 +1,3 @@
 export * from './JsPackageManagerFactory';
 export * from './JsPackageManager';
-export * from './PackageJson';
-export * from './PackageJsonHelper';
+export * from './PackageJson';

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

@@ -112,7 +112,7 @@ const configureYarn2ForE2E = async ({
   cwd
 }) => {
   const command = [// ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml)
-  `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`, // Some required magic to be able to fetch deps from local registry
+  `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`, // Some required magic to be able to fetch deps from local registry
   `yarn config set unsafeHttpWhitelist --json '["localhost"]'`, // Disable fallback mode to make sure everything is required correctly
   `yarn config set pnpFallbackMode none`, // We need to be able to update lockfile when bootstrapping the examples
   `yarn config set enableImmutableInstalls false`, // Discard all YN0013 - FETCH_NOT_CACHED messages