@storybook/cli 7.0.0-alpha.16 → 7.0.0-alpha.17

package/dist/esm/detect-nextjs.js

@@ -1,12 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detectNextJS = void 0;
 const regex = /[\s"\n]next.*?(\d+).*/;
-
-const detectNextJS = packageManager => {
+export const detectNextJS = packageManager => {
   try {
     let out = '';
 
@@ -28,6 +21,4 @@ const detectNextJS = packageManager => {
   }
 
   return false;
-};
-
-exports.detectNextJS = detectNextJS;
+};

package/dist/esm/detect-webpack.js

@@ -1,11 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detectWebpack = void 0;
-
-const detectWebpack = packageManager => {
+export const detectWebpack = packageManager => {
   try {
     let out = '';
 
@@ -34,6 +27,4 @@ const detectWebpack = packageManager => {
   }
 
   return false;
-};
-
-exports.detectWebpack = detectWebpack;
+};

package/dist/esm/detect.js

@@ -1,36 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detect = detect;
-exports.detectBuilder = detectBuilder;
-exports.detectFrameworkPreset = detectFrameworkPreset;
-exports.detectLanguage = detectLanguage;
-exports.isStorybookInstalled = isStorybookInstalled;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _findUp = _interopRequireDefault(require("find-up"));
-
-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 }; }
-
+import path from 'path';
+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'];
 
 const hasDependency = (packageJson, name, matcher) => {
-  var _packageJson$dependen, _packageJson$devDepen;
-
-  const version = ((_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[name]) || ((_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[name]);
+  const version = packageJson.dependencies?.[name] || packageJson.devDependencies?.[name];
 
   if (version && typeof matcher === 'function') {
     return matcher(version);
@@ -40,9 +18,7 @@ const hasDependency = (packageJson, name, matcher) => {
 };
 
 const hasPeerDependency = (packageJson, name, matcher) => {
-  var _packageJson$peerDepe;
-
-  const version = (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[name];
+  const version = packageJson.peerDependencies?.[name];
 
   if (version && typeof matcher === 'function') {
     return matcher(version);
@@ -91,17 +67,17 @@ const getFrameworkPreset = (packageJson, framework) => {
   }
 
   if (Array.isArray(files) && files.length > 0) {
-    matcher.files = files.map(name => _fs.default.existsSync(_path.default.join(process.cwd(), name)));
+    matcher.files = files.map(name => fs.existsSync(path.join(process.cwd(), name)));
   }
 
   return matcherFunction(matcher) ? preset : null;
 };
 
-function detectFrameworkPreset(packageJson = {}) {
-  const result = [..._project_types.supportedTemplates, _project_types.unsupportedTemplate].find(framework => {
+export function detectFrameworkPreset(packageJson = {}) {
+  const result = [...supportedTemplates, unsupportedTemplate].find(framework => {
     return getFrameworkPreset(packageJson, framework) !== null;
   });
-  return result ? result.preset : _project_types.ProjectType.UNDETECTED;
+  return result ? result.preset : ProjectType.UNDETECTED;
 }
 /**
  * Attempts to detect which builder to use, by searching for a vite config file.  If one is found, the vite builder
@@ -110,75 +86,71 @@ function detectFrameworkPreset(packageJson = {}) {
  * @returns CoreBuilder
  */
 
-
-function detectBuilder(packageManager) {
-  const viteConfig = _findUp.default.sync(viteConfigFiles);
+export function detectBuilder(packageManager) {
+  const viteConfig = findUp.sync(viteConfigFiles);
 
   if (viteConfig) {
-    (0, _helpers.paddedLog)('Detected vite project, setting builder to @storybook/builder-vite');
-    return _project_types.CoreBuilder.Vite;
+    paddedLog('Detected vite project, setting builder to @storybook/builder-vite');
+    return CoreBuilder.Vite;
   }
 
-  const nextJSVersion = (0, _detectNextjs.detectNextJS)(packageManager);
+  const nextJSVersion = detectNextJS(packageManager);
 
   if (nextJSVersion) {
     if (nextJSVersion >= 11) {
-      return _project_types.CoreBuilder.Webpack5;
+      return CoreBuilder.Webpack5;
     }
   } // Fallback to webpack5
 
 
-  return _project_types.CoreBuilder.Webpack5;
+  return CoreBuilder.Webpack5;
 }
-
-function isStorybookInstalled(dependencies, force) {
+export function isStorybookInstalled(dependencies, force) {
   if (!dependencies) {
     return false;
   }
 
   if (!force && dependencies.devDependencies) {
-    if (_project_types.SUPPORTED_RENDERERS.reduce((storybookPresent, framework) => storybookPresent || !!dependencies.devDependencies[`@storybook/${framework}`], false)) {
-      return _project_types.ProjectType.ALREADY_HAS_STORYBOOK;
+    if (SUPPORTED_RENDERERS.reduce((storybookPresent, framework) => storybookPresent || !!dependencies.devDependencies[`@storybook/${framework}`], false)) {
+      return ProjectType.ALREADY_HAS_STORYBOOK;
     }
   }
 
   return false;
 }
-
-function detectLanguage() {
-  let language = _project_types.SupportedLanguage.JAVASCRIPT;
+export function detectLanguage() {
+  let language = SupportedLanguage.JAVASCRIPT;
   let packageJson;
 
   try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
+    packageJson = readPackageJson();
   } catch (err) {//
   }
 
-  const bowerJson = (0, _helpers.getBowerJson)();
+  const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {
     return language;
   }
 
   if (hasDependency(packageJson || bowerJson, 'typescript')) {
-    language = _project_types.SupportedLanguage.TYPESCRIPT;
+    language = SupportedLanguage.TYPESCRIPT;
   }
 
   return language;
 }
-
-function detect(options = {}) {
+export function detect(options = {}) {
   let packageJson;
 
   try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
+    packageJson = readPackageJson();
   } catch (err) {//
   }
 
-  const bowerJson = (0, _helpers.getBowerJson)();
+  const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {
-    return _project_types.ProjectType.UNDETECTED;
+    return ProjectType.UNDETECTED;
   }
 
   const storyBookInstalled = isStorybookInstalled(packageJson, options.force);
@@ -188,7 +160,7 @@ function detect(options = {}) {
   }
 
   if (options.html) {
-    return _project_types.ProjectType.HTML;
+    return ProjectType.HTML;
   }
 
   return detectFrameworkPreset(packageJson || bowerJson);

package/dist/esm/dev.js

@@ -1,68 +1,47 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.dev = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _tsDedent = require("ts-dedent");
-
-var _readPkgUp = require("read-pkg-up");
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _coreServer = require("@storybook/core-server");
-
-var _coreCommon = require("@storybook/core-common");
-
-const dev = async cliOptions => {
+import { dedent } from 'ts-dedent';
+import { sync as readUpSync } from 'read-pkg-up';
+import { logger, instance as npmLog } from '@storybook/node-logger';
+import { buildDevStandalone } from '@storybook/core-server';
+import { cache } from '@storybook/core-common';
+export const dev = async cliOptions => {
   process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
   try {
-    await (0, _coreServer.buildDevStandalone)(Object.assign({}, cliOptions, {
+    await buildDevStandalone(Object.assign({}, cliOptions, {
       configDir: cliOptions.configDir || './.storybook',
       configType: 'DEVELOPMENT',
       ignorePreview: !!cliOptions.previewUrl && !cliOptions.forceBuildPreview,
       docsMode: !!cliOptions.docs,
-      cache: _coreCommon.cache,
-      packageJson: (0, _readPkgUp.sync)({
+      cache,
+      packageJson: readUpSync({
         cwd: __dirname
       }).packageJson
     }));
   } catch (error) {
-    var _error$compilation;
-
     // this is a weird bugfix, somehow 'node-pre-gyp' is polluting the npmLog header
-    _nodeLogger.instance.heading = '';
+    npmLog.heading = '';
 
     if (error instanceof Error) {
       if (error.error) {
-        _nodeLogger.logger.error(error.error);
+        logger.error(error.error);
       } else if (error.stats && error.stats.compilation.errors) {
-        error.stats.compilation.errors.forEach(e => _nodeLogger.logger.plain(e));
+        error.stats.compilation.errors.forEach(e => logger.plain(e));
       } else {
-        _nodeLogger.logger.error(error);
+        logger.error(error);
       }
-    } else if ((_error$compilation = error.compilation) !== null && _error$compilation !== void 0 && _error$compilation.errors) {
-      error.compilation.errors.forEach(e => _nodeLogger.logger.plain(e));
+    } else if (error.compilation?.errors) {
+      error.compilation.errors.forEach(e => logger.plain(e));
     }
 
-    _nodeLogger.logger.line();
-
-    _nodeLogger.logger.warn(error.close ? (0, _tsDedent.dedent)`
+    logger.line();
+    logger.warn(error.close ? dedent`
           FATAL broken build!, will close the process,
           Fix the error below and restart storybook.
-        ` : (0, _tsDedent.dedent)`
+        ` : dedent`
           Broken build, fix the error above.
           You may need to refresh the browser.
         `);
-
-    _nodeLogger.logger.line();
-
+    logger.line();
     process.exit(1);
   }
-};
-
-exports.dev = dev;
+};

package/dist/esm/dirs.js

@@ -0,0 +1,4 @@
+import { dirname } from 'path';
+export function getBaseDir() {
+  return dirname(require.resolve('@storybook/cli/package.json'));
+}

package/dist/esm/extract.js

@@ -1,25 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.extract = extract;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fsExtra = require("fs-extra");
-
-var _puppeteerCore = _interopRequireDefault(require("puppeteer-core"));
-
-var _express = _interopRequireDefault(require("express"));
-
-var _getPort = _interopRequireDefault(require("get-port"));
-
-var _nodeLogger = require("@storybook/node-logger");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+import "core-js/modules/web.immediate.js";
+import path from 'path';
+import { writeFile, stat } from 'fs-extra';
+import puppeteerCore from 'puppeteer-core';
+import express from 'express';
+import getPort from 'get-port';
+import { logger } from '@storybook/node-logger';
 
 const read = async url => {
   const browser = await usePuppeteerBrowser();
@@ -42,21 +27,19 @@ const read = async url => {
 
 const useLocation = async input => {
   // check for input's existence
-  await (0, _fsExtra.stat)(_path.default.resolve(input));
+  await stat(path.resolve(input));
 
   if (input.match(/^http/)) {
     return [input, async () => {}];
   }
 
-  const app = (0, _express.default)();
-  app.use(_express.default.static(input));
-  const port = await (0, _getPort.default)();
+  const app = express();
+  app.use(express.static(input));
+  const port = await getPort();
   return new Promise(resolve => {
     const server = app.listen(port, () => {
       const result = `http://localhost:${port}/iframe.html`;
-
-      _nodeLogger.logger.info(`connecting to: ${result}`);
-
+      logger.info(`connecting to: ${result}`);
       resolve([result, server.close.bind(server)]);
     });
   });
@@ -66,28 +49,27 @@ const usePuppeteerBrowser = async () => {
   const args = ['--no-sandbox ', '--disable-setuid-sandbox'];
 
   try {
-    return await _puppeteerCore.default.launch({
+    return await puppeteerCore.launch({
       args,
       executablePath: process.env.SB_CHROMIUM_PATH
     });
   } catch (e) {
     // it's not installed
-    _nodeLogger.logger.info('installing puppeteer...');
-
+    logger.info('installing puppeteer...');
     return new Promise((resolve, reject) => {
       // eslint-disable-next-line global-require
-      require('child_process').exec(`node ${require.resolve(_path.default.join('puppeteer-core', 'install.js'))}`, error => error ? reject(error) : resolve(_puppeteerCore.default.launch({
+      require('child_process').exec(`node ${require.resolve(path.join('puppeteer-core', 'install.js'))}`, error => error ? reject(error) : resolve(puppeteerCore.launch({
         args
       })));
     });
   }
 };
 
-async function extract(input, targetPath) {
+export async function extract(input, targetPath) {
   if (input && targetPath) {
     const [location, exit] = await useLocation(input);
     const data = await read(location);
-    await (0, _fsExtra.writeFile)(targetPath, JSON.stringify(data, null, 2));
+    await writeFile(targetPath, JSON.stringify(data, null, 2));
     await exit();
   } else {
     throw new Error('Extract: please specify a path where your built-storybook is (can be a public url) and a target directory');