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

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

@@ -13,8 +13,6 @@ var _csfTools = require("@storybook/csf-tools");
 
 var _coreCommon = require("@storybook/core-common");
 
-var _jsPackageManager = require("../../js-package-manager");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const logger = console;
@@ -93,7 +91,7 @@ const builderVite = {
     if (!dryRun) {
       delete dependencies['storybook-builder-vite'];
       delete devDependencies['storybook-builder-vite'];
-      (0, _jsPackageManager.writePackageJson)(packageJson);
+      packageManager.writePackageJson(packageJson);
     }
 
     logger.info(`Adding '@storybook/builder-vite' as dev dependency`);

package/dist/cjs/detect.js

@@ -19,8 +19,6 @@ var _project_types = require("./project_types");
 
 var _helpers = require("./helpers");
 
-var _jsPackageManager = require("./js-package-manager");
-
 var _detectNextjs = require("./detect-nextjs");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -145,15 +143,8 @@ function isStorybookInstalled(dependencies, force) {
   return false;
 }
 
-function detectLanguage() {
+function detectLanguage(packageJson) {
   let language = _project_types.SupportedLanguage.JAVASCRIPT;
-  let packageJson;
-
-  try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
-  } catch (err) {//
-  }
-
   const bowerJson = (0, _helpers.getBowerJson)();
 
   if (!packageJson && !bowerJson) {
@@ -167,14 +158,7 @@ function detectLanguage() {
   return language;
 }
 
-function detect(options = {}) {
-  let packageJson;
-
-  try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
-  } catch (err) {//
-  }
-
+function detect(packageJson, options = {}) {
   const bowerJson = (0, _helpers.getBowerJson)();
 
   if (!packageJson && !bowerJson) {

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

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _baseGenerator = require("../baseGenerator");
 
-var _jsPackageManager = require("../../js-package-manager");
-
 const generator = async (packageManager, npmOptions, options) => {
   const [latestRaxVersion] = await packageManager.getVersions('rax');
   const packageJson = packageManager.retrievePackageJson();
@@ -20,7 +18,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;
-  (0, _jsPackageManager.writePackageJson)(packageJson);
+  packageManager.writePackageJson(packageJson);
   await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'rax', {
     extraPackages: ['rax']
   });

package/dist/cjs/initiate.js

@@ -72,7 +72,14 @@ const installStorybook = (projectType, packageManager, options) => {
     installAsDevDependencies: true,
     skipInstall: options.skipInstall
   };
-  const language = (0, _detect.detectLanguage)();
+  let packageJson;
+
+  try {
+    packageJson = packageManager.readPackageJson();
+  } catch (err) {//
+  }
+
+  const language = (0, _detect.detectLanguage)(packageJson);
   const generatorOptions = {
     language,
     builder: options.builder || (0, _detect.detectBuilder)(packageManager),
@@ -249,7 +256,7 @@ async function initiate(options, pkg) {
         process.exit(1);
       }
     } else {
-      projectType = (0, _detect.detect)(options);
+      projectType = (0, _detect.detect)(packageJson, options);
     }
   } catch (ex) {
     done(ex.message);

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

@@ -12,9 +12,11 @@ var _semver = require("@storybook/semver");
 
 var _crossSpawn = require("cross-spawn");
 
-var _helpers = require("../helpers");
+var _path = _interopRequireDefault(require("path"));
+
+var _fs = _interopRequireDefault(require("fs"));
 
-var _PackageJsonHelper = require("./PackageJsonHelper");
+var _helpers = require("../helpers");
 
 var _versions = _interopRequireDefault(require("../versions"));
 
@@ -42,13 +44,16 @@ function getPackageDetails(pkg) {
 }
 
 class JsPackageManager {
-  constructor() {
+  constructor(options) {
     this.type = void 0;
+    this.cwd = void 0;
+    this.cwd = options === null || options === void 0 ? void 0 : options.cwd;
   }
-
   /**
    * Install dependencies listed in `package.json`
    */
+
+
   installDependencies() {
     let done = (0, _helpers.commandLog)('Preparing to install dependencies');
     done();
@@ -65,6 +70,28 @@ class JsPackageManager {
 
     done();
   }
+
+  packageJsonPath() {
+    return this.cwd ? _path.default.resolve(this.cwd, 'package.json') : _path.default.resolve('package.json');
+  }
+
+  readPackageJson() {
+    const packageJsonPath = this.packageJsonPath();
+
+    if (!_fs.default.existsSync(packageJsonPath)) {
+      throw new Error(`Could not read package.json file at ${packageJsonPath}`);
+    }
+
+    const jsonContent = _fs.default.readFileSync(packageJsonPath, 'utf8');
+
+    return JSON.parse(jsonContent);
+  }
+
+  writePackageJson(packageJson) {
+    const content = `${JSON.stringify(packageJson, null, 2)}\n`;
+
+    _fs.default.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.
@@ -75,10 +102,10 @@ class JsPackageManager {
     let packageJson;
 
     try {
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = this.readPackageJson();
     } catch (err) {
       this.initPackageJson();
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = this.readPackageJson();
     }
 
     return Object.assign({}, packageJson, {
@@ -123,7 +150,7 @@ class JsPackageManager {
         packageJson.dependencies = Object.assign({}, packageJson.dependencies, dependenciesMap);
       }
 
-      (0, _PackageJsonHelper.writePackageJson)(packageJson);
+      this.writePackageJson(packageJson);
     } else {
       try {
         this.runAddDeps(dependencies, options.installAsDevDependencies);
@@ -165,7 +192,7 @@ class JsPackageManager {
           delete packageJson.dependencies[dep];
         }
       });
-      (0, _PackageJsonHelper.writePackageJson)(packageJson);
+      this.writePackageJson(packageJson);
     } else {
       try {
         this.runRemoveDeps(dependencies);
@@ -272,7 +299,7 @@ class JsPackageManager {
     var _packageJson$eslintCo;
 
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.writePackageJson)(Object.assign({}, packageJson, {
+    this.writePackageJson(Object.assign({}, packageJson, {
       eslintConfig: Object.assign({}, packageJson.eslintConfig, {
         overrides: [...(((_packageJson$eslintCo = packageJson.eslintConfig) === null || _packageJson$eslintCo === void 0 ? void 0 : _packageJson$eslintCo.overrides) || []), {
           files: ['**/*.stories.*'],
@@ -286,13 +313,20 @@ class JsPackageManager {
 
   addScripts(scripts) {
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.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 = (0, _crossSpawn.sync)(command, args, {
+      cwd: this.cwd,
       stdio: stdio ?? 'pipe',
       encoding: 'utf-8'
     });

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

@@ -16,21 +16,31 @@ var _Yarn2Proxy = require("./Yarn2Proxy");
 var _Yarn1Proxy = require("./Yarn1Proxy");
 
 class JsPackageManagerFactory {
-  static getPackageManager(forceNpmUsage = false) {
+  static getPackageManager(forceNpmUsage = false, cwd) {
     if (forceNpmUsage) {
-      return new _NPMProxy.NPMProxy();
+      return new _NPMProxy.NPMProxy({
+        cwd
+      });
     }
 
-    const yarnVersion = getYarnVersion();
-    const hasYarnLockFile = (0, _findUp.sync)('yarn.lock');
-    const hasNPMCommand = hasNPM();
+    const yarnVersion = getYarnVersion(cwd);
+    const hasYarnLockFile = (0, _findUp.sync)('yarn.lock', {
+      cwd
+    });
+    const hasNPMCommand = hasNPM(cwd);
 
     if (yarnVersion && (hasYarnLockFile || !hasNPMCommand)) {
-      return yarnVersion === 1 ? new _Yarn1Proxy.Yarn1Proxy() : new _Yarn2Proxy.Yarn2Proxy();
+      return yarnVersion === 1 ? new _Yarn1Proxy.Yarn1Proxy({
+        cwd
+      }) : new _Yarn2Proxy.Yarn2Proxy({
+        cwd
+      });
     }
 
     if (hasNPMCommand) {
-      return new _NPMProxy.NPMProxy();
+      return new _NPMProxy.NPMProxy({
+        cwd
+      });
     }
 
     throw new Error('Unable to find a usable package manager within NPM, Yarn and Yarn 2');
@@ -40,13 +50,17 @@ class JsPackageManagerFactory {
 
 exports.JsPackageManagerFactory = JsPackageManagerFactory;
 
-function hasNPM() {
-  const npmVersionCommand = (0, _crossSpawn.sync)('npm', ['--version']);
+function hasNPM(cwd) {
+  const npmVersionCommand = (0, _crossSpawn.sync)('npm', ['--version'], {
+    cwd
+  });
   return npmVersionCommand.status === 0;
 }
 
-function getYarnVersion() {
-  const yarnVersionCommand = (0, _crossSpawn.sync)('yarn', ['--version']);
+function getYarnVersion(cwd) {
+  const yarnVersionCommand = (0, _crossSpawn.sync)('yarn', ['--version'], {
+    cwd
+  });
 
   if (yarnVersionCommand.status !== 0) {
     return undefined;

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

@@ -64,6 +64,25 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return this.uninstallArgs;
   }
 
+  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;
+  }
+
+  getResolutions(packageJson, versions) {
+    return {
+      overrides: Object.assign({}, packageJson.overrides, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('npm', this.getInstallArgs(), 'inherit');
   }

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

@@ -25,6 +25,25 @@ class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
     return `yarn ${command}`;
   }
 
+  setRegistryURL(url) {
+    if (url) {
+      this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]);
+    } else {
+      this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']);
+    }
+  }
+
+  getRegistryURL() {
+    const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim();
+    return url === 'undefined' ? undefined : url;
+  }
+
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }

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

@@ -25,6 +25,25 @@ class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
     return `yarn ${command}`;
   }
 
+  setRegistryURL(url) {
+    if (url) {
+      this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]);
+    } else {
+      this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']);
+    }
+  }
+
+  getRegistryURL() {
+    const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim();
+    return url === 'undefined' ? undefined : url;
+  }
+
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }

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

@@ -41,17 +41,4 @@ Object.keys(_PackageJson).forEach(function (key) {
       return _PackageJson[key];
     }
   });
-});
-
-var _PackageJsonHelper = require("./PackageJsonHelper");
-
-Object.keys(_PackageJsonHelper).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PackageJsonHelper[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PackageJsonHelper[key];
-    }
-  });
 });

package/dist/cjs/versions.js

@@ -6,80 +6,80 @@ 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.23',
+  '@storybook/addon-actions': '7.0.0-alpha.23',
+  '@storybook/addon-backgrounds': '7.0.0-alpha.23',
+  '@storybook/addon-controls': '7.0.0-alpha.23',
+  '@storybook/addon-docs': '7.0.0-alpha.23',
+  '@storybook/addon-essentials': '7.0.0-alpha.23',
+  '@storybook/addon-highlight': '7.0.0-alpha.23',
+  '@storybook/addon-interactions': '7.0.0-alpha.23',
+  '@storybook/addon-jest': '7.0.0-alpha.23',
+  '@storybook/addon-links': '7.0.0-alpha.23',
+  '@storybook/addon-measure': '7.0.0-alpha.23',
+  '@storybook/addon-outline': '7.0.0-alpha.23',
+  '@storybook/addon-storyshots': '7.0.0-alpha.23',
+  '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.23',
+  '@storybook/addon-storysource': '7.0.0-alpha.23',
+  '@storybook/addon-toolbars': '7.0.0-alpha.23',
+  '@storybook/addon-viewport': '7.0.0-alpha.23',
+  '@storybook/addons': '7.0.0-alpha.23',
+  '@storybook/angular': '7.0.0-alpha.23',
+  '@storybook/api': '7.0.0-alpha.23',
+  '@storybook/blocks': '7.0.0-alpha.23',
+  '@storybook/builder-manager': '7.0.0-alpha.23',
+  '@storybook/builder-webpack5': '7.0.0-alpha.23',
+  '@storybook/channel-postmessage': '7.0.0-alpha.23',
+  '@storybook/channel-websocket': '7.0.0-alpha.23',
+  '@storybook/channels': '7.0.0-alpha.23',
+  '@storybook/cli': '7.0.0-alpha.23',
+  '@storybook/client-api': '7.0.0-alpha.23',
+  '@storybook/client-logger': '7.0.0-alpha.23',
+  '@storybook/codemod': '7.0.0-alpha.23',
+  '@storybook/components': '7.0.0-alpha.23',
+  '@storybook/core-client': '7.0.0-alpha.23',
+  '@storybook/core-common': '7.0.0-alpha.23',
+  '@storybook/core-events': '7.0.0-alpha.23',
+  '@storybook/core-server': '7.0.0-alpha.23',
+  '@storybook/core-webpack': '7.0.0-alpha.23',
+  '@storybook/csf-tools': '7.0.0-alpha.23',
+  '@storybook/docs-tools': '7.0.0-alpha.23',
+  '@storybook/ember': '7.0.0-alpha.23',
+  '@storybook/html': '7.0.0-alpha.23',
+  '@storybook/html-webpack5': '7.0.0-alpha.23',
+  '@storybook/instrumenter': '7.0.0-alpha.23',
+  '@storybook/node-logger': '7.0.0-alpha.23',
+  '@storybook/postinstall': '7.0.0-alpha.23',
+  '@storybook/preact': '7.0.0-alpha.23',
+  '@storybook/preact-webpack5': '7.0.0-alpha.23',
+  '@storybook/preset-html-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-preact-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-react-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-server-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-svelte-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-vue-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-vue3-webpack': '7.0.0-alpha.23',
+  '@storybook/preset-web-components-webpack': '7.0.0-alpha.23',
+  '@storybook/preview-web': '7.0.0-alpha.23',
+  '@storybook/react': '7.0.0-alpha.23',
+  '@storybook/react-webpack5': '7.0.0-alpha.23',
+  '@storybook/router': '7.0.0-alpha.23',
+  '@storybook/server': '7.0.0-alpha.23',
+  '@storybook/server-webpack5': '7.0.0-alpha.23',
+  '@storybook/source-loader': '7.0.0-alpha.23',
+  '@storybook/store': '7.0.0-alpha.23',
+  '@storybook/svelte': '7.0.0-alpha.23',
+  '@storybook/svelte-webpack5': '7.0.0-alpha.23',
+  '@storybook/telemetry': '7.0.0-alpha.23',
+  '@storybook/theming': '7.0.0-alpha.23',
+  '@storybook/ui': '7.0.0-alpha.23',
+  '@storybook/vue': '7.0.0-alpha.23',
+  '@storybook/vue-webpack5': '7.0.0-alpha.23',
+  '@storybook/vue3': '7.0.0-alpha.23',
+  '@storybook/vue3-webpack5': '7.0.0-alpha.23',
+  '@storybook/web-components': '7.0.0-alpha.23',
+  '@storybook/web-components-webpack5': '7.0.0-alpha.23',
+  sb: '7.0.0-alpha.23',
+  storybook: '7.0.0-alpha.23'
 };
 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/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);