From ded6324ebdb692bc428864eb6abd7c2b39d6419a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Mon, 10 Feb 2020 21:46:14 +0100 Subject: [PATCH] refactor(cli): replace some default exports with named ones For some reason why see https://blog.neufund.org/why-we-have-banned-default-exports-and-you-should-do-the-same-d51fdc2cf2ad --- lib/cli/src/add.js | 6 +++--- lib/cli/src/detect.js | 2 +- lib/cli/src/generate.js | 2 +- lib/cli/src/generators/MARIONETTE/index.js | 2 +- lib/cli/src/has_yarn.js | 2 +- lib/cli/src/helpers.js | 4 ++-- lib/cli/src/initiate.js | 4 ++-- lib/cli/src/latest_version.js | 2 +- lib/cli/src/npm_init.js | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/cli/src/add.js b/lib/cli/src/add.js index 17713c1bcc0..da1557b0fb8 100644 --- a/lib/cli/src/add.js +++ b/lib/cli/src/add.js @@ -1,8 +1,8 @@ import path from 'path'; import fs from 'fs'; import { sync as spawnSync } from 'cross-spawn'; -import hasYarn from './has_yarn'; -import latestVersion from './latest_version'; +import { hasYarn } from './has_yarn'; +import { latestVersion } from './latest_version'; import { commandLog, getPackageJson } from './helpers'; const logger = console; @@ -128,7 +128,7 @@ const postinstallAddon = async (addonName, isOfficialAddon) => { } }; -export default async function add(addonName, options) { +export async function add(addonName, options) { const useYarn = Boolean(options.useNpm !== true) && hasYarn(); const npmOptions = { useYarn, diff --git a/lib/cli/src/detect.js b/lib/cli/src/detect.js index 90d384a3cc4..41c10bf88db 100644 --- a/lib/cli/src/detect.js +++ b/lib/cli/src/detect.js @@ -151,7 +151,7 @@ export function isStorybookInstalled(dependencies, force) { return false; } -export default function detect(options) { +export function detect(options) { if (options.html) { return types.HTML; } diff --git a/lib/cli/src/generate.js b/lib/cli/src/generate.js index fa7363259d1..0e7ccd6c249 100644 --- a/lib/cli/src/generate.js +++ b/lib/cli/src/generate.js @@ -5,7 +5,7 @@ import didYouMean from 'didyoumean'; import pkg from '../package.json'; import initiate from './initiate'; import { codeLog } from './helpers'; -import add from './add'; +import { add } from './add'; import { migrate } from './migrate'; const logger = console; diff --git a/lib/cli/src/generators/MARIONETTE/index.js b/lib/cli/src/generators/MARIONETTE/index.js index 369fedc8fd7..fb3b8b824ae 100644 --- a/lib/cli/src/generators/MARIONETTE/index.js +++ b/lib/cli/src/generators/MARIONETTE/index.js @@ -1,6 +1,6 @@ import fse from 'fs-extra'; import path from 'path'; -import npmInit from '../../npm_init'; +import { npmInit } from '../../npm_init'; import { getVersion, getPackageJson, diff --git a/lib/cli/src/has_yarn.js b/lib/cli/src/has_yarn.js index ce7bdd251d9..a6708adc042 100644 --- a/lib/cli/src/has_yarn.js +++ b/lib/cli/src/has_yarn.js @@ -2,7 +2,7 @@ import { sync as spawnSync } from 'cross-spawn'; import path from 'path'; import findUp from 'find-up'; -export default function hasYarn() { +export function hasYarn() { const yarnAvailable = spawnSync('yarn', ['--version'], { silent: true }); const npmAvailable = spawnSync('npm', ['--version'], { silent: true }); diff --git a/lib/cli/src/helpers.js b/lib/cli/src/helpers.js index 317fb2a5a4c..a83b1ffd773 100644 --- a/lib/cli/src/helpers.js +++ b/lib/cli/src/helpers.js @@ -6,10 +6,10 @@ import chalk from 'chalk'; import { sync as spawnSync } from 'cross-spawn'; import { gt, satisfies } from 'semver'; import stripJsonComments from 'strip-json-comments'; -import latestVersion from './latest_version'; +import { latestVersion } from './latest_version'; import { version, devDependencies } from '../package.json'; -import npmInit from './npm_init'; +import { npmInit } from './npm_init'; const logger = console; diff --git a/lib/cli/src/initiate.js b/lib/cli/src/initiate.js index a18738ede87..85f2cd6d53c 100644 --- a/lib/cli/src/initiate.js +++ b/lib/cli/src/initiate.js @@ -1,8 +1,8 @@ import updateNotifier from 'update-notifier'; import chalk from 'chalk'; import inquirer from 'inquirer'; -import detect, { isStorybookInstalled } from './detect'; -import hasYarn from './has_yarn'; +import { detect, isStorybookInstalled } from './detect'; +import { hasYarn } from './has_yarn'; import types, { installableProjectTypes } from './project_types'; import { commandLog, diff --git a/lib/cli/src/latest_version.js b/lib/cli/src/latest_version.js index 724dee8308e..b351f4fceb0 100644 --- a/lib/cli/src/latest_version.js +++ b/lib/cli/src/latest_version.js @@ -1,7 +1,7 @@ import { spawn } from 'cross-spawn'; import { satisfies } from 'semver'; -export default function latestVersion(npmOptions, packageName, constraint) { +export function latestVersion(npmOptions, packageName, constraint) { const packageManager = npmOptions.useYarn ? 'yarn' : 'npm'; return new Promise((resolve, reject) => { const command = spawn( diff --git a/lib/cli/src/npm_init.js b/lib/cli/src/npm_init.js index d6526166eaa..1ee1656940b 100644 --- a/lib/cli/src/npm_init.js +++ b/lib/cli/src/npm_init.js @@ -1,9 +1,9 @@ import { spawn } from 'cross-spawn'; -import hasYarn from './has_yarn'; +import { hasYarn } from './has_yarn'; const packageManager = hasYarn() ? 'yarn' : 'npm'; -export default function npmInit() { +export function npmInit() { const results = spawn.sync(packageManager, ['init', '-y'], { cwd: process.cwd(), env: process.env,